nvapi-Stub_DLL: Remove unnecessary DLL_WINE_PREATTACH check.

This commit is contained in:
Sebastian Lackner 2015-01-07 10:40:48 +01:00
parent 1f5939c74a
commit 2e6bd2290e

View File

@ -1,4 +1,4 @@
From 645fe9f2724f45ccbf259e3622393bba5fc44743 Mon Sep 17 00:00:00 2001
From d66a88dca92c1e409b6a51781f8b0330eae61623 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.
@ -6,7 +6,7 @@ Subject: nvapi: First implementation.
---
configure.ac | 3 +
dlls/nvapi/Makefile.in | 4 +
dlls/nvapi/nvapi.c | 462 +++++++++++++++++++++++++++++++++++++++++++
dlls/nvapi/nvapi.c | 460 +++++++++++++++++++++++++++++++++++++++++++
dlls/nvapi/nvapi.spec | 5 +
dlls/nvapi/tests/Makefile.in | 5 +
dlls/nvapi/tests/nvapi.c | 265 +++++++++++++++++++++++++
@ -14,7 +14,7 @@ Subject: nvapi: First implementation.
dlls/nvapi64/nvapi64.spec | 5 +
include/Makefile.in | 1 +
include/nvapi.h | 74 +++++++
10 files changed, 829 insertions(+)
10 files changed, 827 insertions(+)
create mode 100644 dlls/nvapi/Makefile.in
create mode 100644 dlls/nvapi/nvapi.c
create mode 100644 dlls/nvapi/nvapi.spec
@ -50,10 +50,10 @@ index 0000000..606177f
+ nvapi.c
diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
new file mode 100644
index 0000000..1741a48
index 0000000..fdaf21d
--- /dev/null
+++ b/dlls/nvapi/nvapi.c
@@ -0,0 +1,462 @@
@@ -0,0 +1,460 @@
+/*
+ * Copyright (C) 2015 Michael Müller
+ * Copyright (C) 2015 Sebastian Lackner
@ -503,8 +503,6 @@ index 0000000..1741a48
+ TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+ switch (reason)
+ {
+ case DLL_WINE_PREATTACH:
+ return TRUE; /* prefer native version */
+ case DLL_PROCESS_ATTACH:
+ DisableThreadLibraryCalls(instance);
+ init_thunks();
@ -832,10 +830,10 @@ index 0000000..f0c054b
+@ stub DllRegisterServer
+@ stub DllUnregisterServer
diff --git a/include/Makefile.in b/include/Makefile.in
index afd4a21..5f3798a 100644
index 84c3ea7..f9eaf44 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -476,6 +476,7 @@ SRCDIR_INCLUDES = \
@@ -477,6 +477,7 @@ SRCDIR_INCLUDES = \
ntsecapi.h \
ntsecpkg.h \
ntstatus.h \
@ -924,5 +922,5 @@ index 0000000..1980895
+
+#endif /* __WINE_NVAPI_H */
--
1.9.1
2.2.1