March 2017 - Wine-commits - list.winehq.org

Austin English : kernel32: Add GetVolumeInformationByHandleW stub.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: ad6c781eb2f27e158e973e55aced6b01f320c542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6c781eb2f27e158e973e55a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 6 17:34:40 2016 -0500 kernel32: Add GetVolumeInformationByHandleW stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-file-l1-1-0.spec | 2 +- .../api-ms-win-core-file-l1-2-0.spec | 2 +- .../api-ms-win-core-file-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 22 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec index 61e8038..612e491 100644 --- a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec +++ b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec @@ -49,7 +49,7 @@ @ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW @ stdcall LocalFileTimeToFileTime(ptr ptr) kernel32.LocalFileTimeToFileTime diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec index cddf112..1aba68d 100644 --- a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec +++ b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec @@ -50,7 +50,7 @@ @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW diff --git a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec index a9acd8d..5bf5cb3 100644 --- a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec +++ b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec @@ -52,7 +52,7 @@ @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a144fd1..31ce456 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -877,7 +877,7 @@ @ stdcall GetVersionExA(ptr) @ stdcall GetVersionExW(ptr) @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) -# @ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) @ stdcall GetVolumeNameForVolumeMountPointA(str ptr long) @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 68cc762..92bcf53 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -2309,3 +2309,25 @@ BOOL WINAPI SetVolumeMountPointW(LPCWSTR path, LPCWSTR volume) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * GetVolumeInformationByHandleW (KERNEL32.@) + */ +BOOL WINAPI GetVolumeInformationByHandleW(HANDLE handle, WCHAR *volnamebuf, DWORD volnamesize, DWORD *volserial, DWORD *maxlength, DWORD *flags, WCHAR *fsnamebuf, DWORD fsnamesize) +{ + FIXME("%p %p %d %p %p %p %p %d\n", handle, volnamebuf, volnamesize, volserial, maxlength, flags, fsnamebuf, fsnamesize); + + if(volnamebuf && volnamesize) + *volnamebuf = 0; + if(volserial) + *volserial = 0; + if(maxlength) + *maxlength = 0; + if(flags) + *flags = 0; + if(fsnamebuf && fsnamesize) + *fsnamebuf = 0; + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 064f792..95ce6c1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -337,7 +337,7 @@ @ stdcall GetVersion() kernel32.GetVersion @ stdcall GetVersionExA(ptr) kernel32.GetVersionExA @ stdcall GetVersionExW(ptr) kernel32.GetVersionExW -@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW @ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW @ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW @ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid diff --git a/include/winbase.h b/include/winbase.h index 2345443..894156c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2217,6 +2217,7 @@ WINBASEAPI BOOL WINAPI GetVersionExW(OSVERSIONINFOW*); WINBASEAPI BOOL WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD); WINBASEAPI BOOL WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD); #define GetVolumeInformation WINELIB_NAME_AW(GetVolumeInformation) +WINBASEAPI BOOL WINAPI GetVolumeInformationByHandleW(HANDLE,WCHAR *,DWORD,DWORD *,DWORD *,DWORD *,WCHAR *,DWORD); WINBASEAPI BOOL WINAPI GetVolumeNameForVolumeMountPointA(LPCSTR,LPSTR,DWORD); WINBASEAPI BOOL WINAPI GetVolumeNameForVolumeMountPointW(LPCWSTR,LPWSTR,DWORD); #define GetVolumeNameForVolumeMountPoint WINELIB_NAME_AW(GetVolumeNameForVolumeMountPoint)

1 0

Marcus Meissner : kernel32/tests: Fixed incorrect buffer sizes.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 0cf2adb36d9542e45b527cac0e2a44c79c525d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2adb36d9542e45b527cac0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Mar 20 21:55:08 2017 +0100 kernel32/tests: Fixed incorrect buffer sizes. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index b384135..1f88e24 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1822,7 +1822,7 @@ static void test_message_from_64bit_number(void) { r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, 0, 0, outW, sizeof(outW) / sizeof(WCHAR), unsigned_tests[i].number); - MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, sizeof(expW)); + MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, sizeof(expW) / sizeof(WCHAR)); todo_wine { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, wine_dbgstr_w(outW)); @@ -1841,7 +1841,7 @@ todo_wine { { r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, 0, 0, outW, sizeof(outW) / sizeof(WCHAR), signed_tests[i].number); - MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, sizeof(expW)); + MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, sizeof(expW) / sizeof(WCHAR)); todo_wine { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, wine_dbgstr_w(outW));

