September 2019 - Wine-Commits

Jacek Caban : include: Add threadpoolapiset.h file.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 8bbdfbceed4944be83021ee5e6f91cb1659b94a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bbdfbceed4944be83021ee5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 15:51:59 2019 +0200 include: Add threadpoolapiset.h file. Based on patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/threadpoolapiset.h | 65 ++++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 29 +-------------------- include/winnt.h | 1 - 4 files changed, 67 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bbdfbceed4944be8302…

1 0

Hans Leidekker : webservices: Add support for writing WS_ENUM_TYPE values.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 7236d982c9e922bf0e15685ae3a25e1d154d710a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7236d982c9e922bf0e15685a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 25 14:29:57 2019 +0200 webservices: Add support for writing WS_ENUM_TYPE values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 35 +++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 905f397b64..18c4b7e284 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -553,6 +553,11 @@ static void test_WsWriteType(void) WS_XML_WRITER *writer; WS_XML_STRING prefix = {1, (BYTE*)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; const WCHAR *val_str; + enum {ONE = 1, TWO = 2}; + WS_XML_STRING one = {3, (BYTE *)"ONE" }, two = {3, (BYTE *)"TWO"}; + WS_ENUM_VALUE enum_values[] = {{ONE, &one}, {TWO, &two}}; + WS_ENUM_DESCRIPTION enum_desc; + int val_enum; hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -637,6 +642,36 @@ static void test_WsWriteType(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + enum_desc.values = enum_values; + enum_desc.valueCount = ARRAY_SIZE(enum_values); + enum_desc.maxByteCount = 3; + enum_desc.nameIndices = NULL; + + val_enum = 0; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + val_enum = 3; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + val_enum = ONE; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">ONE</p:str>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4d75e859d0..f750859fbc 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3876,6 +3876,35 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping return S_OK; } +static const WS_XML_STRING *get_enum_value_name( const WS_ENUM_DESCRIPTION *desc, int value ) +{ + ULONG i; + for (i = 0; i < desc->valueCount; i++) + { + if (desc->values[i].value == value) return desc->values[i].name; + } + return NULL; +} + +static HRESULT write_type_enum( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_ENUM_DESCRIPTION *desc, WS_WRITE_OPTION option, + const void *value, ULONG size ) +{ + const WS_XML_STRING *name; + WS_XML_UTF8_TEXT utf8; + const int *ptr; + HRESULT hr; + + if (!desc) return E_INVALIDARG; + if ((hr = get_value_ptr( option, value, size, sizeof(*ptr), (const void **)&ptr )) != S_OK) return hr; + if (!(name = get_enum_value_name( desc, *ptr ))) return E_INVALIDARG; + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = name->bytes; + utf8.value.length = name->length; + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -3939,6 +3968,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_STRUCT_TYPE: return write_type_struct( writer, mapping, desc, option, value, size ); + case WS_ENUM_TYPE: + return write_type_enum( writer, mapping, desc, option, value, size ); + default: FIXME( "type %u not supported\n", type ); return E_NOTIMPL;

1 0

Zhiyi Zhang : winex11.drv: Handle XRandR not reporting any providers.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: ffd4caa5f0e401cf973078fbbd54e4950d408792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd4caa5f0e401cf973078fb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 15:28:15 2019 +0800 winex11.drv: Handle XRandR not reporting any providers. Some XRandR implementations, e.g., the QXL driver used on Debian 10 TestBots, don't report any providers. In this case, we can still search in XRandR screen resources to get adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 2a1c7ce594..6bb2b18ce7 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -662,6 +662,7 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { + static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; struct x11drv_gpu *gpus = NULL; XRRScreenResources *screen_resources = NULL; XRRProviderResources *provider_resources = NULL; @@ -680,10 +681,22 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) if (!provider_resources) goto done; - gpus = heap_calloc( provider_resources->nproviders, sizeof(*gpus) ); + gpus = heap_calloc( provider_resources->nproviders ? provider_resources->nproviders : 1, sizeof(*gpus) ); if (!gpus) goto done; + /* Some XRandR implementations don't support providers. + * In this case, report a fake one to try searching adapters in screen resources */ + if (!provider_resources->nproviders) + { + WARN("XRandR implementation doesn't report any providers, faking one.\n"); + lstrcpyW( gpus[0].name, wine_adapterW ); + *new_gpus = gpus; + *count = 1; + ret = TRUE; + goto done; + } + primary_rect = get_primary_rect( screen_resources ); for (i = 0; i < provider_resources->nproviders; ++i) { @@ -751,6 +764,8 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new XRRProviderInfo *provider_info = NULL; XRRCrtcInfo *enum_crtc_info, *crtc_info = NULL; XRROutputInfo *output_info = NULL; + RROutput *outputs; + INT crtc_count, output_count; INT primary_adapter = 0; INT adapter_count = 0; BOOL mirrored, detached; @@ -762,19 +777,33 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!screen_resources) goto done; - provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); - if (!provider_info) - goto done; + if (gpu_id) + { + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); + if (!provider_info) + goto done; + + crtc_count = provider_info->ncrtcs; + output_count = provider_info->noutputs; + outputs = provider_info->outputs; + } + /* Fake provider id, search adapters in screen resources */ + else + { + crtc_count = screen_resources->ncrtc; + output_count = screen_resources->noutput; + outputs = screen_resources->outputs; + } /* Actual adapter count could be less */ - adapters = heap_calloc( provider_info->ncrtcs, sizeof(*adapters) ); + adapters = heap_calloc( crtc_count, sizeof(*adapters) ); if (!adapters) goto done; primary_rect = get_primary_rect( screen_resources ); - for (i = 0; i < provider_info->noutputs; ++i) + for (i = 0; i < output_count; ++i) { - output_info = pXRRGetOutputInfo( gdi_display, screen_resources, provider_info->outputs[i] ); + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, outputs[i] ); if (!output_info) goto done; @@ -830,7 +859,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new { /* Use RROutput as adapter id. The reason of not using RRCrtc is that we need to detect inactive but * attached monitors */ - adapters[adapter_count].id = provider_info->outputs[i]; + adapters[adapter_count].id = outputs[i]; if (!detached) adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; if (is_crtc_primary( primary_rect, crtc_info ))

1 0

Zhiyi Zhang : winemac.drv: Trace display device counts.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 20336127a480037dfaf469ffc2727511c55fab11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20336127a480037dfaf469ff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 07:16:11 2019 -0500 winemac.drv: Trace display device counts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index cb9f1ebcab..cc5e9beaff 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1658,6 +1658,7 @@ void macdrv_init_display_devices(BOOL force) /* Initialize GPUs */ if (macdrv_get_gpus(&gpus, &gpu_count)) goto done; + TRACE("GPU count: %d\n", gpu_count); for (gpu = 0; gpu < gpu_count; gpu++) { @@ -1667,11 +1668,13 @@ void macdrv_init_display_devices(BOOL force) /* Initialize adapters */ if (macdrv_get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + TRACE("GPU: %#llx %s, adapter count: %d\n", gpus[gpu].id, gpus[gpu].name, adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { if (macdrv_get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; + TRACE("adapter: %#x, monitor count: %d\n", adapters[adapter].id, monitor_count); if (!macdrv_init_adapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) @@ -1680,6 +1683,7 @@ void macdrv_init_display_devices(BOOL force) /* Initialize monitors */ for (monitor = 0; monitor < monitor_count; monitor++) { + TRACE("monitor: %#x %s\n", monitor, monitors[monitor].name); if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) goto done; }

1 0

Zebediah Figura : qcap/smartteefilter: Use BasePinImpl_EnumMediaTypes().
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: be5c7ed5910ff6843ee3f5e4faa43927ae32b771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5c7ed5910ff6843ee3f5e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:14 2019 -0500 qcap/smartteefilter: Use BasePinImpl_EnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 78 ++++++++++++---------------------------------- dlls/strmbase/pin.c | 7 +++++ 2 files changed, 27 insertions(+), 58 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 7bb053d550..e7ff5f9b34 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -57,11 +57,6 @@ static inline SmartTeeFilter *impl_from_strmbase_pin(struct strmbase_pin *pin) return impl_from_strmbase_filter(pin->filter); } -static inline SmartTeeFilter *impl_from_IPin(IPin *iface) -{ - return impl_from_strmbase_filter(CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface)->filter); -} - static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) { SmartTeeFilter *This = impl_from_IBaseFilter(iface); @@ -327,20 +322,6 @@ static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = .pfnReceive = SmartTeeFilterInput_Receive, }; -static HRESULT WINAPI SmartTeeFilterCapture_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppEnum); - EnterCriticalSection(&This->filter.csFilter); - if (This->sink.pin.pConnectedTo) - hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - else - hr = VFW_E_NOT_CONNECTED; - LeaveCriticalSection(&This->filter.csFilter); - return hr; -} - static const IPinVtbl SmartTeeFilterCaptureVtbl = { BaseOutputPinImpl_QueryInterface, BasePinImpl_AddRef, @@ -354,7 +335,7 @@ static const IPinVtbl SmartTeeFilterCaptureVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - SmartTeeFilterCapture_EnumMediaTypes, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -368,16 +349,23 @@ static HRESULT capture_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT capture_get_media_type(struct strmbase_pin *base, - unsigned int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, + unsigned int index, AM_MEDIA_TYPE *mt) { - SmartTeeFilter *This = impl_from_strmbase_pin(base); - TRACE("(%p, %d, %p)\n", This, iPosition, amt); - if (iPosition == 0) { - CopyMediaType(amt, &This->sink.pin.mtCurrent); - return S_OK; - } else - return S_FALSE; + SmartTeeFilter *filter = impl_from_strmbase_pin(iface); + HRESULT hr = S_OK; + + EnterCriticalSection(&filter->filter.csFilter); + + if (!filter->sink.pin.pConnectedTo) + hr = VFW_E_NOT_CONNECTED; + else if (!index) + CopyMediaType(mt, &filter->sink.pin.mtCurrent); + else + hr = VFW_S_NO_MORE_ITEMS; + + LeaveCriticalSection(&filter->filter.csFilter); + return hr; } static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_source *base, @@ -393,25 +381,11 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_sour static const struct strmbase_source_ops capture_ops = { .base.pin_query_accept = capture_query_accept, - .base.pin_get_media_type = capture_get_media_type, + .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = SmartTeeFilterCapture_DecideAllocator, }; -static HRESULT WINAPI SmartTeeFilterPreview_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) -{ - SmartTeeFilter *This = impl_from_IPin(iface); - HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppEnum); - EnterCriticalSection(&This->filter.csFilter); - if (This->sink.pin.pConnectedTo) - hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - else - hr = VFW_E_NOT_CONNECTED; - LeaveCriticalSection(&This->filter.csFilter); - return hr; -} - static const IPinVtbl SmartTeeFilterPreviewVtbl = { BaseOutputPinImpl_QueryInterface, BasePinImpl_AddRef, @@ -425,7 +399,7 @@ static const IPinVtbl SmartTeeFilterPreviewVtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - SmartTeeFilterPreview_EnumMediaTypes, + BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, @@ -439,18 +413,6 @@ static HRESULT preview_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT preview_get_media_type(struct strmbase_pin *base, - unsigned int iPosition, AM_MEDIA_TYPE *amt) -{ - SmartTeeFilter *This = impl_from_strmbase_pin(base); - TRACE("(%p, %d, %p)\n", This, iPosition, amt); - if (iPosition == 0) { - CopyMediaType(amt, &This->sink.pin.mtCurrent); - return S_OK; - } else - return S_FALSE; -} - static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_source *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { @@ -464,7 +426,7 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_sour static const struct strmbase_source_ops preview_ops = { .base.pin_query_accept = preview_query_accept, - .base.pin_get_media_type = preview_get_media_type, + .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = SmartTeeFilterPreview_DecideAllocator, }; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 403e468550..2cc6ef5259 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -295,9 +295,16 @@ HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) { struct strmbase_pin *pin = impl_from_IPin(iface); + AM_MEDIA_TYPE mt; + HRESULT hr; TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types); + if (FAILED(hr = pin->pFuncsTable->pin_get_media_type(pin, 0, &mt))) + return hr; + if (hr == S_OK) + FreeMediaType(&mt); + return enum_media_types_create(pin, enum_media_types); }

