Rebase against 24a730187e08699b51c698d4fed58ba2947f0c5d.

[kernel32-CompareString_Length] Removed patch to make sure CompareString aborts on first non-matching character (accepted upstream). [kernel32-GetLogicalProcessorInformationEx] Removed patch to return TRUE from GetLogicalProcessorInformationEx stub (accepted upstream). [user32-WM_CAPTURECHANGE] Removed patch to send WM_CAPTURECHANGE also when capture has not changed (accepted upstream). [wined3d-Multisampling] Removed patch to allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE (fixed upstream).
2025-04-13 14:42:51 -07:00 · 2016-04-13 18:04:24 +02:00
parent 24dcca66e3
commit 7e776b7a90
24 changed files with 344 additions and 801 deletions
--- a/patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch
+++ b/patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch
@@ -1,12 +1,12 @@
-From 7cb209e122fc503190dcad411483147ebc6d6cb4 Mon Sep 17 00:00:00 2001
+From 940f22fae1e118faab3aa2926d050ad3c84a3e79 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 11 Nov 2014 03:11:33 +0100
 Subject: ntdll: Implement emulation of SIDT instruction when using Exagear.

 ---
 configure.ac             |   8 ++
- dlls/ntdll/signal_i386.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 232 insertions(+)
+ dlls/ntdll/signal_i386.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 231 insertions(+)

 diff --git a/configure.ac b/configure.ac
 index 92d78a2..c88a139 100644
@@ -20,7 +20,7 @@ index 92d78a2..c88a139 100644
 
 AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
             [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
-@@ -367,6 +368,13 @@ fi
+@@ -363,6 +364,13 @@ fi
 WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
                   [gettext tools not found (or too old), translations won't be built.])
 
@@ -35,7 +35,7 @@ index 92d78a2..c88a139 100644
 
 dnl Check for -li386 for NetBSD and OpenBSD
 diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
-index 13df4bb..edf5ea8 100644
+index 5708aae..f27ce56 100644
 --- a/dlls/ntdll/signal_i386.c
 +++ b/dlls/ntdll/signal_i386.c
@@ -96,6 +96,14 @@ typedef struct
@@ -53,11 +53,10 @@ index 13df4bb..edf5ea8 100644
 /***********************************************************************
  * signal context platform-specific definitions
  */
-@@ -1573,6 +1581,214 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
-     }
+@@ -1898,6 +1906,213 @@ static inline DWORD get_fpu_code( const CONTEXT *context )
 }
 
-+
+ 
 +#ifdef EXAGEAR_COMPAT
 +
 +/***********************************************************************
@@ -265,10 +264,10 @@ index 13df4bb..edf5ea8 100644
 +#endif /* EXAGEAR_COMPAT */
 +
 +
