Release 1.8.4.

(cherry picked from commit e875860886)

README.md

@@ -66,7 +66,8 @@ Configuration:
 
 Backends:
   --backend=patch      Use regular 'patch' utility to apply patches (default)
-  --backend=epatch     Use 'epatch' to apply patches (Gentoo only)
+  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
   --backend=git-am     Use 'git am' to apply patches
   --backend=git-apply  Use 'git apply' to apply patches
   --backend=stg        Import the patches using stacked git

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
 

patches/amstream-GetMultiMediaStream/0001-amstream-Implement-IAMMediaStream-GetMultiMediaStrea.patch

@@ -1,14 +1,14 @@
-From 4d0e6bbc00bd49b8dcfce494bd7380c49f58f92b Mon Sep 17 00:00:00 2001
+From 4bec6ad3640799a4b8bdb1d1987d8e65e15c0355 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 28 Jul 2015 18:21:20 +0200
 Subject: amstream: Implement IAMMediaStream::GetMultiMediaStream.
 
 ---
- dlls/amstream/mediastream.c | 40 ++++++++++++++++++++++++++++++++--------
- 1 file changed, 32 insertions(+), 8 deletions(-)
+ dlls/amstream/mediastream.c | 30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
-index 947be1e..e4e15d7 100644
+index 51349ab..98fca62 100644
 --- a/dlls/amstream/mediastream.c
 +++ b/dlls/amstream/mediastream.c
 @@ -110,9 +110,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetMultiMediaStre
@@ -29,25 +29,7 @@ index 947be1e..e4e15d7 100644
  }
  
  static HRESULT WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
