November 2018 - Wine-commits

Alex Henrie : shell32: Rename icon 137 from "options" to "control panel XP ".
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: a5d47b79717432d492aab9b3f620223c1462dbc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d47b79717432d492aab9b3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:24 2018 -0600 shell32: Rename icon 137 from "options" to "control panel XP". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e26bf9c3ea2e3ed2728a008722d54f7a8f89350b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shresdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7282fbb..d9cb3d9 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -224,7 +224,7 @@ #define IDI_SHELL_FILE_SEARCH 134 #define IDI_SHELL_SYSTEM_SEARCH 135 /* 136 not used on Windows */ -#define IDI_SHELL_OPTIONS 137 +#define IDI_SHELL_CONTROL_PANEL_XP 137 #define IDI_SHELL_PRINTERS_FOLDER_XP 138 #define IDI_SHELL_ADD_PRINTER 139 #define IDI_SHELL_REMOTE_PRINTER 140

1 0

Alex Henrie : shell32: Add remaining control panel icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: c4d42a2dc8007945ba35f04864e560076de18769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d42a2dc8007945ba35f048… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:25 2018 -0600 shell32: Add remaining control panel icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a924932da5655ab1270beaa0003f8b5bcc4dba1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 7b253d1..3e42d46 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -954,6 +954,9 @@ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_XP2 ICON resources/control.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico @@ -967,6 +970,9 @@ IDI_SHELL_HELP_SMALL ICON resources/help.ico /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index d9cb3d9..a48dfd4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -350,10 +350,12 @@ #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320 +#define IDI_SHELL_CONTROL_PANEL_XP2 321 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_CONTROL_PANEL_SMALL 330 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338

1 0

Alex Henrie : shell32: Add remaining small icons.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 2a2d0e38c81cf977bac0cd988483f0d800b7f581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2d0e38c81cf977bac0cd98… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 30 21:41:26 2018 -0600 shell32: Add remaining small icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c1a5099f094720a75b6327a6e8488002e2fdbb0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 15 +++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 3e42d46..ae9f2da 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -966,13 +966,28 @@ IDI_SHELL_SEARCH_SMALL ICON resources/search.ico /* @makedep: resources/help.ico */ IDI_SHELL_HELP_SMALL ICON resources/help.ico +/* @makedep: resources/log_off.ico */ +IDI_SHELL_LOG_OFF_SMALL ICON resources/log_off.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico +/* @makedep: resources/recent.ico */ +IDI_SHELL_RECENT_SMALL ICON resources/recent.ico + +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN_SMALL ICON resources/window.ico + +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_POWER_OFF_SMALL ICON resources/shut_down.ico + /* @makedep: resources/control.ico */ IDI_SHELL_CONTROL_PANEL_SMALL ICON resources/control.ico +/* @makedep: resources/eject.ico */ +IDI_SHELL_EJECT_SMALL ICON resources/eject.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/search.ico */ IDI_SHELL_SEARCH_DIRECTORY ICON resources/search.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a48dfd4..c1fecc4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -354,8 +354,13 @@ #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_SEARCH_SMALL 323 #define IDI_SHELL_HELP_SMALL 324 +#define IDI_SHELL_LOG_OFF_SMALL 325 #define IDI_SHELL_APP_FOLDER_SMALL 326 +#define IDI_SHELL_RECENT_SMALL 327 +#define IDI_SHELL_RUN_SMALL 328 +#define IDI_SHELL_POWER_OFF_SMALL 329 #define IDI_SHELL_CONTROL_PANEL_SMALL 330 +#define IDI_SHELL_EJECT_SMALL 331 /* 332 - 336 not used on Windows */ #define IDI_SHELL_SEARCH_DIRECTORY 337 #define IDI_SHELL_RESTRICTED2 338

1 0

