Rebase against 50f889fd19d329bef7c001f9eafd1030fc1e3a56.

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

@@ -1,4 +1,4 @@
-From 75e63f301be09d0e1e858bc4bde5774468852b1a Mon Sep 17 00:00:00 2001
+From 689a5a7bf13f6e809967907537de85ec28c04d8f 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 32cf76bb8fc..f83ae22cf5e 100644
+index 40aed003e11..80ee05a0959 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -238,6 +238,12 @@ enable_win16=${enable_win16:-no}
+@@ -232,6 +232,12 @@ enable_win16=${enable_win16:-no}
  enable_win64=${enable_win64:-no}
  enable_wow64=${enable_wow64:-no}
  enable_wow64win=${enable_wow64win:-no}
@@ -41,7 +41,7 @@ index 32cf76bb8fc..f83ae22cf5e 100644
  enable_wow64cpu=${enable_wow64cpu:-no}
  
  dnl Disable winetest too if tests are disabled
-@@ -3569,6 +3575,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
+@@ -3459,6 +3465,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)
@@ -858,13 +858,13 @@ index 00000000000..f0c054b2bf9
 +@ stub DllRegisterServer
 +@ stub DllUnregisterServer
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 0cb69abe5d0..cd60b036710 100644
+index 4085fa679db..a303c90689c 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -549,6 +549,7 @@ SOURCES = \
- 	ntsecapi.h \
+@@ -555,6 +555,7 @@ SOURCES = \
  	ntsecpkg.h \
  	ntstatus.h \
+ 	ntuser.h \
 +	nvapi.h \
  	oaidl.idl \
  	objbase.h \
@@ -952,5 +952,5 @@ index 00000000000..4204256cca2
 +
 +#endif /* __WINE_NVAPI_H */
 -- 
-2.30.2
+2.33.0