October 2013 - Wine-commits

Ken Thomases : winemac: Don' t accidentally clear Cocoa window style mask bits.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: bdcb8138fe5549071eb3339ced67180b00bafb5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcb8138fe5549071eb3339ce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:27 2013 -0500 winemac: Don't accidentally clear Cocoa window style mask bits. --- dlls/winemac.drv/cocoa_window.m | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ede86d5..9b3fa9d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -569,8 +569,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { + static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | + NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask; NSUInteger currentStyle = [self styleMask]; - NSUInteger newStyle = style_mask_for_features(wf); + NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles); if (newStyle != currentStyle) {

1 0

Ken Thomases : winemac: Update the window min/ max size info and enforce it when zooming.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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: Only update window minimized state when it has changed from what processed events told us it was .
by Alexandre Julliard 08 Oct '13

08 Oct '13

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

Ken Thomases : winemac: If the app doesn't specify a custom max. tracking size, don't restrict Cocoa.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 9779f0ace4c4f5a0e361b6d6c2c6b9d1b92d058a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9779f0ace4c4f5a0e361b6d6c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:31 2013 -0500 winemac: If the app doesn't specify a custom max. tracking size, don't restrict Cocoa. --- dlls/winemac.drv/window.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 1afe294..6e92d13 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -479,8 +479,6 @@ static void sync_window_min_max_info(HWND hwnd) WINDOWPLACEMENT wpl; HMONITOR monitor; struct macdrv_win_data *data; - RECT min_rect, max_rect; - CGSize min_size, max_size; TRACE("win %p\n", hwnd); @@ -573,12 +571,22 @@ static void sync_window_min_max_info(HWND hwnd) if ((data = get_win_data(hwnd)) && data->cocoa_window) { + RECT min_rect, max_rect; + CGSize min_size, max_size; + SetRect(&min_rect, 0, 0, minmax.ptMinTrackSize.x, minmax.ptMinTrackSize.y); - SetRect(&max_rect, 0, 0, minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y); macdrv_window_to_mac_rect(data, style, &min_rect); - macdrv_window_to_mac_rect(data, style, &max_rect); min_size = CGSizeMake(min_rect.right - min_rect.left, min_rect.bottom - min_rect.top); - max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); + + if (minmax.ptMaxTrackSize.x == GetSystemMetrics(SM_CXMAXTRACK) && + minmax.ptMaxTrackSize.y == GetSystemMetrics(SM_CYMAXTRACK)) + max_size = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX); + else + { + SetRect(&max_rect, 0, 0, minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y); + macdrv_window_to_mac_rect(data, style, &max_rect); + max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); + } TRACE("min_size (%g,%g) max_size (%g,%g)\n", min_size.width, min_size.height, max_size.width, max_size.height); macdrv_set_window_min_max_sizes(data->cocoa_window, min_size, max_size);

1 0

Ken Thomases : winemac: Tell Wine when Cocoa has brought a window to the front.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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

Piotr Caban : riched20: Fix loop condition while processing control content in WM_CREATE.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: d31048f0aecadfd6d9698ca9c8ac1d947470ab5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31048f0aecadfd6d9698ca9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 8 13:17:05 2013 +0200 riched20: Fix loop condition while processing control content in WM_CREATE. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4e3d978..e70bbbe 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4039,7 +4039,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (!(editor->styleFlags & ES_MULTILINE)) { len = 0; - while(textW[len] != '0' && textW[len] != '\r' && textW[len] != '\n') + while(textW[len] != '\0' && textW[len] != '\r' && textW[len] != '\n') len++; } ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle);

1 0

Frédéric Delanoy : riched20/tests: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: c388cce8aa75a4c724a51d956844c08d06744366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c388cce8aa75a4c724a51d956… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:38 2013 +0200 riched20/tests: Use BOOL type where appropriate. --- dlls/riched20/tests/editor.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4d9fde6..2fc228b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1637,27 +1637,27 @@ static void test_EM_SETOPTIONS(void) DestroyWindow(hwndRichEdit); } -static int check_CFE_LINK_selection(HWND hwnd, int sel_start, int sel_end) +static BOOL check_CFE_LINK_selection(HWND hwnd, int sel_start, int sel_end) { CHARFORMAT2W text_format; text_format.cbSize = sizeof(text_format); SendMessage(hwnd, EM_SETSEL, sel_start, sel_end); SendMessage(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &text_format); - return (text_format.dwEffects & CFE_LINK) ? 1 : 0; + return (text_format.dwEffects & CFE_LINK) != 0; } -static void check_CFE_LINK_rcvd(HWND hwnd, int is_url, const char * url) +static void check_CFE_LINK_rcvd(HWND hwnd, BOOL is_url, const char * url) { - int link_present = 0; + BOOL link_present = FALSE; link_present = check_CFE_LINK_selection(hwnd, 0, 1); if (is_url) { /* control text is url; should get CFE_LINK */ - ok(0 != link_present, "URL Case: CFE_LINK not set for [%s].\n", url); + ok(link_present, "URL Case: CFE_LINK not set for [%s].\n", url); } else { - ok(0 == link_present, "Non-URL Case: CFE_LINK set for [%s].\n", url); + ok(!link_present, "Non-URL Case: CFE_LINK set for [%s].\n", url); } } @@ -1672,20 +1672,20 @@ static void test_EM_AUTOURLDETECT(void) one non-URL and one URL */ struct urls_s { const char *text; - int is_url; + BOOL is_url; } urls[12] = { - {"winehq.org", 0}, - {"http://www.winehq.org", 1}, - {"http//winehq.org", 0}, - {"ww.winehq.org", 0}, - {"www.winehq.org", 1}, - {"ftp://192.168.1.1", 1}, - {"ftp//192.168.1.1", 0}, - {"mailto:your(a)email.com", 1}, - {"prospero:prosperoserver", 1}, - {"telnet:test", 1}, - {"news:newserver", 1}, - {"wais:waisserver", 1} + {"winehq.org", FALSE}, + {"http://www.winehq.org", TRUE}, + {"http//winehq.org", FALSE}, + {"ww.winehq.org", FALSE}, + {"www.winehq.org", TRUE}, + {"ftp://192.168.1.1", TRUE}, + {"ftp//192.168.1.1", FALSE}, + {"mailto:your(a)email.com", TRUE}, + {"prospero:prosperoserver", TRUE}, + {"telnet:test", TRUE}, + {"news:newserver", TRUE}, + {"wais:waisserver", TRUE} }; int i, j; @@ -1769,7 +1769,7 @@ static void test_EM_AUTOURLDETECT(void) SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); - check_CFE_LINK_rcvd(hwndRichEdit, 0, urls[i].text); + check_CFE_LINK_rcvd(hwndRichEdit, FALSE, urls[i].text); /* Link detection should happen immediately upon WM_SETTEXT */ SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0);

1 0

Frédéric Delanoy : mscoree: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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

Frédéric Delanoy : ws2_32: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: aedb86a46f48626839f3ae9253470a13bd9c29a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedb86a46f48626839f3ae925… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:40 2013 +0200 ws2_32: Use BOOL type where appropriate. --- dlls/ws2_32/socket.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1b1815c..679258b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5065,7 +5065,8 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; - DWORD ifmetric, exists = FALSE; + DWORD ifmetric; + BOOL exists = FALSE; if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue;

1 0

Alexandre Julliard : winspool: Store generic. ppd in a resource instead of depending on an external file.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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