-@@ -271,9 +277,15 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetMultiM
- {
-     DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface);
- 
--    FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
-+    TRACE("(%p/%p)->(%p) stub!\n", This, iface, ppMultiMediaStream);
- 
--    return S_FALSE;
-+    if (!ppMultiMediaStream)
-+        return E_POINTER;
-+
-+    IMultiMediaStream_AddRef(This->parent);
-+    *ppMultiMediaStream = This->parent;
-+
-+    return S_OK;
- }
- 
- static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface,
-@@ -511,9 +523,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
+@@ -517,9 +523,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetMultiMediaStream(IA
  {
      AudioMediaStreamImpl *This = impl_from_AudioMediaStream_IAMMediaStream(iface);
  
@@ -65,7 +47,7 @@ index 947be1e..e4e15d7 100644
  }
  
  static HRESULT WINAPI AudioMediaStreamImpl_IAMMediaStream_GetInformation(IAMMediaStream *iface,
-@@ -672,9 +690,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
+@@ -678,9 +690,15 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetMultiMediaStream
  {
      AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface);
  
@@ -84,5 +66,5 @@ index 947be1e..e4e15d7 100644
  
  static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_GetInformation(IAudioMediaStream *iface,
 -- 
-2.4.5
+2.9.0
 

patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch

@@ -1,46 +0,0 @@
-From fe4c1e1f10f8edc76c5dad994ed2e5202f9c2821 Mon Sep 17 00:00:00 2001
-From: Martin Storsjo <martin@martin.st>
-Date: Mon, 3 Aug 2015 22:26:01 +0300
-Subject: ucrtbase: Hook up some functions with new names to existing
- implementations
-
-These are some functions that on a first glance seem to have a
-matching signature even though the name has changed.
----
- dlls/ucrtbase/ucrtbase.spec | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
-index bb56408..cee094d 100644
---- a/dlls/ucrtbase/ucrtbase.spec
-+++ b/dlls/ucrtbase/ucrtbase.spec
-@@ -211,7 +211,7 @@
- @ cdecl _c_exit() MSVCRT__c_exit
- @ cdecl _cabs(long) MSVCRT__cabs
- @ cdecl _callnewh(long)
--@ stub _calloc_base
-+@ cdecl _calloc_base(long long) MSVCRT_calloc
- @ cdecl _cexit() MSVCRT__cexit
- @ cdecl _cgets(ptr)
- @ stub _cgets_s
-@@ -333,7 +333,7 @@
- @ cdecl _fputwchar(long) MSVCRT__fputwchar
- @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
- @ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
--@ stub _free_base
-+@ cdecl _free_base(ptr) MSVCRT_free
- @ cdecl _free_locale(ptr) MSVCRT__free_locale
- @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
- @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@@ -580,7 +580,7 @@
- @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s
- @ cdecl _makepath(ptr str str str str) MSVCRT__makepath
- @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s
--@ stub _malloc_base
-+@ cdecl _malloc_base(long) MSVCRT_malloc
- @ cdecl _mbbtombc(long)
- @ stub _mbbtombc_l
- @ cdecl _mbbtype(long long)
--- 
-2.5.0
-

patches/api-ms-win-crt-Stub_DLLs/definition

@@ -1 +0,0 @@
-Fixes: Add stub dlls required for MSVC 2015 runtime library (Windows 10)

patches/dinput-DIPROP_USERNAME/0001-dinput-Implement-device-property-DIPROP_USERNAME.patch

@@ -1,177 +0,0 @@
-From 4eb926239cec9c6dfa489056bb30d698039926a1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu@vr-web.de>
-Date: Tue, 24 Nov 2015 21:13:50 +0100
-Subject: dinput: Implement device property DIPROP_USERNAME.
-
-https://bugs.winehq.org/show_bug.cgi?id=39667
-
-Probably same issue as in https://bugs.winehq.org/show_bug.cgi?id=12432 .
-(Attached backtrace seems equal.)
-
-Steps to reproduce:
-- start launcher
-- "Configure Controller"
-- leave dialog with "Cancel"
-- crash
-
-MotoGP 3 demo launcher uses ConfigureDevices for the key mapping.
-This seems because the result of a GetProperty(DIPROP_USERNAME) is used
-without checking.
----
- dlls/dinput/device.c         | 39 +++++++++++++++++++++++++++++++++++++++
- dlls/dinput/device_private.h |  1 +
- dlls/dinput8/tests/device.c  | 29 +++++++++++++++++++++++++++--
- 3 files changed, 67 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index e525f01..41fb2c4 100644
---- a/dlls/dinput/device.c
-+++ b/dlls/dinput/device.c
-@@ -778,11 +778,13 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf,
- 
- HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, LPCDIDATAFORMAT df)
- {
-+    static const WCHAR emptyW[] = { 0 };
-     IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
-     DIDATAFORMAT data_format;
-     DIOBJECTDATAFORMAT *obj_df = NULL;
-     DIPROPDWORD dp;
-     DIPROPRANGE dpr;
-+    DIPROPSTRING dps;
-     WCHAR username[MAX_PATH];
-     DWORD username_size = MAX_PATH;
-     int i, action = 0, num_actions = 0;
-@@ -863,6 +865,13 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
-     else
-         lstrcpynW(username, lpszUserName, MAX_PATH);
- 
-+    dps.diph.dwSize = sizeof(dps);
-+    dps.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-+    dps.diph.dwObj = 0;
-+    dps.diph.dwHow = DIPH_DEVICE;
-+    lstrcpynW(dps.wsz, (dwFlags & DIDSAM_NOUSER) ? emptyW : username, sizeof(dps.wsz)/sizeof(WCHAR));
-+    IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph);
-+
-     /* Save the settings to disk */
-     save_mapping_settings(iface, lpdiaf, username);
- 
-@@ -1100,6 +1109,9 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface)
-     /* Free action mapping */
-     HeapFree(GetProcessHeap(), 0, This->action_map);
- 
-+    /* Free username */
-+    HeapFree(GetProcessHeap(), 0, This->username);
-+
-     EnterCriticalSection( &This->dinput->crit );
-     list_remove( &This->entry );
-     LeaveCriticalSection( &This->dinput->crit );
-@@ -1251,6 +1263,17 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface,
-             TRACE("buffersize = %d\n", pd->dwData);
-             break;
-         }
-+        case (DWORD_PTR) DIPROP_USERNAME:
-+        {
-+            LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph;
-+
-+            if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM;
-+
-+            ps->wsz[0] = 0;
-+            if (This->username)
-+                lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR));
-+            break;
-+        }
-         case (DWORD_PTR) DIPROP_VIDPID:
-             FIXME("DIPROP_VIDPID not implemented\n");
-             return DIERR_UNSUPPORTED;
-@@ -1324,6 +1347,22 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty(
-             LeaveCriticalSection(&This->crit);
-             break;
-         }
-+        case (DWORD_PTR) DIPROP_USERNAME:
-+        {
-+            LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph;
-+
-+            if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM;
-+
-+            if (!This->username)
-+                This->username = HeapAlloc(GetProcessHeap(), 0, sizeof(ps->wsz));
-+            if (!This->username)
-+                return DIERR_OUTOFMEMORY;
-+
-+            This->username[0] = 0;
-+            if (ps->wsz)
-+                lstrcpynW(This->username, ps->wsz, sizeof(ps->wsz)/sizeof(WCHAR));
-+            break;
-+        }
-         default:
-             WARN("Unknown property %s\n", debugstr_guid(rguid));
-             return DIERR_UNSUPPORTED;
-diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
-index 52bbec4..44fa46a 100644
---- a/dlls/dinput/device_private.h
-+++ b/dlls/dinput/device_private.h
-@@ -81,6 +81,7 @@ struct IDirectInputDeviceImpl
-     /* Action mapping */
-     int                         num_actions; /* number of actions mapped */
-     ActionMap                  *action_map;  /* array of mappings */
-+    WCHAR                      *username;    /* set by 'SetActionMap' */
- };
- 
- extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN;
-diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
-index 6495559..b5e27ad 100644
---- a/dlls/dinput8/tests/device.c
-+++ b/dlls/dinput8/tests/device.c
-@@ -223,8 +223,8 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec
-     dps.wsz[0] = '\0';
- 
-     hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_USERNAME, &dps.diph);
--    todo_wine ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
--    todo_wine ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1));
-+    ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
-+    ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1));
- 
-     /* Test buffer size */
-     memset(&dp, 0, sizeof(dp));
-@@ -275,6 +275,7 @@ static void test_action_mapping(void)
-     HINSTANCE hinst = GetModuleHandleA(NULL);
-     IDirectInput8A *pDI = NULL;
-     DIACTIONFORMATA af;
-+    DIPROPSTRING dps;
-     struct enum_data data =  {pDI, &af, NULL, NULL, NULL, 0};
-     HWND hwnd;
- 
-@@ -342,6 +343,30 @@ static void test_action_mapping(void)
- 
-         af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]);
-         af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]);
-+
-+        /* test DIDSAM_NOUSER */
-+        dps.diph.dwSize = sizeof(dps);
-+        dps.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-+        dps.diph.dwObj = 0;
-+        dps.diph.dwHow = DIPH_DEVICE;
-+        dps.wsz[0] = '\0';
-+
-+        hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph);
-+        ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
-+        ok (dps.wsz[0] != 0, "Expected any username, got=%s\n", wine_dbgstr_wn(dps.wsz, -1));
-+
-+        hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, DIDSAM_NOUSER);
-+        ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr);
-+
-+        dps.diph.dwSize = sizeof(dps);
-+        dps.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-+        dps.diph.dwObj = 0;
-+        dps.diph.dwHow = DIPH_DEVICE;
-+        dps.wsz[0] = '\0';
-+
-+        hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph);
-+        ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr);
-+        ok (dps.wsz[0] == 0, "Expected empty username, got=%s\n", wine_dbgstr_wn(dps.wsz, -1));
-     }
- 
-     if (data.mouse != NULL)
--- 
-2.6.2
-

