nvapi-Stub_DLL: Build nvapi.dll only on 32-bit systems and nvapi64.dll only on 64-bit systems.

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

@@ -1,10 +1,10 @@
-From 8ef1cf2176dfab90c442465c13b2ad25d144f441 Mon Sep 17 00:00:00 2001
+From ef18cdddb0a8f9876920d4718b84262dd0cd7fd1 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.
 
 ---
- configure.ac                 |   3 +
+ configure.ac                 |   9 +
  dlls/nvapi/Makefile.in       |   4 +
  dlls/nvapi/nvapi.c           | 462 +++++++++++++++++++++++++++++++++++++++++++
  dlls/nvapi/nvapi.spec        |   5 +
@@ -14,7 +14,7 @@ Subject: nvapi: First implementation.
  dlls/nvapi64/nvapi64.spec    |   5 +
  include/Makefile.in          |   1 +
  include/nvapi.h              |  76 +++++++
- 10 files changed, 842 insertions(+)
+ 10 files changed, 848 insertions(+)
  create mode 100644 dlls/nvapi/Makefile.in
  create mode 100644 dlls/nvapi/nvapi.c
  create mode 100644 dlls/nvapi/nvapi.spec
@@ -25,14 +25,27 @@ Subject: nvapi: First implementation.
  create mode 100644 include/nvapi.h
 
 diff --git a/configure.ac b/configure.ac
-index 43c33bf..efc143a 100644
+index 73e67bb..f76fa4d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3125,6 +3125,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests)
+@@ -188,6 +188,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}
++if test "x$enable_win64" != "xyes"
++then
++  enable_win32="yes"
++else
++  enable_win32="no"
++fi
+ 
+ dnl Disable winetest too if tests are disabled
+ enable_winetest=${enable_winetest:-$enable_tests}
+@@ -3125,6 +3131,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests)
  WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
  WINE_CONFIG_DLL(ntprint)
  WINE_CONFIG_TEST(dlls/ntprint/tests)
-+WINE_CONFIG_DLL(nvapi)
++WINE_CONFIG_DLL(nvapi,enable_win32)
 +WINE_CONFIG_TEST(dlls/nvapi/tests)
 +WINE_CONFIG_DLL(nvapi64,enable_win64)
  WINE_CONFIG_DLL(nvcuda)
@@ -937,5 +950,5 @@ index 0000000..4204256
 +
 +#endif /* __WINE_NVAPI_H */
 -- 
-1.9.1
+2.2.1
 

patches/wined3d-CSMT_Main/9999-IfDefined.patch

@@ -9552,7 +9552,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
-@@ -4731,9 +4731,15 @@
+@@ -5181,9 +5181,15 @@
      DebugBreak();
  }