February 2013 - Wine-commits

Marcus Meissner : kernel32: Use the correct pointer size in atl thunk ( Coverity).
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: fc179497bdb7cf852f2dfd3cd89e681b15511a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc179497bdb7cf852f2dfd3cd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 16 17:45:31 2013 +0100 kernel32: Use the correct pointer size in atl thunk (Coverity). --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 05ede34..0344a29 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1569,7 +1569,7 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; BOOL ret = FALSE; - if (!virtual_is_valid_code_address( thunk, sizeof(thunk) )) return FALSE; + if (!virtual_is_valid_code_address( thunk, sizeof(*thunk) )) return FALSE; __TRY {

1 0

Marcus Meissner : ole32: Free *ppszProgID on error path (Coverity).
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 2dbb23c8109e5c82dfe4221a9b95c8c3d586d384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbb23c8109e5c82dfe4221a9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 16 17:46:04 2013 +0100 ole32: Free *ppszProgID on error path (Coverity). --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dc2a02b..17bd7a1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2033,8 +2033,11 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) *ppszProgID = CoTaskMemAlloc(progidlen * sizeof(WCHAR)); if (*ppszProgID) { - if (RegQueryValueW(hkey, NULL, *ppszProgID, &progidlen)) + if (RegQueryValueW(hkey, NULL, *ppszProgID, &progidlen)) { ret = REGDB_E_CLASSNOTREG; + CoTaskMemFree(*ppszProgID); + *ppszProgID = NULL; + } } else ret = E_OUTOFMEMORY;

1 0

