Skip to content

W
wine-winehq
Commit 75c525c1 authored by James Juran's avatar James Juran Committed by Alexandre Julliard
Browse files
Options

Make sure we set dwOSVersionInfoSize before calling GetVersionInfo().

parent 4e5903aa
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
controls/edit.c
View file @ 75c525c1
...@@ -361,6 +361,7 @@ static DWORD get_app_version(void) ...@@ -361,6 +361,7 @@ static DWORD get_app_version(void)
OSVERSIONINFOW info; OSVERSIONINFOW info;
DWORD dwProcVersion = GetProcessVersion(0); DWORD dwProcVersion = GetProcessVersion(0);
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
GetVersionExW( &info ); GetVersionExW( &info );
dwEmulatedVersion = MAKELONG( info.dwMinorVersion, info.dwMajorVersion ); dwEmulatedVersion = MAKELONG( info.dwMinorVersion, info.dwMajorVersion );
/* fixme: this may not be 100% correct; see discussion on the /* fixme: this may not be 100% correct; see discussion on the
......
dlls/imm32/imm.c
View file @ 75c525c1
...@@ -172,6 +172,7 @@ LONG WINAPI ImmGetCompositionStringA( ...@@ -172,6 +172,7 @@ LONG WINAPI ImmGetCompositionStringA(
hIMC, dwIndex, lpBuf, dwBufLen hIMC, dwIndex, lpBuf, dwBufLen
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
GetVersionExA( &version ); GetVersionExA( &version );
switch(version.dwPlatformId) switch(version.dwPlatformId)
{ {
...@@ -195,6 +196,7 @@ LONG WINAPI ImmGetCompositionStringW( ...@@ -195,6 +196,7 @@ LONG WINAPI ImmGetCompositionStringW(
hIMC, dwIndex, lpBuf, dwBufLen hIMC, dwIndex, lpBuf, dwBufLen
); );
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
GetVersionExA( &version ); GetVersionExA( &version );
switch(version.dwPlatformId) switch(version.dwPlatformId)
{ {
...@@ -357,6 +359,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) ...@@ -357,6 +359,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd)
OSVERSIONINFOA version; OSVERSIONINFOA version;
FIXME("(0x%08x): stub\n", hWnd); FIXME("(0x%08x): stub\n", hWnd);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
GetVersionExA( &version ); GetVersionExA( &version );
switch(version.dwPlatformId) switch(version.dwPlatformId)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment