September 2021 - Wine-Commits

Hans Leidekker : winhttp: Don't remove content-type/length headers in handle_redirect().
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: badc64b42c56f7a16494eedd2a8add9ef3254af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=badc64b42c56f7a16494eedd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:29 2021 +0200 winhttp: Don't remove content-type/length headers in handle_redirect(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50272 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0155d5780fe..2c064bb767b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2544,7 +2544,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) struct connect *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location = NULL; - int index; if ((ret = get_redirect_url( request, &location, &len_loc ))) return ret; @@ -2643,10 +2642,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) else request->path = strdupW( L"/" ); } - /* remove content-type/length headers */ - if ((index = get_header_index( request, L"Content-Type", 0, TRUE )) >= 0) delete_header( request, index ); - if ((index = get_header_index( request, L"Content-Length", 0, TRUE )) >= 0 ) delete_header( request, index ); - if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, L"POST" )) { free( request->verb );

1 0

Jacek Caban : opencl: Fix compilation on MSVC targets.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: a91d6e9eae71a0ed0ddeac3d571704fd3e47b3c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a91d6e9eae71a0ed0ddeac3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 16:26:24 2021 +0200 opencl: Fix compilation on MSVC targets. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 6 +++--- dlls/opencl/opencl_types.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 09eba09914e..270f9a3a502 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -513,9 +513,9 @@ open(TYPES, ">$types_file") or die "cannot create $types_file"; print TYPES <<END /* Automatically generated from OpenCL registry files; DO NOT EDIT! */ -typedef int32_t cl_int DECLSPEC_ALIGN(4); -typedef uint32_t cl_uint DECLSPEC_ALIGN(4); -typedef uint64_t cl_ulong DECLSPEC_ALIGN(8); +typedef int32_t DECLSPEC_ALIGN(4) cl_int; +typedef uint32_t DECLSPEC_ALIGN(4) cl_uint; +typedef uint64_t DECLSPEC_ALIGN(8) cl_ulong; END ; diff --git a/dlls/opencl/opencl_types.h b/dlls/opencl/opencl_types.h index 6d6dc0d870c..7acd4a77f76 100644 --- a/dlls/opencl/opencl_types.h +++ b/dlls/opencl/opencl_types.h @@ -1,8 +1,8 @@ /* Automatically generated from OpenCL registry files; DO NOT EDIT! */ -typedef int32_t cl_int DECLSPEC_ALIGN(4); -typedef uint32_t cl_uint DECLSPEC_ALIGN(4); -typedef uint64_t cl_ulong DECLSPEC_ALIGN(8); +typedef int32_t DECLSPEC_ALIGN(4) cl_int; +typedef uint32_t DECLSPEC_ALIGN(4) cl_uint; +typedef uint64_t DECLSPEC_ALIGN(8) cl_ulong; typedef struct _cl_platform_id * cl_platform_id; typedef struct _cl_device_id * cl_device_id;

1 0

