October 2013 - Wine-Commits

Ken Thomases : winemac: Tell Wine when Cocoa has brought a window to the front.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: c043587d56e7950a79bd04ffdefe46143b935e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c043587d56e7950a79bd04ffd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:34 2013 -0500 winemac: Tell Wine when Cocoa has brought a window to the front. --- dlls/winemac.drv/cocoa_app.m | 8 ++++++-- dlls/winemac.drv/cocoa_window.h | 3 +++ dlls/winemac.drv/cocoa_window.m | 31 ++++++++++++++++++++++++++++--- dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 12 ++++++++++++ 7 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 9d33e7f..d0cb18d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1629,8 +1629,12 @@ int macdrv_err_on; macdrv_release_event(event); } - else if (broughtWindowForward && ![window isKeyWindow]) - [self windowGotFocus:window]; + else if (broughtWindowForward) + { + [[window ancestorWineWindow] postBroughtForwardEvent]; + if (![window isKeyWindow]) + [self windowGotFocus:window]; + } } // Since mouse button events deliver absolute cursor position, the diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 4d43ab6..210299e 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -73,5 +73,8 @@ - (void) updateFullscreen; - (void) postKeyEvent:(NSEvent *)theEvent; + - (void) postBroughtForwardEvent; + + - (WineWindow*) ancestorWineWindow; @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 380469c..a48b691 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1268,6 +1268,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } + - (WineWindow*) ancestorWineWindow + { + WineWindow* ancestor = self; + for (;;) + { + WineWindow* parent = (WineWindow*)[ancestor parentWindow]; + if ([parent isKindOfClass:[WineWindow class]]) + ancestor = parent; + else + break; + } + return ancestor; + } + + - (void) postBroughtForwardEvent + { + macdrv_event* event = macdrv_create_event(WINDOW_BROUGHT_FORWARD, self); + [queue postEvent:event]; + macdrv_release_event(event); + } + /* * ---------- NSWindow method overrides ---------- @@ -1313,12 +1334,13 @@ 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 { - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [[WineApplicationController sharedController] windowGotFocus:self]; - if ([self isMiniaturized]) [self deminiaturize:nil]; [self orderBelow:nil orAbove:nil activate:NO]; + [[self ancestorWineWindow] postBroughtForwardEvent]; + + if (![self isKeyWindow] && !self.disabled && !self.noActivate) + [[WineApplicationController sharedController] windowGotFocus:self]; } - (void) sendEvent:(NSEvent*)event @@ -1480,6 +1502,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [controller updateFullscreenWindows]; [controller adjustWindowLevels]; + if (![self parentWindow]) + [self postBroughtForwardEvent]; + if (!self.disabled && !self.noActivate) { causing_becomeKeyWindow = self; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index b9b9778..2b7adb0 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -48,6 +48,7 @@ static const char *dbgstr_event(int type) "RELEASE_CAPTURE", "STATUS_ITEM_MOUSE_BUTTON", "STATUS_ITEM_MOUSE_MOVE", + "WINDOW_BROUGHT_FORWARD", "WINDOW_CLOSE_REQUESTED", "WINDOW_DID_UNMINIMIZE", "WINDOW_FRAME_CHANGED", @@ -111,6 +112,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) { event_mask |= event_mask_for_type(QUERY_EVENT); event_mask |= event_mask_for_type(RELEASE_CAPTURE); + event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); } @@ -234,6 +236,9 @@ void macdrv_handle_event(const macdrv_event *event) case STATUS_ITEM_MOUSE_MOVE: macdrv_status_item_mouse_move(event); break; + case WINDOW_BROUGHT_FORWARD: + macdrv_window_brought_forward(hwnd); + break; case WINDOW_CLOSE_REQUESTED: macdrv_window_close_requested(hwnd); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4a7e259..3c56c35 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -162,6 +162,7 @@ extern void macdrv_app_deactivated(void) DECLSPEC_HIDDEN; extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d99a5ec..1a38b56 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -185,6 +185,7 @@ enum { RELEASE_CAPTURE, STATUS_ITEM_MOUSE_BUTTON, STATUS_ITEM_MOUSE_MOVE, + WINDOW_BROUGHT_FORWARD, WINDOW_CLOSE_REQUESTED, WINDOW_DID_UNMINIMIZE, WINDOW_FRAME_CHANGED, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6e92d13..b49e347 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1862,6 +1862,18 @@ done: } +/*********************************************************************** + * macdrv_window_brought_forward + * + * Handler for WINDOW_BROUGHT_FORWARD events. + */ +void macdrv_window_brought_forward(HWND hwnd) +{ + TRACE("win %p\n", hwnd); + SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); +} + + struct quit_info { HWND *wins; UINT capacity;

