May 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : imm32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 0243fd5aa3bbf7d279d7d41996ae6cbe194159f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0243fd5aa3bbf7d279d7d4199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:26:39 2013 +0200 imm32: Don't bother to unregister classes at process exit. --- dlls/imm32/imm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index fbb683f..62f4b71 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -386,6 +386,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) IMM_FreeThreadData(); break; case DLL_PROCESS_DETACH: + if (lpReserved) break; IMM_FreeThreadData(); IMM_FreeAllImmHkl(); TlsFree(tlsIndex);

1 0

Alexandre Julliard : inetcomm: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 1b5114d9fc37992af5698c9b2eb17cb9404d80ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5114d9fc37992af5698c9b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:16:33 2013 +0200 inetcomm: Don't bother to unregister classes at process exit. --- dlls/inetcomm/inetcomm_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 8f5eca6..9987a41 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -58,11 +58,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) MimeInternational_Construct(&international); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; IMimeInternational_Release(international); InternetTransport_UnregisterClass(hinstDLL); break; - default: - break; } return TRUE; }

1 0

Alexandre Julliard : msi: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: d578d0d6c3407f292151979e28b13230c871abbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d578d0d6c3407f292151979e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:18:37 2013 +0200 msi: Don't bother to unregister classes at process exit. --- dlls/msi/msi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 46f9ed8..148e678 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -76,6 +76,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) IsWow64Process( GetCurrentProcess(), &is_wow64 ); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; msi_dialog_unregister_class(); msi_free_handle_table(); msi_free( gszLogFile );

1 0

Alexandre Julliard : riched20: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 85f882856053cbc5e51a1e94ed39146bc47700ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f882856053cbc5e51a1e94e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:19:48 2013 +0200 riched20: Don't bother to unregister classes at process exit. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1b4788c..f54458e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2843,6 +2843,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; UnregisterClassW(RICHEDIT_CLASS20W, 0); UnregisterClassW(MSFTEDIT_CLASS, 0); UnregisterClassA(RICHEDIT_CLASS20A, 0); @@ -2853,7 +2854,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) UnregisterClassW(REComboBox20W, 0); LookupCleanup(); HeapDestroy (me_heap); - me_heap = NULL; break; } return TRUE;

1 0

Alexandre Julliard : riched32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 0091c0ae964908f1e0227ecbcf01a7c43284136d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0091c0ae964908f1e0227ecbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:20:49 2013 +0200 riched32: Don't bother to unregister classes at process exit. --- dlls/riched32/richedit.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/riched32/richedit.c b/dlls/riched32/richedit.c index 7513273..44ce843 100644 --- a/dlls/riched32/richedit.c +++ b/dlls/riched32/richedit.c @@ -40,16 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM); -/* Unregisters the window class. */ -static BOOL RICHED32_Unregister(void) -{ - TRACE("\n"); - - UnregisterClassA(RICHEDIT_CLASS10A, NULL); - return TRUE; -} - - /* Registers the window class. */ static BOOL RICHED32_Register(void) { @@ -80,7 +70,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return RICHED32_Register(); case DLL_PROCESS_DETACH: - return RICHED32_Unregister(); + if (lpvReserved) break; + UnregisterClassA(RICHEDIT_CLASS10A, NULL); + break; } return TRUE; }

1 0

Alexandre Julliard : ole32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 5e95368e0a40df0cba8c238ff43652631d840585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e95368e0a40df0cba8c238ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:25:29 2013 +0200 ole32: Don't bother to unregister classes at process exit. --- dlls/ole32/compobj.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1857ac7..e007440 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4449,9 +4449,9 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) /*********************************************************************** * DllMain (OLE32.@) */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: @@ -4460,6 +4460,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: + if (reserved) break; COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free();

1 0