Nikolay Sivov : d3d10/effect: Forward to pool effect in GetVariableBySemantic().
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 19517f8685a694bc32dff11875794aa730f53f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=19517f8685a694bc32dff118… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 21 08:22:17 2021 +0300 d3d10/effect: Forward to pool effect in GetVariableBySemantic(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 13 ++++++++----- dlls/d3d10/tests/effect.c | 9 +++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 672cbae3920..623183311f2 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3312,7 +3312,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, const char *semantic) { - struct d3d10_effect *This = impl_from_ID3D10Effect(iface); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); @@ -3323,9 +3323,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB return &null_variable.ID3D10EffectVariable_iface; } - for (i = 0; i < This->local_buffer_count; ++i) + for (i = 0; i < effect->local_buffer_count; ++i) { - struct d3d10_effect_variable *l = &This->local_buffers[i]; + struct d3d10_effect_variable *l = &effect->local_buffers[i]; unsigned int j; for (j = 0; j < l->type->member_count; ++j) @@ -3340,9 +3340,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } - for (i = 0; i < This->local_variable_count; ++i) + for (i = 0; i < effect->local_variable_count; ++i) { - struct d3d10_effect_variable *v = &This->local_variables[i]; + struct d3d10_effect_variable *v = &effect->local_variables[i]; if (v->semantic && !stricmp(v->semantic, semantic)) { @@ -3351,6 +3351,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } + if (effect->pool) + return effect->pool->lpVtbl->GetVariableBySemantic(effect->pool, semantic); + WARN("Invalid semantic specified\n"); return &null_variable.ID3D10EffectVariable_iface; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 31edd4a1c48..1dfd420ae36 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6675,13 +6675,10 @@ todo_wine v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR1"); hr = v->lpVtbl->GetDesc(v, &var_desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); - ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); - } + ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); +todo_wine + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); child_effect->lpVtbl->Release(child_effect);

1 0

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

Sept. 23, 2021

Module: wine Branch: master Commit: dbb0f284890d9c44ac67a8792690a9d91f9724fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb0f284890d9c44ac67a879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:09 2021 +0100 gdi32: Directly use ntdll in load_system_links. 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 | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3419b18a242..1e3c70550a3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -91,6 +91,18 @@ static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const WCHAR nt_prefixW[] = {'\\','?','?','\\'}; +static const WCHAR system_link_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','L','i','n','k', + '\\','S','y','s','t','e','m','L','i','n','k' +}; + static const WCHAR font_substitutes_keyW[] = { '\\','R','e','g','i','s','t','r','y', @@ -1470,34 +1482,33 @@ static void load_system_links(void) struct gdi_font_link *font_link, *system_font_link; struct gdi_font_face *face; - if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontLink\\SystemLink", &hkey )) + if ((hkey = reg_open_key( NULL, system_link_keyW, sizeof(system_link_keyW) ))) { - WCHAR value[MAX_PATH], data[1024]; - DWORD type, val_len, data_len; + char buffer[4096]; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + WCHAR value[MAX_PATH]; WCHAR *entry, *next; - val_len = ARRAY_SIZE(value); - data_len = sizeof(data); i = 0; - while (!RegEnumValueW( hkey, i++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len)) + while (reg_enum_value( hkey, i++, info, sizeof(buffer), value, sizeof(value) )) { /* Don't store fonts that are only substitutes for other fonts */ if (!get_gdi_font_subst( value, -1, NULL )) { + char *data = (char *)info + info->DataOffset; font_link = add_gdi_font_link( value ); - for (entry = data; (char *)entry < (char *)data + data_len && *entry; entry = next) + for (entry = (WCHAR *)data; (char *)entry < data + info->DataLength && *entry; entry = next) { const WCHAR *family_name = NULL; WCHAR *p; - TRACE("%s: %s\n", debugstr_w(value), debugstr_w(entry)); + TRACE( "%s: %s\n", debugstr_w(value), debugstr_w(entry) ); next = entry + lstrlenW(entry) + 1; if ((p = wcschr( entry, ',' ))) { *p++ = 0; - while (iswspace(*p)) p++; + while (*p == ' ' || *p == '\t') p++; if (!(family_name = get_gdi_font_subst( p, -1, NULL ))) family_name = p; } if ((face = find_face_from_filename( entry, family_name ))) @@ -1510,11 +1521,8 @@ static void load_system_links(void) } } else TRACE("%s: SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); - - val_len = ARRAY_SIZE(value); - data_len = sizeof(data); } - RegCloseKey( hkey ); + NtClose( hkey ); } if ((shelldlg_name = get_gdi_font_subst( L"MS Shell Dlg", -1, NULL )))

1 0

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

Sept. 23, 2021

Module: wine Branch: master Commit: 4ad71bb1b991d66742ed1df26c796be8e64497bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ad71bb1b991d66742ed1df2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 13:44:08 2021 +0100 gdi32: Directly use ntdll in remove_face_from_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 | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a02e5b4207a..3419b18a242 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -523,6 +523,13 @@ static BOOL reg_enum_value( HKEY hkey, unsigned int index, KEY_VALUE_FULL_INFORM return TRUE; } +static void reg_delete_value( HKEY hkey, const WCHAR *name ) +{ + unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + NtDeleteValueKey( hkey, &nameW ); +} + static BOOL reg_delete_tree( HKEY parent, const WCHAR *name, ULONG name_len ) { char buffer[4096]; @@ -1273,20 +1280,25 @@ static void add_face_to_cache( struct gdi_font_face *face ) static void remove_face_from_cache( struct gdi_font_face *face ) { - HKEY hkey_family; + HKEY hkey_family, hkey; - if (RegOpenKeyExW( wine_fonts_cache_key, face->family->family_name, 0, KEY_ALL_ACCESS, &hkey_family )) + if (!(hkey_family = reg_open_key( wine_fonts_cache_key, face->family->family_name, + lstrlenW( face->family->family_name ) * sizeof(WCHAR) ))) return; if (!face->scalable) { WCHAR name[10]; swprintf( name, ARRAY_SIZE(name), L"%d", face->size.y_ppem ); - RegDeleteKeyW( hkey_family, name ); + if ((hkey = reg_open_key( hkey_family, name, lstrlenW( name ) * sizeof(WCHAR) ))) + { + NtDeleteKey( hkey ); + NtClose( hkey ); + } } - else RegDeleteValueW( hkey_family, face->style_name ); + else reg_delete_value( hkey_family, face->style_name ); - RegCloseKey( hkey_family ); + NtClose( hkey_family ); } /* font links */

1 0

Rémi Bernon : joy.cpl: Refresh the joystick device list when modified.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: c496a7b3f984fa0eb4931757da77eeecd6a7ab38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c496a7b3f984fa0eb4931757… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:55 2021 +0200 joy.cpl: Refresh the joystick device list when modified. This will not work for legacy dinput devices because of the internal enumeration logic, but it will dynamically update the list for HID joysticks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index d5272990df3..dbe84963c5d 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -155,20 +155,7 @@ static void destroy_joysticks(struct JoystickData *data) } free(data->joysticks); -} - -static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) -{ - int i; - - SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); - - /* Add enumerated joysticks */ - for (i = 0; i < data->num_joysticks; i++) - { - struct Joystick *joy = &data->joysticks[i]; - SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); - } + data->joysticks = NULL; } /****************************************************************************** @@ -233,15 +220,23 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) if (appkey) RegCloseKey(appkey); } -static void initialize_disabled_joysticks_list(HWND hwnd) +static void refresh_joystick_list(HWND hwnd, struct JoystickData *data) { + struct Joystick *joy, *joy_end; HKEY hkey, appkey; DWORD values = 0; LSTATUS status; DWORD i; + destroy_joysticks(data); + initialize_joysticks(data); + + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); + for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) + SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); + /* Search for disabled joysticks */ get_app_key(&hkey, &appkey); RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &values, NULL, NULL, NULL, NULL); @@ -275,8 +270,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - initialize_joysticks_list(hwnd, data); - initialize_disabled_joysticks_list(hwnd); + refresh_joystick_list(hwnd, data); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTONDISABLE), FALSE); @@ -298,7 +292,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM if (sel >= 0) { enable_joystick(data->joysticks[sel].instance.tszInstanceName, FALSE); - initialize_disabled_joysticks_list(hwnd); + refresh_joystick_list(hwnd, data); } } break; @@ -312,7 +306,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM WCHAR text[MAX_PATH]; SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_GETTEXT, sel, (LPARAM) text); enable_joystick(text, TRUE); - initialize_disabled_joysticks_list(hwnd); + refresh_joystick_list(hwnd, data); } } break;

