wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6282718c73bdf1648f18764c51671a57cef3c526.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-12-02 10:14:53 +11:00
parent 4c51f4f5f6
commit 7f17af3a42
9 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/libs-Unicode_Collation/0001-kernelbase-Implement-sortkey-generation-on-official-.patch
View File

@ -1,4 +1,4 @@
From e5140396b7787d48d39f0b47876022c64fc1c2c7 Mon Sep 17 00:00:00 2001
From 96bd1ab47a39d621c5f63264fb4bc415164d371c Mon Sep 17 00:00:00 2001
From: Fabian Maurer <dark.shadow4@web.de>
Date: Fri, 10 Apr 2020 18:47:18 +0200
Subject: [PATCH] kernelbase: Implement sortkey generation on official tables
@ -10,10 +10,10 @@ Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
2 files changed, 413 insertions(+), 123 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index c65c2cce3f2..a5d88288f27 100644
index 94c9ce3ad1b..8447e67486c 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2697,6 +2697,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f
@@ -2560,6 +2560,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f
lstrlenW(symbols_stripped) + 1, ret);
ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name);
@ -27,7 +27,7 @@ index c65c2cce3f2..a5d88288f27 100644
/* test srclen = 0 */
SetLastError(0xdeadbeef);
ret = func_ptr(0, upper_case, 0, buf, ARRAY_SIZE(buf));
@@ -3126,6 +3133,135 @@ static void test_sorting(void)
@@ -2989,6 +2996,135 @@ static void test_sorting(void)
}
}
@ -163,14 +163,16 @@ index c65c2cce3f2..a5d88288f27 100644
static void test_FoldStringA(void)
{
int ret, i, j;
@@ -7191,4 +7327,5 @@ START_TEST(locale)
@@ -7201,6 +7337,7 @@ START_TEST(locale)
test_NLSVersion();
test_geo_name();
test_sorting();
+ test_unicode_sorting();
}
test_EnumCalendarInfoA();
test_EnumCalendarInfoW();
test_EnumCalendarInfoExA();
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 89b35775053..5da87e065f1 100644
index 667d1a4dc65..095e0a68558 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -2164,127 +2164,6 @@ static int wcstombs_codepage( UINT codepage, DWORD flags, const WCHAR *src, int
@ -582,7 +584,7 @@ index 89b35775053..5da87e065f1 100644
static const struct geoinfo *get_geoinfo_ptr( GEOID geoid )
{
@@ -5303,8 +5456,8 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co
@@ -5302,8 +5455,8 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co
TRACE( "(%s,0x%08x,%s,%d,%p,%d)\n",
debugstr_w(locale), flags, debugstr_wn(src, srclen), srclen, dst, dstlen );
@ -594,5 +596,5 @@ index 89b35775053..5da87e065f1 100644
}
--
2.30.2
2.33.0