September 2021 - Wine-Commits

Jacek Caban : gdi32: Directly use ntdll instead of RegDeleteTreeW.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 171bfb6e35857bf4cc44e5d773efbfca7dea3f3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=171bfb6e35857bf4cc44e5d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:02 2021 +0100 gdi32: Directly use ntdll instead of RegDeleteTreeW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 11cec6b95ae..3ba84b10955 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,16 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR font_assoc_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','F','o','n','t','A','s','s','o','c' +}; + static UINT font_smoothing = GGO_BITMAP; static UINT subpixel_orientation = GGO_GRAY4_BITMAP; static BOOL antialias_fakes = TRUE; @@ -429,6 +439,41 @@ static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) if (file) lstrcatW( path, file ); } +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) +{ + char buffer[4096]; + KEY_NODE_INFORMATION *key_info = (KEY_NODE_INFORMATION *)buffer; + DWORD size; + HKEY key; + BOOL ret = TRUE; + + if (!(key = reg_open_key( parent, name, name_len ))) return FALSE; + + while (ret && !NtEnumerateKey( key, 0, KeyNodeInformation, key_info, sizeof(buffer), &size )) + ret = reg_delete_tree( key, key_info->Name, key_info->NameLength ); + + if (ret) ret = !NtDeleteKey( key ); + NtClose( key ); + return ret; +} + /* font substitutions */ struct gdi_font_subst @@ -2373,7 +2418,7 @@ static void update_font_association_info(UINT current_ansi_codepage) } } else - RegDeleteTreeW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\FontAssoc"); + reg_delete_tree( NULL, font_assoc_keyW, sizeof(font_assoc_keyW) ); } static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value, DWORD len)

1 0

Jacek Caban : gdi32: Directly use ntdll in load_gdi_font_subst.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: c1959a797412fbc2a19a8904d6bbc2d3900183ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1959a797412fbc2a19a8904… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:03 2021 +0100 gdi32: Directly use ntdll in load_gdi_font_subst. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 54 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3ba84b10955..6af91da7869 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,17 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR font_substitutes_keyW[] = +{ + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s',' ','N','T', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','F','o','n','t','S','u','b','s','t','i','t','u','t','e','s' +}; + static const WCHAR font_assoc_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -456,6 +467,24 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, + ULONG size, WCHAR *name, ULONG name_size ) +{ + ULONG full_size; + + if (NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + info, size, &full_size )) + return FALSE; + + if (name_size) + { + if (name_size < info->NameLength + sizeof(WCHAR)) return FALSE; + memcpy( name, info->Name, info->NameLength ); + name[info->NameLength / sizeof(WCHAR)] = 0; + } + return TRUE; +} + static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) { char buffer[4096]; @@ -541,20 +570,23 @@ static BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const static void load_gdi_font_subst(void) { + char buffer[512]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; HKEY hkey; - DWORD i = 0, type, dlen, vlen; - WCHAR value[64], data[64], *p; + DWORD i = 0; + WCHAR *data, *p, value[64]; - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", - &hkey)) return; + if (!(hkey = reg_open_key( NULL, font_substitutes_keyW, sizeof(font_substitutes_keyW) ))) + return; - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); - while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { int from_charset = -1, to_charset = -1; - TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); + if (info->Type != REG_SZ) continue; + data = (WCHAR *)((char *)info + info->DataOffset); + + TRACE( "Got %s=%s\n", debugstr_w(value), debugstr_w(data) ); if ((p = wcsrchr( value, ',' )) && p[1]) { *p++ = 0; @@ -570,12 +602,8 @@ static void load_gdi_font_subst(void) or mapping of DEFAULT_CHARSET */ if ((!from_charset || to_charset == from_charset) && to_charset != DEFAULT_CHARSET) add_gdi_font_subst( value, from_charset, data, to_charset ); - - /* reset dlen and vlen */ - dlen = sizeof(data); - vlen = ARRAY_SIZE(value); } - RegCloseKey( hkey ); + NtClose( hkey ); } /* font families */

1 0

Jacek Caban : gdi32: Directly use ntdll in add_face_to_cache.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 3eeb37f86a4d0a8c826fa72d8f657e13b8d159e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eeb37f86a4d0a8c826fa72d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:05 2021 +0100 gdi32: Directly use ntdll in add_face_to_cache. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c91ce3c8792..b78e5947f5e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -467,6 +467,31 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, + DWORD options, DWORD *disposition ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + return ret; +} + +static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value, DWORD count ) +{ + unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + NtSetValueKey( hkey, &nameW, 0, type, value, count ); +} + static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORMATION *info, ULONG size, WCHAR *name, ULONG name_size ) { @@ -1193,21 +1218,22 @@ static void add_face_to_cache( struct gdi_font_face *face ) DWORD len, buffer[1024]; struct cached_face *cached = (struct cached_face *)buffer; - if (RegCreateKeyExW( wine_fonts_cache_key, face->family->family_name, 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &hkey_family, NULL )) + if (!(hkey_family = reg_create_key( wine_fonts_cache_key, face->family->family_name, + lstrlenW( face->family->family_name ) * sizeof(WCHAR), + REG_OPTION_VOLATILE, NULL ))) return; if (face->family->second_name[0]) - RegSetValueExW( hkey_family, NULL, 0, REG_SZ, (BYTE *)face->family->second_name, - (lstrlenW( face->family->second_name ) + 1) * sizeof(WCHAR) ); + set_reg_value( hkey_family, NULL, REG_SZ, face->family->second_name, + (lstrlenW( face->family->second_name ) + 1) * sizeof(WCHAR) ); if (!face->scalable) { WCHAR name[10]; swprintf( name, ARRAY_SIZE(name), L"%d", face->size.y_ppem ); - RegCreateKeyExW( hkey_family, name, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, - NULL, &hkey_face, NULL); + hkey_face = reg_create_key( hkey_family, name, lstrlenW( name ) * sizeof(WCHAR), + REG_OPTION_VOLATILE, NULL ); } else hkey_face = hkey_family; @@ -1223,11 +1249,11 @@ static void add_face_to_cache( struct gdi_font_face *face ) lstrcpyW( cached->full_name + len, face->file ); len += lstrlenW( face->file ) + 1; - RegSetValueExW( hkey_face, face->style_name, 0, REG_BINARY, (BYTE *)cached, - offsetof( struct cached_face, full_name[len] )); + set_reg_value( hkey_face, face->style_name, REG_BINARY, cached, + offsetof( struct cached_face, full_name[len] )); - if (hkey_face != hkey_family) RegCloseKey( hkey_face ); - RegCloseKey( hkey_family ); + if (hkey_face != hkey_family) NtClose( hkey_face ); + NtClose( hkey_family ); } static void remove_face_from_cache( struct gdi_font_face *face )

