wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Piotr Caban : msvcp_win: Add stub dll.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 241455e84b93c2deaf2c300c007aa0612994f7d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=241455e84b93c2deaf2c300c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 19:46:43 2021 +0100 msvcp_win: Add stub dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/msvcp_win/Makefile.in | 1 + dlls/msvcp_win/msvcp_win.spec | 3761 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 3765 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=241455e84b93c2deaf2c…

1 0

Dmitry Timoshkov : comctl32: Add semi-stub for ImageList_WriteEx.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: c692c59c2e2f1a61352b7f1b55807e3b84bd98ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c692c59c2e2f1a61352b7f1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 19 15:58:33 2021 +0300 comctl32: Add semi-stub for ImageList_WriteEx. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/imagelist.c | 8 ++++++++ include/commctrl.h | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index e3b889b9bd3..73f25906205 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -188,6 +188,7 @@ @ stdcall ImageList_SetImageCount(ptr long) @ stdcall ImageList_SetOverlayImage(ptr long long) @ stdcall ImageList_Write(ptr ptr) +@ stdcall ImageList_WriteEx(ptr long ptr) @ stdcall InitCommonControlsEx(ptr) @ stdcall InitMUILanguage(long) @ stdcall InitializeFlatSB(long) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 307ccc0336c..8da8beec1e0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3058,6 +3058,14 @@ failed: return result; } +/************************************************************************* + * ImageList_WriteEx [COMCTL32.@] + */ +BOOL WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) +{ + FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); + return ImageList_Write(himl, pstm); +} /************************************************************************* * ImageList_Write [COMCTL32.@] diff --git a/include/commctrl.h b/include/commctrl.h index 41abceb0138..025eb328c32 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -601,7 +601,8 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); -BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM); +BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); +BOOL WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)

1 0

Damjan Jovanovic : server: Implement vm counters on FreeBSD.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 93852599c20f0ba7859ef9dcafa5fbc05cce86f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93852599c20f0ba7859ef9dc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Nov 19 17:31:39 2021 +0200 server: Implement vm counters on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/Makefile.in | 2 +- server/process.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index 84e78d0aa56..739d0517339 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,6 +49,6 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -EXTRALIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) +EXTRALIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS) unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" diff --git a/server/process.c b/server/process.c index 343ad78270c..6d794ba5ead 100644 --- a/server/process.c +++ b/server/process.c @@ -36,6 +36,23 @@ #endif #include <unistd.h> #include <poll.h> +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> +#endif +#ifdef HAVE_SYS_QUEUE_H +# include <sys/queue.h> +#endif +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif +#ifdef HAVE_SYS_USER_H +# define thread __unix_thread +# include <sys/user.h> +# undef thread +#endif +#ifdef HAVE_LIBPROCSTAT +# include <libprocstat.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1550,9 +1567,9 @@ DECL_HANDLER(get_process_vm_counters) struct process *process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ); if (!process) return; -#ifdef linux if (process->unix_pid != -1) { +#ifdef linux FILE *f; char proc_path[32], line[256]; unsigned long value; @@ -1579,9 +1596,28 @@ DECL_HANDLER(get_process_vm_counters) fclose( f ); } else set_error( STATUS_ACCESS_DENIED ); +#elif defined(HAVE_LIBPROCSTAT) + struct procstat *procstat; + unsigned int count; + + if ((procstat = procstat_open_sysctl())) + { + struct kinfo_proc *kp = procstat_getprocs( procstat, KERN_PROC_PID, process->unix_pid, &count ); + if (kp) + { + reply->virtual_size = kp->ki_size; + reply->peak_virtual_size = reply->virtual_size; + reply->working_set_size = kp->ki_rssize << PAGE_SHIFT; + reply->peak_working_set_size = kp->ki_rusage.ru_maxrss * 1024; + procstat_freeprocs( procstat, kp ); + } + else set_error( STATUS_ACCESS_DENIED ); + procstat_close( procstat ); + } + else set_error( STATUS_ACCESS_DENIED ); +#endif } else set_error( STATUS_ACCESS_DENIED ); -#endif release_object( process ); }

1 0

Jinoh Kang : winedbg: Escape special characters in GDB packet reply.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: f3478b4ec933d511aeb1cf3275872e4d9bcb857c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3478b4ec933d511aeb1cf32… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Nov 19 22:41:24 2021 +0900 winedbg: Escape special characters in GDB packet reply. There are four special characters in GDB's remote serial protocol: - '$' (0x24): start of packet - '}' (0x7D): escape - '*' (0x2A): run-length encoding repeat count delimiter - '#' (0x23): end of packet; start of checksum In particular, the '#' and '}' characters are problematic since they are often used in library filenames. A few examples: - %SystemRoot%\assembly\NativeImages_v[.NET ver]\[module+hash]#\*\*.dll - {CLSID or UUID}\*\.dll To make GDB happy with those filenames, we scan for those characters and escape them properly. While we are at it, also remove the assert in the packet_reply function that checks for '$' and '#' in the packet payload. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 54 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 727b24c9adf..c1d0bda1a41 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -739,18 +739,55 @@ static void packet_reply_val(struct gdb_context* gdbctx, ULONG_PTR val, int len) } } -static inline void packet_reply_add(struct gdb_context* gdbctx, const char* str) +static const unsigned char gdb_special_chars_lookup_table[4] = { + /* The characters should be indexed by its value modulo table length. */ + + 0x24, /* $: 001001|00 */ + 0x7D, /* }: 011111|01 */ + 0x2A, /* *: 001010|10 */ + 0x23 /* #: 001000|11 */ +}; + +static inline BOOL is_gdb_special_char(unsigned char val) { - int len = strlen(str); - packet_reply_grow(gdbctx, len); - memcpy(&gdbctx->out_buf[gdbctx->out_len], str, len); - gdbctx->out_len += len; + /* A note on the GDB special character scanning code: + * + * We cannot use strcspn() since we plan to transmit binary data in + * packet reply, which can contain NULL (0x00) bytes. We also don't want + * to slow down memory dump transfers. Therefore, we use a tiny lookup + * table that contains all the four special characters to speed up scanning. + */ + const size_t length = ARRAY_SIZE(gdb_special_chars_lookup_table); + return gdb_special_chars_lookup_table[val % length] == val; +} + +static void packet_reply_add(struct gdb_context* gdbctx, const char* str) +{ + const unsigned char *ptr = (unsigned char *)str, *curr; + + while (*ptr) + { + curr = ptr; + + while (*ptr && !is_gdb_special_char(*ptr)) + ptr++; + + packet_reply_grow(gdbctx, ptr - curr); + memcpy(&gdbctx->out_buf[gdbctx->out_len], curr, ptr - curr); + gdbctx->out_len += ptr - curr; + if (!*ptr) break; + + packet_reply_grow(gdbctx, 2); + gdbctx->out_buf[gdbctx->out_len++] = 0x7D; + gdbctx->out_buf[gdbctx->out_len++] = 0x20 ^ *ptr++; + } } static void packet_reply_open(struct gdb_context* gdbctx) { assert(gdbctx->out_curr_packet == -1); - packet_reply_add(gdbctx, "$"); + packet_reply_grow(gdbctx, 1); + gdbctx->out_buf[gdbctx->out_len++] = '$'; gdbctx->out_curr_packet = gdbctx->out_len; } @@ -760,7 +797,8 @@ static void packet_reply_close(struct gdb_context* gdbctx) int plen; plen = gdbctx->out_len - gdbctx->out_curr_packet; - packet_reply_add(gdbctx, "#"); + packet_reply_grow(gdbctx, 1); + gdbctx->out_buf[gdbctx->out_len++] = '#'; cksum = checksum(&gdbctx->out_buf[gdbctx->out_curr_packet], plen); packet_reply_hex_to(gdbctx, &cksum, 1); gdbctx->out_curr_packet = -1; @@ -799,8 +837,6 @@ static enum packet_return packet_reply(struct gdb_context* gdbctx, const char* p { packet_reply_open(gdbctx); - assert(strchr(packet, '$') == NULL && strchr(packet, '#') == NULL); - packet_reply_add(gdbctx, packet); packet_reply_close(gdbctx);

1 0

Jinoh Kang : winedbg: Use unsigned int for offset/length in GDB qXfer handler.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: a4b55c620ca6954efff8f59a9ae96201ecdd657d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b55c620ca6954efff8f59a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Nov 19 22:41:12 2021 +0900 winedbg: Use unsigned int for offset/length in GDB qXfer handler. packet_query uses sscanf format "%x" to parse out offset and length values. Since %x corresponds to unsigned int in the C standard, adjust the variable types appropriately. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index d3055340ead..727b24c9adf 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -772,7 +772,7 @@ static void packet_reply_open_xfer(struct gdb_context* gdbctx) packet_reply_add(gdbctx, "m"); } -static void packet_reply_close_xfer(struct gdb_context* gdbctx, int off, int len) +static void packet_reply_close_xfer(struct gdb_context* gdbctx, unsigned int off, unsigned int len) { int begin = gdbctx->out_curr_packet + 1; int plen; @@ -789,7 +789,7 @@ static void packet_reply_close_xfer(struct gdb_context* gdbctx, int off, int len } plen = gdbctx->out_len - begin; - if (len >= 0 && plen > len) gdbctx->out_len -= (plen - len); + if (plen > len) gdbctx->out_len -= (plen - len); else gdbctx->out_buf[gdbctx->out_curr_packet] = 'l'; packet_reply_close(gdbctx); @@ -1762,7 +1762,7 @@ static void packet_query_target_xml(struct gdb_context* gdbctx, struct backend_c static enum packet_return packet_query(struct gdb_context* gdbctx) { - int off, len; + unsigned int off, len; struct backend_cpu *cpu; switch (gdbctx->in_packet[0])

1 0

Jinoh Kang : winedbg: Replace packet_realloc() with realloc().
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: d8c07c139179b0949f58b73cb9f260fa0a2cfc6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c07c139179b0949f58b73c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Nov 19 22:41:05 2021 +0900 winedbg: Replace packet_realloc() with realloc(). winedbg is now built with msvcrt, so just use realloc() directly instead of Win32 heap functions. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index cd736532dcf..d3055340ead 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -705,20 +705,12 @@ static int addr_width(struct gdb_context* gdbctx) enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; -static char* packet_realloc(char* buf, int size) -{ - if (!buf) - return HeapAlloc(GetProcessHeap(), 0, size); - return HeapReAlloc(GetProcessHeap(), 0, buf, size); - -} - static void packet_reply_grow(struct gdb_context* gdbctx, size_t size) { if (gdbctx->out_buf_alloc < gdbctx->out_len + size) { gdbctx->out_buf_alloc = ((gdbctx->out_len + size) / 32 + 1) * 32; - gdbctx->out_buf = packet_realloc(gdbctx->out_buf, gdbctx->out_buf_alloc); + gdbctx->out_buf = realloc(gdbctx->out_buf, gdbctx->out_buf_alloc); } } @@ -2096,7 +2088,7 @@ static int fetch_data(struct gdb_context* gdbctx) { #define STEP 128 if (gdbctx->in_len + STEP > gdbctx->in_buf_alloc) - gdbctx->in_buf = packet_realloc(gdbctx->in_buf, gdbctx->in_buf_alloc += STEP); + gdbctx->in_buf = realloc(gdbctx->in_buf, gdbctx->in_buf_alloc += STEP); #undef STEP len = recv(gdbctx->sock, gdbctx->in_buf + gdbctx->in_len, gdbctx->in_buf_alloc - gdbctx->in_len - 1, 0); if (len <= 0) break;

1 0

Jacek Caban : user32: Move register_builtin_classes call to GetDesktopWindow.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 0487c826fb8433cdede71f27af71c43fe7445a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0487c826fb8433cdede71f27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 19 13:47:37 2021 +0100 user32: Move register_builtin_classes call to GetDesktopWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 - dlls/user32/win.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 06b02adeab5..a1a64f42b6f 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -98,7 +98,6 @@ static const struct user_driver_funcs *load_driver(void) __wine_set_user_driver( &driver, WINE_GDI_DRIVER_VERSION ); } - register_builtin_classes(); return USER_Driver; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9fd5a9aa5e6..221607b3169 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -252,6 +252,7 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, else assert( full_parent == thread_info->top_window ); if (full_parent && !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); + register_builtin_classes(); } else /* HWND_MESSAGE parent */ { @@ -2282,6 +2283,7 @@ HWND WINAPI GetDesktopWindow(void) if (!thread_info->top_window || !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); + register_builtin_classes(); return thread_info->top_window; }

1 0

Jacek Caban : user32: Don't load cursor inside user lock in register_builtin.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 898ce074066ea29dc8eedd37070161ede912dc25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=898ce074066ea29dc8eedd37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 19 13:45:10 2021 +0100 user32: Don't load cursor inside user lock in register_builtin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 622226f9e15..b37db675400 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -529,11 +529,18 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; + HCURSOR cursor = 0; + + if (descr->cursor) cursor = LoadCursorA( 0, (LPSTR)descr->cursor ); if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE, - descr->style, 0, descr->extra ))) return; + descr->style, 0, descr->extra ))) + { + if (cursor) DestroyCursor( cursor ); + return; + } - if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); + classPtr->hCursor = cursor; classPtr->hbrBackground = descr->brush; classPtr->winproc = BUILTIN_WINPROC( descr->proc ); release_class_ptr( classPtr );

