Jacek Caban : vulkan-1: Make sure that user32 is loaded before ICD.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 35413f9217e56209784032f749b97c481d3b4c84
URL:    https://gitlab.winehq.org/wine/wine/-/commit/35413f9217e56209784032f749b97c4...

Author: Jacek Caban 
Date:   Wed Apr  6 22:49:28 2022 +0200

vulkan-1: Make sure that user32 is loaded before ICD.

---

dlls/vulkan-1/Makefile.in |  5 ++++-
 dlls/vulkan-1/vulkan.c    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in
index a4a10bc8e93..9c4dca9a880 100644
--- a/dlls/vulkan-1/Makefile.in
+++ b/dlls/vulkan-1/Makefile.in
@@ -1,7 +1,10 @@
 MODULE    = vulkan-1.dll
-IMPORTS   = winevulkan
+IMPORTS   = user32
 IMPORTLIB = vulkan-1

EXTRADLLFLAGS = -Wb,--prefer-native

RC_SRCS = version.rc
+
+C_SRCS = \
+	vulkan.c
diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c
new file mode 100644
index 00000000000..ab40260d9bd
--- /dev/null
+++ b/dlls/vulkan-1/vulkan.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 Jacek Caban for CodeWeavers
+ *
+ * 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 <windows.h>
+#include "wine/debug.h"
+
+
+BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
+{
+    if (reason != DLL_PROCESS_ATTACH) return TRUE;
+
+    DisableThreadLibraryCalls(hinst);
+    GetDpiForSystem(); /* make sure that user32 is loaded */
+    return TRUE;
+}