wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Shaun Ren : sapi: Add ISpeechObjectTokens stub.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: ca6f3a7af87ded6f54c23aa5a983bbe9ee74667f URL: https://gitlab.winehq.org/wine/wine/-/commit/ca6f3a7af87ded6f54c23aa5a983bb… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Feb 2 02:19:38 2024 -0500 sapi: Add ISpeechObjectTokens stub. --- dlls/sapi/tests/token.c | 30 +++++++++++ dlls/sapi/token.c | 129 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 153 insertions(+), 6 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 0fe142f89a8..9350c304e41 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -246,12 +246,42 @@ static void test_token_enum(void) { ISpObjectTokenEnumBuilder *token_enum; HRESULT hr; + IDispatch *disp; + ISpeechObjectTokens *speech_tokens; ISpObjectToken *tokens[5]; ISpObjectToken *out_tokens[5]; WCHAR token_id[MAX_PATH]; ULONG count; int i; + hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum, + &IID_IDispatch, (void **)&disp ); + ok( hr == S_OK, "got %08lx\n", hr ); + IDispatch_Release( disp ); + + hr = ISpObjectTokenEnumBuilder_QueryInterface( token_enum, + &IID_ISpeechObjectTokens, + (void **)&speech_tokens ); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpeechObjectTokens_Release( speech_tokens ); + + ISpObjectTokenEnumBuilder_Release( token_enum ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_IDispatch, (void **)&disp ); + ok( hr == S_OK, "got %08lx\n", hr ); + IDispatch_Release( disp ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpeechObjectTokens, (void **)&speech_tokens ); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpeechObjectTokens_Release( speech_tokens ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, &IID_ISpObjectTokenEnumBuilder, (void **)&token_enum ); ok( hr == S_OK, "got %08lx\n", hr ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index fd4efb9a95a..4688e6a07b9 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -579,6 +579,7 @@ struct token_with_score struct token_enum { ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface; + ISpeechObjectTokens ISpeechObjectTokens_iface; LONG ref; BOOL init; @@ -593,6 +594,11 @@ static struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnu return CONTAINING_RECORD( iface, struct token_enum, ISpObjectTokenEnumBuilder_iface ); } +static struct token_enum *impl_from_ISpeechObjectTokens( ISpeechObjectTokens *iface ) +{ + return CONTAINING_RECORD( iface, struct token_enum, ISpeechObjectTokens_iface ); +} + static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface, LPCWSTR req, LPCWSTR opt, IEnumSpObjectTokens **enum_tokens ) @@ -765,15 +771,19 @@ static HRESULT WINAPI token_enum_QueryInterface( ISpObjectTokenEnumBuilder *ifac if (IsEqualIID( iid, &IID_IUnknown ) || IsEqualIID( iid, &IID_IEnumSpObjectTokens ) || IsEqualIID( iid, &IID_ISpObjectTokenEnumBuilder )) + *obj = &This->ISpObjectTokenEnumBuilder_iface; + else if (IsEqualIID( iid, &IID_IDispatch ) || + IsEqualIID( iid, &IID_ISpeechObjectTokens )) + *obj = &This->ISpeechObjectTokens_iface; + else { - ISpObjectTokenEnumBuilder_AddRef( iface ); - *obj = iface; - return S_OK; + *obj = NULL; + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; } - FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef( (IUnknown *)*obj ); + return S_OK; } static ULONG WINAPI token_enum_AddRef( ISpObjectTokenEnumBuilder *iface ) @@ -1135,6 +1145,112 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl = token_enum_Sort }; +static HRESULT WINAPI speech_tokens_QueryInterface( ISpeechObjectTokens *iface, + REFIID iid, void **obj ) +{ + struct token_enum *This = impl_from_ISpeechObjectTokens( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + return ISpObjectTokenEnumBuilder_QueryInterface( + &This->ISpObjectTokenEnumBuilder_iface, iid, obj ); +} + +static ULONG WINAPI speech_tokens_AddRef( ISpeechObjectTokens *iface ) +{ + struct token_enum *This = impl_from_ISpeechObjectTokens( iface ); + + TRACE( "(%p)\n", This ); + + return ISpObjectTokenEnumBuilder_AddRef( &This->ISpObjectTokenEnumBuilder_iface ); +} + +static ULONG WINAPI speech_tokens_Release( ISpeechObjectTokens *iface ) +{ + struct token_enum *This = impl_from_ISpeechObjectTokens( iface ); + + TRACE( "(%p)\n", This ); + + return ISpObjectTokenEnumBuilder_Release( &This->ISpObjectTokenEnumBuilder_iface ); +} + +static HRESULT WINAPI speech_tokens_GetTypeInfoCount( ISpeechObjectTokens *iface, + UINT *count ) +{ + + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_tokens_GetTypeInfo( ISpeechObjectTokens *iface, + UINT index, + LCID lcid, + ITypeInfo **type_info ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_tokens_GetIDsOfNames( ISpeechObjectTokens *iface, + REFIID iid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispids ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_tokens_Invoke( ISpeechObjectTokens *iface, + DISPID dispid, + REFIID iid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excepinfo, + UINT *argerr ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_tokens_get_Count( ISpeechObjectTokens *iface, + LONG *count ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_tokens_Item( ISpeechObjectTokens *iface, + LONG index, ISpeechObjectToken **token ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_tokens_get__NewEnum( ISpeechObjectTokens *iface, + IUnknown **new_enum ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static const ISpeechObjectTokensVtbl speech_tokens_vtbl = +{ + speech_tokens_QueryInterface, + speech_tokens_AddRef, + speech_tokens_Release, + speech_tokens_GetTypeInfoCount, + speech_tokens_GetTypeInfo, + speech_tokens_GetIDsOfNames, + speech_tokens_Invoke, + speech_tokens_get_Count, + speech_tokens_Item, + speech_tokens_get__NewEnum +}; + HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) { struct token_enum *This = malloc( sizeof(*This) ); @@ -1142,6 +1258,7 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) if (!This) return E_OUTOFMEMORY; This->ISpObjectTokenEnumBuilder_iface.lpVtbl = &token_enum_vtbl; + This->ISpeechObjectTokens_iface.lpVtbl = &speech_tokens_vtbl; This->ref = 1; This->req = NULL; This->opt = NULL;

