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

Ken Thomases : winemac: Use window server' s window list to find next window to offer focus to.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 0d4a26eff5b0765dc3ae8ad4562b1f1d6c8998cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4a26eff5b0765dc3ae8ad45… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:28 2013 -0500 winemac: Use window server's window list to find next window to offer focus to. ... rather than our orderedWineWindows array, which is going away. --- dlls/winemac.drv/cocoa_app.m | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 67984cd..74eff00 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -322,9 +322,21 @@ int macdrv_err_on; { if (event->window_got_focus.serial == windowFocusSerial) { + NSMutableArray* windows = [keyWindows mutableCopy]; + NSNumber* windowNumber; + WineWindow* window; + + for (windowNumber in [NSWindow windowNumbersWithOptions:NSWindowNumberListAllSpaces]) + { + window = (WineWindow*)[NSApp windowWithWindowNumber:[windowNumber integerValue]]; + if ([window isKindOfClass:[WineWindow class]] && [window screen] && + ![windows containsObject:window]) + [windows addObject:window]; + } + triedWindows = (NSMutableSet*)event->window_got_focus.tried_windows; [triedWindows addObject:(WineWindow*)event->window]; - for (NSWindow* window in [keyWindows arrayByAddingObjectsFromArray:[self orderedWineWindows]]) + for (window in windows) { if (![triedWindows containsObject:window] && [window canBecomeKeyWindow]) { @@ -333,6 +345,7 @@ int macdrv_err_on; } } triedWindows = nil; + [windows release]; } }

1 0

Ken Thomases : winemac: Centralize adjusting of window levels using the window server's z-order.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 27510fae8e9c77dcdd3fb922a5eed2b98950fc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27510fae8e9c77dcdd3fb922a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:33 2013 -0500 winemac: Centralize adjusting of window levels using the window server's z-order. --- dlls/winemac.drv/cocoa_app.h | 7 +- dlls/winemac.drv/cocoa_app.m | 198 +++++++++++++++++++++++--------------- dlls/winemac.drv/cocoa_window.h | 5 +- dlls/winemac.drv/cocoa_window.m | 200 +++++++++++++-------------------------- 4 files changed, 186 insertions(+), 224 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27510fae8e9c77dcdd3fb…

1 0

Ken Thomases : winemac: In -setFrameIfOnScreen:, avoid some work if the frame didn't change.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 94746f1d2dfc2067b95548cce329e913b70181e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94746f1d2dfc2067b95548cce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:37 2013 -0500 winemac: In -setFrameIfOnScreen:, avoid some work if the frame didn't change. --- dlls/winemac.drv/cocoa_window.m | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 57d6e5d..ae5f40b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -727,7 +727,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { NSArray* screens = [NSScreen screens]; BOOL on_screen = [self isOrderedIn]; - NSRect frame, oldFrame; if (![screens count]) return on_screen; @@ -742,8 +741,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self doOrderOut]; } + /* The back end is establishing a new window size and position. It's + not interested in any stale events regarding those that may be sitting + in the queue. */ + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) + forWindow:self]; + if (!NSIsEmptyRect(contentRect)) { + NSRect frame, oldFrame; + oldFrame = [self frame]; frame = [self frameRectForContentRect:contentRect]; if (!NSEqualRects(frame, oldFrame)) @@ -752,24 +759,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setFrameOrigin:frame.origin]; else [self setFrame:frame display:YES]; - } - } - if (on_screen) - { - [[WineApplicationController sharedController] adjustWindowLevels]; + if (on_screen) + { + [[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. */ - [self windowDidResize:nil]; - } - else - { - /* The back end is establishing a new window size and position. It's - not interested in any stale events regarding those that may be sitting - in the queue. */ - [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) - forWindow:self]; + /* 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. */ + [self windowDidResize:nil]; + } + } } return on_screen;

1 0

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

17 May '13

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: Don't reorder windows if they' re already ordered as requested.
by Alexandre Julliard 17 May '13

17 May '13

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

Jacek Caban : winegecko.php: Added 2.21 release.
by Alexandre Julliard 17 May '13

17 May '13

Module: tools Branch: master Commit: c432bea2ddd7bc484b92fea0ea3b10f480b4888e URL: http://source.winehq.org/git/tools.git/?a=commit;h=c432bea2ddd7bc484b92fea0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 17 12:34:15 2013 +0200 winegecko.php: Added 2.21 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 34f0f36..963966f 100644 --- a/winegecko.php +++ b/winegecko.php @@ -74,7 +74,9 @@ $aFileSizes = array( '1.9-x86'=>19060224, '1.9-x86_64'=>19622400, '2.21-beta1-x86'=>20875264, - '2.21-beta1-x86_64'=>21648896 + '2.21-beta1-x86_64'=>21648896, + '2.21-x86'=>20871680, + '2.21-x86_64'=>21646336 ); // Exact size of the file:

