November 2021 - Wine-commits

Nikolay Sivov : mf/session: Expose rate control interfaces.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: d1662e4beb4c1b757423c71107f7ec115ade19f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1662e4beb4c1b757423c711… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 9 10:06:00 2021 +0300 mf/session: Expose rate control interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 19 +++++++++++++++---- dlls/mf/tests/mf.c | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index fe87b3e6584..c8ec1b5c33f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1637,23 +1637,34 @@ static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID ri TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + *out = NULL; + if (IsEqualIID(riid, &IID_IMFMediaSession) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *out = &session->IMFMediaSession_iface; - IMFMediaSession_AddRef(iface); - return S_OK; } else if (IsEqualIID(riid, &IID_IMFGetService)) { *out = &session->IMFGetService_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *out = &session->IMFRateSupport_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateControl)) + { + *out = &session->IMFRateControl_iface; + } + + if (*out) + { IMFMediaSession_AddRef(iface); return S_OK; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 623781a6ba2..eb681a8b9a7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1181,8 +1181,8 @@ static void test_media_session(void) ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); check_interface(session, &IID_IMFGetService, TRUE); - todo_wine check_interface(session, &IID_IMFRateSupport, TRUE); - todo_wine check_interface(session, &IID_IMFRateControl, TRUE); + check_interface(session, &IID_IMFRateSupport, TRUE); + check_interface(session, &IID_IMFRateControl, TRUE); check_interface(session, &IID_IMFAttributes, FALSE); check_interface(session, &IID_IMFTopologyNodeAttributeEditor, FALSE); check_interface(session, &IID_IMFLocalMFTRegistration, FALSE);

1 0

Nikolay Sivov : propsys/tests: Add a VT_UI4 test for PropVariantCompareEx().
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 10359e17ce64f39461a7b7b54f73857e6458d1fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=10359e17ce64f39461a7b7b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 9 10:05:47 2021 +0300 propsys/tests: Add a VT_UI4 test for PropVariantCompareEx(). A test for 58eeb1a86433db1104d3a9ccf9ad7435ec81443a. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 9ffa048a8b7..6370c01dc80 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -670,6 +670,7 @@ static void test_PropVariantCompareEx(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; PROPVARIANT clsid_null, clsid, clsid2, r4_0, r4_2, r8_0, r8_2; + PROPVARIANT ui4, ui4_large; PROPVARIANT var1, var2; INT res; static const WCHAR str_2W[] = {'2', 0}; @@ -711,6 +712,10 @@ static void test_PropVariantCompareEx(void) i4_largeneg.lVal = -65536; i4_2.vt = VT_I4; i4_2.lVal = 2; + ui4.vt = VT_UI4; + ui4.ulVal = 2; + ui4_large.vt = VT_UI4; + ui4_large.ulVal = 65536; str_2.vt = VT_BSTR; str_2.bstrVal = SysAllocString(str_2W); str_02.vt = VT_BSTR; @@ -759,6 +764,12 @@ static void test_PropVariantCompareEx(void) res = PropVariantCompareEx(&i2_0, &i2_2, 0, 0); ok(res == -1, "res=%i\n", res); + res = PropVariantCompareEx(&ui4, &ui4_large, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&ui4_large, &ui4, 0, 0); + ok(res == 1, "res=%i\n", res); + /* Always return -1 if second value cannot be converted to first type */ res = PropVariantCompareEx(&i2_0, &i4_large, 0, 0); ok(res == -1, "res=%i\n", res);

1 0

Rémi Bernon : winebus.sys: Use +hid debug channel.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 5b735572c16f9a322af4611f6bd63088785fb7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b735572c16f9a322af4611f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:08 2021 +0100 winebus.sys: Use +hid debug channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/hid.c | 2 +- dlls/winebus.sys/main.c | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index eef882b52e8..735fd8c54cc 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -97,7 +97,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef HAVE_IOHIDMANAGERCREATE static pthread_mutex_t iohid_cs = PTHREAD_MUTEX_INITIALIZER; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index c01648ce67e..49afcbaf67c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -55,7 +55,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef SONAME_LIBSDL2 diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1591f00eedf..dad5344a54c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -92,7 +92,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); #ifdef HAVE_UDEV diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index a0f07f66392..893bf1cd7f6 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -39,7 +39,7 @@ #include "unix_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static BOOL hid_report_descriptor_append(struct hid_report_descriptor *desc, const BYTE *buffer, SIZE_T size) { diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 0e7889386dc..c9a18313853 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -40,7 +40,7 @@ #include "unixlib.h" -WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static DRIVER_OBJECT *driver_obj; @@ -411,7 +411,7 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("read input report length %u:\n", report->length); for (i = 0; i < report->length;) @@ -1038,7 +1038,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) memcpy(packet->reportBuffer, ext->last_reports[packet->reportId], packet->reportBufferLen); irp->IoStatus.Information = packet->reportBufferLen; irp->IoStatus.Status = STATUS_SUCCESS; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("read input report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1068,7 +1068,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_WRITE_REPORT: { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("write output report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1087,7 +1087,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; unix_device_get_feature_report(device, packet, &irp->IoStatus); - if (!irp->IoStatus.Status && TRACE_ON(plugplay)) + if (!irp->IoStatus.Status && TRACE_ON(hid)) { TRACE("read feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;) @@ -1104,7 +1104,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; - if (TRACE_ON(plugplay)) + if (TRACE_ON(hid)) { TRACE("write feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); for (i = 0; i < packet->reportBufferLen;)

