nvapi-Stub_DLL: Merge some cleanup changes.

2024-11-21 16:46:54 -08:00 · 2017-07-29 00:49:46 +02:00 · 2017-07-29 00:49:46 +02:00 · ebc9ba4921
commit ebc9ba4921
parent 77a90f1dd0
22 changed files with 171 additions and 228 deletions
--- a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
+++ b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
@ -1,4 +1,4 @@
-From a693fcab267468e8506448a492c756bdf070ba5b Mon Sep 17 00:00:00 2001
+From 2eda3b378d4d2d16faf413aebc414a893fd035c1 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: nvapi: First implementation.
@ -51,7 +51,7 @@ index 8a98996..efe32af 100644
 WINE_CONFIG_TEST(dlls/nvcuda/tests)
 diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in
 new file mode 100644
-index 0000000..606177f
+index 00000000000..606177f1f8b
 --- /dev/null
 +++ b/dlls/nvapi/Makefile.in
@@ -0,0 +1,4 @@
@ -61,7 +61,7 @@ index 0000000..606177f
 +	nvapi.c
 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
 new file mode 100644
-index 0000000..2c7eceb
+index 00000000000..51de61703d0
 --- /dev/null
 +++ b/dlls/nvapi/nvapi.c
@@ -0,0 +1,462 @@
@ -467,7 +467,7 @@ index 0000000..2c7eceb
 +                                                   const RECT *pSourceRect, IDirect3DResource9 *pDestResource,
 +                                                   const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter)
 +{
-+    TRACE("(%p, %p, %p, %p, %p, %d)\n", pDevice, pSourceResource, pSourceRect, pDestResource, pDestRect, Filter);
+    FIXME("(%p, %p, %p, %p, %p, %d): stub\n", pDevice, pSourceResource, pSourceRect, pDestResource, pDestRect, Filter);
 +    return NVAPI_UNREGISTERED_RESOURCE;
 +}
 +
@ -497,7 +497,7 @@ index 0000000..2c7eceb
 +        {0x451f2134, NvAPI_Stereo_GetSeparation},
 +        {0x5c069fa3, NvAPI_Stereo_SetSeparation},
 +        {0x239c4545, NvAPI_Stereo_Enable},
-+        {0xaeaecd41, NvAPI_D3D9_StretchRectEx}
+        {0xaeaecd41, NvAPI_D3D9_StretchRectEx},
 +    };
 +    unsigned int i;
 +    TRACE("(%x)\n", offset);
@ -529,7 +529,7 @@ index 0000000..2c7eceb
 +}
 diff --git a/dlls/nvapi/nvapi.spec b/dlls/nvapi/nvapi.spec
 new file mode 100644
-index 0000000..f0c054b
+index 00000000000..f0c054b2bf9
 --- /dev/null
 +++ b/dlls/nvapi/nvapi.spec
@@ -0,0 +1,5 @@
@ -540,7 +540,7 @@ index 0000000..f0c054b
 +@ stub DllUnregisterServer
 diff --git a/dlls/nvapi/tests/Makefile.in b/dlls/nvapi/tests/Makefile.in
 new file mode 100644
-index 0000000..a94df01
+index 00000000000..a94df015e09
 --- /dev/null
 +++ b/dlls/nvapi/tests/Makefile.in
@@ -0,0 +1,5 @@
@ -551,7 +551,7 @@ index 0000000..a94df01
 +	nvapi.c
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
 new file mode 100644
-index 0000000..d760a18
+index 00000000000..d760a184141
 --- /dev/null
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -0,0 +1,276 @@
@ -833,7 +833,7 @@ index 0000000..d760a18
 +}
 diff --git a/dlls/nvapi64/Makefile.in b/dlls/nvapi64/Makefile.in
 new file mode 100644
-index 0000000..80e2d6b
+index 00000000000..80e2d6bfb20
 --- /dev/null
 +++ b/dlls/nvapi64/Makefile.in
@@ -0,0 +1,5 @@
@ -844,7 +844,7 @@ index 0000000..80e2d6b
 +	nvapi.c
 diff --git a/dlls/nvapi64/nvapi64.spec b/dlls/nvapi64/nvapi64.spec
 new file mode 100644
-index 0000000..f0c054b
+index 00000000000..f0c054b2bf9
 --- /dev/null
 +++ b/dlls/nvapi64/nvapi64.spec
@@ -0,0 +1,5 @@
@ -854,10 +854,10 @@ index 0000000..f0c054b
 +@ stub DllRegisterServer
 +@ stub DllUnregisterServer
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 6abb2c2..476613a 100644
+index df98dda1cdd..60c1f3439b1 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -482,6 +482,7 @@ SRCDIR_INCLUDES = \
+@@ -537,6 +537,7 @@ HEADER_SRCS = \
 	ntsecapi.h \
 	ntsecpkg.h \
 	ntstatus.h \
@ -867,7 +867,7 @@ index 6abb2c2..476613a 100644
 	odbcinst.h \
 diff --git a/include/nvapi.h b/include/nvapi.h
 new file mode 100644
-index 0000000..4204256
+index 00000000000..4204256cca2
 --- /dev/null
 +++ b/include/nvapi.h
@@ -0,0 +1,76 @@
@ -948,5 +948,5 @@ index 0000000..4204256
 +
 +#endif /* __WINE_NVAPI_H */
 -- 
-2.4.0
+2.13.1

--- a/patches/nvapi-Stub_DLL/0002-nvapi-Add-stubs-for-NvAPI_EnumLogicalGPUs-and-undocu.patch
+++ b/patches/nvapi-Stub_DLL/0002-nvapi-Add-stubs-for-NvAPI_EnumLogicalGPUs-and-undocu.patch
@ -1,17 +1,17 @@
-From 86b33d987c6b1dc948018b58a2d1a131e701805f Mon Sep 17 00:00:00 2001
+From b4e4e655e9342ef893741cc69483160563bc0213 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 7 Jan 2015 23:26:27 +0100
 Subject: nvapi: Add stubs for NvAPI_EnumLogicalGPUs and undocumented
 equivalent.

 ---
- dlls/nvapi/nvapi.c       | 27 ++++++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 25 ++++++++++++++++++++
 dlls/nvapi/tests/nvapi.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/nvapi.h          |  3 +++
