From a20a59f0c2306588ebde23bd40a8afb5b03ae5b1 Mon Sep 17 00:00:00 2001
From: Juergen Schmied <juergen.schmied@metronet.de>
Date: Sat, 7 Aug 1999 12:32:42 +0000
Subject: [PATCH] Explicitly load shell32.dll.

---
 dlls/commdlg/cdlg32.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dlls/commdlg/cdlg32.c b/dlls/commdlg/cdlg32.c
index 93f64fb04c5..d94b2bb4473 100644
--- a/dlls/commdlg/cdlg32.c
+++ b/dlls/commdlg/cdlg32.c
@@ -22,6 +22,8 @@ static DWORD	COMDLG32_TlsIndex;
 static int	COMDLG32_Attach = 0;
 
 HINSTANCE	COMCTL32_hInstance = 0;
+HINSTANCE	SHELL32_hInstance = 0;
+
 HDPA	(WINAPI* COMDLG32_DPA_Create) (INT);  
 LPVOID	(WINAPI* COMDLG32_DPA_GetPtr) (const HDPA, INT);   
 LPVOID	(WINAPI* COMDLG32_DPA_DeletePtr) (const HDPA hdpa, INT i);
@@ -81,6 +83,13 @@ BOOL WINAPI COMDLG32_DllEntryPoint(HINSTANCE hInstance, DWORD Reason, LPVOID Res
 		}
 
 		COMCTL32_hInstance = LoadLibraryA("COMCTL32.DLL");	
+		SHELL32_hInstance = LoadLibraryA("SHELL32.DLL");
+		
+		if (!COMCTL32_hInstance || !SHELL32_hInstance)
+		{
+			ERR("loading of comctl32 or shell32 failed\n");
+			return FALSE;
+		}
 
 		COMDLG32_DPA_Create=(void*)GetProcAddress(COMCTL32_hInstance, (LPCSTR)328L);
 		COMDLG32_DPA_Destroy=(void*)GetProcAddress(COMCTL32_hInstance, (LPCSTR)329L);
@@ -103,8 +112,9 @@ BOOL WINAPI COMDLG32_DllEntryPoint(HINSTANCE hInstance, DWORD Reason, LPVOID Res
 			if(COMDLG32_hInstance16)
 				FreeLibrary16(COMDLG32_hInstance16);
 
-			FreeLibrary(COMCTL32_hInstance);
 		}
+		FreeLibrary(COMCTL32_hInstance);
+		FreeLibrary(SHELL32_hInstance);
 		break;
 	}
 	return TRUE;