From 8c4e6525314edbb879c66a710e4e69aa530a47f9 Mon Sep 17 00:00:00 2001 From: Slawomir Cygan Date: Mon, 21 Oct 2019 12:36:53 +0200 Subject: vulkaninfo: load user32.dll dynamically Instead of depending on user32.dll, this library is now loaded dynamically. This change is needed to redistribute vulkaninfo.exe as a part of "universal" windows driverm, by making vulkaninfo pass the 'ApiValidator' test. See more here https://docs.microsoft.com/en-us/windows-hardware/drivers/develop/validating-universal-drivers Change-Id: I79a28cbb5d761b33ab673994a2b578c4044f5a90 Author: Kamil Szypryt --- vulkaninfo/vulkaninfo.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'vulkaninfo/vulkaninfo.cpp') diff --git a/vulkaninfo/vulkaninfo.cpp b/vulkaninfo/vulkaninfo.cpp index fae81475..bab61ee7 100644 --- a/vulkaninfo/vulkaninfo.cpp +++ b/vulkaninfo/vulkaninfo.cpp @@ -28,6 +28,19 @@ #include "vulkaninfo.hpp" +#ifdef _WIN32 +// Initialize User32 pointers +PFN_AdjustWindowRect User32Handles::pfnAdjustWindowRect = nullptr; +PFN_CreateWindowExA User32Handles::pfnCreateWindowExA = nullptr; +PFN_DefWindowProcA User32Handles::pfnDefWindowProcA = nullptr; +PFN_DestroyWindow User32Handles::pfnDestroyWindow = nullptr; +PFN_LoadIconA User32Handles::pfnLoadIconA = nullptr; +PFN_RegisterClassExA User32Handles::pfnRegisterClassExA = nullptr; + +HMODULE User32Handles::user32DllHandle = nullptr; + +#endif + // =========== Dump Functions ========= // void DumpExtensions(Printer &p, std::string layer_name, std::vector extensions) { @@ -676,6 +689,11 @@ void print_usage(const char *argv0) { int main(int argc, char **argv) { #ifdef _WIN32 if (ConsoleIsExclusive()) ConsoleEnlarge(); + if (!LoadUser32Dll()) { + fprintf(stderr, "Failed to load user32.dll library!\n"); + WAIT_FOR_CONSOLE_DESTROY; + exit(1); + } #endif uint32_t selected_gpu = 0; @@ -790,6 +808,9 @@ int main(int argc, char **argv) { #endif WAIT_FOR_CONSOLE_DESTROY; +#ifdef _WIN32 + FreeUser32Dll(); +#endif return 0; } -- cgit v1.2.3