Zebediah Figura : msvfw32: Fix driver enumeration.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: a1afb864ffb3092ee7af598159dc25a0a4819eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1afb864ffb3092ee7af5981… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 13 13:00:04 2018 -0600 msvfw32: Fix driver enumeration. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3396ca87ae34e446be55fda76d7f21fb3e85cf39) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 53 +++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d49ea74..e071d95 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -223,48 +223,48 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } -typedef BOOL (*enum_handler_t)(const char*, unsigned int, void*); +typedef BOOL (*enum_handler_t)(const char *name, const char *driver, unsigned int index, void *param); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) { - CHAR buf[2048], fccTypeStr[5], *s; + char fccTypeStr[4]; + char name_buf[10]; + char buf[2048]; + DWORD i, cnt = 0, lRet; BOOL result = FALSE; HKEY hKey; fourcc_to_string(fccTypeStr, fccType); - fccTypeStr[4] = '.'; /* first, go through the registry entries */ lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { - DWORD name, data, type; i = 0; for (;;) - { - name = 10; - data = sizeof buf - name; - lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); - if (lRet == ERROR_NO_MORE_ITEMS) break; - if (lRet != ERROR_SUCCESS) continue; - if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; - buf[name] = '='; - if ((result = handler(buf, cnt++, param))) break; - } - RegCloseKey( hKey ); + { + DWORD name_len = 10, driver_len = 128; + lRet = RegEnumValueA(hKey, i++, name_buf, &name_len, 0, 0, (BYTE *)buf, &driver_len); + if (lRet == ERROR_NO_MORE_ITEMS) break; + if (name_len != 9 || name_buf[4] != '.') continue; + if (fccType && strncasecmp(name_buf, fccTypeStr, 4)) continue; + if ((result = handler(name_buf, buf, cnt++, param))) break; + } + RegCloseKey( hKey ); } if (result) return result; /* if that didn't work, go through the values in system.ini */ if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) { - for (s = buf; *s; s += strlen(s) + 1) - { - TRACE("got %s\n", s); - if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; - if ((result = handler(s, cnt++, param))) break; - } + char *s; + for (s = buf; *s; s += strlen(s) + 1) + { + if (s[4] != '.' || s[9] != '=') continue; + if (fccType && strncasecmp(s, fccTypeStr, 4)) continue; + if ((result = handler(s, s + 10, cnt++, param))) break; + } } return result; @@ -294,10 +294,11 @@ DWORD WINAPI VideoForWindowsVersion(void) return 0x040003B6; /* 4.950 */ } -static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { ICINFO *lpicinfo = param; - DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); + DWORD fccType = mmioStringToFOURCCA(name, 0); + DWORD fccHandler = mmioStringToFOURCCA(name + 5, 0); if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) return FALSE; @@ -308,7 +309,7 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) lpicinfo->dwVersionICM = ICVERSION; lpicinfo->szName[0] = 0; lpicinfo->szDescription[0] = 0; - MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, + MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver, sizeof(lpicinfo->szDriver)/sizeof(WCHAR)); return TRUE; @@ -647,10 +648,10 @@ static HIC try_driver(driver_info_t *info) return 0; } -static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICLocate_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { driver_info_t *info = param; - info->fccHandler = mmioStringToFOURCCA(drv + 5, 0); + info->fccHandler = mmioStringToFOURCCA(name + 5, 0); info->hic = try_driver(info); return info->hic != 0; }

1 0

