wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Austin English : dxdiagn: Add a few more stub properties.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: d66f7cdb529203563c82319b1cf2ec5720b138fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66f7cdb529203563c82319b1… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 4 18:20:37 2013 -0700 dxdiagn: Add a few more stub properties. --- dlls/dxdiagn/provider.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 8132b8f..145e5a3 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -66,6 +66,9 @@ static const WCHAR szSubSysId[] = {'s','z','S','u','b','S','y','s','I','d',0}; static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0}; static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; +static const WCHAR szChipType[] = {'s','z','C','h','i','p','T','y','p','e',0}; +static const WCHAR szDACType[] = {'s','z','D','A','C','T','y','p','e',0}; +static const WCHAR szRevision[] = {'s','z','R','e','v','i','s','i','o','n',0}; struct IDxDiagProviderImpl { @@ -1016,6 +1019,18 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; + hr = add_bstr_property(display_adapter, szChipType, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDACType, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szRevision, szEmpty); + if (FAILED(hr)) + goto cleanup; + if (!get_texture_memory(&adapter_info.DeviceIdentifier, &available_mem)) WARN("get_texture_memory helper failed\n"); @@ -1042,7 +1057,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container static const WCHAR *empty_properties[] = {szDeviceIdentifier, szVendorId, szDeviceId, szKeyDeviceKey, szKeyDeviceID, szDriverName, szDriverVersion, szSubSysId, szRevisionId, - szManufacturer}; + szManufacturer, szChipType, szDACType, szRevision}; IDxDiagContainerImpl_Container *display_adapter; HRESULT hr;

1 0