1 0

Ivo Ivanov : dinput: Support creating effects using device managed reports.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 02951f12a4a3b3110756cda8bfd6bd3e1dbb44fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02951f12a4a3b3110756cda8… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 19 12:37:20 2021 +0100 dinput: Support creating effects using device managed reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 81 ++++++++++++++++++++++++++++++++++++++++------ dlls/dinput8/tests/hid.c | 3 -- 2 files changed, 72 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 21e430a819f..3d90e721fb6 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -174,6 +174,7 @@ struct hid_joystick char *input_report_buf; char *output_report_buf; + char *feature_report_buf; USAGE_AND_PAGE *usages_buf; ULONG usages_count; @@ -401,15 +402,54 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance ) } } -static HRESULT find_next_effect_id( struct hid_joystick *impl, ULONG *index ) +static HRESULT find_next_effect_id( struct hid_joystick *impl, DWORD *index, USAGE type ) { - ULONG i; + struct pid_device_pool *device_pool = &impl->pid_device_pool; + struct pid_new_effect *new_effect = &impl->pid_new_effect; + struct pid_block_load *block_load = &impl->pid_block_load; + ULONG i, count, report_len = impl->caps.FeatureReportByteLength; + NTSTATUS status; + USAGE usage; + + if (!device_pool->device_managed_caps) + { + for (i = 0; i < ARRAY_SIZE(impl->effect_inuse); ++i) + if (!impl->effect_inuse[i]) break; + if (i == ARRAY_SIZE(impl->effect_inuse)) return DIERR_DEVICEFULL; + impl->effect_inuse[i] = TRUE; + *index = i + 1; + } + else + { + status = HidP_InitializeReportForID( HidP_Feature, new_effect->id, impl->preparsed, + impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + count = 1; + status = HidP_SetUsages( HidP_Feature, HID_USAGE_PAGE_PID, new_effect->type_coll, + &type, &count, impl->preparsed, impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + if (!HidD_SetFeature( impl->device, impl->feature_report_buf, report_len )) return DIERR_INPUTLOST; - for (i = 0; i < ARRAY_SIZE(impl->effect_inuse); ++i) - if (!impl->effect_inuse[i]) break; - if (i == ARRAY_SIZE(impl->effect_inuse)) return DIERR_DEVICEFULL; - impl->effect_inuse[i] = TRUE; - *index = i + 1; + status = HidP_InitializeReportForID( HidP_Feature, block_load->id, impl->preparsed, + impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + if (!HidD_GetFeature( impl->device, impl->feature_report_buf, report_len )) return DIERR_INPUTLOST; + + count = 1; + status = HidP_GetUsages( HidP_Feature, HID_USAGE_PAGE_PID, block_load->status_coll, + &usage, &count, impl->preparsed, impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + + if (count != 1 || usage == PID_USAGE_BLOCK_LOAD_ERROR) return DIERR_INPUTLOST; + if (usage == PID_USAGE_BLOCK_LOAD_FULL) return DIERR_DEVICEFULL; + + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + index, impl->preparsed, impl->feature_report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return status; + } return DI_OK; } @@ -736,6 +776,7 @@ static void hid_joystick_release( IDirectInputDevice8W *iface ) if (!ref) { free( impl->usages_buf ); + free( impl->feature_report_buf ); free( impl->output_report_buf ); free( impl->input_report_buf ); HidD_FreePreparsedData( impl->preparsed ); @@ -1897,6 +1938,9 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, size = impl->caps.OutputReportByteLength; if (!(buffer = malloc( size ))) goto failed; impl->output_report_buf = buffer; + size = impl->caps.FeatureReportByteLength; + if (!(buffer = malloc( size ))) goto failed; + impl->feature_report_buf = buffer; impl->usages_count = HidP_MaxUsageListLength( HidP_Input, 0, impl->preparsed ); size = impl->usages_count * sizeof(USAGE_AND_PAGE); if (!(usages = malloc( size ))) goto failed; @@ -2720,7 +2764,7 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) hr = DIERR_NOTEXCLUSIVEACQUIRED; else if ((impl->flags & complete_mask) != complete_mask) hr = DIERR_INCOMPLETEEFFECT; - else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index ))) + else if (!impl->index && SUCCEEDED(hr = find_next_effect_id( impl->joystick, &impl->index, impl->type ))) { if (!impl->type_specific_buf[0]) status = HIDP_STATUS_SUCCESS; else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, @@ -2873,7 +2917,11 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) { struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); struct hid_joystick *joystick = impl->joystick; + struct pid_device_pool *device_pool = &joystick->pid_device_pool; + struct pid_block_free *block_free = &joystick->pid_block_free; + ULONG report_len = joystick->caps.OutputReportByteLength; HRESULT hr = DI_OK; + NTSTATUS status; TRACE( "iface %p\n", iface ); @@ -2882,7 +2930,22 @@ static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) hr = DI_NOEFFECT; else if (SUCCEEDED(hr = IDirectInputEffect_Stop( iface ))) { - impl->joystick->effect_inuse[impl->index - 1] = FALSE; + if (!device_pool->device_managed_caps) + joystick->effect_inuse[impl->index - 1] = FALSE; + else if (block_free->id) + { + status = HidP_InitializeReportForID( HidP_Output, block_free->id, joystick->preparsed, + joystick->output_report_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, joystick->preparsed, joystick->output_report_buf, report_len ); + + if (status != HIDP_STATUS_SUCCESS) hr = status; + else if (WriteFile( joystick->device, joystick->output_report_buf, report_len, NULL, NULL )) hr = DI_OK; + else hr = DIERR_INPUTLOST; + } + impl->index = 0; } LeaveCriticalSection( &joystick->base.crit ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f7c8001881d..cbb202530ac 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8445,7 +8445,6 @@ static void test_device_managed_effect(void) .report_id = 9, .report_len = 2, .report_buf = {9,0x03}, - .todo = TRUE, }, /* block load */ { @@ -8453,7 +8452,6 @@ static void test_device_managed_effect(void) .report_id = 10, .report_len = 3, .report_buf = {10,0x01,0x01}, - .todo = TRUE, }, /* set condition */ { @@ -8492,7 +8490,6 @@ static void test_device_managed_effect(void) .report_id = 11, .report_len = 2, .report_buf = {11,0x01}, - .todo = TRUE, }, }; static const DWORD expect_axes[3] =

1 0

Ivo Ivanov : dinput: Write PID_USAGE_PARAMETER_BLOCK_OFFSET in the set condition report.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: b510558cb69feb67666b35ed0a3caf0553ea99c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b510558cb69feb67666b35ed… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 19 12:37:19 2021 +0100 dinput: Write PID_USAGE_PARAMETER_BLOCK_OFFSET in the set condition report. Required by the PID spec for devices with device managed blocks. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 858755140d1..21e430a819f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2765,6 +2765,10 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) case PID_USAGE_ET_FRICTION: for (i = 0; i < impl->params.cbTypeSpecificParams / sizeof(DICONDITION); ++i) { + status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_PARAMETER_BLOCK_OFFSET, + i, impl->joystick->preparsed, impl->type_specific_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue %04x:%04x returned %#x\n", + HID_USAGE_PAGE_PID, PID_USAGE_PARAMETER_BLOCK_OFFSET, status ); set_parameter_value( impl, impl->type_specific_buf, set_condition->center_point_offset_caps, impl->condition[i].lOffset ); set_parameter_value( impl, impl->type_specific_buf, set_condition->positive_coefficient_caps,

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021