Zebediah Figura : msvfw32: Set fccType in ICInfo().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 1135dba1ad768bf15dad878e4b931f54fd747a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1135dba1ad768bf15dad878e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 13 13:00:05 2018 -0600 msvfw32: Set fccType in ICInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2068b95abaaac0ee5ddd38fca5dcb259533e4766) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 1 + dlls/msvfw32/tests/msvfw.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index e071d95..5dc99a4 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -303,6 +303,7 @@ static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned i if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) return FALSE; + lpicinfo->fccType = fccType; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; lpicinfo->dwVersion = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 3fe6702..8e262ff 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -294,6 +294,7 @@ static void test_ICInfo(void) for (i = found = 0; ICInfo(0, i, &info); i++) { trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + ok(info.fccType, "expected nonzero fccType\n"); ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x\n", info.fccHandler); @@ -317,6 +318,11 @@ static void test_ICInfo(void) } } ok(found != 0, "expected at least one codec\n"); + + memset(&info, 0, sizeof(info)); + ok(!ICInfo(ICTYPE_VIDEO, mmioFOURCC('f','a','k','e'), &info), "expected failure\n"); + ok(info.fccType == ICTYPE_VIDEO, "got 0x%08x\n", info.fccType); + ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); } START_TEST(msvfw)

1 0

Zebediah Figura : msvfw32: Reimplement ICGetDisplayFormat().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 0f25121a0277eaacb1c768c36ee26090e7c5f602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f25121a0277eaacb1c768c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 29 19:42:08 2018 -0500 msvfw32: Reimplement ICGetDisplayFormat(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44490 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37326f2111ea33f763a05a78e6fecb1d60d237df) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 138 ++++++++++++++++-------- dlls/msvfw32/tests/msvfw.c | 248 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 342 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f25121a0277eaacb1c7…

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for holding a critical section during process termination.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: b4307ecab34b3e130046b147073a7701a6b542d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4307ecab34b3e130046b147… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 7 16:03:13 2018 +0800 kernel32/tests: Add a test for holding a critical section during process termination. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0f99327e78b07fa0a2a40454870a75f12c48eeb9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/loader.c | 67 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index fe2957c..5dc9308 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1673,13 +1673,15 @@ static void test_import_resolution(void) #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; -HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; -static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; +static HANDLE event, mutex, semaphore; +static HANDLE stop_event, loader_lock_event, peb_lock_event, heap_lock_event, cs_lock_event, ack_event; +static CRITICAL_SECTION cs_lock; +static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock, inside_cs_lock; static LONG fls_callback_count; static DWORD WINAPI mutex_thread_proc(void *param) { - HANDLE wait_list[4]; + HANDLE wait_list[5]; DWORD ret; ret = WaitForSingleObject(mutex, 0); @@ -1691,6 +1693,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[1] = loader_lock_event; wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; + wait_list[4] = cs_lock_event; trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) @@ -1720,6 +1723,13 @@ static DWORD WINAPI mutex_thread_proc(void *param) inside_heap_lock++; SetEvent(ack_event); } + else if (ret == WAIT_OBJECT_0 + 4) + { + trace("%04x: mutex_thread_proc: Entering CS lock\n", GetCurrentThreadId()); + EnterCriticalSection(&cs_lock); + inside_cs_lock++; + SetEvent(ack_event); + } } trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); @@ -1829,14 +1839,19 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(0, "dll_entry_point: process should already deadlock\n"); break; } + else if (test_dll_phase == 7) + { + EnterCriticalSection(&cs_lock); + } - if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3 || test_dll_phase == 7) ok(param != NULL, "dll: param %p\n", param); else ok(!param, "dll: param %p\n", param); if (test_dll_phase == 0 || test_dll_phase == 1) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; + else if (test_dll_phase == 7) expected_code = 199; else expected_code = STILL_ACTIVE; if (test_dll_phase == 3) @@ -2154,6 +2169,11 @@ static void child_process(const char *dll_name, DWORD target_offset) heap_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(heap_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + InitializeCriticalSection(&cs_lock); + SetLastError(0xdeadbeef); + cs_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(cs_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + SetLastError(0xdeadbeef); ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(ack_event != 0, "CreateEvent error %d\n", GetLastError()); @@ -2370,6 +2390,20 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(0, "ExitProcess should not return\n"); break; + case 7: + trace("setting cs_lock_event\n"); + SetEvent(cs_lock_event); + WaitForSingleObject(ack_event, 1000); + ok(inside_cs_lock != 0, "inside_cs_lock is not set\n"); + + *child_failures = winetest_get_failures(); + + /* calling ExitProcess should not cause a deadlock */ + trace("call ExitProcess(199)\n"); + ExitProcess(199); + ok(0, "ExitProcess should not return\n"); + break; + default: assert(0); break; @@ -2674,6 +2708,31 @@ static void test_ExitProcess(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); + /* phase 7 */ + *child_failures = -1; + sprintf(cmdline, "\"%s\" loader %s %u 7", argv[0], dll_name, target_offset); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 5000); +todo_wine + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + if (ret != WAIT_OBJECT_0) + { + trace("terminating child process\n"); + TerminateProcess(pi.hProcess, 199); + } + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + GetExitCodeProcess(pi.hProcess, &ret); + ok(ret == 199, "expected exit code 199, got %u\n", ret); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + /* test remote process termination */ SetLastError(0xdeadbeef); ret = CreateProcessA(argv[0], NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi);

1 0

Dmitry Timoshkov : ntdll: Don' t allow blocking on a critical section during process termination.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 9a3c62249c746710d47aa02709e75f1bf33957a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a3c62249c746710d47aa027… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 7 16:03:16 2018 +0800 ntdll: Don't allow blocking on a critical section during process termination. As a result HeapLock() no longer blocks process termination since underlying implementation uses a critical section. However this should be considered as a minor side effect because applications shouldn't depend on this behaviour. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7def0f200f117a5a72ce454004ac4fd600ef8a4b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/loader.c | 4 +++- dlls/ntdll/critsection.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 5dc9308..7066bca 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1836,6 +1836,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) * doesn't call the DLL entry point on process detach either. */ HeapLock(GetProcessHeap()); +todo_wine ok(0, "dll_entry_point: process should already deadlock\n"); break; } @@ -2690,6 +2691,7 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); +todo_wine ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -2699,6 +2701,7 @@ static void test_ExitProcess(void) ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); +todo_wine ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); if (*child_failures) { @@ -2714,7 +2717,6 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); if (ret != WAIT_OBJECT_0) { diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index e405b08..42e432c 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -436,6 +436,15 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; + + /* Don't allow blocking on a critical section during process termination */ + if (RtlDllShutdownInProgress()) + { + WARN( "process %s is shutting down, returning STATUS_SUCCESS\n", + debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer) ); + return STATUS_SUCCESS; + } + for (;;) { EXCEPTION_RECORD rec;

1 0

Fabian Maurer : kernel32: Make UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 6f334fc0def4c1cfa0916b5ac1b17fd4d371bf6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f334fc0def4c1cfa0916b5a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 16 07:01:12 2018 +0200 kernel32: Make UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY. This is needed by x64 chromium sandbox for >= win10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45644 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2a82ddc2b95bb04e9bdab87744435ff1734bc4fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e23786b..a0817e0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4242,8 +4242,17 @@ BOOL WINAPI UpdateProcThreadAttribute(struct _PROC_THREAD_ATTRIBUTE_LIST *list, } break; + case PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY: + if (size != sizeof(DWORD) && size != sizeof(DWORD64)) + { + SetLastError(ERROR_BAD_LENGTH); + return FALSE; + } + break; + default: SetLastError(ERROR_NOT_SUPPORTED); + FIXME("Unhandled attribute number %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER); return FALSE; }

1 0

Alistair Leslie-Hughes : powrprof: Added PowerEnumerate stub.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 59d262ccbaec1bdd4efe4e9670182d19fbc8593f URL: https://source.winehq.org/git/wine.git/?a=commit;h=59d262ccbaec1bdd4efe4e96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 15 06:32:45 2018 +0000 powrprof: Added PowerEnumerate stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45603 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit acecb72006bee20682c31ad9e02c8cab50436042) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/powrprof/powrprof.c | 8 ++++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 685b663..1597d96 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -321,6 +321,14 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) return PlatformRoleDesktop; } +DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, + ULONG index, UCHAR *buffer, DWORD *buffer_size) +{ + FIXME("(%p,%s,%s,%d,%d,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), + flags, index, buffer, buffer_size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index c90fafc..a9e337a 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerDeterminePlatformRole () +@ stdcall PowerEnumerate(long ptr ptr long long ptr ptr) @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 239044e..318188e 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -109,6 +109,36 @@ typedef struct _POWER_POLICY { } POWER_POLICY, *PPOWER_POLICY; +typedef enum _POWER_DATA_ACCESSOR { + ACCESS_AC_POWER_SETTING_INDEX, + ACCESS_DC_POWER_SETTING_INDEX, + ACCESS_FRIENDLY_NAME, + ACCESS_DESCRIPTION, + ACCESS_POSSIBLE_POWER_SETTING, + ACCESS_POSSIBLE_POWER_SETTING_FRIENDLY_NAME, + ACCESS_POSSIBLE_POWER_SETTING_DESCRIPTION, + ACCESS_DEFAULT_AC_POWER_SETTING, + ACCESS_DEFAULT_DC_POWER_SETTING, + ACCESS_POSSIBLE_VALUE_MIN, + ACCESS_POSSIBLE_VALUE_MAX, + ACCESS_POSSIBLE_VALUE_INCREMENT, + ACCESS_POSSIBLE_VALUE_UNITS, + ACCESS_ICON_RESOURCE, + ACCESS_DEFAULT_SECURITY_DESCRIPTOR, + ACCESS_ATTRIBUTES, + ACCESS_SCHEME, + ACCESS_SUBGROUP, + ACCESS_INDIVIDUAL_SETTING, + ACCESS_ACTIVE_SCHEME, + ACCESS_CREATE_SCHEME, + ACCESS_AC_POWER_SETTING_MAX, + ACCESS_DC_POWER_SETTING_MAX, + ACCESS_AC_POWER_SETTING_MIN, + ACCESS_DC_POWER_SETTING_MIN, + ACCESS_PROFILE, + ACCESS_OVERLAY_SCHEME, + ACCESS_ACTIVE_OVERLAY_SCHEME, +} POWER_DATA_ACCESSOR, *PPOWER_DATA_ACCESSOR; #ifdef __cplusplus extern "C" { @@ -128,6 +158,7 @@ BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY); BOOLEAN WINAPI IsPwrHibernateAllowed(VOID); BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); +DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);

1 0