Changeset 3544 for trunk/src/comdlg32/cdlg32.cpp

Timestamp:

May 16, 2000, 10:00:13 PM (25 years ago)

Author:

sandervl

Message:

import directly from dlls; not dynamically -> fixes crash due to recent shlwapi changes

File:

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

trunk/src/comdlg32/cdlg32.cpp

@@ -1 @@
-/* $Id: cdlg32.cpp,v 1.4 1999-11-20 16:00:14 achimha Exp $ */
+/* $Id: cdlg32.cpp,v 1.5 2000-05-16 20:00:13 sandervl Exp $ */
 /*
  *  Common Dialog Boxes interface (32 bit)
@@ -29 +29 @@
 
 HINSTANCE       COMCTL32_hInstance = 0;
+
+#ifndef __WIN32OS2__
 HINSTANCE       SHELL32_hInstance = 0;
 HINSTANCE       SHLWAPI_hInstance = 0;
@@ -66 +68 @@
 BOOL (WINAPI *COMDLG32_PathMatchSpecW)(LPCWSTR x, LPCWSTR y);
 LPSTR (WINAPI *COMDLG32_PathAddBackslashA)(LPSTR path);
+#endif
 
 /***********************************************************************
@@ -104 +107 @@
                 }
 
+#ifndef __WIN32OS2__
                 COMCTL32_hInstance = LoadLibraryA("COMCTL32.DLL");      
                 SHELL32_hInstance = LoadLibraryA("SHELL32.DLL");
@@ -156 +160 @@
                 *(VOID **)&COMDLG32_PathFindFilenameA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathFindFileNameA");
                 *(VOID **)&COMDLG32_PathAddBackslashA = (void*)GetProcAddress(SHLWAPI_hInstance,"PathAddBackslashA");
+#endif
                 break;
 
@@ -165 +170 @@
 
                 }
+#ifndef __WIN32OS2__
                 FreeLibrary(COMCTL32_hInstance);
                 FreeLibrary(SHELL32_hInstance);
                 FreeLibrary(SHLWAPI_hInstance);
+#endif
                 break;
         }