wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Zebediah Figura : winebus.sys: Just report the bus ID when enumerating compatible IDs.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: e83fd91d5ff08045697398ecf131e0abe6d6f3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e83fd91d5ff08045697398ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 12:45:22 2019 -0500 winebus.sys: Just report the bus ID when enumerating compatible IDs. It's the only one we actually match against. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 291ec74..7207e14 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -195,33 +195,14 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - WCHAR *iid, *did, *dst, *ptr; - DWORD len; - - if (!(iid = get_instance_id(device))) - return NULL; - - if (!(did = get_device_id(device))) - { - HeapFree(GetProcessHeap(), 0, iid); - return NULL; - } + WCHAR *dst; - len = strlenW(iid) + strlenW(did) + strlenW(ext->busid) + 4; - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) { - ptr = dst; - strcpyW(ptr, iid); - ptr += strlenW(iid) + 1; - strcpyW(ptr, did); - ptr += strlenW(did) + 1; - strcpyW(ptr, ext->busid); - ptr += strlenW(ext->busid) + 1; - *ptr = 0; + strcpyW(dst, ext->busid); + dst[strlenW(dst) + 1] = 0; } - HeapFree(GetProcessHeap(), 0, iid); - HeapFree(GetProcessHeap(), 0, did); return dst; }

1 0

Zebediah Figura : winebus.sys: Make the device and instance IDs consistent.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: f39adfe914f7503df0474bfed5d802f24b20dd48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f39adfe914f7503df0474bfe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 12:45:21 2019 -0500 winebus.sys: Make the device and instance IDs consistent. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 73e3154..291ec74 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -168,13 +168,26 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) static WCHAR *get_device_id(DEVICE_OBJECT *device) { - static const WCHAR formatW[] = {'%','s','\\','V','i','d','_','%','0','4','x','&','P','i','d','_','%','0','4','x',0}; + static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x', + '&','p','i','d','_','%','0','4','x',0}; + static const WCHAR format_inputW[] = {'%','s','\\','v','i','d','_','%','0','4','x', + '&','p','i','d','_','%','0','4','x','&','%','s','_','%','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - DWORD len = strlenW(ext->busid) + 19; + DWORD len = strlenW(ext->busid) + 34; WCHAR *dst; if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) - sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); + { + if (ext->input == (WORD)-1) + { + sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); + } + else + { + sprintfW(dst, format_inputW, ext->busid, ext->vid, ext->pid, + ext->is_gamepad ? igW : miW, ext->input); + } + } return dst; }

1 0

