February 2021 - Wine-Commits

Alexandre Julliard : ntdll: Implement DbgUiConvertStateChangeStructure().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: d848a25b765cd9826d19d3448b75ffe9692460b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d848a25b765cd9826d19d344… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:39:06 2021 +0100 ntdll: Implement DbgUiConvertStateChangeStructure(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 55 ++++++++++++++++++++++++ include/winternl.h | 93 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 258 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d848a25b765cd9826d19…

1 0

Alexandre Julliard : ntdll: Implement NtDebugActiveProcess() and NtRemoveProcessDebug().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 46b84e7a83beae7484e6daac16739a2b9238f68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=46b84e7a83beae7484e6daac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:09:01 2021 +0100 ntdll: Implement NtDebugActiveProcess() and NtRemoveProcessDebug(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 37 +++++++++-------------- dlls/ntdll/ntdll.spec | 8 ++--- dlls/ntdll/process.c | 20 +++++++++++++ dlls/ntdll/unix/process.c | 34 ++++++++++++++++++++-- include/wine/server_protocol.h | 6 ++-- include/winternl.h | 4 +++ server/debugger.c | 66 +++++++++++++++--------------------------- server/object.h | 1 - server/protocol.def | 5 ++-- server/request.h | 5 ++-- server/trace.c | 3 +- 11 files changed, 107 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46b84e7a83beae7484e6…

1 0

Rémi Bernon : include: Add more DISPID constants to wmpids.h.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: da0b451f5f8f9a9d19b32c28aa2b3d14515d081c URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0b451f5f8f9a9d19b32c28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:30 2021 +0100 include: Add more DISPID constants to wmpids.h. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmpids.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/include/wmpids.h b/include/wmpids.h index a8500409ac4..2ae1d5c8bdd 100644 --- a/include/wmpids.h +++ b/include/wmpids.h @@ -19,6 +19,53 @@ #define DISPID_WMPCOREEVENT_STATUSCHANGE 5002 #define DISPID_WMPCOREEVENT_PLAYSTATECHANGE 5101 +#define DISPID_WMPCOREEVENT_AUDIOLANGUAGECHANGE 5102 -#define DISPID_WMPCOREEVENT_MEDIACHANGE 5802 -#define DISPID_WMPCOREEVENT_CURRENTITEMCHANGE 5806 +#define DISPID_WMPCOREEVENT_ENDOFSTREAM 5201 +#define DISPID_WMPCOREEVENT_POSITIONCHANGE 5202 +#define DISPID_WMPCOREEVENT_MARKERHIT 5203 +#define DISPID_WMPCOREEVENT_DURATIONUNITCHANGE 5204 + +#define DISPID_WMPCOREEVENT_SCRIPTCOMMAND 5301 + +#define DISPID_WMPCOREEVENT_DISCONNECT 5401 +#define DISPID_WMPCOREEVENT_BUFFERING 5402 +#define DISPID_WMPCOREEVENT_NEWSTREAM 5403 + +#define DISPID_WMPCOREEVENT_ERROR 5501 + +#define DISPID_WMPCOREEVENT_WARNING 5601 + +#define DISPID_WMPCOREEVENT_CDROMMEDIACHANGE 5701 + +#define DISPID_WMPCOREEVENT_PLAYLISTCHANGE 5801 +#define DISPID_WMPCOREEVENT_MEDIACHANGE 5802 +#define DISPID_WMPCOREEVENT_CURRENTMEDIAITEMAVAILABLE 5803 +#define DISPID_WMPCOREEVENT_CURRENTPLAYLISTCHANGE 5804 +#define DISPID_WMPCOREEVENT_CURRENTPLAYLISTITEMAVAILABLE 5805 +#define DISPID_WMPCOREEVENT_CURRENTITEMCHANGE 5806 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONCHANGE 5807 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONATTRIBUTESTRINGADDED 5808 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONATTRIBUTESTRINGREMOVED 5809 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONCHANGE 5810 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONPLAYLISTADDED 5811 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONPLAYLISTREMOVED 5812 +#define DISPID_WMPCOREEVENT_PLAYLISTCOLLECTIONPLAYLISTSETASDELETED 5818 +#define DISPID_WMPCOREEVENT_MODECHANGE 5819 +#define DISPID_WMPCOREEVENT_MEDIACOLLECTIONATTRIBUTESTRINGCHANGED 5820 +#define DISPID_WMPCOREEVENT_MEDIAERROR 5821 +#define DISPID_WMPCOREEVENT_DOMAINCHANGE 5822 +#define DISPID_WMPCOREEVENT_OPENPLAYLISTSWITCH 5823 + +#define DISPID_WMPOCXEVENT_SWITCHEDTOPLAYERAPPLICATION 6501 +#define DISPID_WMPOCXEVENT_SWITCHEDTOCONTROL 6502 +#define DISPID_WMPOCXEVENT_PLAYERDOCKEDSTATECHANGE 6503 +#define DISPID_WMPOCXEVENT_PLAYERRECONNECT 6504 +#define DISPID_WMPOCXEVENT_CLICK 6505 +#define DISPID_WMPOCXEVENT_DOUBLECLICK 6506 +#define DISPID_WMPOCXEVENT_KEYDOWN 6507 +#define DISPID_WMPOCXEVENT_KEYPRESS 6508 +#define DISPID_WMPOCXEVENT_KEYUP 6509 +#define DISPID_WMPOCXEVENT_MOUSEDOWN 6510 +#define DISPID_WMPOCXEVENT_MOUSEMOVE 6511 +#define DISPID_WMPOCXEVENT_MOUSEUP 6512

1 0

Rémi Bernon : include: Add IWMPRenderConfig interface to wmprealestate.idl.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 5a45763ebedcf386612f1f75b36ca1aa98b6d639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a45763ebedcf386612f1f75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:27 2021 +0100 include: Add IWMPRenderConfig interface to wmprealestate.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmprealestate.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wmprealestate.idl b/include/wmprealestate.idl index 34100a12aa8..948ace57eb8 100644 --- a/include/wmprealestate.idl +++ b/include/wmprealestate.idl @@ -29,3 +29,15 @@ interface IWMPVideoRenderConfig : IUnknown { [propput] HRESULT presenterActivate([in] IMFActivate *activate); } + +[ + odl, + uuid(959506c1-0314-4ec5-9e61-8528db5e5478), + oleautomation +] +interface IWMPRenderConfig : IUnknown +{ + [propput] HRESULT inProcOnly([in] BOOL fInProc); + + [propget] HRESULT inProcOnly([out, retval] BOOL *pfInProc); +}

1 0

Nikolay Sivov : mf/tests: Add some more tests for video processor transform.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: e9248486d7b1f4a8b811a68d2dba77f2353a1285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9248486d7b1f4a8b811a68d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 1 13:22:10 2021 +0300 mf/tests: Add some more tests for video processor transform. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 25 ++++++++++--- include/mfidl.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9bbf82c97e7..11eff78b645 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3347,7 +3347,7 @@ static void test_video_processor(void) IMFTransform *transform; IMFMediaBuffer *buffer; IMFMediaEvent *event; - IUnknown *unk; + unsigned int value; HRESULT hr; GUID guid; @@ -3362,15 +3362,28 @@ static void test_video_processor(void) goto failed; } - hr = IMFTransform_QueryInterface(transform, &IID_IMFMediaEventGenerator, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); - - hr = IMFTransform_QueryInterface(transform, &IID_IMFShutdown, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); +todo_wine + check_interface(transform, &IID_IMFVideoProcessorControl, TRUE); +todo_wine + check_interface(transform, &IID_IMFRealTimeClientEx, TRUE); + check_interface(transform, &IID_IMFMediaEventGenerator, FALSE); + check_interface(transform, &IID_IMFShutdown, FALSE); /* Transform global attributes. */ hr = IMFTransform_GetAttributes(transform, &attributes); ok(hr == S_OK, "Failed to get attributes, hr %#x.\n", hr); + + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(!!count, "Unexpected attribute count %u.\n", count); + + value = 0; + hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_AWARE, &value); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected attribute value %u.\n", value); +} hr = IMFTransform_GetAttributes(transform, &attributes2); ok(hr == S_OK, "Failed to get attributes, hr %#x.\n", hr); ok(attributes == attributes2, "Unexpected instance.\n"); diff --git a/include/mfidl.idl b/include/mfidl.idl index dd5de8d0d2f..46c715a3752 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1163,6 +1163,112 @@ interface IMFVideoSampleAllocatorEx : IMFVideoSampleAllocator ); } +typedef enum _MF_VIDEO_PROCESSOR_MIRROR +{ + MIRROR_NONE, + MIRROR_HORIZONTAL, + MIRROR_VERTICAL +} MF_VIDEO_PROCESSOR_MIRROR; + +typedef enum _MF_VIDEO_PROCESSOR_ROTATION +{ + ROTATION_NONE, + ROTATION_NORMAL +} MF_VIDEO_PROCESSOR_ROTATION; + +[ + object, + uuid(a3f675d5-6119-4f7f-a100-1d8b280f0efb), + local, + pointer_default(unique) +] +interface IMFVideoProcessorControl : IUnknown +{ + HRESULT SetBorderColor( + [in] MFARGB *color + ); + + HRESULT SetSourceRectangle( + [in] RECT *rect + ); + + HRESULT SetDestinationRectangle( + [in] RECT *rect + ); + + HRESULT SetMirror( + [in] MF_VIDEO_PROCESSOR_MIRROR mirror + ); + + HRESULT SetRotation( + [in] MF_VIDEO_PROCESSOR_ROTATION rotation + ); + + HRESULT SetConstrictionSize( + [in] SIZE *size + ); +} + +[ + object, + uuid(bde633d3-e1dc-4a7f-a693-bbae399c4a20), + local, + pointer_default(unique) +] +interface IMFVideoProcessorControl2 : IMFVideoProcessorControl +{ + HRESULT SetRotationOverride( + [in] UINT rotation + ); + + HRESULT EnableHardwareEffects( + [in] BOOL enabled + ); + + HRESULT GetSupportedHardwareEffects( + [out, retval] UINT *support + ); +} + +[ + object, + uuid(2347d60b-3fb5-480c-8803-8df3adcd3ef0), + local +] +interface IMFRealTimeClient : IUnknown +{ + HRESULT RegisterThreads( + [in] DWORD task_index, + [in] LPCWSTR classname + ); + + HRESULT UnregisterThreads(); + + HRESULT SetWorkQueue( + [in] DWORD queue_id + ); +} + +[ + object, + uuid(03910848-ab16-4611-b100-17b88ae2f248), +] +interface IMFRealTimeClientEx : IUnknown +{ + HRESULT RegisterThreadsEx( + [in, out] DWORD *task_index, + [in] LPCWSTR classname, + [in] LONG basepriority + ); + + HRESULT UnregisterThreads( ); + + HRESULT SetWorkQueueEx( + [in] DWORD mtqueue_id, + [in] LONG base_priority + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001,