- /***********************************************************************
-  *           check_invalid_gs
-  *
-@@ -1902,6 +2118,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
+ /**********************************************************************
+  *		raise_segv_exception
+  */
+@@ -1907,6 +2122,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
 
     switch(rec->ExceptionCode)
     {
@@ -284,5 +283,5 @@ index 13df4bb..edf5ea8 100644
         if (rec->NumberParameters == 2)
         {
 -- 
-2.1.3
+2.7.1

--- a/patches/kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch
+++ b/patches/kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch
@@ -1,92 +0,0 @@
-From f8acf44d20407c213dd1f48691b432c2e9f555df Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Fri, 13 Nov 2015 20:36:54 +0800
-Subject: kernel32: CompareStringW should abort on the first nonmatching
- character to avoid invalid memory access. (v2)
-
-For bug 37556.
-
-Changes in v2 (by Sebastian Lackner):
-* Use loop to handle strings ending with multiple \0 characters correctly.
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
-Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
- libs/wine/sortkey.c | 39 ++++++++++++++++++++++++++++++---------
- 1 file changed, 30 insertions(+), 9 deletions(-)
-
-diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c
-index 17b5537..7280501 100644
--- a/libs/wine/sortkey.c
-+++ b/libs/wine/sortkey.c
-@@ -223,6 +223,16 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1
-         len1--;
-         len2--;
-     }
-+    while (len1 && !*str1)
-+    {
-+        str1++;
-+        len1--;
-+    }
-+    while (len2 && !*str2)
-+    {
-+        str2++;
-+        len2--;
-+    }
-     return len1 - len2;
- }
- 
-@@ -272,6 +282,16 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le
-         len1--;
-         len2--;
-     }
-+    while (len1 && !*str1)
-+    {
-+        str1++;
-+        len1--;
-+    }
-+    while (len2 && !*str2)
-+    {
-+        str2++;
-+        len2--;
-+    }
-     return len1 - len2;
- }
- 
-@@ -321,23 +341,24 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1,
-         len1--;
-         len2--;
-     }
-+    while (len1 && !*str1)
-+    {
-+        str1++;
-+        len1--;
-+    }
-+    while (len2 && !*str2)
-+    {
-+        str2++;
-+        len2--;
-+    }
-     return len1 - len2;
- }
- 
-static inline int real_length(const WCHAR *str, int len)
-{
-    while (len && !str[len - 1]) len--;
-    return len;
-}
-
- int wine_compare_string(int flags, const WCHAR *str1, int len1,
-                         const WCHAR *str2, int len2)
- {
-     int ret;
- 
-    len1 = real_length(str1, len1);
-    len2 = real_length(str2, len2);
-
-     ret = compare_unicode_weights(flags, str1, len1, str2, len2);
-     if (!ret)
-     {
-- 
-2.6.4
-
--- a/patches/kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch
+++ b/patches/kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch
@@ -1,31 +0,0 @@
-From 9261fada866235424392ac94d78e2d3a3a02ecc7 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 14 Nov 2015 20:43:39 +0100
-Subject: kernel32/tests: Add some more tests for NORM_IGNORESYMBOLS.
-
---
- dlls/kernel32/tests/locale.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
-index 7b0212e..a70dc13 100644
--- a/dlls/kernel32/tests/locale.c
-+++ b/dlls/kernel32/tests/locale.c
-@@ -1634,7 +1634,13 @@ static const struct comparestringa_entry comparestringa_data[] = {
-   { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1, CSTR_LESS_THAN },
-   { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1, CSTR_GREATER_THAN },
-   { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9, CSTR_EQUAL },
-  { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN }
-+  { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a-", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a'", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a-", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a'", 3, "a\0", 3, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a.", 3, "a\0", 3, CSTR_EQUAL },
-+  { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a ", 3, "a\0", 3, CSTR_EQUAL },
- };
- 
- static void test_CompareStringA(void)
-- 
-2.6.2
-
--- a/patches/kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch
+++ b/patches/kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch
@@ -1,32 +0,0 @@
-From c855cfddc7853fa8aed1ce4aac9a85c7ff7cb1f1 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 22 Jan 2016 15:13:36 +0100
-Subject: kenrel32/tests: Add further tests for comparing strings ending with
- multiple \0 characters.
-
---
- dlls/kernel32/tests/locale.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
-index d531272..4a9e540 100644
--- a/dlls/kernel32/tests/locale.c
-+++ b/dlls/kernel32/tests/locale.c
-@@ -1643,6 +1643,14 @@ static const struct comparestringa_entry comparestringa_data[] = {
-   { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a'", 3, "a\0", 3, CSTR_GREATER_THAN },
-   { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a.", 3, "a\0", 3, CSTR_EQUAL },
-   { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a ", 3, "a\0", 3, CSTR_EQUAL },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0\0", 4, CSTR_EQUAL },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0\0", 4, CSTR_EQUAL },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 1, CSTR_EQUAL },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 2, CSTR_EQUAL },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0x", 4, CSTR_LESS_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0x", 4, CSTR_LESS_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 1, CSTR_GREATER_THAN },
-+  { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 2, CSTR_GREATER_THAN },
- };
- 
- static void test_CompareStringA(void)
-- 
-2.6.4
-
--- a/patches/kernel32-CompareString_Length/definition
+++ b/patches/kernel32-CompareString_Length/definition
@@ -1 +0,0 @@
-Fixes: [37556] CompareString should abort on first non-matching character
--- a/patches/kernel32-GetLogicalProcessorInformationEx/0001-kernel32-Make-GetLogicalProcessorInformationEx-a-stu.patch
+++ b/patches/kernel32-GetLogicalProcessorInformationEx/0001-kernel32-Make-GetLogicalProcessorInformationEx-a-stu.patch
@@ -1,38 +0,0 @@
-From f7ea420c1ca707503214eba3c9bfce6719e66fdc Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Fri, 20 Jun 2014 21:16:39 +0200
-Subject: kernel32: Make GetLogicalProcessorInformationEx a stub which returns
- TRUE.
-
---
- dlls/kernel32/process.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index b371e73..24da577 100644
--- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -3831,8 +3831,18 @@ BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION
- BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP relationship, PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX buffer, PDWORD pBufLen)
- {
-     FIXME("(%u,%p,%p): stub\n", relationship, buffer, pBufLen);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-+
-+    if (!pBufLen)
-+    {
-+        SetLastError(ERROR_INVALID_PARAMETER);
-+        return FALSE;
-+    }
-+
-+    /* MSDN says '[...] at least one SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX
-+     * structure is written to the output buffer.' - don't be surprised if this
-+     * stub doesn't work always. */
-+    *pBufLen = 0;
-+    return TRUE;
- }
- 
- /***********************************************************************
-- 
-2.3.0
-
--- a/patches/kernel32-GetLogicalProcessorInformationEx/definition
+++ b/patches/kernel32-GetLogicalProcessorInformationEx/definition
@@ -1 +0,0 @@
-Fixes: CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE
--- a/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch
+++ b/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch
@@ -1,4 +1,4 @@
-From 8ad4ff3e0ed7e3065a1f408873a69d51cb6b3b51 Mon Sep 17 00:00:00 2001
+From 3963fc7dff07587084a7d91553727bba88871677 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 15 Aug 2014 22:23:08 +0200
 Subject: ntdll: Unify similar code in NtReadFile and FILE_AsyncReadService.
@@ -15,14 +15,14 @@ Changes in FILE_AsyncReadService:
    whereas NtReadFile uses different behaviour based on the fd type.
    Now both implementations match, and behave the same way.
 ---
- dlls/ntdll/file.c | 108 +++++++++++++++++++++++-------------------------------
- 1 file changed, 46 insertions(+), 62 deletions(-)
+ dlls/ntdll/file.c | 113 ++++++++++++++++++++++--------------------------------
+ 1 file changed, 46 insertions(+), 67 deletions(-)

 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 79daec5..fd88777 100644
+index 6531569..e42cf46 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -471,6 +471,45 @@ NTSTATUS FILE_GetNtStatus(void)
+@@ -486,6 +486,45 @@ NTSTATUS FILE_GetNtStatus(void)
     }
 }
 
@@ -48,7 +48,7 @@ index 79daec5..fd88777 100644
 +                case FD_TYPE_DEVICE:
 +                    return length ? STATUS_END_OF_FILE : STATUS_SUCCESS;
 +                case FD_TYPE_SERIAL:
-+                    return STATUS_PENDING;
+                    return length ? STATUS_PENDING : STATUS_SUCCESS;
 +                default:
 +                    return STATUS_PIPE_BROKEN;
 +                }
@@ -68,7 +68,7 @@ index 79daec5..fd88777 100644
 /***********************************************************************
  *             FILE_AsyncReadService      (INTERNAL)
  */
-@@ -478,44 +517,19 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb,
+@@ -493,44 +532,19 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb,
                                        NTSTATUS status, void **apc, void **arg )
 {
     struct async_fileio_read *fileio = user;
@@ -118,7 +118,7 @@ index 79daec5..fd88777 100644
         break;
 
     case STATUS_TIMEOUT:
-@@ -762,7 +776,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL
+@@ -777,7 +791,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL
     return status;
 }
 
@@ -126,7 +126,7 @@ index 79daec5..fd88777 100644
 /******************************************************************************
  *  NtReadFile					[NTDLL.@]
  *  ZwReadFile					[NTDLL.@]
-@@ -858,38 +871,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent,
+@@ -873,43 +886,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent,
 
     for (;;)
     {
@@ -148,6 +148,11 @@ index 79daec5..fd88777 100644
 -                    status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS;
 -                    goto done;
 -                case FD_TYPE_SERIAL:
+-                    if (!length)
+-                    {
+-                        status = STATUS_SUCCESS;
+-                        goto done;
+-                    }
 -                    break;
 -                default:
 -                    status = STATUS_PIPE_BROKEN;
@@ -168,5 +173,5 @@ index 79daec5..fd88777 100644
         if (async_read)
         {
 -- 
-2.4.0
+2.7.1

--- a/patches/kernel32-Named_Pipe/0010-ntdll-Add-handling-for-partially-received-messages-i.patch
+++ b/patches/kernel32-Named_Pipe/0010-ntdll-Add-handling-for-partially-received-messages-i.patch
@@ -1,4 +1,4 @@
-From cdb1ae761d777e7a1cf4c73edd946c94d1e73700 Mon Sep 17 00:00:00 2001
+From 39c68a41a2f5f9bf8fd95c278786f70050ff765b Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 11 Aug 2014 05:01:11 +0200
 Subject: ntdll: Add handling for partially received messages in NtReadFile.
@@ -248,7 +248,7 @@ index 5f5553b..3811ccd 100644
     ok(overlapped.InternalHigh == 0, "expected 0, got %lu\n", overlapped.InternalHigh);
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index fd6c605..18ee740 100644
+index 75ad1aa..da0948c 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
@@ -490,7 +490,7 @@ NTSTATUS FILE_GetNtStatus(void)
@@ -294,7 +294,7 @@ index fd6c605..18ee740 100644
@@ -577,11 +586,18 @@ static NTSTATUS read_unix_fd(int fd, char *buf, ULONG *total, ULONG length,
                     return length ? STATUS_END_OF_FILE : STATUS_SUCCESS;
                 case FD_TYPE_SERIAL:
-                     return STATUS_PENDING;
+                     return length ? STATUS_PENDING : STATUS_SUCCESS;
 +                case FD_TYPE_PIPE:
 +                    {
 +                        NTSTATUS status = unix_fd_avail( fd, &result );
@@ -321,5 +321,5 @@ index fd6c605..18ee740 100644
         io_status->u.Status = status;
         io_status->Information = total;
 -- 
-2.6.2
+2.7.1

--- a/patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch
+++ b/patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch
@@ -1,4 +1,4 @@
-From 1d4383d08858f302927f08138bbe81093efbfd14 Mon Sep 17 00:00:00 2001
+From 0cdb31619be9eda07a99f339e1072423b613bb5d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 28 Sep 2014 22:42:46 +0200
 Subject: ntdll: Throw exception if invalid handle is passed to NtClose and
@@ -10,7 +10,7 @@ Subject: ntdll: Throw exception if invalid handle is passed to NtClose and
 2 files changed, 92 insertions(+)

 diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
-index 47a2614..bcc6d69 100644
+index 3fadba7..6527501 100644
 --- a/dlls/ntdll/om.c
 +++ b/dlls/ntdll/om.c
@@ -38,6 +38,7 @@
@@ -21,7 +21,7 @@ index 47a2614..bcc6d69 100644
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
-@@ -343,6 +344,13 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source,
+@@ -377,6 +378,13 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source,
     return ret;
 }
 
@@ -35,7 +35,7 @@ index 47a2614..bcc6d69 100644
 /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */
 NTSTATUS close_handle( HANDLE handle )
 {
-@@ -356,6 +364,25 @@ NTSTATUS close_handle( HANDLE handle )
+@@ -390,6 +398,25 @@ NTSTATUS close_handle( HANDLE handle )
     }
     SERVER_END_REQ;
     if (fd != -1) close( fd );
@@ -62,10 +62,10 @@ index 47a2614..bcc6d69 100644
 }
 
 diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
-index 5cbab71..7a97ae5 100644
+index c62dcb3..440655c 100644
 --- a/dlls/ntdll/tests/exception.c
 +++ b/dlls/ntdll/tests/exception.c
-@@ -53,6 +53,7 @@ static NTSTATUS  (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code);
+@@ -52,6 +52,7 @@ static NTSTATUS  (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code);
 static NTSTATUS  (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
 static NTSTATUS  (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG);
 static BOOL      (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
@@ -73,11 +73,11 @@ index 5cbab71..7a97ae5 100644
 
 #if defined(__x86_64__)
 static BOOLEAN   (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64);
-@@ -938,6 +939,16 @@ static void test_debugger(void)
-                         /* here we handle exception */
-                     }
+@@ -963,6 +964,16 @@ static void test_debugger(void)
+ 
+                     if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
                 }
-+                else if (stage == 7 || stage == 8)
+                else if (stage == 11 || stage == 12)
 +                {
 +                    ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE,
 +                       "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode,
@@ -85,12 +85,12 @@ index 5cbab71..7a97ae5 100644
 +                    ok(de.u.Exception.ExceptionRecord.NumberParameters == 0,
 +                       "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
 +
-+                    if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+                    if (stage == 12) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
 +                }
                 else
                     ok(FALSE, "unexpected stage %x\n", stage);
 
-@@ -1791,6 +1802,53 @@ static void test_ripevent(DWORD numexc)
+@@ -2078,6 +2089,53 @@ static void test_breakpoint(DWORD numexc)
     pRtlRemoveVectoredExceptionHandler(vectored_handler);
 }
 
@@ -144,7 +144,7 @@ index 5cbab71..7a97ae5 100644
 static void test_vectored_continue_handler(void)
 {
     PVOID handler1, handler2;
-@@ -1843,6 +1901,7 @@ START_TEST(exception)
+@@ -2130,6 +2188,7 @@ START_TEST(exception)
     pNtGetContextThread  = (void *)GetProcAddress( hntdll, "NtGetContextThread" );
     pNtSetContextThread  = (void *)GetProcAddress( hntdll, "NtSetContextThread" );
     pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" );
@@ -152,33 +152,33 @@ index 5cbab71..7a97ae5 100644
     pRtlUnwind           = (void *)GetProcAddress( hntdll, "RtlUnwind" );
     pRtlRaiseException   = (void *)GetProcAddress( hntdll, "RtlRaiseException" );
     pNtTerminateProcess  = (void *)GetProcAddress( hntdll, "NtTerminateProcess" );
-@@ -1910,6 +1969,10 @@ START_TEST(exception)
-             test_ripevent(0);
-             test_stage = 6;
-             test_ripevent(1);
-+            test_stage = 7;
+@@ -2205,6 +2264,10 @@ START_TEST(exception)
+             test_breakpoint(0);
+             test_stage = 10;
+             test_breakpoint(1);
+            test_stage = 11;
 +            test_closehandle(0);
-+            test_stage = 8;
+            test_stage = 12;
 +            test_closehandle(1);
         }
         else
             skip( "RtlRaiseException not found\n" );
-@@ -1923,6 +1986,7 @@ START_TEST(exception)
-     test_rtlraiseexception();
-     test_outputdebugstring(1, FALSE);
+@@ -2220,6 +2283,7 @@ START_TEST(exception)
     test_ripevent(1);
+     test_debug_service(1);
+     test_breakpoint(1);
 +    test_closehandle(0);
     test_vectored_continue_handler();
     test_debugger();
     test_simd_exceptions();
-@@ -1942,6 +2006,7 @@ START_TEST(exception)
- 
-     test_outputdebugstring(1, FALSE);
+@@ -2241,6 +2305,7 @@ START_TEST(exception)
     test_ripevent(1);
+     test_debug_service(1);
+     test_breakpoint(1);
 +    test_closehandle(0);
     test_vectored_continue_handler();
     test_virtual_unwind();
 
 -- 
-2.1.3
+2.7.1

--- a/patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch
+++ b/patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch
@@ -1,4 +1,4 @@
-From 51935986a1e973ab26dc3035905a47e1f19c6062 Mon Sep 17 00:00:00 2001
+From 21a4d707055fc3e7781fbefec814095cd109fcd2 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 28 Sep 2014 23:39:51 +0200
 Subject: ntdll: OutputDebugString should throw the exception a second time, if
@@ -38,10 +38,10 @@ index d4d66b2..981661b 100644
     if (!mutex_inited)
     {
 diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
-index 7a97ae5..b0f0fac 100644
+index 440655c..70ccf82 100644
 --- a/dlls/ntdll/tests/exception.c
 +++ b/dlls/ntdll/tests/exception.c
-@@ -1727,7 +1727,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
+@@ -1780,7 +1780,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
     return EXCEPTION_CONTINUE_SEARCH;
 }
 
@@ -50,7 +50,7 @@ index 7a97ae5..b0f0fac 100644
 {
     PVOID vectored_handler;
 
-@@ -1742,13 +1742,8 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
+@@ -1795,13 +1795,8 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
 
     outputdebugstring_exceptions = 0;
     OutputDebugStringA("Hello World");
@@ -66,7 +66,7 @@ index 7a97ae5..b0f0fac 100644
 
     pRtlRemoveVectoredExceptionHandler(vectored_handler);
 }
-@@ -1962,9 +1957,9 @@ START_TEST(exception)
+@@ -2249,9 +2244,9 @@ START_TEST(exception)
             run_rtlraiseexception_test(EXCEPTION_BREAKPOINT);
             run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE);
             test_stage = 3;
@@ -78,24 +78,24 @@ index 7a97ae5..b0f0fac 100644
             test_stage = 5;
             test_ripevent(0);
             test_stage = 6;
-@@ -1984,7 +1979,7 @@ START_TEST(exception)
+@@ -2279,7 +2274,7 @@ START_TEST(exception)
     test_unwind();
     test_exceptions();
     test_rtlraiseexception();
 -    test_outputdebugstring(1, FALSE);
 +    test_outputdebugstring(1);
     test_ripevent(1);
-     test_closehandle(0);
-     test_vectored_continue_handler();
-@@ -2004,7 +1999,7 @@ START_TEST(exception)
+     test_debug_service(1);
+     test_breakpoint(1);
+@@ -2301,7 +2296,7 @@ START_TEST(exception)
     pRtlLookupFunctionEntry            = (void *)GetProcAddress( hntdll,
                                                                  "RtlLookupFunctionEntry" );
 
 -    test_outputdebugstring(1, FALSE);
 +    test_outputdebugstring(1);
     test_ripevent(1);
-     test_closehandle(0);
-     test_vectored_continue_handler();
+     test_debug_service(1);
+     test_breakpoint(1);
 -- 
-2.1.3
+2.7.1

--- a/patches/ntdll-Loader_Machine_Type/0001-ntdll-Check-architecture-before-loading-module.patch
+++ b/patches/ntdll-Loader_Machine_Type/0001-ntdll-Check-architecture-before-loading-module.patch
@@ -1,4 +1,4 @@
-From a01523c116eb0fa430e618683bea55f1e3b6b0d5 Mon Sep 17 00:00:00 2001
+From 70913f6c98d75d46e542ccb0cde9bdaf9e819b85 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 18 Jul 2015 04:52:55 +0200
 Subject: ntdll: Check architecture before loading module.
@@ -8,7 +8,7 @@ Subject: ntdll: Check architecture before loading module.
 1 file changed, 131 insertions(+), 8 deletions(-)

 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 74feb97..ee1e5e2 100644
+index cb9a4e2..06c0475 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
@@ -2078,6 +2078,108 @@ done:
@@ -153,7 +153,7 @@ index 74feb97..ee1e5e2 100644
@@ -2150,7 +2256,23 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
             attr.SecurityDescriptor = NULL;
             attr.SecurityQualityOfService = NULL;
-             if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0;
+             if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0;
 -            goto found;
 +        #ifdef CURRENT_ARCH
 +            if (*handle && check_arch)
@@ -202,5 +202,5 @@ index 74feb97..ee1e5e2 100644
         if (status != STATUS_BUFFER_TOO_SMALL) break;
         /* grow the buffer and retry */
 -- 
-2.6.2
+2.7.1

--- a/patches/ntdll-Syscall_Wrappers/0002-ntdll-Use-wrapper-functions-for-syscalls.patch
+++ b/patches/ntdll-Syscall_Wrappers/0002-ntdll-Use-wrapper-functions-for-syscalls.patch
--- a/patches/ntdll-WinSqm/0001-ntdll-Add-stubs-for-WinSqmStartSession-WinSqmEndSess.patch
+++ b/patches/ntdll-WinSqm/0001-ntdll-Add-stubs-for-WinSqmStartSession-WinSqmEndSess.patch
@@ -1,4 +1,4 @@
-From ff1be4d15b2114de6b785c164ddc27fd6993c6f8 Mon Sep 17 00:00:00 2001
+From 6318565d6da5c76eabe006a5c6b25fee7532f445 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 25 Dec 2014 12:36:28 -0700
 Subject: ntdll: Add stubs for WinSqmStartSession / WinSqmEndSession.
@@ -11,7 +11,7 @@ Based on a patch by Detlef Riekenberg.
 3 files changed, 76 insertions(+)

 diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index 2cfa900..7832d37 100644
+index 0f6c5df..bd8b358d 100644
 --- a/dlls/ntdll/misc.c
 +++ b/dlls/ntdll/misc.c
@@ -27,6 +27,8 @@
@@ -23,7 +23,7 @@ index 2cfa900..7832d37 100644
 #include "wine/library.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
-@@ -328,6 +330,15 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb,
+@@ -330,6 +332,15 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb,
 }
 
 /*********************************************************************
@@ -39,11 +39,10 @@ index 2cfa900..7832d37 100644
  *                  WinSqmIsOptedIn   (NTDLL.@)
  */
 BOOL WINAPI WinSqmIsOptedIn(void)
-@@ -335,3 +346,12 @@ BOOL WINAPI WinSqmIsOptedIn(void)
-     FIXME("() stub\n");
+@@ -338,6 +349,15 @@ BOOL WINAPI WinSqmIsOptedIn(void)
     return FALSE;
 }
