Rebase against dbce559df683b7831861c747f1f4d28614eedbe2

patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch

@@ -1,4 +1,4 @@
-From 40cf610272e52f68631e9292342e1d020735b6a4 Mon Sep 17 00:00:00 2001
+From 45051916c0540f68fc9687fc9001415e73c1566e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 5 Jan 2015 18:11:53 +0100
 Subject: [PATCH] nvapi: First implementation.
@@ -25,10 +25,10 @@ Subject: [PATCH] nvapi: First implementation.
  create mode 100644 include/nvapi.h
 
 diff --git a/configure.ac b/configure.ac
-index 55d8931..fbf0cce 100644
+index 621d007..2d53813 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -216,6 +216,12 @@ esac
+@@ -213,6 +213,12 @@ esac
  dnl enable_win16 defaults to yes on x86, to no on other CPUs
  enable_win16=${enable_win16:-no}
  enable_win64=${enable_win64:-no}
@@ -41,8 +41,8 @@ index 55d8931..fbf0cce 100644
  
  dnl Disable winetest too if tests are disabled
  enable_winetest=${enable_winetest:-$enable_tests}
-@@ -3554,6 +3560,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntdsapi/tests)
- WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
+@@ -3507,6 +3513,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
+ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
  WINE_CONFIG_MAKEFILE(dlls/ntprint)
  WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
 +WINE_CONFIG_MAKEFILE(dlls/nvapi,enable_win32)
@@ -856,10 +856,10 @@ index 0000000..f0c054b
 +@ stub DllRegisterServer
 +@ stub DllUnregisterServer
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 60b2a41..b7bf57f 100644
+index d12e58a..1dc9cb4 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -477,6 +477,7 @@ SOURCES = \
+@@ -475,6 +475,7 @@ SOURCES = \
  	ntsecapi.h \
  	ntsecpkg.h \
  	ntstatus.h \
@@ -950,5 +950,5 @@ index 0000000..4204256
 +
 +#endif /* __WINE_NVAPI_H */
 -- 
-1.9.1
+2.7.4
 

patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch

@@ -1,4 +1,4 @@
-From ddb398fc71e14607ecc400f049b04a93181f4987 Mon Sep 17 00:00:00 2001
+From 60b8f3d44890b9d3a60c7893c6633e89e91064c8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 7 Jul 2017 23:56:16 +0200
 Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2)
@@ -11,19 +11,19 @@ Subject: [PATCH] nvapi: Implement NvAPI_D3D11_SetDepthBoundsTest. (v2)
  4 files changed, 60 insertions(+)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index d8059e5..497ed9b 100644
+index 18fa670..abe9e29 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
-@@ -4453,6 +4453,8 @@ static inline struct d3d11_deferred_context *impl_from_deferred_ID3D11DeviceCont
- static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_QueryInterface(ID3D11DeviceContext *iface,
+@@ -48,6 +48,8 @@ static inline struct d3d_device *device_from_immediate_ID3D11DeviceContext1(ID3D
+ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11DeviceContext1 *iface,
          REFIID riid, void **out)
  {
 +    struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1( (ID3D11DeviceContext1*)iface);
 +
      TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
  
-     if (IsEqualGUID(riid, &IID_ID3D11DeviceContext)
-@@ -4463,6 +4465,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_QueryInterface(ID3D11Dev
+     if (IsEqualGUID(riid, &IID_ID3D11DeviceContext1)
+@@ -59,6 +61,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De
          *out = iface;
          return S_OK;
      }
@@ -35,7 +35,7 @@ index d8059e5..497ed9b 100644
  
      WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
      *out = NULL;
-@@ -7148,6 +7155,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
+@@ -3864,6 +3871,11 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface
      {
          *out = &device->IWineDXGIDeviceParent_iface;
      }
@@ -151,7 +151,7 @@ index c8b66ac..87327c0 100644
      /* d3d9 tests */
      wc.lpfnWndProc = DefWindowProcA;
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index 37d5770..6772524 100644
+index 15e14e5..f9df2d2 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
 @@ -32,6 +32,8 @@
@@ -164,5 +164,5 @@ index 37d5770..6772524 100644
  
  #define _FACWINED3D                                             0x876
 -- 
-1.9.1
+2.7.4