Ticket #8549: scummvm-win-inifix_v4.diff

config-manager.cpp

@@ -97 +97 @@
                 strcpy(configFile, DEFAULT_CONFIG_FILE);
 #else
         #if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+                // Check windows directory
                 GetWindowsDirectory(configFile, MAXPATHLEN);
                 strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
+                if (fopen(configFile, "r") == NULL) {
+                        OSVERSIONINFO win32OsVersion;
+                        ZeroMemory(&win32OsVersion, sizeof(OSVERSIONINFO));
+                        win32OsVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+                        GetVersionEx(&win32OsVersion);
+                        // Check for non-9X version of Windows.
+                        if (win32OsVersion.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) {
+                                // Use the Application Data directory of the user profile.
+                                int bytesRead;
+                                if (win32OsVersion.dwMajorVersion >= 5)
+                                        bytesRead = GetEnvironmentVariable("APPDATA", configFile, sizeof(configFile));
+                                else {
+                                        bytesRead = GetEnvironmentVariable("USERPROFILE", configFile, sizeof(configFile));
+                                        if (bytesRead > 0) {
+                                                strcat(configFile, "\\Application Data");
+                                                CreateDirectory(configFile, NULL);
+                                        }
+                                }
+
+                                //Use APPDATA/USERPROFILE if found, otherwise fall back to Windows directory.
+                                if (bytesRead > 0) {
+                                        strcat(configFile, "\\ScummVM");
+                                        CreateDirectory(configFile, NULL);
+                                        strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
+                                } else {
+                                        GetWindowsDirectory(configFile, MAXPATHLEN);
+                                        strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
+                                }
+                        }
+                }
+
         #elif defined(PALMOS_MODE)
                 strcpy(configFile,"/PALM/Programs/ScummVM/" DEFAULT_CONFIG_FILE);
         #elif defined(__PLAYSTATION2__)