Changeset 4098 for trunk/src

Timestamp:

Aug 27, 2000, 5:25:42 AM (25 years ago)

Author:

bird

Message:

Corrected bug in PROFILE_LoadOdinIni.

File:

• trunk/src/kernel32/profile.cpp (modified) (3 diffs)

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.23 2000-07-06 21:18:44 sandervl Exp $ */
+/* $Id: profile.cpp,v 1.24 2000-08-27 03:25:42 bird Exp $ */
 
 /*
@@ -33 +33 @@
 #define DBG_LOCALLOG    DBG_profile
 #include "dbglocal.h"
+
+#include "initterm.h"
 
 ODINDEBUGCHANNEL(PROFILE)
@@ -967 +969 @@
       strncpy(PROFILE_OdinIniUsed,p,MAX_PATHNAME_LEN);
       PROFILE_OdinIniUsed[MAX_PATHNAME_LEN-1] = 0;
-    } 
+    }
     else
     {
+      #if 0 /* Aug 27 2000 4:26am: Why not use the global kernel32Path
+             *                (LoadLibrary may cause harm if used...) */
       HINSTANCE hInstance = LoadLibraryA("KERNEL32.DLL");
       GetModuleFileNameA(hInstance,PROFILE_OdinIniUsed,sizeof(PROFILE_OdinIniUsed));
       FreeLibrary(hInstance);
       strcpy(strrchr(PROFILE_OdinIniUsed,'\\')+1,ODINININAME);
-      f = fopen(PROFILE_OdinIniUsed,"r");
+      #else
+      strcpy(PROFILE_OdinIniUsed, kernel32Path);
+      strcat(PROFILE_OdinIniUsed, ODINININAME);
+      #endif
+      f = fopen(PROFILE_OdinIniUsed, "r");
       PROFILE_OdinProfile = PROFILE_Load(f);
       fclose(f);