* Start on integrating Sheldon Gills NSPathUtilities patches.

* Headers/Foundation/NSPathUtilities.h: Depreciate
GSSystemRootDirectory, GSStandardPathPrefixes. Add
GSPreferencesDirectory to NSSearchPathDirectory enum. Enumerate
NSSearchPathDomainMask values.
* Headers/Additions/GNUStepBase/Win32Support.h,
Headers/Additions/GNUStepBase/Win32_Utilites.h: New files.
* Source/GNUmakefile: Add NSPathUtilities.m
* Source/NSUser.m: Move everything in here...
* Source/NSPathUtilities.m: to here.
* Source/win32/GNUmakefile: Add Win32Support.m, Win32_Utilities.m
* Source/win32Win32Support.m, Win32_Utilities.m: New files
* Testing/nspathutilites.m: New file.
(Files and patches from Sheldon Gill with minor modifications).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20837 72102866-910b-0410-8b05-ffd578937521

Source/win32/GNUmakefile

@@ -32,7 +32,9 @@ SUBPROJECT_NAME = win32
 win32_OBJC_FILES =\
 	GSRunLoopCtxt.m \
 	GSRunLoopWatcher.m \
-	NSRunLoopWin32.m
+	NSRunLoopWin33.m \
+	Win32Support.m \
+	Win32_Utilities.m
 
 -include Makefile.preamble
 

Source/win32/Win32Support.m

@@ -0,0 +1,46 @@
+/* Useful support functions for GNUstep under MS-Windows
+   Copyright (C) 2004-2005 Free Software Foundation, Inc.
+   
+   Written by:  Sheldon Gill <address@hidden>
+   Created: Dec 2003
+
+   This file is part of the GNUstep Base Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+  */
+
+#include "Win32_Utilities.h"
+//#include "Win32_FileManagement.h"
+
+/*
+ * Perform any and all necessary initialisation for supporting Win32
+ * Called after first part of library initialisation so some Obj-C is okay
+ */
+void Win32Initialise(void)
+{
+  /* We call the initialisation routines of all support modules in turn */
+  Win32_Utilities_init();
+// Win32_FileManagement_init();
+}
+
+/*
+ * Free and finalise all things for supporting Win32
+ */
+void Win32Finalise(void)
+{
+  /* We call the finalisation routines of all support modules in turn */
+  Win32_Utilities_fini(void);
+// Win32_FileManagement_fini();
+}

Source/win32/Win32_Utilities.m