1 0

Hugh McMaster : regedit/tests: Add missing ok() check after RegOpenKeyExA( ).
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: e96056a026466083ebd332b9730476c178b6a859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96056a026466083ebd332b97… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 21 08:47:09 2017 +0000 regedit/tests: Add missing ok() check after RegOpenKeyExA(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index eacb583..b91df5a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -518,6 +518,7 @@ static void test_comments(void) ";comment\\\n" "\"Wine2\"=\"Line 2\"\n\n"); lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0); verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0);

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLRemoveDriver/ SQLRemoveDriverW.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 3136beda264d8f01f9bf772aca1289be30623e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3136beda264d8f01f9bf772ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 20 23:07:32 2017 +0000 odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 68 +++++++++++++++++++++++++++++++++++++++++----- dlls/odbccp32/tests/misc.c | 4 +-- 2 files changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 037a2a9..6a2c484 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1132,22 +1132,76 @@ BOOL WINAPI SQLRemoveDefaultDataSource(void) return FALSE; } -BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, - LPDWORD lpdwUsageCount) +BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_count) { + HKEY hkey; + DWORD usagecount = 1; + clear_errors(); - FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); - if (lpdwUsageCount) *lpdwUsageCount = 1; + TRACE("%s %d %p\n", debugstr_w(drivername), remove_dsn, usage_count); + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) + { + DWORD size, type; + DWORD count; + + size = sizeof(usagecount); + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); + TRACE("Usage count %d\n", usagecount); + count = usagecount - 1; + if (count) + { + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&count, sizeof(count)) != ERROR_SUCCESS) + ERR("Failed to write registry UsageCount key\n"); + } + + RegCloseKey(hkeydriver); + } + + if (usagecount) + usagecount--; + + if (!usagecount) + { + if (RegDeleteKeyW(hkey, drivername) != ERROR_SUCCESS) + ERR("Failed to delete registry key: %s\n", debugstr_w(drivername)); + + if (RegOpenKeyW(hkey, odbcdrivers, &hkeydriver) == ERROR_SUCCESS) + { + if(RegDeleteValueW(hkeydriver, drivername) != ERROR_SUCCESS) + ERR("Failed to delete registry value: %s\n", debugstr_w(drivername)); + RegCloseKey(hkeydriver); + } + } + + RegCloseKey(hkey); + } + + if (usage_count) + *usage_count = usagecount; + return TRUE; } BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, LPDWORD lpdwUsageCount) { + WCHAR *driver; + BOOL ret; + clear_errors(); - FIXME("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); - if (lpdwUsageCount) *lpdwUsageCount = 1; - return TRUE; + TRACE("%s %d %p\n", debugstr_a(lpszDriver), fRemoveDSN, lpdwUsageCount); + + driver = SQLInstall_strdup(lpszDriver); + + ret = SQLRemoveDriverW(driver, fRemoveDSN, lpdwUsageCount); + + HeapFree(GetProcessHeap(), 0, driver); + return ret; } BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 5ba1eee..905468c 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -462,12 +462,12 @@ void test_SQLInstallDriverEx(void) cnt = 100; ret = SQLRemoveDriver("WINE ODBC Driver", FALSE, &cnt); ok(ret, "SQLRemoveDriver failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); + ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); cnt = 100; ret = SQLRemoveDriver("WINE ODBC Driver Path", FALSE, &cnt); ok(ret, "SQLRemoveDriver failed\n"); - todo_wine ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); + ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } START_TEST(misc)

1 0

Daniel Lehman : msvcrt: Call unwind handlers on intermediate frames during virtual unwind.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 5a10705f0c57142c6317bfab660d6270116c332c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a10705f0c57142c6317bfab6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 2 17:16:52 2016 -0700 msvcrt: Call unwind handlers on intermediate frames during virtual unwind. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 3a90a66..80780ae 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -470,14 +470,20 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block) { - ULONG64 orig_frame = rec->ExceptionInformation[1]; - const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; - int end_level = rec->ExceptionInformation[3]; EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; thread_data_t *data = msvcrt_get_thread_data(); frame_info *cur; - cxx_local_unwind(orig_frame, dispatch, descr, end_level); + if (rec->ExceptionFlags & EH_TARGET_UNWIND) + { + ULONG64 orig_frame = rec->ExceptionInformation[1]; + const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; + int end_level = rec->ExceptionInformation[3]; + + cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); + } + else + cxx_local_unwind(frame, dispatch, descr, -1); /* FIXME: we should only unregister frames registered by call_catch_block here */ for (cur = data->frame_info_head; cur; cur = cur->next)

