November 2014 - Wine-commits

Jacek Caban : mshtml: Added HTMLFrameBase2:: allowTransparency semi-stub implementation.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 504872741c9b9ce6be7a7e6d4309b8887f462901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504872741c9b9ce6be7a7e6d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 11:20:21 2014 +0100 mshtml: Added HTMLFrameBase2::allowTransparency semi-stub implementation. --- dlls/mshtml/htmlframebase.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index bd5c1de..d6e5ed2 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -667,15 +667,20 @@ static HRESULT WINAPI HTMLFrameBase2_get_readyState(IHTMLFrameBase2 *iface, BSTR static HRESULT WINAPI HTMLFrameBase2_put_allowTransparency(IHTMLFrameBase2 *iface, VARIANT_BOOL v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + FIXME("(%p)->(%x) semi-stub\n", This, v); + + return S_OK; } static HRESULT WINAPI HTMLFrameBase2_get_allowTransparency(IHTMLFrameBase2 *iface, VARIANT_BOOL *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) semi-stub\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static const IHTMLFrameBase2Vtbl HTMLFrameBase2Vtbl = {

1 0

Sebastian Lackner : ws2_32/tests: Wait for thread termination before cleaning up winsock.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 69cc90957c2118fc503ea9e18e7b2a14243c7685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cc90957c2118fc503ea9e18… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 20 12:51:06 2014 +0100 ws2_32/tests: Wait for thread termination before cleaning up winsock. --- dlls/ws2_32/tests/sock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0c39545..acc2783 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4354,7 +4354,11 @@ end: if (dst != INVALID_SOCKET) closesocket(dst); if (hThread != NULL) + { + dwRet = WaitForSingleObject(hThread, 500); + ok(dwRet == WAIT_OBJECT_0, "failed to wait for thread termination: %d\n", GetLastError()); CloseHandle(hThread); + } if (ov.hEvent) CloseHandle(ov.hEvent); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Michael Stefaniuc : shell32/tests: Fix a copy and paste error (PVS-Studio) .
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 61ed9130bf5d76ede29ef83c99fccb14ad93247a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed9130bf5d76ede29ef83c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 20 13:43:54 2014 +0100 shell32/tests: Fix a copy and paste error (PVS-Studio). --- dlls/shell32/tests/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 51de635..07e4ee2 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -251,7 +251,7 @@ static void test_get_file_info(void) ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent) should return 1, got 0x%x\n", rc); if (rc) { - ok(strcpy(shfi.szDisplayName, "dummy") != 0, "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); + ok(strcmp(shfi.szDisplayName, "dummy"), "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); ok(shfi.iIcon != 0xdeadbeef, "SHGetFileInfoA(c:\\nonexistent) iIcon is not set\n"); }

1 0

Jactry Zeng : explorer: Remove unnecessary backslash when parsing / select and /root.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: eaa747311fb13e6e6bf5753afe91bb0016b5d8c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa747311fb13e6e6bf5753af… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Nov 20 21:22:29 2014 +0800 explorer: Remove unnecessary backslash when parsing /select and /root. --- programs/explorer/explorer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 1b900d0..a4f93bc 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -639,6 +639,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) while (*source && *source != ',') target[i++] = *source++; target[i] = 0; } + PathRemoveBackslashW(target); return i; }

1 0

Ralf Habacker : comdlg32: Update dmFormName when changing paper size in print UI.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 2b9d337f6d7848cde660ddc41c419eaefc446eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9d337f6d7848cde660ddc41… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Thu Nov 20 14:03:33 2014 +0100 comdlg32: Update dmFormName when changing paper size in print UI. --- dlls/comdlg32/printdlg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d52b47d..bedd9c4 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1798,10 +1798,12 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextA(hDlg, cmb2, (char *)lpdm->dmFormName, CCHFORMNAME); + } } break; @@ -1954,10 +1956,12 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextW(hDlg, cmb2, lpdm->dmFormName, CCHFORMNAME); + } } break;

1 0

