Rebase against 52a99f2eadf04394a99d81f97a9a6d2a454fa959.

[api-ms-win-Stub_DLLs]
Removed multiple api-ms-win stub dlls (accepted upstream).

[kernel32-QT_Environment_Variables]
Removed patch to avoid inheritance of QT_ environment variables from host
environment to Wine (accepted upstream).

[kernel32-VirtualProtect]
Removed patch to allow to pass NULL as old protection to VirtualProtect for
Win9x compatibility (accepted upstream).

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

[wpcap-Several_Fixes]
Removed patch to fix possible crash in pcap_loop (accepted upstream).

patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch

@@ -1,15 +1,15 @@
-From 7cb209e122fc503190dcad411483147ebc6d6cb4 Mon Sep 17 00:00:00 2001
+From 78ee3e0a09735f835303b7ddd458c8852b4774fc 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
+index c9445e7..8a5b2d8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp
@@ -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
+@@ -372,6 +373,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 7121267..6976709 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/api-ms-win-Stub_DLLs/0014-api-ms-win-core-wow64-l1-1-0-Add-dll.patch

@@ -1,57 +0,0 @@
-From 59d8094be6c648259ebaabb39c06c41f1e227490 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 21 Jan 2016 00:48:48 +0100
-Subject: api-ms-win-core-wow64-l1-1-0: Add dll.
-
----
- configure.ac                                                        | 1 +
- dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in                       | 1 +
- dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec | 3 +++
- tools/make_specfiles                                                | 1 +
- 4 files changed, 6 insertions(+)
- create mode 100644 dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in
- create mode 100644 dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec
-
-diff --git a/configure.ac b/configure.ac
-index 67fd5d5..e10e890 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2696,6 +2696,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-winrt-registration-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0)
-+WINE_CONFIG_DLL(api-ms-win-core-wow64-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0)
- WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-crt-convert-l1-1-0)
-diff --git a/dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in b/dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..3e3d74f
---- /dev/null
-+++ b/dlls/api-ms-win-core-wow64-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-core-wow64-l1-1-0.dll
-diff --git a/dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec b/dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec
-new file mode 100644
-index 0000000..c1df1cf
---- /dev/null
-+++ b/dlls/api-ms-win-core-wow64-l1-1-0/api-ms-win-core-wow64-l1-1-0.spec
-@@ -0,0 +1,3 @@
-+@ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process
-+@ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection
-+@ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 8498606..b9a96c7 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -210,6 +210,7 @@ my @dll_groups =
-   "api-ms-win-core-localization-l1-2-1",
-   "api-ms-win-core-datetime-l1-1-0",
-   "api-ms-win-core-datetime-l1-1-1",
-+  "api-ms-win-core-wow64-l1-1-0",
-   "api-ms-win-core-xstate-l2-1-0",
-   "api-ms-win-core-errorhandling-l1-1-2",
-  ],
--- 
-2.6.4
-

patches/api-ms-win-Stub_DLLs/0016-api-ms-win-core-threadpool-l1-2-0-Add-dll.patch