-+
+ 
 +/*********************************************************************
 + *                  WinSqmStartSession   (NTDLL.@)
 + */
@@ -52,18 +51,26 @@ index 2cfa900..7832d37 100644
 +    FIXME("(%p, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3);
 +    return NULL;
 +}
+
+ /******************************************************************************
+  *                  EtwRegisterTraceGuidsW (NTDLL.@)
+  *
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 28165ef..9225898 100644
+index 04e9548..f5e9275 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -971,3 +971,5 @@
+@@ -1010,7 +1010,9 @@
+ @ stdcall TpWaitForWait(ptr long)
+ @ stdcall TpWaitForWork(ptr long)
 @ stdcall -ret64 VerSetConditionMask(int64 long long)
 +@ stdcall WinSqmEndSession(ptr)
 @ stdcall WinSqmIsOptedIn()
 +@ stdcall WinSqmStartSession(ptr long long)
 @ stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort
+ @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck
+ @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index e8eb04a..7b5f07d 100644
+index 94a22ac..d382691 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
@@ -62,6 +62,9 @@ static inline USHORT __my_ushort_swap(USHORT s)
@@ -76,7 +83,7 @@ index e8eb04a..7b5f07d 100644
 static SIZE_T    (WINAPI  *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T);
 static SIZE_T    (WINAPI  *pRtlCompareMemoryUlong)(PULONG, SIZE_T, ULONG);
 static NTSTATUS  (WINAPI  *pRtlDeleteTimer)(HANDLE, HANDLE, HANDLE);
-@@ -109,6 +112,9 @@ static void InitFunctionPtrs(void)
+@@ -115,6 +118,9 @@ static void InitFunctionPtrs(void)
     hntdll = LoadLibraryA("ntdll.dll");
     ok(hntdll != 0, "LoadLibrary failed\n");
     if (hntdll) {
@@ -86,7 +93,7 @@ index e8eb04a..7b5f07d 100644
 	pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory");
 	pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong");
         pRtlDeleteTimer = (void *)GetProcAddress(hntdll, "RtlDeleteTimer");
-@@ -149,6 +155,48 @@ static void InitFunctionPtrs(void)
+@@ -161,6 +167,48 @@ static void InitFunctionPtrs(void)
     ok(strlen(src) == 15, "Source must be 16 bytes long!\n");
 }
 
@@ -135,7 +142,7 @@ index e8eb04a..7b5f07d 100644
 #define COMP(str1,str2,cmplen,len) size = pRtlCompareMemory(str1, str2, cmplen); \
   ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len)
 
-@@ -1603,6 +1651,12 @@ START_TEST(rtl)
+@@ -2060,6 +2108,12 @@ START_TEST(rtl)
 {
     InitFunctionPtrs();
 
@@ -149,5 +156,5 @@ index e8eb04a..7b5f07d 100644
     test_RtlCompareMemoryUlong();
     test_RtlMoveMemory();
 -- 
-2.3.5
+2.7.1

--- a/patches/ntoskrnl-DriverTest/0002-ntoskrnl.exe-tests-Add-kernel-compliant-test-functio.patch
+++ b/patches/ntoskrnl-DriverTest/0002-ntoskrnl.exe-tests-Add-kernel-compliant-test-functio.patch
@@ -1,4 +1,4 @@
-From 56879d100853d341a322ab082dbbd91e50ec72cd Mon Sep 17 00:00:00 2001
+From 0f6bbb3432a99f86bc15fa865452f4e18ef989fe Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 20 Jan 2015 18:39:36 +0100
 Subject: ntoskrnl.exe/tests: Add kernel compliant test functions.
@@ -19,7 +19,7 @@ Subject: ntoskrnl.exe/tests: Add kernel compliant test functions.
 create mode 100644 dlls/ntoskrnl.exe/tests/driver.sys/util.h

 diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index b824250..c104002 100644
+index db15265..5645b20 100644
 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
 +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -1423,7 +1423,7 @@
@@ -43,7 +43,7 @@ index bc040e4..b3a6839 100644
 +	driver.c \
 +	test.c
 diff --git a/dlls/ntoskrnl.exe/tests/driver.sys/driver.c b/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
-index 5756090..3da7ba1 100644
+index 35f78d1..f39aa37 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.sys/driver.c
@@ -30,6 +30,9 @@
@@ -90,7 +90,7 @@ index 5756090..3da7ba1 100644
     return STATUS_SUCCESS;
 }
 
-@@ -70,16 +66,20 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
+@@ -72,16 +68,20 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
     NTSTATUS status = STATUS_NOT_SUPPORTED;
     ULONG_PTR information = 0;
 
@@ -672,11 +672,11 @@ index 9b8a6a7..64e9d97 100644
     unload_driver(service, filename);
 }
 diff --git a/include/wine/test.h b/include/wine/test.h
-index f8b608f..b7ef81a 100644
+index 862d553..de21413 100644
 --- a/include/wine/test.h
 +++ b/include/wine/test.h
@@ -61,7 +61,13 @@ extern int winetest_loop_todo(void);
- extern void winetest_end_todo( const char* platform );
+ extern void winetest_end_todo(void);
 extern int winetest_get_mainargs( char*** pargv );
 extern LONG winetest_get_failures(void);
 +extern int winetest_get_report_success(void);
@@ -689,7 +689,7 @@ index f8b608f..b7ef81a 100644
 extern void winetest_wait_child_process( HANDLE process );
 
 extern const char *wine_dbgstr_wn( const WCHAR *str, int n );
-@@ -436,10 +442,39 @@ LONG winetest_get_failures(void)
+@@ -433,10 +439,39 @@ LONG winetest_get_failures(void)
     return failures;
 }
 
@@ -732,5 +732,5 @@ index f8b608f..b7ef81a 100644
 
 void winetest_wait_child_process( HANDLE process )
 -- 
-2.2.1
+2.7.1

--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "84cae8c3ea2614fce65d5d499159de9d530444ef"
+	echo "24a730187e08699b51c698d4fed58ba2947f0c5d"
 }

 # Show version information
@@ -151,13 +151,11 @@ patch_enable_all ()
 	enable_kernel32_COMSPEC="$1"
 	enable_kernel32_Codepage_Conversion="$1"
 	enable_kernel32_CompareStringEx="$1"
-	enable_kernel32_CompareString_Length="$1"
 	enable_kernel32_CopyFileEx="$1"
 	enable_kernel32_Cwd_Startup_Info="$1"
 	enable_kernel32_FreeUserPhysicalPages="$1"
 	enable_kernel32_GetFinalPathNameByHandle="$1"
 	enable_kernel32_GetLargestConsoleWindowSize="$1"
-	enable_kernel32_GetLogicalProcessorInformationEx="$1"
 	enable_kernel32_LocaleNameToLCID="$1"
 	enable_kernel32_Named_Pipe="$1"
 	enable_kernel32_NeedCurrentDirectoryForExePath="$1"
@@ -289,7 +287,6 @@ patch_enable_all ()
 	enable_user32_Refresh_MDI_Menus="$1"
 	enable_user32_ScrollWindowEx="$1"
 	enable_user32_SetCoalescableTimer="$1"
-	enable_user32_WM_CAPTURECHANGE="$1"
 	enable_user32_WM_MDICALCCHILDSCROLL="$1"
 	enable_user32_WndProc="$1"
 	enable_uxtheme_GTK_Theming="$1"
@@ -309,7 +306,6 @@ patch_enable_all ()
 	enable_wined3d_DXTn="$1"
 	enable_wined3d_Geforce_425M="$1"
 	enable_wined3d_MESA_GPU_Info="$1"
-	enable_wined3d_Multisampling="$1"
 	enable_wined3d_Revert_PixelFormat="$1"
 	enable_wined3d_UnhandledBlendFactor="$1"
 	enable_wined3d_resource_check_usage="$1"
@@ -569,9 +565,6 @@ patch_enable ()
 		kernel32-CompareStringEx)
 			enable_kernel32_CompareStringEx="$2"
 			;;
-		kernel32-CompareString_Length)
-			enable_kernel32_CompareString_Length="$2"
-			;;
 		kernel32-CopyFileEx)
 			enable_kernel32_CopyFileEx="$2"
 			;;
@@ -587,9 +580,6 @@ patch_enable ()
 		kernel32-GetLargestConsoleWindowSize)
 			enable_kernel32_GetLargestConsoleWindowSize="$2"
 			;;
-		kernel32-GetLogicalProcessorInformationEx)
-			enable_kernel32_GetLogicalProcessorInformationEx="$2"
-			;;
 		kernel32-LocaleNameToLCID)
 			enable_kernel32_LocaleNameToLCID="$2"
 			;;
@@ -983,9 +973,6 @@ patch_enable ()
 		user32-SetCoalescableTimer)
 			enable_user32_SetCoalescableTimer="$2"
 			;;
-		user32-WM_CAPTURECHANGE)
-			enable_user32_WM_CAPTURECHANGE="$2"
-			;;
 		user32-WM_MDICALCCHILDSCROLL)
 			enable_user32_WM_MDICALCCHILDSCROLL="$2"
 			;;
@@ -1043,9 +1030,6 @@ patch_enable ()
 		wined3d-MESA_GPU_Info)
 			enable_wined3d_MESA_GPU_Info="$2"
 			;;
-		wined3d-Multisampling)
-			enable_wined3d_Multisampling="$2"
-			;;
 		wined3d-Revert_PixelFormat)
 			enable_wined3d_Revert_PixelFormat="$2"
 			;;
@@ -1657,9 +1641,6 @@ if test "$enable_category_stable" -eq 1; then
 	if test "$enable_winecfg_Libraries" -gt 1; then
 		abort "Patchset winecfg-Libraries disabled, but category-stable depends on that."
 	fi
-	if test "$enable_wined3d_Multisampling" -gt 1; then
-		abort "Patchset wined3d-Multisampling disabled, but category-stable depends on that."
-	fi
 	if test "$enable_wined3d_Revert_PixelFormat" -gt 1; then
 		abort "Patchset wined3d-Revert_PixelFormat disabled, but category-stable depends on that."
 	fi
@@ -1753,7 +1734,6 @@ if test "$enable_category_stable" -eq 1; then
 	enable_wine_inf_ProfileList_UserSID=1
 	enable_wineboot_HKEY_DYN_DATA=1
 	enable_winecfg_Libraries=1
-	enable_wined3d_Multisampling=1
 	enable_wined3d_Revert_PixelFormat=1
 	enable_wined3d_UnhandledBlendFactor=1
 	enable_wined3d_resource_check_usage=1
@@ -3384,25 +3364,6 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset kernel32-CompareString_Length
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#37556] CompareString should abort on first non-matching character
-# |
-# | Modified files:
-# |   *	dlls/kernel32/tests/locale.c, libs/wine/sortkey.c
-# |
-if test "$enable_kernel32_CompareString_Length" -eq 1; then
-	patch_apply kernel32-CompareString_Length/0001-kernel32-CompareStringW-should-abort-on-the-first-no.patch
-	patch_apply kernel32-CompareString_Length/0002-kernel32-tests-Add-some-more-tests-for-NORM_IGNORESY.patch
-	patch_apply kernel32-CompareString_Length/0003-kenrel32-tests-Add-further-tests-for-comparing-strin.patch
-	(
-		echo '+    { "Dmitry Timoshkov", "kernel32: CompareStringW should abort on the first nonmatching character to avoid invalid memory access.", 2 },';
-		echo '+    { "Sebastian Lackner", "kernel32/tests: Add some more tests for NORM_IGNORESYMBOLS.", 1 },';
-		echo '+    { "Sebastian Lackner", "kenrel32/tests: Add further tests for comparing strings ending with multiple \\\\0 characters.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset kernel32-SetFileInformationByHandle
 # |
 # | Modified files:
@@ -3544,18 +3505,6 @@ if test "$enable_kernel32_GetLargestConsoleWindowSize" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset kernel32-GetLogicalProcessorInformationEx
-# |
-# | Modified files:
-# |   *	dlls/kernel32/process.c
-# |
-if test "$enable_kernel32_GetLogicalProcessorInformationEx" -eq 1; then
-	patch_apply kernel32-GetLogicalProcessorInformationEx/0001-kernel32-Make-GetLogicalProcessorInformationEx-a-stu.patch
-	(
-		echo '+    { "Sebastian Lackner", "kernel32: Make GetLogicalProcessorInformationEx a stub which returns TRUE.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset kernel32-LocaleNameToLCID
 # |
 # | This patchset fixes the following Wine bugs:
@@ -5680,21 +5629,6 @@ if test "$enable_user32_SetCoalescableTimer" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset user32-WM_CAPTURECHANGE
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#13683] Also send WM_CAPTURECHANGE when capture has not changed
-# |
-# | Modified files:
-# |   *	dlls/comctl32/toolbar.c, dlls/comctl32/trackbar.c, dlls/user32/button.c, dlls/user32/input.c, dlls/user32/tests/msg.c
-# |
-if test "$enable_user32_WM_CAPTURECHANGE" -eq 1; then
-	patch_apply user32-WM_CAPTURECHANGE/0001-user32-Also-send-WM_CAPTURECHANGE-when-capture-has-n.patch
-	(
-		echo '+    { "Christopher Thielen", "user32: Also send WM_CAPTURECHANGE when capture has not changed.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset user32-WM_MDICALCCHILDSCROLL
 # |
 # | Modified files:
@@ -5935,21 +5869,6 @@ if test "$enable_wined3d_MESA_GPU_Info" -eq 1; then
 	) >> "$patchlist"
 fi

-# Patchset wined3d-Multisampling
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#12652] Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE.
-# |
-# | Modified files:
-# |   *	dlls/wined3d/directx.c, dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h
-# |
-if test "$enable_wined3d_Multisampling" -eq 1; then
-	patch_apply wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch
-	(
-		echo '+    { "Austin English", "wined3d: Allow to specify multisampling AA quality levels via registry.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wined3d-Revert_PixelFormat
 # |
 # | Modified files:
--- a/patches/server-Parent_Process/0002-kernel32-tests-Add-test-for-process-object-destructi.patch
+++ b/patches/server-Parent_Process/0002-kernel32-tests-Add-test-for-process-object-destructi.patch
@@ -1,14 +1,14 @@
-From 799244b5aa488e397c3744fbf9ce368ec52ab596 Mon Sep 17 00:00:00 2001
+From c1fbb588bfe27085e0751c561c76339938575d56 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 12 Dec 2015 15:08:40 +0100
 Subject: kernel32/tests: Add test for process object destruction.

 ---
- dlls/kernel32/tests/process.c | 161 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 161 insertions(+)
+ dlls/kernel32/tests/process.c | 159 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 159 insertions(+)

 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index f186c94..8e0f0c2 100644
+index 5e7fecb..d7518f7 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
@@ -33,11 +33,14 @@
@@ -26,33 +26,31 @@ index f186c94..8e0f0c2 100644
 
 #define expect_eq_d(expected, actual) \
     do { \
-@@ -79,6 +82,12 @@ static BOOL   (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR);
- static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
+@@ -80,6 +83,11 @@ static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, P
 static BOOL   (WINAPI *pProcessIdToSessionId)(DWORD,DWORD*);
 static DWORD  (WINAPI *pWTSGetActiveConsoleSessionId)(void);
+ static BOOL   (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*);
 +static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD);
 +static BOOL   (WINAPI *pProcess32First)(HANDLE, PROCESSENTRY32*);
 +static BOOL   (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*);
 +static BOOL   (WINAPI *pThread32First)(HANDLE, THREADENTRY32*);
 +static BOOL   (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*);
-+
 
 /* ############################### */
 static char     base[MAX_PATH];
