fix: apply dll load macro to win32gui

mhammond · Jun 24, 2024 · a1cbfc3 · a1cbfc3
1 parent c32cf79
commit a1cbfc3
Showing 1 changed file with 27 additions and 36 deletions.
diff --git a/win32/src/win32gui.i b/win32/src/win32gui.i
@@ -266,42 +266,33 @@ for (PyMethodDef *pmd = win32guiMethods; pmd->ml_name; pmd++)
 		)
 		pmd->ml_flags = METH_VARARGS | METH_KEYWORDS;
 
-HMODULE hmodule=GetModuleHandle(TEXT("user32.dll"));
-if (hmodule==NULL)
-	hmodule=LoadLibrary(TEXT("user32.dll"));
-if (hmodule){
-	pfnSetLayeredWindowAttributes=(SetLayeredWindowAttributesfunc)GetProcAddress(hmodule,"SetLayeredWindowAttributes");
-	pfnGetLayeredWindowAttributes=(GetLayeredWindowAttributesfunc)GetProcAddress(hmodule,"GetLayeredWindowAttributes");
-	pfnUpdateLayeredWindow=(UpdateLayeredWindowfunc)GetProcAddress(hmodule,"UpdateLayeredWindow");
-	pfnAnimateWindow=(AnimateWindowfunc)GetProcAddress(hmodule,"AnimateWindow");
-	pfnGetMenuInfo=(GetMenuInfofunc)GetProcAddress(hmodule,"GetMenuInfo");
-	pfnSetMenuInfo=(SetMenuInfofunc)GetProcAddress(hmodule,"SetMenuInfo");
-	pfnDrawTextW=(DrawTextWfunc)GetProcAddress(hmodule, "DrawTextW");
-	}
-
-hmodule=GetModuleHandle(TEXT("gdi32.dll"));
-if (hmodule==NULL)
-	hmodule=LoadLibrary(TEXT("gdi32.dll"));
-if (hmodule){
-	pfnAngleArc=(AngleArcfunc)GetProcAddress(hmodule,"AngleArc");
-	pfnPlgBlt=(PlgBltfunc)GetProcAddress(hmodule,"PlgBlt");
-	pfnGetWorldTransform=(GetWorldTransformfunc)GetProcAddress(hmodule,"GetWorldTransform");
-	pfnSetWorldTransform=(SetWorldTransformfunc)GetProcAddress(hmodule,"SetWorldTransform");
-	pfnModifyWorldTransform=(ModifyWorldTransformfunc)GetProcAddress(hmodule,"ModifyWorldTransform");
-	pfnCombineTransform=(CombineTransformfunc)GetProcAddress(hmodule,"CombineTransform");
-	pfnMaskBlt=(MaskBltfunc)GetProcAddress(hmodule,"MaskBlt");
-	pfnGetLayout=(GetLayoutfunc)GetProcAddress(hmodule,"GetLayout");
-	pfnSetLayout=(SetLayoutfunc)GetProcAddress(hmodule,"SetLayout");
-	}
-
-hmodule=GetModuleHandle(TEXT("msimg32.dll"));
-if (hmodule==NULL)
-	hmodule=LoadLibrary(TEXT("msimg32.dll"));
-if (hmodule){
-	pfnGradientFill=(GradientFillfunc)GetProcAddress(hmodule,"GradientFill");
-	pfnTransparentBlt=(TransparentBltfunc)GetProcAddress(hmodule,"TransparentBlt");
-	pfnAlphaBlend=(AlphaBlendfunc)GetProcAddress(hmodule,"AlphaBlend");
-	}
+PYWIN_BEGIN_LOAD_LIBRARY("user32.dll")
+    pfnSetLayeredWindowAttributes = (SetLayeredWindowAttributesfunc)GetProcAddress(hmodule,"SetLayeredWindowAttributes");
+    pfnGetLayeredWindowAttributes = (GetLayeredWindowAttributesfunc)GetProcAddress(hmodule,"GetLayeredWindowAttributes");
+    pfnUpdateLayeredWindow = (UpdateLayeredWindowfunc)GetProcAddress(hmodule,"UpdateLayeredWindow");
+    pfnAnimateWindow = (AnimateWindowfunc)GetProcAddress(hmodule,"AnimateWindow");
+    pfnGetMenuInfo = (GetMenuInfofunc)GetProcAddress(hmodule,"GetMenuInfo");
+    pfnSetMenuInfo = (SetMenuInfofunc)GetProcAddress(hmodule,"SetMenuInfo");
+    pfnDrawTextW = (DrawTextWfunc)GetProcAddress(hmodule, "DrawTextW");
+PYWIN_END_LOAD_LIBRARY
+
+PYWIN_BEGIN_LOAD_LIBRARY("gdi32.dll")
+    pfnAngleArc = (AngleArcfunc)GetProcAddress(hmodule,"AngleArc");
+    pfnPlgBlt = (PlgBltfunc)GetProcAddress(hmodule,"PlgBlt");
+    pfnGetWorldTransform = (GetWorldTransformfunc)GetProcAddress(hmodule,"GetWorldTransform");
+    pfnSetWorldTransform = (SetWorldTransformfunc)GetProcAddress(hmodule,"SetWorldTransform");
+    pfnModifyWorldTransform = (ModifyWorldTransformfunc)GetProcAddress(hmodule,"ModifyWorldTransform");
+    pfnCombineTransform = (CombineTransformfunc)GetProcAddress(hmodule,"CombineTransform");
+    pfnMaskBlt = (MaskBltfunc)GetProcAddress(hmodule,"MaskBlt");
+    pfnGetLayout = (GetLayoutfunc)GetProcAddress(hmodule,"GetLayout");
+    pfnSetLayout = (SetLayoutfunc)GetProcAddress(hmodule,"SetLayout");
+PYWIN_END_LOAD_LIBRARY
+
+PYWIN_BEGIN_LOAD_LIBRARY("msimg32.dll")
+    pfnGradientFill = (GradientFillfunc)GetProcAddress(hmodule,"GradientFill");
+    pfnTransparentBlt = (TransparentBltfunc)GetProcAddress(hmodule,"TransparentBlt");
+    pfnAlphaBlend = (AlphaBlendfunc)GetProcAddress(hmodule,"AlphaBlend");
+PYWIN_END_LOAD_LIBRARY
 %}
 
 %{