- Wine-Devel - list.winehq.org

[PATCH v4 1/6] robocopy: Add stub
by Florian Eder Sept. 20, 2021

Sept. 20, 2021

Basic files and required changes to configure(.ac) to create a stub version of the robocopy utility Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43653 Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v4: Identical to the patch sent in v3 --- configure | 2 +- configure.ac | 1 + programs/robocopy/Makefile.in | 8 ++++++++ programs/robocopy/main.c | 29 +++++++++++++++++++++++++++++ programs/robocopy/robocopy.rc | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 programs/robocopy/Makefile.in create mode 100644 programs/robocopy/main.c create mode 100644 programs/robocopy/robocopy.rc diff --git a/configure b/configure index 00a5be6a504..a5767af3c60 100755 --- a/configure +++ b/configure @@ -21234,6 +21234,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 @@ -22767,4 +22768,3 @@ IFS="$ac_save_IFS" $as_echo " $as_me: Finished. Do '${ac_make}' to compile Wine. " >&6 - diff --git a/configure.ac b/configure.ac index dea5fe61bf3..97c46565db3 100644 --- a/configure.ac +++ b/configure.ac @@ -3958,6 +3958,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..5a48be3725b --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = robocopy.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..00dacc8ab6c --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("robocopy stub"); + return 0; +} diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..edae5b71d86 --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "XP027" + +#include "wine/wine_common_ver.rc" -- 2.32.0

2 7

