February 2022 - Wine-commits

Hans Leidekker : wbemprox: Return an empty array for __DERIVATION.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: b5eebf644a56a8e4978b000df2cad398d06ee933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5eebf644a56a8e4978b000d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:44 2021 +0200 wbemprox: Return an empty array for __DERIVATION. Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51871 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2243229043b9af45376e27df55a3fa279590a9b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/query.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index ec2a43c3f5f..dc363475c71 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1001,6 +1001,19 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } + if (!wcsicmp( name, L"__DERIVATION" )) + { + if (ret) + { + SAFEARRAY *sa; + FIXME( "returning empty array for __DERIVATION\n" ); + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, 0 ))) return E_OUTOFMEMORY; + V_VT( ret ) = VT_BSTR | VT_ARRAY; + V_ARRAY( ret ) = sa; + } + if (type) *type = CIM_STRING | CIM_FLAG_ARRAY; + return S_OK; + } FIXME("system property %s not implemented\n", debugstr_w(name)); return WBEM_E_NOT_FOUND; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 2cb9e3c54bd..b2e2d815e2a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1514,6 +1514,7 @@ static void test_Win32_VideoController( IWbemServices *services ) if (hr != S_OK) break; check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__DERIVATION", VT_BSTR | VT_ARRAY, CIM_STRING | CIM_FLAG_ARRAY ); check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); check_property( obj, L"__PATH", VT_BSTR, CIM_STRING );

1 0

Hans Leidekker : wbemprox: Add __DERIVATION to the list of system properties.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: b296253f79fc41681e2964ec87039c77a69515f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b296253f79fc41681e2964ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:45 2021 +0200 wbemprox: Add __DERIVATION to the list of system properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b6565a61fe66ccd1472a4c78b3daf0e1897fba0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index dc363475c71..ee05845158e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1390,7 +1390,8 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { static const WCHAR * const system_props[] = - { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__DERIVATION", L"__SERVER", L"__NAMESPACE", + L"__PATH" }; SAFEARRAY *sa; BSTR str; UINT i, table_index, result_index, count = 0;

1 0

Jefferson Carpenter : msxml3/saxreader: Handle null url in parseURL().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 98a3f0376bd0a7bf8e1248005bcb10917c1e62d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a3f0376bd0a7bf8e124800… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Fri Oct 22 09:56:54 2021 +0300 msxml3/saxreader: Handle null url in parseURL(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51267 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b7386cec716013e8a17abae54f1609ba2e8518c0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/saxreader.c | 14 +++++++------- dlls/msxml3/tests/saxreader.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fc27260cc2c..4d12ebbc5a6 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2734,23 +2734,23 @@ static HRESULT internal_onDataAvailable(void *obj, char *ptr, DWORD len) return internal_parseBuffer(This, ptr, len, FALSE); } -static HRESULT internal_parseURL( - saxreader* This, - const WCHAR *url, - BOOL vbInterface) +static HRESULT internal_parseURL(saxreader *reader, const WCHAR *url, BOOL vbInterface) { IMoniker *mon; bsc_t *bsc; HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + TRACE("%p, %s.\n", reader, debugstr_w(url)); + + if (!url && reader->version < MSXML4) + return E_INVALIDARG; hr = create_moniker_from_url(url, &mon); if(FAILED(hr)) return hr; - if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, This, &bsc); - else hr = bind_url(mon, internal_onDataAvailable, This, &bsc); + if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, reader, &bsc); + else hr = bind_url(mon, internal_onDataAvailable, reader, &bsc); IMoniker_Release(mon); if(FAILED(hr)) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ab814c5f764..0b5e3085ad5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2310,6 +2310,22 @@ static void test_saxreader(void) WriteFile(file, testXML, sizeof(testXML)-1, &written, NULL); CloseHandle(file); + /* crashes on newer versions */ + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader30)) + { + IVBSAXXMLReader *vb_reader; + + hr = ISAXXMLReader_parseURL(reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = ISAXXMLReader_QueryInterface(reader, &IID_IVBSAXXMLReader, (void **)&vb_reader); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IVBSAXXMLReader_parseURL(vb_reader, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IVBSAXXMLReader_Release(vb_reader); + } + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) test_seq = content_handler_test1_alternate;

1 0

Alexandre Julliard : wininet/tests: Mark a failing test as todo.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 8d00191097b2d90e7e1d0abde0bf4f9e0a2c9bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d00191097b2d90e7e1d0abd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 15:10:48 2021 +0100 wininet/tests: Mark a failing test as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13966ac99737acd1e05d3affb0ee5f0dd6c06216) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1620b7a7e3f..4ad3eb4c9c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6636,6 +6636,7 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); WaitForSingleObject(complete_event, INFINITE); + todo_wine ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); @@ -6699,7 +6700,7 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); if(req_error != ERROR_INTERNET_SEC_CERT_ERRORS) { - win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); + skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); close_async_handle(ses, 3); return;