1 0

Zebediah Figura : qcap/vfwcapture: Use more strmbase pin methods.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: b28e37247099f97d34faacf3059de6ea91fa48f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28e37247099f97d34faacf3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:13 2019 -0500 qcap/vfwcapture: Use more strmbase pin methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index a5664b7c1c..e5278152ed 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -586,28 +586,6 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static HRESULT WINAPI -VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) -{ - VfwCapture *filter = impl_from_IPin(iface); - AM_MEDIA_TYPE *pmt; - HRESULT hr; - - hr = qcap_driver_get_format(filter->driver_info, &pmt); - if (SUCCEEDED(hr)) { - hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); - DeleteMediaType(pmt); - } - return hr; -} - -static HRESULT WINAPI -VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) -{ - TRACE("(%p)->(%p, %p)\n", iface, apPin, cPin); - return E_NOTIMPL; -} - static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, @@ -622,8 +600,8 @@ static const IPinVtbl VfwPin_Vtbl = BasePinImpl_QueryDirection, BasePinImpl_QueryId, BasePinImpl_QueryAccept, - VfwPin_EnumMediaTypes, - VfwPin_QueryInternalConnections, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush,

1 0

Zebediah Figura : strmbase: Pass an unsigned index to pin_get_media_type().
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: b0e47ab9e719981ba2dacb2d2cf6f7c0ed91d05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0e47ab9e719981ba2dacb2d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:12 2019 -0500 strmbase: Pass an unsigned index to pin_get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 +--- dlls/qcap/avimux.c | 4 +--- dlls/qcap/smartteefilter.c | 9 ++++++--- dlls/qcap/vfwcapture.c | 5 ++--- dlls/quartz/filesource.c | 6 ++---- dlls/strmbase/pin.c | 5 +---- dlls/strmbase/transform.c | 4 +--- dlls/winegstreamer/gstdemux.c | 7 +------ dlls/wineqtdecoder/qtsplitter.c | 4 +--- include/wine/strmbase.h | 4 ++-- 10 files changed, 18 insertions(+), 34 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 43cca04a06..33d1c7fab2 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -526,12 +526,10 @@ static const IPinVtbl AVICompressorOutputPinVtbl = { BasePinImpl_NewSegment }; -static HRESULT source_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt) { AVICompressor *This = impl_from_strmbase_filter(base->filter); - TRACE("(%p)->(%d %p)\n", base, iPosition, amt); - if(iPosition || !This->videoinfo) return S_FALSE; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f969e73a8c..42b198deea 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1174,12 +1174,10 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, return BaseOutputPinImpl_AttemptConnection(base, pReceivePin, pmt); } -static HRESULT source_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt) { TRACE("(%p)->(%d %p)\n", base, iPosition, amt); - if(iPosition < 0) - return E_INVALIDARG; if(iPosition > 0) return VFW_S_NO_MORE_ITEMS; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 390bfa8e20..7bb053d550 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -179,7 +179,8 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE return S_OK; } -static HRESULT sink_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT sink_get_media_type(struct strmbase_pin *base, + unsigned int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_strmbase_pin(base); HRESULT hr; @@ -367,7 +368,8 @@ static HRESULT capture_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT capture_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT capture_get_media_type(struct strmbase_pin *base, + unsigned int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_strmbase_pin(base); TRACE("(%p, %d, %p)\n", This, iPosition, amt); @@ -437,7 +439,8 @@ static HRESULT preview_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY return S_OK; } -static HRESULT preview_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT preview_get_media_type(struct strmbase_pin *base, + unsigned int iPosition, AM_MEDIA_TYPE *amt) { SmartTeeFilter *This = impl_from_strmbase_pin(base); TRACE("(%p, %d, %p)\n", This, iPosition, amt); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 551dad61f3..a5664b7c1c 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -518,14 +518,13 @@ static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE return qcap_driver_check_format(filter->driver_info, mt); } -static HRESULT source_get_media_type(struct strmbase_pin *pin, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *pin, + unsigned int iPosition, AM_MEDIA_TYPE *pmt) { VfwCapture *filter = impl_from_strmbase_pin(pin); AM_MEDIA_TYPE *vfw_pmt; HRESULT hr; - if (iPosition < 0) - return E_INVALIDARG; if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 031307e183..160b814738 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -591,13 +591,11 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY return S_FALSE; } -static HRESULT source_get_media_type(struct strmbase_pin *iface, int index, AM_MEDIA_TYPE *mt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { AsyncReader *filter = impl_from_strmbase_pin(iface); - if (index < 0) - return E_INVALIDARG; - else if (index > 1) + if (index > 1) return VFW_S_NO_MORE_ITEMS; if (index == 0) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4a7b3b20bf..403e468550 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -152,11 +152,8 @@ static BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype))); } -/*** Common Base Pin function */ -HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - if (iPosition < 0) - return E_INVALIDARG; return VFW_S_NO_MORE_ITEMS; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index fc2f0b1d2d..fa041b66bd 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -110,12 +110,10 @@ static HRESULT WINAPI TransformFilter_Output_DecideBufferSize(struct strmbase_so return pTransformFilter->pFuncsTable->pfnDecideBufferSize(pTransformFilter, pAlloc, ppropInputRequest); } -static HRESULT source_get_media_type(struct strmbase_pin *This, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *This, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { TransformFilter *pTransform = impl_from_source_IPin(&This->IPin_iface); - if (iPosition < 0) - return E_INVALIDARG; if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; CopyMediaType(pmt, &pTransform->pmt); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b9ff1fdc03..de3bc99687 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1799,15 +1799,10 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP return S_OK; } -static HRESULT source_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { struct gstdemux_source *This = impl_source_from_IPin(&iface->IPin_iface); - TRACE("(%p)->(%i, %p)\n", This, iPosition, pmt); - - if (iPosition < 0) - return E_INVALIDARG; - if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 17d22b4d8d..d3b9596375 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1295,12 +1295,10 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP return S_OK; } -static HRESULT source_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { QTOutPin *This = impl_sink_from_strmbase_pin(iface); - if (iPosition < 0) - return E_INVALIDARG; if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; CopyMediaType(pmt, This->pmt); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index fc18b22d6d..65ba180caa 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -46,7 +46,7 @@ typedef struct BasePinFuncTable { /* Required for QueryAccept(), Connect(), ReceiveConnection(). */ HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); /* Required for EnumMediaTypes(). */ - HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt); + HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); } BasePinFuncTable; struct strmbase_source @@ -95,7 +95,7 @@ typedef struct BaseInputPinFuncTable { } BaseInputPinFuncTable; /* Base Pin */ -HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt); +HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); LONG WINAPI BasePinImpl_GetMediaTypeVersion(struct strmbase_pin *pin); ULONG WINAPI BasePinImpl_AddRef(IPin *iface); ULONG WINAPI BasePinImpl_Release(IPin *iface);

