packager-DllMain: Use --prefer-native instead of DLL_WINE_PREATTACH.

patches/packager-DllMain/0001-packager-Prefer-native-version.patch

@@ -1,25 +1,25 @@
-From 35edeed55faa516480528c5c5e64ceedd45e29fb Mon Sep 17 00:00:00 2001
+From 8e4c76596335097ca35af9d289c2096dc274b4d3 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 6 Aug 2017 02:50:23 +0200
-Subject: packager: Prefer native version.
+Subject: [PATCH] packager: Prefer native version.
 
 ---
- dlls/packager/packager_main.c | 2 ++
- 1 file changed, 2 insertions(+)
+ dlls/packager/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c
-index c1d194e3684..af1ee224ca6 100644
---- a/dlls/packager/packager_main.c
-+++ b/dlls/packager/packager_main.c
-@@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-     TRACE("(%p, %u, %p)\n", instance, reason, reserved);
+diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in
+index a90014ce25d..747eed203ae 100644
+--- a/dlls/packager/Makefile.in
++++ b/dlls/packager/Makefile.in
+@@ -1,7 +1,7 @@
+ MODULE = packager.dll
+ IMPORTS = uuid shell32 shlwapi user32
  
-     switch(reason){
-+        case DLL_WINE_PREATTACH:
-+            return FALSE;  /* prefer native version */
-         case DLL_PROCESS_ATTACH:
-             g_instance = instance;
-             DisableThreadLibraryCalls(instance);
+-EXTRADLLFLAGS = -mno-cygwin
++EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+ 
+ C_SRCS = \
+ 	packager_main.c
 -- 
-2.13.1
+2.20.1
 

patches/patchinstall.sh

@@ -3352,7 +3352,7 @@ fi
 # |   *	[#43472] Prefer native version of packager.dll
 # |
 # | Modified files:
-# |   *	dlls/packager/packager_main.c
+# |   *	dlls/packager/Makefile.in
 # |
 if test "$enable_packager_DllMain" -eq 1; then
 	patch_apply packager-DllMain/0001-packager-Prefer-native-version.patch