Alexandre Julliard : wintab32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 9cf94e30b2ef8140faca7c0268a1ef08329446f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf94e30b2ef8140faca7c026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:27:40 2013 +0200 wintab32: Don't bother to unregister classes at process exit. --- dlls/wintab32/wintab32.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 51cba6a..0633ea8 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -99,12 +99,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) return FALSE; break; case DLL_PROCESS_DETACH: + if (lpReserved) break; TRACE("Detaching\n"); - if (hwndDefault) - { - DestroyWindow(hwndDefault); - hwndDefault = 0; - } + if (hwndDefault) DestroyWindow(hwndDefault); TABLET_Unregister(); DeleteCriticalSection(&csTablet); break;

1 0

Alexandre Julliard : wined3d: Don' t bother to unregister classes at process exit.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 02d56bd3a217a20a6e2aa8e53bbb8f6c099b47fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d56bd3a217a20a6e2aa8e53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:30:43 2013 +0200 wined3d: Don't bother to unregister classes at process exit. --- dlls/wined3d/wined3d_main.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f49e5bc..50bee78 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -521,18 +521,15 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return wined3d_dll_init(hInstDLL); case DLL_PROCESS_DETACH: + if (lpv) break; return wined3d_dll_destroy(hInstDLL); case DLL_THREAD_DETACH: - { if (!context_set_current(NULL)) { ERR("Failed to clear current context.\n"); } return TRUE; - } - - default: - return TRUE; } + return TRUE; }

1 0

Dmitry Timoshkov : kernel32: Add a test for holding process heap lock before calling ExitProcess.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 462ad39949d3c9378607ba3ea78f38e07d42de0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ad39949d3c9378607ba3ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:45:45 2013 +0900 kernel32: Add a test for holding process heap lock before calling ExitProcess. --- dlls/kernel32/tests/loader.c | 70 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ac171bd..d481f08 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1060,12 +1060,12 @@ nt4_is_broken: #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, ack_event; -static int test_dll_phase, inside_loader_lock, inside_peb_lock; +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 DWORD WINAPI mutex_thread_proc(void *param) { - HANDLE wait_list[3]; + HANDLE wait_list[4]; DWORD ret; ret = WaitForSingleObject(mutex, 0); @@ -1076,11 +1076,12 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[0] = stop_event; wait_list[1] = loader_lock_event; wait_list[2] = peb_lock_event; + wait_list[3] = heap_lock_event; while (1) { trace("%04u: mutex_thread_proc: still alive\n", GetCurrentThreadId()); - ret = WaitForMultipleObjects(3, wait_list, FALSE, 50); + ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) { @@ -1098,6 +1099,13 @@ static DWORD WINAPI mutex_thread_proc(void *param) inside_peb_lock++; SetEvent(ack_event); } + else if (ret == WAIT_OBJECT_0 + 3) + { + trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + HeapLock(GetProcessHeap()); + inside_heap_lock++; + SetEvent(ack_event); + } } trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); @@ -1169,6 +1177,18 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) break; } + /* The process should already deadlock at this point */ + if (test_dll_phase == 6) + { + /* In reality, code below never gets executed, probably some other + * code tries to access process heap and deadlocks earlier, even XP + * doesn't call the DLL entry point on process detach either. + */ + HeapLock(GetProcessHeap()); + ok(0, "dll_entry_point: process should already deadlock\n"); + break; + } + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) ok(param != NULL, "dll: param %p\n", param); else @@ -1444,6 +1464,10 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(peb_lock_event != 0, "CreateEvent error %d\n", GetLastError()); SetLastError(0xdeadbeef); + heap_lock_event = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(heap_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ack_event = CreateEvent(NULL, FALSE, FALSE, NULL); ok(ack_event != 0, "CreateEvent error %d\n", GetLastError()); @@ -1644,6 +1668,20 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(0, "ExitProcess should not return\n"); break; + case 6: + trace("setting heap_lock_event\n"); + SetEvent(heap_lock_event); + WaitForSingleObject(ack_event, 1000); + ok(inside_heap_lock != 0, "inside_heap_lock is not set\n"); + + *child_failures = winetest_get_failures(); + + /* calling ExitProcess should cause a deadlock */ + trace("call ExitProcess(1)\n"); + ExitProcess(1); + ok(0, "ExitProcess should not return\n"); + break; + default: assert(0); break; @@ -1923,6 +1961,30 @@ static void test_ExitProcess(void) else win_skip("RtlAcquirePebLock/RtlReleasePebLock are not available on this platform\n"); + /* phase 6 */ + *child_failures = -1; + sprintf(cmdline, "\"%s\" loader %s %u 6", argv[0], dll_name, target_offset); + ret = CreateProcess(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); + ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); + if (ret != WAIT_OBJECT_0) + { + trace("terminating child process\n"); + TerminateProcess(pi.hProcess, 201); + } + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + GetExitCodeProcess(pi.hProcess, &ret); + ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, 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 = CreateProcess(argv[0], NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi);

