r876 - trunk/platform

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-03-26 03:51:57 -0400 (Mon, 26 Mar 2007)
New Revision: 876

Modified:
   trunk/platform/windows.c
Log:
Man, I knew I would need getOSInfo() as soon as I deleted it!

Apparently Win9x has the Unicode entry points, they just don't work, so
 only do a real lookup on NT-based platforms, and just force the 
 fallbacks on 95/98/ME systems.


Modified: trunk/platform/windows.c
===================================================================
--- trunk/platform/windows.c	2007-03-26 06:46:03 UTC (rev 875)
+++ trunk/platform/windows.c	2007-03-26 07:51:57 UTC (rev 876)
@@ -104,7 +104,9 @@
     int readonly;
 } WinApiFile;
 
+
 static char *userDir = NULL;
+static int osHasUnicode = 0;
 
 
 /* pointers for APIs that may not exist on some Windows versions... */
@@ -263,37 +265,46 @@
 {
     HMODULE dll = NULL;
 
-    #define LOOKUP_NOFALLBACK(x) { symLookup(dll, (void **) &p##x, #x); }
-    #define LOOKUP(x) { \
-        if (!symLookup(dll, (void **) &p##x, #x)) \
+    #define LOOKUP_NOFALLBACK(x, reallyLook) { \
+        if (reallyLook) \
+            symLookup(dll, (void **) &p##x, #x); \
+        else \
+            p##x = NULL; \
+    }
+
+    #define LOOKUP(x, reallyLook) { \
+        if ((!reallyLook) || (!symLookup(dll, (void **) &p##x, #x))) \
             p##x = fallback##x; \
     }
 
+    /* Apparently Win9x HAS the Unicode entry points, they just don't WORK. */
+    /*  ...so don't look them up unless we're on NT+. (see osHasUnicode.) */
+
     dll = libUserEnv = LoadLibraryA("userenv.dll");
     if (dll != NULL)
-        LOOKUP_NOFALLBACK(GetUserProfileDirectoryW);
+        LOOKUP_NOFALLBACK(GetUserProfileDirectoryW, osHasUnicode);
 
     /* !!! FIXME: what do they call advapi32.dll on Win64? */
     dll = libAdvApi32 = LoadLibraryA("advapi32.dll");
     if (dll != NULL)
-        LOOKUP(GetUserNameW);
+        LOOKUP(GetUserNameW, osHasUnicode);
 
     /* !!! FIXME: what do they call kernel32.dll on Win64? */
     dll = libKernel32 = LoadLibraryA("kernel32.dll");
     if (dll != NULL)
     {
-        LOOKUP_NOFALLBACK(GetFileAttributesExA);
-        LOOKUP_NOFALLBACK(GetFileAttributesExW);
-        LOOKUP(GetModuleFileNameW);
-        LOOKUP(FormatMessageW);
-        LOOKUP_NOFALLBACK(FindFirstFileW);
-        LOOKUP_NOFALLBACK(FindNextFileW);
-        LOOKUP(GetFileAttributesW);
-        LOOKUP(GetCurrentDirectoryW);
-        LOOKUP(CreateDirectoryW);
-        LOOKUP(RemoveDirectoryW);
-        LOOKUP(CreateFileW);
-        LOOKUP(DeleteFileW);
+        LOOKUP_NOFALLBACK(GetFileAttributesExA, 1);
+        LOOKUP_NOFALLBACK(GetFileAttributesExW, osHasUnicode);
+        LOOKUP_NOFALLBACK(FindFirstFileW, osHasUnicode);
+        LOOKUP_NOFALLBACK(FindNextFileW, osHasUnicode);
+        LOOKUP(GetModuleFileNameW, osHasUnicode);
+        LOOKUP(FormatMessageW, osHasUnicode);
+        LOOKUP(GetFileAttributesW, osHasUnicode);
+        LOOKUP(GetCurrentDirectoryW, osHasUnicode);
+        LOOKUP(CreateDirectoryW, osHasUnicode);
+        LOOKUP(RemoveDirectoryW, osHasUnicode);
+        LOOKUP(CreateFileW, osHasUnicode);
+        LOOKUP(DeleteFileW, osHasUnicode);
     } /* if */
 
     #undef LOOKUP_NOFALLBACK
@@ -873,8 +884,24 @@
 } /* __PHYSFS_platformMkDir */
 
 
+ /*
+  * Get OS info and save the important parts.
+  *
+  * Returns non-zero if successful, otherwise it returns zero on failure.
+  */
+ static int getOSInfo(void)
+ {
+     OSVERSIONINFO osVerInfo;     /* Information about the OS */
+     osVerInfo.dwOSVersionInfoSize = sizeof(osVerInfo);
+     BAIL_IF_MACRO(!GetVersionEx(&osVerInfo), winApiStrError(), 0);
+     osHasUnicode = (osVerInfo.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS);
+     return(1);
+ } /* getOSInfo */
+
+
 int __PHYSFS_platformInit(void)
 {
+    BAIL_IF_MACRO(!getOSInfo(), NULL, 0);
     BAIL_IF_MACRO(!findApiSymbols(), NULL, 0);
     BAIL_IF_MACRO(!determineUserDir(), NULL, 0);
     return(1);  /* It's all good */