1 0

Ken Thomases : winemac: Update the window min/ max size info and enforce it when zooming.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 4d9340eb41b0bbca1c801e032d0440a2257678aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9340eb41b0bbca1c801e032… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:29 2013 -0500 winemac: Update the window min/max size info and enforce it when zooming. --- dlls/winemac.drv/cocoa_window.m | 41 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 4 +++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 13 ++++++++++++ 5 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9b3fa9d..380469c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1616,6 +1616,47 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) forMode:NSRunLoopCommonModes]; } + - (NSRect) windowWillUseStandardFrame:(NSWindow*)window defaultFrame:(NSRect)proposedFrame + { + macdrv_query* query; + NSRect currentContentRect, proposedContentRect, newContentRect, screenRect; + NSSize maxSize; + + query = macdrv_create_query(); + query->type = QUERY_MIN_MAX_INFO; + query->window = (macdrv_window)[self retain]; + [self.queue query:query timeout:0.5]; + macdrv_release_query(query); + + currentContentRect = [self contentRectForFrameRect:[self frame]]; + proposedContentRect = [self contentRectForFrameRect:proposedFrame]; + + maxSize = [self contentMaxSize]; + newContentRect.size.width = MIN(NSWidth(proposedContentRect), maxSize.width); + newContentRect.size.height = MIN(NSHeight(proposedContentRect), maxSize.height); + + // Try to keep the top-left corner where it is. + newContentRect.origin.x = NSMinX(currentContentRect); + newContentRect.origin.y = NSMaxY(currentContentRect) - NSHeight(newContentRect); + + // If that pushes the bottom or right off the screen, pull it up and to the left. + screenRect = [self contentRectForFrameRect:[[self screen] visibleFrame]]; + if (NSMaxX(newContentRect) > NSMaxX(screenRect)) + newContentRect.origin.x = NSMaxX(screenRect) - NSWidth(newContentRect); + if (NSMinY(newContentRect) < NSMinY(screenRect)) + newContentRect.origin.y = NSMinY(screenRect); + + // If that pushes the top or left off the screen, push it down and the right + // again. Do this last because the top-left corner is more important than the + // bottom-right. + if (NSMinX(newContentRect) < NSMinX(screenRect)) + newContentRect.origin.x = NSMinX(screenRect); + if (NSMaxY(newContentRect) > NSMaxY(screenRect)) + newContentRect.origin.y = NSMaxY(screenRect) - NSHeight(newContentRect); + + return [self frameRectForContentRect:newContentRect]; + } + /* * ---------- NSPasteboardOwner methods ---------- diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 515671e..b9b9778 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -158,6 +158,10 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); break; + case QUERY_MIN_MAX_INFO: + TRACE("QUERY_MIN_MAX_INFO\n"); + success = query_min_max_info(hwnd); + break; default: FIXME("unrecognized query type %d\n", query->type); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e2a54cc..4a7e259 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -164,6 +164,7 @@ extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; +extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 63f537e..d99a5ec 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -287,6 +287,7 @@ enum { QUERY_PASTEBOARD_DATA, QUERY_RESIZE_END, QUERY_RESIZE_START, + QUERY_MIN_MAX_INFO, NUM_QUERY_TYPES }; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index efd63d1..1afe294 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2048,3 +2048,16 @@ BOOL query_resize_end(HWND hwnd) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); return TRUE; } + + +/*********************************************************************** + * query_min_max_info + * + * Handler for QUERY_MIN_MAX_INFO query. + */ +BOOL query_min_max_info(HWND hwnd) +{ + TRACE("hwnd %p\n", hwnd); + sync_window_min_max_info(hwnd); + return TRUE; +}

1 0

Ken Thomases : winemac: Use unsigned type for bitfields.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 0e8e45cf99c479dbef4bca491e4f1cc58992c1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8e45cf99c479dbef4bca491… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:21 2013 -0500 winemac: Use unsigned type for bitfields. --- dlls/winemac.drv/macdrv.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e6b5295..e2a54cc 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -131,12 +131,12 @@ struct macdrv_win_data macdrv_view gl_view; /* view for GL */ RECT gl_rect; /* GL view rectangle relative to whole_rect */ COLORREF color_key; /* color key for layered window; CLR_INVALID is not color keyed */ - BOOL on_screen : 1; /* is window ordered in? (minimized or not) */ - BOOL shaped : 1; /* is window using a custom region shape? */ - BOOL layered : 1; /* is window layered and with valid attributes? */ - BOOL ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ - BOOL per_pixel_alpha : 1; /* is window using per-pixel alpha? */ - BOOL minimized : 1; /* is window minimized? */ + unsigned int on_screen : 1; /* is window ordered in? (minimized or not) */ + unsigned int shaped : 1; /* is window using a custom region shape? */ + unsigned int layered : 1; /* is window layered and with valid attributes? */ + unsigned int ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ + unsigned int per_pixel_alpha : 1; /* is window using per-pixel alpha? */ + unsigned int minimized : 1; /* is window minimized? */ struct window_surface *surface; struct window_surface *unminimized_surface; };

