Release 1.8.5.

[kernel32-CompareStringEx]
Removed patch to silence repeated CompareStringEx FIXME (fixed upstream).

[kernel32-QT_Environment_Variables]
Removed patch to avoid inheriting QT_* environment variables (accepted upstream).

[services-SERVICE_FILE_SYSTEM_DRIVER]
Removed patch to start SERVICE_FILE_SYSTEM_DRIVER services with winedevice
(accepted upstream).

[winspool.drv-SetPrinterW]
Removed patch to handle case 8 in SetPrinterW (fixed upstream).

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/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-CompareStringEx/0001-kernel32-Silence-repeated-CompareStringEx-FIXME.patch

@@ -1,50 +0,0 @@
-From 33fa174b6404cfea673d510457d21d784a23efbd Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 4 May 2014 00:18:11 +0200
-Subject: kernel32: Silence repeated CompareStringEx FIXME.
-
----
- dlls/kernel32/locale.c |   14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
-index eca0e39..55ef3d6 100644
---- a/dlls/kernel32/locale.c
-+++ b/dlls/kernel32/locale.c
-@@ -2985,9 +2985,10 @@ INT WINAPI CompareStringW(LCID lcid, DWORD flags,
- INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1,
-                            LPCWSTR str2, INT len2, LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lParam)
- {
--    DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT
--                           |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP;
--    DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
-+    static const DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT
-+                                        |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP
-+                                        |NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
-+    static DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
-     /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */
-     INT ret;
- 
-@@ -3001,14 +3002,17 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1,
-         return 0;
-     }
- 
--    if (flags & ~(supported_flags|semistub_flags))
-+    if (flags & ~supported_flags)
-     {
-         SetLastError(ERROR_INVALID_FLAGS);
-         return 0;
-     }
- 
-     if (flags & semistub_flags)
--        FIXME("semi-stub behavor for flag(s) 0x%x\n", flags & semistub_flags);
-+    {
-+        FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags);
-+        semistub_flags &= ~flags;
-+    }
- 
-     if (len1 < 0) len1 = strlenW(str1);
-     if (len2 < 0) len2 = strlenW(str2);
--- 
-1.7.9.5
-

patches/kernel32-CompareStringEx/definition

@@ -1 +0,0 @@
-Category: stable

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-QT_Environment_Variables/0001-kernel32-Do-not-inherit-QT_-environment-variables-to.patch

@@ -1,29 +0,0 @@
-From c62a9b8f39fcdd2209959e831e3801162b41420c Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 27 Jan 2016 06:56:09 +0100
-Subject: kernel32: Do not inherit QT_* environment variables to Windows
- environment.
-
-If necessary, QT environment variables can still be set by adding a WINE
-prefix, for example: WINEQT_QPA_PLATFORM=...
----
- dlls/kernel32/process.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 6e7b23e..bb6c2dd 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -135,7 +135,8 @@ static inline BOOL is_special_env_var( const char *var )
-             !strncmp( var, "PWD=", sizeof("PWD=")-1 ) ||
-             !strncmp( var, "HOME=", sizeof("HOME=")-1 ) ||
-             !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) ||
--            !strncmp( var, "TMP=", sizeof("TMP=")-1 ));
-+            !strncmp( var, "TMP=", sizeof("TMP=")-1 ) ||
-+            !strncmp( var, "QT_", sizeof("QT_")-1 ));
- }
- 
- 
--- 
-2.6.4
-

patches/kernel32-QT_Environment_Variables/definition

@@ -1 +0,0 @@
-Fixes: Do not inherit QT_* environment variables to Windows environment

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

@@ -1,4 +1,4 @@
-From 9a4f8fae5a735a8ceeec6136b548420abb69f336 Mon Sep 17 00:00:00 2001
+From f97150c35f617561b99e71f3b7568170f72890a6 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
 Date: Mon, 28 Jul 2003 07:39:25 -0500
 Subject: libs: Fix most problems with CompareString.