Zebediah Figura : ntoskrnl.exe: Fix handling of reference string in IoRegisterDeviceInterface().
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 6e999b4a464f0bee025d2fc40e452b7646411ba5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e999b4a464f0bee025d2fc4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 12:45:20 2019 -0500 ntoskrnl.exe: Fix handling of reference string in IoRegisterDeviceInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 85bb9f4..23ae4ca 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -613,26 +613,22 @@ static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, - UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) + UNICODE_STRING *refstr, UNICODE_STRING *symbolic_link) { SP_DEVICE_INTERFACE_DATA sp_iface = {sizeof(sp_iface)}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; struct device_interface *iface; - WCHAR *referenceW = NULL; WCHAR *instance_id; DWORD required; HDEVINFO set; BOOL rc; - TRACE("device %p, class_guid %s, reference_string %s, symbolic_link %p.\n", - device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link); + TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n", + device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link); - if (reference_string != NULL) - referenceW = reference_string->Buffer; - - set = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + set = SetupDiGetClassDevsW( class_guid, NULL, NULL, DIGCF_DEVICEINTERFACE ); if (set == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; status = get_instance_id( device, &instance_id ); @@ -674,7 +670,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla } HeapFree( GetProcessHeap(), 0, instance_id ); - if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, NULL, 0, &sp_iface )) + if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; required = 0;

1 0

Aric Stewart : dinput: Handle case where IOHIDDeviceGetValue fails.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: c5283300e10b289293203a02f765cf757e3e910e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5283300e10b289293203a02… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 4 07:47:35 2019 -0500 dinput: Handle case where IOHIDDeviceGetValue fails. This prevents crashes if a controller disconnects from OS/X. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 540d16b..ba3d56d 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -801,7 +801,11 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) TRACE("kIOHIDElementTypeInput_Button\n"); if(button_idx < 128) { - IOHIDDeviceGetValue(hid_device, element, &valueRef); + valueRef = NULL; + if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) + return; + if (valueRef == NULL) + return; val = IOHIDValueGetIntegerValue(valueRef); newVal = val ? 0x80 : 0x0; oldVal = device->generic.js.rgbButtons[button_idx]; @@ -823,7 +827,11 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) case kHIDUsage_GD_Hatswitch: { TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Hatswitch\n"); - IOHIDDeviceGetValue(hid_device, element, &valueRef); + valueRef = NULL; + if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) + return; + if (valueRef == NULL) + return; val = IOHIDValueGetIntegerValue(valueRef); oldVal = device->generic.js.rgdwPOV[pov_idx]; if (val >= 8) @@ -850,7 +858,11 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) { int wine_obj = -1; - IOHIDDeviceGetValue(hid_device, element, &valueRef); + valueRef = NULL; + if (IOHIDDeviceGetValue(hid_device, element, &valueRef) != kIOReturnSuccess) + return; + if (valueRef == NULL) + return; val = IOHIDValueGetIntegerValue(valueRef); newVal = joystick_map_axis(&device->generic.props[idx], val); switch (usage)

1 0

Alistair Leslie-Hughes : include: Add missing SYMOPT_* defines.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 620da60f7f7939261192680d10012e31426ba5b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=620da60f7f7939261192680d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 4 04:39:48 2019 +0000 include: Add missing SYMOPT_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbghelp.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 4210616..df105a8 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -500,8 +500,16 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 #define SYMOPT_NO_PROMPTS 0x00080000 #define SYMOPT_OVERWRITE 0x00100000 #define SYMOPT_IGNORE_IMAGEDIR 0x00200000 - -#define SYMOPT_DEBUG 0x80000000 +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 +#define SYMOPT_DISABLE_FAST_SYMBOLS 0x10000000 +#define SYMOPT_DISABLE_SYMSRV_TIMEOUT 0x20000000 +#define SYMOPT_DISABLE_SRVSTAR_ON_STARTUP 0x40000000 +#define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME {

1 0

Zebediah Figura : qcap/audiorecord: Use strmbase filter aggregation support.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 320fa4ccfc1f8f1c54698dd27d90ad9ab7157a4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=320fa4ccfc1f8f1c54698dd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 10:01:20 2019 -0500 qcap/audiorecord: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 120 +++++++++++++----------------------------------- 1 file changed, 31 insertions(+), 89 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 9b493c5..e002bb2 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -35,18 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { - IUnknown IUnknown_iface; - IUnknown *outerUnknown; BaseFilter filter; IPersistPropertyBag IPersistPropertyBag_iface; BaseOutputPin *output; } AudioRecord; -static inline AudioRecord *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, AudioRecord, IUnknown_iface); -} - static inline AudioRecord *impl_from_BaseFilter(BaseFilter *filter) { return CONTAINING_RECORD(filter, AudioRecord, filter); @@ -63,75 +56,6 @@ static inline AudioRecord *impl_from_IPersistPropertyBag(IPersistPropertyBag *if return CONTAINING_RECORD(iface, AudioRecord, IPersistPropertyBag_iface); } -static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppv) -{ - AudioRecord *This = impl_from_IUnknown(iface); - if (IsEqualIID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = &This->IUnknown_iface; - } else if (IsEqualIID(riid, &IID_IPersist)) { - TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IMediaFilter)) { - TRACE("(%p)->(IID_IMediaFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IBaseFilter)) { - TRACE("(%p)->(IID_IBaseFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IPersistPropertyBag)) { - TRACE("(%p)->(IID_IPersistPropertyBag, %p)\n", This, ppv); - *ppv = &This->IPersistPropertyBag_iface; - } else { - FIXME("(%p): no interface for %s\n", This, debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI Unknown_AddRef(IUnknown *iface) -{ - AudioRecord *This = impl_from_IUnknown(iface); - return BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI Unknown_Release(IUnknown *iface) -{ - AudioRecord *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->filter.refcount); - TRACE("(%p/%p)->() ref=%d\n", iface, This, ref); - if (!ref) { - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - } - return ref; -} - -static const IUnknownVtbl UnknownVtbl = { - Unknown_QueryInterface, - Unknown_AddRef, - Unknown_Release -}; - -static HRESULT WINAPI AudioRecord_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - AudioRecord *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(This->outerUnknown, riid, ppv); -} - -static ULONG WINAPI AudioRecord_AddRef(IBaseFilter *iface) -{ - AudioRecord *This = impl_from_IBaseFilter(iface); - return IUnknown_AddRef(This->outerUnknown); -} - -static ULONG WINAPI AudioRecord_Release(IBaseFilter *iface) -{ - AudioRecord *This = impl_from_IBaseFilter(iface); - return IUnknown_Release(This->outerUnknown); -} - static HRESULT WINAPI AudioRecord_Stop(IBaseFilter *iface) { AudioRecord *This = impl_from_IBaseFilter(iface); @@ -154,9 +78,9 @@ static HRESULT WINAPI AudioRecord_Run(IBaseFilter *iface, REFERENCE_TIME tStart) } static const IBaseFilterVtbl AudioRecordVtbl = { - AudioRecord_QueryInterface, - AudioRecord_AddRef, - AudioRecord_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, AudioRecord_Stop, AudioRecord_Pause, @@ -177,26 +101,49 @@ static IPin *audio_record_get_pin(BaseFilter *iface, unsigned int index) return NULL; } +static void audio_record_destroy(BaseFilter *iface) +{ + AudioRecord *filter = impl_from_BaseFilter(iface); + + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + +static HRESULT audio_record_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + AudioRecord *filter = impl_from_BaseFilter(iface); + + if (IsEqualGUID(iid, &IID_IPersistPropertyBag)) + *out = &filter->IPersistPropertyBag_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseFilterFuncTable AudioRecordFuncs = { .filter_get_pin = audio_record_get_pin, + .filter_destroy = audio_record_destroy, + .filter_query_interface = audio_record_query_interface, }; static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, LPVOID *ppv) { AudioRecord *This = impl_from_IPersistPropertyBag(iface); - return IUnknown_QueryInterface(This->outerUnknown, riid, ppv); + return IUnknown_QueryInterface(This->filter.outer_unk, riid, ppv); } static ULONG WINAPI PPB_AddRef(IPersistPropertyBag *iface) { AudioRecord *This = impl_from_IPersistPropertyBag(iface); - return IUnknown_AddRef(This->outerUnknown); + return IUnknown_AddRef(This->filter.outer_unk); } static ULONG WINAPI PPB_Release(IPersistPropertyBag *iface) { AudioRecord *This = impl_from_IPersistPropertyBag(iface); - return IUnknown_Release(This->outerUnknown); + return IUnknown_Release(This->filter.outer_unk); } static HRESULT WINAPI PPB_GetClassID(IPersistPropertyBag *iface, CLSID *pClassID) @@ -264,16 +211,11 @@ IUnknown* WINAPI QCAP_createAudioCaptureFilter(IUnknown *outer, HRESULT *phr) return NULL; } memset(This, 0, sizeof(*This)); - This->IUnknown_iface.lpVtbl = &UnknownVtbl; This->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; - if (outer) - This->outerUnknown = outer; - else - This->outerUnknown = &This->IUnknown_iface; - strmbase_filter_init(&This->filter, &AudioRecordVtbl, NULL, &CLSID_AudioRecord, + strmbase_filter_init(&This->filter, &AudioRecordVtbl, outer, &CLSID_AudioRecord, (DWORD_PTR)(__FILE__ ": AudioRecord.csFilter"), &AudioRecordFuncs); *phr = S_OK; - return &This->IUnknown_iface; + return &This->filter.IUnknown_inner; }

1 0

Zebediah Figura : quartz/vmr9: Use strmbase filter aggregation support.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: a7f27388a0f96c5fabccd46e4a4ad67d8202523d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f27388a0f96c5fabccd46e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 10:01:19 2019 -0500 quartz/vmr9: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 347 ++++++++++++++++------------------------------------- 1 file changed, 104 insertions(+), 243 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7f27388a0f96c5fabcc…

1 0

Zebediah Figura : quartz/videorenderer: Use strmbase filter aggregation support.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 105539f735ea2b7c4479e5277c76f56560883005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=105539f735ea2b7c4479e527… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 10:01:18 2019 -0500 quartz/videorenderer: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 169 ++++++++++++-------------------------------- 1 file changed, 45 insertions(+), 124 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 182d5e8..4f279b0 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -46,9 +46,6 @@ typedef struct VideoRendererImpl BaseControlWindow baseControlWindow; BaseControlVideo baseControlVideo; - IUnknown IUnknown_inner; - IUnknown *outer_unk; - BOOL init; HANDLE hThread; @@ -386,6 +383,36 @@ static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) return BaseRendererImpl_EndFlush(iface); } +static void video_renderer_destroy(BaseRenderer *iface) +{ + VideoRendererImpl *filter = impl_from_BaseRenderer(iface); + + BaseControlWindow_Destroy(&filter->baseControlWindow); + BaseControlVideo_Destroy(&filter->baseControlVideo); + PostThreadMessageW(filter->ThreadID, WM_QUIT, 0, 0); + WaitForSingleObject(filter->hThread, INFINITE); + CloseHandle(filter->hThread); + CloseHandle(filter->hEvent); + + strmbase_renderer_cleanup(&filter->renderer); + CoTaskMemFree(filter); +} + +static HRESULT video_renderer_query_interface(BaseRenderer *iface, REFIID iid, void **out) +{ + VideoRendererImpl *filter = impl_from_BaseRenderer(iface); + + if (IsEqualGUID(iid, &IID_IBasicVideo)) + *out = &filter->baseControlVideo.IBasicVideo_iface; + else if (IsEqualGUID(iid, &IID_IVideoWindow)) + *out = &filter->baseControlWindow.IVideoWindow_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static VOID WINAPI VideoRenderer_OnStopStreaming(BaseRenderer* iface) { VideoRendererImpl *This = impl_from_BaseRenderer(iface); @@ -469,6 +496,8 @@ static const BaseRendererFuncTable BaseFuncTable = { NULL, NULL, VideoRenderer_EndFlush, + video_renderer_destroy, + video_renderer_query_interface, }; static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { @@ -639,106 +668,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_SetTargetRect }; -static inline VideoRendererImpl *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, VideoRendererImpl, IUnknown_inner); -} - -static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - VideoRendererImpl *This = impl_from_IUnknown(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IUnknown_inner; - else if (IsEqualIID(riid, &IID_IBasicVideo)) - *ppv = &This->baseControlVideo.IBasicVideo_iface; - else if (IsEqualIID(riid, &IID_IVideoWindow)) - *ppv = &This->baseControlWindow.IVideoWindow_iface; - else - { - HRESULT hr; - hr = BaseRendererImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppv); - if (SUCCEEDED(hr)) - return hr; - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin)) - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); - - return E_NOINTERFACE; -} - -static ULONG WINAPI VideoRendererInner_AddRef(IUnknown *iface) -{ - VideoRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseFilterImpl_AddRef(&This->renderer.filter.IBaseFilter_iface); - - TRACE("(%p)->(): new ref = %d\n", This, refCount); - - return refCount; -} - -static ULONG WINAPI VideoRendererInner_Release(IUnknown *iface) -{ - VideoRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = InterlockedDecrement(&This->renderer.filter.refcount); - - TRACE("(%p)->(): new ref = %d\n", This, refCount); - - if (!refCount) - { - BaseControlWindow_Destroy(&This->baseControlWindow); - BaseControlVideo_Destroy(&This->baseControlVideo); - PostThreadMessageW(This->ThreadID, WM_QUIT, 0, 0); - WaitForSingleObject(This->hThread, INFINITE); - CloseHandle(This->hThread); - CloseHandle(This->hEvent); - - TRACE("Destroying Video Renderer\n"); - strmbase_renderer_cleanup(&This->renderer); - CoTaskMemFree(This); - - return 0; - } - else - return refCount; -} - -static const IUnknownVtbl IInner_VTable = -{ - VideoRendererInner_QueryInterface, - VideoRendererInner_AddRef, - VideoRendererInner_Release -}; - -static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - VideoRendererImpl *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); -} - -static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) -{ - VideoRendererImpl *This = impl_from_IBaseFilter(iface); - return IUnknown_AddRef(This->outer_unk); -} - -static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) -{ - VideoRendererImpl *This = impl_from_IBaseFilter(iface); - return IUnknown_Release(This->outer_unk); -} - /** IMediaFilter methods **/ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) @@ -767,9 +696,9 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) static const IBaseFilterVtbl VideoRenderer_Vtbl = { - VideoRenderer_QueryInterface, - VideoRenderer_AddRef, - VideoRenderer_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, VideoRenderer_Pause, @@ -791,7 +720,7 @@ static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo *iface, REFIID riid, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); } static ULONG WINAPI BasicVideo_AddRef(IBasicVideo *iface) @@ -800,7 +729,7 @@ static ULONG WINAPI BasicVideo_AddRef(IBasicVideo *iface) TRACE("(%p/%p)->()\n", This, iface); - return IUnknown_AddRef(This->outer_unk); + return IUnknown_AddRef(This->renderer.filter.outer_unk); } static ULONG WINAPI BasicVideo_Release(IBasicVideo *iface) @@ -809,7 +738,7 @@ static ULONG WINAPI BasicVideo_Release(IBasicVideo *iface) TRACE("(%p/%p)->()\n", This, iface); - return IUnknown_Release(This->outer_unk); + return IUnknown_Release(This->renderer.filter.outer_unk); } static const IBasicVideoVtbl IBasicVideo_VTable = @@ -863,7 +792,7 @@ static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID rii TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); } static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) @@ -872,7 +801,7 @@ static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) TRACE("(%p/%p)->()\n", This, iface); - return IUnknown_AddRef(This->outer_unk); + return IUnknown_AddRef(This->renderer.filter.outer_unk); } static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) @@ -881,7 +810,7 @@ static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) TRACE("(%p/%p)->()\n", This, iface); - return IUnknown_Release(This->outer_unk); + return IUnknown_Release(This->renderer.filter.outer_unk); } static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, @@ -977,18 +906,15 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_IsCursorHidden }; -HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) +HRESULT VideoRenderer_create(IUnknown *outer, void **out) { static const WCHAR sink_name[] = {'I','n',0}; HRESULT hr; VideoRendererImpl * pVideoRenderer; - TRACE("(%p, %p)\n", pUnkOuter, ppv); - - *ppv = NULL; + *out = NULL; pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); - pVideoRenderer->IUnknown_inner.lpVtbl = &IInner_VTable; pVideoRenderer->init = FALSE; ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); @@ -996,13 +922,8 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); pVideoRenderer->FullScreenMode = OAFALSE; - if (pUnkOuter) - pVideoRenderer->outer_unk = pUnkOuter; - else - pVideoRenderer->outer_unk = &pVideoRenderer->IUnknown_inner; - hr = strmbase_renderer_init(&pVideoRenderer->renderer, &VideoRenderer_Vtbl, - NULL, &CLSID_VideoRenderer, sink_name, + outer, &CLSID_VideoRenderer, sink_name, (DWORD_PTR)(__FILE__ ": VideoRendererImpl.csFilter"), &BaseFuncTable); if (FAILED(hr)) @@ -1025,7 +946,7 @@ HRESULT VideoRenderer_create(IUnknown *pUnkOuter, void **ppv) goto fail; } - *ppv = &pVideoRenderer->IUnknown_inner; + *out = &pVideoRenderer->renderer.filter.IUnknown_inner; return S_OK; fail:

