Changeset 529 for trunk/src/kernel32/profile.cpp

Timestamp:

Aug 17, 1999, 6:35:30 PM (26 years ago)

Author:

phaller

Message:

Fix: removed ODINCRT remains

File:

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

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.8 1999-08-06 12:14:12 phaller Exp $ */
+/* $Id: profile.cpp,v 1.9 1999-08-17 16:35:10 phaller Exp $ */
 
 /*
@@ -10 +10 @@
  * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 1998 Patrick Haller
+ * Copyright 1999 Christoph Bratschi
  */
 
@@ -63 +64 @@
     BOOL             changed;
     PROFILESECTION  *section;
-    char            *filename;
+    char            *filename; //first open name
+    char            *fullname; //name with path
     time_t           mtime;
 } PROFILE;
@@ -79 +81 @@
 
 #define PROFILE_MAX_LINE_LEN   1024
+#define WINININAME "WIN.INI"
 
 /* Wine profile name in $HOME directory; must begin with slash */
@@ -91 +94 @@
 #define WINE_INI_GLOBAL ETCDIR "/wine.conf"
 
-static LPCWSTR wininiW = NULL;
+static LPCWSTR wininiW = NULL; //CB: never freed
 
 static CRITICAL_SECTION PROFILE_CritSect;
@@ -398 +401 @@
 
     // try to open file
-    file = fopen(CurProfile->filename, "w");
+    file = fopen(CurProfile->fullname, "w");
     if (!file)
     {
-        dprintf(("Kernel32:Profile:could not save profile file %s\n", CurProfile->filename));
+        dprintf(("Kernel32:Profile:could not save profile file %s\n", CurProfile->fullname));
         return FALSE;
     }
 
-    dprintf(("Kernel32:Profile:Saving %s\n", CurProfile->filename ));
+    dprintf(("Kernel32:Profile:Saving %s\n", CurProfile->fullname ));
     PROFILE_Save( file, CurProfile->section );
     fclose( file );
     CurProfile->changed = FALSE;
-    if(!stat(CurProfile->filename,&buf))
+    if(!stat(CurProfile->fullname,&buf))
        CurProfile->mtime=buf.st_mtime;
     return TRUE;
@@ -425 +428 @@
     PROFILE_Free( CurProfile->section );
     if (CurProfile->filename) HeapFree( SystemHeap, 0, CurProfile->filename );
+    if (CurProfile->fullname) HeapFree(SystemHeap,0,CurProfile->fullname);
     CurProfile->changed   = FALSE;
     CurProfile->section   = NULL;
     CurProfile->filename  = NULL;
+    CurProfile->fullname  = NULL;
     CurProfile->mtime     = 0;
 }
@@ -439 +444 @@
 static BOOL PROFILE_Open( LPCSTR filename )
 {
-    char buffer[MAX_PATHNAME_LEN];
     FILE *file = NULL;
     int i,j;
     struct stat buf;
     PROFILE *tempProfile;
+
+    if (!filename || filename[0] == 0) return FALSE;
 
     /* First time around */
@@ -454 +460 @@
           MRUProfile[i]->section=NULL;
           MRUProfile[i]->filename=NULL;
+          MRUProfile[i]->fullname=NULL;
           MRUProfile[i]->mtime=0;
          }
@@ -459 +466 @@
     /* Check for a match */
 
-    if (!strchr( filename, '/' ) &&
-        !strchr( filename, '\\' ) &&
-        !strchr( filename, ':' ))
-    {
-        GetWindowsDirectoryA( buffer, sizeof(buffer) );
-        strcat( buffer, "\\" );
-        strcat( buffer, filename );
-    }
-
     for(i=0;i<N_CACHED_PROFILES;i++)
       {
-       if ((MRUProfile[i]->filename && !strcmp( filename, MRUProfile[i]->filename )))
+       if (MRUProfile[i]->filename && (!strcmp(filename,MRUProfile[i]->filename) || !strcmp(filename,MRUProfile[i]->fullname)))
          {
           if(i)
@@ -480 +478 @@
              CurProfile=tempProfile;
             }
-          if(!stat(CurProfile->filename,&buf) && CurProfile->mtime==buf.st_mtime)
+          if(!stat(CurProfile->fullname,&buf) && CurProfile->mtime==buf.st_mtime)
              dprintf(("Kernel32:Profile:(%s): already opened (mru=%d)\n",
                               filename, i ));
@@ -504 +502 @@
     if(CurProfile->filename) PROFILE_ReleaseFile();
 
-    CurProfile->filename  = HEAP_strdupA( SystemHeap, 0, filename );
-
-    file = fopen( filename, "r" );
+    CurProfile->filename  = HEAP_strdupA(SystemHeap,0,filename);
+
+    /* check for path */
+
+    if (!strchr( filename,'/') ||
+        !strchr( filename,'\\') ||
+        !strchr( filename,':'))
+    {
+      char fullname[MAX_PATHNAME_LEN];
+
+      GetWindowsDirectoryA(fullname,sizeof(fullname));
+      strcat(fullname,"\\");
+      strcat(fullname,filename);
+      CurProfile->fullname  = HEAP_strdupA(SystemHeap,0,fullname);
+    } else CurProfile->fullname  = HEAP_strdupA(SystemHeap,0,filename);
+
+    file = fopen(CurProfile->fullname,"r");
     if (file)
     {
       dprintf(("Kernel32:Profile:(%s): found it in %s\n",
-               filename, filename ));
+               filename, CurProfile->fullname ));
 
         CurProfile->section = PROFILE_Load( file );
         fclose( file );
