wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : strmbase/renderer: Add a destructor callback.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 12965264503ad38ab9c8f5e32a43b9863b1c0549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12965264503ad38ab9c8f5e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:55 2019 -0500 strmbase/renderer: Add a destructor callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 16 ++++++++++++---- include/wine/strmbase.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ea1be8b..7a69d98 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -194,6 +194,18 @@ static IPin *renderer_get_pin(BaseFilter *iface, unsigned int index) return &This->pInputPin->pin.IPin_iface; } +static void renderer_destroy(BaseFilter *iface) +{ + BaseRenderer *filter = impl_from_BaseFilter(iface); + filter->pFuncsTable->renderer_destroy(filter); +} + +static const BaseFilterFuncTable RendererBaseFilterFuncTable = +{ + .filter_get_pin = renderer_get_pin, + .filter_destroy = renderer_destroy, +}; + static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE * pmt) { BaseRenderer *This = impl_from_IBaseFilter(pin->pinInfo.pFilter); @@ -206,10 +218,6 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa return BaseRendererImpl_Receive(This, pSample); } -static const BaseFilterFuncTable RendererBaseFilterFuncTable = { - .filter_get_pin = renderer_get_pin, -}; - static const BaseInputPinFuncTable input_BaseInputFuncTable = { { BaseRenderer_Input_CheckMediaType, diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 307204e..9bc13de 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -604,6 +604,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_EndOfStream pfnEndOfStream; BaseRenderer_BeginFlush pfnBeginFlush; BaseRenderer_EndFlush pfnEndFlush; + void (*renderer_destroy)(BaseRenderer *iface); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : setupapi: Avoid adding duplicate devices in SetupDiGetClassDevs().
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: e2194b93b5a77a2e11700833223d4504dba738c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2194b93b5a77a2e11700833… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:20 2019 -0500 setupapi: Avoid adding duplicate devices in SetupDiGetClassDevs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 35 ++++++++++++++++++----------------- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 3c75fdf..743999d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -748,7 +748,8 @@ static void delete_device(struct device *device) heap_free(device); } -static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, +/* Create a new device, or return a device already in the set. */ +static struct device *create_device(struct DeviceInfoSet *set, const GUID *class, const WCHAR *instanceid, BOOL phantom) { const DWORD one = 1; @@ -758,6 +759,15 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); + LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) + { + if (!strcmpiW(instanceid, device->instanceId)) + { + TRACE("Found device %p already in set.\n", device); + return device; + } + } + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); @@ -788,6 +798,8 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); + + TRACE("Created new device %p.\n", device); return device; } @@ -1620,7 +1632,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const } } - if (!(device = SETUPDI_CreateDeviceInfo(set, class, id, TRUE))) + if (!(device = create_device(set, class, id, TRUE))) return FALSE; if (description) @@ -2196,8 +2208,7 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, deviceClassStr[37] = 0; UuidFromStringW(&deviceClassStr[1], &deviceClass); - if ((device = SETUPDI_CreateDeviceInfo(set, - &deviceClass, deviceInst, FALSE))) + if ((device = create_device(set, &deviceClass, deviceInst, FALSE))) SETUPDI_AddDeviceInterfaces(device, subKey, guid, flags); } RegCloseKey(deviceKey); @@ -2318,7 +2329,7 @@ static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set, if (snprintfW(id, ARRAY_SIZE(id), fmt, enumerator, deviceName, deviceInstance) != -1) { - SETUPDI_CreateDeviceInfo(set, &deviceClass, id, FALSE); + create_device(set, &deviceClass, id, FALSE); } } } @@ -3398,7 +3409,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hw PSP_DEVINFO_DATA device_data) { struct DeviceInfoSet *set; - struct device *device = NULL, *enum_device; + struct device *device; WCHAR classW[40]; GUID guid; HKEY enumKey = NULL; @@ -3448,17 +3459,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hw goto done; } - /* If current set already contains a same instance, don't create new ones */ - LIST_FOR_EACH_ENTRY(enum_device, &set->devices, struct device, entry) - { - if (!strcmpiW(instance_id, enum_device->instanceId)) - { - device = enum_device; - break; - } - } - - if (!device && !(device = SETUPDI_CreateDeviceInfo(set, &guid, instance_id, FALSE))) + if (!(device = create_device(set, &guid, instance_id, FALSE))) goto done; if (!device_data || device_data->cbSize == sizeof(SP_DEVINFO_DATA)) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 09cd7ae..f266592 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2933,7 +2933,6 @@ todo_wine { ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_list(set, &GUID_NULL); check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); -todo_wine check_device_info(set, 1, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, "\\\\?\\root#legacy_bogus#foo#{deadbeef-3f65-11db-b704-0011955c2bdb}"); check_device_iface(set, NULL, &iface_guid, 1, 0, NULL); @@ -2980,7 +2979,6 @@ todo_wine { ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_list(set, &GUID_NULL); check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); -todo_wine check_device_info(set, 1, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, "\\\\?\\root#legacy_bogus#foo#{deadbeef-3f65-11db-b704-0011955c2bdb}"); check_device_iface(set, NULL, &iface_guid, 1, 0, NULL);

