From 4cea402c50eea1ef0b2919034410620010264fd1 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 20 Feb 2018 20:20:32 +1100
Subject: [PATCH] Updated nvapi-Stub_DLL patchset

---
 .../0001-nvapi-First-implementation.patch     | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
index 299fcfa8..8c56d84f 100644
--- a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
+++ b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
@@ -1,7 +1,7 @@
-From 2eda3b378d4d2d16faf413aebc414a893fd035c1 Mon Sep 17 00:00:00 2001
+From 05c9bc5495e04fc20d4a06efc4966f3d926e6468 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.
+Subject: [PATCH] nvapi: First implementation.
 
 ---
  configure.ac                 |   9 +
@@ -25,10 +25,10 @@ Subject: nvapi: First implementation.
  create mode 100644 include/nvapi.h
 
 diff --git a/configure.ac b/configure.ac
-index 8a98996..efe32af 100644
+index 38b4e3e..1083cb1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -190,6 +190,12 @@ esac
+@@ -214,6 +214,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,7 +41,8 @@ index 8a98996..efe32af 100644
  
  dnl Disable winetest too if tests are disabled
  enable_winetest=${enable_winetest:-$enable_tests}
-@@ -3159,4 +3165,7 @@ WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
+@@ -3535,6 +3541,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests)
+ WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl])
  WINE_CONFIG_DLL(ntprint)
  WINE_CONFIG_TEST(dlls/ntprint/tests)
 +WINE_CONFIG_DLL(nvapi,enable_win32)
@@ -49,9 +50,10 @@ index 8a98996..efe32af 100644
 +WINE_CONFIG_DLL(nvapi64,enable_win64)
  WINE_CONFIG_DLL(nvcuda)
  WINE_CONFIG_TEST(dlls/nvcuda/tests)
+ WINE_CONFIG_DLL(objsel,,[clean])
 diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in
 new file mode 100644
-index 00000000000..606177f1f8b
+index 0000000..606177f
 --- /dev/null
 +++ b/dlls/nvapi/Makefile.in
 @@ -0,0 +1,4 @@
@@ -61,7 +63,7 @@ index 00000000000..606177f1f8b
 +	nvapi.c
 diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
 new file mode 100644
-index 00000000000..51de61703d0
+index 0000000..51de617
 --- /dev/null
 +++ b/dlls/nvapi/nvapi.c
 @@ -0,0 +1,462 @@
@@ -529,7 +531,7 @@ index 00000000000..51de61703d0
 +}
 diff --git a/dlls/nvapi/nvapi.spec b/dlls/nvapi/nvapi.spec
 new file mode 100644
-index 00000000000..f0c054b2bf9
+index 0000000..f0c054b
 --- /dev/null
 +++ b/dlls/nvapi/nvapi.spec
 @@ -0,0 +1,5 @@
@@ -540,7 +542,7 @@ index 00000000000..f0c054b2bf9
 +@ stub DllUnregisterServer
 diff --git a/dlls/nvapi/tests/Makefile.in b/dlls/nvapi/tests/Makefile.in
 new file mode 100644
-index 00000000000..a94df015e09
+index 0000000..a94df01
 --- /dev/null
 +++ b/dlls/nvapi/tests/Makefile.in
 @@ -0,0 +1,5 @@
@@ -551,7 +553,7 @@ index 00000000000..a94df015e09
 +	nvapi.c
 diff --git a/dlls/nvapi/tests/nvapi.c b/dlls/nvapi/tests/nvapi.c
 new file mode 100644
-index 00000000000..d760a184141
+index 0000000..d760a18
 --- /dev/null
 +++ b/dlls/nvapi/tests/nvapi.c
 @@ -0,0 +1,276 @@
@@ -833,7 +835,7 @@ index 00000000000..d760a184141
 +}
 diff --git a/dlls/nvapi64/Makefile.in b/dlls/nvapi64/Makefile.in
 new file mode 100644
-index 00000000000..80e2d6bfb20
+index 0000000..80e2d6b
 --- /dev/null
 +++ b/dlls/nvapi64/Makefile.in
 @@ -0,0 +1,5 @@
@@ -844,7 +846,7 @@ index 00000000000..80e2d6bfb20
 +	nvapi.c
 diff --git a/dlls/nvapi64/nvapi64.spec b/dlls/nvapi64/nvapi64.spec
 new file mode 100644
-index 00000000000..f0c054b2bf9
+index 0000000..f0c054b
 --- /dev/null
 +++ b/dlls/nvapi64/nvapi64.spec
 @@ -0,0 +1,5 @@
@@ -854,20 +856,20 @@ index 00000000000..f0c054b2bf9
 +@ stub DllRegisterServer
 +@ stub DllUnregisterServer
 diff --git a/include/Makefile.in b/include/Makefile.in
-index df98dda1cdd..60c1f3439b1 100644
+index 60b2a41..b7bf57f 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -537,6 +537,7 @@ HEADER_SRCS = \
+@@ -477,6 +477,7 @@ SOURCES = \
  	ntsecapi.h \
  	ntsecpkg.h \
  	ntstatus.h \
 +	nvapi.h \
+ 	oaidl.idl \
  	objbase.h \
- 	objsel.h \
- 	odbcinst.h \
+ 	objectarray.idl \
 diff --git a/include/nvapi.h b/include/nvapi.h
 new file mode 100644
-index 00000000000..4204256cca2
+index 0000000..4204256
 --- /dev/null
 +++ b/include/nvapi.h
 @@ -0,0 +1,76 @@
@@ -948,5 +950,5 @@ index 00000000000..4204256cca2
 +
 +#endif /* __WINE_NVAPI_H */
 -- 
-2.13.1
+1.9.1