Fixes 6b8b35f9507f61e435d0b4582e31584c9244fa70 which incorrectly replaced it with string literal, leading to the default setting being used all the time.
From: Rémi Bernon rbernon@codeweavers.com
Fixes 6b8b35f9507f61e435d0b4582e31584c9244fa70 which incorrectly replaced it with string literal, leading to the default setting being used all the time.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56435 --- dlls/win32u/sysparams.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6c4223f0cdb..3ec99ad798c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4587,13 +4587,10 @@ static union sysparam_all_entry * const default_entries[] = static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, WCHAR *buffer, DWORD size ) { - WCHAR nameW[128]; char buf[2048]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)buf;
- asciiz_to_unicode( nameW, name ); - - if (appkey && query_reg_ascii_value( appkey, "Name", info, sizeof(buf) )) + if (appkey && query_reg_ascii_value( appkey, name, info, sizeof(buf) )) { size = min( info->DataLength, size - sizeof(WCHAR) ); memcpy( buffer, info->Data, size ); @@ -4601,7 +4598,7 @@ static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, return 0; }
- if (defkey && query_reg_ascii_value( defkey, "Name", info, sizeof(buf) )) + if (defkey && query_reg_ascii_value( defkey, name, info, sizeof(buf) )) { size = min( info->DataLength, size - sizeof(WCHAR) ); memcpy( buffer, info->Data, size );
Hi,
It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.
The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:
The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=144069
Your paranoid android.
=== debian11b (64 bit WoW report) ===
d3dx10_34: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011B5CF0. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C3A40. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B6010. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B5CF0. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B4E40.
d3dx10_35: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E3AE0. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E3AE0. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D4A10. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3AE0. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011BE6C0.
d3dx10_36: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C18F0. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4A80. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3690. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C1820.
d3dx10_37: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D1D40. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001195900. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D1B30. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011958C0. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B5EA0.
d3dx10_38: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239E20. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E34A0. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239D20. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B6010. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001239D20.
d3dx10_39: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001195CA0. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E39A0. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011BB6A0. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D5620. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D57F0.
d3dx10_40: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239CB0. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B6050. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D5320. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D54F0. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D56C0.
d3dx10_41: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011B6120. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001195C60. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A49E0. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011F0CB0. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D49E0.
d3dx10_42: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D6A10. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D6940. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4A10. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011BB560. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011E3940.
d3dx10_43: d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239E60. d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001195C00. d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239E60. d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001239E60. d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C37F0.
-
Marvin -
Rémi Bernon -
Rémi Bernon (＠rbernon)