wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7be72ce2a708ec88aa2362352f37db30529251c4.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-11-02 10:28:15 +11:00
parent acb054627a
commit bd2608b12c
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch
View File

@@ -1,10 +1,10 @@
From 689a5a7bf13f6e809967907537de85ec28c04d8f Mon Sep 17 00:00:00 2001
From 3b711fd2f449364855e985f834373361d760bddb 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.
---
configure.ac | 9 +
configure.ac | 10 +
dlls/nvapi/Makefile.in | 6 +
dlls/nvapi/nvapi.c | 460 +++++++++++++++++++++++++++++++++++
dlls/nvapi/nvapi.spec | 5 +
@@ -14,7 +14,7 @@ Subject: [PATCH] nvapi: First implementation.
dlls/nvapi64/nvapi64.spec | 5 +
include/Makefile.in | 1 +
include/nvapi.h | 76 ++++++
10 files changed, 850 insertions(+)
10 files changed, 851 insertions(+)
create mode 100644 dlls/nvapi/Makefile.in
create mode 100644 dlls/nvapi/nvapi.c
create mode 100644 dlls/nvapi/nvapi.spec
@@ -25,23 +25,24 @@ Subject: [PATCH] nvapi: First implementation.
create mode 100644 include/nvapi.h
diff --git a/configure.ac b/configure.ac
index 40aed003e11..80ee05a0959 100644
index 67551950263..8c64eeb79be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,6 +232,12 @@ enable_win16=${enable_win16:-no}
enable_win64=${enable_win64:-no}
enable_wow64=${enable_wow64:-no}
enable_wow64win=${enable_wow64win:-no}
@@ -199,6 +199,13 @@ enable_wow64=${enable_wow64:-aarch64,x86_64}
enable_wow64win=${enable_wow64win:-aarch64,x86_64}
enable_wow64cpu=${enable_wow64cpu:-x86_64}
+if test "x$enable_win64" != "xyes"
+then
+ enable_win32="yes"
+else
+ enable_win32="no"
+fi
enable_wow64cpu=${enable_wow64cpu:-no}
+
dnl Disable winetest too if tests are disabled
@@ -3459,6 +3465,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
enable_winetest=${enable_winetest:-$enable_tests}
@@ -2966,6 +2973,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,10 +859,10 @@ index 00000000000..f0c054b2bf9
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
diff --git a/include/Makefile.in b/include/Makefile.in
index 4085fa679db..a303c90689c 100644
index f971a95f7f9..5f2efa538eb 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -555,6 +555,7 @@ SOURCES = \
@@ -572,6 +572,7 @@ SOURCES = \
ntsecpkg.h \
ntstatus.h \
ntuser.h \
@@ -952,5 +953,5 @@ index 00000000000..4204256cca2
+
+#endif /* __WINE_NVAPI_H */
--
2.33.0
2.38.1