optimized last commit to not retrieve the function repeatedly if it has already failed.

coelckers · madame-rachelle · commit d8bd9189f82f · 2024-04-21T08:39:18.000-04:00
diff --git a/libraries/ZWidget/src/window/win32/win32window.cpp b/libraries/ZWidget/src/window/win32/win32window.cpp
@@ -275,10 +275,12 @@ typedef UINT(WINAPI* GetDpiForWindow_t)(HWND);
 double Win32Window::GetDpiScale() const
 {
 	static GetDpiForWindow_t pGetDpiForWindow = nullptr;
-	if (!pGetDpiForWindow)
+	static bool done = false;
+	if (!done)
 	{
-		HMODULE hMod = LoadLibrary(TEXT("User32.dll"));
-		pGetDpiForWindow = reinterpret_cast<GetDpiForWindow_t>(GetProcAddress(hMod, "GetDpiForWindow"));
+		HMODULE hMod = GetModuleHandleA("User32.dll");
+		if (hMod != nullptr) pGetDpiForWindow = reinterpret_cast<GetDpiForWindow_t>(GetProcAddress(hMod, "GetDpiForWindow"));
+		done = true;
 	}
 
 	if (pGetDpiForWindow)

Original file line number	Diff line number	Diff line change
`@@ -275,10 +275,12 @@ typedef UINT(WINAPI* GetDpiForWindow_t)(HWND);`
`275`	`275`	`double Win32Window::GetDpiScale() const`
`276`	`276`	`{`
`277`	`277`	`static GetDpiForWindow_t pGetDpiForWindow = nullptr;`
`278`		`- if (!pGetDpiForWindow)`
	`278`	`+ static bool done = false;`
	`279`	`+ if (!done)`
`279`	`280`	`{`
`280`		`- HMODULE hMod = LoadLibrary(TEXT("User32.dll"));`
`281`		`- pGetDpiForWindow = reinterpret_cast<GetDpiForWindow_t>(GetProcAddress(hMod, "GetDpiForWindow"));`
	`281`	`+ HMODULE hMod = GetModuleHandleA("User32.dll");`
	`282`	`+ if (hMod != nullptr) pGetDpiForWindow = reinterpret_cast<GetDpiForWindow_t>(GetProcAddress(hMod, "GetDpiForWindow"));`
	`283`	`+ done = true;`
`282`	`284`	`}`
`283`	`285`
`284`	`286`	`if (pGetDpiForWindow)`