1 0

Zebediah Figura : strmbase: Support aggregation in the base filter.
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: 31a5cb5f0531838fbd8c2c295846ca0c786ab99b URL: https://source.winehq.org/git/wine.git/?a=commit;h=31a5cb5f0531838fbd8c2c29… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 10:01:17 2019 -0500 strmbase: Support aggregation in the base filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 +- dlls/qcap/audiorecord.c | 4 +- dlls/qcap/avico.c | 6 +-- dlls/qcap/avimux.c | 13 ++--- dlls/qcap/smartteefilter.c | 4 +- dlls/qcap/tests/avico.c | 10 ++-- dlls/qcap/tests/avimux.c | 3 +- dlls/qcap/vfwcapture.c | 5 +- dlls/qedit/nullrenderer.c | 4 +- dlls/qedit/samplegrabber.c | 4 +- dlls/quartz/avisplit.c | 13 ++--- dlls/quartz/dsoundrender.c | 14 ++--- dlls/quartz/filesource.c | 10 ++-- dlls/quartz/mpegsplit.c | 14 ++--- dlls/quartz/parser.c | 9 ++-- dlls/quartz/parser.h | 2 +- dlls/quartz/tests/avisplit.c | 3 +- dlls/quartz/tests/dsoundrender.c | 3 +- dlls/quartz/tests/filesource.c | 3 +- dlls/quartz/tests/mpegsplit.c | 3 +- dlls/quartz/tests/waveparser.c | 3 +- dlls/quartz/videorenderer.c | 4 +- dlls/quartz/vmr9.c | 6 +-- dlls/quartz/waveparser.c | 13 ++--- dlls/strmbase/filter.c | 108 +++++++++++++++++++++++++-------------- dlls/strmbase/renderer.c | 8 +-- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gstdemux.c | 14 ++--- dlls/wineqtdecoder/qtsplitter.c | 9 ++-- include/wine/strmbase.h | 28 +++++----- 30 files changed, 159 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31a5cb5f0531838fbd8c…