@@ -9,10 +9,10 @@ Subject: libs: Fix most problems with CompareString.
  2 files changed, 34 insertions(+), 35 deletions(-)
 
 diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
-index 7b0212e..cba3ebc 100644
+index 3054c50..d12378d 100644
 --- a/dlls/kernel32/tests/locale.c
 +++ b/dlls/kernel32/tests/locale.c
-@@ -1759,13 +1759,13 @@ static void test_CompareStringA(void)
+@@ -1763,13 +1763,13 @@ static void test_CompareStringA(void)
      todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n");
  
      ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
@@ -29,10 +29,10 @@ index 7b0212e..cba3ebc 100644
  
      lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
  
-@@ -4600,6 +4600,5 @@ START_TEST(locale)
-   test_GetGeoInfo();
-   test_EnumSystemGeoID();
+@@ -4851,6 +4851,5 @@ START_TEST(locale)
    test_invariant();
+   test_GetSystemPreferredUILanguages();
+   test_GetThreadPreferredUILanguages();
 -  /* this requires collation table patch to make it MS compatible */
 -  if (0) test_sorting();
 +  test_sorting();
@@ -168,5 +168,5 @@ index 465d740..f354a75 100644
      0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
      0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
 -- 
-2.6.2
+2.9.0
 

patches/ntdll-DllRedirects/0005-ntdll-Implement-loader-redirection-scheme.patch

@@ -1,4 +1,4 @@
-From a76e0d5f4e8211975ede9f1bf65522a31114112a Mon Sep 17 00:00:00 2001
+From 88b4c986267863958749232806fbd6ce40db9fdb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 13 Dec 2014 05:34:48 +0100
 Subject: ntdll: Implement loader redirection scheme.
@@ -8,10 +8,10 @@ Subject: ntdll: Implement loader redirection scheme.
  1 file changed, 44 insertions(+), 22 deletions(-)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 0486517..7877f04 100644
+index 243efab..9e54f82 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -85,6 +85,7 @@ struct builtin_load_info
+@@ -92,6 +92,7 @@ struct builtin_load_info
  {
      const WCHAR *load_path;
      const WCHAR *filename;
@@ -19,7 +19,7 @@ index 0486517..7877f04 100644
      NTSTATUS     status;
      WINE_MODREF *wm;
  };
-@@ -110,7 +111,8 @@ static WINE_MODREF *cached_modref;
+@@ -117,7 +118,8 @@ static WINE_MODREF *cached_modref;
  static WINE_MODREF *current_modref;
  static WINE_MODREF *last_failed_modref;
  
@@ -29,7 +29,7 @@ index 0486517..7877f04 100644
  static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved );
  static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports,
                                      DWORD exp_size, DWORD ordinal, LPCWSTR load_path );
-@@ -436,7 +438,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
+@@ -443,7 +445,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS
      if (!(wm = find_basename_module( mod_name )))
      {
          TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward );
@@ -38,7 +38,7 @@ index 0486517..7877f04 100644
              !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
          {
              if (process_attach( wm, NULL ) != STATUS_SUCCESS)
-@@ -585,7 +587,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d
+@@ -599,7 +601,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP
      {
          ascii_to_unicode( buffer, name, len );
          buffer[len] = 0;
@@ -47,8 +47,8 @@ index 0486517..7877f04 100644
      }
      else  /* need to allocate a larger buffer */
      {
-@@ -593,7 +595,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d
-         if (!ptr) return NULL;
+@@ -607,7 +609,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP
+         if (!ptr) return FALSE;
          ascii_to_unicode( ptr, name, len );
          ptr[len] = 0;
 -        status = load_dll( load_path, ptr, 0, &wmImp );
@@ -56,7 +56,7 @@ index 0486517..7877f04 100644
          RtlFreeHeap( GetProcessHeap(), 0, ptr );
      }
  
-@@ -909,7 +911,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path )
+@@ -927,7 +929,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path )
   * Allocate a WINE_MODREF structure and add it to the process list
   * The loader_section must be locked while calling this function.
   */
