Rebase against 3c2db20f66806074b047b0b3c76aa86ad79e3175.

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

@@ -1,4 +1,4 @@
-From d0a39d80d29ceee3358929d2b017a374f688ab2f Mon Sep 17 00:00:00 2001
+From 984214b365c072614c45f996074c092f3ca34d46 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 67f4376f9aa..4c74e6436a3 100644
+index 69674311deb..d0117589326 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -224,6 +224,12 @@ esac
+@@ -225,6 +225,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}
@@ -38,10 +38,10 @@ index 67f4376f9aa..4c74e6436a3 100644
 +else
 +  enable_win32="no"
 +fi
+ enable_wow64cpu=${enable_wow64cpu:-no}
  
  dnl Disable winetest too if tests are disabled
- enable_winetest=${enable_winetest:-$enable_tests}
-@@ -3557,6 +3563,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
+@@ -3559,6 +3565,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,7 +858,7 @@ index 00000000000..f0c054b2bf9
 +@ stub DllRegisterServer
 +@ stub DllUnregisterServer
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 41861c5af0d..78e9b15aad1 100644
+index 02ddf06df8f..f0600555cd9 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
 @@ -539,6 +539,7 @@ SOURCES = \