Alexandre Julliard : d3drm: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Mon Feb 22 15:43:21 CST 2021
Module: wine
Branch: master
Commit: 7526f9d434e0f4135e2d8ef26ef9101badd9320e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7526f9d434e0f4135e2d8ef26ef9101badd9320e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Feb 22 09:24:28 2021 +0100
d3drm: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3drm/Makefile.in | 2 +-
dlls/d3drm/d3drm_main.c | 16 ----------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in
index 1c2cbf4c9f9..db7f25609cf 100644
--- a/dlls/d3drm/Makefile.in
+++ b/dlls/d3drm/Makefile.in
@@ -2,7 +2,7 @@ MODULE = d3drm.dll
IMPORTLIB = d3drm
IMPORTS = d3dxof ddraw
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
d3drm.c \
diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c
index 075b331e051..be7b8101fe8 100644
--- a/dlls/d3drm/d3drm_main.c
+++ b/dlls/d3drm/d3drm_main.c
@@ -20,22 +20,6 @@
#include "initguid.h"
#include "d3drm_private.h"
-/***********************************************************************
- * DllMain (D3DRM.@)
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls( inst );
- break;
- }
- return TRUE;
-}
-
void d3drm_object_init(struct d3drm_object *object, const char *classname)
{
object->ref = 1;
More information about the wine-cvs
mailing list