Rebase against 4a6a7655e1cbc614f609ea53939e240f4f785a94

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

@@ -1,7 +1,7 @@
-From 5871f04dcacf0fc07ee027db46608ce09e79e0c9 Mon Sep 17 00:00:00 2001
+From 2b81cf8ae5a8be48f3548a3a598800f35ee5615f 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.
+Subject: [PATCH] libs: Fix most problems with CompareString.
 
 ---
  dlls/kernel32/tests/locale.c |  9 +++----
@@ -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 a99763d..3414334 100644
+index b9b36d8a132..95e6ee9ea45 100644
 --- a/dlls/kernel32/tests/locale.c
 +++ b/dlls/kernel32/tests/locale.c
-@@ -1963,13 +1963,13 @@ static void test_CompareStringA(void)
+@@ -1965,13 +1965,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,16 +29,16 @@ index a99763d..3414334 100644
  
      lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
  
-@@ -5518,6 +5518,5 @@ START_TEST(locale)
-   test_GetUserPreferredUILanguages();
+@@ -5702,6 +5702,5 @@ START_TEST(locale)
    test_FindNLSStringEx();
    test_SetThreadUILanguage();
+   test_NormalizeString();
 -  /* this requires collation table patch to make it MS compatible */
 -  if (0) test_sorting();
 +  test_sorting();
  }
 diff --git a/libs/wine/collation.c b/libs/wine/collation.c
-index 465d740..f354a75 100644
+index 465d740001b..f354a75f686 100644
 --- a/libs/wine/collation.c
 +++ b/libs/wine/collation.c
 @@ -75,34 +75,34 @@ const unsigned int collation_table[12800] =
@@ -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.7.4
+2.16.3