@@ -1,91 +0,0 @@
-From cc03b0abbb80b0d3295db9d89a140208bf55d9f2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 21 Jan 2016 00:54:28 +0100
-Subject: api-ms-win-core-threadpool-l1-2-0: Add dll.
-
----
- configure.ac                                       |  1 +
- dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in |  1 +
- .../api-ms-win-core-threadpool-l1-2-0.spec         | 37 ++++++++++++++++++++++
- tools/make_specfiles                               |  1 +
- 4 files changed, 40 insertions(+)
- create mode 100644 dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in
- create mode 100644 dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec
-
-diff --git a/configure.ac b/configure.ac
-index e329038..e66f269 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2688,6 +2688,7 @@ WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0)
- WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0)
- WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1)
-+WINE_CONFIG_DLL(api-ms-win-core-threadpool-l1-2-0)
- WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0)
-diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in b/dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in
-new file mode 100644
-index 0000000..fa2c09e
---- /dev/null
-+++ b/dlls/api-ms-win-core-threadpool-l1-2-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-core-threadpool-l1-2-0.dll
-diff --git a/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec
-new file mode 100644
-index 0000000..870becc
---- /dev/null
-+++ b/dlls/api-ms-win-core-threadpool-l1-2-0/api-ms-win-core-threadpool-l1-2-0.spec
-@@ -0,0 +1,37 @@
-+@ stdcall CallbackMayRunLong(ptr) kernel32.CallbackMayRunLong
-+@ stub CancelThreadpoolIo
-+@ stdcall CloseThreadpool(ptr) kernel32.CloseThreadpool
-+@ stdcall CloseThreadpoolCleanupGroup(ptr) kernel32.CloseThreadpoolCleanupGroup
-+@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) kernel32.CloseThreadpoolCleanupGroupMembers
-+@ stub CloseThreadpoolIo
-+@ stdcall CloseThreadpoolTimer(ptr) kernel32.CloseThreadpoolTimer
-+@ stdcall CloseThreadpoolWait(ptr) kernel32.CloseThreadpoolWait
-+@ stdcall CloseThreadpoolWork(ptr) kernel32.CloseThreadpoolWork
-+@ stdcall CreateThreadpool(ptr) kernel32.CreateThreadpool
-+@ stdcall CreateThreadpoolCleanupGroup() kernel32.CreateThreadpoolCleanupGroup
-+@ stub CreateThreadpoolIo
-+@ stdcall CreateThreadpoolTimer(ptr ptr ptr) kernel32.CreateThreadpoolTimer
-+@ stdcall CreateThreadpoolWait(ptr ptr ptr) kernel32.CreateThreadpoolWait
-+@ stdcall CreateThreadpoolWork(ptr ptr ptr) kernel32.CreateThreadpoolWork
-+@ stdcall DisassociateCurrentThreadFromCallback(ptr) kernel32.DisassociateCurrentThreadFromCallback
-+@ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) kernel32.FreeLibraryWhenCallbackReturns
-+@ stdcall IsThreadpoolTimerSet(ptr) kernel32.IsThreadpoolTimerSet
-+@ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) kernel32.LeaveCriticalSectionWhenCallbackReturns
-+@ stub QueryThreadpoolStackInformation
-+@ stdcall ReleaseMutexWhenCallbackReturns(ptr long) kernel32.ReleaseMutexWhenCallbackReturns
-+@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) kernel32.ReleaseSemaphoreWhenCallbackReturns
-+@ stdcall SetEventWhenCallbackReturns(ptr long) kernel32.SetEventWhenCallbackReturns
-+@ stub SetThreadpoolStackInformation
-+@ stdcall SetThreadpoolThreadMaximum(ptr long) kernel32.SetThreadpoolThreadMaximum
-+@ stdcall SetThreadpoolThreadMinimum(ptr long) kernel32.SetThreadpoolThreadMinimum
-+@ stdcall SetThreadpoolTimer(ptr ptr long long) kernel32.SetThreadpoolTimer
-+@ stub SetThreadpoolTimerEx
-+@ stdcall SetThreadpoolWait(ptr long ptr) kernel32.SetThreadpoolWait
-+@ stub SetThreadpoolWaitEx
-+@ stub StartThreadpoolIo
-+@ stdcall SubmitThreadpoolWork(ptr) kernel32.SubmitThreadpoolWork
-+@ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) kernel32.TrySubmitThreadpoolCallback
-+@ stub WaitForThreadpoolIoCallbacks
-+@ stdcall WaitForThreadpoolTimerCallbacks(ptr long) kernel32.WaitForThreadpoolTimerCallbacks
-+@ stdcall WaitForThreadpoolWaitCallbacks(ptr long) kernel32.WaitForThreadpoolWaitCallbacks
-+@ stdcall WaitForThreadpoolWorkCallbacks(ptr long) kernel32.WaitForThreadpoolWorkCallbacks
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 8b63c60..7761136 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -199,6 +199,7 @@ my @dll_groups =
-   "api-ms-win-core-processenvironment-l1-1-0",
-   "api-ms-win-core-processenvironment-l1-2-0",
-   "api-ms-win-core-psapi-l1-1-0",
-+  "api-ms-win-core-threadpool-l1-2-0",
-   "api-ms-win-core-threadpool-legacy-l1-1-0",
-   "api-ms-win-core-timezone-l1-1-0",
-   "api-ms-win-core-file-l2-1-1",
--- 
-2.6.4
-

