Rebase against 1316520a8029c0a99b358d1cd754294634d1855a.

[ntoskrnl-METHOD_OUT_DIRECT]
Removed patch to implement support for METHOD_OUT_DIRECT ioctls (accepted
upstream).

[wined3d-CSMT_Main]
Temporarily disable patchset.
This commit is contained in:
Sebastian Lackner
2016-10-30 23:03:30 +01:00
parent 6997fa0121
commit 5c0d70c70e
18 changed files with 118 additions and 407 deletions

View File

@ -1,4 +1,4 @@
From 40564f426aea608e9925d332e15eca8e9f2e3ea1 Mon Sep 17 00:00:00 2001
From a34d16145d16d83aa3edc0d8cbf59dfd40268738 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 20f52d2..015bfad 100644
index 07d6f8c..97ed611 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -1766,13 +1766,13 @@ static void test_CompareStringA(void)
@@ -1956,13 +1956,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 20f52d2..015bfad 100644
lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -4842,6 +4842,5 @@ START_TEST(locale)
test_invariant();
@@ -5302,6 +5302,5 @@ START_TEST(locale)
test_GetSystemPreferredUILanguages();
test_GetThreadPreferredUILanguages();
test_GetUserPreferredUILanguages();
- /* 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.8.0
2.9.0