1 0

Michael Stefaniuc : Release 6.0.3.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: f560fad07d6192a29be7987006154b201e06896d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f560fad07d6192a29be79870… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 6 16:00:03 2022 +0100 Release 6.0.3. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 436 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 6 + VERSION | 2 +- configure | 18 +-- 4 files changed, 226 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f560fad07d6192a29be7…

1 0

Tag wine-6.0.3 : Alexandre Julliard : Release 6.0.3
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: refs/tags/wine-6.0.3 Tag: 647a79bde965f4383c0c27491e34b25a909e6775 URL: https://source.winehq.org/git/wine.git/?a=tag;h=647a79bde965f4383c0c27491e3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 14:28:42 2022 +0100 Release 6.0.3

1 0

Paul Gofman : kernelbase: Fix copy size for delete_privs in CreateRestrictedToken().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: f9f4e8f6921ba2a04d0ac669fe93267ebf61f9a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f4e8f6921ba2a04d0ac669… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 4 13:43:46 2021 +0300 kernelbase: Fix copy size for delete_privs in CreateRestrictedToken(). Fixes 3D Aim Trainer crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d63e0b7084ff651a8423324c54ab98ff8669de51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/security.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 97943048b01..36196304db3 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -662,21 +662,21 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, { if (!(nt_disable_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[disable_sid_count] ) ))) goto out; nt_disable_sids->GroupCount = disable_sid_count; - memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_disable_sids->Groups, disable_sids, disable_sid_count * sizeof(*disable_sids) ); } if (delete_priv_count) { if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; - memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); } if (restrict_sid_count) { if (!(nt_restrict_sids = heap_alloc( offsetof( TOKEN_GROUPS, Groups[restrict_sid_count] ) ))) goto out; nt_restrict_sids->GroupCount = restrict_sid_count; - memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(SID_AND_ATTRIBUTES) ); + memcpy( nt_restrict_sids->Groups, restrict_sids, restrict_sid_count * sizeof(*restrict_sids) ); } status = NtFilterToken(token, flags, nt_disable_sids, nt_privs, nt_restrict_sids, ret);

1 0

