May 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : authz: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: bc27abc14c49957652d6629cac28d7b68f6ac527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc27abc14c49957652d6629c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:45 2019 +0200 authz: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in index 129e2a3..91a0704 100644 --- a/dlls/authz/Makefile.in +++ b/dlls/authz/Makefile.in @@ -1,4 +1,6 @@ MODULE = authz.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ authz.c

1 0

Huw Davies : msctfp: Define the correct PROXY_CLSID.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 1020db7938c7c3d2ce6250739dfb8df22d5a3745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1020db7938c7c3d2ce625073… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 28 12:59:44 2019 +0100 msctfp: Define the correct PROXY_CLSID. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctfp/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in index 9ff3c3d..992aeef 100644 --- a/dlls/msctfp/Makefile.in +++ b/dlls/msctfp/Makefile.in @@ -3,4 +3,4 @@ IMPORTS = rpcrt4 ole32 oleaut32 IDL_SRCS = msctfp.idl -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer

1 0

Hans Leidekker : advapi32: Improve the SaferComputeTokenFromLevel stub.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 17110a0a890d2bacb5b348bd9bb3cef10d144e19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17110a0a890d2bacb5b348bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 28 09:34:10 2019 +0200 advapi32: Improve the SaferComputeTokenFromLevel stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47274 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- include/winsafer.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4b2876d..8027434 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6172,7 +6172,7 @@ BOOL WINAPI SaferComputeTokenFromLevel(SAFER_LEVEL_HANDLE handle, HANDLE token, { FIXME("(%p, %p, %p, %x, %p) stub\n", handle, token, access_token, flags, reserved); - *access_token = (HANDLE)0xdeadbeef; + *access_token = (flags & SAFER_TOKEN_NULL_IF_EQUAL) ? NULL : (HANDLE)0xdeadbeef; return TRUE; } diff --git a/include/winsafer.h b/include/winsafer.h index 2565484..02150c5 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -30,6 +30,11 @@ extern "C" { DECLARE_HANDLE(SAFER_LEVEL_HANDLE); +#define SAFER_TOKEN_NULL_IF_EQUAL 0x00000001 +#define SAFER_TOKEN_COMPARE_ONLY 0x00000002 +#define SAFER_TOKEN_MAKE_INERT 0x00000004 +#define SAFER_TOKEN_WANT_FLAGS 0x00000008 + #define SAFER_MAX_HASH_SIZE 64 #include <pshpack8.h>

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTCheckOcclusion tests.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 4f201cfcc939d6bc3d00f82abd0f3861d66b3847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f201cfcc939d6bc3d00f82a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat May 25 11:55:07 2019 +0800 gdi32/tests: Add D3DKMTCheckOcclusion tests. Mostly to show that D3DKMTCheckOcclusion is mainly composed of ownership checks rather than actually window occlusion. Also composition status doesn't affect its behavior despite MSDN say so. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f201cfcc939d6bc3d00…

1 0

Alexandre Julliard : cdosys: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 07efbbf329f4efc66da4c3c655f0efee9916f54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=07efbbf329f4efc66da4c3c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:39:24 2019 +0200 cdosys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cdosys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/cdosys/Makefile.in b/dlls/cdosys/Makefile.in index d1ce780..fefa8e8 100644 --- a/dlls/cdosys/Makefile.in +++ b/dlls/cdosys/Makefile.in @@ -1,5 +1,7 @@ MODULE = cdosys.dll IMPORTS = uuid ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : browseui: Build with msvcrt.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 7c7a259e7c0cded789b3a5f52c7a5dd44221f621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c7a259e7c0cded789b3a5f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:37:36 2019 +0200 browseui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/Makefile.in | 2 ++ dlls/browseui/aclmulti.c | 3 --- dlls/browseui/aclsource.c | 3 --- dlls/browseui/browseui_main.c | 2 -- dlls/browseui/compcatcachedaemon.c | 3 --- dlls/browseui/progressdlg.c | 9 +++------ 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 0dc50a0..a09649f 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,6 +1,8 @@ MODULE = browseui.dll IMPORTS = uuid ole32 comctl32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ aclmulti.c \ aclsource.c \ diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 412a18d..820b246 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 0ade9cc..5ac7cb1 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 2e31b37..71981d7 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 1f62441..6de0d87 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "browseui.h" #include "resids.h" diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 61078a1..bca61f5 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS @@ -37,7 +35,6 @@ #include "shlobj.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "browseui.h" #include "resids.h" @@ -100,7 +97,7 @@ static void set_buffer(LPWSTR *buffer, LPCWSTR string) string = empty_string; CoGetMalloc(MEMCTX_TASK, &malloc); - cb = (strlenW(string) + 1)*sizeof(WCHAR); + cb = (lstrlenW(string) + 1)*sizeof(WCHAR); if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer)) *buffer = IMalloc_Realloc(malloc, *buffer, cb); memcpy(*buffer, string, cb); @@ -119,8 +116,8 @@ static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) LPWSTR ret; LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); - ret = HeapAlloc(GetProcessHeap(), 0, (strlenW(string) + 1) * sizeof(WCHAR)); - strcpyW(ret, string); + ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(string) + 1) * sizeof(WCHAR)); + lstrcpyW(ret, string); return ret; }

1 0

Zebediah Figura : quartz/avisplit: Use BaseFilterImpl_Release().
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: af34a88673d37078ce80c48eb84e7cccb271df70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af34a88673d37078ce80c48e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:59 2019 -0500 quartz/avisplit: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index e6f7c2f..f77efa3 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1266,24 +1266,6 @@ static HRESULT AVISplitter_Disconnect(LPVOID iface) return S_OK; } -static ULONG WINAPI AVISplitter_Release(IBaseFilter *iface) -{ - AVISplitterImpl *This = impl_from_IBaseFilter(iface); - ULONG ref; - - ref = InterlockedDecrement(&This->Parser.filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, ref + 1); - - if (!ref) - { - AVISplitter_Flush(This); - Parser_Destroy(&This->Parser); - } - - return ref; -} - static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) { AVISplitterImpl *This = impl_from_IMediaSeeking(iface); @@ -1414,7 +1396,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = { Parser_QueryInterface, Parser_AddRef, - AVISplitter_Release, + BaseFilterImpl_Release, Parser_GetClassID, Parser_Stop, Parser_Pause, @@ -1429,9 +1411,17 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = Parser_QueryVendorInfo }; +static void avi_splitter_destroy(BaseFilter *iface) +{ + AVISplitterImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + AVISplitter_Flush(filter); + Parser_Destroy(&filter->Parser); +} + static const BaseFilterFuncTable avi_splitter_func_table = { .filter_get_pin = parser_get_pin, + .filter_destroy = avi_splitter_destroy, }; HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

Zebediah Figura : setupapi/tests: Add some tests for DIGCF_DEVICEINTERFACE.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 676e19f399cb9da6a1f85b241206f2af6e6f93e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=676e19f399cb9da6a1f85b24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:17 2019 -0500 setupapi/tests: Add some tests for DIGCF_DEVICEINTERFACE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 142 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 136 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=676e19f399cb9da6a1f8…

1 0

Zebediah Figura : setupapi/tests: Add some tests for SetupDiGetClassDevs() .
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: 301f66bf9661fbdd9f1ec73ed5c540ec5ee0f27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=301f66bf9661fbdd9f1ec73e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:15 2019 -0500 setupapi/tests: Add some tests for SetupDiGetClassDevs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 156 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 53e50b8..053802e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,6 +37,7 @@ /* This is a unique guid for testing purposes */ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; +static GUID iface_guid = {0xdeadbeef, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); BOOL (WINAPI *pSetupDiGetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD); @@ -2691,6 +2692,160 @@ static void test_call_class_installer(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void check_all_devices_enumerated_(int line, HDEVINFO set) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + BOOL ret, found_dev1 = 0, found_dev2 = 0, found_dev3 = 0; + char id[50]; + DWORD i; + + for (i = 0; SetupDiEnumDeviceInfo(set, i, &device); ++i) + { + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + if (!ret) continue; + + if (!strcasecmp(id, "Root\\LEGACY_BOGUS\\foo")) + { + found_dev1 = 1; + ok_(__FILE__, line)(IsEqualGUID(&device.ClassGuid, &guid), + "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + } + else if (!strcasecmp(id, "Root\\LEGACY_BOGUS\\qux")) + { + found_dev2 = 1; + ok_(__FILE__, line)(IsEqualGUID(&device.ClassGuid, &guid), + "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + } + else if (!strcasecmp(id, "Root\\LEGACY_BOGUS\\bar")) + { + found_dev3 = 1; + ok_(__FILE__, line)(IsEqualGUID(&device.ClassGuid, &guid2), + "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + } + } + ok_(__FILE__, line)(found_dev1, "Expected device 1 to be enumerated.\n"); + ok_(__FILE__, line)(found_dev2, "Expected device 2 to be enumerated.\n"); + ok_(__FILE__, line)(found_dev3, "Expected device 2 to be enumerated.\n"); +} +#define check_all_devices_enumerated(a) check_all_devices_enumerated_(__LINE__,a) + +static void test_get_class_devs(void) +{ + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA device = {sizeof(device)}; + HDEVINFO set; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(NULL, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\foo", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &iface_guid, NULL, 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\qux", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\bar", &guid2, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + set = SetupDiGetClassDevsA(NULL, NULL, NULL, 0); + ok(set == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(NULL, NULL, NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_all_devices_enumerated(set); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); + check_device_info(set, 2, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_all_devices_enumerated(set); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + set = SetupDiGetClassDevsA(NULL, "ROOT", NULL, 0); + ok(set == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(NULL, "ROOT", NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_all_devices_enumerated(set); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(NULL, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); +todo_wine { + check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); +} + check_device_info(set, 3, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, 0); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); +todo_wine { + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); +} + check_device_info(set, 2, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); +todo_wine { + check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); +} + check_device_info(set, 3, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + SetupDiEnumDeviceInfo(set, 0, &device); + SetupDiRemoveDevice(set, &device); + SetupDiEnumDeviceInfo(set, 1, &device); + SetupDiRemoveDevice(set, &device); + SetupDiDestroyDeviceInfoList(set); + set = SetupDiGetClassDevsA(&guid2, NULL, NULL, 0); + SetupDiEnumDeviceInfo(set, 0, &device); + SetupDiRemoveDevice(set, &device); + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); @@ -2728,4 +2883,5 @@ START_TEST(devinst) test_device_install_params(); test_driver_list(); test_call_class_installer(); + test_get_class_devs(); }

1 0

Zebediah Figura : setupapi/tests: Test calling SetupDiEnumDeviceInterfaces () with a NULL device.
by Alexandre Julliard May 28, 2019

May 28, 2019

Module: wine Branch: master Commit: bf09cca85090094121a390b2f83b1a10b5862aa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf09cca85090094121a390b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:14 2019 -0500 setupapi/tests: Test calling SetupDiEnumDeviceInterfaces() with a NULL device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 8477020..53e50b8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1055,8 +1055,8 @@ static void test_device_iface(void) { char buffer[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buffer; + SP_DEVINFO_DATA device = {0}, device2 = {sizeof(device2)}; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; - SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; @@ -1154,6 +1154,16 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device2); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device2, &guid, NULL, 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + check_device_iface(set, NULL, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, NULL, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, NULL, &guid, 2, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0001#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}"); + check_device_iface(set, NULL, &guid, 3, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); }

1 0