- 3 files changed, 90 insertions(+), 1 deletion(-)
+ 3 files changed, 89 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 2c7eceb..efd6a66 100644
+index 51de61703d0..c7bcab82988 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nvapi);
@ -51,19 +51,17 @@ index 2c7eceb..efd6a66 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -430,7 +453,9 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x451f2134, NvAPI_Stereo_GetSeparation},
+@@ -431,6 +454,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x5c069fa3, NvAPI_Stereo_SetSeparation},
         {0x239c4545, NvAPI_Stereo_Enable},
-        {0xaeaecd41, NvAPI_D3D9_StretchRectEx}
-+        {0xaeaecd41, NvAPI_D3D9_StretchRectEx},
+         {0xaeaecd41, NvAPI_D3D9_StretchRectEx},
 +        {0x48b3ea59, NvAPI_EnumLogicalGPUs},
-+        {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown}
+        {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index d760a18..ea630f3 100644
+index d760a184141..ea630f3e315 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -33,6 +33,8 @@
@ -161,7 +159,7 @@ index d760a18..ea630f3 100644
 +    test_NvAPI_EnumLogicalGPUs();
 }
 diff --git a/include/nvapi.h b/include/nvapi.h
-index 4204256..448b0ce 100644
+index 4204256cca2..448b0cef00b 100644
 --- a/include/nvapi.h
 +++ b/include/nvapi.h
@@ -31,18 +31,21 @@ typedef unsigned int NvU32;
@ -187,5 +185,5 @@ index 4204256..448b0ce 100644
 typedef void *StereoHandle;
 
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0003-nvapi-Add-NvAPI_GetPhysicalGPUsFromLogicalGPU.patch
+++ b/patches/nvapi-Stub_DLL/0003-nvapi-Add-NvAPI_GetPhysicalGPUsFromLogicalGPU.patch
@ -1,16 +1,16 @@
-From 91fa06cbf5f9183063232bef9d208643304ad267 Mon Sep 17 00:00:00 2001
+From 4cdf23c5042ec35bfc81fa1fa6245545736bd312 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jan 2015 00:54:18 +0100
 Subject: nvapi: Add NvAPI_GetPhysicalGPUsFromLogicalGPU.

 ---
- dlls/nvapi/nvapi.c       | 28 ++++++++++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 26 +++++++++++++++++++++++
 dlls/nvapi/tests/nvapi.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/nvapi.h          |  1 +
- 3 files changed, 82 insertions(+), 1 deletion(-)
+ 3 files changed, 81 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index efd6a66..3c3f2fd 100644
+index c7bcab82988..7c0ad46d464 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -427,6 +427,31 @@ static NvAPI_Status CDECL NvAPI_EnumLogicalGPUs_unknown(NvLogicalGpuHandle gpuHa
@ -45,18 +45,16 @@ index efd6a66..3c3f2fd 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -455,7 +480,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x239c4545, NvAPI_Stereo_Enable},
+@@ -456,6 +481,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0xaeaecd41, NvAPI_D3D9_StretchRectEx},
         {0x48b3ea59, NvAPI_EnumLogicalGPUs},
-        {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown}
-+        {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown},
-+        {0xaea3fa32, NvAPI_GetPhysicalGPUsFromLogicalGPU}
+         {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown},
+        {0xaea3fa32, NvAPI_GetPhysicalGPUsFromLogicalGPU},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index ea630f3..779dc32 100644
+index ea630f3e315..779dc3215b0 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -35,6 +35,7 @@
@ -147,7 +145,7 @@ index ea630f3..779dc32 100644
 +    test_NvAPI_GetPhysicalGPUsFromLogicalGPU();
 }
 diff --git a/include/nvapi.h b/include/nvapi.h
-index 448b0ce..e3c94d8 100644
+index 448b0cef00b..e3c94d8d4de 100644
 --- a/include/nvapi.h
 +++ b/include/nvapi.h
@@ -32,6 +32,7 @@ typedef unsigned int NvU32;
@ -159,5 +157,5 @@ index 448b0ce..e3c94d8 100644
 #define NVAPI_STEREO_NOT_INITIALIZED -140
 #define NVAPI_UNREGISTERED_RESOURCE -170
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0004-nvapi-Add-stub-for-NvAPI_EnumPhysicalGPUs.patch
+++ b/patches/nvapi-Stub_DLL/0004-nvapi-Add-stub-for-NvAPI_EnumPhysicalGPUs.patch
@ -1,15 +1,15 @@
-From 089ba9733d4692a2cfac5f46713d6e2bb2b2ce87 Mon Sep 17 00:00:00 2001
+From e6d7797df568f9ffd36358bce7130c31507df132 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 12 Jan 2015 17:57:52 +0100
 Subject: nvapi: Add stub for NvAPI_EnumPhysicalGPUs.

 ---
- dlls/nvapi/nvapi.c       | 19 ++++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 17 +++++++++++++++++
 dlls/nvapi/tests/nvapi.c | 36 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+), 1 deletion(-)
+ 2 files changed, 53 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 3c3f2fd..f02df67 100644
+index 7c0ad46d464..d89d6c7d0dc 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -452,6 +452,22 @@ static NvAPI_Status CDECL NvAPI_GetPhysicalGPUsFromLogicalGPU(NvLogicalGpuHandle
@ -35,18 +35,16 @@ index 3c3f2fd..f02df67 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -481,7 +497,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0xaeaecd41, NvAPI_D3D9_StretchRectEx},
+@@ -482,6 +498,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x48b3ea59, NvAPI_EnumLogicalGPUs},
         {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown},
-        {0xaea3fa32, NvAPI_GetPhysicalGPUsFromLogicalGPU}
-+        {0xaea3fa32, NvAPI_GetPhysicalGPUsFromLogicalGPU},
-+        {0xe5ac921f, NvAPI_EnumPhysicalGPUs}
+         {0xaea3fa32, NvAPI_GetPhysicalGPUsFromLogicalGPU},
+        {0xe5ac921f, NvAPI_EnumPhysicalGPUs},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index 779dc32..3855635 100644
+index 779dc3215b0..38556352620 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -36,6 +36,7 @@
@ -119,5 +117,5 @@ index 779dc32..3855635 100644
 +    test_NvAPI_EnumPhysicalGPUs();
 }
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0005-nvapi-Add-stubs-for-NvAPI_GPU_GetFullName.patch
+++ b/patches/nvapi-Stub_DLL/0005-nvapi-Add-stubs-for-NvAPI_GPU_GetFullName.patch
@ -1,15 +1,15 @@
-From 1858bd6b9e0bbf89b2ff0738dc5324aad4adf2a0 Mon Sep 17 00:00:00 2001
+From 6cc229391dd81cd439bbab220ef1662e43c45ae7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 12 Jan 2015 18:16:12 +0100
 Subject: nvapi: Add stubs for NvAPI_GPU_GetFullName.

 ---