1 0

Ken Thomases : winemac: Fix disabling of resizable windows.
by Alexandre Julliard 14 May '13

14 May '13

Module: wine Branch: master Commit: 1ac1cd69addcfd65ea78a114625488e486929f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac1cd69addcfd65ea78a1146… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 14 03:35:03 2013 -0500 winemac: Fix disabling of resizable windows. --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 52 ++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 2d95e1a..21bcf44 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -26,7 +26,6 @@ @interface WineWindow : NSPanel <NSWindowDelegate> { - NSUInteger normalStyleMask; BOOL disabled; BOOL noActivate; BOOL floating; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ae69479..8ebda3b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -460,7 +460,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) defer:YES] autorelease]; if (!window) return nil; - window->normalStyleMask = [window styleMask]; /* Standardize windows to eliminate differences between titled and borderless windows and between NSWindow and NSPanel. */ @@ -515,22 +514,37 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) adjustFeaturesForState { - NSUInteger style = normalStyleMask; - - if (self.disabled) - style &= ~NSResizableWindowMask; - if (style != [self styleMask]) - [self setStyleMask:style]; + NSUInteger style = [self styleMask]; if (style & NSClosableWindowMask) [[self standardWindowButton:NSWindowCloseButton] setEnabled:!self.disabled]; if (style & NSMiniaturizableWindowMask) [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; + if (style & NSResizableWindowMask) + [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; } - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { - normalStyleMask = style_mask_for_features(wf); + NSUInteger currentStyle = [self styleMask]; + NSUInteger newStyle = style_mask_for_features(wf); + + if (newStyle != currentStyle) + { + BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; + BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; + if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) + { + // -setStyleMask: is buggy on 10.7+ with respect to NSResizableWindowMask. + // If transitioning from NSTitledWindowMask | NSResizableWindowMask to + // just NSTitledWindowMask, the window buttons should disappear rather + // than just being disabled. But they don't. Similarly in reverse. + // The workaround is to also toggle NSClosableWindowMask at the same time. + [self setStyleMask:newStyle ^ NSClosableWindowMask]; + } + [self setStyleMask:newStyle]; + } + [self adjustFeaturesForState]; [self setHasShadow:wf->shadow]; } @@ -791,6 +805,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { disabled = newValue; [self adjustFeaturesForState]; + + if (disabled) + { + NSSize size = [self frame].size; + [self setMinSize:size]; + [self setMaxSize:size]; + } + else + { + [self setMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + [self setMinSize:NSZeroSize]; + } } } @@ -1165,8 +1191,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void)windowDidResize:(NSNotification *)notification { macdrv_event* event; - NSRect frame = [self contentRectForFrameRect:[self frame]]; + NSRect frame = [self frame]; + + if (self.disabled) + { + NSSize size = frame.size; + [self setMinSize:size]; + [self setMaxSize:size]; + } + frame = [self contentRectForFrameRect:frame]; [[WineApplicationController sharedController] flipRect:&frame]; /* Coalesce events by discarding any previous ones still in the queue. */

1 0