@@ -65,7 +65,7 @@ index 0486517..7877f04 100644
  {
      WINE_MODREF *wm;
      const WCHAR *p;
-@@ -932,7 +934,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename )
+@@ -950,7 +952,7 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename )
      wm->ldr.TimeDateStamp = 0;
      wm->ldr.ActivationContext = 0;
  
@@ -74,7 +74,7 @@ index 0486517..7877f04 100644
      if ((p = strrchrW( wm->ldr.FullDllName.Buffer, '\\' ))) p++;
      else p = wm->ldr.FullDllName.Buffer;
      RtlInitUnicodeString( &wm->ldr.BaseDllName, p );
-@@ -1549,7 +1551,7 @@ static void load_builtin_callback( void *module, const char *filename )
+@@ -1589,7 +1591,7 @@ static void load_builtin_callback( void *module, const char *filename )
          return;
      }
  
@@ -83,7 +83,7 @@ index 0486517..7877f04 100644
      RtlFreeHeap( GetProcessHeap(), 0, fullname );
      if (!wm)
      {
-@@ -1605,8 +1607,8 @@ static void load_builtin_callback( void *module, const char *filename )
+@@ -1771,8 +1773,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len )
  /******************************************************************************
   *	load_native_dll  (internal)
   */
@@ -94,7 +94,7 @@ index 0486517..7877f04 100644
  {
      void *module;
      HANDLE mapping;
-@@ -1630,7 +1632,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
+@@ -1806,7 +1808,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file,
  
      /* create the MODREF */
  
@@ -103,7 +103,7 @@ index 0486517..7877f04 100644
      {
          status = STATUS_NO_MEMORY;
          goto done;
-@@ -1692,8 +1694,8 @@ done:
+@@ -1870,8 +1872,8 @@ done:
  /***********************************************************************
   *           load_builtin_dll
   */
@@ -114,7 +114,7 @@ index 0486517..7877f04 100644
  {
      char error[256], dllname[MAX_PATH];
      const WCHAR *name, *p;
-@@ -1713,6 +1715,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
+@@ -1891,6 +1893,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
       */
      info.load_path = load_path;
      info.filename  = NULL;
@@ -122,7 +122,7 @@ index 0486517..7877f04 100644
      info.status    = STATUS_SUCCESS;
      info.wm        = NULL;
  
-@@ -2153,14 +2156,14 @@ overflow:
+@@ -2331,14 +2334,14 @@ overflow:
      return STATUS_BUFFER_TOO_SMALL;
  }
  
@@ -139,7 +139,7 @@ index 0486517..7877f04 100644
  {
      BOOL data = flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE);
      enum loadorder loadorder;
-@@ -2198,6 +2201,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2376,6 +2379,25 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
      }
  
      main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
@@ -165,7 +165,7 @@ index 0486517..7877f04 100644
      loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename );
  
      if (handle && is_fake_dll( handle ))
-@@ -2220,22 +2242,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2398,22 +2420,22 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
          if (!handle) nts = STATUS_DLL_NOT_FOUND;
          else
          {
@@ -193,7 +193,7 @@ index 0486517..7877f04 100644
          if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT &&
              (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS))
          {
-@@ -2245,7 +2267,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
+@@ -2423,7 +2445,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_
              nts = STATUS_DLL_NOT_FOUND;
          }
          if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN)
@@ -202,7 +202,7 @@ index 0486517..7877f04 100644
          break;
      }
  
-@@ -2278,7 +2300,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags,
+@@ -2456,7 +2478,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags,
      RtlEnterCriticalSection( &loader_section );
  
      if (!path_name) path_name = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer;