- dlls/nvapi/nvapi.c       | 25 +++++++++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 23 ++++++++++++++++++++++
 dlls/nvapi/tests/nvapi.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 74 insertions(+), 1 deletion(-)
+ 2 files changed, 73 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index f02df67..51c6688 100644
+index d89d6c7d0dc..bb9f80f31d7 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -468,6 +468,28 @@ static NvAPI_Status CDECL NvAPI_EnumPhysicalGPUs(NvPhysicalGpuHandle gpuHandle[N
@ -41,18 +41,16 @@ index f02df67..51c6688 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -498,7 +520,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x48b3ea59, NvAPI_EnumLogicalGPUs},
+@@ -499,6 +521,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown},
         {0xaea3fa32, NvAPI_GetPhysicalGPUsFromLogicalGPU},
-        {0xe5ac921f, NvAPI_EnumPhysicalGPUs}
-+        {0xe5ac921f, NvAPI_EnumPhysicalGPUs},
-+        {0xceee8e9f, NvAPI_GPU_GetFullName}
+         {0xe5ac921f, NvAPI_EnumPhysicalGPUs},
+        {0xceee8e9f, NvAPI_GPU_GetFullName},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index 3855635..e205662 100644
+index 38556352620..38baea8bfc8 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -37,6 +37,7 @@
@ -139,5 +137,5 @@ index 3855635..e205662 100644
 +    test_NvAPI_GPU_GetFullName();
 }
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0006-nvapi-Explicity-return-NULL-for-0x33c7358c-and-0x593.patch
+++ b/patches/nvapi-Stub_DLL/0006-nvapi-Explicity-return-NULL-for-0x33c7358c-and-0x593.patch
@ -1,27 +1,25 @@
-From be91056d36eb806068d23dcc40201c8030436658 Mon Sep 17 00:00:00 2001
+From 8474e07396ee431e79dc57de7a4ba5b337933e8e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 12 Jan 2015 23:32:45 +0100
 Subject: nvapi: Explicity return NULL for 0x33c7358c and 0x593e8644.

 ---
- dlls/nvapi/nvapi.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ dlls/nvapi/nvapi.c | 2 ++
+ 1 file changed, 2 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 51c6688..1bdff9a 100644
+index bb9f80f31d7..1e71db854c5 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
-@@ -521,7 +521,9 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0xfb9bc2ab, NvAPI_EnumLogicalGPUs_unknown},
+@@ -522,6 +522,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0xaea3fa32, NvAPI_GetPhysicalGPUsFromLogicalGPU},
         {0xe5ac921f, NvAPI_EnumPhysicalGPUs},
-        {0xceee8e9f, NvAPI_GPU_GetFullName}
-+        {0xceee8e9f, NvAPI_GPU_GetFullName},
+         {0xceee8e9f, NvAPI_GPU_GetFullName},
 +        {0x33c7358c, NULL}, /* This functions seems to be optional */
-+        {0x593e8644, NULL}  /* This functions seems to be optional */
+        {0x593e8644, NULL}, /* This functions seems to be optional */
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0007-nvapi-Add-stub-for-NvAPI_DISP_GetGDIPrimaryDisplayId.patch
+++ b/patches/nvapi-Stub_DLL/0007-nvapi-Add-stub-for-NvAPI_DISP_GetGDIPrimaryDisplayId.patch
@ -1,15 +1,15 @@
-From d910c47cc81c2b2bcb2fae736e60307cd6323728 Mon Sep 17 00:00:00 2001
+From 5e7ddf36d3df23818c6a027b02ff101b366ef28c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 12 Jan 2015 23:54:30 +0100
 Subject: nvapi: Add stub for NvAPI_DISP_GetGDIPrimaryDisplayId.

 ---
- dlls/nvapi/nvapi.c       | 15 ++++++++++++++-
+ dlls/nvapi/nvapi.c       | 13 +++++++++++++
 dlls/nvapi/tests/nvapi.c | 24 ++++++++++++++++++++++++
- 2 files changed, 38 insertions(+), 1 deletion(-)
+ 2 files changed, 37 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 1bdff9a..bbd1d66 100644
+index 1e71db854c5..e2ffdd64da9 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nvapi);
@ -38,18 +38,16 @@ index 1bdff9a..bbd1d66 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -523,7 +535,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0xe5ac921f, NvAPI_EnumPhysicalGPUs},
+@@ -524,6 +536,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0xceee8e9f, NvAPI_GPU_GetFullName},
         {0x33c7358c, NULL}, /* This functions seems to be optional */
-        {0x593e8644, NULL}  /* This functions seems to be optional */
-+        {0x593e8644, NULL}, /* This functions seems to be optional */
-+        {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId}
+         {0x593e8644, NULL}, /* This functions seems to be optional */
+        {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index e205662..acdd10d 100644
+index 38baea8bfc8..db0d82857c4 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -38,6 +38,7 @@
@ -110,5 +108,5 @@ index e205662..acdd10d 100644
 +    test_NvAPI_DISP_GetGDIPrimaryDisplayId();
 }
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0008-nvapi-Add-stub-for-EnumNvidiaDisplayHandle.patch
+++ b/patches/nvapi-Stub_DLL/0008-nvapi-Add-stub-for-EnumNvidiaDisplayHandle.patch
@ -1,16 +1,16 @@
-From ebd22c15b9beac466f1c5f2cbe262a75ea2a3622 Mon Sep 17 00:00:00 2001
+From f7af75a1ceb818814b6179d64f3a10cdcf2ecdc5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 13 Jan 2015 00:22:26 +0100
 Subject: nvapi: Add stub for EnumNvidiaDisplayHandle.

 ---
