March 2020 - Wine-commits - list.winehq.org

Jeff Smith : jscript: Set return object's class to 'object' in Object.create.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: dd678df78911124791fa6fcad9e6a2aeedaeed36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd678df78911124791fa6fca… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Mar 16 23:36:37 2020 -0500 jscript: Set return object's class to 'object' in Object.create. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48762 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 2 +- dlls/mshtml/tests/es5.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 3cac277775..268cfaa1c3 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -612,7 +612,7 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return E_INVALIDARG; } - hres = create_dispex(ctx, NULL, proto, &obj); + hres = create_dispex(ctx, &ObjectInst_info, proto, &obj); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7a5b9d57ea..6b5d04a959 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -768,7 +768,7 @@ function test_getPrototypeOf() { } function test_toString() { - var tmp; + var tmp, obj; (function () { tmp = Object.prototype.toString.call(arguments); })(); todo_wine. @@ -786,6 +786,13 @@ function test_toString() { todo_wine. ok(tmp === "[object Undefined]", "toString.call() = " + tmp); + obj = Object.create(null); + tmp = Object.prototype.toString.call(obj); + ok(tmp === "[object Object]", "toString.call(Object.create(null)) = " + tmp); + obj = Object.create(Number.prototype); + tmp = Object.prototype.toString.call(obj); + ok(tmp === "[object Object]", "toString.call(Object.create(Number.prototype)) = " + tmp); + next_test(); }

1 0

Francois Gouget : tests: Report all errors when failing to wait for a child process.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: a909baeb4e5ee8050a32832c28ff3ee79c54fbfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a909baeb4e5ee8050a32832c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 23:52:21 2020 +0100 tests: Report all errors when failing to wait for a child process. Report the line number where the test failed to wait for the child so one can identify which child process did not behave as expected. Also wait_child_process() is meant for the general case so report all non-crash error cases as test failures so they are accounted for. Omit the "winetest_" prefix to match the other Wine test functions and so the underlying winetest_wait_child_process() function can be wrapped with the usual line-capturing macros. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48651 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/dbgeng/tests/dbgeng.c | 4 ++-- dlls/gdi32/tests/font.c | 2 +- dlls/kernel32/tests/actctx.c | 4 ++-- dlls/kernel32/tests/console.c | 2 +- dlls/kernel32/tests/heap.c | 2 +- dlls/kernel32/tests/pipe.c | 6 +++--- dlls/kernel32/tests/toolhelp.c | 2 +- dlls/kernel32/tests/virtual.c | 4 ++-- dlls/mfplat/tests/mfplat.c | 4 ++-- dlls/mscoree/tests/comtest.c | 2 +- dlls/msvcrt/tests/data.c | 2 +- dlls/msvcrt/tests/file.c | 4 ++-- dlls/ntdll/tests/exception.c | 4 ++-- dlls/ole32/tests/marshal.c | 2 +- dlls/oleacc/tests/main.c | 2 +- dlls/qmgr/tests/qmgr.c | 2 +- dlls/rpcrt4/tests/server.c | 6 +++--- dlls/shell32/tests/shellpath.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- dlls/sxs/tests/sxs.c | 2 +- dlls/ucrtbase/tests/misc.c | 2 +- dlls/urlmon/tests/misc.c | 2 +- dlls/urlmon/tests/sec_mgr.c | 2 +- dlls/user32/tests/class.c | 2 +- dlls/user32/tests/clipboard.c | 2 +- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/tests/win.c | 6 +++--- include/wine/test.h | 32 ++++++++++++++++++++++---------- 30 files changed, 64 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a909baeb4e5ee8050a32…

1 0

Zebediah Figura : winebus.sys: Use public HID_USAGE_* constants.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 602f20826d3e2f04d5f46778edfe0c178565af5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=602f20826d3e2f04d5f46778… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 16 21:19:38 2020 -0500 winebus.sys: Use public HID_USAGE_* constants. Fix a typo in the process (HID_USAGE_DIGITIZER_Y_TILT is 0x3E, not 0x3F). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 18 +++++++++--------- include/hidusage.h | 33 ++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 24d7961b06..51940ba088 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -139,8 +139,8 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, 0xC4}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, 0xC5}, /*ABS_BRAKE*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELLERATOR}, /*ABS_GAS*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -149,15 +149,15 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {0,0}, /*ABS_HAT2Y*/ {0,0}, /*ABS_HAT3X*/ {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, 0x30}, /*ABS_PRESSURE*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3D}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3F}, /*ABS_TILT_Y*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ {0, 0}, /*ABS_TOOL_WIDTH*/ {0, 0}, {0, 0}, {0, 0}, - {HID_USAGE_PAGE_CONSUMER, 0xE0} /*ABS_VOLUME*/ + {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) @@ -245,9 +245,9 @@ static const BYTE* what_am_I(struct udev_device *dev) static const BYTE Keyboard[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD}; static const BYTE Gamepad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; static const BYTE Keypad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYPAD}; - static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, 0x2}; - static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, 0x4}; - static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, 0x5}; + static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_PEN}; + static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_SCREEN}; + static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_PAD}; struct udev_device *parent = dev; diff --git a/include/hidusage.h b/include/hidusage.h index 67d698ed34..c45e2712fc 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -24,6 +24,21 @@ extern "C" { typedef USHORT USAGE, *PUSAGE; +#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) + +#define HID_USAGE_CONSUMER_VOLUME ((USAGE) 0xE0) + +#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) +#define HID_USAGE_DIGITIZER_TOUCH_SCREEN ((USAGE) 0x04) +#define HID_USAGE_DIGITIZER_TOUCH_PAD ((USAGE) 0x05) +#define HID_USAGE_DIGITIZER_TIP_PRESSURE ((USAGE) 0x30) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) +#define HID_USAGE_DIGITIZER_X_TILT ((USAGE) 0x3D) +#define HID_USAGE_DIGITIZER_Y_TILT ((USAGE) 0x3E) +#define HID_USAGE_DIGITIZER_AZIMUTH ((USAGE) 0x3F) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) + #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) #define HID_USAGE_GENERIC_JOYSTICK ((USAGE) 0x04) @@ -183,16 +198,11 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) -#define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) -#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) -#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS ((USAGE) 0x03) -#define HID_USAGE_TELEPHONY_HANDSET ((USAGE) 0x04) -#define HID_USAGE_TELEPHONY_HEADSET ((USAGE) 0x05) -#define HID_USAGE_TELEPHONY_KEYPAD ((USAGE) 0x06) -#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07) - #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) +#define HID_USAGE_SIMULATION_ACCELLERATOR ((USAGE) 0xC4) +#define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xC5) +#define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xC8) #define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) #define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) @@ -214,13 +224,6 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) -#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) - -#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) -#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) -#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) -#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) - #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : winedump: Add dumping of sortkey NLS files.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 8207bdfecbd0d811abfb48a19090e945a4c1c8f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8207bdfecbd0d811abfb48a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 10:14:49 2020 +0100 winedump: Add dumping of sortkey NLS files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/dump.c | 28 ++++ tools/winedump/nls.c | 396 ++++++++++++++++++++++++++++++++++++++++++++-- tools/winedump/winedump.h | 1 + 3 files changed, 409 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8207bdfecbd0d811abfb…

1 0

Alexandre Julliard : unicode: Add separate helper for removing linguistic case mappings.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 57a6033c0abdfb34c7798835f65a1bfb6fd5f7d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a6033c0abdfb34c7798835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:26:41 2020 +0100 unicode: Add separate helper for removing linguistic case mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 63 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 8cf1d45108..454dba538f 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -553,6 +553,28 @@ sub compose_hangul(@) return @ret; } +################################################################ +# remove linguistic-only mappings from the case table +sub remove_linguistic_mappings($$) +{ + my ($upper, $lower) = @_; + + # remove case mappings that don't round-trip + + for (my $i = 0; $i < @{$upper}; $i++) + { + next unless defined ${$upper}[$i]; + my $ch = ${$upper}[$i]; + ${$upper}[$i] = undef unless defined ${$lower}[$ch] && ${$lower}[$ch] == $i; + } + for (my $i = 0; $i < @{$lower}; $i++) + { + next unless defined ${$lower}[$i]; + my $ch = ${$lower}[$i]; + ${$lower}[$i] = undef unless defined ${$upper}[$ch] && ${$upper}[$ch] == $i; + } +} + ################################################################ # read in the Unicode database files sub load_data() @@ -672,21 +694,6 @@ sub load_data() foreach my $i (@{$special_categories{$cat}}) { $category_table[$i] |= $flag; } } - # remove case mappings that don't round-trip - - for (my $i = 0; $i < @toupper_table; $i++) - { - next unless defined $toupper_table[$i]; - my $ch = $toupper_table[$i]; - $toupper_table[$i] = undef unless defined $tolower_table[$ch] && $tolower_table[$ch] == $i; - } - for (my $i = 0; $i < @tolower_table; $i++) - { - next unless defined $tolower_table[$i]; - my $ch = $tolower_table[$i]; - $tolower_table[$i] = undef unless defined $toupper_table[$ch] && $toupper_table[$ch] == $i; - } - # load the composition exclusions my $EXCL = open_data_file( $UNIDATA, "CompositionExclusions.txt" ); @@ -1651,9 +1658,13 @@ sub dump_case_mappings($) print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"windef.h\"\n\n"; - dump_case_table( "wine_casemap_lower", @tolower_table ); + my @upper = @toupper_table; + my @lower = @tolower_table; + remove_linguistic_mappings( \@upper, \@lower ); + + dump_case_table( "wine_casemap_lower", @lower ); print OUTPUT "\n"; - dump_case_table( "wine_casemap_upper", @toupper_table ); + dump_case_table( "wine_casemap_upper", @upper ); close OUTPUT; save_file($filename); } @@ -1793,17 +1804,21 @@ sub dump_binary_case_table(@) my @row_array = compress_array( $level1, 0, @difftable[0..$max_char-1] ); my @array = compress_array( $level2, 0, @row_array[0..$level1-1] ); - for (my $i = $level2; $i < @array; $i++) { $array[$i] += @array - $level1; } - return @array, @row_array[$level1..$#row_array]; + my $offset = @array - $level1; + for (my $i = $level2; $i < @array; $i++) { $array[$i] += $offset; } + return pack "S<*", 1 + $offset + @row_array, @array, @row_array[$level1..$#row_array]; } - ################################################################ # dump case mappings for l_intl.nls sub dump_intl_nls($) { - my @upper = dump_binary_case_table( @toupper_table ); - my @lower = dump_binary_case_table( @tolower_table ); + my @upper_table = @toupper_table; + my @lower_table = @tolower_table; + remove_linguistic_mappings( \@upper_table, \@lower_table ); + + my $upper = dump_binary_case_table( @upper_table ); + my $lower = dump_binary_case_table( @lower_table ); my $filename = shift; open OUTPUT,">$filename.new" or die "Cannot create $filename"; @@ -1811,8 +1826,8 @@ sub dump_intl_nls($) binmode OUTPUT; print OUTPUT pack "S<", 1; # version - print OUTPUT pack "S<*", 1 + scalar @upper, @upper; - print OUTPUT pack "S<*", 1 + scalar @lower, @lower; + print OUTPUT $upper; + print OUTPUT $lower; close OUTPUT; save_file($filename); }

