Rebase against 0c738d900a8daccf2c5460972033766d34d59aed.

This commit is contained in:
Zebediah Figura
2019-02-19 18:36:59 -06:00
parent b3c99ebf4b
commit 13b580a0c8
14 changed files with 26 additions and 1436 deletions

View File

@@ -1,4 +1,4 @@
From e5df77725c34e82d7d796b514118be6fece16386 Mon Sep 17 00:00:00 2001
From 0e78ff26dc69402d31b691f0fec956d516bcd1de Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
Date: Mon, 28 Jul 2003 07:39:25 -0500
Subject: [PATCH] libs: Fix most problems with CompareString.
@@ -9,7 +9,7 @@ Subject: [PATCH] libs: Fix most problems with CompareString.
2 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index f5d54e06..2f61e1c9 100644
index 2627fc5d..c90223e6 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1963,13 +1963,13 @@ static void test_CompareStringA(void)
@@ -29,10 +29,10 @@ index f5d54e06..2f61e1c9 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -5814,6 +5814,5 @@ START_TEST(locale)
test_FindStringOrdinal();
@@ -6020,6 +6020,5 @@ START_TEST(locale)
test_SetThreadUILanguage();
test_NormalizeString();
test_SpecialCasing();
- /* this requires collation table patch to make it MS compatible */
- if (0) test_sorting();
+ test_sorting();
@@ -168,5 +168,5 @@ index 465d7400..f354a75f 100644
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
--
2.19.1
2.20.1