Stefan Dösinger : wined3d: Remove redundant surface location changes.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 1631603986d55f4e0382a0f8cf7a2d0e79f383fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1631603986d55f4e0382a0f8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:10 2013 +0200 wined3d: Remove redundant surface location changes. fb_copy_to_texture_direct and fb_copy_to_texture_hwstretch already invalidate everything but the RGB texture. --- dlls/wined3d/surface.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 52eac16..860296b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4984,15 +4984,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); } - if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) - { - wined3d_resource_free_sysmem(&dst_surface->resource); - dst_surface->resource.allocatedMemory = NULL; - } - else - { - dst_surface->flags &= ~SFLAG_INSYSMEM; - } + surface_evict_sysmem(dst_surface); return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Remove the D3DSWAPEFFECT_DISCARD debug clear code.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 9331c791e87d057728c45f3ff2956c807d83f250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9331c791e87d057728c45f3ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:09 2013 +0200 wined3d: Remove the D3DSWAPEFFECT_DISCARD debug clear code. --- dlls/wined3d/swapchain.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2bab9ed..73243a9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -566,31 +566,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT } } - /* This is disabled, but the code left in for debug purposes. - * - * Since we're allowed to modify the new back buffer on a D3DSWAPEFFECT_DISCARD flip, - * we can clear it with some ugly color to make bad drawing visible and ease debugging. - * The Debug runtime does the same on Windows. However, a few games do not redraw the - * screen properly, like Max Payne 2, which leaves a few pixels undefined. - * - * Tests show that the content of the back buffer after a discard flip is indeed not - * reliable, so no game can depend on the exact content. However, it resembles the - * old contents in some way, for example by showing fragments at other locations. In - * general, the color theme is still intact. So Max payne, which draws rather dark scenes - * gets a dark background image. If we clear it with a bright ugly color, the game's - * bug shows up much more than it does on Windows, and the players see single pixels - * with wrong colors. - * (The Max Payne bug has been confirmed on Windows with the debug runtime) */ - if (FALSE && swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) - { - static const struct wined3d_color cyan = {0.0f, 1.0f, 1.0f, 1.0f}; - - TRACE("Clearing the color buffer with cyan color\n"); - - wined3d_device_clear(swapchain->device, 0, NULL, - WINED3DCLEAR_TARGET, &cyan, 1.0f, 0); - } - if (!swapchain->render_to_fbo && ((swapchain->front_buffer->flags & SFLAG_INSYSMEM) || (back_buffer->flags & SFLAG_INSYSMEM))) {

1 0

Stefan Dösinger : wined3d: Get rid of SFLAG_LOCKABLE.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: e4a0767e2dfd69e7b6473ec9247a39fa6e5b44c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0767e2dfd69e7b6473ec92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:07 2013 +0200 wined3d: Get rid of SFLAG_LOCKABLE. --- dlls/wined3d/surface.c | 5 +++-- dlls/wined3d/wined3d_private.h | 39 +++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cc5a7a5..52eac16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3476,7 +3476,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, ++surface->resource.map_count; - if (!(surface->flags & SFLAG_LOCKABLE)) + if (!(surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) WARN("Trying to lock unlockable surface.\n"); /* Performance optimization: Count how often a surface is mapped, if it is @@ -6876,7 +6876,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN if (flags & WINED3D_SURFACE_PIN_SYSMEM) surface->flags |= SFLAG_PIN_SYSMEM; if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) - surface->flags |= SFLAG_LOCKABLE; + surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; + /* I'm not sure if this qualifies as a hack or as an optimization. It * seems reasonable to assume that lockable render targets will get * locked, so we might as well set SFLAG_DYNLOCK right at surface diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c28643a..69738d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2298,26 +2298,25 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ -#define SFLAG_LOCKABLE 0x00000010 /* Surface can be locked. */ -#define SFLAG_DYNLOCK 0x00000020 /* Surface is often locked by the application. */ -#define SFLAG_PIN_SYSMEM 0x00000040 /* Keep the surface in sysmem, at the same address. */ -#define SFLAG_DCINUSE 0x00000080 /* Set between GetDC and ReleaseDC calls. */ -#define SFLAG_LOST 0x00000100 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000200 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000400 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_INOVERLAYDRAW 0x00000800 /* Overlay drawing is in progress. Recursion prevention. */ -#define SFLAG_DIBSECTION 0x00001000 /* Has a DIB section attached for GetDC. */ -#define SFLAG_USERPTR 0x00002000 /* The application allocated the memory for this surface. */ -#define SFLAG_ALLOCATED 0x00004000 /* A GL texture is allocated for this surface. */ -#define SFLAG_SRGBALLOCATED 0x00008000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00010000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00020000 /* The system memory copy is current. */ -#define SFLAG_INTEXTURE 0x00040000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00080000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00100000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00200000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00800000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ +#define SFLAG_PIN_SYSMEM 0x00000020 /* Keep the surface in sysmem, at the same address. */ +#define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ +#define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ +#define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ +#define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ +#define SFLAG_INOVERLAYDRAW 0x00000400 /* Overlay drawing is in progress. Recursion prevention. */ +#define SFLAG_DIBSECTION 0x00000800 /* Has a DIB section attached for GetDC. */ +#define SFLAG_USERPTR 0x00001000 /* The application allocated the memory for this surface. */ +#define SFLAG_ALLOCATED 0x00002000 /* A GL texture is allocated for this surface. */ +#define SFLAG_SRGBALLOCATED 0x00004000 /* A sRGB GL texture is allocated for this surface. */ +#define SFLAG_PBO 0x00008000 /* The surface has a PBO. */ +#define SFLAG_INSYSMEM 0x00010000 /* The system memory copy is current. */ +#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Stefan Dösinger : wined3d: Avoid duplicated code in wined3d_surface_blt.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: bff422f340f72aa73aca139eed5059562dcdd265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff422f340f72aa73aca139ee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:06 2013 +0200 wined3d: Avoid duplicated code in wined3d_surface_blt. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d7accd..cc5a7a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6610,7 +6610,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC if (dst_surface->flags & SFLAG_CONVERTED) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); - return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); + goto cpu; } if (flags & ~simple_blit) @@ -6687,7 +6687,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC else if (convert) TRACE("Not doing sysmem blit because of format conversion.\n"); else - return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); + goto cpu; } if (flags & WINEDDBLT_COLORFILL)

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

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

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: 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: 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

← Newer
1
...
55
56
57
58
59
60
61
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013