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

Alexandre Julliard : imagehlp: Don't bother to free memory at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 4d9dbfc3fb5245028182a32e5044588bfda30874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9dbfc3fb5245028182a32e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:26:31 2013 +0200 imagehlp: Don't bother to free memory at process exit. --- dlls/imagehlp/imagehlp_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index 3ddae7a..e505126 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -40,10 +40,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; HeapDestroy(IMAGEHLP_hHeap); - IMAGEHLP_hHeap = NULL; - break; - default: break; } return TRUE;

1 0

Alexandre Julliard : wineps.drv: Don' t bother to free memory at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: d7ddcdfca7d2df2b62b4da67b79e92dcf7a0e4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ddcdfca7d2df2b62b4da67b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:28:28 2013 +0200 wineps.drv: Don't bother to free memory at process exit. --- dlls/wineps.drv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4b5baed..ec98f04 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -139,7 +139,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) break; case DLL_PROCESS_DETACH: - + if (reserved) break; DeleteObject( PSDRV_DefaultFont ); HeapDestroy( PSDRV_Heap ); break;

1 0

Alexandre Julliard : mshtml: Don't bother to clean up at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 1d0fe8664ec1b1030cd4816e25e45368299e7f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0fe8664ec1b1030cd4816e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:27:20 2013 +0200 mshtml: Don't bother to clean up at process exit. --- dlls/mshtml/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 503d738..f81255a 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -164,13 +164,14 @@ HDC get_display_dc(void) return display_dc; } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { switch(fdwReason) { case DLL_PROCESS_ATTACH: hInst = hInstDLL; break; case DLL_PROCESS_DETACH: + if (reserved) break; process_detach(); break; case DLL_THREAD_DETACH:

1 0

Alexandre Julliard : netapi32: Don't bother to clean up at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 670c621414e2ac3556352ee2b4a3975af572659e URL: http://source.winehq.org/git/wine.git/?a=commit;h=670c621414e2ac3556352ee2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:28:05 2013 +0200 netapi32: Don't bother to clean up at process exit. --- dlls/netapi32/netapi32.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index a24320c..a5f1c03 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -33,17 +33,14 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); NetBIOSInit(); NetBTInit(); break; - } case DLL_PROCESS_DETACH: - { + if (lpvReserved) break; NetBIOSShutdown(); break; - } } return TRUE;

1 0

Alexandre Julliard : winhttp: Don't bother to clean up at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 7ad43e4e8874e16401aab08205ea2f22d3a01862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad43e4e8874e16401aab0820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:28:45 2013 +0200 winhttp: Don't bother to clean up at process exit. --- dlls/winhttp/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 5348d4d..5827c10 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -46,6 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (lpv) break; netconn_unload(); break; }

1 0

Dmitry Timoshkov : kernel32: Terminate threads before unloading DLLs on process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: bfcdf6df8eea1230fb0e1835a809e49e5971e5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcdf6df8eea1230fb0e1835a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:46:37 2013 +0900 kernel32: Terminate threads before unloading DLLs on process exit. --- dlls/kernel32/process.c | 2 ++ dlls/kernel32/tests/loader.c | 22 ---------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 683385f..d07065c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2631,6 +2631,7 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr void WINAPI process_ExitProcess( DWORD status ) { RtlAcquirePebLock(); + NtTerminateProcess(0, status); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); @@ -2641,6 +2642,7 @@ void WINAPI process_ExitProcess( DWORD status ) void WINAPI ExitProcess( DWORD status ) { RtlAcquirePebLock(); + NtTerminateProcess(0, status); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index d481f08..bd80508 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1225,19 +1225,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (expected_code != STILL_ACTIVE) { ret = WaitForSingleObject(attached_thread[i], 1000); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } ret = GetExitCodeThread(attached_thread[i], &code); trace("dll: GetExitCodeThread(%u) => %d,%u\n", i, ret, code); ok(ret == 1, "GetExitCodeThread returned %d, expected 1\n", ret); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); - else ok(code == expected_code, "expected thread exit code %u, got %u\n", expected_code, code); } @@ -1248,13 +1240,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (expected_code == STILL_ACTIVE) ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); else - { - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_ABANDONED, "expected WAIT_ABANDONED, got %#x\n", ret); - else ok(ret == WAIT_ABANDONED, "expected WAIT_ABANDONED, got %#x\n", ret); - } /* semaphore is not abandoned on thread termination */ ret = WaitForSingleObject(semaphore, 0); @@ -1270,16 +1256,8 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) else { ret = WaitForSingleObject(attached_thread[0], 0); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); ret = WaitForSingleObject(attached_thread[1], 0); - /* FIXME: remove once Wine is fixed */ - if (test_dll_phase == 1) todo_wine - ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - else ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); }

