June 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : hid: Introduce new get_value_caps_range helper for HidP_InitializeReportForID.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 04bd7c9d68b5c59c4ea689544d9790410f695876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04bd7c9d68b5c59c4ea68954… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 21 09:05:22 2021 +0200 hid: Introduce new get_value_caps_range helper for HidP_InitializeReportForID. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 80 +++++++++++++++++++++----------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 56 +------------------------- 2 files changed, 45 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04bd7c9d68b5c59c4ea6…

1 0

Rémi Bernon : hid: Introduce new enum_value_caps helper for HidP_GetSpecificButtonCaps.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: ad03df1222c2bb22e991641dcc0d9e4ed684158b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad03df1222c2bb22e991641d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 21 09:05:23 2021 +0200 hid: Introduce new enum_value_caps helper for HidP_GetSpecificButtonCaps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 160 ++++++++++++++++++++++--------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 41 +--------- include/wine/hid.h | 30 ------- 3 files changed, 95 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad03df1222c2bb22e991…

1 0

Rémi Bernon : hid: Rewrite HidP_Get*Caps using HidP_GetSpecific*Caps.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: e5b636c05639f8517f1b5a1fe248d3767cafef47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b636c05639f8517f1b5a1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 21 09:05:21 2021 +0200 hid: Rewrite HidP_Get*Caps using HidP_GetSpecific*Caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 113 +++----------------------------------------------------- 1 file changed, 6 insertions(+), 107 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 9eedf12b694..168461d99c9 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -156,63 +156,12 @@ static NTSTATUS get_report_data_array(BYTE *report, UINT reportLength, UINT star return HIDP_STATUS_SUCCESS; } - -NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, - PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +NTSTATUS WINAPI HidP_GetButtonCaps( HIDP_REPORT_TYPE report_type, HIDP_BUTTON_CAPS *caps, USHORT *caps_count, + PHIDP_PREPARSED_DATA preparsed_data ) { - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT b_count = 0, r_count = 0; - int i,j,u; - - TRACE("(%i, %p, %p, %p)\n",ReportType, ButtonCaps, ButtonCapsLength, PreparsedData); - - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; - - switch(ReportType) - { - case HidP_Input: - b_count = data->caps.NumberInputButtonCaps; - report = HID_INPUT_REPORTS(data); - break; - case HidP_Output: - b_count = data->caps.NumberOutputButtonCaps; - report = HID_OUTPUT_REPORTS(data); - break; - case HidP_Feature: - b_count = data->caps.NumberFeatureButtonCaps; - report = HID_FEATURE_REPORTS(data); - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - - if (!r_count || !b_count) - { - *ButtonCapsLength = 0; - return HIDP_STATUS_SUCCESS; - } - - b_count = min(b_count, *ButtonCapsLength); - - u = 0; - for (j = 0; j < r_count && u < b_count; j++) - { - for (i = 0; i < report[j].elementCount && u < b_count; i++) - { - if (elems[report[j].elementIdx + i].caps.BitSize == 1) - ButtonCaps[u++] = *(HIDP_BUTTON_CAPS *)&elems[report[j].elementIdx + i].caps; - } - } - - *ButtonCapsLength = b_count; - return HIDP_STATUS_SUCCESS; + return HidP_GetSpecificButtonCaps( report_type, 0, 0, 0, caps, caps_count, preparsed_data ); } - NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities) { @@ -467,60 +416,10 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH return HIDP_STATUS_SUCCESS; } - -NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, - PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +NTSTATUS WINAPI HidP_GetValueCaps( HIDP_REPORT_TYPE report_type, HIDP_VALUE_CAPS *caps, USHORT *caps_count, + PHIDP_PREPARSED_DATA preparsed_data ) { - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT v_count = 0, r_count = 0; - int i,j,u; - - TRACE("(%i, %p, %p, %p)\n", ReportType, ValueCaps, ValueCapsLength, PreparsedData); - - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; - - switch(ReportType) - { - case HidP_Input: - v_count = data->caps.NumberInputValueCaps; - report = HID_INPUT_REPORTS(data); - break; - case HidP_Output: - v_count = data->caps.NumberOutputValueCaps; - report = HID_OUTPUT_REPORTS(data); - break; - case HidP_Feature: - v_count = data->caps.NumberFeatureValueCaps; - report = HID_FEATURE_REPORTS(data); - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - - if (!r_count || !v_count) - { - *ValueCapsLength = 0; - return HIDP_STATUS_SUCCESS; - } - - v_count = min(v_count, *ValueCapsLength); - - u = 0; - for (j = 0; j < r_count && u < v_count; j++) - { - for (i = 0; i < report[j].elementCount && u < v_count; i++) - { - if (elems[report[j].elementIdx + i].caps.BitSize != 1) - ValueCaps[u++] = elems[report[j].elementIdx + i].caps; - } - } - - *ValueCapsLength = v_count; - return HIDP_STATUS_SUCCESS; + return HidP_GetSpecificValueCaps( report_type, 0, 0, 0, caps, caps_count, preparsed_data ); } NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID,

1 0

Zebediah Figura : ws2_32: Make getsockopt(SO_DEBUG) into a stub.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: d8dfce3edcdf10d0fd7d65df1e15c15fb4661cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8dfce3edcdf10d0fd7d65df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:47 2021 -0500 ws2_32: Make getsockopt(SO_DEBUG) into a stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++++- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 320e4b3af2a..ab111f726a9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2103,7 +2103,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_DEBUG: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: case WS_SO_RCVBUF: @@ -2168,6 +2167,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, csinfo->iProtocol = infow.iProtocol; return 0; } + + case WS_SO_DEBUG: + WARN( "returning 0 for SO_DEBUG\n" ); + *(DWORD *)optval = 0; + SetLastError( 0 ); + return 0; + case WS_SO_DONTLINGER: { struct linger lingval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c4a3f953175..7534e75edb3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10991,7 +10991,7 @@ static void test_so_debug(void) debug = 0xdeadbeef; ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); ok(!ret, "got %d\n", ret); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(len == sizeof(debug), "got len %u\n", len); ok(!debug, "got debug %u\n", debug); @@ -11006,7 +11006,7 @@ static void test_so_debug(void) debug = 0xdeadbeef; ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); ok(!ret, "got %d\n", ret); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(len == sizeof(debug), "got len %u\n", len); todo_wine ok(debug == 1, "got debug %u\n", debug);

