February 2021 - Wine-Commits

Dmitry Timoshkov : wevtapi: Return TRUE from EvtSetChannelConfigProperty.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: ed07d4b85f1007727c3fed3d10bcf55973bed51c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed07d4b85f1007727c3fed3d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 1 14:36:08 2021 +0300 wevtapi: Return TRUE from EvtSetChannelConfigProperty. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 8521ac3cae8..d11287a5dee 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -72,7 +72,7 @@ BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig, PEVT_VARIANT PropertyValue) { FIXME("(%p %i %u %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue); - return FALSE; + return TRUE; } EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR ChannelPath,

1 0

Zebediah Figura : include: Pack HID_DESCRIPTOR.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 3fab0c4cfdc6654e5d322aed655db0d801f9b327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fab0c4cfdc6654e5d322aed… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 22:19:37 2021 -0600 include: Pack HID_DESCRIPTOR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/hidport.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ddk/hidport.h b/include/ddk/hidport.h index 3ebe273583b..2c881c87921 100644 --- a/include/ddk/hidport.h +++ b/include/ddk/hidport.h @@ -49,6 +49,7 @@ typedef struct _HID_DEVICE_ATTRIBUTES USHORT Reserved[11]; } HID_DEVICE_ATTRIBUTES, *PHID_DEVICE_ATTRIBUTES; +#include <pshpack1.h> typedef struct _HID_DESCRIPTOR { UCHAR bLength; @@ -62,6 +63,7 @@ typedef struct _HID_DESCRIPTOR USHORT wReportLength; } DescriptorList[1]; } HID_DESCRIPTOR, *PHID_DESCRIPTOR; +#include <poppack.h> #define HID_HID_DESCRIPTOR_TYPE 0x21 #define HID_REPORT_DESCRIPTOR_TYPE 0x22

1 0

Nikolay Sivov : mfmediaengine: Fix vtable variables types.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 0ec86a165a18dab96a60b3210df685a9a1693544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ec86a165a18dab96a60b321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 19:56:16 2021 +0300 mfmediaengine: Fix vtable variables types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 65f207bd4b5..8ae86d3a68b 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2021,7 +2021,7 @@ static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) return S_OK; } -static const struct IClassFactoryVtbl class_factory_vtbl = +static const IClassFactoryVtbl class_factory_vtbl = { classfactory_QueryInterface, classfactory_AddRef,

1 0

Nikolay Sivov : mfplat/tests: Add some tests for D3D11-aware sample allocator.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: be5b34b1ee2331115576c6c2fa7c886b709d9b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5b34b1ee2331115576c6c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 19:56:13 2021 +0300 mfplat/tests: Add some tests for D3D11-aware sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 397 ++++++++++++++++++++++++++++++++++++++++++++- include/mfapi.h | 3 + include/mfobjects.idl | 28 ++++ 3 files changed, 427 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be5b34b1ee2331115576…

1 0

Zebediah Figura : winebus.sys: Fix the definition of ABS_TO_HID_MAP.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: eaf2d6224c5bf824daaa6ec78c991cd523d88658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaf2d6224c5bf824daaa6ec7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 22:17:32 2021 -0600 winebus.sys: Fix the definition of ABS_TO_HID_MAP. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1473579c72c..74cf6a28a1a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -141,6 +141,11 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELERATOR}, /*ABS_GAS*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ + {0,0}, + {0,0}, + {0,0}, + {0,0}, + {0,0}, {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -160,6 +165,7 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) +C_ASSERT(ARRAY_SIZE(ABS_TO_HID_MAP) == HID_ABS_MAX); #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) static const BYTE REL_TO_HID_MAP[][2] = {

1 0

Zebediah Figura : winegstreamer: Duplicate the "sink_connected" field in struct wg_parser.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: cd27f3ca00f63c8e07d5a06058feb3ee93509317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd27f3ca00f63c8e07d5a060… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 18:37:00 2021 -0600 winegstreamer: Duplicate the "sink_connected" field in 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ab7efc24018..1ddbc954fb4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -69,7 +69,7 @@ struct wg_parser GstFlowReturn ret; } read_request; - bool flushing; + bool flushing, sink_connected; }; struct parser @@ -1188,12 +1188,12 @@ static DWORD CALLBACK read_thread(void *arg) pthread_mutex_lock(&filter->mutex); - for (;;) + while (filter->sink_connected) { - while (filter->sink_connected && !parser->read_request.buffer) + while (parser->sink_connected && !parser->read_request.buffer) pthread_cond_wait(&parser->read_cond, &filter->mutex); - if (!filter->sink_connected) + if (!parser->sink_connected) break; parser->read_request.done = true; @@ -1593,6 +1593,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) parser->file_size = This->file_size; This->sink_connected = true; + parser->sink_connected = true; This->read_thread = CreateThread(NULL, 0, read_thread, This, 0, NULL); @@ -2541,8 +2542,9 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) /* read_thread() needs to stay alive to service any read requests GStreamer * sends, so we can only shut it down after GStreamer stops. */ - pthread_mutex_lock(&This->mutex); This->sink_connected = false; + pthread_mutex_lock(&This->mutex); + parser->sink_connected = false; pthread_mutex_unlock(&This->mutex); pthread_cond_signal(&parser->read_cond); WaitForSingleObject(This->read_thread, INFINITE);

