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

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 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: 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 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: 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 : 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 : quartz/dsoundrender: Use BaseFilterImpl_Release().
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: d1536df330f5a206f2f64b1e3a77c2d7a9dca2a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1536df330f5a206f2f64b1e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:56 2019 -0500 quartz/dsoundrender: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 69 ++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 844085a..2b50eae 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -586,6 +586,31 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) return S_OK; } +static void dsound_render_destroy(BaseRenderer *iface) +{ + DSoundRenderImpl *filter = impl_from_BaseRenderer(iface); + + if (filter->threadid) + { + PostThreadMessageW(filter->threadid, WM_APP, 0, 0); + WaitForSingleObject(filter->advisethread, INFINITE); + CloseHandle(filter->advisethread); + } + + if (filter->dsbuffer) + IDirectSoundBuffer_Release(filter->dsbuffer); + filter->dsbuffer = NULL; + if (filter->dsound) + IDirectSound8_Release(filter->dsound); + filter->dsound = NULL; + + BasicAudio_Destroy(&filter->basicAudio); + CloseHandle(filter->blocked); + + strmbase_renderer_cleanup(&filter->renderer); + CoTaskMemFree(filter); +} + static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CheckMediaType, DSoundRender_DoRenderSample, @@ -606,6 +631,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_EndOfStream, DSoundRender_BeginFlush, DSoundRender_EndFlush, + dsound_render_destroy, }; HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -712,41 +738,6 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri return E_NOINTERFACE; } -static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) -{ - DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) - { - if (This->threadid) { - PostThreadMessageW(This->threadid, WM_APP, 0, 0); - WaitForSingleObject(This->advisethread, INFINITE); - CloseHandle(This->advisethread); - } - - if (This->dsbuffer) - IDirectSoundBuffer_Release(This->dsbuffer); - This->dsbuffer = NULL; - if (This->dsound) - IDirectSound8_Release(This->dsound); - This->dsound = NULL; - - BasicAudio_Destroy(&This->basicAudio); - CloseHandle(This->blocked); - - TRACE("Destroying Audio Renderer\n"); - strmbase_renderer_cleanup(&This->renderer); - CoTaskMemFree(This); - - return 0; - } - else - return refCount; -} - static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) { DSoundRenderImpl *This = impl_from_IBaseFilter(iface); @@ -781,7 +772,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = { DSoundRender_QueryInterface, BaseFilterImpl_AddRef, - DSoundRender_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, DSoundRender_Pause, @@ -820,7 +811,7 @@ static ULONG WINAPI Basicaudio_Release(IBasicAudio *iface) { TRACE("(%p/%p)->()\n", This, iface); - return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); + return BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); } /*** IBasicAudio methods ***/ @@ -1016,7 +1007,7 @@ static ULONG WINAPI ReferenceClock_Release(IReferenceClock *iface) TRACE("(%p/%p)->()\n", This, iface); - return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); + return BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); } /*** IReferenceClock methods ***/ @@ -1184,7 +1175,7 @@ static ULONG WINAPI AMDirectSound_Release(IAMDirectSound *iface) TRACE("(%p/%p)->()\n", This, iface); - return DSoundRender_Release(&This->renderer.filter.IBaseFilter_iface); + return BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); } /*** IAMDirectSound methods ***/

1 0

Zebediah Figura : quartz/parser: Get rid of the "fnCleanup" member of ParserImpl.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 461cee2149400f66bcb093d8f134a89c5d96b23c URL: https://source.winehq.org/git/wine.git/?a=commit;h=461cee2149400f66bcb093d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:57 2019 -0500 quartz/parser: Get rid of the "fnCleanup" member of ParserImpl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 8660cf2..3b89ed6 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -30,7 +30,6 @@ struct ParserImpl { BaseFilter filter; - PFN_CLEANUP fnCleanup; PFN_DISCONNECT fnDisconnect; PullPin * pInputPin;

1 0

