November 2022 - Wine-Commits

Alex Henrie : taskschd: Use standard C functions for memory allocation in folder_collection.c.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: e0b9fbe5974a5b7a4bad8004f52519190271096a URL: https://gitlab.winehq.org/wine/wine/-/commit/e0b9fbe5974a5b7a4bad8004f52519… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 07:59:18 2022 -0700 taskschd: Use standard C functions for memory allocation in folder_collection.c. --- dlls/taskschd/folder_collection.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 41e3caca33f..578e3e653b6 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -72,8 +72,8 @@ static ULONG WINAPI folders_Release(ITaskFolderCollection *iface) { TRACE("destroying %p\n", iface); free_list(folders->list, folders->count); - heap_free(folders->path); - heap_free(folders); + free(folders->path); + free(folders); } return ref; @@ -226,7 +226,7 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o hr = SchRpcEnumFolders(path, 0, &start_index, 0, &count, &list); if (hr != S_OK) return hr; - folders = heap_alloc(sizeof(*folders)); + folders = malloc(sizeof(*folders)); if (!folders) { free_list(list, count); @@ -235,9 +235,9 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; folders->ref = 1; - if (!(folders->path = heap_strdupW(path))) + if (!(folders->path = wcsdup(path))) { - heap_free(folders); + free(folders); free_list(list, count); return E_OUTOFMEMORY; } @@ -296,7 +296,7 @@ static ULONG WINAPI enumvar_Release(IEnumVARIANT *iface) { TRACE("destroying %p\n", iface); ITaskFolderCollection_Release(&enumvar->folders->ITaskFolderCollection_iface); - heap_free(enumvar); + free(enumvar); } return ref; @@ -384,7 +384,7 @@ static HRESULT NewEnum_create(TaskFolderCollection *folders, IUnknown **obj) { EnumVARIANT *enumvar; - enumvar = heap_alloc(sizeof(*enumvar)); + enumvar = malloc(sizeof(*enumvar)); if (!enumvar) return E_OUTOFMEMORY; enumvar->IEnumVARIANT_iface.lpVtbl = &EnumVARIANT_vtbl;

1 0

Alex Henrie : windows.media.speech: Put the calling convention inside the function pointer parentheses.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: abf14cd4bc641b17b3801c141743cbc95e47e580 URL: https://gitlab.winehq.org/wine/wine/-/commit/abf14cd4bc641b17b3801c141743cb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:56:41 2022 -0700 windows.media.speech: Put the calling convention inside the function pointer parentheses. As required by MSVC. --- dlls/windows.media.speech/tests/speech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 464faaf819a..445d10923ae 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -57,7 +57,7 @@ #define IAsyncHandler_IInspectable_iface IAsyncOperationCompletedHandler_IInspectable_iface -HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); +HRESULT (WINAPI *pDllGetActivationFactory)(HSTRING, IActivationFactory **); static BOOL is_win10_1507 = FALSE; static BOOL is_win10_1709 = FALSE;

1 0

Alex Henrie : kernel32/tests: Avoid using GCC's typeof extension.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 318d02723cef8e79e7b559d569808a98629dc88e URL: https://gitlab.winehq.org/wine/wine/-/commit/318d02723cef8e79e7b559d569808a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 21:14:47 2022 -0700 kernel32/tests: Avoid using GCC's typeof extension. --- dlls/kernel32/tests/heap.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 3e861f52248..f449f06270d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -52,13 +52,10 @@ static BOOLEAN (WINAPI *pRtlSetUserFlagsHeap)(HANDLE,ULONG,void*,ULONG,ULONG); static HGLOBAL (WINAPI *pGlobalAlloc)(UINT,SIZE_T); static HGLOBAL (WINAPI *pGlobalFree)(HGLOBAL); static HGLOBAL (WINAPI *pLocalFree)(HLOCAL); - -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( HeapQueryInformation ); -MAKE_FUNC( HeapSetInformation ); -MAKE_FUNC( GlobalFlags ); -MAKE_FUNC( RtlGetNtGlobalFlags ); -#undef MAKE_FUNC +static BOOL (WINAPI *pHeapQueryInformation)(HANDLE,HEAP_INFORMATION_CLASS,void*,SIZE_T,SIZE_T*); +static BOOL (WINAPI *pHeapSetInformation)(HANDLE,HEAP_INFORMATION_CLASS,void*,SIZE_T); +static UINT (WINAPI *pGlobalFlags)(HGLOBAL); +static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); static void load_functions(void) {

1 0