-@@ -237,6 +246,12 @@ static BOOL init(void)
-     pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode");
+@@ -239,6 +247,11 @@ static BOOL init(void)
     pProcessIdToSessionId = (void *)GetProcAddress(hkernel32, "ProcessIdToSessionId");
     pWTSGetActiveConsoleSessionId = (void *)GetProcAddress(hkernel32, "WTSGetActiveConsoleSessionId");
+     pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx");
 +    pCreateToolhelp32Snapshot = (void *)GetProcAddress(hkernel32, "CreateToolhelp32Snapshot");
 +    pProcess32First = (void *)GetProcAddress(hkernel32, "Process32First");
 +    pProcess32Next = (void *)GetProcAddress(hkernel32, "Process32Next");
 +    pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First");
 +    pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next");
-+
+ 
     return TRUE;
 }
- 
-@@ -287,6 +302,8 @@ static void     doChild(const char* file, const char* option)
+@@ -290,6 +303,8 @@ static void     doChild(const char* file, const char* option)
     char                bufA[MAX_PATH];
     WCHAR               bufW[MAX_PATH];
     HANDLE              hFile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
@@ -61,7 +59,7 @@ index f186c94..8e0f0c2 100644
     BOOL ret;
 
     if (hFile == INVALID_HANDLE_VALUE) return;