1 0

Shaun Ren : sapi: Add ISpeechObjectToken stub.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: c45bedbf23ddf619b2aa034e843dc010f47b4f58 URL: https://gitlab.winehq.org/wine/wine/-/commit/c45bedbf23ddf619b2aa034e843dc0… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Feb 2 01:58:10 2024 -0500 sapi: Add ISpeechObjectToken stub. --- dlls/sapi/tests/token.c | 27 ++++++ dlls/sapi/token.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++-- include/sapi.idl | 2 +- 3 files changed, 247 insertions(+), 7 deletions(-)

1 0

Jacek Caban : dsound: Simplify f_to_32.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 4e54087fab9c58dc5aefd25adfcf9cb42222718d URL: https://gitlab.winehq.org/wine/wine/-/commit/4e54087fab9c58dc5aefd25adfcf9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 11:33:36 2023 +0100 dsound: Simplify f_to_32. --- dlls/dsound/dsound_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 67344565860..bdd62c8e51f 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -142,7 +142,7 @@ static inline LONG f_to_32(float value) { if(value <= -1.f) return 0x80000000; - if(value >= 1.f * 0x7FFFFFFF / 0x80000000U) /* this rounds to 1.f */ + if(value >= 1.f) return 0x7FFFFFFF; return le32(lrintf(value * 0x80000000U)); }

1 0

