Rebase against ca9d03a7ac6bb599e50aa05ea5ec99d5cf096e2a.

This commit is contained in:
Zebediah Figura
2018-04-02 20:00:16 -05:00
parent 89733585b3
commit b4fce09d03
7 changed files with 27 additions and 257 deletions

View File

@ -1,4 +1,4 @@
From c16727fda95fe208bfa5730d6a36e82c6d8d52a2 Mon Sep 17 00:00:00 2001
From 5871f04dcacf0fc07ee027db46608ce09e79e0c9 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 efb4231..cdb935e 100644
index a99763d..3414334 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1959,13 +1959,13 @@ static void test_CompareStringA(void)
@@ -1963,13 +1963,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 efb4231..cdb935e 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -5490,6 +5490,5 @@ START_TEST(locale)
test_GetThreadPreferredUILanguages();
@@ -5518,6 +5518,5 @@ START_TEST(locale)
test_GetUserPreferredUILanguages();
test_FindNLSStringEx();
test_SetThreadUILanguage();
- /* this requires collation table patch to make it MS compatible */
- if (0) test_sorting();
+ test_sorting();