wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs-Unicode_Collation: Also enable sorting tests, they pass after this patch.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-11-27 10:52:08 +01:00
parent a85a3e8533
commit c873b7f422
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,18 @@
From 3df119d731762991ed2301ac3540d112b416fdaa Mon Sep 17 00:00:00 2001
From 9a4f8fae5a735a8ceeec6136b548420abb69f336 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.
---
dlls/kernel32/tests/locale.c | 6 ++---
libs/wine/collation.c | 60 +++++++++++++++++++++---------------------
2 files changed, 33 insertions(+), 33 deletions(-)
dlls/kernel32/tests/locale.c | 9 +++----
libs/wine/collation.c | 60 ++++++++++++++++++++++----------------------
2 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index aad58b2..13803fb 100644
index 7b0212e..cba3ebc 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1461,13 +1461,13 @@ static void test_CompareStringA(void)
@@ -1759,13 +1759,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,6 +29,14 @@ index aad58b2..13803fb 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -4600,6 +4600,5 @@ START_TEST(locale)
test_GetGeoInfo();
test_EnumSystemGeoID();
test_invariant();
- /* 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
--- a/libs/wine/collation.c
@ -160,5 +168,5 @@ index 465d740..f354a75 100644
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
--
1.7.9.5
2.6.2