patches/dinput-DIPROP_USERNAME/definition

@@ -1 +0,0 @@
-Fixes: [39667] Implement dinput device property DIPROP_USERNAME

patches/hal-KeQueryPerformanceCounter/0001-hal-Implement-KeQueryPerformanceCounter.patch

@@ -1,4 +1,4 @@
-From 6ae55e62a81e4f4ded0ea14926f014b6d6a4b633 Mon Sep 17 00:00:00 2001
+From 3c0f4068c5e5319560525b157e704dccf0e6353e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 Oct 2015 22:36:01 +0100
 Subject: hal: Implement KeQueryPerformanceCounter.
@@ -9,12 +9,12 @@ Subject: hal: Implement KeQueryPerformanceCounter.
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c
-index 96bc895..145869d 100644
+index 0b2e422..be3a48b 100644
 --- a/dlls/hal/hal.c
 +++ b/dlls/hal/hal.c
-@@ -155,3 +155,13 @@ KIRQL WINAPI KeGetCurrentIrql(VOID)
-     FIXME( " stub!\n");
-     return 0;
+@@ -172,3 +172,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value)
+ {
+     FIXME("(%p %d) stub!\n", port, value);
  }
 +
 +ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency)
@@ -27,7 +27,7 @@ index 96bc895..145869d 100644
 +    return counter.QuadPart;
 +}
 diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec
