Rebase against 429325b6891bbb7488b3e8d8f97e4abb92879ce7.

This commit is contained in:
Alistair Leslie-Hughes
2022-03-22 10:46:29 +11:00
parent 8fb1779241
commit 5d30a5655f
6 changed files with 62 additions and 60 deletions

View File

@ -1,4 +1,4 @@
From bd39095de661aa8bef068e6cc7403000d66876f1 Mon Sep 17 00:00:00 2001
From b7da069fa1681f8ef532fa77ff27ca6002f48dfa 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 ee9aad33312..c95ff8f19ba 100644
index ad644cf5a3e..3f608996bba 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2560,6 +2560,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f
@@ -2564,6 +2564,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 ee9aad33312..c95ff8f19ba 100644
/* test srclen = 0 */
SetLastError(0xdeadbeef);
ret = func_ptr(0, upper_case, 0, buf, ARRAY_SIZE(buf));
@@ -2989,6 +2996,135 @@ static void test_sorting(void)
@@ -2993,6 +3000,135 @@ static void test_sorting(void)
}
}
@ -163,8 +163,8 @@ index ee9aad33312..c95ff8f19ba 100644
static void test_FoldStringA(void)
{
int ret, i, j;
@@ -7194,6 +7330,7 @@ START_TEST(locale)
test_NLSVersion();
@@ -7248,6 +7384,7 @@ START_TEST(locale)
test_locale_nls();
test_geo_name();
test_sorting();
+ test_unicode_sorting();