1 0

Rémi Bernon : joy.cpl: Use msvcrt memory allocation functions.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 0a777f0bcce71084b756376395c09ee6fc794ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a777f0bcce71084b7563763… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:50 2021 +0200 joy.cpl: Use msvcrt memory allocation functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3ea417843f4..226f36051a6 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -112,7 +112,7 @@ static void initialize_joysticks(struct JoystickData *data) data->num_joysticks = 0; data->cur_joystick = 0; IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY); - data->joysticks = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Joystick) * data->num_joysticks); + data->joysticks = malloc(sizeof(struct Joystick) * data->num_joysticks); /* Get all the joysticks */ IDirectInput8_EnumDevices(data->di, DI8DEVCLASS_GAMECTRL, enum_callback, data, DIEDFL_ATTACHEDONLY); @@ -134,14 +134,14 @@ static void destroy_joysticks(struct JoystickData *data) if (data->joysticks[i].effects[j].effect) IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); - HeapFree(GetProcessHeap(), 0, data->joysticks[i].effects); + free(data->joysticks[i].effects); } IDirectInputDevice8_Unacquire(data->joysticks[i].device); IDirectInputDevice8_Release(data->joysticks[i].device); } - HeapFree(GetProcessHeap(), 0, data->joysticks); + free(data->joysticks); } static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) @@ -823,7 +823,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp joy->num_effects = 0; joy->effects = NULL; IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void *) joy, 0); - joy->effects = HeapAlloc(GetProcessHeap(), 0, sizeof(struct Effect) * joy->num_effects); + joy->effects = malloc(sizeof(struct Effect) * joy->num_effects); joy->cur_effect = 0; IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void*) joy, 0);

1 0