-index 3046c65..dc908dd 100644
+index c21806c..243c67b 100644
 --- a/dlls/hal/hal.spec
 +++ b/dlls/hal/hal.spec
 @@ -72,7 +72,7 @@
@@ -40,5 +40,5 @@ index 3046c65..dc908dd 100644
  @ stub KeRaiseIrqlToDpcLevel
  @ stub KeRaiseIrqlToSynchLevel
 -- 
-2.6.2
+2.9.0
 

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
-

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
-

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
-

patches/kernel32-CompareString_Length/definition

@@ -1 +0,0 @@
-Fixes: [37556] CompareString should abort on first non-matching character

patches/kernel32-FreeUserPhysicalPages/0001-kernel32-add-FreeUserPhysicalPages-stub-try-2.patch

@@ -1,53 +0,0 @@
-From 0aab8389ccbaf7c89a37112faef790ef45b0b15f Mon Sep 17 00:00:00 2001
-From: Austin English <austinenglish@gmail.com>
-Date: Tue, 3 Nov 2015 11:03:54 -0600
-Subject: kernel32: add FreeUserPhysicalPages stub (try 2)
-
-For https://bugs.winehq.org/show_bug.cgi?id=39543
-
-Signed-off-by: Austin English <austinenglish@gmail.com>
----
- dlls/kernel32/heap.c        | 7 +++++++
- dlls/kernel32/kernel32.spec | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
-index 0c05de6..e86b292 100644
---- a/dlls/kernel32/heap.c
-+++ b/dlls/kernel32/heap.c
-@@ -1490,3 +1490,10 @@ BOOL WINAPI AllocateUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PT
-     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-     return FALSE;
- }
-+
-+BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *userarray)
-+{
-+    FIXME("stub: %p %p %p\n", process, pages, userarray);
-+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-+    return FALSE;
-+}
-diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index ff67e54..d4e1d01 100644
---- a/dlls/kernel32/kernel32.spec
-+++ b/dlls/kernel32/kernel32.spec
-@@ -154,7 +154,7 @@
- @ stdcall AllocConsole()
- @ stub -i386 AllocLSCallback
- @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback
--@ stdcall AllocateUserPhysicalPages(ptr ptr ptr)
-+@ stdcall AllocateUserPhysicalPages(long ptr ptr)
- @ stdcall ApplicationRecoveryFinished(long)
- @ stdcall ApplicationRecoveryInProgress(ptr)
- @ stdcall AreFileApisANSI()
-@@ -535,7 +535,7 @@
- @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion
- @ stdcall FreeResource(long)
- @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback
--@ stub FreeUserPhysicalPages
-+@ stdcall FreeUserPhysicalPages(long ptr ptr)
- @ stub FreeVirtualBuffer
- @ stdcall GenerateConsoleCtrlEvent(long long)
- @ stdcall -i386 -private Get16DLLAddress(long str) krnl386.exe16.Get16DLLAddress
--- 
-2.6.2
-