1 0

Alexandre Julliard : unicode: Store data for CT_CTYPE3 types.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: d87d4a4a045653aa03543c2ac122402bb6339def URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87d4a4a045653aa03543c2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:26:47 2020 +0100 unicode: Store data for CT_CTYPE3 types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/wctype.c | 4 +- libs/port/wctype.c | 4 +- tools/make_unicode | 105 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 78 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d87d4a4a045653aa0354…

1 0

Alexandre Julliard : unicode: Generate a registry script for Nls keys.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 712839d5816adbbeb2f905971058489193ad2161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=712839d5816adbbeb2f90597… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 13:58:18 2020 +0100 unicode: Generate a registry script for Nls keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 + dlls/kernelbase/kernelbase.rc | 20 ++++++++++ dlls/kernelbase/kernelbase.rgs | 91 ++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 72 --------------------------------- tools/make_unicode | 57 ++++++++++++++++++++++++++ 5 files changed, 170 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=712839d5816adbbeb2f9…

1 0

Alexandre Julliard : unicode: Generate the NLS file for sortkeys.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 95aeb41c8cd090ff40cc86e7df1e8c94cef67860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95aeb41c8cd090ff40cc86e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:26:53 2020 +0100 unicode: Generate the NLS file for sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.rgs | 121 +++++++++++++ loader/wine.inf.in | 19 +- nls/Makefile.in | 3 +- nls/sortdefault.nls | Bin 0 -> 3316820 bytes tools/make_makefiles | 13 +- tools/make_unicode | 383 ++++++++++++++++++++++++++++++++++++++++- 6 files changed, 528 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95aeb41c8cd090ff40cc…