Giovanni Mascellani : kernelbase: Fix an incorrect allocation size.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 8506b2ae188243048cc897f7262a83bbea1e9884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8506b2ae188243048cc897f7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Aug 10 16:40:12 2021 +0200 kernelbase: Fix an incorrect allocation size. Variable nt_privs has type TOKEN_PRIVILEGES*, not TOKEN_GROUPS*. This fixes a crash in the Cyberpunk 2077 launcher. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1ca54db1bfd05c46dbd3039ed5ad48d9d915f212) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 36196304db3..472076cf7fe 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -667,7 +667,7 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, if (delete_priv_count) { - if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; + if (!(nt_privs = heap_alloc( offsetof( TOKEN_PRIVILEGES, Privileges[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); }

1 0

Francois Gouget : gdiplus: GdipGetFamilyName() should not crash when given a NULL name.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 7a9898344d61ad4d8619f2bbb3ffe037f180ff3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a9898344d61ad4d8619f2bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 13:16:12 2021 +0200 gdiplus: GdipGetFamilyName() should not crash when given a NULL name. It used to crash on Windows XP and Vista but does not since Windows 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ad663360fae6b4a9ee3d7786857404e0a4917329) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/font.c | 7 +++++-- dlls/gdiplus/tests/font.c | 9 +++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index c18e5702ca2..4d0a84943ea 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -798,17 +798,20 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo * FAILURE: InvalidParameter if family is NULL * * NOTES - * If name is a NULL ptr, then both XP and Vista will crash (so we do as well) + * If name is NULL, XP and Vista crash but not Windows 7+ */ GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, WCHAR *name, LANGID language) { static int lang_fixme; + TRACE("%p, %p, %d\n", family, name, language); + if (family == NULL) return InvalidParameter; - TRACE("%p, %p, %d\n", family, name, language); + if (name == NULL) + return Ok; if (language != LANG_NEUTRAL && !lang_fixme++) FIXME("No support for handling of multiple languages!\n"); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b208989c054..4ffa9e823fc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -388,12 +388,9 @@ static void test_fontfamily (void) expect (Ok, stat); expect (0, lstrcmpiW(itsName, L"Tahoma")); - if (0) - { - /* Crashes on Windows XP SP2, Vista, and so Wine as well */ - stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); - expect (Ok, stat); - } + /* Crashes on Windows XP SP2 and Vista */ + stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); + expect (Ok, stat); /* Make sure we don't read old data */ ZeroMemory (itsName, sizeof(itsName));

1 0

Jan Sikorski : winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: cb8fde193b80494301a6525e085b0b7727e903ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8fde193b80494301a6525e… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Sep 6 12:50:54 2021 +0200 winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes. The motivating example is when a newly created window gets moved off the system menu bar. A program might not be prepared to handle these messages yet. Fixes a crash in Lord of the Rings online. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d22e8455a2e809a891df289df42113276c0a276) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 19 +++++++++++++------ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 5 +++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..cc9166e24ea 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1775,7 +1775,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi /* Cocoa may adjust the frame when the window is ordered onto the screen. Generate a frame-changed event just in case. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO]; @@ -1954,7 +1954,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; } } } @@ -2114,7 +2114,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); } - - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing + - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing skipSizeMove:(BOOL)skipSizeMove { macdrv_event* event; NSUInteger style = self.styleMask; @@ -2134,6 +2134,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); event->window_frame_changed.fullscreen = isFullscreen; event->window_frame_changed.in_resize = resizing; + event->window_frame_changed.skip_size_move_loop = skipSizeMove; [queue postEvent:event]; macdrv_release_event(event); } @@ -2897,7 +2898,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); } - - (void)windowDidResize:(NSNotification *)notification + - (void)windowDidResize:(NSNotification *)notification skipSizeMove:(BOOL)skipSizeMove { NSRect frame = self.wine_fractionalFrame; @@ -2920,12 +2921,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self postWindowFrameChanged:frame fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 - resizing:[self inLiveResize]]; + resizing:[self inLiveResize] + skipSizeMove:skipSizeMove]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; [self updateFullscreen]; } + - (void)windowDidResize:(NSNotification *)notification + { + [self windowDidResize:notification skipSizeMove:FALSE]; + } + - (BOOL)windowShouldClose:(id)sender { macdrv_event* event = macdrv_create_event(WINDOW_CLOSE_REQUESTED, self); @@ -2982,7 +2989,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) windowWillExitFullScreen:(NSNotification*)notification { exitingFullScreen = TRUE; - [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE]; + [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE skipSizeMove:FALSE]; } - (void)windowWillMiniaturize:(NSNotification *)notification diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b02ad79f025..77c2ed87b64 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -443,6 +443,7 @@ typedef struct macdrv_event { CGRect frame; int fullscreen; int in_resize; + int skip_size_move_loop; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7f5327fcdc..267c4cd550d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2322,10 +2322,11 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) { - if (!event->window_frame_changed.in_resize && !being_dragged) + int send_sizemove = !event->window_frame_changed.in_resize && !being_dragged && !event->window_frame_changed.skip_size_move_loop; + if (send_sizemove) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); - if (!event->window_frame_changed.in_resize && !being_dragged) + if (send_sizemove) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); } }

1 0