Andrew Talbot : msvcp90: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 51a79287c0dd7327e55796e26ed6fe10f8ea3f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a79287c0dd7327e55796e26… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:21 2013 +0000 msvcp90: Avoid signed-unsigned integer comparisons. --- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index eab867b..87ad06e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2533,7 +2533,7 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8b3df21..bacf26c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -195,7 +195,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Andrew Talbot : msi: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 40f3a9fa590b1e4ab785509bb389efbe4f59e964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f3a9fa590b1e4ab785509bb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:17 2013 +0000 msi: Avoid signed-unsigned integer comparisons. --- dlls/msi/package.c | 8 +++++--- dlls/msi/suminfo.c | 2 +- dlls/msi/where.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 385000c..bcda102 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -154,7 +154,6 @@ void msi_free_action_script( MSIPACKAGE *package, UINT script ) static void free_package_structures( MSIPACKAGE *package ) { - INT i; struct list *item, *cursor; LIST_FOR_EACH_SAFE( item, cursor, &package->features ) @@ -283,11 +282,14 @@ static void free_package_structures( MSIPACKAGE *package ) if (package->script) { + INT i; + UINT j; + for (i = 0; i < SCRIPT_MAX; i++) msi_free_action_script( package, i ); - for (i = 0; i < package->script->UniqueActionsCount; i++) - msi_free( package->script->UniqueActions[i] ); + for (j = 0; j < package->script->UniqueActionsCount; j++) + msi_free( package->script->UniqueActions[j] ); msi_free( package->script->UniqueActions ); msi_free( package->script ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index e0c99b8..363f683 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -922,7 +922,7 @@ static UINT parse_prop( LPCWSTR prop, LPCWSTR value, UINT *pid, INT *int_value, UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) { UINT r = ERROR_FUNCTION_FAILED; - DWORD i, j; + int i, j; MSISUMMARYINFO *si; si = MSI_GetSummaryInformationW( db->storage, num_records * (num_columns / 2) ); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 10c4b37..e3bc9b7 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -770,7 +770,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) JOINTABLE *table = wv->tables; UINT *rows; JOINTABLE **ordered_tables; - int i = 0; + UINT i = 0; TRACE("%p %p\n", wv, record); @@ -1052,7 +1052,7 @@ static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns) column_info *column = columns; MSIORDERINFO *orderinfo; UINT r, count = 0; - int i; + UINT i; TRACE("%p %p\n", view, columns);

1 0

Andrew Talbot : mshtml: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: a9200aa99d369fe50d84005aeb51131bee7afa87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9200aa99d369fe50d84005ae… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:13 2013 +0000 mshtml: Avoid signed-unsigned integer comparisons. --- dlls/mshtml/htmlbody.c | 3 ++- dlls/mshtml/htmlevent.c | 13 ++++++++----- dlls/mshtml/main.c | 2 +- dlls/mshtml/nsio.c | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e427fc0..f02264e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -127,7 +127,8 @@ static int loose_hex_to_rgb(const WCHAR *hex) static HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) { - int i, rgb = -1; + unsigned int i; + int rgb = -1; static const WCHAR formatW[] = {'#','%','0','2','x','%','0','2','x','%','0','2','x',0}; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 98e592d..ea0201f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -929,7 +929,6 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; handler_vector_t *handler_vector = NULL; VARIANT v; - int i; HRESULT hres; if(event_target) @@ -966,6 +965,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, if(handler_vector && handler_vector->handler_cnt) { VARIANTARG arg; DISPPARAMS dp = {&arg, NULL, 1, 0}; + int i; V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)event_obj; @@ -1009,16 +1009,18 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, for(cp = cp_container->cp_list; cp; cp = cp->next) { if(cp->sinks_size && is_cp_event(cp->data, event_info[eid].dispid)) { + unsigned int i; + for(i=0; doc->nsevent_listener && i < cp->sinks_size; i++) { if(!cp->sinks[i].disp) continue; V_VT(&v) = VT_EMPTY; - TRACE("cp %s [%d] >>>\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, &v); if(hres == S_OK) { - TRACE("cp %s [%d] <<<\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1030,7 +1032,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } VariantClear(&v); }else { - WARN("cp %s [%d] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); + WARN("cp %s [%u] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); } } @@ -1558,7 +1560,8 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) void release_event_target(event_target_t *event_target) { - int i, j; + int i; + unsigned int j; for(i=0; i < EVENTID_LAST; i++) { if(event_target->event_table[i]) { diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8468f5c..503d738 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -67,7 +67,7 @@ static void thread_detach(void) static void free_strings(void) { - int i; + unsigned int i; for(i = 0; i < sizeof(status_strings)/sizeof(*status_strings); i++) heap_free(status_strings[i]); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 96191f7..1e8f1bb 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3229,7 +3229,7 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { static const char *special_schemes[] = {"chrome:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; - int i; + unsigned int i; for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) { if(!strncasecmp(spec, special_schemes[i], strlen(special_schemes[i])))

1 0

Carlo Bramini : windowsx.h: Fix HANDLE_WM_DISPLAYCHANGE macro.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 8fa295ed879b08ee42945b65abb8cee25def6af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa295ed879b08ee42945b65a… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Feb 17 12:13:10 2013 +0100 windowsx.h: Fix HANDLE_WM_DISPLAYCHANGE macro. --- include/windowsx.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index 0f84622..fa27b49 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -1321,7 +1321,7 @@ extern "C" { /* void Cls_OnDisplayChange(HWND hwnd, UINT bitsPerPixel, UINT cxScreen, UINT cyScreen) */ #define HANDLE_WM_DISPLAYCHANGE(hwnd, wParam, lParam, fn) \ - ((fn)((hwnd), (UINT)(wParam), (UINT)LOWORD(lParam), (UINT)HIWORD(wParam)), 0L) + ((fn)((hwnd), (UINT)(wParam), (UINT)LOWORD(lParam), (UINT)HIWORD(lParam)), 0L) #define FORWARD_WM_DISPLAYCHANGE(hwnd, bitsPerPixel, cxScreen, cyScreen, fn) \ (void)(fn)((hwnd), WM_DISPLAYCHANGE, (WPARAM)(UINT)(bitsPerPixel), (LPARAM)MAKELPARAM((UINT)(cxScreen), (UINT)(cyScreen)))

1 0

Ken Thomases : winemac: Discard old frame changed events when setting frame for off-screen windows , too.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 47352930d8a7caa74d658b8267f3a4add317cd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47352930d8a7caa74d658b826… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:16 2013 -0600 winemac: Discard old frame changed events when setting frame for off-screen windows, too. --- dlls/winemac.drv/cocoa_window.m | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4371110..2247d32 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -445,6 +445,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) 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]; + } return on_screen; }

1 0

Ken Thomases : winemac: Don't set Cocoa window frame to be zero-sized.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: d74e90080ab1b8820d15b84ab3dce6fe9b4c0568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74e90080ab1b8820d15b84ab… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:19 2013 -0600 winemac: Don't set Cocoa window frame to be zero-sized. --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2247d32..d8ea9ed 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -429,14 +429,17 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self doOrderOut]; } - oldFrame = [self frame]; - frame = [self frameRectForContentRect:contentRect]; - if (!NSEqualRects(frame, oldFrame)) + if (!NSIsEmptyRect(contentRect)) { - if (NSEqualSizes(frame.size, oldFrame.size)) - [self setFrameOrigin:frame.origin]; - else - [self setFrame:frame display:YES]; + oldFrame = [self frame]; + frame = [self frameRectForContentRect:contentRect]; + if (!NSEqualRects(frame, oldFrame)) + { + if (NSEqualSizes(frame.size, oldFrame.size)) + [self setFrameOrigin:frame.origin]; + else + [self setFrame:frame display:YES]; + } } if (on_screen)

1 0

Ken Thomases : winemac: Use only on-screen windows for Cocoa parent ( Win32 owner) and ordering sibling.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 3799acb3ac8968353c3d8b2ce23f0834c970a098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3799acb3ac8968353c3d8b2ce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:23 2013 -0600 winemac: Use only on-screen windows for Cocoa parent (Win32 owner) and ordering sibling. --- dlls/winemac.drv/window.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 7a7eda7..65f7955 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -303,10 +303,12 @@ static void release_win_data(struct macdrv_win_data *data) * * Return the Mac window associated with the full area of a window */ -static macdrv_window macdrv_get_cocoa_window(HWND hwnd) +static macdrv_window macdrv_get_cocoa_window(HWND hwnd, BOOL require_on_screen) { struct macdrv_win_data *data = get_win_data(hwnd); - macdrv_window ret = data ? data->cocoa_window : NULL; + macdrv_window ret = NULL; + if (data && (data->on_screen || !require_on_screen)) + ret = data->cocoa_window; release_win_data(data); return ret; } @@ -330,7 +332,7 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); owner = GetWindow(data->hwnd, GW_OWNER); - owner_win = macdrv_get_cocoa_window(owner); + owner_win = macdrv_get_cocoa_window(owner, TRUE); macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win); get_cocoa_window_features(data, style, ex_style, &wf); @@ -698,14 +700,14 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) /* find window that this one must be after */ HWND prev = GetWindow(data->hwnd, GW_HWNDPREV); while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && - (prev_window = macdrv_get_cocoa_window(prev)))) + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) prev = GetWindow(prev, GW_HWNDPREV); if (!prev_window) { /* find window that this one must be before */ next = GetWindow(data->hwnd, GW_HWNDNEXT); while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && - (next_window = macdrv_get_cocoa_window(next)))) + (next_window = macdrv_get_cocoa_window(next, TRUE)))) next = GetWindow(next, GW_HWNDNEXT); } @@ -988,7 +990,7 @@ void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text) TRACE("%p, %s\n", hwnd, debugstr_w(text)); - if ((win = macdrv_get_cocoa_window(hwnd))) + if ((win = macdrv_get_cocoa_window(hwnd, FALSE))) macdrv_set_cocoa_window_title(win, text, strlenW(text)); }

