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

Timestamp:

Oct 2, 2000, 8:40:12 PM (25 years ago)

Author:

sandervl

Message:

fixes for FS macro changes

File:

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

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.26 2000-10-02 13:38:57 sandervl Exp $ */
+/* $Id: profile.cpp,v 1.27 2000-10-02 18:39:35 sandervl Exp $ */
 
 /*
@@ -74 +74 @@
     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);
 
 
@@ -1087 +1077 @@
               INT, def_val)
 {
-    return ODIN_GetPrivateProfileIntA( section, entry, def_val, WINININAME );
+    return CALL_ODINFUNC(GetPrivateProfileIntA)( section, entry, def_val, WINININAME );
 }
 
@@ -1099 +1089 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return ODIN_GetPrivateProfileIntW( section, entry, def_val, wininiW );
+    return CALL_ODINFUNC(GetPrivateProfileIntW)( section, entry, def_val, wininiW );
 }
 
@@ -1112 +1102 @@
               UINT, len)
 {
-    return ODIN_GetPrivateProfileStringA( section, entry, def_val,
+    return CALL_ODINFUNC(GetPrivateProfileStringA)( section, entry, def_val,
                  buffer, len, WINININAME );
 }
@@ -1127 +1117 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return ODIN_GetPrivateProfileStringW( section, entry, def_val,
+    return CALL_ODINFUNC(GetPrivateProfileStringW)( section, entry, def_val,
                  buffer, len, wininiW );
 }
@@ -1139 +1129 @@
               LPCSTR, string)
 {
-    return ODIN_WritePrivateProfileStringA( section, entry, string, WINININAME );
+    return CALL_ODINFUNC(WritePrivateProfileStringA)( section, entry, string, WINININAME );
 }
 
@@ -1151 +1141 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return ODIN_WritePrivateProfileStringW( section, entry, string, wininiW );
+    return CALL_ODINFUNC(WritePrivateProfileStringW)( section, entry, string, wininiW );
 }
 
@@ -1167 +1157 @@
     long result;
 
-    ODIN_GetPrivateProfileStringA( section, entry, "",
+    CALL_ODINFUNC(GetPrivateProfileStringA)( section, entry, "",
                                 buffer, sizeof(buffer), filename );
     if (!buffer[0]) return (UINT)def_val;
@@ -1187 +1177 @@
     LPSTR entryA    = HEAP_strdupWtoA( GetProcessHeap(), 0, entry );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    UINT res = ODIN_GetPrivateProfileIntA(sectionA, entryA, def_val, filenameA);
+    UINT res = CALL_ODINFUNC(GetPrivateProfileIntA)(sectionA, entryA, def_val, filenameA);
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, filenameA );
@@ -1240 +1230 @@
     LPSTR def_valA  = HEAP_strdupWtoA( GetProcessHeap(), 0, def_val );
     LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
-    INT ret = ODIN_GetPrivateProfileStringA( sectionA, entryA, def_valA,
+    INT ret = CALL_ODINFUNC(GetPrivateProfileStringA)( sectionA, entryA, def_valA,
                                             bufferA, len, filenameA );
     lstrcpynAtoW( buffer, bufferA, len );
@@ -1287 +1277 @@
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
     LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
-    INT ret = ODIN_GetPrivateProfileSectionA( sectionA, bufferA, len,
+    INT ret = CALL_ODINFUNC(GetPrivateProfileSectionA)( sectionA, bufferA, len,
                   filenameA );
     MultiByteToWideChar(CP_ACP,0,bufferA,ret,buffer,len);
@@ -1304 +1294 @@
               DWORD, len)
 {
-    return ODIN_GetPrivateProfileSectionA( section, buffer, len, WINININAME );
+    return CALL_ODINFUNC(GetPrivateProfileSectionA)( section, buffer, len, WINININAME );
 }
 
@@ -1316 +1306 @@
 {
     if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
-    return ODIN_GetPrivateProfileSectionW( section, buffer, len, wininiW );
+    return CALL_ODINFUNC(GetPrivateProfileSectionW)( section, buffer, len, wininiW );
 }
 
@@ -1357 +1347 @@
     LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    BOOL res = ODIN_WritePrivateProfileStringA( sectionA, entryA,
+    BOOL res = CALL_ODINFUNC(WritePrivateProfileStringA)( sectionA, entryA,
                   stringA, filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
@@ -1391 +1381 @@
     LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    BOOL res = ODIN_WritePrivateProfileSectionA( sectionA, stringA, filenameA );
+    BOOL res = CALL_ODINFUNC(WritePrivateProfileSectionA)( sectionA, stringA, filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );
     HeapFree( GetProcessHeap(), 0, stringA );
@@ -1405 +1395 @@
               LPCSTR, keys_n_values)
 {
-    return ODIN_WritePrivateProfileSectionA( section, keys_n_values, WINININAME);
+    return CALL_ODINFUNC(WritePrivateProfileSectionA)( section, keys_n_values, WINININAME);
 }
 
@@ -1417 +1407 @@
    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME);
 
-   return (ODIN_WritePrivateProfileSectionW (section,keys_n_values, wininiW));
+   return (CALL_ODINFUNC(WritePrivateProfileSectionW) (section,keys_n_values, wininiW));
 }
 
@@ -1448 +1438 @@
               LPCSTR, filename)
 {
- return (ODIN_GetPrivateProfileSectionNames16 (buffer,size,filename));
+ return (CALL_ODINFUNC(GetPrivateProfileSectionNames16) (buffer,size,filename));
 }
 
@@ -1462 +1452 @@
    LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, size);
 
-   INT ret = ODIN_GetPrivateProfileSectionNames16 (bufferA, size, filenameA);
+   INT ret = CALL_ODINFUNC(GetPrivateProfileSectionNames16) (bufferA, size, filenameA);
    lstrcpynAtoW( buffer, bufferA, size);
    HeapFree( GetProcessHeap(), 0, bufferA);
@@ -1511 +1501 @@
     LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
 
-    INT ret = ODIN_GetPrivateProfileStructA( sectionA, keyA, bufferA,
+    INT ret = CALL_ODINFUNC(GetPrivateProfileStructA)( sectionA, keyA, bufferA,
                len, filenameA );
     lstrcpynAtoW( (LPWSTR)buffer, bufferA, len );
@@ -1536 +1526 @@
 
     if (!section && !key && !buf)  /* flush the cache */
-        return ODIN_WritePrivateProfileStringA( NULL, NULL, NULL, filename );
+        return CALL_ODINFUNC(WritePrivateProfileStringA)( NULL, NULL, NULL, filename );
 
     EnterCriticalSection( &PROFILE_CritSect );
@@ -1561 +1551 @@
     LPSTR keyA      = HEAP_strdupWtoA( GetProcessHeap(), 0, key);
     LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
-    INT ret = ODIN_WritePrivateProfileStructA( sectionA, keyA, buf, bufsize,
+    INT ret = CALL_ODINFUNC(WritePrivateProfileStructA)( sectionA, keyA, buf, bufsize,
                  filenameA );
     HeapFree( GetProcessHeap(), 0, sectionA );