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

Timestamp:

Oct 1, 2000, 11:16:04 PM (25 years ago)

Author:

phaller

Message:

Optimization

File:

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

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.24 2000-08-27 03:25:42 bird Exp $ */
+/* $Id: profile.cpp,v 1.25 2000-10-01 21:16:04 phaller Exp $ */
 
 /*
@@ -47 +47 @@
 
 #define SystemHeap               GetProcessHeap()
+
+#ifndef strcasecmp
 #define strcasecmp               stricmp
+#endif
+
 #define DOSFS_GetFullName(a,b,c) strcpy(c,a)
 #define CharLowerA(a)            (a)
@@ -75 +79 @@
     time_t           mtime;
 } PROFILE;
+
+
+/****************************************************************************
+ * internal prototypes                                                      *
+ ****************************************************************************/
+UINT ODIN_INTERNAL ODIN_GetPrivateProfileIntA(LPCSTR, LPCSTR, INT, LPCSTR);
+UINT ODIN_INTERNAL ODIN_GetPrivateProfileIntW(LPCWSTR, LPCWSTR, INT, LPCWSTR);
+INT  ODIN_INTERNAL ODIN_GetPrivateProfileStringW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, UINT, LPCWSTR);
+BOOL ODIN_INTERNAL ODIN_WritePrivateProfileStringA(LPCSTR, LPCSTR, LPCSTR, LPCSTR);
+BOOL ODIN_INTERNAL ODIN_WritePrivateProfileStringW(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR);
+
 
 
@@ -1077 +1092 @@
               INT, def_val)
 {
-    return GetPrivateProfileIntA( section, entry, def_val, WINININAME );
+    return ODIN_GetPrivateProfileIntA( section, entry, def_val, WINININAME );
 }
 
@@ -1089 +1104 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return GetPrivateProfileIntW( section, entry, def_val, wininiW );
+    return ODIN_GetPrivateProfileIntW( section, entry, def_val, wininiW );
 }
 
@@ -1102 +1117 @@
               UINT, len)
 {
-    return GetPrivateProfileStringA( section, entry, def_val,
+    return ODIN_GetPrivateProfileStringA( section, entry, def_val,
                  buffer, len, WINININAME );
 }
@@ -1117 +1132 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return GetPrivateProfileStringW( section, entry, def_val,
+    return ODIN_GetPrivateProfileStringW( section, entry, def_val,
                  buffer, len, wininiW );
 }
@@ -1129 +1144 @@
               LPCSTR, string)
 {
-    return WritePrivateProfileStringA( section, entry, string, WINININAME );
+    return ODIN_WritePrivateProfileStringA( section, entry, string, WINININAME );
 }
 
@@ -1141 +1156 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return WritePrivateProfileStringW( section, entry, string, wininiW );
+    return ODIN_WritePrivateProfileStringW( section, entry, string, wininiW );
 }
 
@@ -1157 +1172 @@
     long result;
 
-    GetPrivateProfileStringA( section, entry, "",
+    ODIN_GetPrivateProfileStringA( section, entry, "",
                                 buffer, sizeof(buffer), filename );
     if (!buffer[0]) return (UINT)def_val;
@@ -1177 +1192 @@
     LPSTR entryA    = HEAP_strdupWtoA( GetProcessHeap(), 0, entry );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    UINT res = GetPrivateProfileIntA(sectionA, entryA, def_val, filenameA);
+    UINT res = ODIN_GetPrivateProfileIntA(sectionA, entryA, def_val, filenameA);
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, filenameA );
@@ -1230 +1245 @@
     LPSTR def_valA  = HEAP_strdupWtoA( GetProcessHeap(), 0, def_val );
     LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
-    INT ret = GetPrivateProfileStringA( sectionA, entryA, def_valA,
+    INT ret = ODIN_GetPrivateProfileStringA( sectionA, entryA, def_valA,
                                             bufferA, len, filenameA );
     lstrcpynAtoW( buffer, bufferA, len );
@@ -1277 +1292 @@
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
     LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
-    INT ret = GetPrivateProfileSectionA( sectionA, bufferA, len,
+    INT ret = ODIN_GetPrivateProfileSectionA( sectionA, bufferA, len,
                   filenameA );
     MultiByteToWideChar(CP_ACP,0,bufferA,ret,buffer,len);
@@ -1294 +1309 @@
               DWORD, len)
 {
-    return GetPrivateProfileSectionA( section, buffer, len, WINININAME );
+    return ODIN_GetPrivateProfileSectionA( section, buffer, len, WINININAME );
 }
 
@@ -1306 +1321 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return GetPrivateProfileSectionW( section, buffer, len, wininiW );
+    return ODIN_GetPrivateProfileSectionW( section, buffer, len, wininiW );
 }
 
@@ -1347 +1362 @@
     LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    BOOL res = WritePrivateProfileStringA( sectionA, entryA,
+    BOOL res = ODIN_WritePrivateProfileStringA( sectionA, entryA,
                   stringA, filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
@@ -1381 +1396 @@
     LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    BOOL res = WritePrivateProfileSectionA( sectionA, stringA, filenameA );
+    BOOL res = ODIN_WritePrivateProfileSectionA( sectionA, stringA, filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, stringA );
@@ -1395 +1410 @@
               LPCSTR, keys_n_values)
 {
-    return WritePrivateProfileSectionA( section, keys_n_values, WINININAME);
+    return ODIN_WritePrivateProfileSectionA( section, keys_n_values, WINININAME);
 }
 
@@ -1407 +1422 @@
    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME);
 
-   return (WritePrivateProfileSectionW (section,keys_n_values, wininiW));
+   return (ODIN_WritePrivateProfileSectionW (section,keys_n_values, wininiW));
 }
 
@@ -1438 +1453 @@
               LPCSTR, filename)
 {
- return (GetPrivateProfileSectionNames16 (buffer,size,filename));
+ return (ODIN_GetPrivateProfileSectionNames16 (buffer,size,filename));
 }
 
@@ -1452 +1467 @@
    LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, size);
 
-   INT ret = GetPrivateProfileSectionNames16 (bufferA, size, filenameA);
+   INT ret = ODIN_GetPrivateProfileSectionNames16 (bufferA, size, filenameA);
    lstrcpynAtoW( buffer, bufferA, size);
    HeapFree( GetProcessHeap(), 0, bufferA);
@@ -1501 +1516 @@
     LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
 
-    INT ret = GetPrivateProfileStructA( sectionA, keyA, bufferA,
+    INT ret = ODIN_GetPrivateProfileStructA( sectionA, keyA, bufferA,
                len, filenameA );
     lstrcpynAtoW( (LPWSTR)buffer, bufferA, len );
@@ -1526 +1541 @@
 
     if (!section && !key && !buf)  /* flush the cache */
-        return WritePrivateProfileStringA( NULL, NULL, NULL, filename );
+        return ODIN_WritePrivateProfileStringA( NULL, NULL, NULL, filename );
 
     EnterCriticalSection( &PROFILE_CritSect );
@@ -1551 +1566 @@
     LPSTR keyA      = HEAP_strdupWtoA( GetProcessHeap(), 0, key);
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    INT ret = WritePrivateProfileStructA( sectionA, keyA, buf, bufsize,
+    INT ret = ODIN_WritePrivateProfileStructA( sectionA, keyA, buf, bufsize,
                  filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
@@ -1593 +1608 @@
 }
 
-
-