Alexandre Julliard : virtdisk: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Thu Feb 25 16:45:37 CST 2021
Module: wine
Branch: master
Commit: be791094542e8d7e8a83fef44973e4e0e3fc67d3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=be791094542e8d7e8a83fef44973e4e0e3fc67d3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 25 08:59:13 2021 +0100
virtdisk: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/virtdisk/Makefile.in | 2 +-
dlls/virtdisk/virtdisk_main.c | 19 -------------------
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in
index 463e1acbb7c..05290eccdc5 100644
--- a/dlls/virtdisk/Makefile.in
+++ b/dlls/virtdisk/Makefile.in
@@ -1,6 +1,6 @@
MODULE = virtdisk.dll
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
virtdisk_main.c
diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c
index 630a97b59bd..ef7f176704e 100644
--- a/dlls/virtdisk/virtdisk_main.c
+++ b/dlls/virtdisk/virtdisk_main.c
@@ -26,25 +26,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(virtdisk);
-/*****************************************************
- * DllMain (VIRTDISK.@)
- */
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
-{
- TRACE("(%p, %d, %p)\n", hinst, reason, reserved);
-
- switch (reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinst);
- break;
- }
-
- return TRUE;
-}
-
DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used)
{
ULONG temp_size = sizeof(STORAGE_DEPENDENCY_INFO);
More information about the wine-cvs
mailing list