patches/kernel32-FreeUserPhysicalPages/definition

@@ -1 +0,0 @@
-Fixes: [39543] Add stub kernel32.FreeUserPhysicalPages

patches/kernel32-GetFinalPathNameByHandle/0001-kernel32-Implement-GetFinalPathNameByHandle.patch

@@ -1,251 +0,0 @@
-From afd33fadd45f1073ac0b8734d7003ba46b5d1269 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 12 Aug 2014 20:24:14 +0200
-Subject: kernel32: Implement GetFinalPathNameByHandle.
-
----
- .../api-ms-win-core-file-l1-1-0.spec               |   4 +-
- .../api-ms-win-core-file-l1-2-0.spec               |   4 +-
- dlls/kernel32/file.c                               | 182 +++++++++++++++++++++
- dlls/kernel32/kernel32.spec                        |   4 +-
- 4 files changed, 188 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec
-index 9e5b809..61e8038 100644
---- a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec
-@@ -39,8 +39,8 @@
- @ stdcall GetFileSizeEx(long ptr) kernel32.GetFileSizeEx
- @ stdcall GetFileTime(long ptr ptr ptr) kernel32.GetFileTime
- @ stdcall GetFileType(long) kernel32.GetFileType
--@ stub GetFinalPathNameByHandleA
--@ stub GetFinalPathNameByHandleW
-+@ stdcall GetFinalPathNameByHandleA(long ptr long long) kernel32.GetFinalPathNameByHandleA
-+@ stdcall GetFinalPathNameByHandleW(long ptr long long) kernel32.GetFinalPathNameByHandleW
- @ stdcall GetFullPathNameA(str long ptr ptr) kernel32.GetFullPathNameA
- @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW
- @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW
-diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec
-index ebfd52e..cddf112 100644
---- a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec
-+++ b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec
-@@ -39,8 +39,8 @@
- @ stdcall GetFileSizeEx(long ptr) kernel32.GetFileSizeEx
- @ stdcall GetFileTime(long ptr ptr ptr) kernel32.GetFileTime
- @ stdcall GetFileType(long) kernel32.GetFileType
--@ stub GetFinalPathNameByHandleA
--@ stub GetFinalPathNameByHandleW
-+@ stdcall GetFinalPathNameByHandleA(long ptr long long) kernel32.GetFinalPathNameByHandleA
-+@ stdcall GetFinalPathNameByHandleW(long ptr long long) kernel32.GetFinalPathNameByHandleW
- @ stdcall GetFullPathNameA(str long ptr ptr) kernel32.GetFullPathNameA
- @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW
- @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW
-diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
-index 006db1c..b3cc8c3 100644
---- a/dlls/kernel32/file.c
-+++ b/dlls/kernel32/file.c
-@@ -2829,3 +2829,185 @@ DWORD WINAPI K32GetDeviceDriverFileNameW(void *image_base, LPWSTR file_name, DWO
- 
-     return 0;
- }
-+
-+/***********************************************************************
-+ *           GetFinalPathNameByHandleW (KERNEL32.@)
-+ */
-+DWORD WINAPI GetFinalPathNameByHandleW(HANDLE file, LPWSTR path, DWORD charcount, DWORD flags)
-+{
-+    WCHAR buffer[sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH + 1];
-+    OBJECT_NAME_INFORMATION *info = (OBJECT_NAME_INFORMATION*)&buffer;
-+    WCHAR drive_part[MAX_PATH];
-+    DWORD drive_part_len;
-+    NTSTATUS status;
-+    DWORD result = 0;
-+    ULONG dummy;
-+    WCHAR *ptr;
-+
-+    TRACE( "(%p,%p,%d,%x)\n", file, path, charcount, flags );
-+
-+    /* check for invalid arguments */
-+    if (!path)
-+    {
-+        SetLastError( ERROR_INVALID_PARAMETER );
-+        return 0;
-+    }
-+    else if (file == INVALID_HANDLE_VALUE)
-+    {
-+        SetLastError( ERROR_INVALID_HANDLE );
-+        return 0;
-+    }
-+    else if (flags & ~(FILE_NAME_OPENED | VOLUME_NAME_GUID | VOLUME_NAME_NONE | VOLUME_NAME_NT))
-+    {
-+        WARN("Invalid or unsupported flags: %x\n", flags);
-+        SetLastError( ERROR_INVALID_PARAMETER );
-+        return 0;
-+    }
-+
-+    /* get object name */
-+    status = NtQueryObject( file, ObjectNameInformation, &buffer, sizeof(buffer) - sizeof(WCHAR), &dummy );
-+    if (status != STATUS_SUCCESS)
-+    {
-+        SetLastError( RtlNtStatusToDosError( status ) );
-+        return 0;
-+    }
-+    else if (info->Name.Length < 4 * sizeof(WCHAR) || info->Name.Buffer[0] != '\\' ||
-+             info->Name.Buffer[1] != '?' || info->Name.Buffer[2] != '?' || info->Name.Buffer[3] != '\\' )
-+    {
-+        FIXME("Unexpected object name: %s\n", debugstr_wn(info->Name.Buffer, info->Name.Length / sizeof(WCHAR)));
-+        SetLastError( ERROR_GEN_FAILURE );
-+        return 0;
-+    }
-+
-+    /* add terminating null character, remove "\\??\\" */
-+    info->Name.Buffer[info->Name.Length / sizeof(WCHAR)] = 0;
-+    info->Name.Length -= 4 * sizeof(WCHAR);
-+    info->Name.Buffer += 4;
-+
-+    /* FILE_NAME_OPENED is not supported yet, and would require Wineserver changes */
-+    if (flags & FILE_NAME_OPENED)
-+    {
-+        FIXME("FILE_NAME_OPENED not supported\n");
-+        flags &= ~FILE_NAME_OPENED;
-+    }
-+
-+    /* Get information required for VOLUME_NAME_NONE, VOLUME_NAME_GUID and VOLUME_NAME_NT */
-+    if (flags == VOLUME_NAME_NONE || flags == VOLUME_NAME_GUID || flags == VOLUME_NAME_NT)
-+    {
-+        if (!GetVolumePathNameW( info->Name.Buffer, drive_part, MAX_PATH ))
-+            return 0;
-+
-+        drive_part_len = strlenW(drive_part);
-+        if (!drive_part_len || drive_part_len > strlenW(info->Name.Buffer) ||
-+                drive_part[drive_part_len-1] != '\\' ||
-+                strncmpiW( info->Name.Buffer, drive_part, drive_part_len ))
-+        {
-+            FIXME("Path %s returned by GetVolumePathNameW does not match file path %s\n",
-+                debugstr_w(drive_part), debugstr_w(info->Name.Buffer));
-+            SetLastError( ERROR_GEN_FAILURE );
-+            return 0;
-+        }
-+    }
-+
-+    if (flags == VOLUME_NAME_NONE)
-+    {
-+        ptr    = info->Name.Buffer + drive_part_len - 1;
-+        result = strlenW(ptr);
-+        if (result < charcount)
-+            memcpy(path, ptr, (result + 1) * sizeof(WCHAR));
-+        else result++;
-+    }
-+    else if (flags == VOLUME_NAME_GUID)
-+    {
-+        WCHAR volume_prefix[51];
-+
-+        /* GetVolumeNameForVolumeMountPointW sets error code on failure */
-+        if (!GetVolumeNameForVolumeMountPointW( drive_part, volume_prefix, 50 ))
-+            return 0;
-+
-+        ptr    = info->Name.Buffer + drive_part_len;
-+        result = strlenW(volume_prefix) + strlenW(ptr);
-+        if (result < charcount)
-+        {
-+            path[0] = 0;
-+            strcatW(path, volume_prefix);
-+            strcatW(path, ptr);
-+        }
-+        else result++;
-+    }
-+    else if (flags == VOLUME_NAME_NT)
-+    {
-+        WCHAR nt_prefix[MAX_PATH];
-+
-+        /* QueryDosDeviceW sets error code on failure */
-+        drive_part[drive_part_len - 1] = 0;
-+        if (!QueryDosDeviceW( drive_part, nt_prefix, MAX_PATH ))
-+            return 0;
-+
-+        ptr    = info->Name.Buffer + drive_part_len - 1;
-+        result = strlenW(nt_prefix) + strlenW(ptr);
-+        if (result < charcount)
-+        {
-+            path[0] = 0;
-+            strcatW(path, nt_prefix);
-+            strcatW(path, ptr);
-+        }
-+        else result++;
-+    }
-+    else if (flags == VOLUME_NAME_DOS)
-+    {
-+        static const WCHAR dos_prefix[] = {'\\','\\','?','\\', '\0'};
-+
-+        result = strlenW(dos_prefix) + strlenW(info->Name.Buffer);
-+        if (result < charcount)
-+        {
-+            path[0] = 0;
-+            strcatW(path, dos_prefix);
-+            strcatW(path, info->Name.Buffer);
-+        }
-+        else result++;
-+    }
-+    else
-+    {
-+        /* Windows crashes here, but we prefer returning ERROR_INVALID_PARAMETER */
-+        WARN("Invalid combination of flags: %x\n", flags);
-+        SetLastError( ERROR_INVALID_PARAMETER );
-+    }
-+
-+    return result;
-+}
-+
-+/***********************************************************************
-+ *           GetFinalPathNameByHandleA (KERNEL32.@)
-+ */
-+DWORD WINAPI GetFinalPathNameByHandleA(HANDLE file, LPSTR path, DWORD charcount, DWORD flags)
-+{
-+    WCHAR *str;
-+    DWORD result;
-+
-+    TRACE( "(%p,%p,%d,%x)\n", file, path, charcount, flags );
-+
-+    if (!path || !charcount)
-+        return GetFinalPathNameByHandleW(file, (LPWSTR)path, charcount, flags);
-+
-+    str = HeapAlloc( GetProcessHeap(), 0, charcount * sizeof(WCHAR) );
-+    if (!str)
-+    {
-+        SetLastError( ERROR_NOT_ENOUGH_MEMORY );
-+        return 0;
-+    }
-+
-+    result = GetFinalPathNameByHandleW(file, (LPWSTR)str, charcount, flags);
-+    if (result)
-+    {
-+        if (result < charcount)
-+        {
-+            result = FILE_name_WtoA( str, result, path, charcount - 1 );
-+            path[result] = 0;
-+        }
-+        else result--; /* Why does Windows do this? */
-+    }
-+
-+    HeapFree( GetProcessHeap(), 0, str );
-+    return result;
-+}
-\ No newline at end of file
-diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index bb72041..b7bead0 100644
---- a/dlls/kernel32/kernel32.spec
-+++ b/dlls/kernel32/kernel32.spec
-@@ -682,8 +682,8 @@
- @ stdcall GetFileSizeEx(long ptr)
- @ stdcall GetFileTime(long ptr ptr ptr)
- @ stdcall GetFileType(long)
--# @ stub GetFinalPathNameByHandleA
--# @ stub GetFinalPathNameByHandleW
-+@ stdcall GetFinalPathNameByHandleA(long ptr long long)
-+@ stdcall GetFinalPathNameByHandleW(long ptr long long)
- @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long)
- @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long)
- @ stdcall GetFullPathNameA(str long ptr ptr)
--- 
-2.4.0
-

patches/kernel32-GetFinalPathNameByHandle/definition

@@ -1 +0,0 @@
-Fixes: [34851] Support for GetFinalPathNameByHandle

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
-

patches/kernel32-GetLogicalProcessorInformationEx/definition

@@ -1 +0,0 @@
-Fixes: CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE

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
 

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