1 0

Alexandre Julliard : ntdll: Pass a debug object in the new_process request.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 11e6f1007c3d13a2f5b1e547850de8b832110c7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e6f1007c3d13a2f5b1e547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 11:08:44 2021 +0100 ntdll: Pass a debug object in the new_process request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 3 --- dlls/kernelbase/process.c | 48 ++++++++++++++++++++++++++++++------------ dlls/ntdll/unix/process.c | 2 +- include/wine/server_protocol.h | 4 +++- server/debugger.c | 5 +++++ server/process.c | 19 ++++++++++++----- server/process.h | 1 + server/protocol.def | 1 + server/request.h | 19 +++++++++-------- server/trace.c | 1 + 10 files changed, 70 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11e6f1007c3d13a2f5b1…

1 0

Rémi Bernon : include: Add IWMPVideoRenderConfig interface to wmprealestate.idl.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 67bce6f1b1de69eb88384a4662b1cd78cf7b4709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bce6f1b1de69eb88384a46… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 1 09:29:26 2021 +0100 include: Add IWMPVideoRenderConfig interface to wmprealestate.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wmprealestate.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fc5ffbbc721..b03c2e8c602 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -797,6 +797,7 @@ SOURCES = \ wmiutils.idl \ wmp.idl \ wmpids.h \ + wmprealestate.idl \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ diff --git a/include/wmprealestate.idl b/include/wmprealestate.idl new file mode 100644 index 00000000000..34100a12aa8 --- /dev/null +++ b/include/wmprealestate.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; +import "mfidl.idl"; + +[ + odl, + uuid(6d6cf803-1ec0-4c8d-b3ca-f18e27282074), + oleautomation +] +interface IWMPVideoRenderConfig : IUnknown +{ + [propput] HRESULT presenterActivate([in] IMFActivate *activate); +}