-@@ -341,6 +358,26 @@ static void     doChild(const char* file, const char* option)
+@@ -344,6 +359,26 @@ static void     doChild(const char* file, const char* option)
     childPrintf(hFile, "CommandLineA=%s\n", encodeA(GetCommandLineA()));
     childPrintf(hFile, "CommandLineW=%s\n\n", encodeW(GetCommandLineW()));
 
@@ -88,7 +86,7 @@ index f186c94..8e0f0c2 100644
     /* output of environment (Ansi) */
     ptrA_save = ptrA = GetEnvironmentStringsA();
     if (ptrA)
-@@ -1065,6 +1102,112 @@ static void test_Directory(void)
+@@ -1068,6 +1103,112 @@ static void test_Directory(void)
     ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n");
 }
 
@@ -201,7 +199,7 @@ index f186c94..8e0f0c2 100644
 static BOOL is_str_env_drive_dir(const char* str)
 {
     return str[0] == '=' && str[1] >= 'A' && str[1] <= 'Z' && str[2] == ':' &&
-@@ -2989,6 +3132,23 @@ START_TEST(process)
+@@ -3024,6 +3165,23 @@ START_TEST(process)
             Sleep(100);
             return;
         }
@@ -225,7 +223,7 @@ index f186c94..8e0f0c2 100644
 
         ok(0, "Unexpected command %s\n", myARGV[2]);
         return;