1 0

Dmitry Timoshkov : ntdll: Thread creation control is now taken care by server.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 94336f1aabebac164764b838ccd92b0b9a55c8b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94336f1aabebac164764b838c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:47:30 2013 +0900 ntdll: Thread creation control is now taken care by server. --- dlls/ntdll/thread.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 4499afa..01a8026 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -461,8 +461,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return result.create_thread.status; } - if (RtlDllShutdownInProgress()) return STATUS_ACCESS_DENIED; - if (server_pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; wine_server_send_fd( request_pipe[0] );

1 0

Ken Thomases : winemac: Implement simpler way to find front Wine window.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: c3183fc00783a3e7ff1ad0eb937150b66f1f016b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3183fc00783a3e7ff1ad0eb9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:16 2013 -0500 winemac: Implement simpler way to find front Wine window. This uses Cocoa and the window server to track windows and their z-order, which is more reliable than our own tracking. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 37 ++++++++++++++++++++----------------- dlls/winemac.drv/cocoa_window.m | 8 ++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 8ed9763..551635d 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -111,6 +111,7 @@ enum { - (void) wineWindow:(WineWindow*)window ordered:(NSWindowOrderingMode)order relativeTo:(WineWindow*)otherWindow; + - (WineWindow*) frontWineWindow; - (BOOL) handleEvent:(NSEvent*)anEvent; - (void) didSendEvent:(NSEvent*)anEvent; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index f9363c1..67984cd 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -486,6 +486,19 @@ int macdrv_err_on; } } + - (WineWindow*) frontWineWindow + { + NSNumber* windowNumber; + for (windowNumber in [NSWindow windowNumbersWithOptions:NSWindowNumberListAllSpaces]) + { + NSWindow* window = [NSApp windowWithWindowNumber:[windowNumber integerValue]]; + if ([window isKindOfClass:[WineWindow class]] && [window screen]) + return (WineWindow*)window; + } + + return nil; + } + - (void) sendDisplaysChanged:(BOOL)activating { macdrv_event* event; @@ -1613,10 +1626,6 @@ int macdrv_err_on; */ - (void)applicationDidBecomeActive:(NSNotification *)notification { - WineWindow* window; - WineWindow* firstMinimized; - BOOL anyShowing; - [self activateCursorClipping]; [orderedWineWindows enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ @@ -1625,23 +1634,17 @@ int macdrv_err_on; [window setLevel:[window levelWhenActive]]; }]; - firstMinimized = nil; - anyShowing = FALSE; - for (window in orderedWineWindows) + if (![self frontWineWindow]) { - if ([window isMiniaturized]) - { - if (!firstMinimized) - firstMinimized = window; - } - else if ([window isVisible]) + for (WineWindow* window in [NSApp windows]) { - anyShowing = TRUE; - break; + if ([window isKindOfClass:[WineWindow class]] && [window isMiniaturized]) + { + [window deminiaturize:self]; + break; + } } } - if (!anyShowing && firstMinimized) - [firstMinimized deminiaturize:self]; // If a Wine process terminates abruptly while it has the display captured // and switched to a different resolution, Mac OS X will uncapture the diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3e60c84..6bc6183 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1920,12 +1920,8 @@ int macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, in if (![window isKindOfClass:[WineWindow class]]) { window = (WineWindow*)[NSApp mainWindow]; - if (![window isKindOfClass:[WineWindow class]] && [[NSApp orderedWineWindows] count]) - { - window = [[NSApp orderedWineWindows] objectAtIndex:0]; - if (![window isKindOfClass:[WineWindow class]]) - window = nil; - } + if (![window isKindOfClass:[WineWindow class]]) + window = [[WineApplicationController sharedController] frontWineWindow]; } if (window)

1 0

Ken Thomases : winemac: Consider minimized windows as "on screen" for our purposes.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 6d4098ebd30897833589efa2f5f040ae85a6f673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4098ebd30897833589efa2f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:25 2013 -0500 winemac: Consider minimized windows as "on screen" for our purposes. --- dlls/winemac.drv/cocoa_window.m | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6bc6183..a7b27a6 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -573,6 +573,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setHasShadow:wf->shadow]; } + - (BOOL) isOrderedIn + { + return [self isVisible] || [self isMiniaturized]; + } + - (void) adjustWindowLevel { WineApplicationController* controller = [WineApplicationController sharedController]; @@ -619,14 +624,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) Also, any windows which are supposed to be in front of it had better have the same or higher window level. If not, bump them up. */ - if (index != NSNotFound && [self isVisible]) + if (index != NSNotFound && [self isOrderedIn]) { for (; index > 0; index--) { other = [[controller orderedWineWindows] objectAtIndex:index - 1]; if ([other level] < level) [other setLevelWhenActive:level]; - else + else if ([self isVisible]) { [self orderWindow:NSWindowBelow relativeTo:[other windowNumber]]; break; @@ -654,13 +659,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (state->excluded_by_cycle) { behavior |= NSWindowCollectionBehaviorIgnoresCycle; - if ([self isVisible]) + if ([self isOrderedIn]) [NSApp removeWindowsItem:self]; } else { behavior |= NSWindowCollectionBehaviorParticipatesInCycle; - if ([self isVisible]) + if ([self isOrderedIn]) [NSApp addWindowsItem:self title:[self title] filename:NO]; } [self setCollectionBehavior:behavior]; @@ -756,7 +761,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (BOOL) setFrameIfOnScreen:(NSRect)contentRect { NSArray* screens = [NSScreen screens]; - BOOL on_screen = [self isVisible]; + BOOL on_screen = [self isOrderedIn]; NSRect frame, oldFrame; if (![screens count]) return on_screen; @@ -892,7 +897,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* If a borderless window is offscreen, orderFront: won't move it onscreen like it would for a titled window. Do that ourselves. */ screens = [NSScreen screens]; - if (!([self styleMask] & NSTitledWindowMask) && ![self isVisible] && + if (!([self styleMask] & NSTitledWindowMask) && ![self isOrderedIn] && !frame_intersects_screens([self frame], screens)) { NSScreen* primaryScreen = [screens objectAtIndex:0]; @@ -1482,7 +1487,7 @@ void macdrv_set_cocoa_window_title(macdrv_window w, const unsigned short* title, titleString = @""; OnMainThreadAsync(^{ [window setTitle:titleString]; - if ([window isVisible] && ![window isExcludedFromWindowsMenu]) + if ([window isOrderedIn] && ![window isExcludedFromWindowsMenu]) [NSApp changeWindowsItem:window title:titleString filename:NO]; });

1 0

Ken Thomases : winemac: Set up window' s latent parent-child relationship before ordering the window.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 8343e7ce4dcf91faf2265e10d52e750e3ca5d5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8343e7ce4dcf91faf2265e10d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:31 2013 -0500 winemac: Set up window's latent parent-child relationship before ordering the window. Making a window a child reorders it to be immediately above or below its parent, potentially undoing the ordering we had just done. --- dlls/winemac.drv/cocoa_window.m | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a7b27a6..717bcf6 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -697,6 +697,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { [controller transformProcessToForeground]; + if (latentParentWindow) + { + if ([latentParentWindow level] > [self level]) + [self setLevelWhenActive:[latentParentWindow level]]; + [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [controller wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; + self.latentParentWindow = nil; + } if (prev) { /* Make sure that windows that should be above this one really are. @@ -728,14 +736,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self orderWindow:NSWindowAbove relativeTo:[next windowNumber]]; [controller wineWindow:self ordered:NSWindowAbove relativeTo:next]; } - if (latentParentWindow) - { - if ([latentParentWindow level] > [self level]) - [self setLevelWhenActive:[latentParentWindow level]]; - [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; - [controller wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; - self.latentParentWindow = nil; - } /* Cocoa may adjust the frame when the window is ordered onto the screen. Generate a frame-changed event just in case. The back end will ignore @@ -922,11 +922,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } if (activate) [NSApp activateIgnoringOtherApps:YES]; - [self orderFront:nil]; - [controller wineWindow:self ordered:NSWindowAbove relativeTo:nil]; - causing_becomeKeyWindow = TRUE; - [self makeKeyWindow]; - causing_becomeKeyWindow = FALSE; if (latentParentWindow) { if ([latentParentWindow level] > [self level]) @@ -935,6 +930,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [controller wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } + [self orderFront:nil]; + [controller wineWindow:self ordered:NSWindowAbove relativeTo:nil]; + causing_becomeKeyWindow = TRUE; + [self makeKeyWindow]; + causing_becomeKeyWindow = FALSE; if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO];

1 0