1 0

Piotr Caban : concrt140: Add missing i386 spec file entries.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 6288f0b435209da166408411c201dc5a6925bebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6288f0b435209da166408411c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 12:13:01 2017 +0100 concrt140: Add missing i386 spec file entries. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6288f0b435209da166408…

1 0

Piotr Caban : msvcp140: Add {_Schedule, _Reschedule, _Release}_chore implementation.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 4c54f9aeaca1d662a15ae037372d7399c37d1360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c54f9aeaca1d662a15ae0373… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 12:13:11 2017 +0100 msvcp140: Add {_Schedule,_Reschedule,_Release}_chore implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 12 ++++---- dlls/msvcp140/tests/msvcp140.c | 67 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 49 ++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c54f9aeaca1d662a15ae…

1 0

Piotr Caban : user32: Don't call IsChild with NULL window in EnableWindow.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: a878f0a02ad553b94b78b907715c691507dea501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a878f0a02ad553b94b78b9077… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 21 13:03:55 2017 +0100 user32: Don't call IsChild with NULL window in EnableWindow. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 ++ dlls/user32/win.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e11ff2..915012c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3091,7 +3091,9 @@ static void test_SetFocus(HWND hwnd) ShowWindow(child, SW_SHOW); SetFocus(child); ok( GetFocus() == child, "Focus should be on child %p\n", child ); + SetLastError(0xdeadbeef); EnableWindow(hwnd, FALSE); + ok(GetLastError() == 0xdeadbeef, "got error %u in EnableWindow call\n", GetLastError()); ok( GetFocus() == child, "Focus should still be on child %p\n", child ); EnableWindow(hwnd, TRUE); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4406577..f3b4ef5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2171,7 +2171,7 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) SetFocus( 0 ); /* A disabled window can't have the focus */ capture_wnd = GetCapture(); - if (hwnd == capture_wnd || IsChild(hwnd, capture_wnd)) + if (capture_wnd && (hwnd == capture_wnd || IsChild(hwnd, capture_wnd))) ReleaseCapture(); /* A disabled window can't capture the mouse */ SendMessageW( hwnd, WM_ENABLE, FALSE, 0 );

1 0

Alex Henrie : ntdll: Don' t report false memory statistics for other processes.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 08ea8280d38e0592abd817d13a058567db0ea5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ea8280d38e0592abd817d13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 20 22:29:55 2017 -0600 ntdll: Don't report false memory statistics for other processes. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index adff826..8689d9b 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -271,7 +271,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( else { memset(&pvmi, 0 , sizeof(VM_COUNTERS)); - fill_VM_COUNTERS(&pvmi); + if (ProcessHandle == GetCurrentProcess()) + fill_VM_COUNTERS(&pvmi); + else + FIXME("Need wineserver call to get VM counters for another process\n"); len = ProcessInformationLength; if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS);

1 0

Alex Henrie : ntdll: Implement ProcessVmCounters for Linux.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: bf7a97e5d3482d1ee4130d716f02b870df804040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7a97e5d3482d1ee4130d716… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Mar 20 22:55:37 2017 -0600 ntdll: Implement ProcessVmCounters for Linux. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 28 ++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 5 +---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 8689d9b..9522256 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -131,6 +131,34 @@ static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) #endif } +#elif defined(linux) + +static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +{ + FILE *f; + char line[256]; + unsigned long value; + + f = fopen("/proc/self/status", "r"); + if (!f) return; + + while (fgets(line, sizeof(line), f)) + { + if (sscanf(line, "VmPeak: %lu", &value)) + pvmi->PeakVirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSize: %lu", &value)) + pvmi->VirtualSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmHWM: %lu", &value)) + pvmi->PeakWorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmRSS: %lu", &value)) + pvmi->WorkingSetSize = (ULONG64)value * 1024; + else if (sscanf(line, "VmSwap: %lu", &value)) + pvmi->PeakPagefileUsage = pvmi->PagefileUsage = (ULONG64)value * 1024; + } + + fclose(f); +} + #else static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 448bc64..35e25af 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1078,10 +1078,7 @@ static void test_query_process_vm(void) /* Check if we have some return values */ trace("WorkingSetSize : %ld\n", pvi.WorkingSetSize); - todo_wine - { - ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); - } + ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); } static void test_query_process_io(void)

1 0