Jacek Caban : mshtml: Added missing nsIHttpChannelInternal functions.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: bcce460f9ed667e037afade8882682c310c516c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcce460f9ed667e037afade88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 14:45:27 2014 +0100 mshtml: Added missing nsIHttpChannelInternal functions. --- dlls/mshtml/nsio.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9216c1f..c016914 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1824,6 +1824,43 @@ static nsresult NSAPI nsHttpChannelInternal_SetLoadUnblocked(nsIHttpChannelInter return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsHttpChannelInternal_GetResponseTimeoutEnabled(nsIHttpChannelInternal *iface, + cpp_bool *aResponseTimeoutEnabled) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aResponseTimeoutEnabled); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_SetResponseTimeoutEnabled(nsIHttpChannelInternal *iface, + cpp_bool aResponseTimeoutEnabled) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%x)\n", This, aResponseTimeoutEnabled); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_GetApiRedirectToURI(nsIHttpChannelInternal *iface, nsIURI **aApiRedirectToURI) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aApiRedirectToURI); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_AddRedirect(nsIHttpChannelInternal *iface, nsIPrincipal *aPrincipal) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aPrincipal); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_GetLastModifiedTime(nsIHttpChannelInternal *iface, PRTime *aLastModifiedTime) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aLastModifiedTime); + return NS_ERROR_NOT_IMPLEMENTED; +} + static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_QueryInterface, nsHttpChannelInternal_AddRef, @@ -1851,7 +1888,12 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_GetLoadAsBlocking, nsHttpChannelInternal_SetLoadAsBlocking, nsHttpChannelInternal_GetLoadUnblocked, - nsHttpChannelInternal_SetLoadUnblocked + nsHttpChannelInternal_SetLoadUnblocked, + nsHttpChannelInternal_GetResponseTimeoutEnabled, + nsHttpChannelInternal_SetResponseTimeoutEnabled, + nsHttpChannelInternal_GetApiRedirectToURI, + nsHttpChannelInternal_AddRedirect, + nsHttpChannelInternal_GetLastModifiedTime };

1 0

Jacek Caban : mshtml: Added nsIURI::GetPrePath implementation.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 9a68ef40dd25394dcf396342b8d7ea5a26d9378a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a68ef40dd25394dcf396342b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 14:45:35 2014 +0100 mshtml: Added nsIURI::GetPrePath implementation. --- dlls/mshtml/nsio.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c016914..d8e1712 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2076,8 +2076,42 @@ static nsresult NSAPI nsURI_SetSpec(nsIFileURL *iface, const nsACString *aSpec) static nsresult NSAPI nsURI_GetPrePath(nsIFileURL *iface, nsACString *aPrePath) { nsWineURI *This = impl_from_nsIFileURL(iface); - FIXME("(%p)->(%p)\n", This, aPrePath); - return NS_ERROR_NOT_IMPLEMENTED; + IUriBuilder *uri_builder; + BSTR display_uri; + IUri *uri; + int len; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aPrePath); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = CreateIUriBuilder(This->uri, 0, 0, &uri_builder); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUriBuilder_RemoveProperties(uri_builder, Uri_HAS_PATH|Uri_HAS_QUERY|Uri_HAS_FRAGMENT); + if(SUCCEEDED(hres)) + hres = IUriBuilder_CreateUriSimple(uri_builder, 0, 0, &uri); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUri_GetDisplayUri(uri, &display_uri); + IUri_Release(uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + /* Remove trailing slash that may be appended as default path. */ + len = SysStringLen(display_uri); + if(len && display_uri[len-1] == '/') + display_uri[len-1] = 0; + + nsres = return_wstr_nsacstr(aPrePath, display_uri, -1); + SysFreeString(display_uri); + return nsres; } static nsresult NSAPI nsURI_GetScheme(nsIFileURL *iface, nsACString *aScheme)

1 0

Nikolay Sivov : include: Added SHAssocEnumHandlers() and related interfaces definition.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 5ff44e5aefc3987a4a700e17036db4208ee08433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff44e5aefc3987a4a700e170… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 21:38:36 2014 +0300 include: Added SHAssocEnumHandlers() and related interfaces definition. --- include/shobjidl.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 627a6df..7dfc4c4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3440,6 +3440,54 @@ interface ITransferDestination : IUnknown [out, iid_is(riid)] void **presources); } +[ + uuid(92218cab-ecaa-4335-8133-807fd234c2ee), + object, + pointer_default(unique) +] +interface IAssocHandlerInvoker : IUnknown +{ + HRESULT SupportsSelection(); + HRESULT Invoke(); +} + +[ + uuid(f04061ac-1659-4a3f-a954-775aa57fc083), + object, + pointer_default(unique) +] +interface IAssocHandler : IUnknown +{ + HRESULT GetName([out, string] LPWSTR *name); + HRESULT GetUIName([out, string] LPWSTR *uiname); + HRESULT GetIconLocation([out, string] LPWSTR *path, + [out] int *index); + HRESULT IsRecommended(); + HRESULT MakeDefault([in, string] LPCWSTR description); + HRESULT Invoke([in] IDataObject *object); + HRESULT CreateInvoker([in] IDataObject *object, + [out] IAssocHandlerInvoker **invoker); +} + +[ + uuid(973810ae-9599-4b88-9e4d-6ee98c9552da), + object, + pointer_default(unique) +] +interface IEnumAssocHandlers : IUnknown +{ + HRESULT Next([in] ULONG count, + [out, size_is(count), length_is(*fetched)] IAssocHandler **handlers, + [out] ULONG *fetched); +} + +typedef enum ASSOC_FILTER +{ + ASSOC_FILTER_NONE = 0, + ASSOC_FILTER_RECOMMENDED +} ASSOC_FILTER; +cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);") + /***************************************************************************** * ShellObjects typelibrary */