1 0

Ken Thomases : winemac: Track Cocoa windows in a z-ordered list.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: ba86e67792c7056580ce7fefe64d9671ea4f1334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba86e67792c7056580ce7fefe… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:27 2013 -0600 winemac: Track Cocoa windows in a z-ordered list. --- dlls/winemac.drv/cocoa_app.h | 7 ++++ dlls/winemac.drv/cocoa_app.m | 64 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 39 +++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 1166087..f215b11 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -46,10 +46,13 @@ CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; + + NSMutableArray* orderedWineWindows; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; @property (readonly, copy, nonatomic) NSEvent* lastFlagsChanged; +(a)property (readonly, nonatomic) NSArray* orderedWineWindows; - (void) transformProcessToForeground; @@ -63,6 +66,10 @@ - (void) keyboardSelectionDidChange; + - (void) wineWindow:(WineWindow*)window + ordered:(NSWindowOrderingMode)order + relativeTo:(WineWindow*)otherWindow; + @end void OnMainThread(dispatch_block_t block); diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index ae2353b..d26682e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -38,6 +38,7 @@ int macdrv_err_on; @implementation WineApplication @synthesize keyboardType, lastFlagsChanged; + @synthesize orderedWineWindows; - (id) init { @@ -48,8 +49,9 @@ int macdrv_err_on; eventQueuesLock = [[NSLock alloc] init]; keyWindows = [[NSMutableArray alloc] init]; + orderedWineWindows = [[NSMutableArray alloc] init]; - if (!eventQueues || !eventQueuesLock || !keyWindows) + if (!eventQueues || !eventQueuesLock || !keyWindows || !orderedWineWindows) { [self release]; return nil; @@ -60,6 +62,7 @@ int macdrv_err_on; - (void) dealloc { + [orderedWineWindows release]; [keyWindows release]; [eventQueues release]; [eventQueuesLock release]; @@ -251,6 +254,64 @@ int macdrv_err_on; return point; } + - (void) wineWindow:(WineWindow*)window + ordered:(NSWindowOrderingMode)order + relativeTo:(WineWindow*)otherWindow + { + NSUInteger index; + + switch (order) + { + case NSWindowAbove: + [window retain]; + [orderedWineWindows removeObjectIdenticalTo:window]; + if (otherWindow) + { + index = [orderedWineWindows indexOfObjectIdenticalTo:otherWindow]; + if (index == NSNotFound) + index = 0; + } + else + { + index = 0; + for (otherWindow in orderedWineWindows) + { + if ([otherWindow level] <= [window level]) + break; + index++; + } + } + [orderedWineWindows insertObject:window atIndex:index]; + [window release]; + break; + case NSWindowBelow: + [window retain]; + [orderedWineWindows removeObjectIdenticalTo:window]; + if (otherWindow) + { + index = [orderedWineWindows indexOfObjectIdenticalTo:otherWindow]; + if (index == NSNotFound) + index = [orderedWineWindows count]; + } + else + { + index = 0; + for (otherWindow in orderedWineWindows) + { + if ([otherWindow level] < [window level]) + break; + index++; + } + } + [orderedWineWindows insertObject:window atIndex:index]; + [window release]; + break; + case NSWindowOut: + default: + break; + } + } + /* * ---------- NSApplication method overrides ---------- @@ -307,6 +368,7 @@ int macdrv_err_on; usingBlock:^(NSNotification *note){ NSWindow* window = [note object]; [keyWindows removeObjectIdenticalTo:window]; + [orderedWineWindows removeObjectIdenticalTo:window]; }]; [nc addObserver:self diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d8ea9ed..b3ccb92 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -380,12 +380,19 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [NSApp transformProcessToForeground]; if (prev) + { [self orderWindow:NSWindowBelow relativeTo:[prev windowNumber]]; + [NSApp wineWindow:self ordered:NSWindowBelow relativeTo:prev]; + } else + { [self orderWindow:NSWindowAbove relativeTo:[next windowNumber]]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:next]; + } if (latentParentWindow) { [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } @@ -407,6 +414,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [latentParentWindow removeChildWindow:self]; forceNextMouseMoveAbsolute = TRUE; [self orderOut:nil]; + [NSApp wineWindow:self ordered:NSWindowOut relativeTo:nil]; [NSApp removeWindowsItem:self]; } @@ -467,7 +475,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [[self parentWindow] removeChildWindow:self]; self.latentParentWindow = nil; if ([self isVisible] && parent) + { [parent addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:parent]; + } else self.latentParentWindow = parent; } @@ -556,12 +567,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } [self orderFront:nil]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; causing_becomeKeyWindow = TRUE; [self makeKeyWindow]; causing_becomeKeyWindow = FALSE; if (latentParentWindow) { [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } if (![self isExcludedFromWindowsMenu]) @@ -700,6 +713,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { if ([event type] == NSLeftMouseDown) { + NSWindowButton windowButton; + BOOL broughtWindowForward = TRUE; + /* Since our windows generally claim they can't be made key, clicks in their title bars are swallowed by the theme frame stuff. So, we hook directly into the event stream and assume that any click @@ -707,6 +723,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) accept. */ if (![self isKeyWindow] && !self.disabled && !self.noActivate) [NSApp windowGotFocus:self]; + + /* Any left-click on our window anyplace other than the close or + minimize buttons will bring it forward. */ + for (windowButton = NSWindowCloseButton; + windowButton <= NSWindowMiniaturizeButton; + windowButton++) + { + NSButton* button = [[event window] standardWindowButton:windowButton]; + if (button) + { + NSPoint point = [button convertPoint:[event locationInWindow] fromView:nil]; + if ([button mouse:point inRect:[button bounds]]) + { + broughtWindowForward = FALSE; + break; + } + } + } + + if (broughtWindowForward) + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } [super sendEvent:event]; @@ -908,6 +945,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } ignore_windowDeminiaturize = FALSE; + + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } - (void)windowDidMove:(NSNotification *)notification

1 0