1 0

Rémi Bernon : hidparse.sys: Use +hid debug channel.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: e9dc0cf83a318c75b22129a4a0cda3dc754d9d4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dc0cf83a318c75b22129a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:09 2021 +0100 hidparse.sys: Use +hid debug channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index d455049d9b1..c07389044fd 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -35,7 +35,7 @@ #include "wine/list.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(hidp); +WINE_DEFAULT_DEBUG_CHANNEL(hid); /* Flags that are defined in the document "Device Class Definition for Human Interface Devices" */ @@ -122,7 +122,7 @@ static void debug_print_preparsed( struct hid_preparsed_data *data ) { unsigned int i, end; - if (TRACE_ON( hidp )) + if (TRACE_ON(hid)) { TRACE( "usage %02x:%02x input %u-(%u)-%u, report len %u output %u-(%u)-%u, report len %u " "feature %u-(%u)-%u, report len %u collections %u\n", data->usage_page, data->usage, @@ -498,7 +498,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng BYTE *ptr, *end; int i; - if (TRACE_ON( hidp )) + if (TRACE_ON(hid)) { TRACE( "descriptor %p, length %u:\n", descriptor, length ); for (i = 0; i < length;)

1 0

Rémi Bernon : hid: Use +hid debug channel instead of +hidp.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: b25a4d0787408648397ebab36fa3afcd563f0617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b25a4d0787408648397ebab3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:10 2021 +0100 hid: Use +hid debug channel instead of +hidp. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 90dc3211e45..ed2fa3906bd 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -34,7 +34,7 @@ #include "wine/hid.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(hidp); +WINE_DEFAULT_DEBUG_CHANNEL(hid); static NTSTATUS get_value_caps_range( struct hid_preparsed_data *preparsed, HIDP_REPORT_TYPE report_type, ULONG report_len, const struct hid_value_caps **caps, const struct hid_value_caps **caps_end )

1 0

Rémi Bernon : winexinput.sys: Use +xinput channel.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 5802a27dfe4dba141f1532a4bf02c6af8c984e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5802a27dfe4dba141f1532a4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 9 09:51:11 2021 +0100 winexinput.sys: Use +xinput channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index abc61e8754f..339db17817c 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -37,7 +37,7 @@ #include "wine/asm.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winexinput); +WINE_DEFAULT_DEBUG_CHANNEL(xinput); #ifdef __ASM_USE_FASTCALL_WRAPPER extern void *WINAPI wrap_fastcall_func1(void *func, const void *a);

1 0

Alistair Leslie-Hughes : msdasql: Fixup GetCommandText wrt dialect.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 61d1152c7c4d9a1264d28e742d68e0df4ccf3d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d1152c7c4d9a1264d28e74… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 9 16:24:57 2021 +1100 msdasql: Fixup GetCommandText wrt dialect. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index e52e8cd18d8..25dfd801250 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -834,8 +834,11 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, if (!command->query) return DB_E_NOCOMMAND; - if (IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) + { + *dialect = DBGUID_DEFAULT; hr = DB_S_DIALECTIGNORED; + } *commandstr = heap_alloc((lstrlenW(command->query)+1)*sizeof(WCHAR)); wcscpy(*commandstr, command->query);

1 0

Alistair Leslie-Hughes : msdasql: Fix initial query value.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: 5cadb646952653501e0c525ccbff9b7fb38f01a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cadb646952653501e0c525c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 9 16:24:58 2021 +1100 msdasql: Fix initial query value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 25dfd801250..6e9c4b680e9 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1062,6 +1062,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; command->refs = 1; + command->query = NULL; IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session);

1 0

Alistair Leslie-Hughes : include: Add SQLGetDiagFieldW prototype.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: e9da85341e255ed43c17b9bb57294063c4aedbf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9da85341e255ed43c17b9bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 9 16:24:59 2021 +1100 include: Add SQLGetDiagFieldW prototype. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqlucode.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/sqlucode.h b/include/sqlucode.h index 7e1fb677cce..f1eaace87c1 100644 --- a/include/sqlucode.h +++ b/include/sqlucode.h @@ -62,6 +62,10 @@ SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER StringLength); +SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT type, SQLHANDLE handle, + SQLSMALLINT record, SQLSMALLINT field, SQLPOINTER info, + SQLSMALLINT info_len, SQLSMALLINT *ret_len); + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : bcrypt: Implement Wow64 entry points in the Unix library.
by Alexandre Julliard 09 Nov '21

09 Nov '21

Module: wine Branch: master Commit: fcc827d141f32954545b349f06b01a3909b95ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc827d141f32954545b349f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 11:38:45 2021 +0100 bcrypt: Implement Wow64 entry points in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/gnutls.c | 536 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 523 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc827d141f32954545b…

1 0