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

Alexandre Julliard : mapi32: Don't bother to free libraries at process exit .
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: cbb2792e01395c3c0ee8a6e86d4d8b1e70f1dfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb2792e01395c3c0ee8a6e86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:23:03 2013 +0200 mapi32: Don't bother to free libraries at process exit. --- dlls/mapi32/mapi32_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index e7c1781..0dcc811 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -51,6 +51,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) load_mapi_providers(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); unload_mapi_providers(); break;

1 0

Ken Thomases : winemac: Always call super in -validateMenuItem:; fixes check mark in Windows menu.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: 05c250dfcb394a41ac96c51fcaa40a10f411c2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c250dfcb394a41ac96c51fc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:41:59 2013 -0500 winemac: Always call super in -validateMenuItem:; fixes check mark in Windows menu. --- dlls/winemac.drv/cocoa_window.m | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index daa1e66..3e60c84 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1020,9 +1020,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (BOOL) validateMenuItem:(NSMenuItem *)menuItem { + BOOL ret = [super validateMenuItem:menuItem]; + if ([menuItem action] == @selector(makeKeyAndOrderFront:)) - return [self isKeyWindow] || (!self.disabled && !self.noActivate); - return [super validateMenuItem:menuItem]; + ret = [self isKeyWindow] || (!self.disabled && !self.noActivate); + + return ret; } /* We don't call this. It's the action method of the items in the Window menu. */

1 0

Ken Thomases : winemac: Don't reorder windows if they' re already ordered as requested.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: ef874a8eaa7660a5bbbc762f2f396e0f831280d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef874a8eaa7660a5bbbc762f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:44 2013 -0500 winemac: Don't reorder windows if they're already ordered as requested. This avoids adjusting window levels. It also avoid unnecessarily deinterleaving the windows of this and other processes. --- dlls/winemac.drv/cocoa_window.m | 74 ++++++++++++++++++++++++++++++++++---- 1 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 16244e8..cec86b5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -657,6 +657,55 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) forWindow:self]; } + // Determine if, among Wine windows, this window is directly above or below + // a given other Wine window with no other Wine window intervening. + // Intervening non-Wine windows are ignored. + - (BOOL) isOrdered:(NSWindowOrderingMode)orderingMode relativeTo:(WineWindow*)otherWindow + { + NSNumber* windowNumber; + NSNumber* otherWindowNumber; + NSArray* windowNumbers; + NSUInteger windowIndex, otherWindowIndex, lowIndex, highIndex, i; + + if (![self isVisible] || ![otherWindow isVisible]) + return FALSE; + + windowNumber = [NSNumber numberWithInteger:[self windowNumber]]; + otherWindowNumber = [NSNumber numberWithInteger:[otherWindow windowNumber]]; + windowNumbers = [[self class] windowNumbersWithOptions:0]; + windowIndex = [windowNumbers indexOfObject:windowNumber]; + otherWindowIndex = [windowNumbers indexOfObject:otherWindowNumber]; + + if (windowIndex == NSNotFound || otherWindowIndex == NSNotFound) + return FALSE; + + if (orderingMode == NSWindowAbove) + { + lowIndex = windowIndex; + highIndex = otherWindowIndex; + } + else if (orderingMode == NSWindowBelow) + { + lowIndex = otherWindowIndex; + highIndex = windowIndex; + } + else + return FALSE; + + if (highIndex <= lowIndex) + return FALSE; + + for (i = lowIndex + 1; i < highIndex; i++) + { + NSInteger interveningWindowNumber = [[windowNumbers objectAtIndex:i] integerValue]; + NSWindow* interveningWindow = [NSApp windowWithWindowNumber:interveningWindowNumber]; + if ([interveningWindow isKindOfClass:[WineWindow class]]) + return FALSE; + } + + return TRUE; + } + /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next @@ -665,6 +714,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) BOOL on_screen = frame_intersects_screens([self frame], [NSScreen screens]); if (on_screen) { + BOOL needAdjustWindowLevels = FALSE; + [controller transformProcessToForeground]; NSDisableScreenUpdates(); @@ -675,19 +726,24 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setLevel:[latentParentWindow level]]; [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; self.latentParentWindow = nil; + needAdjustWindowLevels = TRUE; } if (prev || next) { WineWindow* other = [prev isVisible] ? prev : next; NSWindowOrderingMode orderingMode = [prev isVisible] ? NSWindowBelow : NSWindowAbove; - // This window level may not be right for this window based - // on floating-ness, fullscreen-ness, etc. But we set it - // temporarily to allow us to order the windows properly. - // Then the levels get fixed by -adjustWindowLevels. - if ([self level] != [other level]) - [self setLevel:[other level]]; - [self orderWindow:orderingMode relativeTo:[other windowNumber]]; + if (![self isOrdered:orderingMode relativeTo:other]) + { + // This window level may not be right for this window based + // on floating-ness, fullscreen-ness, etc. But we set it + // temporarily to allow us to order the windows properly. + // Then the levels get fixed by -adjustWindowLevels. + if ([self level] != [other level]) + [self setLevel:[other level]]; + [self orderWindow:orderingMode relativeTo:[other windowNumber]]; + needAdjustWindowLevels = TRUE; + } } else { @@ -697,8 +753,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (next && [self level] < [next level]) [self setLevel:[next level]]; [self orderFront:nil]; + needAdjustWindowLevels = TRUE; } - [controller adjustWindowLevels]; + if (needAdjustWindowLevels) + [controller adjustWindowLevels]; NSEnableScreenUpdates();

1 0

Ken Thomases : winemac: In -setFrameIfOnScreen:, don' t adjust window levels if fullscreen-ness didn't change.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: 7a047af6404585f7eeb5b402ea45b6950e635947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a047af6404585f7eeb5b402e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:40 2013 -0500 winemac: In -setFrameIfOnScreen:, don't adjust window levels if fullscreen-ness didn't change. --- dlls/winemac.drv/cocoa_window.m | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ae5f40b..16244e8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -762,7 +762,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (on_screen) { - [[WineApplicationController sharedController] adjustWindowLevels]; + BOOL fullscreen = (screen_covered_by_rect(frame, screens) != nil); + BOOL oldFullscreen = (screen_covered_by_rect(oldFrame, screens) != nil); + + if (fullscreen != oldFullscreen) + [[WineApplicationController sharedController] adjustWindowLevels]; /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */

1 0

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

May 17, 2013

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: Implement simpler way to find front Wine window.
by Alexandre Julliard May 17, 2013

May 17, 2013

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

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

May 17, 2013

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

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

May 17, 2013

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 : wineps.drv: Don' t bother to free memory at process exit.
by Alexandre Julliard May 17, 2013

May 17, 2013

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 : imagehlp: Don't bother to free memory at process exit.
by Alexandre Julliard May 17, 2013

May 17, 2013

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