wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 3d5a2567977455d04e4896368a71db74e7b9074b.

Browse Source
This commit is contained in:
Zebediah Figura
2018-10-31 00:06:39 -05:00
parent b874b3656e
commit 6fc555874b
8 changed files with 71 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,18 @@
From 2b81cf8ae5a8be48f3548a3a598800f35ee5615f Mon Sep 17 00:00:00 2001
From e5df77725c34e82d7d796b514118be6fece16386 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.
---
dlls/kernel32/tests/locale.c | 9 +++----
libs/wine/collation.c | 60 ++++++++++++++++++++++----------------------
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 b9b36d8a132..95e6ee9ea45 100644
index f5d54e06..2f61e1c9 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1965,13 +1965,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,8 +29,8 @@ index b9b36d8a132..95e6ee9ea45 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -5702,6 +5702,5 @@ START_TEST(locale)
test_FindNLSStringEx();
@@ -5814,6 +5814,5 @@ START_TEST(locale)
test_FindStringOrdinal();
test_SetThreadUILanguage();
test_NormalizeString();
- /* this requires collation table patch to make it MS compatible */
@@ -38,7 +38,7 @@ index b9b36d8a132..95e6ee9ea45 100644
+ test_sorting();
}
diff --git a/libs/wine/collation.c b/libs/wine/collation.c
index 465d740001b..f354a75f686 100644
index 465d7400..f354a75f 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 465d740001b..f354a75f686 100644
0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
--
2.16.3
2.19.1