Zebediah Figura : quartz/parser: Pass a BaseFilterFuncTable to Parser_Create().
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: b883b69e770151cc114bda8af4f7ede1e656036b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b883b69e770151cc114bda8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 23:09:58 2019 -0500 quartz/parser: Pass a BaseFilterFuncTable to Parser_Create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 7 ++++++- dlls/quartz/mpegsplit.c | 7 ++++++- dlls/quartz/parser.c | 12 ++++-------- dlls/quartz/parser.h | 6 ++++-- dlls/quartz/waveparser.c | 7 ++++++- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index a422f45..e6f7c2f 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1429,6 +1429,11 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = Parser_QueryVendorInfo }; +static const BaseFilterFuncTable avi_splitter_func_table = +{ + .filter_get_pin = parser_get_pin, +}; + HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -1449,7 +1454,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->oldindex = NULL; hr = Parser_Create(&This->Parser, &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, - sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, + &avi_splitter_func_table, sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Flush, AVISplitter_Disconnect, AVISplitter_first_request, AVISplitter_done_process, NULL, AVISplitter_seek, NULL); diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index c4cf93b..24e61fe 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -868,6 +868,11 @@ static const IAMStreamSelectVtbl AMStreamSelectVtbl = AMStreamSelect_Enable }; +static const BaseFilterFuncTable mpeg_splitter_func_table = +{ + .filter_get_pin = parser_get_pin, +}; + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { static const WCHAR sink_name[] = {'I','n','p','u','t',0}; @@ -887,7 +892,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) ZeroMemory(This, sizeof(MPEGSplitterImpl)); hr = Parser_Create(&This->Parser, &MPEGSplitter_Vtbl, &CLSID_MPEG1Splitter, - sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, + &mpeg_splitter_func_table, sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index fdefa3d..433502c 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -62,7 +62,7 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) return CONTAINING_RECORD(iface, ParserImpl, filter); } -static IPin *parser_get_pin(BaseFilter *iface, unsigned int index) +IPin *parser_get_pin(BaseFilter *iface, unsigned int index) { ParserImpl *filter = impl_from_BaseFilter(iface); @@ -73,13 +73,9 @@ static IPin *parser_get_pin(BaseFilter *iface, unsigned int index) return filter->ppPins[index]; } -static const BaseFilterFuncTable BaseFuncTable = { - .filter_get_pin = parser_get_pin, -}; - HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, - const CLSID* pClsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE fnProcessSample, - PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, + const CLSID *pClsid, const BaseFilterFuncTable *func_table, const WCHAR *sink_name, + PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup, PFN_DISCONNECT fnDisconnect, REQUESTPROC fnRequest, STOPPROCESSPROC fnDone, SourceSeeking_ChangeStop stop, SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate) @@ -88,7 +84,7 @@ HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, PIN_INFO piInput; /* pTransformFilter is already allocated */ - BaseFilter_Init(&pParser->filter, Parser_Vtbl, pClsid, (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"), &BaseFuncTable); + BaseFilter_Init(&pParser->filter, Parser_Vtbl, pClsid, (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"), func_table); pParser->fnDisconnect = fnDisconnect; diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 3b89ed6..d221eec 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -53,8 +53,8 @@ typedef struct Parser_OutputPin extern HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt); HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl, - const CLSID *clsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE, - PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, PFN_DISCONNECT, + const CLSID *clsid, const BaseFilterFuncTable *func_table, const WCHAR *sink_name, + PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, PFN_DISCONNECT, REQUESTPROC, STOPPROCESSPROC, SourceSeeking_ChangeStop, SourceSeeking_ChangeStart, SourceSeeking_ChangeRate) DECLSPEC_HIDDEN; @@ -76,6 +76,8 @@ extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *p extern HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName); extern HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); +IPin *parser_get_pin(BaseFilter *iface, unsigned int index) DECLSPEC_HIDDEN; + /* COM helpers */ static inline Parser_OutputPin *unsafe_impl_Parser_OutputPin_from_IPin( IPin *iface ) { diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index b21b2e9..6240b78 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -413,6 +413,11 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = Parser_QueryVendorInfo }; +static const BaseFilterFuncTable wave_parser_func_table = +{ + .filter_get_pin = parser_get_pin, +}; + HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -430,7 +435,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This = CoTaskMemAlloc(sizeof(WAVEParserImpl)); hr = Parser_Create(&This->Parser, &WAVEParser_Vtbl, &CLSID_WAVEParser, - sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, + &wave_parser_func_table, sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL);

1 0

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

28 May '19

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