[project @ 2005-04-15 14:33:49 by simonpj]

Update the CgCmmBranch (ghc directory) up to the HEAD ghc-6-4-branch-point

diff --git a/ghc/lib/compat/Compat/Directory.hs b/ghc/lib/compat/Compat/Directory.hs
index e6e4cd4..bce1da6 100644 (file)
--- a/ghc/lib/compat/Compat/Directory.hs
+++ b/ghc/lib/compat/Compat/Directory.hs
@@ -55,7 +55,7 @@ getAppUserDataDirectory appName = do
 #endif
 
 #if __GLASGOW_HASKELL__ && defined(mingw32_HOST_OS)
-foreign import ccall unsafe "directory.h __hscore_getFolderPath"
+foreign import stdcall unsafe "SHGetFolderPathA"
             c_SHGetFolderPath :: Ptr () 
                               -> CInt 
                               -> Ptr () 

diff --git a/ghc/lib/compat/cbits/directory.c b/ghc/lib/compat/cbits/directory.c
index 79d6cd4..af09655 100644 (file)
--- a/ghc/lib/compat/cbits/directory.c
+++ b/ghc/lib/compat/cbits/directory.c
@@ -1,96 +1,50 @@
-#include "HsFFI.h"
-
-#include "../../../includes/ghcconfig.h"
-
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#if HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-#include "directory.h"
-
-#define INLINE /* nothing */
-
-/*
- * Following code copied from libraries/base/includes/HsBase.h
- */
-
-#ifdef PATH_MAX
-/* A size that will contain many path names, but not necessarily all
- * (PATH_MAX is not defined on systems with unlimited path length,
- * e.g. the Hurd).
- */
-INLINE HsInt __compat_long_path_size() { return PATH_MAX; } 
-#else
-INLINE HsInt __compat_long_path_size() { return 4096; }
-#endif
-
-#if defined(mingw32_HOST_OS)
-
-/* Make sure we've got the reqd CSIDL_ constants in scope;
- * w32api header files are lagging a bit in defining the full set.
- */
-#if !defined(CSIDL_APPDATA)
-#define CSIDL_APPDATA 0x001a
-#endif
-#if !defined(CSIDL_PERSONAL)
-#define CSIDL_PERSONAL 0x0005
-#endif
-#if !defined(CSIDL_PROFILE)
-#define CSIDL_PROFILE 0x0028
-#endif
-#if !defined(CSIDL_WINDOWS)
-#define CSIDL_WINDOWS 0x0024
-#endif
-
-INLINE int __hscore_CSIDL_PROFILE()  { return CSIDL_PROFILE;  }
-INLINE int __hscore_CSIDL_APPDATA()  { return CSIDL_APPDATA;  }
-INLINE int __hscore_CSIDL_WINDOWS()  { return CSIDL_WINDOWS;  }
-INLINE int __hscore_CSIDL_PERSONAL() { return CSIDL_PERSONAL; }
-
-#if __GLASGOW_HASKELL__ < 604
-/*
- * Function: __hscore_getFolderPath()
- *
- * Late-bound version of SHGetFolderPath(), coping with OS versions
- * that have shell32's lacking that particular API.
- *
- */
-typedef HRESULT (*HSCORE_GETAPPFOLDERFUNTY)(HWND,int,HANDLE,DWORD,char*);
-int
-__hscore_getFolderPath(HWND hwndOwner,
-                      int nFolder,
-                      HANDLE hToken,
-                      DWORD dwFlags,
-                      char*  pszPath)
-{
-    static int loaded_dll = 0;
-    static HMODULE hMod = (HMODULE)NULL;
-    static HSCORE_GETAPPFOLDERFUNTY funcPtr = NULL;
-    /* The DLLs to try loading entry point from */
-    char* dlls[] = { "shell32.dll", "shfolder.dll" };
-    
-    if (loaded_dll < 0) {
-       return (-1);
-    } else if (loaded_dll == 0) {
-       int i;
-       for(i=0;i < sizeof(dlls); i++) {
-           hMod = LoadLibrary(dlls[i]);
-           if ( hMod != NULL &&
-                (funcPtr = (HSCORE_GETAPPFOLDERFUNTY)GetProcAddress(hMod, "SHGetFolderPathA")) ) {
-               loaded_dll = 1;
-               break;
-           }
-       }
-       if (loaded_dll == 0) {
-           loaded_dll = (-1);
-           return (-1);
-       }
-    }
-    /* OK, if we got this far the function has been bound */
-    return (int)funcPtr(hwndOwner,nFolder,hToken,dwFlags,pszPath);
-    /* ToDo: unload the DLL on shutdown? */
-}
-#endif /* __GLASGOW_HASKELL__ < 604 */
-#endif
+#include "../../../includes/ghcconfig.h"\r
+\r
+#include "HsFFI.h"\r
+\r
+#if HAVE_LIMITS_H\r
+#include <limits.h>\r
+#endif\r
+#if HAVE_WINDOWS_H\r
+#include <windows.h>\r
+#endif\r
+\r
+#define INLINE /* nothing */\r
+\r
+/*\r
+ * Following code copied from libraries/base/includes/HsBase.h\r
+ */\r
+\r
+#ifdef PATH_MAX\r
+/* A size that will contain many path names, but not necessarily all\r
+ * (PATH_MAX is not defined on systems with unlimited path length,\r
+ * e.g. the Hurd).\r
+ */\r
+INLINE HsInt __compat_long_path_size() { return PATH_MAX; } \r
+#else\r
+INLINE HsInt __compat_long_path_size() { return 4096; }\r
+#endif\r
+\r
+#if defined(mingw32_HOST_OS)\r
+\r
+/* Make sure we've got the reqd CSIDL_ constants in scope;\r
+ * w32api header files are lagging a bit in defining the full set.\r
+ */\r
+#if !defined(CSIDL_APPDATA)\r
+#define CSIDL_APPDATA 0x001a\r
+#endif\r
+#if !defined(CSIDL_PERSONAL)\r
+#define CSIDL_PERSONAL 0x0005\r
+#endif\r
+#if !defined(CSIDL_PROFILE)\r
+#define CSIDL_PROFILE 0x0028\r
+#endif\r
+#if !defined(CSIDL_WINDOWS)\r
+#define CSIDL_WINDOWS 0x0024\r
+#endif\r
+\r
+INLINE int __hscore_CSIDL_PROFILE()  { return CSIDL_PROFILE;  }\r
+INLINE int __hscore_CSIDL_APPDATA()  { return CSIDL_APPDATA;  }\r
+INLINE int __hscore_CSIDL_WINDOWS()  { return CSIDL_WINDOWS;  }\r
+INLINE int __hscore_CSIDL_PERSONAL() { return CSIDL_PERSONAL; }\r
+#endif\r