@@ -211,7 +211,7 @@ index 0486517..7877f04 100644
  
      if (nts == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS))
      {
-@@ -3241,7 +3263,7 @@ void __wine_process_init(void)
+@@ -3419,7 +3441,7 @@ void __wine_process_init(void)
      /* setup the load callback and create ntdll modref */
      wine_dll_set_callback( load_builtin_callback );
  
@@ -221,5 +221,5 @@ index 0486517..7877f04 100644
          MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
          exit(1);
 -- 
-2.4.5
+2.9.0
 

patches/ntdll-NtSetLdtEntries/0001-ntdll-add-NtSetLdtEntries-ZwSetLdtEntries-stub-try-2.patch

@@ -1,82 +0,0 @@
-From 15201062dd669c30343f7d1a1157c254943267ea Mon Sep 17 00:00:00 2001
-From: Austin English <austinenglish@gmail.com>
-Date: Wed, 19 Feb 2014 12:54:00 -0800
-Subject: ntdll: add NtSetLdtEntries/ZwSetLdtEntries stub (try 2)
-
----
- dlls/ntdll/nt.c       | 12 ++++++++++++
- dlls/ntdll/ntdll.spec |  4 ++--
- include/ddk/wdm.h     |  1 +
- include/winternl.h    |  2 +-
- 4 files changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index 73d9383..0d11037 100644
---- a/dlls/ntdll/nt.c
-+++ b/dlls/ntdll/nt.c
-@@ -2446,3 +2446,15 @@ NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULO
- 
-     return STATUS_NOT_IMPLEMENTED;
- }
-+
-+/******************************************************************************
-+ *  NtSetLdtEntries   (NTDLL.@)
-+ *  ZwSetLdtEntries   (NTDLL.@)
-+ */
-+NTSTATUS WINAPI NtSetLdtEntries(ULONG selector1, ULONG entry1_low, ULONG entry1_high,
-+                                ULONG selector2, ULONG entry2_low, ULONG entry2_high)
-+{
-+    FIXME("(%u, %u, %u, %u, %u, %u): stub\n", selector1, entry1_low, entry1_high, selector2, entry2_low, entry2_high);
-+
-+    return STATUS_NOT_IMPLEMENTED;
-+}
-diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 5bac269..f1dafc8 100644
---- a/dlls/ntdll/ntdll.spec
-+++ b/dlls/ntdll/ntdll.spec
-@@ -332,7 +332,7 @@
- @ stdcall NtSetInformationToken(long long ptr long)
- @ stdcall NtSetIntervalProfile(long long)
- @ stdcall NtSetIoCompletion(ptr long ptr long long)
--@ stub NtSetLdtEntries
-+@ stdcall NtSetLdtEntries(long long long long long long)
- @ stub NtSetLowEventPair
- @ stub NtSetLowWaitHighEventPair
- @ stub NtSetLowWaitHighThread
-@@ -1209,7 +1209,7 @@
- @ stdcall ZwSetInformationToken(long long ptr long) NtSetInformationToken
- @ stdcall ZwSetIntervalProfile(long long) NtSetIntervalProfile
- @ stdcall ZwSetIoCompletion(ptr long ptr long long) NtSetIoCompletion
--@ stub ZwSetLdtEntries
-+@ stdcall ZwSetLdtEntries(long long long long long long) NtSetLdtEntries
- @ stub ZwSetLowEventPair
- @ stub ZwSetLowWaitHighEventPair
- @ stub ZwSetLowWaitHighThread
-diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
-index 29b24e7..ef4fa80 100644
---- a/include/ddk/wdm.h
-+++ b/include/ddk/wdm.h
-@@ -1333,6 +1333,7 @@ NTSTATUS  WINAPI ZwSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID,
- NTSTATUS  WINAPI ZwSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG);
- NTSTATUS  WINAPI ZwSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG);
- NTSTATUS  WINAPI ZwSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG);
-+NTSTATUS  WINAPI ZwSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG);
- NTSTATUS  WINAPI ZwSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
- NTSTATUS  WINAPI ZwSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG);
- NTSTATUS  WINAPI ZwSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*);
-diff --git a/include/winternl.h b/include/winternl.h
-index 5a27f94..ddc7c18 100644
---- a/include/winternl.h
-+++ b/include/winternl.h
-@@ -2228,7 +2228,7 @@ NTSYSAPI NTSTATUS  WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,
- NTSYSAPI NTSTATUS  WINAPI NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG);
- NTSYSAPI NTSTATUS  WINAPI NtSetIntervalProfile(ULONG,KPROFILE_SOURCE);
- NTSYSAPI NTSTATUS  WINAPI NtSetIoCompletion(HANDLE,ULONG_PTR,ULONG_PTR,NTSTATUS,SIZE_T);
--NTSYSAPI NTSTATUS  WINAPI NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY);
-+NTSYSAPI NTSTATUS  WINAPI NtSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG);
- NTSYSAPI NTSTATUS  WINAPI NtSetLowEventPair(HANDLE);
- NTSYSAPI NTSTATUS  WINAPI NtSetLowWaitHighEventPair(HANDLE);
- NTSYSAPI NTSTATUS  WINAPI NtSetLowWaitHighThread(VOID);
--- 
-2.1.3
-