- dlls/nvapi/nvapi.c       | 17 ++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 15 +++++++++++++++
 dlls/nvapi/tests/nvapi.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 include/nvapi.h          |  4 ++++
- 3 files changed, 63 insertions(+), 1 deletion(-)
+ 3 files changed, 62 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index bbd1d66..4c009b5 100644
+index e2ffdd64da9..f2d2ba5dee2 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -502,6 +502,20 @@ static NvAPI_Status CDECL NvAPI_DISP_GetGDIPrimaryDisplayId(NvU32* displayId)
@ -34,18 +34,16 @@ index bbd1d66..4c009b5 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -536,7 +550,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0xceee8e9f, NvAPI_GPU_GetFullName},
+@@ -537,6 +551,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x33c7358c, NULL}, /* This functions seems to be optional */
         {0x593e8644, NULL}, /* This functions seems to be optional */
-        {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId}
-+        {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId},
-+        {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle}
+         {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId},
+        {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index acdd10d..8d15382 100644
+index db0d82857c4..653f84e4493 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -39,6 +39,7 @@
@ -125,7 +123,7 @@ index acdd10d..8d15382 100644
 +    test_NvAPI_EnumNvidiaDisplayHandle();
 }
 diff --git a/include/nvapi.h b/include/nvapi.h
-index e3c94d8..2a13277 100644
+index e3c94d8d4de..2a13277f564 100644
 --- a/include/nvapi.h
 +++ b/include/nvapi.h
@@ -29,6 +29,7 @@ typedef unsigned int NvU32;
@ -149,5 +147,5 @@ index e3c94d8..2a13277 100644
 typedef char NvAPI_ShortString[NVAPI_SHORT_STRING_MAX];
 
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0009-nvapi-Add-stub-for-NvAPI_SYS_GetDriverAndBranchVersi.patch
+++ b/patches/nvapi-Stub_DLL/0009-nvapi-Add-stub-for-NvAPI_SYS_GetDriverAndBranchVersi.patch
@ -1,15 +1,15 @@
-From 13ee123115eef55e23ab7574e13f9e8f68b34555 Mon Sep 17 00:00:00 2001
+From f990969ec5ed5d185929bc327d2ac33a8bcd5a96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 13 Jan 2015 00:39:43 +0100
 Subject: nvapi: Add stub for NvAPI_SYS_GetDriverAndBranchVersion.

 ---
- dlls/nvapi/nvapi.c       | 18 +++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 16 ++++++++++++++++
 dlls/nvapi/tests/nvapi.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 57 insertions(+), 1 deletion(-)
+ 2 files changed, 56 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 4c009b5..43c0375 100644
+index f2d2ba5dee2..062c99a6585 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -516,6 +516,21 @@ static NvAPI_Status CDECL NvAPI_EnumNvidiaDisplayHandle(NvU32 thisEnum, NvDispla
@ -34,18 +34,16 @@ index 4c009b5..43c0375 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -551,7 +566,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x33c7358c, NULL}, /* This functions seems to be optional */
+@@ -552,6 +567,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x593e8644, NULL}, /* This functions seems to be optional */
         {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId},
-        {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle}
-+        {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle},
-+        {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion}
+         {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle},
+        {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index 8d15382..aeca45f 100644
+index 653f84e4493..341b6084303 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -40,6 +40,7 @@
@ -122,5 +120,5 @@ index 8d15382..aeca45f 100644
 +    test_NvAPI_SYS_GetDriverAndBranchVersion();
 }
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0010-nvapi-Add-stub-for-NvAPI_Unload.patch
+++ b/patches/nvapi-Stub_DLL/0010-nvapi-Add-stub-for-NvAPI_Unload.patch
@ -1,14 +1,14 @@
-From 1f87d8b802f5182067afcfd1b157f1fe00088fbc Mon Sep 17 00:00:00 2001
+From 9337f83015b33f301ac15b11af5d8c947773e916 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 13 Jan 2015 00:48:47 +0100
 Subject: nvapi: Add stub for NvAPI_Unload.

 ---
- dlls/nvapi/nvapi.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ dlls/nvapi/nvapi.c | 7 +++++++
+ 1 file changed, 7 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 43c0375..78ffdc9 100644
+index 062c99a6585..44d9d4a5245 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -531,6 +531,12 @@ static NvAPI_Status CDECL NvAPI_SYS_GetDriverAndBranchVersion(NvU32* pDriverVers
@ -24,16 +24,14 @@ index 43c0375..78ffdc9 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -567,7 +573,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x593e8644, NULL}, /* This functions seems to be optional */
+@@ -568,6 +574,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId},
         {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle},
-        {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion}
-+        {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion},
-+        {0xd22bdd7e, NvAPI_Unload}
+         {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion},
+        {0xd22bdd7e, NvAPI_Unload},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0011-nvapi-Add-stub-for-NvAPI_D3D_GetCurrentSLIState.patch
+++ b/patches/nvapi-Stub_DLL/0011-nvapi-Add-stub-for-NvAPI_D3D_GetCurrentSLIState.patch
@ -1,17 +1,17 @@
-From 711a5534ea1772eefcb664969bd9f6a6bad7c0bc Mon Sep 17 00:00:00 2001
+From e47ddc854890a93bfaac06a4ad02f929a5d89901 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 13 Jan 2015 02:06:40 +0100
 Subject: nvapi: Add stub for NvAPI_D3D_GetCurrentSLIState.

 ---
- dlls/nvapi/nvapi.c           |  16 ++++++-
+ dlls/nvapi/nvapi.c           |  14 ++++++
 dlls/nvapi/tests/Makefile.in |   2 +-
 dlls/nvapi/tests/nvapi.c     | 107 +++++++++++++++++++++++++++++++++++++++++++
 include/nvapi.h              |  14 ++++++
- 4 files changed, 137 insertions(+), 2 deletions(-)
+ 4 files changed, 136 insertions(+), 1 deletion(-)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 78ffdc9..287e681 100644
+index 44d9d4a5245..0019a9869a6 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -537,6 +537,19 @@ static NvAPI_Status CDECL NvAPI_Unload(void)
@ -34,18 +34,16 @@ index 78ffdc9..287e681 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -574,7 +587,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x1e9d8a31, NvAPI_DISP_GetGDIPrimaryDisplayId},
+@@ -575,6 +588,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle},
         {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion},