1 0

Nikolay Sivov : mf/session: Fix typo in a trace message.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 396df44c7b9f660d75b3be17527286df6adbc887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=396df44c7b9f660d75b3be17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 23 17:25:30 2021 +0300 mf/session: Fix typo in a trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 826c31ce121..9e8429fa8ac 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3361,7 +3361,7 @@ static HRESULT WINAPI session_sink_finalizer_callback_Invoke(IMFAsyncCallback *i if (state == (IUnknown *)sink->sink) { if (FAILED(hr = IMFMediaSink_QueryInterface(sink->sink, &IID_IMFFinalizableMediaSink, (void **)&fin_sink))) - WARN("Unexpected, missing IMFFinalizableSink, hr %#x.\n", hr); + WARN("Unexpected, missing IMFFinalizableMediaSink, hr %#x.\n", hr); } else {

1 0

Zhiyi Zhang : light.msstyles: Add Blue stub visual style.
by Alexandre Julliard June 23, 2021

June 23, 2021

1 0

Zebediah Figura : ws2_32: Move the setsockopt(SO_BROADCAST) implementation to ntdll.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 759408c3ae1086b68cb10916492decee5a1e4e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=759408c3ae1086b68cb10916… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:45 2021 -0500 ws2_32: Move the setsockopt(SO_BROADCAST) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 25 ++++++++++++++++++++++--- dlls/ws2_32/socket.c | 16 +++++++++++++++- include/wine/afd.h | 1 + 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c3392f94b54..959f0e7bc00 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1146,8 +1146,8 @@ static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo } -static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, void *out_buffer, - ULONG out_size, int level, int option ) +static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, + int option, void *out_buffer, ULONG out_size ) { int fd, needs_close = FALSE; socklen_t len = out_size; @@ -1165,6 +1165,22 @@ static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, void *out_buf } +static NTSTATUS do_setsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, + int option, const void *optval, socklen_t optlen ) +{ + int fd, needs_close = FALSE; + NTSTATUS status; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = setsockopt( fd, level, option, optval, optlen ); + if (needs_close) close( fd ); + return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; +} + + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1586,7 +1602,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } case IOCTL_AFD_WINE_GET_SO_BROADCAST: - return do_getsockopt( handle, io, out_buffer, out_size, SOL_SOCKET, SO_BROADCAST ); + return do_getsockopt( handle, io, SOL_SOCKET, SO_BROADCAST, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_SO_BROADCAST: + return do_setsockopt( handle, io, SOL_SOCKET, SO_BROADCAST, in_buffer, in_size ); default: { diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3b00e65fe3d..320e4b3af2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3538,6 +3538,18 @@ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, return n; } + +static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optlen ) +{ + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, (void *)optval, optlen, NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; +} + + /*********************************************************************** * setsockopt (WS2_32.21) */ @@ -3566,6 +3578,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SOL_SOCKET: switch(optname) { + case WS_SO_BROADCAST: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3621,7 +3636,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* The options listed here don't need any special handling. Thanks to * the conversion happening above, options from there will fall through * to this, too.*/ - case WS_SO_BROADCAST: case WS_SO_ERROR: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 8916fafae53..6370e00539f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -161,6 +161,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Roman Pišl : kernel32: Implement GetProcessGroupAffinity stub.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 410623a0101a2e223a6500295a82a42178e4d267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410623a0101a2e223a650029… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Wed Jun 23 05:39:49 2021 +0200 kernel32: Implement GetProcessGroupAffinity stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51322 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec094c98508..0f474504bfe 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -782,7 +782,7 @@ @ stdcall GetProcessAffinityMask(long ptr ptr) @ stdcall GetProcessDEPPolicy(long ptr ptr) @ stdcall GetProcessFlags(long) -# @ stub GetProcessGroupAffinity +@ stdcall -import GetProcessGroupAffinity(long ptr ptr) @ stdcall -import GetProcessHandleCount(long ptr) @ stdcall -import GetProcessHeap() @ stdcall -import GetProcessHeaps(long ptr) RtlGetProcessHeaps diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9a66c5c2ac0..94a648f65aa 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -623,7 +623,7 @@ @ stdcall GetProcAddress(long str) # @ stub GetProcAddressForCaller # @ stub GetProcessDefaultCpuSets -# @ stub GetProcessGroupAffinity +@ stdcall GetProcessGroupAffinity(long ptr ptr) @ stdcall GetProcessHandleCount(long ptr) @ stdcall -norelay GetProcessHeap() kernelbase_GetProcessHeap @ stdcall -import GetProcessHeaps(long ptr) RtlGetProcessHeaps diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index ab89d3bcf31..924fa733e5b 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -804,6 +804,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetPriorityClass( HANDLE process ) } +/*********************************************************************** + * GetProcessGroupAffinity (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetProcessGroupAffinity( HANDLE process, USHORT *count, USHORT *array ) +{ + FIXME( "(%p,%p,%p): stub\n", process, count, array ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + /****************************************************************** * GetProcessHandleCount (kernelbase.@) */

1 0

Alistair Leslie-Hughes : include: Add ICommandWithParameters interface.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 2731a014cf2be274d545ad3ab60e31750669ed15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2731a014cf2be274d545ad3a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 10 11:32:56 2021 +1000 include: Add ICommandWithParameters interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 44 +++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/cmdwpr.idl | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 110 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 27de85077b8..8910070fbac 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1697,3 +1697,47 @@ HRESULT __RPC_STUB ICommandPrepare_Unprepare_Stub(ICommandPrepare* This, IErrorI FIXME("(%p)->(%p): stub\n", This, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandWithParameters_GetParameterInfo_Proxy(ICommandWithParameters* This, + DB_UPARAMS *uparams, DBPARAMINFO **info, OLECHAR **buffer) +{ + FIXME("(%p)->(%p %p %p): stub\n", This, uparams, info, buffer); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandWithParameters_GetParameterInfo_Stub(ICommandWithParameters* This, + DB_UPARAMS *uparams, DBPARAMINFO **param_info, DBBYTEOFFSET **offsets, DBLENGTH *buff_len, + OLECHAR **buffer, IErrorInfo **error) +{ + FIXME("(%p)->(%p %p %p %p %p %p %p): stub\n", This, uparams, param_info, buffer, offsets, buff_len, + buffer, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandWithParameters_SetParameterInfo_Proxy(ICommandWithParameters* This, + DB_UPARAMS params, const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + FIXME("(%p)->(%ld %p %p): stub\n", This, params, ordinals, bindinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandWithParameters_SetParameterInfo_Stub(ICommandWithParameters* This, + DB_UPARAMS params, const DB_UPARAMS *ordinals, const DBPARAMBINDINFO *bindinfo, IErrorInfo **error) +{ + FIXME("(%p)->(%ld %p %p %p): stub\n", This, params, ordinals, bindinfo, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandWithParameters_MapParameterNames_Proxy(ICommandWithParameters* This, + DB_UPARAMS count, LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + FIXME("(%p)->(%ld %p %p): stub\n", This, count, names, ordinals); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandWithParameters_MapParameterNames_Stub(ICommandWithParameters* This, + DB_UPARAMS count, LPCOLESTR *names, DB_LPARAMS *ordinals, IErrorInfo **error) +{ + FIXME("(%p)->(%ld %p %p %p): stub\n", This, count, names, ordinals, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 9822bce6bdd..5b84d7858ff 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -68,6 +68,7 @@ SOURCES = \ cmdprp.idl \ cmdstrm.idl \ cmdtxt.idl \ + cmdwpr.idl \ cmnquery.idl \ codecapi.h \ colinf.idl \ diff --git a/include/cmdwpr.idl b/include/cmdwpr.idl new file mode 100644 index 00000000000..9e25f649902 --- /dev/null +++ b/include/cmdwpr.idl @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a64-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandWithParameters : IUnknown +{ + + typedef struct tagDBPARAMBINDINFO + { + LPOLESTR pwszDataSourceType; + LPOLESTR pwszName; + DBLENGTH ulParamSize; + DBPARAMFLAGS dwFlags; + BYTE bPrecision; + BYTE bScale; + } DBPARAMBINDINFO; + + [local] + HRESULT GetParameterInfo([in, out] DB_UPARAMS *uparams, [out, size_is(,*uparams)] DBPARAMINFO **info, [out] OLECHAR **buffer); + + [call_as(GetParameterInfo)] + HRESULT RemoteGetParameterInfo([in, out] DB_UPARAMS *uparams, [out, size_is(,(ULONG)*uparams)] DBPARAMINFO **param_info, + [out, size_is(,(ULONG)*uparams)] DBBYTEOFFSET **offsets, [in, out] DBLENGTH *buff_len, + [in, out, unique, size_is(,(ULONG)*buff_len)] OLECHAR **buffer, [out] IErrorInfo **error); + + [local] + HRESULT MapParameterNames([in] DB_UPARAMS uparams, [in, size_is((ULONG)uparams)] LPCWSTR names[], + [out, size_is((ULONG)uparams)] DB_LPARAMS ordinals[]); + + [call_as(MapParameterNames)] + HRESULT RemoteMapParameterNames([in] DB_UPARAMS uparams, [in, size_is((ULONG)uparams)] LPCOLESTR *names, + [out, size_is((ULONG)uparams)] DB_LPARAMS *ordinals, [out] IErrorInfo **error); + + [local] + HRESULT SetParameterInfo([in] DB_UPARAMS uparams, [in, unique, size_is((ULONG)uparams)] const DB_UPARAMS ordinals[], + [in, unique, size_is((ULONG)uparams)] const DBPARAMBINDINFO bindinfo[]); + + [call_as(SetParameterInfo)] + HRESULT RemoteSetParameterInfo([in] DB_UPARAMS uparams, [in, unique, size_is((ULONG)uparams)] const DB_UPARAMS *ordinals, + [in, unique, size_is((ULONG)uparams)] const DBPARAMBINDINFO *bindinfo, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4976a8ce33e..49c0c304b2d 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -79,6 +79,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstchg.idl" #include "rstupd.idl" #include "mulres.idl" +#include "cmdwpr.idl" cpp_quote("#include <accctrl.h>")

1 0

Rémi Bernon : hidclass.sys: Support parsing of explicit usage page.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 9c77c44509b574221da7d6e1d1c745eddbc7ce2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c77c44509b574221da7d6e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 21 09:05:18 2021 +0200 hidclass.sys: Support parsing of explicit usage page. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 53 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 930dcd52715..646f6eaa492 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -272,7 +272,9 @@ struct hid_parser_state { HIDP_CAPS caps; - USAGE usages[256]; + USAGE usages_page[256]; + USAGE usages_min[256]; + USAGE usages_max[256]; DWORD usages_size; struct hid_value_caps items; @@ -323,6 +325,9 @@ static void reset_local_items( struct hid_parser_state *state ) memset( &state->items, 0, sizeof(state->items) ); copy_global_items( &state->items, &tmp ); copy_collection_items( &state->items, &tmp ); + memset( &state->usages_page, 0, sizeof(state->usages_page) ); + memset( &state->usages_min, 0, sizeof(state->usages_min) ); + memset( &state->usages_max, 0, sizeof(state->usages_max) ); state->usages_size = 0; } @@ -352,14 +357,42 @@ static BOOL parse_global_pop( struct hid_parser_state *state ) return TRUE; } -static BOOL parse_local_usage( struct hid_parser_state *state, USAGE usage ) +static BOOL parse_local_usage( struct hid_parser_state *state, USAGE usage_page, USAGE usage ) { - state->usages[state->usages_size] = usage; + if (!usage_page) usage_page = state->items.usage_page; + if (state->items.is_range) state->usages_size = 0; + state->usages_page[state->usages_size] = usage_page; + state->usages_min[state->usages_size] = usage; + state->usages_max[state->usages_size] = usage; + state->items.usage_min = usage; + state->items.usage_max = usage; state->items.is_range = FALSE; if (state->usages_size++ == 255) ERR( "HID parser usages stack overflow!\n" ); return state->usages_size <= 255; } +static void parse_local_usage_min( struct hid_parser_state *state, USAGE usage_page, USAGE usage ) +{ + if (!usage_page) usage_page = state->items.usage_page; + if (!state->items.is_range) state->usages_max[0] = 0; + state->usages_page[0] = usage_page; + state->usages_min[0] = usage; + state->items.usage_min = usage; + state->items.is_range = TRUE; + state->usages_size = 1; +} + +static void parse_local_usage_max( struct hid_parser_state *state, USAGE usage_page, USAGE usage ) +{ + if (!usage_page) usage_page = state->items.usage_page; + if (!state->items.is_range) state->usages_min[0] = 0; + state->usages_page[0] = usage_page; + state->usages_max[0] = usage; + state->items.usage_max = usage; + state->items.is_range = TRUE; + state->usages_size = 1; +} + static BOOL parse_new_collection( struct hid_parser_state *state ) { if (!array_reserve( &state->stack, &state->stack_size, state->collection_idx )) @@ -377,6 +410,9 @@ static BOOL parse_new_collection( struct hid_parser_state *state ) copy_collection_items( state->stack + state->collection_idx, &state->items ); state->collection_idx++; + state->items.usage_min = state->usages_min[0]; + state->items.usage_max = state->usages_max[0]; + state->collections[state->caps.NumberLinkCollectionNodes] = state->items; state->items.link_collection = state->caps.NumberLinkCollectionNodes; state->items.link_usage_page = state->items.usage_page; @@ -417,8 +453,8 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY list_add_tail( &collection->features, &feature->entry ); feature->type = type; feature->isData = ((state->items.bit_field & INPUT_DATA_CONST) == 0); - if (j < state->usages_size) state->items.usage_min = state->usages[j]; copy_hidp_value_caps( &feature->caps, &state->items ); + if (j < state->usages_size) feature->caps.NotRange.Usage = state->usages_min[j]; feature->caps.ReportCount = 1; if (j + 1 >= state->usages_size) { @@ -508,7 +544,6 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int subcollection->parent = collection; /* Only set our collection once... We do not properly handle composite devices yet. */ - if (state->usages_size) state->items.usage_min = state->usages[state->usages_size - 1]; list_init(&subcollection->features); list_init(&subcollection->collections); parse_collection(size, value, subcollection); @@ -559,15 +594,13 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int break; case SHORT_ITEM(TAG_LOCAL_USAGE, TAG_TYPE_LOCAL): - if (!parse_local_usage( state, value )) return -1; + if (!parse_local_usage( state, value >> 16, value & 0xffff )) return -1; break; case SHORT_ITEM(TAG_LOCAL_USAGE_MINIMUM, TAG_TYPE_LOCAL): - state->items.usage_min = value; - state->items.is_range = TRUE; + parse_local_usage_min( state, value >> 16, value & 0xffff ); break; case SHORT_ITEM(TAG_LOCAL_USAGE_MAXIMUM, TAG_TYPE_LOCAL): - state->items.usage_max = value; - state->items.is_range = TRUE; + parse_local_usage_max( state, value >> 16, value & 0xffff ); break; case SHORT_ITEM(TAG_LOCAL_DESIGNATOR_INDEX, TAG_TYPE_LOCAL): state->items.designator_min = state->items.designator_max = value;

1 0