1 0

Zebediah Figura : ntoskrnl: Do not destroy the device list in enumerate_new_device().
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: cb79644199e2c428b1deab633e93e5415d70c9df URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb79644199e2c428b1deab63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 1 22:16:20 2021 -0600 ntoskrnl: Do not destroy the device list in enumerate_new_device(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6a0e82ec0e2..713e469ee7e 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -336,7 +336,6 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { ERR("Failed to create or open device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError()); - SetupDiDestroyDeviceInfoList( set ); return; } @@ -353,10 +352,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) } if (need_driver && !install_device_driver( device, set, &sp_device )) - { - SetupDiDestroyDeviceInfoList( set ); return; - } start_device( device, set, &sp_device ); }

1 0

Dmitry Timoshkov : wevtapi: Return fake handle from EvtOpenChannelConfig.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: 9f37a90e74d19a68dc755a18fdef15d4f4b4330b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f37a90e74d19a68dc755a18… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 1 14:36:02 2021 +0300 wevtapi: Return fake handle from EvtOpenChannelConfig. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index f7aa7a2a593..8521ac3cae8 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -99,7 +99,7 @@ BOOL WINAPI EvtNextChannelPath(EVT_HANDLE channel_enum, DWORD buffer_len, WCHAR EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); - return NULL; + return (EVT_HANDLE)0xdeadbeef; } EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, DWORD flags)

1 0

Dmitry Timoshkov : wevtapi: Add EvtSaveChannelConfig() stub.
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: ef4be71a480af0a5cd74a4a9ce6184f260103215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef4be71a480af0a5cd74a4a9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 1 14:36:11 2021 +0300 wevtapi: Add EvtSaveChannelConfig() stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- include/winevt.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index d11287a5dee..220987650a2 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -108,6 +108,12 @@ EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *q return NULL; } +BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE channel, DWORD flags) +{ + FIXME("(%p,%08x) stub\n", channel, flags); + return TRUE; +} + BOOL WINAPI EvtClose(EVT_HANDLE handle) { FIXME("(%p) stub\n", handle); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index e5dd0e70572..9ef06907dc1 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -38,7 +38,7 @@ @ stdcall EvtOpenSession(long ptr long long) @ stdcall EvtQuery(ptr wstr wstr long) @ stub EvtRender -@ stub EvtSaveChannelConfig +@ stdcall EvtSaveChannelConfig(ptr long) @ stub EvtSeek @ stdcall EvtSetChannelConfigProperty(ptr long long ptr) @ stub EvtSetObjectArrayProperty diff --git a/include/winevt.h b/include/winevt.h index a37954f2f94..a148dcbb094 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -128,7 +128,7 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context, EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags); EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags); - +BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE, DWORD); #ifdef __cplusplus } /* extern "C" */

1 0

Nikolay Sivov : mf/topology: Improve error handling when connecting sample copier node (Coverity).
by Alexandre Julliard Feb. 2, 2021

Feb. 2, 2021

Module: wine Branch: master Commit: d24ce1374caf586bec4b8e601afa84a3f4425d7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d24ce1374caf586bec4b8e60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 19:56:17 2021 +0300 mf/topology: Improve error handling when connecting sample copier node (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index af28de0819d..58639a67bdb 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2450,9 +2450,10 @@ static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context unsigned int upstream_output; IMFStreamSink *stream_sink; IMFTransform *copier = NULL; - HRESULT hr = S_OK; + HRESULT hr; - topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink); + if (FAILED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) + return hr; if (topology_loader_is_node_d3d_aware(node)) { @@ -2480,6 +2481,7 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) MF_TOPOLOGY_TYPE node_type; IMFTopologyNode *node; WORD i, node_count; + HRESULT hr; IMFTopology_GetNodeCount(context->output_topology, &node_count); @@ -2495,7 +2497,8 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); - topology_loader_connect_d3d_aware_input(context, node); + if (FAILED(hr = topology_loader_connect_d3d_aware_input(context, node))) + WARN("Failed to connect D3D-aware input, hr %#x.\n", hr); } else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) {

1 0