1 0

Rémi Bernon : joy.cpl: Enumerate force-feedback effects with the devices.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 5fad09d24653bd19a0113734d147087c9bcb59ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fad09d24653bd19a0113734… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:52 2021 +0200 joy.cpl: Enumerate force-feedback effects with the devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 43e124a0a33..ef905c65a93 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -60,6 +60,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) * First time it checks if space for the joysticks was already reserved * and if not, just counts how many there are. */ +static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef); static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *context) { struct JoystickData *data = context; @@ -101,6 +102,18 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont IDirectInputDevice_SetProperty(joystick->device, DIPROP_RANGE, &proprange.diph); + if (!joystick->forcefeedback) return DIENUM_CONTINUE; + + /* Count device effects and then store them */ + joystick->num_effects = 0; + joystick->effects = NULL; + IDirectInputDevice8_EnumEffects(joystick->device, ff_effects_callback, (void *)joystick, 0); + joystick->effects = malloc(sizeof(struct Effect) * joystick->num_effects); + + joystick->cur_effect = 0; + IDirectInputDevice8_EnumEffects(joystick->device, ff_effects_callback, (void*)joystick, 0); + joystick->num_effects = joystick->cur_effect; + return DIENUM_CONTINUE; } @@ -818,16 +831,6 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_SETITEMDATA, cur, i); cur++; - - /* Count device effects and then store them */ - joy->num_effects = 0; - joy->effects = NULL; - IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void *) joy, 0); - joy->effects = malloc(sizeof(struct Effect) * joy->num_effects); - - joy->cur_effect = 0; - IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void*) joy, 0); - joy->num_effects = joy->cur_effect; } }

1 0

