October 2022 - Wine-Commits

Kevin Puetz : rpcrt4: Add a refcount owned by MIDL_STUB_MESSAGE.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: a7be4256f6081684e8fb0258564f9358eb36cfcf URL: https://gitlab.winehq.org/wine/wine/-/commit/a7be4256f6081684e8fb0258564f93… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Oct 10 23:31:08 2022 +0000 rpcrt4: Add a refcount owned by MIDL_STUB_MESSAGE. In cases where this could have been use-after-free, exceptions were caught/hidden by RpcTryFinally, but still lead to leaks since NdrProxyFreeBuffer wasn't able to call IRPCChannelBuffer::FreeBuffer. StdProxy_GetChannel() now AddRef() on its return value (used to set __proxy_frame::_StubMsg::pRpcChannelBuffer), and NdrProxyFreeBuffer() calls the corresponding Release() and clears the now-weak pointer. This makes the behavior of these function match the observed test results, and fixes the crash/leak when a proxy is released mid-Invoke. --- dlls/rpcrt4/cproxy.c | 5 +++++ dlls/rpcrt4/tests/cstub.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index da3e19e50f3..426b1425d3a 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -454,6 +454,9 @@ static void StdProxy_GetChannel(LPVOID iface, StdProxyImpl *This = impl_from_proxy_obj( iface ); TRACE("(%p)->GetChannel(%p) %s\n",This,ppChannel,This->name); + if(This->pChannel) + IRpcChannelBuffer_AddRef(This->pChannel); + *ppChannel = This->pChannel; } @@ -585,6 +588,8 @@ void WINAPI NdrProxyFreeBuffer(void *This, (RPCOLEMESSAGE*)pStubMsg->RpcMsg); pStubMsg->fBufferValid = TRUE; } + IRpcChannelBuffer_Release(pStubMsg->pRpcChannelBuffer); + pStubMsg->pRpcChannelBuffer = NULL; } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 57e69389ebd..d44ee36088c 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1527,7 +1527,7 @@ static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) NdrProxyInitialize(proxy_if1, &rpcMessage, &stubMessage, &stubDesc, 0); /* stubMessage should add its own refcount on test_chanbuf */ - todo_wine ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); + ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); ok(stubMessage.pRpcChannelBuffer != NULL, "NULL pRocChannelBuffer\n"); /* stubMessage doesn't add its own refcounts on proxy_if1 or proxy_buffer, @@ -1536,17 +1536,17 @@ static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) * this unadvise could be reentrant to Invoke because SendReceive pumps STA messages. * The source would then erase that conection point entry and Release the proxy. */ IRpcProxyBuffer_Disconnect(proxy_buffer); - todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); IRpcProxyBuffer_Release(proxy_buffer); refs = IUnknown_Release(proxy_if1); ok(refs == 0, "got %ld\n", refs); - todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); /* NdrProxyFreeBuffer must not dereference the the now-freed proxy_if1, * yet should still free the remaining reference on test_chanbuf */ NdrProxyFreeBuffer(proxy_if1, &stubMessage); ok(test_chanbuf.RefCount == 0, "got %ld\n", test_chanbuf.RefCount); - todo_wine ok(!stubMessage.pRpcChannelBuffer, "dangling pRpcChannelBuffer = %p\n", stubMessage.pRpcChannelBuffer); + ok(!stubMessage.pRpcChannelBuffer, "dangling pRpcChannelBuffer = %p\n", stubMessage.pRpcChannelBuffer); } START_TEST( cstub )

1 0

