Alexandre Julliard : hid: Use --prefer-native instead of DLL_WINE_PREATTACH.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 30e7c49a7f1ce3a979bd34e7ff0911cccaff6ef5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=30e7c49a7f1ce3a979bd34e7ff0911cccaff6ef5

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 18 11:44:18 2021 +0100

hid: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/hid/Makefile.in |  5 ++---
 dlls/hid/hidd.c      |  1 +
 dlls/hid/main.c      | 44 --------------------------------------------
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in
index c9ae5f0e567..0146ebd8102 100644
--- a/dlls/hid/Makefile.in
+++ b/dlls/hid/Makefile.in
@@ -1,11 +1,10 @@
 MODULE    = hid.dll
 IMPORTLIB = hid
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	hidd.c \
-	hidp.c \
-	main.c
+	hidp.c
 
 RC_SRCS = version.rc
diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c
index 4bb4deb48b3..684ad5b5df8 100644
--- a/dlls/hid/hidd.c
+++ b/dlls/hid/hidd.c
@@ -32,6 +32,7 @@
 #include "ddk/wdm.h"
 
 #include "hidusage.h"
+#include "initguid.h"
 #include "ddk/hidclass.h"
 #include "ddk/hidsdi.h"
 
diff --git a/dlls/hid/main.c b/dlls/hid/main.c
deleted file mode 100644
index 6c53f118582..00000000000
--- a/dlls/hid/main.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Human Input Devices
- *
- * Copyright (C) 2006 Kevin Koltzau
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-
-#include "wine/debug.h"
-#include "initguid.h"
-#include "ddk/hidclass.h"
-
-/***********************************************************************/
-
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
-{
-    switch(fdwReason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;  /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hInstDLL);
-            break;
-    }
-    return TRUE;
-}