Rebase against c21c8525f9e69cfd48906ecc33b909490bd82783.

patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch

@@ -1,4 +1,4 @@
-From a34d16145d16d83aa3edc0d8cbf59dfd40268738 Mon Sep 17 00:00:00 2001
+From c16727fda95fe208bfa5730d6a36e82c6d8d52a2 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
 Date: Mon, 28 Jul 2003 07:39:25 -0500
 Subject: libs: Fix most problems with CompareString.
@@ -9,10 +9,10 @@ Subject: 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 07d6f8c..97ed611 100644
+index efb4231..cdb935e 100644
 --- a/dlls/kernel32/tests/locale.c
 +++ b/dlls/kernel32/tests/locale.c
-@@ -1956,13 +1956,13 @@ static void test_CompareStringA(void)
+@@ -1959,13 +1959,13 @@ static void test_CompareStringA(void)
      todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n");
  
      ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
@@ -29,10 +29,10 @@ index 07d6f8c..97ed611 100644
  
      lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
  
-@@ -5302,6 +5302,5 @@ START_TEST(locale)
-   test_GetSystemPreferredUILanguages();
+@@ -5490,6 +5490,5 @@ START_TEST(locale)
    test_GetThreadPreferredUILanguages();
    test_GetUserPreferredUILanguages();
+   test_FindNLSStringEx();
 -  /* this requires collation table patch to make it MS compatible */
 -  if (0) test_sorting();
 +  test_sorting();
@@ -168,5 +168,5 @@ index 465d740..f354a75 100644
      0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
      0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
 -- 
-2.9.0
+2.7.4