r908 - in trunk: . code/win32

[DONOTREPLY at icculus.org]

Author: tjw
Date: 2006-09-13 19:52:54 -0400 (Wed, 13 Sep 2006)
New Revision: 908

Modified:
   trunk/README
   trunk/code/win32/win_shared.c
Log:
Bug 2813
* reverted my recent win95, win98, winme homepath change.  it turns out these
  systems can be configured to have multiple user directories afterall


Modified: trunk/README
===================================================================
--- trunk/README	2006-09-13 22:55:53 UTC (rev 907)
+++ trunk/README	2006-09-13 23:52:54 UTC (rev 908)
@@ -24,7 +24,7 @@
   * Support for various esoteric operating systems (see
     http://icculus.org/quake3/?page=status)
   * HTTP/FTP download redirection (using cURL)
-  * Multiuser support on Windows NT based systems (user specific game data
+  * Multiuser support on Windows systems (user specific game data
     is stored in "%APPDATA%\Quake3")
   * Many, many bug fixes
 
@@ -236,19 +236,26 @@
     it will use the value of the cvar cl_cURLLib as the filename of the cURL
     library to dynamically load. 
 
-Multiuser Support on Windows NT based sysems
-    On Windows NT based systems (e.g. Windows XP), all user specific files such
-    as autogenerated configuration, demos, videos, screenshots, and
-    autodownloaded pk3s are now saved in a directory specific to the
-    user who is running ioquake3.  On systems using the English language, 
-    this is usually a directory named:
+Multiuser Support on Windows systems
+    On Windows, all user specific files such as autogenerated configuration,
+    demos, videos, screenshots, and autodownloaded pk3s are now saved in a
+    directory specific to the user who is running ioquake3.
+
+    On NT-based such as Windows XP, this is usually a directory named:
       "C:\Documents and Settings\%USERNAME%\Application Data\Quake3\"
 
+    Windows 95, Windows 98, and Windows ME will use a directory like: 
+      "C:\Windows\Application Data\Quake3"
+    in single-user mode, or:
+      "C:\Windows\Profiles\%USERNAME%\Application Data\Quake3"
+    if multiple logins have been enabled. 
+
     In order to access this directory more easily, the installer may create a
     Shortcut which has its target set to:
       "%APPDATA%\Quake3\"
-    Such a link would work for all users and would work on non-English versions
-    of Windows.
+    This Shortcut would work for all users on the system regardless of the
+    locale settings.  Unfortunately, this environment variable is only 
+    present on Windows NT based systems.
     
     You can revert to the old single-user behaviour by setting the fs_homepath
     cvar to the directory where ioquake3 is installed.  For example:

Modified: trunk/code/win32/win_shared.c
===================================================================
--- trunk/code/win32/win_shared.c	2006-09-13 22:55:53 UTC (rev 907)
+++ trunk/code/win32/win_shared.c	2006-09-13 23:52:54 UTC (rev 908)
@@ -288,14 +288,6 @@
 	TCHAR szPath[MAX_PATH];
 	static char path[MAX_OSPATH];
 
-	// do not bother using a seperate home directory on versions of
-	// windows that do not offer true per-user home directories 
-	// (win98, win95, winme)
-	g_wv.osversion.dwOSVersionInfoSize = sizeof( g_wv.osversion );
-	GetVersionEx( &g_wv.osversion );
-	if( g_wv.osversion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
-		return NULL;
-
 	if( !SUCCEEDED( SHGetFolderPath( NULL, CSIDL_APPDATA,
 		NULL, 0, szPath ) ) )
 	{