-        {0xd22bdd7e, NvAPI_Unload}
-+        {0xd22bdd7e, NvAPI_Unload},
-+        {0x4b708b54, NvAPI_D3D_GetCurrentSLIState}
+         {0xd22bdd7e, NvAPI_Unload},
+        {0x4b708b54, NvAPI_D3D_GetCurrentSLIState},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/Makefile.in b/dlls/nvapi/tests/Makefile.in
-index a94df01..8f950f4 100644
+index a94df015e09..8f950f4f73f 100644
 --- a/dlls/nvapi/tests/Makefile.in
 +++ b/dlls/nvapi/tests/Makefile.in
@@ -1,5 +1,5 @@
@ -56,7 +54,7 @@ index a94df01..8f950f4 100644
 C_SRCS = \
 	nvapi.c
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index aeca45f..f4edcab 100644
+index 341b6084303..09b84f68a9c 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -25,6 +25,7 @@
@ -210,7 +208,7 @@ index aeca45f..f4edcab 100644
 +    test_NvAPI_D3D_GetCurrentSLIState();
 }
 diff --git a/include/nvapi.h b/include/nvapi.h
-index 2a13277..30c02cd 100644
+index 2a13277f564..30c02cd7268 100644
 --- a/include/nvapi.h
 +++ b/include/nvapi.h
@@ -35,6 +35,7 @@ typedef unsigned int NvU32;
@ -242,5 +240,5 @@ index 2a13277..30c02cd 100644
 typedef struct
 {
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0012-nvapi-Print-fixme-message-for-NvAPI_D3D9_StretchRect.patch
+++ b/patches/nvapi-Stub_DLL/0012-nvapi-Print-fixme-message-for-NvAPI_D3D9_StretchRect.patch
@ -1,25 +0,0 @@
-From 3927bd79cfd73dde183947e688eb2563ad001705 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 13 Jan 2015 02:21:07 +0100
-Subject: nvapi: Print fixme message for NvAPI_D3D9_StretchRectEx.
-
---
- dlls/nvapi/nvapi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 287e681..6852e24 100644
--- a/dlls/nvapi/nvapi.c
-+++ b/dlls/nvapi/nvapi.c
-@@ -402,7 +402,7 @@ static NvAPI_Status CDECL NvAPI_D3D9_StretchRectEx(IDirect3DDevice9 *pDevice, ID
-                                                    const RECT *pSourceRect, IDirect3DResource9 *pDestResource,
-                                                    const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter)
- {
-    TRACE("(%p, %p, %p, %p, %p, %d)\n", pDevice, pSourceResource, pSourceRect, pDestResource, pDestRect, Filter);
-+    FIXME("(%p, %p, %p, %p, %p, %d): stub\n", pDevice, pSourceResource, pSourceRect, pDestResource, pDestRect, Filter);
-     return NVAPI_UNREGISTERED_RESOURCE;
- }
- 
-- 
-1.9.1
-
--- a/patches/nvapi-Stub_DLL/0012-nvapi-tests-Use-structure-to-list-imports.patch
+++ b/patches/nvapi-Stub_DLL/0012-nvapi-tests-Use-structure-to-list-imports.patch
@ -57,7 +57,7 @@ index f4edcab..4db576e 100644
 +    {0x1e9d8a31, (void**) &pNvAPI_DISP_GetGDIPrimaryDisplayId},
 +    {0x9abdd40d, (void**) &pNvAPI_EnumNvidiaDisplayHandle},
 +    {0x2926aaad, (void**) &pNvAPI_SYS_GetDriverAndBranchVersion},
-+    {0x4b708b54, (void**) &pNvAPI_D3D_GetCurrentSLIState}
+    {0x4b708b54, (void**) &pNvAPI_D3D_GetCurrentSLIState},
 +};
 +
 static BOOL init(void)
--- a/patches/nvapi-Stub_DLL/0013-nvapi-Add-stub-for-NvAPI_GetLogicalGPUFromDisplay.patch
+++ b/patches/nvapi-Stub_DLL/0013-nvapi-Add-stub-for-NvAPI_GetLogicalGPUFromDisplay.patch
@ -1,16 +1,16 @@
-From 40f42d36dac8ea38381f05158daa97346059a61f Mon Sep 17 00:00:00 2001
+From e74cfb923ed8e79cb8a25133fdc6375c22cb9098 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 14 Jan 2015 21:48:53 +0100
 Subject: nvapi: Add stub for NvAPI_GetLogicalGPUFromDisplay.

 ---
- dlls/nvapi/nvapi.c       | 17 ++++++++++++++++-
- dlls/nvapi/tests/nvapi.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 15 +++++++++++++++
+ dlls/nvapi/tests/nvapi.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 include/nvapi.h          |  1 +
- 3 files changed, 64 insertions(+), 2 deletions(-)
+ 3 files changed, 62 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 6852e24..98658a6 100644
+index 0019a9869a6..52556f18fdc 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -550,6 +550,20 @@ static NvAPI_Status CDECL NvAPI_D3D_GetCurrentSLIState(IUnknown *pDevice, NV_GET
@ -34,18 +34,16 @@ index 6852e24..98658a6 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -588,7 +602,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x9abdd40d, NvAPI_EnumNvidiaDisplayHandle},
+@@ -589,6 +603,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion},
         {0xd22bdd7e, NvAPI_Unload},