Alex Henrie : explorer: Put the calling convention inside the function pointer parentheses.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: dab61cdcd1f0ddbe6c096ccfe9344d4d33572f22 URL: https://gitlab.winehq.org/wine/wine/-/commit/dab61cdcd1f0ddbe6c096ccfe9344d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 21:06:37 2022 -0700 explorer: Put the calling convention inside the function pointer parentheses. As required by MSVC. --- programs/explorer/startmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index 3173ae21fc6..b46bd068220 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -371,8 +371,8 @@ static void fill_menu(struct menu_item* item) static void run_dialog(void) { - void WINAPI (*pRunFileDlg)(HWND hWndOwner, HICON hIcon, LPCSTR lpszDir, - LPCSTR lpszTitle, LPCSTR lpszDesc, DWORD dwFlags); + void (WINAPI *pRunFileDlg)(HWND owner, HICON icon, const char *dir, + const char *title, const char *desc, DWORD flags); HMODULE hShell32; hShell32 = LoadLibraryW(L"shell32");

1 0

Alex Henrie : dinput/tests: Put the calling convention inside the function pointer parentheses.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 929de48426eecedcb7730cd7c095f0051cf48551 URL: https://gitlab.winehq.org/wine/wine/-/commit/929de48426eecedcb7730cd7c095f0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 19:53:18 2022 -0700 dinput/tests: Put the calling convention inside the function pointer parentheses. --- dlls/dinput/tests/force_feedback.c | 10 +++++----- dlls/dinput/tests/hotplug.c | 8 ++++---- dlls/dinput/tests/joystick8.c | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index ba37320e9f0..a2ccdb08350 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -48,11 +48,11 @@ #include "windows.gaming.input.forcefeedback.h" #undef Size -static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); -static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); -static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); -static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); -static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); +static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE ); +static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str ); +static const WCHAR* (WINAPI *pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index e915d04745a..78e38b1e285 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -50,10 +50,10 @@ #include "windows.gaming.input.custom.h" #undef Size -static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); -static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); -static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); -static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); +static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE ); +static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index f568c9298c6..49f7c1a201e 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -47,11 +47,11 @@ #include "windows.gaming.input.h" #undef Size -static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); -static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); -static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); -static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); -static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); +static HRESULT (WINAPI *pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT (WINAPI *pRoInitialize)( RO_INIT_TYPE ); +static HRESULT (WINAPI *pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT (WINAPI *pWindowsDeleteString)( HSTRING str ); +static const WCHAR* (WINAPI *pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) {

1 0

Alex Henrie : webservices: Remove unused function heap_realloc_zero.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 78e0caa5ef09a4410b5b72d841746079c57e3973 URL: https://gitlab.winehq.org/wine/wine/-/commit/78e0caa5ef09a4410b5b72d8417460… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 22:44:25 2022 -0700 webservices: Remove unused function heap_realloc_zero. This function has not been used since commit 105d16774432a6ab206896404ca644d9ee7e2b7e. --- dlls/webservices/webservices_private.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 478f1aa00f3..e488614c2a5 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -406,8 +406,3 @@ static inline BOOL is_valid_parent( const struct node *node ) if (!node) return FALSE; return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); } - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -}

1 0

Gabriel Ivăncescu : jscript: Use CRT allocation functions.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: ae73e09a8d071eaa33fafe785e8295384b9e64a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae73e09a8d071eaa33fafe785e8295… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 21 20:43:43 2022 +0200 jscript: Use CRT allocation functions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 18 +++++++++--------- dlls/jscript/bool.c | 4 ++-- dlls/jscript/compile.c | 40 ++++++++++++++++++++-------------------- dlls/jscript/date.c | 16 ++++++++-------- dlls/jscript/engine.c | 18 +++++++++--------- dlls/jscript/enumerator.c | 6 +++--- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 34 +++++++++++++++++----------------- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 1 - dlls/jscript/json.c | 26 +++++++++++++------------- dlls/jscript/jsregexp.c | 18 +++++++++--------- dlls/jscript/jsstr.c | 10 +++++----- dlls/jscript/jsutils.c | 26 +++++++++++++------------- dlls/jscript/lex.c | 8 ++++---- dlls/jscript/math.c | 4 ++-- dlls/jscript/number.c | 4 ++-- dlls/jscript/object.c | 6 +++--- dlls/jscript/parser.y | 4 ++-- dlls/jscript/regexp.c | 30 +++++++++++++++--------------- dlls/jscript/regexp.h | 2 +- dlls/jscript/set.c | 12 ++++++------ dlls/jscript/string.c | 22 +++++++++++----------- dlls/jscript/vbarray.c | 12 ++++++------ 24 files changed, 163 insertions(+), 164 deletions(-)

1 0

Matthew Tran : hid: Fix HidP_(Get|Set)(Scaled)UsageValue with usage ranges and arrays.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: a08eb8969a2267f90e1f6948b68b62d0375a1efd URL: https://gitlab.winehq.org/wine/wine/-/commit/a08eb8969a2267f90e1f6948b68b62… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Mon Nov 21 12:47:34 2022 +0100 hid: Fix HidP_(Get|Set)(Scaled)UsageValue with usage ranges and arrays. --- dlls/dinput/tests/hid.c | 12 ------------ dlls/hid/hidp.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 26 deletions(-)

1 0

