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/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