patches/api-ms-win-Stub_DLLs/definition

@@ -1,21 +1,13 @@
-Fixes: Add api-ms-win-core-com-l1-1-1 dll
 Fixes: Add api-ms-win-core-quirks-l1-1-0 dll
-Fixes: Add api-ms-win-core-delayload-l1-1-1 dll
 Fixes: Add api-ms-win-appmodel-runtime-l1-1-1 dll
 Fixes: Add api-ms-win-core-apiquery-l1-1-0 dll
-Fixes: Add api-ms-win-core-libraryloader-l1-2-0 dll
-Fixes: Add api-ms-win-core-kernel32-legacy-l1-1-1 dll
 Fixes: Add api-ms-win-core-heap-l2-1-0 dll
-Fixes: Add api-ms-win-eventing-classicprovider-l1-1-0 dll
-Fixes: Add api-ms-win-core-winrt-registration-l1-1-0 dll
 Fixes: Add api-ms-win-shcore-obsolete-l1-1-0 dll
 Fixes: Add ext-ms-win-xaml-pal-l1-1-0 dll
 Fixes: Add ext-ms-win-appmodel-usercontext-l1-1-0 dll
 Fixes: Add api-ms-win-shcore-thread-l1-1-0 dll
 Fixes: Add api-ms-win-core-memory-l1-1-2 dll
-Fixes: Add api-ms-win-core-wow64-l1-1-0 dll
 Fixes: Add api-ms-win-core-shlwapi-obsolete-l1-2-0 dll
-Fixes: Add api-ms-win-core-threadpool-l1-2-0 dll
 Fixes: Add api-ms-win-shcore-stream-l1-1-0 dll
 Fixes: Add ext-ms-win-ntuser-mouse-l1-1-0 dll
 Fixes: Add ext-ms-win-uxtheme-themes-l1-1-0 dll

patches/combase-RoApi/0008-combase-Add-stub-for-RoGetServerActivatableClasses.patch

@@ -1,15 +1,24 @@
-From ce24c3401d5a103c9cf8e7e6a82cdb61026741fb Mon Sep 17 00:00:00 2001
+From fa4ada9e3f3797b704cd8c033fff8f1a8bb25bac Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 02:03:47 +0100
 Subject: combase: Add stub for RoGetServerActivatableClasses.
 
 ---
- dlls/combase/combase.spec |  2 +-
- dlls/combase/roapi.c      | 11 +++++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
+ .../api-ms-win-core-winrt-registration-l1-1-0.spec            |  2 +-
+ dlls/combase/combase.spec                                     |  2 +-
+ dlls/combase/roapi.c                                          | 11 +++++++++++
+ 3 files changed, 13 insertions(+), 2 deletions(-)
 
+diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec
+index 350ac04..20c8d9c 100644
+--- a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec
++++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec
+@@ -1,2 +1,2 @@
+ @ stub RoGetActivatableClassRegistration
+-@ stub RoGetServerActivatableClasses
++@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses
 diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
-index 7ae1f6e..3a17e4a 100644
+index 0405a0e..fca0b2c 100644
 --- a/dlls/combase/combase.spec
 +++ b/dlls/combase/combase.spec
 @@ -254,7 +254,7 @@
@@ -41,5 +50,5 @@ index 035fa47..832ec67 100644
 +    return S_OK;
 +}
 -- 
-2.6.4
+2.7.1
 

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