[PATCH 1/4] ole32/tests: Get rid of some global variables in moniker tests.
by Nikolay Sivov Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 223 +++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 110 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5221be495f0..550ba802cfa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -36,8 +36,6 @@ #include "wine/test.h" #include "wine/heap.h" -#define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) -#define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define CHECK_EXPECTED_METHOD(method_name) \ @@ -138,18 +136,6 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } -static LONG cLocks; - -static void LockModule(void) -{ - InterlockedIncrement(&cLocks); -} - -static void UnlockModule(void) -{ - InterlockedDecrement(&cLocks); -} - static SIZE_T round_global_size(SIZE_T size) { static SIZE_T global_size_alignment = -1; @@ -163,7 +149,23 @@ static SIZE_T round_global_size(SIZE_T size) return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1)); } -static DWORD external_connections; +struct test_factory +{ + IClassFactory IClassFactory_iface; + IExternalConnection IExternalConnection_iface; + LONG refcount; + unsigned int external_connections; +}; + +static struct test_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct test_factory, IClassFactory_iface); +} + +static struct test_factory *impl_from_IExternalConnection(IExternalConnection *iface) +{ + return CONTAINING_RECORD(iface, struct test_factory, IExternalConnection_iface); +} static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { @@ -174,28 +176,31 @@ static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *ifa static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) { - return 2; + struct test_factory *factory = impl_from_IExternalConnection(iface); + return IClassFactory_AddRef(&factory->IClassFactory_iface); } static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) { - return 1; + struct test_factory *factory = impl_from_IExternalConnection(iface); + return IClassFactory_Release(&factory->IClassFactory_iface); } static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + struct test_factory *factory = impl_from_IExternalConnection(iface); + ok(extconn == EXTCONN_STRONG, "Unexpected connection type %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); - return ++external_connections; + return ++factory->external_connections; } static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + struct test_factory *factory = impl_from_IExternalConnection(iface); + ok(extconn == EXTCONN_STRONG, "Unexpected connection type %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); - - return --external_connections; + return --factory->external_connections; } static const IExternalConnectionVtbl ExternalConnectionVtbl = { @@ -206,70 +211,70 @@ static const IExternalConnectionVtbl ExternalConnectionVtbl = { ExternalConnection_ReleaseConnection }; -static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; - -static HRESULT WINAPI Test_IClassFactory_QueryInterface( - LPCLASSFACTORY iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI test_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - if (ppvObj == NULL) return E_POINTER; + struct test_factory *factory = impl_from_IClassFactory(iface); + + if (!obj) return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = iface; - IClassFactory_AddRef(iface); - return S_OK; + *obj = iface; } - - if(IsEqualGUID(riid, &IID_IExternalConnection)) { - *ppvObj = &ExternalConnection; - return S_OK; + else if (IsEqualGUID(riid, &IID_IExternalConnection)) + { + *obj = &factory->IExternalConnection_iface; + } + else + { + *obj = NULL; + return E_NOINTERFACE; } - *ppvObj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } -static ULONG WINAPI Test_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI test_factory_AddRef(IClassFactory *iface) { - LockModule(); - return 2; /* non-heap-based object */ + struct test_factory *factory = impl_from_IClassFactory(iface); + return InterlockedIncrement(&factory->refcount); } -static ULONG WINAPI Test_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI test_factory_Release(IClassFactory *iface) { - UnlockModule(); - return 1; /* non-heap-based object */ + struct test_factory *factory = impl_from_IClassFactory(iface); + return InterlockedDecrement(&factory->refcount); } -static HRESULT WINAPI Test_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI test_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **obj) { return E_NOTIMPL; } -static HRESULT WINAPI Test_IClassFactory_LockServer( - LPCLASSFACTORY iface, - BOOL fLock) +static HRESULT WINAPI test_factory_LockServer(IClassFactory *iface, BOOL lock) { return S_OK; } -static const IClassFactoryVtbl TestClassFactory_Vtbl = +static const IClassFactoryVtbl test_factory_vtbl = { - Test_IClassFactory_QueryInterface, - Test_IClassFactory_AddRef, - Test_IClassFactory_Release, - Test_IClassFactory_CreateInstance, - Test_IClassFactory_LockServer + test_factory_QueryInterface, + test_factory_AddRef, + test_factory_Release, + test_factory_CreateInstance, + test_factory_LockServer }; -static IClassFactory Test_ClassFactory = { &TestClassFactory_Vtbl }; +static void test_factory_init(struct test_factory *factory) +{ + factory->IClassFactory_iface.lpVtbl = &test_factory_vtbl; + factory->IExternalConnection_iface.lpVtbl = &ExternalConnectionVtbl; + factory->refcount = 1; + factory->external_connections = 0; +} typedef struct { @@ -796,6 +801,7 @@ static void test_ROT(void) IMoniker *pMoniker = NULL; struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; + struct test_factory factory; DWORD dwCookie; static const char *methods_register_no_ROTData[] = { @@ -830,7 +836,7 @@ static void test_ROT(void) NULL }; - cLocks = 0; + test_factory_init(&factory); hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); @@ -839,15 +845,13 @@ static void test_ROT(void) test_moniker->no_IROTData = TRUE; expected_method_list = methods_register_no_ROTData; - external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, &test_moniker->IMoniker_iface, &dwCookie); ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); - ok(external_connections == 1, "external_connections = %d\n", external_connections); - - ok_more_than_one_lock(); + ok(factory.external_connections == 1, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_isrunning_no_ROTData; hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); @@ -856,19 +860,17 @@ static void test_ROT(void) hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - ok(external_connections == 0, "external_connections = %d\n", external_connections); - - ok_no_locks(); + ok(!factory.external_connections, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_register; /* try with our own moniker */ test_moniker->no_IROTData = FALSE; - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); - - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_isrunning; hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); @@ -877,50 +879,47 @@ static void test_ROT(void) hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = CreateFileMoniker(wszFileName, &pMoniker); ok_ole_success(hr, CreateClassMoniker); /* test flags: 0 */ - external_connections = 0; - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, - pMoniker, &dwCookie); + factory.external_connections = 0; + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); - ok(external_connections == 0, "external_connections = %d\n", external_connections); - - ok_more_than_one_lock(); + ok(!factory.external_connections, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); - - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT */ /* only succeeds when process is started by SCM and has LocalService * or RunAs AppId values */ - hr = IRunningObjectTable_Register(pROT, - ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE | ROTFLAGS_ALLOWANYCLIENT, + (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); todo_wine { ok(hr == CO_E_WRONG_SERVER_IDENTITY, "Unexpected hr %#x.\n", hr); } + if (SUCCEEDED(hr)) + { + hr = IRunningObjectTable_Revoke(pROT, dwCookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } - hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); @@ -938,6 +937,9 @@ static void test_ROT_multiple_entries(void) IUnknown *pObject = NULL; static const WCHAR moniker_path[] = {'\\', 'w','i','n','d','o','w','s','\\','s','y','s','t','e','m','\\','t','e','s','t','1','.','d','o','c',0}; + struct test_factory factory; + + test_factory_init(&factory); hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); @@ -945,10 +947,10 @@ static void test_ROT_multiple_entries(void) hr = CreateFileMoniker(moniker_path, &pMoniker); ok_ole_success(hr, CreateFileMoniker); - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie1); + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie1); ok_ole_success(hr, IRunningObjectTable_Register); - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie2); + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie2); ok(hr == MK_S_MONIKERALREADYREGISTERED, "IRunningObjectTable_Register should have returned MK_S_MONIKERALREADYREGISTERED instead of 0x%08x\n", hr); ok(dwCookie1 != dwCookie2, "cookie returned for registering duplicate object shouldn't match cookie of original object (0x%x)\n", dwCookie1); @@ -1103,6 +1105,9 @@ static void test_MkParseDisplayName(void) {&pbc, wszEmpty, &eaten, NULL}, {&pbc, wszEmpty, &eaten, &pmk}, }; + struct test_factory factory; + + test_factory_init(&factory); hr = CreateBindCtx(0, &pbc); ok_ole_success(hr, CreateBindCtx); @@ -1143,7 +1148,7 @@ todo_wine ok_ole_success(hr, CreateFileMoniker); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); ok_ole_success(hr, IBindCtx_GetRunningObjectTable); - hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&factory.IClassFactory_iface, pmk, &pdwReg1); ok_ole_success(hr, IRunningObjectTable_Register); IMoniker_Release(pmk); pmk = NULL; @@ -1164,7 +1169,7 @@ todo_wine ok_ole_success(hr, CreateFileMoniker); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); ok_ole_success(hr, IBindCtx_GetRunningObjectTable); - hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&factory.IClassFactory_iface, pmk, &pdwReg1); ok_ole_success(hr, IRunningObjectTable_Register); IMoniker_Release(pmk); pmk = NULL; @@ -3032,6 +3037,7 @@ todo_wine static void test_pointer_moniker(void) { IMoniker *moniker, *moniker2, *prefix, *inverse, *anti; + struct test_factory factory; IEnumMoniker *enummoniker; DWORD hash, size; HRESULT hr; @@ -3045,13 +3051,13 @@ static void test_pointer_moniker(void) LARGE_INTEGER pos; CLSID clsid; - cLocks = 0; + test_factory_init(&factory); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, NULL); - ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); - ok_ole_success(hr, CreatePointerMoniker); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -3089,7 +3095,7 @@ static void test_pointer_moniker(void) IMarshal_Release(marshal); - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); /* Display Name */ @@ -3122,9 +3128,7 @@ static void test_pointer_moniker(void) /* Hashing */ hr = IMoniker_Hash(moniker, &hash); ok_ole_success(hr, IMoniker_Hash); - ok(hash == PtrToUlong(&Test_ClassFactory), - "Hash value should have been 0x%08x, instead of 0x%08x\n", - PtrToUlong(&Test_ClassFactory), hash); + ok(hash == PtrToUlong(&factory.IClassFactory_iface), "Unexpected hash value %#x.\n", hash); /* IsSystemMoniker test */ TEST_MONIKER_TYPE(moniker, MKSYS_POINTERMONIKER); @@ -3154,8 +3158,7 @@ static void test_pointer_moniker(void) IMoniker_Release(moniker); -todo_wine - ok(cLocks == 0, "Number of locks should be 0, but actually is %d.\n", cLocks); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = CreatePointerMoniker(NULL, &moniker); ok_ole_success(hr, CreatePointerMoniker); @@ -3178,10 +3181,10 @@ todo_wine IMoniker_Release(moniker); /* CommonPrefixWith() */ - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker2); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker2); ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, NULL); -- 2.33.0