Jacek Caban : d3d10/tests: Avoid implicit cast changing value.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 92f9c58e6dafdd5ab6ad6dcd7c9d57fba9d34598 URL: https://gitlab.winehq.org/wine/wine/-/commit/92f9c58e6dafdd5ab6ad6dcd7c9d57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 9 13:31:00 2024 +0100 d3d10/tests: Avoid implicit cast changing value. --- dlls/d3d10/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 35f99fc7d46..a9f4c1e47e5 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9147,7 +9147,7 @@ static void test_effect_value_expression(void) ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ok(!blend_state, "Unexpected blend state %p.\n", blend_state); for (idx = 0; idx < ARRAY_SIZE(blend_factor); ++idx) - ok(blend_factor[idx] == UINT_MAX, "Got unexpected blend_factor[%u] %.8e.\n", idx, blend_factor[idx]); + ok(blend_factor[idx] == (float)UINT_MAX, "Got unexpected blend_factor[%u] %.8e.\n", idx, blend_factor[idx]); ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); /* movc */

1 0

Alexandre Julliard : ntdll/tests: Mark a failing test as todo.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 13b0f22cf9c1b6f22dcede70f40244b486b9e2e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/13b0f22cf9c1b6f22dcede70f40244… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 17:59:46 2024 +0100 ntdll/tests: Mark a failing test as todo. --- dlls/ntdll/tests/wow64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index aebff700940..e0dd7bab13b 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1700,6 +1700,7 @@ static void check_module( ULONG64 base, const WCHAR *name ) else CHECK_MODULE(wow64cpu); #undef CHECK_MODULE + todo_wine_if( !wcscmp( name, L"win32u.dll" )) ok( 0, "unknown module %s %s found\n", wine_dbgstr_longlong(base), wine_dbgstr_w(name)); }

1 0

Alexandre Julliard : user32/tests: Fix some sysparams results on recent Windows.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 7e2f44210bfd4b95467929ade792dc9b403f81df URL: https://gitlab.winehq.org/wine/wine/-/commit/7e2f44210bfd4b95467929ade792dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 15:11:22 2024 +0100 user32/tests: Fix some sysparams results on recent Windows. --- dlls/user32/tests/sysparams.c | 135 ++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 52 deletions(-)

1 0