1 0

Stefan Dösinger : wined3d: Fix mode comparison in wined3d_set_adapter_display_mode.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: a835ae864362e02e055c91bbb7163cbb8b0349d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a835ae864362e02e055c91bbb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 20:13:49 2014 +0100 wined3d: Fix mode comparison in wined3d_set_adapter_display_mode. --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dbd433b..794496b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3325,7 +3325,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } else { - if(!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) + if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) { ERR("Failed to read mode from registry.\n"); return WINED3DERR_NOTAVAILABLE; @@ -3344,7 +3344,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, && (current_mode.dmDisplayFrequency == new_mode.dmDisplayFrequency || !(new_mode.dmFields & DM_DISPLAYFREQUENCY)) && (current_mode.u2.dmDisplayFlags == new_mode.u2.dmDisplayFlags - || new_mode.dmFields & DM_DISPLAYFLAGS)) + || !(new_mode.dmFields & DM_DISPLAYFLAGS))) { TRACE("Skipping redundant mode setting call.\n"); return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Set the device window size on focus window activation.
by Alexandre Julliard 20 Nov '14

20 Nov '14

Module: wine Branch: master Commit: 09a91231a689e5ef8550ef2517de2dc40e0a75b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a91231a689e5ef8550ef251… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 20:13:50 2014 +0100 wined3d: Set the device window size on focus window activation. --- dlls/d3d8/tests/device.c | 14 +++++++++++++- dlls/d3d9/tests/d3d9ex.c | 6 ++++++ dlls/d3d9/tests/device.c | 28 ++++++++++++++++++++++++---- dlls/wined3d/swapchain.c | 14 ++++++++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6244254..6ee4f89 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2282,6 +2282,14 @@ static void test_wndproc(void) * or before. */ {0, 0, FALSE, 0}, }; + static const struct message reactivate_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, + {0, 0, FALSE, 0}, + }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -2469,13 +2477,17 @@ static void test_wndproc(void) /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ + expect_messages = reactivate_messages; ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ SetForegroundWindow(focus_window); flush_events(); SetForegroundWindow(focus_window); - flush_events(); + flush_events(); /* WM_WINDOWPOSCHANGING etc arrive after SetForegroundWindow returns. */ + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + expect_messages = NULL; hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5f54d5b..9f8c163 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2052,6 +2052,12 @@ static void test_wndproc(void) * independent of D3DCREATE_NOWINDOWCHANGES. */ ShowWindow(device_window, SW_MINIMIZE); ShowWindow(device_window, SW_RESTORE); + + /* Reactivation messages like in d3d8/9 are random in native d3d9ex. + * Sometimes they are sent, sometimes they are not (tested on Vista + * and Windows 7). The minimizing and restoring of the device window + * may have something to do with this, but if the messages are sent, + * they are generated by the 3 calls below. */ ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3fd25d1..3e91267 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3244,15 +3244,30 @@ static void test_wndproc(void) {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, {0, 0, FALSE, 0}, }; + static const struct message reactivate_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, + {0, 0, FALSE, 0}, + }; + static const struct message reactivate_messages_nowc[] = + { + /* We're activating the device window before activating the + * focus window, so no ACTIVATEAPP message is sent. */ + {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_ACTIVE}, + {0, 0, FALSE, 0}, + }; static const struct { DWORD create_flags; - const struct message *focus_loss_messages; + const struct message *focus_loss_messages, *reactivate_messages; } tests[] = { - {0, focus_loss_messages}, - {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc}, + {0, focus_loss_messages, reactivate_messages}, + {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc, reactivate_messages_nowc}, }; d3d9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -3441,17 +3456,22 @@ static void test_wndproc(void) ShowWindow(device_window, SW_MINIMIZE); ShowWindow(device_window, SW_RESTORE); } + flush_events(); /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ + expect_messages = tests[i].reactivate_messages; ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ SetForegroundWindow(focus_window); flush_events(); SetForegroundWindow(focus_window); - flush_events(); + flush_events(); /* WM_WINDOWPOSCHANGING etc arrive after SetForegroundWindow returns. */ + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + expect_messages = NULL; hr = IDirect3DDevice9_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 20731ef..d1b6d0b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1178,6 +1178,20 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { if (activate) { + if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) + { + /* The d3d versions do not agree on the exact messages here. D3d8 restores + * the window but leaves the size untouched, d3d9 sets the size on an + * invisible window, generates messages but doesn't change the window + * properties. The implementation follows d3d9. + * + * Guild Wars 1 wants a WINDOWPOSCHANGED message on the device window to + * resume drawing after a focus loss. */ + SetWindowPos(swapchain->device_window, NULL, 0, 0, + swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, + SWP_NOACTIVATE | SWP_NOZORDER); + } + if (swapchain->device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d,

1 0