1 3

[PATCH 1/5] dinput: Pass output instance to get_object_info HID joystick callback.
by Rémi Bernon Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 709953be8f0..1614f5e8583 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -652,11 +652,11 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; - ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); if (ret != DIENUM_CONTINUE) return S_OK; - ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); if (ret != DIENUM_CONTINUE) return S_OK; - enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); return S_OK; } -- 2.33.0

2 9

[PATCH 1/5] winebus.sys: Add a VID and PID to mouse and keyboard devices.
by Rémi Bernon Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/unixlib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 929997f1aa7..6b6a2595ca0 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -143,6 +143,8 @@ static const WCHAR mouse_bus_id[] = {'W','I','N','E','M','O','U','S','E',0}; static const struct device_desc mouse_device_desc = { .busid = mouse_bus_id, + .vid = 0x845e, + .pid = 0x0001, .input = -1, .manufacturer = {"The Wine Project"}, .product = {"Wine HID mouse"}, @@ -241,6 +243,8 @@ static const WCHAR keyboard_bus_id[] = {'W','I','N','E','K','E','Y','B','O','A', static const struct device_desc keyboard_device_desc = { .busid = keyboard_bus_id, + .vid = 0x845e, + .pid = 0x0002, .input = -1, .manufacturer = {"The Wine Project"}, .product = {"Wine HID keyboard"}, -- 2.33.0

1 4

[PATCH] winegcc: Correctly put the -munix manual section in its own paragraph.
by Zebediah Figura Sept. 20, 2021

Sept. 20, 2021

Use a style consistent with the rest of the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tools/winegcc/winegcc.man.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 831a98323cf..87c1496fd18 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,9 +59,8 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. -.B \-munix +.IP \fB-munix\fR Set when building the Unix counterpart of a builtin module. -.TP .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and -- 2.33.0

1 0

[PATCH v2] gdi32: Implement D3DKMTOpenAdapterFromDeviceName().
by Paul Gofman Sept. 20, 2021

Sept. 20, 2021

Fixes non functional setting page in Resident Evil Village. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - use GUID_DISPLAY_DEVICE_ARRIVAL directly; - check for NULL device_name->pDeviceName explicitly; - call SetupDiEnumDeviceInterfaces() directly without SetupDiEnumDeviceInfo(); - curly braces around WARN(); - call release_display_device_init_mutex() sooner; - use %d to print BOOL; - send WM_NULL to desktop window to init driver instead of creating window; - actually pass device_name to pD3DKMTOpenAdapterFromDeviceName when testing NULL device_name->pDeviceName. dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/objects.c | 66 ++++++++++++++++++++++++ dlls/gdi32/tests/Makefile.in | 2 +- dlls/gdi32/tests/driver.c | 98 ++++++++++++++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6dbc8a9bf12..46534796317 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory @ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape +@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc @ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 7f6893f0952..0acf736786b 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "devguid.h" #include "setupapi.h" +#include "ntddvdeo.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -889,6 +890,71 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/****************************************************************************** + * D3DKMTOpenAdapterFromDeviceName (GDI32.@) + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromDeviceName(D3DKMT_OPENADAPTERFROMDEVICENAME *device_name) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail_data; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + NTSTATUS status = STATUS_INVALID_PARAMETER; + D3DKMT_OPENADAPTERFROMLUID luid_desc; + WCHAR iface_detail_buffer[256]; + BOOL found = FALSE; + DEVPROPTYPE type; + unsigned int i; + HDEVINFO set; + HANDLE mutex; + + TRACE( "device_name %p.\n", device_name ); + + if (!device_name || !device_name->pDeviceName) return STATUS_INVALID_PARAMETER; + + TRACE("device path %s.\n", debugstr_w( device_name->pDeviceName )); + + mutex = get_display_device_init_mutex(); + + set = SetupDiGetClassDevsW( &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + iface_detail_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_detail_data->cbSize = sizeof(*iface_detail_data); + + for (i = 0; SetupDiEnumDeviceInterfaces( set, NULL, &GUID_DISPLAY_DEVICE_ARRIVAL, i, &iface_data ); ++i) + { + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface_data, iface_detail_data, + sizeof(iface_detail_buffer), NULL, &device_data )) + { + ERR( "Could not get interface detail, iface %u.\n", i ); + continue; + } + if (lstrcmpiW( device_name->pDeviceName, iface_detail_data->DevicePath )) continue; + + if (SetupDiGetDevicePropertyW( set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid_desc.AdapterLuid, + sizeof( luid_desc.AdapterLuid ), NULL, 0)) + found = TRUE; + else + ERR( "Could not get luid.\n" ); + + break; + } + + SetupDiDestroyDeviceInfoList( set ); + + release_display_device_init_mutex( mutex ); + + if (found && !(status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) + { + device_name->hAdapter = luid_desc.hAdapter; + device_name->AdapterLuid = luid_desc.AdapterLuid; + } + else + { + WARN( "Device %s not found.\n", debugstr_w(device_name->pDeviceName )); + } + return status; +} + /*********************************************************************** * D3DKMTOpenAdapterFromGdiDisplayName (GDI32.@) */ diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 876f6a376a2..3eb478ff765 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gdi32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = setupapi user32 gdi32 advapi32 C_SRCS = \ bitmap.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index eb0da18b32e..c05522c0394 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -29,16 +29,22 @@ #include "winternl.h" #include "dwmapi.h" #include "ddk/d3dkmthk.h" +#include "initguid.h" +#include "setupapi.h" +#include "ntddvdeo.h" #include "wine/test.h" static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFROMDEVICENAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); @@ -789,6 +795,96 @@ static void test_D3DKMTCheckOcclusion(void) DestroyWindow(hwnd); } +static void test_D3DKMTOpenAdapterFromDeviceName_deviface(const GUID *devinterface_guid, NTSTATUS expected_status) +{ + BYTE iface_detail_buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + 256 * sizeof(WCHAR)]; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_data; + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DEVPROPTYPE type; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + LUID luid; + BOOL ret; + + set = SetupDiGetClassDevsW(devinterface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed, error %u.\n", GetLastError()); + + iface_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_data->cbSize = sizeof(*iface_data); + device_name.pDeviceName = iface_data->DevicePath; + + i = 0; + while (SetupDiEnumDeviceInterfaces(set, NULL, devinterface_guid, i, &iface)) + { + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, iface_data, + sizeof(iface_detail_buffer), NULL, &device_data ); + ok(ret, "Got unexpected ret %d, GetLastError() %u.\n", ret, GetLastError()); + + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + ok(status == expected_status, "Got status %#x, expected %#x.\n", status, expected_status); + + if (!status) + { + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0); + ok(ret || GetLastError() == ERROR_NOT_FOUND, "Got unexpected ret %d, GetLastError() %u.\n", + ret, GetLastError()); + + if (ret) + { + ret = RtlEqualLuid( &luid, &device_name.AdapterLuid); + ok(ret, "Luid does not match.\n"); + } + else + { + skip("Luid not found.\n"); + } + + close_adapter_desc.hAdapter = device_name.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(!status, "Got unexpected status %#x.\n", status); + } + ++i; + } + if (!i) + win_skip("No devices found.\n"); + + SetupDiDestroyDeviceInfoList( set ); +} + +static void test_D3DKMTOpenAdapterFromDeviceName(void) +{ + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + NTSTATUS status; + + /* Make sure display devices are initialized. */ + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + + status = pD3DKMTOpenAdapterFromDeviceName(NULL); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("pD3DKMTOpenAdapterFromDeviceName() is not supported.\n"); + return; + } + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + memset(&device_name, 0, sizeof(device_name)); + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + winetest_push_context("GUID_DEVINTERFACE_DISPLAY_ADAPTER"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DEVINTERFACE_DISPLAY_ADAPTER, STATUS_INVALID_PARAMETER); + winetest_pop_context(); + + winetest_push_context("GUID_DISPLAY_DEVICE_ARRIVAL"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DISPLAY_DEVICE_ARRIVAL, STATUS_SUCCESS); + winetest_pop_context(); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -799,6 +895,7 @@ START_TEST(driver) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); + pD3DKMTOpenAdapterFromDeviceName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromDeviceName"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); @@ -814,6 +911,7 @@ START_TEST(driver) test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); + test_D3DKMTOpenAdapterFromDeviceName(); FreeLibrary(dwmapi); } -- 2.31.1

2 1

[PATCH] setupapi/tests: Add display device interface tests.
by Zhiyi Zhang Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/misc.c | 85 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index f16f310b3f7..10ea7c0cba8 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -28,6 +28,9 @@ #include "winnls.h" #include "winuser.h" #include "winreg.h" +#include "devguid.h" +#include "initguid.h" +#include "ntddvdeo.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -819,6 +822,87 @@ static void test_CM_Get_Version(void) ok(ret == 0x0400, "got version %#x\n", ret); } +#define check_device_interface(a, b) _check_device_interface(__LINE__, a, b) +static void _check_device_interface(int line, const char *instance_id, const GUID *guid) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + BOOL ret; + + devinfo = SetupDiGetClassDevsA(guid, instance_id, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ret = SetupDiEnumDeviceInfo(devinfo, 0, &device_data); + ok_(__FILE__, line)(ret || broken(!ret) /* <= Win7 */, + "SetupDiEnumDeviceInfo failed, error %u.\n", GetLastError()); + if (!ret) + { + SetupDiDestroyDeviceInfoList(devinfo); + return; + } + ret = SetupDiEnumDeviceInterfaces(devinfo, &device_data, guid, 0, &iface_data); + ok_(__FILE__, line)(ret, "SetupDiEnumDeviceInterfaces failed, error %u.\n", GetLastError()); + ok_(__FILE__, line)(IsEqualGUID(&iface_data.InterfaceClassGuid, guid), + "Expected guid %s, got %s.\n", wine_dbgstr_guid(guid), + wine_dbgstr_guid(&iface_data.InterfaceClassGuid)); + + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void test_device_interfaces(void) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + char instance_id[MAX_DEVICE_ID_LEN]; + DWORD device_idx = 0, size, error; + HDEVINFO devinfo; + BOOL ret; + + /* GPUs */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("GPU %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_DISPLAY_ADAPTER); + check_device_interface(instance_id, &GUID_DISPLAY_DEVICE_ARRIVAL); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0, "Expected at least one GPU.\n"); + SetupDiDestroyDeviceInfoList(devinfo); + + /* Monitors */ + device_idx = 0; + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("Monitor %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_MONITOR); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0 || broken(device_idx == 0) /* w7u_2qxl TestBot */, + "Expected at least one monitor.\n"); + SetupDiDestroyDeviceInfoList(devinfo); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -841,4 +925,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); test_CM_Get_Version(); + test_device_interfaces(); } -- 2.30.2

1 0

[PATCH 1/5] d3d10/effect: Move effect creation API functions.
by Nikolay Sivov Sept. 19, 2021

Sept. 19, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 53 ----------------------------------------- dlls/d3d10/effect.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 2d08c82a3c4..6961589ca31 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -230,50 +230,6 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER return S_OK; } -static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) -{ - const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); - const DWORD *id = key; - - return *id - t->id; -} - -HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, - ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) -{ - struct d3d10_effect *object; - HRESULT hr; - - FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", - data, data_size, flags, device, effect_pool, effect); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate D3D10 effect object memory\n"); - return E_OUTOFMEMORY; - } - - wine_rb_init(&object->types, d3d10_effect_type_compare); - object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; - object->refcount = 1; - ID3D10Device_AddRef(device); - object->device = device; - - hr = d3d10_effect_parse(object, data, data_size); - if (FAILED(hr)) - { - ERR("Failed to parse effect\n"); - IUnknown_Release(&object->ID3D10Effect_iface); - return hr; - } - - *effect = &object->ID3D10Effect_iface; - - TRACE("Created ID3D10Effect %p\n", object); - - return S_OK; -} - HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) @@ -287,15 +243,6 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } -HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, - ID3D10Device *device, ID3D10EffectPool **effect_pool) -{ - FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", - data, data_size, fx_flags, device, effect_pool); - - return E_NOTIMPL; -} - const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { FIXME("device %p stub!\n", device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e77d0691fcf..7342c2dbe23 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8360,3 +8360,56 @@ static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl = d3d10_effect_type_GetMemberName, d3d10_effect_type_GetMemberSemantic, }; + +static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); + const DWORD *id = key; + + return *id - t->id; +} + +HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) +{ + struct d3d10_effect *object; + HRESULT hr; + + FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", + data, data_size, flags, device, effect_pool, effect); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate D3D10 effect object memory\n"); + return E_OUTOFMEMORY; + } + + wine_rb_init(&object->types, d3d10_effect_type_compare); + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; + object->refcount = 1; + ID3D10Device_AddRef(device); + object->device = device; + + hr = d3d10_effect_parse(object, data, data_size); + if (FAILED(hr)) + { + ERR("Failed to parse effect\n"); + IUnknown_Release(&object->ID3D10Effect_iface); + return hr; + } + + *effect = &object->ID3D10Effect_iface; + + TRACE("Created effect %p\n", object); + + return S_OK; +} + +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool) +{ + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", + data, data_size, fx_flags, device, effect_pool); + + return E_NOTIMPL; +} -- 2.33.0