1 0

Zebediah Figura : qcap/avico: Use BaseFilterImpl_QueryInterface().
by Alexandre Julliard 04 Jun '19

04 Jun '19

Module: wine Branch: master Commit: d6a44a9187715349fcc2eed21f48af784eb12a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a44a9187715349fcc2eed2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 10:01:16 2019 -0500 qcap/avico: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 67e7f50..cfb23e8 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -117,36 +117,6 @@ static HRESULT fill_format_info(AVICompressor *This, VIDEOINFOHEADER *src_videoi return S_OK; } -static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - - if(IsEqualIID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IPersist)) { - TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IMediaFilter)) { - TRACE("(%p)->(IID_IMediaFilter %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IBaseFilter)) { - TRACE("(%p)->(IID_IBaseFilter %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IPersistPropertyBag)) { - TRACE("(%p)->(IID_IPersistPropertyBag %p)\n", This, ppv); - *ppv = &This->IPersistPropertyBag_iface; - }else { - FIXME("no interface for %s\n", debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - -} - static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -205,7 +175,7 @@ static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR * } static const IBaseFilterVtbl AVICompressorVtbl = { - AVICompressor_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -253,9 +223,23 @@ static void avi_compressor_destroy(BaseFilter *iface) heap_free(filter); } +static HRESULT avi_compressor_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + AVICompressor *filter = impl_from_BaseFilter(iface); + + if (IsEqualGUID(iid, &IID_IPersistPropertyBag)) + *out = &filter->IPersistPropertyBag_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseFilterFuncTable filter_func_table = { .filter_get_pin = avi_compressor_get_pin, .filter_destroy = avi_compressor_destroy, + .filter_query_interface = avi_compressor_query_interface, }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface)

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
87
Older →

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 June 2019