1 0

Qian Hong : user32/tests: Added foreground window tests on different desktops.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 5da10c9a0e405c4b502be820ae0385d634306a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da10c9a0e405c4b502be820a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:40:26 2013 +0800 user32/tests: Added foreground window tests on different desktops. --- dlls/user32/tests/winstation.c | 147 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d9b8a0e..f4e86ee 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -717,6 +717,152 @@ todo_wine ok(ret, "CloseDesktop failed!\n"); } +static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_DESTROY) + { + trace("destroying hwnd %p\n", hWnd); + PostQuitMessage(0); + return 0; + } + return DefWindowProcA( hWnd, msg, wParam, lParam ); +} + +typedef struct tag_wnd_param +{ + const char *wnd_name; + HWND hwnd; + HDESK hdesk; + HANDLE hevent; +} wnd_param; + +static DWORD WINAPI create_window(LPVOID param) +{ + wnd_param *param1 = param; + DWORD ret; + MSG msg; + + ret = SetThreadDesktop(param1->hdesk); + ok(ret, "SetThreadDesktop failed!\n"); + param1->hwnd = CreateWindowA("test_class", param1->wnd_name, WS_POPUP, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(param1->hwnd != 0, "CreateWindowA failed!\n"); + ret = SetEvent(param1->hevent); + ok(ret, "SetEvent failed!\n"); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return 0; +} + +static void test_foregroundwindow(void) +{ + HWND hwnd, hwnd_test, partners[2], hwnds[2]; + HDESK hdesks[2]; + int thread_desk_id, input_desk_id, hwnd_id; + WNDCLASSA wclass; + wnd_param param; + DWORD ret; + +#define DESKTOPS 2 + + memset( &wclass, 0, sizeof(wclass) ); + wclass.lpszClassName = "test_class"; + wclass.lpfnWndProc = WndProc; + RegisterClassA(&wclass); + param.wnd_name = "win_name"; + + hdesks[0] = GetThreadDesktop(GetCurrentThreadId()); + ok(hdesks[0] != NULL, "OpenDesktop failed!\n"); + hdesks[1] = CreateDesktop("desk2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(hdesks[1] != NULL, "CreateDesktop failed!\n"); + + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + { + param.hdesk = hdesks[thread_desk_id]; + param.hevent = CreateEventA(NULL, TRUE, FALSE, NULL); + CreateThread(NULL, 0, create_window, &param, 0, NULL); + ret = WaitForSingleObject(param.hevent, INFINITE); + ok(ret == WAIT_OBJECT_0, "wait failed!\n"); + hwnds[thread_desk_id] = param.hwnd; + } + + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + { + param.hdesk = hdesks[thread_desk_id]; + param.hevent = CreateEventA(NULL, TRUE, FALSE, NULL); + CreateThread(NULL, 0, create_window, &param, 0, NULL); + ret = WaitForSingleObject(param.hevent, INFINITE); + ok(ret == WAIT_OBJECT_0, "wait failed!\n"); + partners[thread_desk_id] = param.hwnd; + } + + trace("hwnd0 %p hwnd1 %p partner0 %p partner1 %p\n", hwnds[0], hwnds[1], partners[0], partners[1]); + + for (hwnd_id = 0; hwnd_id < DESKTOPS; hwnd_id++) + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + for (input_desk_id = 0; input_desk_id < DESKTOPS; input_desk_id++) + { + trace("testing thread_desk %d input_desk %d hwnd %d\n", + thread_desk_id, input_desk_id, hwnd_id); + hwnd_test = hwnds[hwnd_id]; + ret = SetThreadDesktop(hdesks[thread_desk_id]); + ok(ret, "set thread desktop failed!\n"); + ret = SwitchDesktop(hdesks[input_desk_id]); + ok(ret, "switch desktop failed!\n"); + SetForegroundWindow(partners[0]); + SetForegroundWindow(partners[1]); + hwnd = GetForegroundWindow(); + ok(hwnd != hwnd_test, "unexpected foreground window %p\n", hwnd); + ret = SetForegroundWindow(hwnd_test); + Sleep(250); + hwnd = GetForegroundWindow(); + if (input_desk_id == hwnd_id) + { + if (input_desk_id == thread_desk_id) + { + ok(ret, "SetForegroundWindow failed!\n"); + ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); + } + else + { + todo_wine ok(ret, "SetForegroundWindow failed!\n"); + todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + } + } + else + { + if (input_desk_id == thread_desk_id) + { + ok(!ret, "SetForegroundWindow should fail!\n"); + ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); + } + else + { + todo_wine ok(!ret, "SetForegroundWindow should fail!\n"); + todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + } + } + } + + /* Clean up */ + + for (thread_desk_id = DESKTOPS - 1; thread_desk_id >= 0; thread_desk_id--) + { + ret = SetThreadDesktop(hdesks[thread_desk_id]); + ok(ret, "set thread desktop failed!\n"); + SendMessage(hwnds[thread_desk_id], WM_DESTROY, 0, 0); + SendMessage(partners[thread_desk_id], WM_DESTROY, 0, 0); + } + + ret = SwitchDesktop(hdesks[0]); + ok(ret, "switch desktop failed!\n"); + CloseDesktop(hdesks[1]); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -735,4 +881,5 @@ START_TEST(winstation) test_enumdesktops(); test_handles(); test_getuserobjectinformation(); + test_foregroundwindow(); }

1 0

Ken Thomases : winemac: Only update window minimized state when it has changed from what processed events told us it was .
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: dd59ab26fe83176f71979f624490a682bb22cb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd59ab26fe83176f71979f624… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:24 2013 -0500 winemac: Only update window minimized state when it has changed from what processed events told us it was. This fixes a problem where windows could spontaneously re-minimize after being unminimized. Cocoa would see the window unminimize. It would queue a WINDOW_DID_UNMINIMIZE event. While that event was pending, Wine might do something which caused set_cocoa_window_properties() to be called and tell Cocoa to conform itself to the current Win32 state. The current Win32 state still had the window minimized, so Cocoa would re-minimize the window. It would even discard the WINDOW_DID_UNMINIMIZE event. --- dlls/winemac.drv/cocoa_window.m | 33 ++++++++++++++++++--------------- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 4 +++- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0726964..ede86d5 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -685,23 +685,26 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } [self setCollectionBehavior:behavior]; - pendingMinimize = FALSE; - if (state->minimized && ![self isMiniaturized]) + if (state->minimized_valid) { - if ([self isVisible]) - [super miniaturize:nil]; - else - pendingMinimize = TRUE; - } - else if (!state->minimized && [self isMiniaturized]) - { - ignore_windowDeminiaturize = TRUE; - [self deminiaturize:nil]; - } + pendingMinimize = FALSE; + if (state->minimized && ![self isMiniaturized]) + { + if ([self isVisible]) + [super miniaturize:nil]; + else + pendingMinimize = TRUE; + } + else if (!state->minimized && [self isMiniaturized]) + { + ignore_windowDeminiaturize = TRUE; + [self deminiaturize:nil]; + } - /* Whatever events regarding minimization might have been in the queue are now stale. */ - [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_DID_UNMINIMIZE) - forWindow:self]; + /* Whatever events regarding minimization might have been in the queue are now stale. */ + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_DID_UNMINIMIZE) + forWindow:self]; + } } - (BOOL) addChildWineWindow:(WineWindow*)child assumeVisible:(BOOL)assumeVisible diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 789e46d..63f537e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -362,6 +362,7 @@ struct macdrv_window_state { unsigned int excluded_by_expose:1; unsigned int excluded_by_cycle:1; unsigned int minimized:1; + unsigned int minimized_valid:1; }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 2c71a1e..efd63d1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -115,6 +115,7 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, if (IsRectEmpty(&data->window_rect)) state->excluded_by_expose = TRUE; state->minimized = (style & WS_MINIMIZE) != 0; + state->minimized_valid = state->minimized != data->minimized; } @@ -312,7 +313,8 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) get_cocoa_window_state(data, style, ex_style, &state); macdrv_set_cocoa_window_state(data->cocoa_window, &state); - data->minimized = state.minimized; + if (state.minimized_valid) + data->minimized = state.minimized; }