3 15

[PATCH] d3dx10_35/tests: Enable tests.
by Nikolay Sivov Sept. 19, 2021

Sept. 19, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_35/Makefile.in | 1 + dlls/d3dx10_35/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) create mode 100644 dlls/d3dx10_35/tests/Makefile.in diff --git a/configure b/configure index 00a5be6a504..db592f0868d 100755 --- a/configure +++ b/configure @@ -20340,6 +20340,7 @@ wine_fn_config_makefile dlls/d3drm/tests enable_tests wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 +wine_fn_config_makefile dlls/d3dx10_35/tests enable_tests wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_36/tests enable_tests wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 diff --git a/configure.ac b/configure.ac index dea5fe61bf3..0bc46a1427b 100644 --- a/configure.ac +++ b/configure.ac @@ -3064,6 +3064,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_35/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in index 419c221b324..0cbbf1841de 100644 --- a/dlls/d3dx10_35/Makefile.in +++ b/dlls/d3dx10_35/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_35.dll +IMPORTLIB = d3dx10_35 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_35/tests/Makefile.in b/dlls/d3dx10_35/tests/Makefile.in new file mode 100644 index 00000000000..8f08bb1ca6a --- /dev/null +++ b/dlls/d3dx10_35/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_35.dll +IMPORTS = d3dx10_35 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

2 1

[PATCH 1/4] user32/tests: Fix occasional failure in WmShowNoActivate_2 message sequence.
by Connor McAdams Sept. 19, 2021

Sept. 19, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cdb162df765..9c086862cd3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13413,6 +13413,7 @@ static const struct message WmShowNoActivate_2[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|optional }, /* Sometimes sent on Win8+. */ + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { HCBT_SETFOCUS, hook|optional }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, -- 2.25.1

2 6