Rémi Bernon : joy.cpl: Use msvcrt wide string functions.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 032052fca6a47d44e7a2fa0623bc86ff2c783d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=032052fca6a47d44e7a2fa06… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:51 2021 +0200 joy.cpl: Use msvcrt wide string functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 226f36051a6..43e124a0a33 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -212,7 +212,7 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) get_app_key(&hkey, &appkey); if (!enable) - set_config_key(hkey, appkey, joy_name, L"disabled", lstrlenW(L"disabled")); + set_config_key(hkey, appkey, joy_name, L"disabled", wcslen(L"disabled")); else set_config_key(hkey, appkey, joy_name, NULL, 0); @@ -240,7 +240,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) status = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); - if (status == ERROR_SUCCESS && !lstrcmpW(L"disabled", buf_data)) + if (status == ERROR_SUCCESS && !wcscmp(L"disabled", buf_data)) SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name); }

1 0

Rémi Bernon : joy.cpl: Refresh joystick test device list when activated.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: 95cc64aa731d9babfba677d6dca97d13efebd476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95cc64aa731d9babfba677d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:53 2021 +0200 joy.cpl: Refresh joystick test device list when activated. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index ef905c65a93..3dee30a4b5b 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -533,6 +533,14 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) * test_dlgproc [internal] * */ +static void refresh_test_joystick_list(HWND hwnd, struct JoystickData *data) +{ + struct Joystick *joy, *joy_end; + SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_RESETCONTENT, 0, 0); + for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) + SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM)joy->instance.tszInstanceName); +} + static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static HANDLE thread; @@ -543,17 +551,9 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { case WM_INITDIALOG: { - int i; - data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - /* Add enumerated joysticks to the combobox */ - for (i = 0; i < data->num_joysticks; i++) - { - struct Joystick *joy = &data->joysticks[i]; - SendDlgItemMessageW(hwnd, IDC_TESTSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); - } - + refresh_test_joystick_list(hwnd, data); draw_joystick_buttons(hwnd, data); draw_joystick_axes(hwnd, data); @@ -576,6 +576,8 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { DWORD tid; + refresh_test_joystick_list(hwnd, data); + /* Initialize input thread */ if (data->num_joysticks > 0) {

1 0

Rémi Bernon : joy.cpl: Refresh joystick FF device list when activated.
by Alexandre Julliard Sept. 23, 2021

Sept. 23, 2021

Module: wine Branch: master Commit: a6f7f2dcfbf1f6fb9555f0324e53194f24d56115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f7f2dcfbf1f6fb9555f032… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 14:01:54 2021 +0200 joy.cpl: Refresh joystick FF device list when activated. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3dee30a4b5b..d5272990df3 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -642,12 +642,9 @@ static void initialize_effects_list(HWND hwnd, struct Joystick* joy) static void ff_handle_joychange(HWND hwnd, struct JoystickData *data) { - int sel; - if (data->num_ff == 0) return; - sel = SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_GETCURSEL, 0, 0); - data->chosen_joystick = SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_GETITEMDATA, sel, 0); + data->chosen_joystick = SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_GETCURSEL, 0, 0); initialize_effects_list(hwnd, &data->joysticks[data->chosen_joystick]); } @@ -808,6 +805,14 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) * ff_dlgproc [internal] * */ +static void refresh_ff_joystick_list(HWND hwnd, struct JoystickData *data) +{ + struct Joystick *joy, *joy_end; + SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_RESETCONTENT, 0, 0); + for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy) + SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM)joy->instance.tszInstanceName); +} + static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static HANDLE thread; @@ -818,24 +823,9 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp { case WM_INITDIALOG: { - int i, cur = 0; - data = (struct JoystickData*) ((PROPSHEETPAGEW*)lparam)->lParam; - /* Add joysticks with FF support to the combobox and get the effects */ - for (i = 0; i < data->num_joysticks; i++) - { - struct Joystick *joy = &data->joysticks[i]; - - if (joy->forcefeedback) - { - SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); - SendDlgItemMessageW(hwnd, IDC_FFSELECTCOMBO, CB_SETITEMDATA, cur, i); - - cur++; - } - } - + refresh_ff_joystick_list(hwnd, data); draw_ff_axis(hwnd, data); return TRUE; @@ -861,6 +851,8 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp switch(((LPNMHDR)lparam)->code) { case PSN_SETACTIVE: + refresh_ff_joystick_list(hwnd, data); + if (data->num_ff > 0) { DWORD tid;

1 0