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

Ken Thomases : winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: c8d4b1cc5e9d69a8dc0e6150d768fc2b02b5ad6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d4b1cc5e9d69a8dc0e6150d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:43:50 2013 -0500 winemac: Order front in -makeKeyAndOrderFront:; we only override to control key status. When we have windows on two different spaces and the user switches between them by clicking our Dock icon, Cocoa inexplicably sends the switched-to window to the back of the z-order. It's only -makeKeyAndOrderFront: that brings it forward again, but our override broke that. --- dlls/winemac.drv/cocoa_window.m | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cec86b5..d2b2547 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1051,8 +1051,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* We don't call this. It's the action method of the items in the Window menu. */ - (void) makeKeyAndOrderFront:(id)sender { + WineApplicationController* controller = [WineApplicationController sharedController]; + WineWindow* front = [controller frontWineWindow]; + if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [[WineApplicationController sharedController] windowGotFocus:self]; + [controller windowGotFocus:self]; + + if (front && [self level] < [front level]) + [self setLevel:[front level]]; + [self orderFront:nil]; + [controller adjustWindowLevels]; } - (void) sendEvent:(NSEvent*)event

1 0

Detlef Riekenberg : user32: The app owns the text buffer memory after an EM_GETHANDLE.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: 40afb51a70ae491011f44dc9e6c1bbf59cf8bd00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40afb51a70ae491011f44dc9e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 3 09:22:43 2013 +0200 user32: The app owns the text buffer memory after an EM_GETHANDLE. --- dlls/user32/edit.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 126ab12..8910748 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -151,6 +151,7 @@ typedef struct HLOCAL hloc32W; /* our unicode local memory block */ HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ + HLOCAL hlocapp; /* The text buffer handle belongs to the app */ /* * IME Data */ @@ -1264,6 +1265,8 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { + if (es->hlocapp) return; + if (!es->text) { if(!es->hloc32W) return; @@ -1305,6 +1308,7 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { + if (es->hlocapp) return; /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) @@ -2485,6 +2489,11 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) hLocal = es->hloc32A; } + EDIT_UnlockBuffer(es, TRUE); + + /* The text buffer handle belongs to the app */ + es->hlocapp = hLocal; + /* The app has knowledge of the text buffer handle */ es->flags |= EF_APP_HAS_HANDLE; TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; @@ -2826,6 +2835,9 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc) es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; + /* The text buffer handle belongs to the control */ + es->hlocapp = NULL; + /* The app has knowledge of the text buffer handle */ es->flags |= EF_APP_HAS_HANDLE; EDIT_LockBuffer(es); @@ -4597,10 +4609,11 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) { LINEDEF *pc, *pp; - if (es->hloc32W) { + /* The app can own the text buffer handle */ + if (es->hloc32W && (es->hloc32W != es->hlocapp)) { LocalFree(es->hloc32W); } - if (es->hloc32A) { + if (es->hloc32A && (es->hloc32A != es->hlocapp)) { LocalFree(es->hloc32A); } EDIT_InvalidateUniscribeData(es);

1 0

Alistair Leslie-Hughes : oledb32: Support VT_NULL when converting to DBTYPE_BSTR.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: d3c3a38f692756b73b9bb1cedbcf22dcbea8be7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c3a38f692756b73b9bb1ced… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 17 12:21:12 2013 +1000 oledb32: Support VT_NULL when converting to DBTYPE_BSTR. --- dlls/oledb32/convert.c | 15 ++++++++++++--- dlls/oledb32/tests/convert.c | 8 ++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 19f46f6..af603e4 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -534,9 +534,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - VariantInit(&tmp); - if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) - *d = V_BSTR(&tmp); + if(V_VT((VARIANT*)src) == VT_NULL) + { + *dst_status = DBSTATUS_S_ISNULL; + *dst_len = get_length(DBTYPE_BSTR); + return S_OK; + } + else + { + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + *d = V_BSTR(&tmp); + } break; default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL; } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 90e1658..6f02899 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -977,6 +977,14 @@ static void test_converttobstr(void) ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); SysFreeString(dst); SysFreeString(b); + + V_VT(&v) = VT_NULL; + dst = (void*)0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == sizeof(BSTR), "got %ld\n", dst_len); + ok(dst == (void*)0x1234, "got %p\n", dst); } static void test_converttowstr(void)

1 0

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

May 17, 2013

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: Centralize adjusting of window levels using the window server's z-order.
by Alexandre Julliard May 17, 2013

May 17, 2013

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

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

May 17, 2013

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

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

May 17, 2013

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

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

May 17, 2013

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

May 17, 2013

Module: wine Branch: master Commit: 2aa3d2b0e193cb50e2c345d28c266f59823da350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa3d2b0e193cb50e2c345d28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:24:41 2013 +0200 setupapi: Don't bother to free libraries at process exit. --- dlls/setupapi/setupcab.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 8fcd989..21336d7 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -114,14 +114,6 @@ static BOOL LoadCABINETDll(void) return TRUE; } -static void UnloadCABINETDll(void) -{ - if (CABINET_hInstance) { - FreeLibrary(CABINET_hInstance); - CABINET_hInstance = 0; - } -} - /* FDICreate callbacks */ static void * CDECL sc_cb_alloc(ULONG cb) @@ -701,7 +693,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) SETUPAPI_hInstance = hinstDLL; break; case DLL_PROCESS_DETACH: - UnloadCABINETDll(); + if (lpvReserved) break; + if (CABINET_hInstance) FreeLibrary(CABINET_hInstance); break; }

1 0

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

May 17, 2013

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