Changeset 1574 for trunk/src

Timestamp:

Nov 3, 1999, 8:34:40 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

• trunk/src/comdlg32/cdlg32.cpp (modified) (5 diffs)

trunk/src/comdlg32/cdlg32.cpp

@@ -1 @@
-/* $Id: cdlg32.cpp,v 1.2 1999-11-02 20:37:42 sandervl Exp $ */
+/* $Id: cdlg32.cpp,v 1.3 1999-11-03 19:34:40 sandervl Exp $ */
 /*
  *  Common Dialog Boxes interface (32 bit)
@@ -30 +30 @@
 HINSTANCE       COMCTL32_hInstance = 0;
 HINSTANCE       SHELL32_hInstance = 0;
+HINSTANCE       SHLWAPI_hInstance = 0;
 
 /* DPA */
@@ -105 +106 @@
                 COMCTL32_hInstance = LoadLibraryA("COMCTL32.DLL");      
                 SHELL32_hInstance = LoadLibraryA("SHELL32.DLL");
-                
-                if (!COMCTL32_hInstance || !SHELL32_hInstance)
+                SHLWAPI_hInstance = LoadLibraryA("SHLWAPI.DLL");
+                
+                if (!COMCTL32_hInstance || !SHELL32_hInstance || !SHLWAPI_hInstance)
                 {
                         ERR("loading of comctl32 or shell32 or shlwapi failed\n");
@@ -149 +151 @@
 
                 /* PATH */
-                *(VOID **)&COMDLG32_PathMatchSpecW = (void*)GetProcAddress(SHELL32_hInstance,"PathMatchSpecW");
-                *(VOID **)&COMDLG32_PathIsRootA = (void*)GetProcAddress(SHELL32_hInstance,"PathIsRootA");
-                *(VOID **)&COMDLG32_PathRemoveFileSpecA = (void*)GetProcAddress(SHELL32_hInstance,"PathRemoveFileSpecA");
-                *(VOID **)&COMDLG32_PathFindFilenameA = (void*)GetProcAddress(SHELL32_hInstance,"PathFindFileNameA");
-                *(VOID **)&COMDLG32_PathAddBackslashA = (void*)GetProcAddress(SHELL32_hInstance,"PathAddBackslashA");
+                *(VOID **)&COMDLG32_PathMatchSpecW = (void*)GetProcAddress(SHLWAPI_hInstance,"PathMatchSpecW");
+                *(VOID **)&COMDLG32_PathIsRootA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathIsRootA");
+                *(VOID **)&COMDLG32_PathRemoveFileSpecA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathRemoveFileSpecA");
+                *(VOID **)&COMDLG32_PathFindFilenameA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathFindFileNameA");
+                *(VOID **)&COMDLG32_PathAddBackslashA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathAddBackslashA");
                 break;
 
@@ -165 +167 @@
                 FreeLibrary(COMCTL32_hInstance);
                 FreeLibrary(SHELL32_hInstance);
+                FreeLibrary(SHLWAPI_hInstance);
                 break;
         }