-        {0x4b708b54, NvAPI_D3D_GetCurrentSLIState}
-+        {0x4b708b54, NvAPI_D3D_GetCurrentSLIState},
-+        {0xee1370cf, NvAPI_GetLogicalGPUFromDisplay}
+         {0x4b708b54, NvAPI_D3D_GetCurrentSLIState},
+        {0xee1370cf, NvAPI_GetLogicalGPUFromDisplay},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index 4db576e..297a335 100644
+index e484f358edb..c8b66ac2fa3 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -44,6 +44,7 @@ static NvAPI_Status (CDECL* pNvAPI_DISP_GetGDIPrimaryDisplayId)(NvU32* displayId
@ -56,13 +54,11 @@ index 4db576e..297a335 100644
 
 static const struct
 {
-@@ -65,7 +66,8 @@ function_list[] =
-     {0x1e9d8a31, (void**) &pNvAPI_DISP_GetGDIPrimaryDisplayId},
+@@ -66,6 +67,7 @@ function_list[] =
     {0x9abdd40d, (void**) &pNvAPI_EnumNvidiaDisplayHandle},
     {0x2926aaad, (void**) &pNvAPI_SYS_GetDriverAndBranchVersion},
-    {0x4b708b54, (void**) &pNvAPI_D3D_GetCurrentSLIState}
-+    {0x4b708b54, (void**) &pNvAPI_D3D_GetCurrentSLIState},
-+    {0xee1370cf, (void**) &pNvAPI_GetLogicalGPUFromDisplay}
+     {0x4b708b54, (void**) &pNvAPI_D3D_GetCurrentSLIState},
+    {0xee1370cf, (void**) &pNvAPI_GetLogicalGPUFromDisplay},
 };
 
 static BOOL init(void)
@ -125,7 +121,7 @@ index 4db576e..297a335 100644
     /* d3d9 tests */
     wc.lpfnWndProc = DefWindowProcA;
 diff --git a/include/nvapi.h b/include/nvapi.h
-index 30c02cd..e52e9b1 100644
+index 30c02cd7268..e52e9b1d774 100644
 --- a/include/nvapi.h
 +++ b/include/nvapi.h
@@ -29,6 +29,7 @@ typedef unsigned int NvU32;
@ -137,5 +133,5 @@ index 30c02cd..e52e9b1 100644
 #define NVAPI_INVALID_HANDLE -8
 #define NVAPI_INCOMPATIBLE_STRUCT_VERSION -9
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0014-nvapi-Add-stub-for-NvAPI_D3D_GetObjectHandleForResou.patch
+++ b/patches/nvapi-Stub_DLL/0014-nvapi-Add-stub-for-NvAPI_D3D_GetObjectHandleForResou.patch
@ -1,15 +1,15 @@
-From da4f75d39fd091fcd6cdad0b67181bbafae86748 Mon Sep 17 00:00:00 2001
+From 1710af67c64a6f8ff9f5230404349ec234221308 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 14 Jan 2015 22:13:57 +0100
 Subject: nvapi: Add stub for NvAPI_D3D_GetObjectHandleForResource.

 ---
- dlls/nvapi/nvapi.c | 9 ++++++++-
+ dlls/nvapi/nvapi.c | 7 +++++++
 include/nvapi.h    | 1 +
- 2 files changed, 9 insertions(+), 1 deletion(-)
+ 2 files changed, 8 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 98658a6..28483be 100644
+index 52556f18fdc..6bf960f79a8 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -564,6 +564,12 @@ static NvAPI_Status CDECL NvAPI_GetLogicalGPUFromDisplay(NvDisplayHandle hNvDisp
@ -25,18 +25,16 @@ index 98658a6..28483be 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -603,7 +609,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x2926aaad, NvAPI_SYS_GetDriverAndBranchVersion},
+@@ -604,6 +610,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0xd22bdd7e, NvAPI_Unload},
         {0x4b708b54, NvAPI_D3D_GetCurrentSLIState},
-        {0xee1370cf, NvAPI_GetLogicalGPUFromDisplay}
-+        {0xee1370cf, NvAPI_GetLogicalGPUFromDisplay},
-+        {0xfceac864, NvAPI_D3D_GetObjectHandleForResource}
+         {0xee1370cf, NvAPI_GetLogicalGPUFromDisplay},
+        {0xfceac864, NvAPI_D3D_GetObjectHandleForResource},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/include/nvapi.h b/include/nvapi.h
-index e52e9b1..ca95a1a 100644
+index e52e9b1d774..ca95a1ac5ee 100644
 --- a/include/nvapi.h
 +++ b/include/nvapi.h
@@ -55,6 +55,7 @@ typedef void *NvPhysicalGpuHandle;
@ -48,5 +46,5 @@ index e52e9b1..ca95a1a 100644
 typedef struct
 {
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0015-nvapi-Add-stub-for-NvAPI_D3D9_RegisterResource.patch
+++ b/patches/nvapi-Stub_DLL/0015-nvapi-Add-stub-for-NvAPI_D3D9_RegisterResource.patch
@ -1,14 +1,14 @@
-From 1da7ea0e73111f1dfbc9f8711e68c6a43eb9a23f Mon Sep 17 00:00:00 2001
+From c4ea0bd8f07199b3a7a68229cb206ed9a568d8e1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 14 Jan 2015 22:50:35 +0100
 Subject: nvapi: Add stub for NvAPI_D3D9_RegisterResource.

 ---
- dlls/nvapi/nvapi.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
+ dlls/nvapi/nvapi.c | 7 +++++++
+ 1 file changed, 7 insertions(+)

 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index 28483be..545bb5a 100644
+index 6bf960f79a8..942fe780c88 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -570,6 +570,12 @@ static NvAPI_Status CDECL NvAPI_D3D_GetObjectHandleForResource(IUnknown *pDevice
@ -24,16 +24,14 @@ index 28483be..545bb5a 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -610,7 +616,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0xd22bdd7e, NvAPI_Unload},
+@@ -611,6 +617,7 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0x4b708b54, NvAPI_D3D_GetCurrentSLIState},
         {0xee1370cf, NvAPI_GetLogicalGPUFromDisplay},
-        {0xfceac864, NvAPI_D3D_GetObjectHandleForResource}
-+        {0xfceac864, NvAPI_D3D_GetObjectHandleForResource},
-+        {0xa064bdfc, NvAPI_D3D9_RegisterResource}
+         {0xfceac864, NvAPI_D3D_GetObjectHandleForResource},
+        {0xa064bdfc, NvAPI_D3D9_RegisterResource},
     };
     unsigned int i;
     TRACE("(%x)\n", offset);
 -- 
-1.9.1
+2.13.1