1 0

Alexandre Julliard : ntdll: Support the sortkey file in NtGetNlsSectionPtr().
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: b408b07eae99ad94e3f12ee77d96090f94513fa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b408b07eae99ad94e3f12ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:27:14 2020 +0100 ntdll: Support the sortkey file in NtGetNlsSectionPtr(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 8334de172d..afd65f3c02 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -67,6 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); enum nls_section_type { + NLS_SECTION_SORTKEYS = 9, NLS_SECTION_CASEMAP = 10, NLS_SECTION_CODEPAGE = 11, NLS_SECTION_NORMALIZE = 12 @@ -548,6 +549,9 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) {'\\','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','\\','N','l','s','\\','%','s',0}; + static const WCHAR sortdirW[] = {'C',':','\\','w','i','n','d','o','w','s','\\', + 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', + 's','o','r','t','i','n','g','\\',0}; static const WCHAR cpW[] = {'C','o','d','e','p','a','g','e',0}; static const WCHAR normW[] = {'N','o','r','m','a','l','i','z','a','t','i','o','n',0}; static const WCHAR langW[] = {'L','a','n','g','u','a','g','e',0}; @@ -564,21 +568,26 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) static const WCHAR normnfkcW[] = {'n','o','r','m','n','f','k','c','.','n','l','s',0}; static const WCHAR normnfkdW[] = {'n','o','r','m','n','f','k','d','.','n','l','s',0}; static const WCHAR normidnaW[] = {'n','o','r','m','i','d','n','a','.','n','l','s',0}; + static const WCHAR sortkeysW[] = {'s','o','r','t','d','e','f','a','u','l','t','.','n','l','s',0}; DWORD size; HANDLE handle; - NTSTATUS status; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW, valueW; WCHAR buffer[MAX_PATH], value[10]; - const WCHAR *name = NULL; + const WCHAR *name = NULL, *dir = system_dir; KEY_VALUE_PARTIAL_INFORMATION *info; /* get filename from registry */ switch (type) { + case NLS_SECTION_SORTKEYS: + if (id) return STATUS_INVALID_PARAMETER_1; + buffer[0] = 0; + break; case NLS_SECTION_CASEMAP: if (id) return STATUS_UNSUCCESSFUL; sprintfW( buffer, keyfmtW, langW ); @@ -595,25 +604,33 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) default: return STATUS_INVALID_PARAMETER_1; } - RtlInitUnicodeString( &nameW, buffer ); - RtlInitUnicodeString( &valueW, value ); - InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - if (!(status = NtOpenKey( &handle, KEY_READ, &attr ))) + + if (buffer[0]) { - info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - size = sizeof(buffer) - sizeof(WCHAR); - if (!(status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ))) + RtlInitUnicodeString( &nameW, buffer ); + RtlInitUnicodeString( &valueW, value ); + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + if (!(status = NtOpenKey( &handle, KEY_READ, &attr ))) { - ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; - name = (WCHAR *)info->Data; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + size = sizeof(buffer) - sizeof(WCHAR); + if (!(status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ))) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + name = (WCHAR *)info->Data; + } + NtClose( handle ); } - NtClose( handle ); } if (!name || !*name) /* otherwise some hardcoded defaults */ { switch (type) { + case NLS_SECTION_SORTKEYS: + name = sortkeysW; + dir = sortdirW; + break; case NLS_SECTION_CASEMAP: name = intlW; break; @@ -637,10 +654,10 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) /* try to open file in system dir */ - valueW.MaximumLength = (strlenW(name) + strlenW(system_dir) + 5) * sizeof(WCHAR); + valueW.MaximumLength = (strlenW(name) + strlenW(dir) + 5) * sizeof(WCHAR); if (!(valueW.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, valueW.MaximumLength ))) return STATUS_NO_MEMORY; - valueW.Length = sprintfW( valueW.Buffer, pathfmtW, system_dir, name ) * sizeof(WCHAR); + valueW.Length = sprintfW( valueW.Buffer, pathfmtW, dir, name ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer ));

1 0

Alexandre Julliard : kernelbase: Load the sortkey file and use it for the case mapping table.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 4b1676af06a0b8db13db1fe692531a48e9be053b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1676af06a0b8db13db1fe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 11:27:21 2020 +0100 kernelbase: Load the sortkey file and use it for the case mapping table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 169da01608..ae4527b866 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -577,6 +577,12 @@ static unsigned int nb_codepages; static struct norm_table *norm_info; +static struct +{ + DWORD *keys; /* sortkey table, indexed by char */ + USHORT *casemap; /* casemap table, in l_intl.nls format */ +} sort; + static CRITICAL_SECTION locale_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -586,13 +592,25 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION locale_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +/*********************************************************************** + * init_sortkeys + */ +static void init_sortkeys( DWORD *ptr ) +{ + sort.keys = (DWORD *)((char *)ptr + ptr[0]); + sort.casemap = (USHORT *)((char *)ptr + ptr[1]); +} + + /*********************************************************************** * init_locale */ void init_locale(void) { UINT ansi_cp = 0, oem_cp = 0; - USHORT *ansi_ptr, *oem_ptr, *casemap_ptr; + USHORT *ansi_ptr, *oem_ptr; + void *sort_ptr; LCID lcid = GetUserDefaultLCID(); WCHAR bufferW[80]; DYNAMIC_TIME_ZONE_INFORMATION timezone; @@ -610,8 +628,9 @@ void init_locale(void) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR) ); - NtGetNlsSectionPtr( 10, 0, 0, (void **)&casemap_ptr, &size ); + NtGetNlsSectionPtr( 9, 0, NULL, &sort_ptr, &size ); NtGetNlsSectionPtr( 12, NormalizationC, NULL, (void **)&norm_info, &size ); + init_sortkeys( sort_ptr ); if (!ansi_cp || NtGetNlsSectionPtr( 11, ansi_cp, NULL, (void **)&ansi_ptr, &size )) NtGetNlsSectionPtr( 11, 1252, NULL, (void **)&ansi_ptr, &size ); @@ -619,8 +638,8 @@ void init_locale(void) NtGetNlsSectionPtr( 11, 437, NULL, (void **)&oem_ptr, &size ); NtCurrentTeb()->Peb->AnsiCodePageData = ansi_ptr; NtCurrentTeb()->Peb->OemCodePageData = oem_ptr; - NtCurrentTeb()->Peb->UnicodeCaseTableData = casemap_ptr; - RtlInitNlsTables( ansi_ptr, oem_ptr, casemap_ptr, &nls_info ); + NtCurrentTeb()->Peb->UnicodeCaseTableData = sort.casemap; + RtlInitNlsTables( ansi_ptr, oem_ptr, sort.casemap, &nls_info ); RtlResetRtlTranslations( &nls_info ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Nls",

1 0