-@@ -2998,6 +3158,7 @@ START_TEST(process)
+@@ -3034,6 +3192,7 @@ START_TEST(process)
     test_Startup();
     test_CommandLine();
     test_Directory();
@@ -234,5 +232,5 @@ index f186c94..8e0f0c2 100644
     test_SuspendFlag();
     test_DebuggingFlag();
 -- 
-2.6.2
+2.7.1

--- a/patches/user32-WM_CAPTURECHANGE/0001-user32-Also-send-WM_CAPTURECHANGE-when-capture-has-n.patch
+++ b/patches/user32-WM_CAPTURECHANGE/0001-user32-Also-send-WM_CAPTURECHANGE-when-capture-has-n.patch
@@ -1,117 +0,0 @@
-From 5bfd73ad3ec48deae92927e8116fce81ac31cf66 Mon Sep 17 00:00:00 2001
-From: Christopher Thielen <cthielen@gmail.com>
-Date: Mon, 23 Nov 2015 21:48:26 -0800
-Subject: user32: Also send WM_CAPTURECHANGE when capture has not changed.
-
-Fixes https://bugs.winehq.org/show_bug.cgi?id=13683
-
-A window may be notified with WM_CAPTURECHANGED about itself
-gaining mouse capture if it calls SetCapture() twice.
-
-Signed-off-by: Christopher Thielen <cthielen@gmail.com>
-Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
- dlls/comctl32/toolbar.c  |  1 +
- dlls/comctl32/trackbar.c |  1 +
- dlls/user32/button.c     |  1 +
- dlls/user32/input.c      |  2 +-
- dlls/user32/tests/msg.c  | 27 +++++++++++++++++++++++++++
- 5 files changed, 31 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
-index 890c18e..3251682 100644
--- a/dlls/comctl32/toolbar.c
-+++ b/dlls/comctl32/toolbar.c
-@@ -6807,6 +6807,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
- 	    return TOOLBAR_MouseLeave (infoPtr);
- 
- 	case WM_CAPTURECHANGED:
-+            if (lParam == (LPARAM)hwnd) return 0;
- 	    return TOOLBAR_CaptureChanged(infoPtr);
- 
- 	case WM_NCACTIVATE:
-diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
-index 6d092a3..4d19a70 100644
--- a/dlls/comctl32/trackbar.c
-+++ b/dlls/comctl32/trackbar.c
-@@ -1976,6 +1976,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
- 
- 
-     case WM_CAPTURECHANGED:
-+        if (lParam == (LPARAM)hwnd) return 0;
-         return TRACKBAR_CaptureChanged (infoPtr);
- 
-     case WM_CREATE:
-diff --git a/dlls/user32/button.c b/dlls/user32/button.c
-index 890d154..2fee3c8 100644
--- a/dlls/user32/button.c
-+++ b/dlls/user32/button.c
-@@ -364,6 +364,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
- 
-     case WM_CAPTURECHANGED:
-         TRACE("WM_CAPTURECHANGED %p\n", hWnd);
-+        if (lParam == (LPARAM)hWnd) break;
-         state = get_button_state( hWnd );
-         if (state & BUTTON_BTNPRESSED)
-         {
-diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 40e35a9..63fae67 100644
--- a/dlls/user32/input.c
-+++ b/dlls/user32/input.c
-@@ -108,7 +108,7 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret )
-     {
-         USER_Driver->pSetCapture( hwnd, gui_flags );
- 
-        if (previous && previous != hwnd)
-+        if (previous)
-             SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd );
- 
-         if (prev_ret) *prev_ret = previous;
-diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index b90f8d0..151b77a 100644
--- a/dlls/user32/tests/msg.c
-+++ b/dlls/user32/tests/msg.c
-@@ -14906,6 +14906,32 @@ else
-     flush_sequence();
- }
- 
-+static const struct message DoubleSetCaptureSeq[] =
-+{
-+    { WM_CAPTURECHANGED, sent },
-+    { 0 }
-+};
-+
-+static void test_DoubleSetCapture(void)
-+{
-+    HWND hwnd;
-+
-+    hwnd = CreateWindowExA(0, "TestWindowClass", "Test DoubleSetCapture",
-+                           WS_OVERLAPPEDWINDOW | WS_VISIBLE,
-+                           100, 100, 200, 200, 0, 0, 0, NULL);
-+    ok(hwnd != 0, "Failed to create overlapped window\n");
-+
-+    ShowWindow( hwnd, SW_SHOW );
-+    flush_sequence();
-+
-+    SetCapture(hwnd);
-+    ok_sequence(WmEmptySeq, "SetCapture(hwnd) empty sequence", FALSE);
-+    SetCapture(hwnd);
-+    ok_sequence(DoubleSetCaptureSeq, "SetCapture(hwnd) twice", FALSE);
-+
-+    DestroyWindow(hwnd);
-+}
-+
- static void init_funcs(void)
- {
-     HMODULE hKernel32 = GetModuleHandleA("kernel32.dll");
-@@ -15045,6 +15071,7 @@ START_TEST(msg)
-     test_layered_window();
-     test_TrackPopupMenu();
-     test_TrackPopupMenuEmpty();
-+    test_DoubleSetCapture();
-     /* keep it the last test, under Windows it tends to break the tests
-      * which rely on active/foreground windows being correct.
-      */
-- 
-2.6.2
-
--- a/patches/user32-WM_CAPTURECHANGE/definition
+++ b/patches/user32-WM_CAPTURECHANGE/definition
@@ -1 +0,0 @@
-Fixes: [13683] Also send WM_CAPTURECHANGE when capture has not changed
--- a/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch
+++ b/patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch
@@ -1,4 +1,4 @@
-From 53a49004741dbe3d7cf1b9e79ed0a5b021bef51a Mon Sep 17 00:00:00 2001
+From 8b80b7ecfb4c4b90e72cbdfaac6df17f2a972c21 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 6 Jun 2015 06:53:34 +0200
 Subject: wined3d: Use real values for memory accounting on NVIDIA cards.
@@ -10,10 +10,10 @@ Subject: wined3d: Use real values for memory accounting on NVIDIA cards.
 3 files changed, 38 insertions(+), 2 deletions(-)

 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index c746d18..f33b313 100644
+index 7753e76..64e9def 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -1181,8 +1181,31 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
+@@ -1215,8 +1215,31 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
 
 UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device)
 {
@@ -46,10 +46,10 @@ index c746d18..f33b313 100644
             wine_dbgstr_longlong(device->adapter->vram_bytes),
             wine_dbgstr_longlong(device->adapter->vram_bytes_used),
 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
-index ce23c47..af7a63b 100644
+index eb414cc..da0ba0a 100644
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
-@@ -220,6 +220,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
+@@ -221,6 +221,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
     {"GL_NV_vertex_program2",               NV_VERTEX_PROGRAM2            },
     {"GL_NV_vertex_program2_option",        NV_VERTEX_PROGRAM2_OPTION     },
     {"GL_NV_vertex_program3",               NV_VERTEX_PROGRAM3            },
@@ -57,7 +57,7 @@ index ce23c47..af7a63b 100644
 
     /* SGI */
     {"GL_SGIS_generate_mipmap",             SGIS_GENERATE_MIPMAP          },
-@@ -1395,7 +1396,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
+@@ -1397,7 +1398,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
     return NULL;
 }
 