1 0

Andrew Eikum : oleaut32: Also search local typeinfos in ITypeInfo:: GetRefTypeInfo.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 70ed25fa1a342733fcef1e638fe4b140849dfb30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ed25fa1a342733fcef1e638… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 16 09:30:38 2013 -0500 oleaut32: Also search local typeinfos in ITypeInfo::GetRefTypeInfo. --- dlls/oleaut32/typelib.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6a2a594..9ffcaaa 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7089,6 +7089,19 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( result = ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &href_dispatch, ppTInfo); } else { TLBRefType *ref_type; + UINT i; + + for(i = 0; i < This->pTypeLib->TypeInfoCount; ++i) + { + if (This->pTypeLib->typeinfos[i]->hreftype == hRefType) + { + result = S_OK; + *ppTInfo = (ITypeInfo*)This->pTypeLib->typeinfos[i]; + ITypeInfo_AddRef(*ppTInfo); + goto end; + } + } + LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry) { if(ref_type->reference == hRefType)

1 0

Daniel Jelinski : wbemprox: Return success if only one result requested from enum.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 8117ca9c61bc144b1da50c32fcb11849a2aecca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8117ca9c61bc144b1da50c32f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 15 22:19:12 2013 +0200 wbemprox: Return success if only one result requested from enum. --- dlls/wbemprox/class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index d516efb..a02b325 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -130,7 +130,7 @@ static HRESULT WINAPI enum_class_object_Next( ec->index++; *puReturned = 1; - if (ec->index == view->count) return WBEM_S_FALSE; + if (ec->index == view->count && uCount > 1) return WBEM_S_FALSE; if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; }

1 0

Daniel Jelinski : wbemprox: Add CIM_LogicalDisk class, forward to Win32_LogicalDisk.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 450617ecfca5711f1c9b5a801b29e241769bdab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=450617ecfca5711f1c9b5a801… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 15 22:39:05 2013 +0200 wbemprox: Add CIM_LogicalDisk class, forward to Win32_LogicalDisk. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fe3fb98..e5a4e37 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +static const WCHAR class_logicaldisk2W[] = + {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_baseboardW[] = {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; static const WCHAR class_biosW[] = @@ -1447,6 +1449,7 @@ static struct table builtin_classes[] = { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, NULL, fill_diskpartition }, + { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os },

1 0

Jacek Caban : vbscript: Round half to even in to_int.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 48a862306288d69d3623d5ecdc0f5a5a40addafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a862306288d69d3623d5ecd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 11:26:17 2013 +0200 vbscript: Round half to even in to_int. Spotted by Zhan Jianyu. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4a5a277..392b88f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -150,12 +150,20 @@ static HRESULT to_int(VARIANT *v, int *ret) *ret = V_I4(v); break; case VT_R8: { - double n = round(V_R8(v)); + double n = floor(V_R8(v)+0.5); + INT32 i; + if(!is_int32(n)) { FIXME("%lf is out of int range\n", n); return E_FAIL; } - *ret = n; + + /* Round half to even */ + i = n; + if(i%2 && n-V_R8(v) == 0.5) + i--; + + *ret = i; break; } case VT_BOOL: diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0aaeefb..b6d8cd5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -134,6 +134,8 @@ Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) Call ok(Chr(0) <> "", "Chr(0) = """"") +Call ok(Chr(120.5) = "x", "Chr(120.5) = " & Chr(120.5)) +Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass @@ -292,6 +294,9 @@ Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") +Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") +Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") +Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) @@ -310,6 +315,8 @@ TestLeft "test", 2, "te" TestLeft "test", 5, "test" TestLeft "test", 0, "" TestLeft 123, 2, "12" +TestLeft "123456", 1.5, "12" +TestLeft "123456", 2.5, "12" if isEnglishLang then TestLeft true, 2, "Tr" Sub TestRight(str, len, ex) @@ -383,6 +390,8 @@ if isEnglishLang then Call ok(WeekDayName(1, 10) = "Sun", "WeekDayName(1, 10) = " & WeekDayName(1, 10)) Call ok(WeekDayName(1, true, 0) = "Sun", "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) + Call ok(WeekDayName(1, true, 2.5) = "Mon", "WeekDayName(1, true, 2.5) = " & WeekDayName(1, true, 2.5)) + Call ok(WeekDayName(1, true, 1.5) = "Mon", "WeekDayName(1, true, 1.5) = " & WeekDayName(1, true, 1.5)) Call ok(WeekDayName(1, true, 7) = "Sat", "WeekDayName(1, true, 7) = " & WeekDayName(1, true, 7)) Call ok(WeekDayName(1, true, 7.1) = "Sat", "WeekDayName(1, true, 7.1) = " & WeekDayName(1, true, 7.1))

1 0