-        if(!stat(CurProfile->filename,&buf))
+        if(!stat(CurProfile->fullname,&buf))
            CurProfile->mtime=buf.st_mtime;
     }
@@ -520 +532 @@
     {
         /* Does not exist yet, we will create it in PROFILE_FlushFile */
-        dprintf(("Kernel32:Profile:profile file %s not found\n", filename ));
+        dprintf(("Kernel32:Profile:profile file %s not found\n", CurProfile->fullname ));
     }
     return TRUE;
@@ -966 +978 @@
 UINT WINAPI GetProfileIntA( LPCSTR section, LPCSTR entry, INT def_val )
 {
-    return GetPrivateProfileIntA( section, entry, def_val, "win.ini" );
+    return GetPrivateProfileIntA( section, entry, def_val, WINININAME );
 }
 
@@ -974 +986 @@
 UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val )
 {
-    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
+    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
     return GetPrivateProfileIntW( section, entry, def_val, wininiW );
 }
@@ -985 +997 @@
 {
     return GetPrivateProfileStringA( section, entry, def_val,
-                 buffer, len, "win.ini" );
+                 buffer, len, WINININAME );
 }
 
@@ -994 +1006 @@
                LPCWSTR def_val, LPWSTR buffer, UINT len )
 {
-    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
+    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
     return GetPrivateProfileStringW( section, entry, def_val,
                  buffer, len, wininiW );
@@ -1005 +1017 @@
              LPCSTR string )
 {
-    return WritePrivateProfileStringA( section, entry, string, "win.ini" );
+    return WritePrivateProfileStringA( section, entry, string, WINININAME );
 }
 
@@ -1014 +1026 @@
                                      LPCWSTR string )
 {
-    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
+    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
     return WritePrivateProfileStringW( section, entry, string, wininiW );
 }
@@ -1062 +1074 @@
 
     if (!filename)
-   filename = "win.ini";
+   filename = WINININAME;
 
     EnterCriticalSection( &PROFILE_CritSect );
@@ -1145 +1157 @@
 INT WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len )
 {
-    return GetPrivateProfileSectionA( section, buffer, len, "win.ini" );
+    return GetPrivateProfileSectionA( section, buffer, len, WINININAME );
 }
 
@@ -1153 +1165 @@
 INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len )
 {
-    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini" );
+    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
     return GetPrivateProfileSectionW( section, buffer, len, wininiW );
 }
@@ -1233 +1245 @@
 
 {
-    return WritePrivateProfileSectionA( section, keys_n_values, "win.ini");
+    return WritePrivateProfileSectionA( section, keys_n_values, WINININAME);
 }
 
@@ -1241 +1253 @@
 BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values)
 {
-   if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, "win.ini");
+   if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME);
 
    return (WritePrivateProfileSectionW (section,keys_n_values, wininiW));
@@ -1375 +1387 @@
     return ret;
 }
+
+/***********************************************************************
+ *           WriteOutProfiles   (KERNEL.315)
+ * CB: original: 16 bit function
+ *     here: necessary to save open ini files
+ */
+void WINAPI WriteOutProfiles(void)
+{
+    PROFILE *lastCurProfile;
+    INT x;
+
+    EnterCriticalSection(&PROFILE_CritSect);
+    PROFILE_FlushFile(); //flash current
+    lastCurProfile = CurProfile;
+    for(x = 1;x < N_CACHED_PROFILES;x++)
+    {
+      if (MRUProfile[x]->filename)
+      {
+        CurProfile = MRUProfile[x];
+        PROFILE_FlushFile();
+      }
+    }
+    CurProfile = lastCurProfile;
+    LeaveCriticalSection(&PROFILE_CritSect);
+}
+