@@ -0,0 +1,219 @@
+/* Useful support functions for GNUstep under MS-Windows
+   Copyright (C) 2004-2005 Free Software Foundation, Inc.
+   
+   Written by:  Sheldon Gill <address@hidden>
+   Created: Dec 2003
+
+   This file is part of the GNUstep Base Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+   
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+  */
+#include <Foundation/NSString.h>
+#include <Foundation/NSProcessInfo.h>
+#include <Foundation/NSException.h>
+
+#include "Win32_Utilities.h"
+
+/* ------------------ */
+/* Internal Variables */
+/* ------------------ */
+
+/* ------+---------+---------+---------+---------+---------+---------+---------+
+#pragma mark -
+#pragma mark -<Registry functions>-
+---------+---------+---------+---------+---------+---------+---------+------- */
+
+/**
+ * Returns a hive key or 0 if unable.
+ */
+HKEY
+Win32OpenRegistry(DWORD hive, const char *key)
+{
+  HKEY regkey;
+  
+  if (ERROR_SUCCESS == RegOpenKeyEx(hive, key, 0, KEY_READ, &regkey))
+    {
+      return regkey;
+    }
+
+  return 0;
+}
+
+/**
+ * Returns an NSString as read from a registry STRING value.
+ */
+NSString *
+Win32NSStringFromRegistry(HKEY regkey, const char *regValue)
+{
+  char buf[MAX_PATH];
+  DWORD bufsize=MAX_PATH;
+  DWORD type;
+
+  if (ERROR_SUCCESS==RegQueryValueEx(regkey, regValue, 0, &type, buf, &bufsize))
+    {
+      // FIXME: Check type is correct!
+      
+      bufsize=strlen(buf);
+      while (bufsize && isspace(buf[bufsize-1]))
+        {
+          bufsize--;
+        }
+      return [NSString stringWithCString:buf length:bufsize];
+    }
+  return nil;
+}
+
+// NSNumber *Win32NSNumberFromRegistry(HKEY regkey, const char *regValue);
+// NSData   *Win32NSDataFromRegistry(HKEY regkey, const char *regValue);
+
+/* ------+---------+---------+---------+---------+---------+---------+---------+
+#pragma mark -
+#pragma mark -<Environment functions>-
+---------+---------+---------+---------+---------+---------+---------+------- */
+
+/**
+ * Obtains an NSString for the environment variable named envVar.
+ */
+NSString *
+Win32NSStringFromEnvironmentVariable(const char * envVar)
+{
+  char buf[1024], *nb;
+  DWORD n;
+  NSString *s = nil;
+
+  [gnustep_global_lock lock];
+  n = GetEnvironmentVariable(envVar, buf, 1024);
+  if (n > 1024)
+    {
+      /* Buffer not big enough, so dynamically allocate it */
+      nb = (char *)NSZoneMalloc(NSDefaultMallocZone(), sizeof(char)*(n+1));
+      if (nb != NULL)
+        {
+          n = GetEnvironmentVariable(envVar, nb, n+1);
+          nb[n] = '\0';
+          s = [NSString stringWithCString: nb];
+          NSZoneFree(NSDefaultMallocZone(), nb);
+        }
+    }
+  else if (n > 0)
+    {
+      /* null terminate it and return the string */
+      buf[n] = '\0';
+      s = [NSString stringWithCString: buf];
+    }
+  [gnustep_global_lock unlock];
+  return s;
+}
+
+/* ------+---------+---------+---------+---------+---------+---------+---------+
+#pragma mark -
+#pragma mark -<Path functions>-
+---------+---------+---------+---------+---------+---------+---------+------- */
+/**
+ * Locates the users profile directory, roughly equivalent to ~/ on unix
+ */
+NSString *
+Win32GetUserProfileDirectory(NSString *userName)
+{
+  if ([loginName isEqual: NSUserName()] == YES)
+    {
+      [gnustep_global_lock lock];
+      /*
+       * The environment variable HOMEPATH holds the home directory
+       * for the user on Windows NT;
+       * For OPENSTEP compatibility (and because USERPROFILE is usually
+       * unusable because it contains spaces), we use HOMEPATH in
+       * preference to USERPROFILE.
+       */
+      s = Win32NSStringFromEnvironmentVariable("HOMEPATH");
+      if (s != nil && ([s length] < 2 || [s characterAtIndex: 1] != ':'))
+        {
+          s = [Win32NSStringFromEnvironmentVariable("HOMEDRIVE")
+            stringByAppendingString: s];
+        }
+      if (s == nil)
+        {
+          s = Win32NSStringFromEnvironmentVariable("USERPROFILE");
+        }
+
+      if (s == nil)
+        {
+          ; // FIXME: Talk to the NET API and get the profile path
+        }
+
+      [gnustep_global_lock unlock];
+    }
+  else
+    {
+      s = nil;
+      NSLog(@"Not implemented! Can't determine other user home directories in Win32.");    
+    }
+  
+  if ([s length] == 0 && [loginName length] != 1)
+    {
+      s = nil;
+      NSLog(@"NSHomeDirectoryForUser(%@) failed", loginName);
+    }
+
+  return s;
+}
+
+/**
+ * Locates specified directory on Win32 systems
+ */
+NSString *
+Win32FindDirectory( int DirCSIDL)
+{
+  [NSException raise: NSInternalInconsistencyException
+              format: @"Not implemented! Can't find directories in Win32."];    
+}
+
+/**
+ * Initialises resources required by utilities
+ */
+void Win32_Utilities_init(void)
+{
+  /*
+   * Initialise the COM sub-system for this application
+   */
+  CoCreateInstance();
+
+  /*
+   * Look for the libraries we need
+   */
+// GetDLLVersion
+
+  /*
+   * Get pointers to the Explorer Shell memory functions
+   */
+//  IShellMalloc, IShellFree
+//  SHGetFolder
+  ;
+}
+
+/**
+ * Closes down and releases resources
+ */
+void Win32_Utilities_fini(void)
+{
+  /*
+   * Release the pointers for Explorer Shell functions
+   */
+  ;
+}
+
+#endif // defined(__WIN32)
+// EOF
+