Rémi Bernon : dinput: Add an instance number to HID joystick collection objects.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: eab7819d7adde5c3c2611bd33bd88f664c2a7beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab7819d7adde5c3c2611bd3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 10:51:37 2021 +0200 dinput: Add an instance number to HID joystick collection objects. 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 ++-- dlls/dinput8/tests/hid.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index acd21001bdf..4d7bbe82a23 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -379,8 +379,8 @@ static BOOL enum_collections_objects( struct hid_joystick *impl, const DIPROPHEA { DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; struct hid_caps caps = {.type = LINK_COLLECTION_NODE}; + DWORD collection = 0, i; BOOL ret; - DWORD i; for (i = 0; i < impl->caps.NumberLinkCollectionNodes; ++i) { @@ -393,7 +393,7 @@ static BOOL enum_collections_objects( struct hid_joystick *impl, const DIPROPHEA else { instance.dwOfs = 0; - instance.dwType = DIDFT_COLLECTION | DIDFT_NODATA; + instance.dwType = DIDFT_COLLECTION | DIDFT_MAKEINSTANCE( collection++ ) | DIDFT_NODATA; instance.dwFlags = 0; instance.wUsagePage = caps.node->LinkUsagePage; instance.wUsage = caps.node->LinkUsage; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 23dc3f6d5f8..54d85cae14b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3572,8 +3572,6 @@ static void test_simple_joystick(void) {.ofs = TRUE}, {.ofs = TRUE}, {.ofs = TRUE}, - {}, - {.type = TRUE}, }; struct check_objects_params check_objects_params =

1 0

Rémi Bernon : winebus.sys: Handle feature and output reports in hid_device.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 78f67d5c088c9ef5a58de691287629fcf764a00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f67d5c088c9ef5a58de691… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 08:55:30 2021 +0200 winebus.sys: Handle feature and output reports in hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 51 ++++++++++++---------------------------- dlls/winebus.sys/bus_udev.c | 23 +++++------------- dlls/winebus.sys/hid.c | 25 ++++++++++++++++---- dlls/winebus.sys/unix_private.h | 13 +++++++---- dlls/winebus.sys/unixlib.c | 52 +++++++---------------------------------- 5 files changed, 58 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78f67d5c088c9ef5a58d…

1 0

Connor McAdams : user32/tests: Add missing winevents to test_edit_messages() message sequences.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 1e43edd8009e4581b17f140859a213a8aca056f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e43edd8009e4581b17f1408… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:51 2021 -0400 user32/tests: Add missing winevents to test_edit_messages() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e2a260ac9d9..53bd2068348 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11862,7 +11862,10 @@ static const struct message sl_edit_invisible[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Sent for IME. */ { WM_KILLFOCUS, sent|parent }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; @@ -11877,6 +11880,7 @@ static const struct message ml_edit_setfocus[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; @@ -18551,6 +18555,7 @@ START_TEST(msg) test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout(); + test_edit_messages(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18561,7 +18566,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_edit_messages(); test_quit_message(); test_notify_message(); test_SetActiveWindow();

1 0

Alexandre Julliard : winegcc: Unify the strarray implementation with the one from makedep.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 2064181c1f120e8d537952b3eeed5ab6938a59bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2064181c1f120e8d537952b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 11:52:15 2021 +0200 winegcc: Unify the strarray implementation with the one from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 161 ++++----- tools/winegcc/utils.h | 31 +- tools/winegcc/winegcc.c | 862 +++++++++++++++++++++++------------------------- 3 files changed, 493 insertions(+), 561 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2064181c1f120e8d5379…

1 0

Rémi Bernon : dinput: Check acquired state in IDirectInputDevice2WImpl_SetCooperativeLevel.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 0686815ff621479f7c53f3318cd08f0b0d837172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0686815ff621479f7c53f331… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 10:51:35 2021 +0200 dinput: Check acquired state in IDirectInputDevice2WImpl_SetCooperativeLevel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 +++++++++--- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2a3ed391919..11496640049 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1118,6 +1118,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W ifac HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8W iface, HWND hwnd, DWORD dwflags) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + HRESULT hr; TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags); _dump_cooperativelevel_DI(dwflags); @@ -1144,11 +1145,16 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 /* Store the window which asks for the mouse */ EnterCriticalSection(&This->crit); - This->win = hwnd; - This->dwCoopLevel = dwflags; + if (This->acquired) hr = DIERR_ACQUIRED; + else + { + This->win = hwnd; + This->dwCoopLevel = dwflags; + hr = DI_OK; + } LeaveCriticalSection(&This->crit); - return DI_OK; + return hr; } /****************************************************************************** diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index e017e048a30..c0f1b78160c 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4082,7 +4082,6 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); - todo_wine ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr );

1 0

Rémi Bernon : winebus.sys: Use report ids in crafted HID reports.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 04b19a969b8ea89898662a5a964248d05172e6fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b19a969b8ea89898662a5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 08:55:28 2021 +0200 winebus.sys: Use report ids in crafted HID reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 18 ++++++++-- dlls/winebus.sys/bus_udev.c | 6 ++++ dlls/winebus.sys/hid.c | 80 +++++++++++++++++++++++++++++++---------- dlls/winebus.sys/unix_private.h | 6 +++- dlls/xinput1_3/main.c | 2 +- 5 files changed, 89 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04b19a969b8ea8989866…

1 0