1 0

Zebediah Figura : setupapi/tests: Add some tests for SetupDiGetDeviceInfoListDetail().
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: eca57ed672e97009108f7cc265fd21122e32d46f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca57ed672e97009108f7cc2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:19 2019 -0500 setupapi/tests: Add some tests for SetupDiGetDeviceInfoListDetail(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3f4a5fd..09cd7ae 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2731,6 +2731,16 @@ static void check_all_devices_enumerated_(int line, HDEVINFO set, BOOL expect_de } #define check_all_devices_enumerated(a,b) check_all_devices_enumerated_(__LINE__,a,b) +static void check_device_list_(int line, HDEVINFO set, const GUID *expect) +{ + SP_DEVINFO_LIST_DETAIL_DATA_A detail = {sizeof(detail)}; + BOOL ret = SetupDiGetDeviceInfoListDetailA(set, &detail); + ok_(__FILE__, line)(ret, "Failed to get list detail, error %#x.\n", GetLastError()); + ok_(__FILE__, line)(IsEqualGUID(&detail.ClassGuid, expect), "Expected class %s, got %s\n", + wine_dbgstr_guid(expect), wine_dbgstr_guid(&detail.ClassGuid)); +} +#define check_device_list(a,b) check_device_list_(__LINE__,a,b) + static void test_get_class_devs(void) { SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -2772,6 +2782,7 @@ static void test_get_class_devs(void) set = SetupDiGetClassDevsA(NULL, NULL, NULL, DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_all_devices_enumerated(set, TRUE); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); ret = SetupDiDestroyDeviceInfoList(set); @@ -2779,6 +2790,7 @@ static void test_get_class_devs(void) set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &guid); 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); @@ -2788,6 +2800,7 @@ static void test_get_class_devs(void) set = SetupDiGetClassDevsA(&guid, NULL, NULL, DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_all_devices_enumerated(set, TRUE); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); ret = SetupDiDestroyDeviceInfoList(set); @@ -2800,6 +2813,7 @@ static void test_get_class_devs(void) set = SetupDiGetClassDevsA(NULL, "ROOT", NULL, DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_all_devices_enumerated(set, TRUE); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); ret = SetupDiDestroyDeviceInfoList(set); @@ -2807,6 +2821,7 @@ static void test_get_class_devs(void) set = SetupDiGetClassDevsA(NULL, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); todo_wine { check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); @@ -2819,6 +2834,7 @@ todo_wine { set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, 0); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &guid); todo_wine { check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); @@ -2830,6 +2846,7 @@ todo_wine { set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); todo_wine { check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); @@ -2849,6 +2866,7 @@ todo_wine { set = SetupDiGetClassDevsA(NULL, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_all_devices_enumerated(set, FALSE); check_device_iface(set, NULL, &iface_guid, 0, 0, "\\\\?\\root#legacy_bogus#foo#{deadbeef-3f65-11db-b704-0011955c2bdb}"); check_device_iface(set, NULL, &iface_guid, 1, 0, "\\\\?\\root#legacy_bogus#qux#{deadbeef-3f65-11db-b704-0011955c2bdb}"); @@ -2860,6 +2878,7 @@ todo_wine { set = SetupDiGetClassDevsA(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_device_info(set, 0, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); check_device_iface(set, NULL, &iface_guid2, 0, 0, NULL); @@ -2868,6 +2887,7 @@ todo_wine { set = SetupDiGetClassDevsA(&iface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); 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, &guid, NULL); @@ -2880,6 +2900,7 @@ todo_wine { set = SetupDiGetClassDevsA(&iface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_all_devices_enumerated(set, FALSE); check_device_iface(set, NULL, &iface_guid, 0, 0, "\\\\?\\root#legacy_bogus#foo#{deadbeef-3f65-11db-b704-0011955c2bdb}"); check_device_iface(set, NULL, &iface_guid, 1, 0, "\\\\?\\root#legacy_bogus#qux#{deadbeef-3f65-11db-b704-0011955c2bdb}"); @@ -2910,6 +2931,7 @@ todo_wine { set = SetupDiGetClassDevsA(NULL, "ROOT\\LEGACY_BOGUS\\foo", NULL, DIGCF_DEVICEINTERFACE | DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); todo_wine check_device_info(set, 1, NULL, NULL); @@ -2922,6 +2944,7 @@ todo_wine set = SetupDiGetClassDevsA(NULL, "ROOT\\LEGACY_BOGUS\\bar", NULL, DIGCF_DEVICEINTERFACE | DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_device_info(set, 0, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); check_device_iface(set, NULL, &iface_guid2, 0, 0, NULL); @@ -2944,6 +2967,7 @@ todo_wine { set = SetupDiGetClassDevsA(&iface_guid, "ROOT\\LEGACY_BOGUS\\foo", NULL, DIGCF_DEVICEINTERFACE); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); check_device_info(set, 1, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, "\\\\?\\root#legacy_bogus#foo#{deadbeef-3f65-11db-b704-0011955c2bdb}"); @@ -2954,6 +2978,7 @@ todo_wine { set = SetupDiGetClassDevsA(&iface_guid, "ROOT\\LEGACY_BOGUS\\foo", NULL, DIGCF_DEVICEINTERFACE | DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_list(set, &GUID_NULL); check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); todo_wine check_device_info(set, 1, NULL, NULL);

1 0

Zebediah Figura : setupapi: Set the list device class to GUID_NULL when enumerating interfaces.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: bd12a0ace89d1d3893a249e3c348fd1ae0fff1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd12a0ace89d1d3893a249e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:18 2019 -0500 setupapi: Set the list device class to GUID_NULL when enumerating interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 3b58513..3c75fdf 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2456,7 +2456,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p if (deviceset) set = deviceset; else - set = SetupDiCreateDeviceInfoListExW(class, parent, machine, reserved); + set = SetupDiCreateDeviceInfoListExW((flags & DIGCF_DEVICEINTERFACE) ? NULL : class, parent, machine, reserved); if (set != INVALID_HANDLE_VALUE) { if (machine && *machine)

1 0

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

28 May '19

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: Treat DIGCF_ALLCLASSES as if a NULL device class was given.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 5ff5c7036ef028d9541b6407eeca05e37667cc84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff5c7036ef028d9541b6407… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:16 2019 -0500 setupapi: Treat DIGCF_ALLCLASSES as if a NULL device class was given. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0279d10..3b58513 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2448,6 +2448,9 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } + if (flags & DIGCF_ALLCLASSES) + class = NULL; + if (flags & unsupportedFlags) WARN("unsupported flags %08x\n", flags & unsupportedFlags); if (deviceset)

1 0

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

28 May '19

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 28 May '19

28 May '19

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

Alexandre Julliard : makefiles: Default to ms_abi for 64-bit msvcrt builds.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: cdf55b77e0e198d039c527314189fd92dc80d796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf55b77e0e198d039c52731… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 12:06:33 2019 +0200 makefiles: Default to ms_abi for 64-bit msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 37 +++++++++++++++++++++++++++++++------ configure.ac | 14 ++++++++------ loader/Makefile.in | 2 +- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 90c8e1a..910bb57 100755 --- a/configure +++ b/configure @@ -17197,8 +17197,8 @@ if test "x$ac_cv_cflags__fshort_wchar" = xyes; then : fi ;; esac - case $host_cpu in - *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 + case $host_cpu in + *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 $as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then : $as_echo_n "(cached) " >&6 @@ -17223,10 +17223,9 @@ $as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } if test "x$ac_cv_cflags__fno_omit_frame_pointer" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" fi ;; - esac - - case $host in - x86_64-*mingw32*|x86_64-*cygwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 + *x86_64*) + case $host_os in + cygwin*|mingw32*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 $as_echo_n "checking whether the compiler supports -Wno-format... " >&6; } if ${ac_cv_cflags__Wno_format+:} false; then : $as_echo_n "(cached) " >&6 @@ -17251,6 +17250,32 @@ $as_echo "$ac_cv_cflags__Wno_format" >&6; } if test "x$ac_cv_cflags__Wno_format" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-format" fi ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -mabi=ms" >&5 +$as_echo_n "checking whether the compiler supports -mabi=ms... " >&6; } +if ${ac_cv_cflags__mabi_ms+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -mabi=ms" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__mabi_ms=yes +else + ac_cv_cflags__mabi_ms=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__mabi_ms" >&5 +$as_echo "$ac_cv_cflags__mabi_ms" >&6; } +if test "x$ac_cv_cflags__mabi_ms" = xyes; then : + MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" +fi ;; + esac ;; esac if test "x$enable_maintainer_mode" = "xyes" diff --git a/configure.ac b/configure.ac index ef7af70..be15cca 100644 --- a/configure.ac +++ b/configure.ac @@ -2022,14 +2022,16 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac - dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; - esac - - dnl mingw uses Windows 64-bit types, not Unix ones - case $host in - x86_64-*mingw32*|x86_64-*cygwin*) WINE_TRY_CFLAGS([-Wno-format]) ;; + *x86_64*) + case $host_os in + dnl Mingw uses Windows 64-bit types, not Unix ones + cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;; + dnl Default to ms_abi on 64-bit + *) WINE_TRY_CFLAGS([-mabi=ms],[MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"]) ;; + esac ;; esac dnl Enable -Werror for maintainer mode diff --git a/loader/Makefile.in b/loader/Makefile.in index a5e04dd..a776c85 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -14,7 +14,7 @@ SOURCES = \ PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) -preloader_EXTRADEFS = $(MSVCRTFLAGS) +preloader_EXTRADEFS = -fno-builtin wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS)

1 0

Alexandre Julliard : makefiles: Build fonts in quiet mode.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: d014b627879d2b4036a5ca5fcc63c423f1898ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=d014b627879d2b4036a5ca5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 21:51:00 2019 +0200 makefiles: Build fonts in quiet mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2c5c503..67ff3b9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2826,7 +2826,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, strarray_add( &make->all_targets, xstrdup( font )); output( "%s: %s %s\n", obj_dir_path( make, font ), tools_path( make, "sfnt2fon" ), ttf_file ); - output( "\t%s -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); + output( "\t%s -q -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); add_install_rule( make, source->name, xstrdup(font), strmake( "d$(fontdir)/%s", font )); } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019