1 0

Qian Hong : user32/tests: Added input desktop tests on different winstations.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 43e1df02d2fdb0f4a3aa3d273e9666dfe5f74b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e1df02d2fdb0f4a3aa3d273… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:40:13 2013 +0800 user32/tests: Added input desktop tests on different winstations. --- dlls/user32/tests/winstation.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 560b34f..d9b8a0e 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -652,6 +652,71 @@ todo_wine ok(ret, "CloseDesktop failed!\n"); } +static void test_inputdesktop2(void) +{ + HWINSTA w1, w2; + HDESK thread_desk, new_desk, input_desk, hdesk; + DWORD ret; + + thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(thread_desk != NULL, "GetThreadDesktop failed!\n"); + w1 = GetProcessWindowStation(); + ok(w1 != NULL, "GetProcessWindowStation failed!\n"); + w2 = CreateWindowStation("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); + ok(w2 != NULL, "CreateWindowStation failed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + ok(!ret, "EnumDesktopsA failed!\n"); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); +todo_wine + ok(input_desk != NULL, "OpenInputDesktop failed!\n"); + ret = CloseDesktop(input_desk); +todo_wine + ok(ret, "CloseDesktop failed!\n"); + + ret = SetProcessWindowStation(w2); + ok(ret, "SetProcessWindowStation failed!\n"); + hdesk = GetThreadDesktop(GetCurrentThreadId()); + ok(hdesk != NULL, "GetThreadDesktop failed!\n"); + ok(hdesk == thread_desk, "thread desktop should not change after winstation changed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + + new_desk = CreateDesktop("desk_test", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(new_desk != NULL, "CreateDesktop failed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + ok(!ret, "EnumDesktopsA failed!\n"); + SetLastError(0xdeadbeef); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); + ok(input_desk == NULL, "OpenInputDesktop should fail on non default winstation!\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_FUNCTION || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + + hdesk = OpenDesktop("desk_test", 0, TRUE, DESKTOP_ALL_ACCESS); + ok(hdesk != NULL, "OpenDesktop failed!\n"); + SetLastError(0xdeadbeef); + ret = SwitchDesktop(hdesk); +todo_wine + ok(!ret, "Switch to desktop belong to non default winstation should fail!\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + ret = SetThreadDesktop(hdesk); + ok(ret, "SetThreadDesktop failed!\n"); + + /* clean side effect */ + ret = SetThreadDesktop(thread_desk); +todo_wine + ok(ret, "SetThreadDesktop should success even desktop is not belong to process winstation!\n"); + ret = SetProcessWindowStation(w1); + ok(ret, "SetProcessWindowStation failed!\n"); + ret = SetThreadDesktop(thread_desk); + ok(ret, "SetThreadDesktop failed!\n"); + ret = CloseWindowStation(w2); + ok(ret, "CloseWindowStation failed!\n"); + ret = CloseDesktop(new_desk); + ok(ret, "CloseDesktop failed!\n"); + ret = CloseDesktop(hdesk); + ok(ret, "CloseDesktop failed!\n"); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -665,6 +730,7 @@ START_TEST(winstation) } test_inputdesktop(); + test_inputdesktop2(); test_enumstations(); test_enumdesktops(); test_handles();

1 0

Alexandre Julliard : configure: Correctly install binaries even when the tools are disabled.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 62beaad8737b7aac7acc2352933c02e33c1aa9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=62beaad8737b7aac7acc23529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 7 13:12:25 2013 +0200 configure: Correctly install binaries even when the tools are disabled. --- aclocal.m4 | 14 +++++++------- configure | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5240a52..3de9199 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -557,23 +557,23 @@ __uninstall__: $ac_dir/__uninstall__" $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" - if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name +"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi - if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) diff --git a/configure b/configure index b53ae91..56f2fab 100755 --- a/configure +++ b/configure @@ -16474,23 +16474,23 @@ __uninstall__: $ac_dir/__uninstall__" $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" - if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name +"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi - if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)