1 0

Zebediah Figura : winegstreamer: Move the "element" field to struct wg_parser.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: d4bb0c4639aea2e8df80e577bd20b7f51c033e33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bb0c4639aea2e8df80e577… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 23:58:04 2021 -0600 winegstreamer: Move the "element" field to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 62 ++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f2b015d99db..2bd6622b889 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -48,6 +48,7 @@ static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x00 struct wg_parser { + GstElement *container; GstBus *bus; }; @@ -72,7 +73,6 @@ struct parser * separate lock. */ bool streaming, flushing, sink_connected; - GstElement *container; GstPad *my_src, *their_sink; guint64 start, nextofs, nextpullofs, stop; @@ -1228,6 +1228,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *This) { static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; + struct wg_parser *parser = This->wg_parser; const char *typename; char *name; GstCaps *caps; @@ -1296,13 +1297,13 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *Th } /* The bin takes ownership of these elements. */ - gst_bin_add(GST_BIN(This->container), deinterlace); + gst_bin_add(GST_BIN(parser->container), deinterlace); gst_element_sync_state_with_parent(deinterlace); - gst_bin_add(GST_BIN(This->container), vconv); + gst_bin_add(GST_BIN(parser->container), vconv); gst_element_sync_state_with_parent(vconv); - gst_bin_add(GST_BIN(This->container), flip); + gst_bin_add(GST_BIN(parser->container), flip); gst_element_sync_state_with_parent(flip); - gst_bin_add(GST_BIN(This->container), vconv2); + gst_bin_add(GST_BIN(parser->container), vconv2); gst_element_sync_state_with_parent(vconv2); gst_element_link(deinterlace, vconv); @@ -1328,7 +1329,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *Th goto out; } - gst_bin_add(GST_BIN(This->container), convert); + gst_bin_add(GST_BIN(parser->container), convert); gst_element_sync_state_with_parent(convert); pin->post_sink = gst_element_get_static_pad(convert, "sink"); @@ -1583,8 +1584,8 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_bus_set_sync_handler(parser->bus, watch_bus, This, NULL); } - This->container = gst_bin_new(NULL); - gst_element_set_bus(This->container, parser->bus); + parser->container = gst_bin_new(NULL); + gst_element_set_bus(parser->container, parser->bus); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); @@ -1691,11 +1692,12 @@ static void parser_destroy(struct strmbase_filter *iface) static HRESULT parser_init_stream(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); + struct wg_parser *parser = filter->wg_parser; GstSeekType stop_type = GST_SEEK_TYPE_NONE; const SourceSeeking *seeking; unsigned int i; - if (!filter->container) + if (!parser->container) return S_OK; filter->streaming = true; @@ -1733,9 +1735,10 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); + struct wg_parser *parser = filter->wg_parser; unsigned int i; - if (!filter->container) + if (!parser->container) return S_OK; filter->streaming = false; @@ -1834,6 +1837,7 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("decodebin", NULL); + struct wg_parser *parser = filter->wg_parser; int ret; if (!element) @@ -1843,7 +1847,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - gst_bin_add(GST_BIN(filter->container), element); + gst_bin_add(GST_BIN(parser->container), element); g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); @@ -1862,8 +1866,8 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PAUSED); - ret = gst_element_get_state(filter->container, NULL, NULL, -1); + gst_element_set_state(parser->container, GST_STATE_PAUSED); + ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { ERR("Failed to play stream.\n"); @@ -2488,12 +2492,13 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name static HRESULT GST_RemoveOutputPins(struct parser *This) { + struct wg_parser *parser = This->wg_parser; unsigned int i; TRACE("(%p)\n", This); mark_wine_thread(); - if (!This->container) + if (!parser->container) return S_OK; /* Unblock all of our streams. */ @@ -2505,7 +2510,7 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) } pthread_mutex_unlock(&This->mutex); - gst_element_set_state(This->container, GST_STATE_NULL); + gst_element_set_state(parser->container, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink); gst_object_unref(This->my_src); gst_object_unref(This->their_sink); @@ -2526,9 +2531,9 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) This->source_count = 0; heap_free(This->sources); This->sources = NULL; - gst_element_set_bus(This->container, NULL); - gst_object_unref(This->container); - This->container = NULL; + gst_element_set_bus(parser->container, NULL); + gst_object_unref(parser->container); + parser->container = NULL; BaseFilterImpl_IncrementPinVersion(&This->filter); return S_OK; } @@ -2587,6 +2592,7 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = static BOOL wave_parser_init_gst(struct parser *filter) { static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; + struct wg_parser *parser = filter->wg_parser; struct parser_source *pin; GstElement *element; int ret; @@ -2598,7 +2604,7 @@ static BOOL wave_parser_init_gst(struct parser *filter) return FALSE; } - gst_bin_add(GST_BIN(filter->container), element); + gst_bin_add(GST_BIN(parser->container), element); filter->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(filter->my_src, filter->their_sink)) < 0) @@ -2618,8 +2624,8 @@ static BOOL wave_parser_init_gst(struct parser *filter) } gst_pad_set_active(pin->my_sink, 1); - gst_element_set_state(filter->container, GST_STATE_PAUSED); - ret = gst_element_get_state(filter->container, NULL, NULL, -1); + gst_element_set_state(parser->container, GST_STATE_PAUSED); + ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { ERR("Failed to play stream.\n"); @@ -2701,6 +2707,7 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("avidemux", NULL); + struct wg_parser *parser = filter->wg_parser; int ret; if (!element) @@ -2710,7 +2717,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - gst_bin_add(GST_BIN(filter->container), element); + gst_bin_add(GST_BIN(parser->container), element); g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); @@ -2728,8 +2735,8 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - gst_element_set_state(filter->container, GST_STATE_PAUSED); - ret = gst_element_get_state(filter->container, NULL, NULL, -1); + gst_element_set_state(parser->container, GST_STATE_PAUSED); + ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { ERR("Failed to play stream.\n"); @@ -2825,6 +2832,7 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = static BOOL mpeg_splitter_init_gst(struct parser *filter) { static const WCHAR source_name[] = {'A','u','d','i','o',0}; + struct wg_parser *parser = filter->wg_parser; struct parser_source *pin; GstElement *element; int ret; @@ -2836,7 +2844,7 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) return FALSE; } - gst_bin_add(GST_BIN(filter->container), element); + gst_bin_add(GST_BIN(parser->container), element); filter->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(filter->my_src, filter->their_sink)) < 0) @@ -2855,8 +2863,8 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) } gst_pad_set_active(pin->my_sink, 1); - gst_element_set_state(filter->container, GST_STATE_PAUSED); - ret = gst_element_get_state(filter->container, NULL, NULL, -1); + gst_element_set_state(parser->container, GST_STATE_PAUSED); + ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { ERR("Failed to play stream.\n");

1 0

Zebediah Figura : winegstreamer: Move the "bus" field of struct parser to a new "wg_parser" object.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: f5969e1e0236fee59798977c76dc054176cae45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5969e1e0236fee59798977c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 23:58:03 2021 -0600 winegstreamer: Move the "bus" field of struct parser to a new "wg_parser" object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 70 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ea6808ec113..f2b015d99db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -46,6 +46,11 @@ GST_DEBUG_CATEGORY_STATIC(wine); static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +struct wg_parser +{ + GstBus *bus; +}; + struct parser { struct strmbase_filter filter; @@ -60,6 +65,8 @@ struct parser LONGLONG filesize; + struct wg_parser *wg_parser; + /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ @@ -67,7 +74,6 @@ struct parser GstElement *container; GstPad *my_src, *their_sink; - GstBus *bus; guint64 start, nextofs, nextpullofs, stop; pthread_mutex_t mutex; @@ -1556,6 +1562,7 @@ static LONGLONG query_duration(GstPad *pad) static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) { + struct wg_parser *parser = This->wg_parser; unsigned int i; LONGLONG avail; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1570,13 +1577,14 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->read_thread = CreateThread(NULL, 0, read_thread, This, 0, NULL); - if (!This->bus) { - This->bus = gst_bus_new(); - gst_bus_set_sync_handler(This->bus, watch_bus, This, NULL); + if (!parser->bus) + { + parser->bus = gst_bus_new(); + gst_bus_set_sync_handler(parser->bus, watch_bus, This, NULL); } This->container = gst_bin_new(NULL); - gst_element_set_bus(This->container, This->bus); + gst_element_set_bus(This->container, parser->bus); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); @@ -1639,6 +1647,17 @@ static struct strmbase_pin *parser_get_pin(struct strmbase_filter *base, unsigne return NULL; } +static void wg_parser_destroy(struct wg_parser *parser) +{ + if (parser->bus) + { + gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); + gst_object_unref(parser->bus); + } + + free(parser); +} + static void parser_destroy(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); @@ -1657,11 +1676,7 @@ static void parser_destroy(struct strmbase_filter *iface) IAsyncReader_Release(filter->reader); filter->reader = NULL; - if (filter->bus) - { - gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); - gst_object_unref(filter->bus); - } + wg_parser_destroy(filter->wg_parser); pthread_cond_destroy(&filter->read_cond); pthread_cond_destroy(&filter->read_done_cond); @@ -1966,6 +1981,17 @@ static void parser_init_common(struct parser *object) object->flushing = true; } +static struct wg_parser *wg_parser_create(void) +{ + struct wg_parser *parser; + + if (!(parser = calloc(1, sizeof(*parser)))) + return NULL; + + TRACE("Created winegstreamer parser %p.\n", parser); + return parser; +} + HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) { struct parser *object; @@ -1978,6 +2004,12 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); @@ -2632,6 +2664,12 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); @@ -2745,6 +2783,12 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); @@ -2889,6 +2933,12 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops);

1 0

Ziqing Hui : windowscodecs/tests: Fix an argument typo in ok().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 33608a2c9ce1779dd4fe1280e6200ecbc3975906 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33608a2c9ce1779dd4fe1280… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jan 29 13:02:40 2021 +0800 windowscodecs/tests: Fix an argument typo in ok(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index b7b002d380d..28554e77c9b 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -495,7 +495,7 @@ static IWICBitmapDecoder *create_decoder(void) hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); ok(hr == S_OK, "GetContainerFormat failed, hr %#x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatDds), - "Got unexpected container format %s\n", debugstr_guid(&GUID_ContainerFormatDds)); + "Got unexpected container format %s\n", debugstr_guid(&guidresult)); return decoder; }

1 0