1 0

Zebediah Figura : strmbase: Rename pfnGetMediaType() to pin_get_media_type().
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: f46fe6d3717f720850f3e2beb12596637bb197a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46fe6d3717f720850f3e2be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 24 19:10:11 2019 -0500 strmbase: Rename pfnGetMediaType() to pin_get_media_type(). And remove the unnecessary calling convention. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 21 ++++++--------------- dlls/qcap/avimux.c | 11 +++-------- dlls/qcap/smartteefilter.c | 12 ++++++------ dlls/qcap/vfwcapture.c | 4 ++-- dlls/quartz/filesource.c | 4 ++-- dlls/strmbase/mediatype.c | 4 ++-- dlls/strmbase/pin.c | 2 +- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 12 ++++++------ dlls/wineqtdecoder/qtsplitter.c | 6 +++--- include/wine/strmbase.h | 7 ++----- 12 files changed, 37 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f46fe6d3717f720850f3…

1 0

Gabriel Ivăncescu : msscript.ocx: Partially implement IScriptControl::ExecuteStatement.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 54b24725566d7bcd7dc659ddfe21f9e918f69bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b24725566d7bcd7dc659dd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 25 17:01:44 2019 +0200 msscript.ocx: Partially implement IScriptControl::ExecuteStatement. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c615e63ed4..816a99dd6c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1023,8 +1023,10 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(statement)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(statement)); + + return parse_script_text(This, statement, 0, NULL); } static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res)