1 0

Frédéric Delanoy : mscoree: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 1214fb41dd2040a3269e60790668ffd064959cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1214fb41dd2040a3269e60790… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:39 2013 +0200 mscoree: Use BOOL type where appropriate. --- dlls/mscoree/corruntimehost.c | 6 +++--- dlls/mscoree/metahost.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 76b7d65..14854d1 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -60,7 +60,7 @@ static struct list dll_fixups; struct dll_fixup { struct list entry; - int done; + BOOL done; HMODULE dll; void *thunk_code; /* pointer into dll_fixup_heap */ VTableFixup *fixup; @@ -939,7 +939,7 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) } } - fixup->done = 1; + fixup->done = TRUE; } if (info != NULL) @@ -972,7 +972,7 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) fixup->thunk_code = HeapAlloc(dll_fixup_heap, 0, sizeof(struct vtable_fixup_thunk) * vtable_fixup->count); fixup->fixup = vtable_fixup; fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva; - fixup->done = 0; + fixup->done = FALSE; if (vtable_fixup->type & COR_VTABLE_32BIT) { diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 519e991..f6558d9 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -59,7 +59,7 @@ static struct CLRRuntimeInfo runtimes[NUM_RUNTIMES] = { {{&CLRRuntimeInfoVtbl}, net_40_subdir, 4, 0, 30319, 0} }; -static int runtimes_initialized; +static BOOL runtimes_initialized = FALSE; static CRITICAL_SECTION runtime_list_cs; static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = @@ -818,7 +818,7 @@ static void find_runtimes(void) runtimes[i].mono_abi_version = -1; } - runtimes_initialized = 1; + runtimes_initialized = TRUE; end: LeaveCriticalSection(&runtime_list_cs); @@ -1335,7 +1335,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (config_file) { - int found=0; + BOOL found = FALSE; hr = parse_config_file(config_file, &parsed_config); if (SUCCEEDED(hr)) @@ -1346,7 +1346,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, hr = CLRMetaHost_GetRuntime(0, entry->version, &IID_ICLRRuntimeInfo, (void**)result); if (SUCCEEDED(hr)) { - found = 1; + found = TRUE; break; } }