Rémi Bernon : hid: Move (get|set)_usage_value around and use it for scaled values.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 7f6e8387dd5cabaae759d39bf54a8ca2bcc72853 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f6e8387dd5cabaae759d39bf54a8c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 21 12:43:23 2022 +0100 hid: Move (get|set)_usage_value around and use it for scaled values. --- dlls/hid/hidp.c | 80 +++++++++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index a1c5805c19f..bf5a6259484 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -236,18 +236,33 @@ static LONG sign_extend( ULONG value, const struct hid_value_caps *caps ) return value - ((value & sign) << 1); } -static NTSTATUS get_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) { struct usage_value_params *params = user; - ULONG unsigned_value = 0, bit_count = caps->bit_size * caps->report_count; - LONG signed_value, *value = params->value_buf; + ULONG bit_count = caps->bit_size * caps->report_count; unsigned char *report_buf; - if ((bit_count + 7) / 8 > sizeof(unsigned_value)) return HIDP_STATUS_BUFFER_TOO_SMALL; - if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + memset( params->value_buf, 0, params->value_len ); report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( (unsigned char *)&unsigned_value, report_buf, bit_count, -caps->start_bit ); + copy_bits( params->value_buf, report_buf, bit_count, -caps->start_bit ); + + return HIDP_STATUS_NULL; +} + +static NTSTATUS get_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + LONG signed_value, *value = params->value_buf; + ULONG unsigned_value = 0; + NTSTATUS status; + + params->value_buf = &unsigned_value; + params->value_len = sizeof(unsigned_value); + if ((status = get_usage_value( caps, params )) != HIDP_STATUS_NULL) return status; + + if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; signed_value = sign_extend( unsigned_value, caps ); if (caps->logical_min > caps->logical_max || caps->physical_min > caps->physical_max) @@ -280,21 +295,6 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE us return enum_value_caps( preparsed, report_type, report_len, &filter, get_scaled_usage_value, &params, &count ); } -static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) -{ - struct usage_value_params *params = user; - ULONG bit_count = caps->bit_size * caps->report_count; - unsigned char *report_buf; - - if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; - memset( params->value_buf, 0, params->value_len ); - - report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( params->value_buf, report_buf, bit_count, -caps->start_bit ); - - return HIDP_STATUS_NULL; -} - NTSTATUS WINAPI HidP_GetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE usage, ULONG *value, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { @@ -446,17 +446,28 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ return count; } -static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) { - ULONG bit_count = caps->bit_size * caps->report_count; struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; unsigned char *report_buf; + + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + + report_buf = (unsigned char *)params->report_buf + caps->start_byte; + copy_bits( report_buf, params->value_buf, bit_count, caps->start_bit ); + + return HIDP_STATUS_NULL; +} + +static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; LONG value, log_range, phy_range; if (caps->logical_min > caps->logical_max) return HIDP_STATUS_BAD_LOG_PHY_VALUES; if (caps->physical_min > caps->physical_max) return HIDP_STATUS_BAD_LOG_PHY_VALUES; - if ((bit_count + 7) / 8 > sizeof(value)) return HIDP_STATUS_BUFFER_TOO_SMALL; if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; value = *(LONG *)params->value_buf; @@ -471,10 +482,9 @@ static NTSTATUS set_scaled_usage_value( const struct hid_value_caps *caps, void value = caps->logical_min + value; } - report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( report_buf, (unsigned char *)&value, bit_count, caps->start_bit ); - - return HIDP_STATUS_NULL; + params->value_buf = &value; + params->value_len = sizeof(value); + return set_usage_value( caps, params ); } NTSTATUS WINAPI HidP_SetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, @@ -495,20 +505,6 @@ NTSTATUS WINAPI HidP_SetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE us return enum_value_caps( preparsed, report_type, report_len, &filter, set_scaled_usage_value, &params, &count ); } -static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) -{ - struct usage_value_params *params = user; - ULONG bit_count = caps->bit_size * caps->report_count; - unsigned char *report_buf; - - if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; - - report_buf = (unsigned char *)params->report_buf + caps->start_byte; - copy_bits( report_buf, params->value_buf, bit_count, caps->start_bit ); - - return HIDP_STATUS_NULL; -} - NTSTATUS WINAPI HidP_SetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE usage, ULONG value, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) {

1 0

Matthew Tran : winexinput.sys: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 84f44de79fa9af56ac7f22e0d7d6e8786ec1d102 URL: https://gitlab.winehq.org/wine/wine/-/commit/84f44de79fa9af56ac7f22e0d7d6e8… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 winexinput.sys: Fix incorrect HID STRING_INDEX tag value. --- dlls/winexinput.sys/psh_hid_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winexinput.sys/psh_hid_macros.h b/dlls/winexinput.sys/psh_hid_macros.h index 4623af20598..8e0a2a9dd6b 100644 --- a/dlls/winexinput.sys/psh_hid_macros.h +++ b/dlls/winexinput.sys/psh_hid_macros.h @@ -79,7 +79,7 @@ #define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) #define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) #define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) -#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) -#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) -#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) -#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x9,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0xa,2,data)

1 0