patches/ntdll-NtSetLdtEntries/definition

@@ -1,2 +0,0 @@
-Fixes: [26268] Add stub for NtSetLdtEntries/ZwSetLdtEntries
-Category: stable

patches/ntoskrnl-Stubs/0005-ntoskrnl.exe-Add-stub-for-KeDelayExecutionThread.patch

@@ -1,63 +0,0 @@
-From ce5aa07ac893aa38e72bb82c3e6dd2496ef4e1f5 Mon Sep 17 00:00:00 2001
-From: Alexander Morozov <amorozov@etersoft.ru>
-Date: Sat, 31 Jan 2015 12:17:54 +0100
-Subject: ntoskrnl.exe: Add stub for KeDelayExecutionThread.
-
----
- dlls/ntoskrnl.exe/ntoskrnl.c        | 13 +++++++++++++
- dlls/ntoskrnl.exe/ntoskrnl.exe.spec |  2 +-
- include/ddk/wdm.h                   |  1 +
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
-index 0d6f730..c90b351 100644
---- a/dlls/ntoskrnl.exe/ntoskrnl.c
-+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
-@@ -1308,6 +1308,19 @@ PRKTHREAD WINAPI KeGetCurrentThread(void)
-     return NULL;
- }
- 
-+
-+/***********************************************************************
-+ *           KeDelayExecutionThread   (NTOSKRNL.EXE.@)
-+ */
-+NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE WaitMode, BOOLEAN Alertable,
-+                                       PLARGE_INTEGER Interval)
-+{
-+    FIXME("(%d, %d, %p): stub\n", WaitMode, Alertable, Interval);
-+
-+    return STATUS_SUCCESS;
-+}
-+
-+
- /***********************************************************************
-  *           KeInitializeEvent   (NTOSKRNL.EXE.@)
-  */
-diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-index 25624a6..bae3678 100644
---- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
-@@ -518,7 +518,7 @@
- @ stub KeClearEvent
- @ stub KeConnectInterrupt
- @ stub KeDcacheFlushCount
--@ stub KeDelayExecutionThread
-+@ stdcall KeDelayExecutionThread(long long ptr)
- @ stub KeDeregisterBugCheckCallback
- @ stub KeDeregisterBugCheckReasonCallback
- @ stub KeDetachProcess
-diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
-index f2eb6a5..0d13337 100644
---- a/include/ddk/wdm.h
-+++ b/include/ddk/wdm.h
-@@ -1219,6 +1219,7 @@ void      WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR);
- VOID      WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG);
- NTSTATUS  WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG);
- 
-+NTSTATUS  WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,PLARGE_INTEGER);
- PKTHREAD  WINAPI KeGetCurrentThread(void);
- void      WINAPI KeQuerySystemTime(LARGE_INTEGER*);
- void      WINAPI KeQueryTickCount(LARGE_INTEGER*);
--- 
-2.2.2
-