1 0

Alexandre Julliard : configure: Simplify the generation of the install and clean rules.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 204105ade494c93d6cce1026058b7bbc30b0b799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204105ade494c93d6cce10260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:31:33 2013 +0200 configure: Simplify the generation of the install and clean rules. --- Make.rules.in | 2 +- aclocal.m4 | 120 +++++++++++++++++++++++++--------------------- configure | 130 ++++++++++++++++++++++++++------------------------ tools/make_makefiles | 8 +++ 4 files changed, 142 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=204105ade494c93d6cce1…

1 0

Alexandre Julliard : winspool: Store generic. ppd in a resource instead of depending on an external file.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 8c959d6c560563d1c7b746e5e28e7245d0b34b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c959d6c560563d1c7b746e5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 12:54:38 2013 +0200 winspool: Store generic.ppd in a resource instead of depending on an external file. --- configure | 5 +-- configure.ac | 3 +- dlls/wineps.drv/Makefile.in | 10 ----- dlls/{wineps.drv => winspool.drv}/generic.ppd | 0 dlls/winspool.drv/info.c | 48 ++++++++++++++---------- dlls/winspool.drv/winspool.rc | 3 ++ 6 files changed, 33 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 24ed2a8..c25d104 100755 --- a/configure +++ b/configure @@ -16598,8 +16598,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS -ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" -test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" @@ -17228,7 +17226,7 @@ wine_fn_config_dll winemac.drv enable_winemac_drv wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv -wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po +wine_fn_config_dll wineps.drv enable_wineps_drv po wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder wine_fn_config_dll winex11.drv enable_winex11_drv @@ -18217,7 +18215,6 @@ do "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; "dlls/shell32/AUTHORS") CONFIG_LINKS="$CONFIG_LINKS dlls/shell32/AUTHORS:AUTHORS" ;; - "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; diff --git a/configure.ac b/configure.ac index a508f8b..763889b 100644 --- a/configure.ac +++ b/configure.ac @@ -2617,7 +2617,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile]) WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) -WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) @@ -3198,7 +3197,7 @@ WINE_CONFIG_DLL(winemac.drv) WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) -WINE_CONFIG_DLL(wineps.drv,,[install-lib,po]) +WINE_CONFIG_DLL(wineps.drv,,[po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineqtdecoder) WINE_CONFIG_DLL(winex11.drv) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index bd810f9..3775f28 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -67,13 +67,3 @@ RC_SRCS = wineps.rc EXTRASUBDIRS = data @MAKE_DLL_RULES@ - -install-ppd:: $(DESTDIR)$(datadir)/wine dummy - $(INSTALL_DATA) $(srcdir)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd - -.PHONY: install-ppd - -(a)WOW64_DISABLE@ install install-lib:: install-ppd - -uninstall:: - $(RM) $(DESTDIR)$(datadir)/wine/generic.ppd diff --git a/dlls/wineps.drv/generic.ppd b/dlls/winspool.drv/generic.ppd similarity index 100% rename from dlls/wineps.drv/generic.ppd rename to dlls/winspool.drv/generic.ppd diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2ab2401..ed4b314 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -646,7 +646,6 @@ static char *get_fallback_ppd_name( const char *printer_name ) HKEY hkey; DWORD needed, type; char *ret = NULL; - const char *data_dir, *filename; if (RegOpenKeyW( HKEY_CURRENT_USER, ppds_key, &hkey ) == ERROR_SUCCESS ) { @@ -666,22 +665,7 @@ static char *get_fallback_ppd_name( const char *printer_name ) RegCloseKey( hkey ); if (ret) return expand_env_string( ret, type ); } - - if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; - else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; - else - { - ERR( "Error getting PPD file name for printer '%s'\n", debugstr_a(printer_name) ); - return NULL; - } - ret = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + strlen(filename) + 1 ); - if (ret) - { - strcpy( ret, data_dir ); - strcat( ret, filename ); - } - - return ret; + return NULL; } static BOOL copy_file( const char *src, const char *dst ) @@ -707,15 +691,39 @@ fail: return ret; } +static BOOL get_internal_fallback_ppd( const WCHAR *ppd ) +{ + static const WCHAR typeW[] = {'P','P','D','F','I','L','E',0}; + + char *ptr, *end; + DWORD size, written; + HANDLE file; + BOOL ret; + HRSRC res = FindResourceW( WINSPOOL_hInstance, MAKEINTRESOURCEW(1), typeW ); + + if (!res || !(ptr = LoadResource( WINSPOOL_hInstance, res ))) return FALSE; + size = SizeofResource( WINSPOOL_hInstance, res ); + end = memchr( ptr, 0, size ); /* resource file may contain additional nulls */ + if (end) size = end - ptr; + file = CreateFileW( ppd, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0 ); + if (file == INVALID_HANDLE_VALUE) return FALSE; + ret = WriteFile( file, ptr, size, &written, NULL ) && written == size; + CloseHandle( file ); + if (ret) TRACE( "using internal fallback for %s\n", debugstr_w( ppd )); + else DeleteFileW( ppd ); + return ret; +} + static BOOL get_fallback_ppd( const char *printer_name, const WCHAR *ppd ) { - char *src = get_fallback_ppd_name( printer_name ); - char *dst = wine_get_unix_file_name( ppd ); + char *dst, *src = get_fallback_ppd_name( printer_name ); BOOL ret = FALSE; + if (!src) return get_internal_fallback_ppd( ppd ); + TRACE( "(%s %s) found %s\n", debugstr_a(printer_name), debugstr_w(ppd), debugstr_a(src) ); - if (!src || !dst) goto fail; + if (!(dst = wine_get_unix_file_name( ppd ))) goto fail; if (symlink( src, dst ) == -1) if (errno != ENOSYS || !copy_file( src, dst )) diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index 9b88b8d..6936353 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -42,6 +42,9 @@ END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: generic.ppd */ +1 PPDFILE generic.ppd + #define WINE_FILENAME_STR "winspool.drv" #define WINE_FILEDESCRIPTION_STR "Wine core printer driver"

1 0