1 0

Jacek Caban : scrobj: Add property element parser support.
by Alexandre Julliard Sept. 25, 2019

Sept. 25, 2019

Module: wine Branch: master Commit: 47e7d4bea23ed21bad896547f167a96db2e67e9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47e7d4bea23ed21bad896547… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:22:31 2019 +0200 scrobj: Add property element parser support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 143 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 116 insertions(+), 27 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 29116e29b1..736dce9557 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -55,11 +55,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrobj); static HINSTANCE scrobj_instance; +enum member_type +{ + MEMBER_METHOD, + MEMBER_PROPERTY +}; + +#define PROP_GETTER 0x01 +#define PROP_SETTER 0x02 + struct scriptlet_member { struct list entry; + enum member_type type; WCHAR *name; - struct list parameters; + union + { + struct list parameters; + unsigned int flags; + } u; }; struct method_parameter @@ -1223,10 +1237,14 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) { - struct scriptlet_member *member; + struct scriptlet_member *member, *member_iter; + enum member_type member_type; XmlNodeType node_type; + BOOL empty; HRESULT hres; + TRACE("\n"); + if (factory->have_public) { FIXME("duplicated public element\n"); @@ -1246,29 +1264,53 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) } if (is_xml_name(factory, L"method")) + member_type = MEMBER_METHOD; + else if (is_xml_name(factory, L"property")) + member_type = MEMBER_PROPERTY; + else { - hres = IXmlReader_MoveToAttributeByName(factory->xml_reader, L"name", NULL); - if (hres != S_OK) - { - FIXME("Missing method name\n"); - return E_FAIL; - } + FIXME("Unexpected element %s\n", debugstr_xml_name(factory)); + return E_NOTIMPL; + } - if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + empty = IXmlReader_IsEmptyElement(factory->xml_reader); - hres = read_xml_value(factory, &member->name); - if (FAILED(hres)) + hres = IXmlReader_MoveToAttributeByName(factory->xml_reader, L"name", NULL); + if (hres != S_OK) + { + FIXME("Missing method name\n"); + return E_FAIL; + } + + if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + member->type = member_type; + + hres = read_xml_value(factory, &member->name); + if (FAILED(hres)) + { + heap_free(member); + return hres; + } + + LIST_FOR_EACH_ENTRY(member_iter, &factory->members, struct scriptlet_member, entry) + { + if (!wcsicmp(member_iter->name, member->name)) { - heap_free(member); - return hres; + FIXME("Duplicated member %s\n", debugstr_w(member->name)); + return E_FAIL; } - list_init(&member->parameters); - list_add_tail(&factory->members, &member->entry); + } + list_add_tail(&factory->members, &member->entry); + switch (member_type) + { + case MEMBER_METHOD: + list_init(&member->u.parameters); + + if (empty) break; for (;;) { struct method_parameter *parameter; - BOOL empty; hres = next_xml_node(factory, &node_type); if (FAILED(hres)) return hres; @@ -1297,14 +1339,58 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) hres = read_xml_value(factory, &parameter->name); if (FAILED(hres)) return hres; - list_add_tail(&member->parameters, &parameter->entry); + list_add_tail(&member->u.parameters, &parameter->entry); if (!empty && FAILED(hres = expect_end_element(factory))) return hres; } - } - else - { - FIXME("Unexpected element %s\n", debugstr_xml_name(factory)); - return E_NOTIMPL; + break; + + case MEMBER_PROPERTY: + member->u.flags = 0; + + if (empty) break; + for (;;) + { + hres = next_xml_node(factory, &node_type); + if (FAILED(hres)) return hres; + if (node_type == XmlNodeType_EndElement) break; + if (node_type != XmlNodeType_Element) + { + FIXME("Unexpected node type %u\n", node_type); + return E_FAIL; + } + if (is_case_xml_name(factory, L"get")) + { + if (member->u.flags & PROP_GETTER) + { + FIXME("Duplicated getter\n"); + return E_FAIL; + } + member->u.flags |= PROP_GETTER; + } + else if (is_case_xml_name(factory, L"put")) + { + if (member->u.flags & PROP_SETTER) + { + FIXME("Duplicated setter\n"); + return E_FAIL; + } + member->u.flags |= PROP_SETTER; + } + else + { + FIXME("Unexpected property element %s\n", debugstr_xml_name(factory)); + return E_FAIL; + } + + empty = IXmlReader_IsEmptyElement(factory->xml_reader); + if (!empty && FAILED(hres = expect_end_element(factory))) return hres; + } + if (!member->u.flags) + { + FIXME("No getter or setter\n"); + return E_NOTIMPL; + } + break; } if (FAILED(hres)) return hres; } @@ -1499,12 +1585,15 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); list_remove(&member->entry); heap_free(member->name); - while (!list_empty(&member->parameters)) + if (member->type == MEMBER_METHOD) { - struct method_parameter *parameter = LIST_ENTRY(list_head(&member->parameters), struct method_parameter, entry); - list_remove(&parameter->entry); - heap_free(parameter->name); - heap_free(parameter); + while (!list_empty(&member->u.parameters)) + { + struct method_parameter *parameter = LIST_ENTRY(list_head(&member->u.parameters), struct method_parameter, entry); + list_remove(&parameter->entry); + heap_free(parameter->name); + heap_free(parameter); + } } heap_free(member); }

1 0