--- a/patches/nvapi-Stub_DLL/0016-nvapi-Improve-NvAPI_D3D_GetCurrentSLIState.patch
+++ b/patches/nvapi-Stub_DLL/0016-nvapi-Improve-NvAPI_D3D_GetCurrentSLIState.patch
--- a/patches/nvapi-Stub_DLL/0017-nvapi-Implement-NvAPI_GPU_Get-Physical-Virtual-Frame.patch
+++ b/patches/nvapi-Stub_DLL/0017-nvapi-Implement-NvAPI_GPU_Get-Physical-Virtual-Frame.patch
@ -1,13 +1,13 @@
-From c4367b30ff8b1acb3e8fcbe027a749313d5a2d91 Mon Sep 17 00:00:00 2001
+From 83e27676c959aa8968d4db9c5ce898b4fe91b8f3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 27 Jun 2017 00:28:03 +0200
 Subject: nvapi: Implement NvAPI_GPU_Get{Physical,Virtual}FrameBufferSize.

 ---
 dlls/nvapi/Makefile.in   |  1 +
- dlls/nvapi/nvapi.c       | 76 +++++++++++++++++++++++++++++++++++++++++++++++-
+ dlls/nvapi/nvapi.c       | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
 dlls/nvapi64/Makefile.in |  1 +
- 3 files changed, 77 insertions(+), 1 deletion(-)
+ 3 files changed, 76 insertions(+)

 diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in
 index 606177f1f8b..6341254d9f6 100644
@ -20,7 +20,7 @@ index 606177f1f8b..6341254d9f6 100644
 C_SRCS = \
 	nvapi.c
 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
-index ad17354c140..372ae359ded 100644
+index 598267d6c86..372ae359ded 100644
 --- a/dlls/nvapi/nvapi.c
 +++ b/dlls/nvapi/nvapi.c
@@ -21,6 +21,7 @@
@ -116,12 +116,10 @@ index ad17354c140..372ae359ded 100644
 void* CDECL nvapi_QueryInterface(unsigned int offset)
 {
     static const struct
-@@ -630,7 +702,9 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
-         {0x4b708b54, NvAPI_D3D_GetCurrentSLIState},
+@@ -631,6 +703,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
         {0xee1370cf, NvAPI_GetLogicalGPUFromDisplay},
         {0xfceac864, NvAPI_D3D_GetObjectHandleForResource},
-        {0xa064bdfc, NvAPI_D3D9_RegisterResource}
-+        {0xa064bdfc, NvAPI_D3D9_RegisterResource},
+         {0xa064bdfc, NvAPI_D3D9_RegisterResource},
 +        {0x46fbeb03, NvAPI_GPU_GetPhysicalFrameBufferSize},
 +        {0x5a04b644, NvAPI_GPU_GetVirtualFrameBufferSize},
     };
--- a/patches/nvapi-Stub_DLL/0018-nvapi-Add-stub-for-NvAPI_GPU_GetGpuCoreCount.patch
+++ b/patches/nvapi-Stub_DLL/0018-nvapi-Add-stub-for-NvAPI_GPU_GetGpuCoreCount.patch
--- a/patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
+++ b/patches/nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
--- a/patches/nvapi-Stub_DLL/0020-nvapi-Implement-NvAPI_D3D11_CreateDevice-and-NvAPI_D.patch
+++ b/patches/nvapi-Stub_DLL/0020-nvapi-Implement-NvAPI_D3D11_CreateDevice-and-NvAPI_D.patch
@ -1,4 +1,4 @@
-From 5850953278f92568bc88418d322609bc593b115e Mon Sep 17 00:00:00 2001
+From 8d3a3d87d3b5d19662f85b1914d3e848f5bc9be3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 14 Jul 2017 09:37:11 +0200
 Subject: nvapi: Implement NvAPI_D3D11_CreateDevice and
@ -7,10 +7,10 @@ Subject: nvapi: Implement NvAPI_D3D11_CreateDevice and
 ---
 dlls/nvapi/Makefile.in   |  2 +-
 dlls/nvapi/nvapi.c       | 55 +++++++++++++++++++++++++++++++++++++++++++++
- dlls/nvapi/tests/nvapi.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++--
+ dlls/nvapi/tests/nvapi.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++-
 dlls/nvapi64/Makefile.in |  2 +-
 include/nvapi.h          |  9 ++++++++
- 5 files changed, 122 insertions(+), 4 deletions(-)
+ 5 files changed, 123 insertions(+), 3 deletions(-)

 diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in
 index 6341254d9f6..0ef540b2f7d 100644
@ -104,7 +104,7 @@ index 70f7b3e9f34..4640c681851 100644
     unsigned int i;
     TRACE("(%x)\n", offset);
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
-index 52ca1d89fca..f08f84b7958 100644
+index c8b66ac2fa3..143e767950b 100644
 --- a/dlls/nvapi/tests/nvapi.c
 +++ b/dlls/nvapi/tests/nvapi.c
@@ -18,6 +18,7 @@
@ -134,17 +134,15 @@ index 52ca1d89fca..f08f84b7958 100644
 
 static const struct
 {
-@@ -67,7 +71,8 @@ function_list[] =
-     {0x9abdd40d, (void**) &pNvAPI_EnumNvidiaDisplayHandle},
+@@ -68,6 +72,7 @@ function_list[] =
     {0x2926aaad, (void**) &pNvAPI_SYS_GetDriverAndBranchVersion},
     {0x4b708b54, (void**) &pNvAPI_D3D_GetCurrentSLIState},
-    {0xee1370cf, (void**) &pNvAPI_GetLogicalGPUFromDisplay}
-+    {0xee1370cf, (void**) &pNvAPI_GetLogicalGPUFromDisplay},
+     {0xee1370cf, (void**) &pNvAPI_GetLogicalGPUFromDisplay},
 +    {0x6a16d3a0, (void**) &pNvAPI_D3D11_CreateDevice},
 };
 
 static BOOL init(void)
-@@ -705,6 +710,54 @@ cleanup:
+@@ -705,6 +710,56 @@ cleanup:
     if (window) DestroyWindow(window);
 }
 
@ -153,7 +151,7 @@ index 52ca1d89fca..f08f84b7958 100644
 +    NVAPI_DEVICE_FEATURE_LEVEL level_nvapi;
 +    D3D_FEATURE_LEVEL level_d3d;
 +    ID3D11Device *device;
-+    HRESULT hr;
+    NvAPI_Status status;
 +
 +    if (!pNvAPI_D3D11_CreateDevice)
 +    {
@ -161,8 +159,9 @@ index 52ca1d89fca..f08f84b7958 100644
 +        return;
 +    }
 +