@@ -67,8 +67,8 @@ index ce23c47..af7a63b 100644
         enum wined3d_pci_vendor vendor, enum wined3d_pci_device device)
 {
     OSVERSIONINFOW os_version;
-@@ -1504,6 +1506,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
-         driver = DRIVER_UNKNOWN;
+@@ -1517,6 +1519,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
+         driver_info->vram_bytes = LONG_MAX;
     }
 
 +    if (gl_info->supported[NVX_GPU_MEMORY_INFO])
@@ -84,7 +84,7 @@ index ce23c47..af7a63b 100644
     if (wined3d_settings.emulated_textureram)
     {
         TRACE("Overriding amount of video memory with 0x%s bytes.\n",
-@@ -3804,7 +3816,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
+@@ -3838,7 +3850,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
     }
 
     fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device);
@@ -94,10 +94,10 @@ index ce23c47..af7a63b 100644
             | adapter->fragment_pipe->get_emul_mask(gl_info);
     if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE)
 diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
-index 8c07ed1..3007516 100644
+index 437f62f..bbfddb2 100644
 --- a/dlls/wined3d/wined3d_gl.h
 +++ b/dlls/wined3d/wined3d_gl.h
-@@ -153,6 +153,7 @@ enum wined3d_gl_extension
+@@ -154,6 +154,7 @@ enum wined3d_gl_extension
     NV_VERTEX_PROGRAM2,
     NV_VERTEX_PROGRAM2_OPTION,
     NV_VERTEX_PROGRAM3,
@@ -106,5 +106,5 @@ index 8c07ed1..3007516 100644
     SGIS_GENERATE_MIPMAP,
     /* WGL extensions */
 -- 
-2.4.5
+2.7.1

--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Fixes: [37556] CompareString should abort on first non-matching character`
				`@@ -1 +0,0 @@`
				`Fixes: CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE`
				`@@ -1 +0,0 @@`
				`Fixes: [13683] Also send WM_CAPTURECHANGE when capture has not changed`