Alexandre Julliard : gdi32/tests: Fix the expected GetTextMetrics() results on recent Windows.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 525835897b9378ec736e60e6898a9c9ffd597ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/525835897b9378ec736e60e6898a9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 12:34:04 2024 +0100 gdi32/tests: Fix the expected GetTextMetrics() results on recent Windows. --- dlls/gdi32/tests/font.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 76ea0ac7de7..0513c2b2ca8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6527,7 +6527,7 @@ static void test_max_height(void) DeleteObject(SelectObject(hdc, hfont_old)); /* test the largest value */ - lf.lfHeight = -((1 << 16) - 1); + lf.lfHeight = -((1 << 14) - 1); hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); memset(&tm, 0, sizeof(tm)); @@ -6547,12 +6547,15 @@ static void test_max_height(void) hfont_old = SelectObject(hdc, hfont); memset(&tm, 0, sizeof(tm)); r = GetTextMetricsA(hdc, &tm); - ok(r, "GetTextMetrics failed\n"); - ok(tm.tmHeight == tm1.tmHeight, - "expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight); - ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, - "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); - DeleteObject(SelectObject(hdc, hfont_old)); + if (r) + { + ok(r, "GetTextMetrics failed\n"); + ok(tm.tmHeight == tm1.tmHeight, + "expected 1 ppem value (%ld), got %ld\n", tm1.tmHeight, tm.tmHeight); + ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, + "expected 1 ppem value (%ld), got %ld\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); + DeleteObject(SelectObject(hdc, hfont_old)); + } winetest_pop_context(); }

1 0

Alexandre Julliard : uxtheme: Use BOOLEAN instead of BOOL in ordinal functions.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 3bd1d1c60d10e96caef40dae6dde8da5f9d03da7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bd1d1c60d10e96caef40dae6dde8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 11:48:46 2024 +0100 uxtheme: Use BOOLEAN instead of BOOL in ordinal functions. This should fix test failures on Windows. --- dlls/uxtheme/system.c | 8 ++++---- dlls/uxtheme/tests/system.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 3c0eb3c66f4..371e23b5474 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1268,7 +1268,7 @@ void WINAPI RefreshImmersiveColorPolicyState(void) * RETURNS * Whether or not the system should use dark mode. */ -BOOL WINAPI ShouldSystemUseDarkMode(void) +BOOLEAN WINAPI ShouldSystemUseDarkMode(void) { DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); @@ -1285,7 +1285,7 @@ BOOL WINAPI ShouldSystemUseDarkMode(void) * RETURNS * Whether or not apps should use dark mode. */ -BOOL WINAPI ShouldAppsUseDarkMode(void) +BOOLEAN WINAPI ShouldAppsUseDarkMode(void) { DWORD light_theme = TRUE, light_theme_size = sizeof(light_theme); @@ -1300,7 +1300,7 @@ BOOL WINAPI ShouldAppsUseDarkMode(void) * AllowDarkModeForWindow (UXTHEME.133) * */ -BOOL WINAPI AllowDarkModeForWindow(HWND hwnd, BOOL allow) +BOOLEAN WINAPI AllowDarkModeForWindow(HWND hwnd, BOOLEAN allow) { FIXME("%p %d: stub\n", hwnd, allow); return FALSE; @@ -1320,7 +1320,7 @@ int WINAPI SetPreferredAppMode(int app_mode) * IsDarkModeAllowedForWindow (UXTHEME.137) * */ -BOOL WINAPI IsDarkModeAllowedForWindow(HWND hwnd) +BOOLEAN WINAPI IsDarkModeAllowedForWindow(HWND hwnd) { FIXME("%p: stub\n", hwnd); return FALSE; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 36740fe2664..30c5fbce161 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -50,8 +50,8 @@ static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); -static BOOL (WINAPI *pShouldSystemUseDarkMode)(void); -static BOOL (WINAPI *pShouldAppsUseDarkMode)(void); +static BOOLEAN (WINAPI *pShouldSystemUseDarkMode)(void); +static BOOLEAN (WINAPI *pShouldAppsUseDarkMode)(void); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -2680,7 +2680,7 @@ static void test_theme(void) static void test_ShouldSystemUseDarkMode(void) { DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; - BOOL result; + BOOLEAN result; LSTATUS ls; if (!pShouldSystemUseDarkMode) @@ -2709,7 +2709,7 @@ static void test_ShouldSystemUseDarkMode(void) static void test_ShouldAppsUseDarkMode(void) { DWORD light_theme, light_theme_size = sizeof(light_theme), last_error; - BOOL result; + BOOLEAN result; LSTATUS ls; if (!pShouldAppsUseDarkMode)

1 0

Rémi Bernon : win32u: Get rid of the rawinput thread data and buffer.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 87e5bdaa4a0442c0bf2829a86d86b548d912a3ef URL: https://gitlab.winehq.org/wine/wine/-/commit/87e5bdaa4a0442c0bf2829a86d86b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 1 08:42:33 2024 +0100 win32u: Get rid of the rawinput thread data and buffer. --- dlls/win32u/ntuser_private.h | 12 +--- dlls/win32u/rawinput.c | 142 +++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 97 deletions(-) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 11bb7f4baf6..3b6cab5bdc9 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,16 +38,6 @@ enum system_timer_id SYSTEM_TIMER_KEY_REPEAT = 0xfff0, }; -struct rawinput_thread_data -{ - UINT hw_id; /* current rawinput message id */ - RAWINPUT buffer[1]; /* rawinput message data buffer */ -}; - -/* on windows the buffer capacity is quite large as well, enough to */ -/* hold up to 10s of 1kHz mouse rawinput events */ -#define RAWINPUT_BUFFER_SIZE (512 * 1024) - struct user_object { HANDLE handle; @@ -133,7 +123,7 @@ struct user_thread_info MSG key_repeat_msg; /* Last WM_KEYDOWN message to repeat */ HKL kbd_layout; /* Current keyboard layout */ UINT kbd_layout_id; /* Current keyboard layout ID */ - struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */ + struct hardware_msg_data *rawinput; /* Current rawinput message data */ UINT spy_indent; /* Current spy indent */ BOOL clipping_cursor; /* thread is currently clipping */ DWORD clipping_reset; /* time when clipping was last reset */ diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index e4f43091b9b..1120ce053aa 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -52,51 +52,6 @@ typedef struct } RAWINPUTHEADER64; #endif -static struct rawinput_thread_data *get_rawinput_thread_data(void) -{ - struct user_thread_info *thread_info = get_user_thread_info(); - struct rawinput_thread_data *data = thread_info->rawinput; - if (data) return data; - data = thread_info->rawinput = calloc( 1, RAWINPUT_BUFFER_SIZE + sizeof(struct user_thread_info) ); - return data; -} - -static BOOL rawinput_from_hardware_message( RAWINPUT *rawinput, const struct hardware_msg_data *msg_data ) -{ - SIZE_T size = msg_data->size - sizeof(*msg_data); - if (sizeof(RAWINPUTHEADER) + size > rawinput->header.dwSize) return FALSE; - - rawinput->header.dwType = msg_data->rawinput.type; - rawinput->header.dwSize = sizeof(RAWINPUTHEADER) + size; - rawinput->header.hDevice = UlongToHandle( msg_data->rawinput.device ); - rawinput->header.wParam = msg_data->rawinput.wparam; - - if (msg_data->rawinput.type == RIM_TYPEMOUSE) - { - if (size != sizeof(RAWMOUSE)) return FALSE; - rawinput->data.mouse = *(RAWMOUSE *)(msg_data + 1); - } - else if (msg_data->rawinput.type == RIM_TYPEKEYBOARD) - { - if (size != sizeof(RAWKEYBOARD)) return FALSE; - rawinput->data.keyboard = *(RAWKEYBOARD *)(msg_data + 1); - } - else if (msg_data->rawinput.type == RIM_TYPEHID) - { - RAWHID *hid = (RAWHID *)(msg_data + 1); - if (size < offsetof(RAWHID, bRawData[0])) return FALSE; - if (size != offsetof(RAWHID, bRawData[hid->dwCount * hid->dwSizeHid])) return FALSE; - memcpy( &rawinput->data.hid, msg_data + 1, size ); - } - else - { - FIXME( "Unhandled rawinput type %#x.\n", msg_data->rawinput.type ); - return FALSE; - } - - return TRUE; -} - struct device { HANDLE file; @@ -552,69 +507,83 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade /********************************************************************** * NtUserGetRawInputData (win32u.@) */ -UINT WINAPI NtUserGetRawInputData( HRAWINPUT rawinput, UINT command, void *data, UINT *data_size, UINT header_size ) +UINT WINAPI NtUserGetRawInputData( HRAWINPUT handle, UINT command, void *data, UINT *data_size, UINT header_size ) { - struct rawinput_thread_data *thread_data; - UINT size; - - TRACE( "rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", - rawinput, command, data, data_size, header_size ); + struct user_thread_info *thread_info = get_user_thread_info(); + struct hardware_msg_data *msg_data; + RAWINPUT *rawinput = data; + UINT size = 0; - if (!(thread_data = get_rawinput_thread_data())) - { - RtlSetLastWin32Error( ERROR_OUTOFMEMORY ); - return ~0u; - } + TRACE( "handle %p, command %#x, data %p, data_size %p, header_size %u.\n", + handle, command, data, data_size, header_size ); - if (!rawinput || thread_data->hw_id != (UINT_PTR)rawinput) + if (!(msg_data = thread_info->rawinput) || msg_data->hw_id != (UINT_PTR)handle) { RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); - return ~0u; + return -1; } if (header_size != sizeof(RAWINPUTHEADER)) { WARN( "Invalid structure size %u.\n", header_size ); RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); - return ~0u; - } - - switch (command) - { - case RID_INPUT: - size = thread_data->buffer->header.dwSize; - break; - - case RID_HEADER: - size = sizeof(RAWINPUTHEADER); - break; - - default: - RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); - return ~0u; + return -1; } + if (command != RID_HEADER && command != RID_INPUT) goto failed; + if (command == RID_INPUT) size = msg_data->size - sizeof(*msg_data); if (!data) { - *data_size = size; + *data_size = sizeof(RAWINPUTHEADER) + size; return 0; } - if (*data_size < size) + if (*data_size < sizeof(RAWINPUTHEADER) + size) { RtlSetLastWin32Error( ERROR_INSUFFICIENT_BUFFER ); - return ~0u; + return -1; + } + + rawinput->header.dwType = msg_data->rawinput.type; + rawinput->header.dwSize = sizeof(RAWINPUTHEADER) + msg_data->size - sizeof(*msg_data); + rawinput->header.hDevice = UlongToHandle( msg_data->rawinput.device ); + rawinput->header.wParam = msg_data->rawinput.wparam; + if (command == RID_HEADER) return sizeof(RAWINPUTHEADER); + + if (msg_data->rawinput.type == RIM_TYPEMOUSE) + { + if (size != sizeof(RAWMOUSE)) goto failed; + rawinput->data.mouse = *(RAWMOUSE *)(msg_data + 1); + } + else if (msg_data->rawinput.type == RIM_TYPEKEYBOARD) + { + if (size != sizeof(RAWKEYBOARD)) goto failed; + rawinput->data.keyboard = *(RAWKEYBOARD *)(msg_data + 1); + } + else if (msg_data->rawinput.type == RIM_TYPEHID) + { + RAWHID *hid = (RAWHID *)(msg_data + 1); + if (size < offsetof(RAWHID, bRawData[0])) goto failed; + if (size != offsetof(RAWHID, bRawData[hid->dwCount * hid->dwSizeHid])) goto failed; + memcpy( &rawinput->data.hid, msg_data + 1, size ); + } + else + { + FIXME( "Unhandled rawinput type %#x.\n", msg_data->rawinput.type ); + goto failed; } - memcpy( data, thread_data->buffer, size ); - return size; + + return rawinput->header.dwSize; + +failed: + WARN( "Invalid command %u or data size %u.\n", command, size ); + RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + return -1; } BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) { - struct rawinput_thread_data *thread_data; - - if (!(thread_data = get_rawinput_thread_data())) - return FALSE; + struct user_thread_info *thread_info = get_user_thread_info(); if (msg->message == WM_INPUT_DEVICE_CHANGE) { @@ -624,9 +593,10 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d } else { - thread_data->buffer->header.dwSize = RAWINPUT_BUFFER_SIZE; - if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; - thread_data->hw_id = hw_id; + struct hardware_msg_data *tmp; + if (!(tmp = realloc( thread_info->rawinput, msg_data->size ))) return FALSE; + memcpy( tmp, msg_data, msg_data->size ); + thread_info->rawinput = tmp; msg->lParam = (LPARAM)hw_id; }

1 0

Rémi Bernon : server: Fix rawinput buffer sizes and alignment on WoW64.
by Alexandre Julliard 09 Feb '24

09 Feb '24

Module: wine Branch: master Commit: 1664ad7d50110902f85af07564ef1505af9cc062 URL: https://gitlab.winehq.org/wine/wine/-/commit/1664ad7d50110902f85af07564ef15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 11:25:41 2024 +0100 server: Fix rawinput buffer sizes and alignment on WoW64. --- dlls/user32/tests/input.c | 3 -- dlls/win32u/rawinput.c | 103 +++++------------------------------------ include/wine/server_protocol.h | 6 +-- server/protocol.def | 4 +- server/queue.c | 96 ++++++++++++++++++++++++-------------- server/request.h | 4 +- server/trace.c | 4 +- 7 files changed, 82 insertions(+), 138 deletions(-)

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
72
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 February 2024