-+    hr = pNvAPI_D3D11_CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &device, &level_d3d, NULL, &level_nvapi);
-+    ok(hr == S_OK, "Failed to create device: %#08x\n", hr);
+    status = pNvAPI_D3D11_CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0,
+                                       D3D11_SDK_VERSION, &device, &level_d3d, NULL, &level_nvapi);
+    ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
 +
 +    switch (level_d3d)
 +    {
@ -184,22 +183,23 @@ index 52ca1d89fca..f08f84b7958 100644
 +            break;
 +    }
 +
-+    if (SUCCEEDED(hr))
+    if (status == NVAPI_OK)
 +        ID3D11Device_Release(device);
 +
 +    level_d3d = D3D_FEATURE_LEVEL_9_1;
-+    hr = pNvAPI_D3D11_CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &level_d3d, 1, D3D11_SDK_VERSION, &device, NULL, NULL, &level_nvapi);
-+    ok(hr == S_OK, "Failed to create device: %#08x\n", hr);
+    status = pNvAPI_D3D11_CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &level_d3d, 1,
+                                       D3D11_SDK_VERSION, &device, NULL, NULL, &level_nvapi);
+    ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
 +    ok(level_nvapi == NVAPI_DEVICE_FEATURE_LEVEL_NULL, "Expected level NVAPI_DEVICE_FEATURE_LEVEL_NULL, got %d\n", level_nvapi);
 +
-+    if (SUCCEEDED(hr))
+    if (status == NVAPI_OK)
 +        ID3D11Device_Release(device);
 +}
 +
 START_TEST( nvapi )
 {
     WNDCLASSA wc = {0};
-@@ -724,6 +777,7 @@ START_TEST( nvapi )
+@@ -724,6 +779,7 @@ START_TEST( nvapi )
     test_NvAPI_EnumNvidiaDisplayHandle();
     test_NvAPI_SYS_GetDriverAndBranchVersion();
     test_NvAPI_GetLogicalGPUFromDisplay();
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@ -6855,16 +6855,15 @@ if test "$enable_nvapi_Stub_DLL" -eq 1; then
 	patch_apply nvapi-Stub_DLL/0009-nvapi-Add-stub-for-NvAPI_SYS_GetDriverAndBranchVersi.patch
 	patch_apply nvapi-Stub_DLL/0010-nvapi-Add-stub-for-NvAPI_Unload.patch
 	patch_apply nvapi-Stub_DLL/0011-nvapi-Add-stub-for-NvAPI_D3D_GetCurrentSLIState.patch
-	patch_apply nvapi-Stub_DLL/0012-nvapi-Print-fixme-message-for-NvAPI_D3D9_StretchRect.patch
-	patch_apply nvapi-Stub_DLL/0013-nvapi-tests-Use-structure-to-list-imports.patch
-	patch_apply nvapi-Stub_DLL/0014-nvapi-Add-stub-for-NvAPI_GetLogicalGPUFromDisplay.patch
-	patch_apply nvapi-Stub_DLL/0015-nvapi-Add-stub-for-NvAPI_D3D_GetObjectHandleForResou.patch
-	patch_apply nvapi-Stub_DLL/0016-nvapi-Add-stub-for-NvAPI_D3D9_RegisterResource.patch
-	patch_apply nvapi-Stub_DLL/0017-nvapi-Improve-NvAPI_D3D_GetCurrentSLIState.patch
-	patch_apply nvapi-Stub_DLL/0018-nvapi-Implement-NvAPI_GPU_Get-Physical-Virtual-Frame.patch
-	patch_apply nvapi-Stub_DLL/0019-nvapi-Add-stub-for-NvAPI_GPU_GetGpuCoreCount.patch
-	patch_apply nvapi-Stub_DLL/0020-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
-	patch_apply nvapi-Stub_DLL/0021-nvapi-Implement-NvAPI_D3D11_CreateDevice-and-NvAPI_D.patch
+	patch_apply nvapi-Stub_DLL/0012-nvapi-tests-Use-structure-to-list-imports.patch
+	patch_apply nvapi-Stub_DLL/0013-nvapi-Add-stub-for-NvAPI_GetLogicalGPUFromDisplay.patch
+	patch_apply nvapi-Stub_DLL/0014-nvapi-Add-stub-for-NvAPI_D3D_GetObjectHandleForResou.patch
+	patch_apply nvapi-Stub_DLL/0015-nvapi-Add-stub-for-NvAPI_D3D9_RegisterResource.patch
+	patch_apply nvapi-Stub_DLL/0016-nvapi-Improve-NvAPI_D3D_GetCurrentSLIState.patch
+	patch_apply nvapi-Stub_DLL/0017-nvapi-Implement-NvAPI_GPU_Get-Physical-Virtual-Frame.patch
+	patch_apply nvapi-Stub_DLL/0018-nvapi-Add-stub-for-NvAPI_GPU_GetGpuCoreCount.patch
+	patch_apply nvapi-Stub_DLL/0019-nvapi-Implement-NvAPI_D3D11_SetDepthBoundsTest.patch
+	patch_apply nvapi-Stub_DLL/0020-nvapi-Implement-NvAPI_D3D11_CreateDevice-and-NvAPI_D.patch
 	(
 		printf '%s\n' '+    { "Michael Müller", "nvapi: First implementation.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "nvapi: Add stubs for NvAPI_EnumLogicalGPUs and undocumented equivalent.", 1 },';
@ -6877,7 +6876,6 @@ if test "$enable_nvapi_Stub_DLL" -eq 1; then
 		printf '%s\n' '+    { "Michael Müller", "nvapi: Add stub for NvAPI_SYS_GetDriverAndBranchVersion.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "nvapi: Add stub for NvAPI_Unload.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "nvapi: Add stub for NvAPI_D3D_GetCurrentSLIState.", 1 },';
-		printf '%s\n' '+    { "Michael Müller", "nvapi: Print fixme message for NvAPI_D3D9_StretchRectEx.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "nvapi/tests: Use structure to list imports.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "nvapi: Add stub for NvAPI_GetLogicalGPUFromDisplay.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "nvapi: Add stub for NvAPI_D3D_GetObjectHandleForResource.", 1 },';