Kevin Puetz : rpcrt4/tests: Add tests for lifetime of IRpcChannelBuffer.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 59f39b325d2d90c09c8b346ba241dab182084c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/59f39b325d2d90c09c8b346ba241da… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri Sep 23 17:25:26 2022 +0000 rpcrt4/tests: Add tests for lifetime of IRpcChannelBuffer. It's possible for a proxy to be released during the middle of an Invoke. E.g. a specific case where this happened was a single-shot event sink which, upon receiving the event it was waiting for, would immediately call DispEventUnadvise. This removed the proxy pointing to that sink from the connection point's list of subscribers and released the last refcount on the proxy itself. Therefore, all state used to complete an RPC call must be on the stack; once NdrProxySendReceive pumps STA messages and permits reentrancy, the proxy cannot be accessed or relied on to own anything. Add test showing MIDL_STUB_MESSAGE::pRpcChannelBuffer owns a refcount (to ensure it can read [out] parameters from the channel) --- dlls/rpcrt4/tests/cstub.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index d8b61d10a1a..57e69389ebd 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1415,6 +1415,140 @@ static void test_delegated_methods(void) ok(hr == S_OK, "got %#lx\n", hr); } +typedef struct tagChannelBufferRefCount +{ + IRpcChannelBuffer IRpcChannelBuffer_iface; + LONG RefCount; +} CChannelBufferRefCount; + +static CChannelBufferRefCount* impl_from_IRpcChannelBuffer(IRpcChannelBuffer* iface) +{ + return CONTAINING_RECORD(iface, CChannelBufferRefCount, IRpcChannelBuffer_iface); +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_query_interface(IRpcChannelBuffer* pchan, + REFIID iid, + void** ppv) +{ + if (IsEqualGUID(&IID_IRpcChannelBuffer, iid)) + { + *ppv = pchan; + IRpcChannelBuffer_AddRef(pchan); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI test_chanbuf_refcount_chan_add_ref(IRpcChannelBuffer* pchan) +{ + CChannelBufferRefCount* This = impl_from_IRpcChannelBuffer(pchan); + return InterlockedIncrement(&This->RefCount); +} + +static ULONG WINAPI test_chanbuf_refcount_chan_release(IRpcChannelBuffer* pchan) +{ + CChannelBufferRefCount* This = impl_from_IRpcChannelBuffer(pchan); + return InterlockedDecrement(&This->RefCount); +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_get_buffer(IRpcChannelBuffer* pchan, + RPCOLEMESSAGE* msg, + REFIID iid) +{ + ok(0, "call to GetBuffer not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_send_receive(IRpcChannelBuffer* pchan, + RPCOLEMESSAGE* pMessage, + ULONG* pStatus) +{ + ok(0, "call to SendReceive not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_free_buffer(IRpcChannelBuffer* pchan, + RPCOLEMESSAGE* pMessage) +{ + ok(0, "call to FreeBuffer not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_get_dest_ctx(IRpcChannelBuffer* pchan, + DWORD* pdwDestContext, + void** ppvDestContext) +{ + *pdwDestContext = MSHCTX_LOCAL; + *ppvDestContext = NULL; + return S_OK; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_is_connected(IRpcChannelBuffer* pchan) +{ + ok(0, "call to IsConnected not expected\n"); + return E_NOTIMPL; +} + +static IRpcChannelBufferVtbl test_chanbuf_refcount_test_rpc_chan_vtbl = +{ + test_chanbuf_refcount_chan_query_interface, + test_chanbuf_refcount_chan_add_ref, + test_chanbuf_refcount_chan_release, + test_chanbuf_refcount_chan_get_buffer, + test_chanbuf_refcount_chan_send_receive, + test_chanbuf_refcount_chan_free_buffer, + test_chanbuf_refcount_chan_get_dest_ctx, + test_chanbuf_refcount_chan_is_connected +}; + +static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) +{ + IRpcProxyBuffer* proxy_buffer = NULL; + IUnknown* proxy_if1 = NULL; + CChannelBufferRefCount test_chanbuf = {{&test_chanbuf_refcount_test_rpc_chan_vtbl}, 1}; + + RPC_MESSAGE rpcMessage = {0}; + MIDL_STUB_MESSAGE stubMessage = {0}; + MIDL_STUB_DESC stubDesc = {0}; + ULONG refs; + + HRESULT hr = IPSFactoryBuffer_CreateProxy(ppsf, NULL, &IID_if1, &proxy_buffer, (void**)&proxy_if1); + ok(hr == S_OK, "got %#lx\n", hr); + + ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + hr = IRpcProxyBuffer_Connect(proxy_buffer, &test_chanbuf.IRpcChannelBuffer_iface); + ok(hr == S_OK, "got %#lx\n", hr); + /* proxy_buffer should have acquired its own refcount on test_chanbuf */ + ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); + + /* which therefore survives releasing the initial one */ + refs = IRpcChannelBuffer_Release(&test_chanbuf.IRpcChannelBuffer_iface); + ok(refs == 1, "got %ld\n", refs); + + NdrProxyInitialize(proxy_if1, &rpcMessage, &stubMessage, &stubDesc, 0); + /* stubMessage should add its own refcount on test_chanbuf */ + todo_wine ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); + ok(stubMessage.pRpcChannelBuffer != NULL, "NULL pRocChannelBuffer\n"); + + /* stubMessage doesn't add its own refcounts on proxy_if1 or proxy_buffer, + * so it's possible these are freed out from under it. + * E.g. an event sink might unadvise upon receiving the event it was waiting for; + * this unadvise could be reentrant to Invoke because SendReceive pumps STA messages. + * The source would then erase that conection point entry and Release the proxy. */ + IRpcProxyBuffer_Disconnect(proxy_buffer); + todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + IRpcProxyBuffer_Release(proxy_buffer); + refs = IUnknown_Release(proxy_if1); + ok(refs == 0, "got %ld\n", refs); + todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + + /* NdrProxyFreeBuffer must not dereference the the now-freed proxy_if1, + * yet should still free the remaining reference on test_chanbuf */ + NdrProxyFreeBuffer(proxy_if1, &stubMessage); + ok(test_chanbuf.RefCount == 0, "got %ld\n", test_chanbuf.RefCount); + todo_wine ok(!stubMessage.pRpcChannelBuffer, "dangling pRpcChannelBuffer = %p\n", stubMessage.pRpcChannelBuffer); +} + START_TEST( cstub ) { IPSFactoryBuffer *ppsf; @@ -1440,6 +1574,7 @@ START_TEST( cstub ) test_delegating_Invoke(ppsf); test_NdrDllRegisterProxy(); test_delegated_methods(); + test_ChannelBufferRefCount(ppsf); OleUninitialize(); }

1 0

Etaash Mathamsetty : ntoskrnl.exe: KeInsertQueueDpc stub.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 92d74369c89aaedd2fa13bfaa036c62bbb079884 URL: https://gitlab.winehq.org/wine/wine/-/commit/92d74369c89aaedd2fa13bfaa036c6… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Mon Oct 10 21:09:24 2022 -0400 ntoskrnl.exe: KeInsertQueueDpc stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fd18ea706c2..6f5564042a6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2569,6 +2569,15 @@ LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) return 0; } +/*********************************************************************** + * KeInsertQueueDpc (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI KeInsertQueueDpc(PRKDPC Dpc, PVOID SystemArgument1, PVOID SystemArgument2) +{ + FIXME( "stub: (%p %p %p)\n", Dpc, SystemArgument1, SystemArgument2 ); + return TRUE; +} + /********************************************************************** * KeQueryActiveProcessors (NTOSKRNL.EXE.@) * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a1a42d52fd1..8f8edcac7a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -587,7 +587,7 @@ @ stub KeInsertHeadQueue @ stdcall KeInsertQueue(ptr ptr) @ stub KeInsertQueueApc -@ stub KeInsertQueueDpc +@ stdcall KeInsertQueueDpc(ptr ptr ptr) @ stub KeIsAttachedProcess @ stub KeIsExecutingDpc @ stdcall KeLeaveCriticalRegion()

1 0

Francois Gouget : dxgi/tests: Mark the test_swapchain_window_messages() tests failing randomly on Windows as flaky.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 6ec99a0e912fe09e08858514cbff0182f956b081 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec99a0e912fe09e08858514cbff01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 11:11:39 2022 +0200 dxgi/tests: Mark the test_swapchain_window_messages() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53229 --- dlls/dxgi/tests/dxgi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 8c16cd37d45..73ea891119f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5817,6 +5817,7 @@ static BOOL check_message(const struct message *expected, static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { + flaky ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#Ix, lparam %#Ix.\n", message, hwnd, wparam, lparam);

1 0

Gabriel Ivăncescu : shell32: Handle drive letters properly when parsing MyComputer.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 075f80653b2db8c03dc89a023a5d60912c6e622e URL: https://gitlab.winehq.org/wine/wine/-/commit/075f80653b2db8c03dc89a023a5d60… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 21:52:23 2022 +0300 shell32: Handle drive letters properly when parsing MyComputer. Besides PathGetDriveNumber being dangerous and having a completely messed up result with \\?\ prefix, a backslash is not required anymore on newer Windows versions. So e.g. C: should succeed to be parsed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/shfldr_desktop.c | 5 +++-- dlls/shell32/shfldr_mycomp.c | 20 ++++++++++++-------- dlls/shell32/tests/shfldr_special.c | 2 -- dlls/shell32/tests/shlfolder.c | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 7bf54c4e7d0..f4df3ed0190 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -151,7 +151,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; PARSEDURLW urldata; @@ -179,7 +179,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - else if (PathGetDriveNumberW (lpszDisplayName) >= 0) + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && lpszDisplayName[1] == ':') { /* it's a filesystem path with a drive. Let MyComputer/UnixDosFolder parse it */ pidlTemp = _ILCreateMyComputer (); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 5b90458e145..2f4ebd580c1 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -189,7 +189,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPITEMIDLIST pidlTemp = NULL; CLSID clsid; @@ -209,13 +209,17 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - /* do we have an absolute path name ? */ - else if (PathGetDriveNumberW (lpszDisplayName) >= 0 && - lpszDisplayName[2] == (WCHAR) '\\') + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && + lpszDisplayName[1] == ':' && + (lpszDisplayName[2] == '\\' || lpszDisplayName[2] == '\0')) { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - /* make drive letter uppercase to enable PIDL comparison */ - szElement[0] = toupper(szElement[0]); + /* drive letter has to be uppercase to enable PIDL comparison */ + szElement[0] = c; + szElement[1] = ':'; + szElement[2] = '\\'; + szElement[3] = '\0'; + szNext = &lpszDisplayName[2] + (lpszDisplayName[2] == '\\'); pidlTemp = _ILCreateDrive (szElement); } @@ -224,7 +228,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); } - else + else if (pidlTemp) { if (pdwAttributes && *pdwAttributes) SHELL32_GetItemAttributes (&This->IShellFolder2_iface, pidlTemp, pdwAttributes); diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 99d6e8c62a4..22749c231f3 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -85,7 +85,6 @@ static void test_parse_for_my_computer(void) pidl = NULL; eaten = 0xdeadbeef; hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); - todo_wine ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); @@ -101,7 +100,6 @@ static void test_parse_for_my_computer(void) "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); - todo_wine ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); ILFree(pidl); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 02a5c0dfb2d..248fbd1df62 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -199,8 +199,8 @@ static struct {{'c',':','\\',0}, S_OK}, {{'c',':','\\','\\',0}, E_INVALIDARG, 1}, {{'c',':','\\','f','a','k','e',0}, 0x80070002}, /* ERROR_FILE_NOT_FOUND */ - {{'c',':','f','a','k','e',0}, E_INVALIDARG, 1}, - {{'c',':','/',0}, E_INVALIDARG, 1}, + {{'c',':','f','a','k','e',0}, E_INVALIDARG}, + {{'c',':','/',0}, E_INVALIDARG}, {{'c',':','\\','w','i','n','d','o','w','s',0}, S_OK}, {{'c',':','\\','w','i','n','d','o','w','s','\\',0}, S_OK}, {{'c',':','\\','w','i','n','d','o','w','s','\\','.',0}, E_INVALIDARG, 1},

1 0

Gabriel Ivăncescu : shell32/tests: Test drive letters parsing for My Computer.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 2b2c09a01c480aa07bee9cb0184929bbdb8239e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b2c09a01c480aa07bee9cb0184929… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 21:52:23 2022 +0300 shell32/tests: Test drive letters parsing for My Computer. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/tests/shfldr_special.c | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index cc0bb20ff33..99d6e8c62a4 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -39,6 +39,76 @@ static inline BOOL SHELL_OsIsUnicode(void) return !(GetVersion() & 0x80000000); } +/* Tests for My Computer */ +static void test_parse_for_my_computer(void) +{ + WCHAR path[] = { '\\','\\','?','\\','C',':','\\',0 }; + IShellFolder *mycomp, *sf; + WCHAR *drive = path + 4; + ITEMIDLIST *pidl; + DWORD eaten; + HRESULT hr; + + hr = SHGetDesktopFolder(&sf); + ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%lx\n", hr); + if (hr != S_OK) return; + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidl); + ok(hr == S_OK, "SHGetSpecialFolderLocation failed with error 0x%lx\n", hr); + if (hr != S_OK) + { + IShellFolder_Release(sf); + return; + } + hr = IShellFolder_BindToObject(sf, pidl, NULL, &IID_IShellFolder, (void**)&mycomp); + ok(hr == S_OK, "IShellFolder::BindToObject failed with error 0x%lx\n", hr); + IShellFolder_Release(sf); + ILFree(pidl); + if (hr != S_OK) return; + + while (drive[0] <= 'Z' && GetDriveTypeW(drive) == DRIVE_NO_ROOT_DIR) drive[0]++; + if (drive[0] > 'Z') + { + skip("No drive found, skipping My Computer tests...\n"); + goto done; + } + + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK, "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl != NULL, "pidl is NULL\n"); + ILFree(pidl); + + /* \\?\ prefix is not valid */ + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl == NULL, "pidl is not NULL\n"); + ILFree(pidl); + + /* Try without backslash */ + drive[2] = '\0'; + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* WinXP */, + "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + todo_wine + ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); + ILFree(pidl); + +done: + IShellFolder_Release(mycomp); +} + /* Tests for My Network Places */ static void test_parse_for_entire_network(void) { @@ -294,6 +364,7 @@ static void test_desktop_displaynameof(void) START_TEST(shfldr_special) { + test_parse_for_my_computer(); test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder();

1 0

Paul Gofman : wined3d: Replace NULL device_window with focus window in swapchain desc.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 6b5193558960da860903138e1fdcd099ea364c70 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b5193558960da860903138e1fdcd0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 28 14:01:27 2022 -0500 wined3d: Replace NULL device_window with focus window in swapchain desc. --- dlls/d3d9/tests/device.c | 6 +++--- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/swapchain.c | 8 +++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d42b210b01f..5c4417a2568 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1354,7 +1354,7 @@ static void test_swapchain(void) ok(hr == D3D_OK, "Got hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain2, &d3dpp); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); + ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -12242,7 +12242,7 @@ static void test_swapchain_parameters(void) hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", present_parameters2.hDeviceWindow, window); ok(present_parameters2.SwapEffect == tests[i].swap_effect, "Swap effect changed from %u to %u, test %u.\n", tests[i].swap_effect, present_parameters2.SwapEffect, i); @@ -12283,7 +12283,7 @@ static void test_swapchain_parameters(void) ok(hr == D3D_OK, "Got hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", present_parameters2.hDeviceWindow, window); IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d1c18177d62..c314292031d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5582,6 +5582,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_view_desc view_desc; BOOL backbuffer_resized, windowed; HRESULT hr = WINED3D_OK; + HWND device_window; unsigned int i; TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", @@ -5658,12 +5659,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, current_desc->refresh_rate = swapchain_desc->refresh_rate; current_desc->auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; - if (swapchain_desc->device_window && swapchain_desc->device_window != current_desc->device_window) + device_window = swapchain_desc->device_window ? swapchain_desc->device_window : device->create_parms.focus_window; + if (device_window && device_window != current_desc->device_window) { TRACE("Changing the device window from %p to %p.\n", - current_desc->device_window, swapchain_desc->device_window); - current_desc->device_window = swapchain_desc->device_window; - swapchain_state->device_window = swapchain_desc->device_window; + current_desc->device_window, device_window); + current_desc->device_window = device_window; + swapchain_state->device_window = device_window; wined3d_swapchain_set_window(swapchain, NULL); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 80e630fd41e..e40707c0e54 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1459,7 +1459,13 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); - window = desc->device_window ? desc->device_window : device->create_parms.focus_window; + if (!desc->device_window) + { + TRACE("Updating device_window to %p.\n", device->create_parms.focus_window); + desc->device_window = device->create_parms.focus_window; + } + window = desc->device_window; + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr);

1 0

Francois Gouget : dxgi/tests: Mark the test_swapchain_window_styles() tests failing randomly on Windows as flaky.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 5b10cb08a5d0a911be465cba071cb9d2149d336d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b10cb08a5d0a911be465cba071cb9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 11:07:41 2022 +0200 dxgi/tests: Mark the test_swapchain_window_styles() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53228 --- dlls/dxgi/tests/dxgi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1874bcc0834..8c16cd37d45 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6120,6 +6120,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6136,6 +6137,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6164,6 +6166,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6190,7 +6193,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); - todo_wine + flaky_if(i == 4) todo_wine ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); } @@ -6206,7 +6209,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); - todo_wine + flaky_if(i == 4) todo_wine ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle);

1 0

Alistair Leslie-Hughes : include: Add missing SP defines.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 64c930ab3e8a322f4f1c437ba6ba47c9742d657f URL: https://gitlab.winehq.org/wine/wine/-/commit/64c930ab3e8a322f4f1c437ba6ba47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 11 16:05:02 2022 +1100 include: Add missing SP defines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49775 --- include/sperror.h | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 4 deletions(-) diff --git a/include/sperror.h b/include/sperror.h index 4b247994ba0..cd8ed9b948d 100644 --- a/include/sperror.h +++ b/include/sperror.h @@ -23,9 +23,139 @@ #include <winerror.h> -#define SPERR_UNINITIALIZED 0x80045001 -#define SPERR_ALREADY_INITIALIZED 0x80045002 -#define SPERR_NOT_FOUND 0x8004503a -#define SPERR_INVALID_REGISTRY_KEY 0x80045040 +#define SP_END_OF_STREAM 0x00045005 +#define SP_INSUFFICIENT_DATA 0x0004500b +#define SP_AUDIO_PAUSED 0x00045010 +#define SP_AUDIO_CONVERSION_ENABLED 0x00045015 +#define SP_NO_HYPOTHESIS_AVAILABLE 0x00045016 +#define SP_ALREADY_IN_LEX 0x00045018 +#define SP_LEX_NOTHING_TO_SYNC 0x0004501a +#define SP_REQUEST_PENDING 0x00045026 +#define SP_NO_PARSE_FOUND 0x0004502c +#define SP_UNSUPPORTED_ON_STREAM_INPUT 0x00045034 +#define SP_WORD_EXISTS_WITHOUT_PRONUNCIATION 0x00045037 +#define SP_RECOGNIZER_INACTIVE 0x0004504e +#define SP_PARTIAL_PARSE_FOUND 0x00045053 +#define SP_NO_RULE_ACTIVE 0x00045055 +#define SP_STREAM_UNINITIALIZED 0x00045057 +#define SP_AUDIO_STOPPED 0x00045065 +#define SP_COMPLETE_BUT_EXTENDABLE 0x00045074 +#define SP_NO_RULES_TO_ACTIVATE 0x0004507b +#define SP_NO_WORDENTRY_NOTIFICATION 0x0004507c +#define S_LIMIT_REACHED 0x0004507f +#define S_NOTSUPPORTED 0x00045080 + +#define SPERR_UNINITIALIZED 0x80045001 +#define SPERR_ALREADY_INITIALIZED 0x80045002 +#define SPERR_INVALID_FLAGS 0x80045004 +#define SPERR_DEVICE_BUSY 0x80045006 +#define SPERR_DEVICE_NOT_SUPPORTED 0x80045007 +#define SPERR_DEVICE_NOT_ENABLED 0x80045008 +#define SPERR_NO_DRIVER 0x80045009 +#define SPERR_FILE_MUST_BE_UNICODE 0x8004500a +#define SPERR_INVALID_PHRASE_ID 0x8004500c +#define SPERR_BUFFER_TOO_SMALL 0x8004500d +#define SPERR_FORMAT_NOT_SPECIFIED 0x8004500e +#define SPERR_AUDIO_STOPPED 0x8004500f +#define SPERR_RULE_NOT_FOUND 0x80045011 +#define SPERR_TTS_ENGINE_EXCEPTION 0x80045012 +#define SPERR_TTS_NLP_EXCEPTION 0x80045013 +#define SPERR_ENGINE_BUSY 0x80045014 +#define SPERR_CANT_CREATE 0x80045017 +#define SPERR_NOT_IN_LEX 0x80045019 +#define SPERR_LEX_VERY_OUT_OF_SYNC 0x8004501b +#define SPERR_UNDEFINED_FORWARD_RULE_REF 0x8004501c +#define SPERR_EMPTY_RULE 0x8004501d +#define SPERR_GRAMMAR_COMPILER_INTERNAL_ERROR 0x8004501e +#define SPERR_RULE_NOT_DYNAMIC 0x8004501f +#define SPERR_DUPLICATE_RULE_NAME 0x80045020 +#define SPERR_DUPLICATE_RESOURCE_NAME 0x80045021 +#define SPERR_TOO_MANY_GRAMMARS 0x80045022 +#define SPERR_CIRCULAR_REFERENCE 0x80045023 +#define SPERR_INVALID_IMPORT 0x80045024 +#define SPERR_INVALID_WAV_FILE 0x80045025 +#define SPERR_ALL_WORDS_OPTIONAL 0x80045027 +#define SPERR_INSTANCE_CHANGE_INVALID 0x80045028 +#define SPERR_RULE_NAME_ID_CONFLICT 0x80045029 +#define SPERR_NO_RULES 0x8004502a +#define SPERR_CIRCULAR_RULE_REF 0x8004502b +#define SPERR_INVALID_HANDLE 0x8004502d +#define SPERR_REMOTE_CALL_TIMED_OUT 0x8004502e +#define SPERR_AUDIO_BUFFER_OVERFLOW 0x8004502f +#define SPERR_NO_AUDIO_DATA 0x80045030 +#define SPERR_DEAD_ALTERNATE 0x80045031 +#define SPERR_HIGH_LOW_CONFIDENCE 0x80045032 +#define SPERR_INVALID_FORMAT_STRING 0x80045033 +#define SPERR_APPLEX_READ_ONLY 0x80045035 +#define SPERR_NO_TERMINATING_RULE_PATH 0x80045036 +#define SPERR_STREAM_CLOSED 0x80045038 +#define SPERR_NO_MORE_ITEMS 0x80045039 +#define SPERR_NOT_FOUND 0x8004503a +#define SPERR_INVALID_AUDIO_STATE 0x8004503b +#define SPERR_GENERIC_MMSYS_ERROR 0x8004503c +#define SPERR_MARSHALER_EXCEPTION 0x8004503d +#define SPERR_NOT_DYNAMIC_GRAMMAR 0x8004503e +#define SPERR_AMBIGUOUS_PROPERTY 0x8004503f +#define SPERR_INVALID_REGISTRY_KEY 0x80045040 +#define SPERR_INVALID_TOKEN_ID 0x80045041 +#define SPERR_XML_BAD_SYNTAX 0x80045042 +#define SPERR_XML_RESOURCE_NOT_FOUND 0x80045043 +#define SPERR_TOKEN_IN_USE 0x80045044 +#define SPERR_TOKEN_DELETED 0x80045045 +#define SPERR_MULTI_LINGUAL_NOT_SUPPORTED 0x80045046 +#define SPERR_EXPORT_DYNAMIC_RULE 0x80045047 +#define SPERR_STGF_ERROR 0x80045048 +#define SPERR_WORDFORMAT_ERROR 0x80045049 +#define SPERR_STREAM_NOT_ACTIVE 0x8004504a +#define SPERR_ENGINE_RESPONSE_INVALID 0x8004504b +#define SPERR_SR_ENGINE_EXCEPTION 0x8004504c +#define SPERR_STREAM_POS_INVALID 0x8004504d +#define SPERR_REMOTE_CALL_ON_WRONG_THREAD 0x8004504f +#define SPERR_REMOTE_PROCESS_TERMINATED 0x80045050 +#define SPERR_REMOTE_PROCESS_ALREADY_RUNNING 0x80045051 +#define SPERR_LANGID_MISMATCH 0x80045052 +#define SPERR_NOT_TOPLEVEL_RULE 0x80045054 +#define SPERR_LEX_REQUIRES_COOKIE 0x80045056 +#define SPERR_UNSUPPORTED_LANG 0x80045059 +#define SPERR_VOICE_PAUSED 0x8004505a +#define SPERR_AUDIO_BUFFER_UNDERFLOW 0x8004505b +#define SPERR_AUDIO_STOPPED_UNEXPECTEDLY 0x8004505c +#define SPERR_NO_WORD_PRONUNCIATION 0x8004505d +#define SPERR_ALTERNATES_WOULD_BE_INCONSISTENT 0x8004505e +#define SPERR_NOT_SUPPORTED_FOR_SHARED_RECOGNIZER 0x8004505f +#define SPERR_TIMEOUT 0x80045060 +#define SPERR_REENTER_SYNCHRONIZE 0x80045061 +#define SPERR_STATE_WITH_NO_ARCS 0x80045062 +#define SPERR_NOT_ACTIVE_SESSION 0x80045063 +#define SPERR_ALREADY_DELETED 0x80045064 +#define SPERR_RECOXML_GENERATION_FAIL 0x80045066 +#define SPERR_SML_GENERATION_FAIL 0x80045067 +#define SPERR_NOT_PROMPT_VOICE 0x80045068 +#define SPERR_ROOTRULE_ALREADY_DEFINED 0x80045069 +#define SPERR_SCRIPT_DISALLOWED 0x80045070 +#define SPERR_REMOTE_CALL_TIMED_OUT_START 0x80045071 +#define SPERR_REMOTE_CALL_TIMED_OUT_CONNECT 0x80045072 +#define SPERR_SECMGR_CHANGE_NOT_ALLOWED 0x80045073 +#define SPERR_FAILED_TO_DELETE_FILE 0x80045075 +#define SPERR_SHARED_ENGINE_DISABLED 0x80045076 +#define SPERR_RECOGNIZER_NOT_FOUND 0x80045077 +#define SPERR_AUDIO_NOT_FOUND 0x80045078 +#define SPERR_NO_VOWEL 0x80045079 +#define SPERR_UNSUPPORTED_PHONEME 0x8004507a +#define SPERR_WORD_NEEDS_NORMALIZATION 0x8004507d +#define SPERR_CANNOT_NORMALIZE 0x8004507e +#define SPERR_TOPIC_NOT_ADAPTABLE 0x80045081 +#define SPERR_PHONEME_CONVERSION 0x80045082 +#define SPERR_NOT_SUPPORTED_FOR_INPROC_RECOGNIZER 0x80045083 +#define SPERR_OVERLOAD 0x80045084 +#define SPERR_LEX_INVALID_DATA 0x80045085 +#define SPERR_CFG_INVALID_DATA 0x80045086 +#define SPERR_LEX_UNEXPECTED_FORMAT 0x80045087 +#define SPERR_STRING_TOO_LONG 0x80045088 +#define SPERR_STRING_EMPTY 0x80045089 +#define SPERR_NON_WORD_TRANSITION 0x80045090 +#define SPERR_SISR_ATTRIBUTES_NOT_ALLOWED 0x80045091 +#define SPERR_SISR_MIXED_NOT_ALLOWED 0x80045092 +#define SPERR_VOICE_NOT_FOUND 0x80045093 #endif /* SPError_h */

1 0

Paul Gofman : d3d9/tests: Add test for NULL hDeviceWindow in presentation parameters.
by Alexandre Julliard Oct. 11, 2022

Oct. 11, 2022

Module: wine Branch: master Commit: 832383f5cd329b9187dc73c785dc17a487a3b163 URL: https://gitlab.winehq.org/wine/wine/-/commit/832383f5cd329b9187dc73c785dc17… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 27 18:31:20 2022 -0500 d3d9/tests: Add test for NULL hDeviceWindow in presentation parameters. --- dlls/d3d9/tests/device.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c824edec9df..d42b210b01f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1348,9 +1348,13 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain2); - ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain2, &d3dpp); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -12208,7 +12212,7 @@ static void test_swapchain_parameters(void) present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters_windowed.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters_windowed.hDeviceWindow = window; + present_parameters_windowed.hDeviceWindow = NULL; present_parameters_windowed.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters_windowed.SwapEffect = D3DSWAPEFFECT_COPY; present_parameters_windowed.Windowed = TRUE; @@ -12219,7 +12223,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -12237,7 +12241,9 @@ static void test_swapchain_parameters(void) ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#lx, test %u.\n", hr, i); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); - ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#lx, test %u.\n", hr, i); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + present_parameters2.hDeviceWindow, window); ok(present_parameters2.SwapEffect == tests[i].swap_effect, "Swap effect changed from %u to %u, test %u.\n", tests[i].swap_effect, present_parameters2.SwapEffect, i); ok(present_parameters2.BackBufferCount == bb_count, "Backbuffer count changed from %u to %u, test %u.\n", @@ -12256,7 +12262,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -12268,9 +12274,18 @@ static void test_swapchain_parameters(void) if (FAILED(hr)) { + present_parameters_windowed.hDeviceWindow = NULL; hr = IDirect3DDevice9_Reset(device, &present_parameters_windowed); ok(SUCCEEDED(hr), "Failed to reset device, hr %#lx, test %u.\n", hr, i); } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + present_parameters2.hDeviceWindow, window); + IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(device); }

1 0