Changeset 4387 for trunk/src


Ignore:
Timestamp:
Oct 2, 2000, 8:40:12 PM (25 years ago)
Author:
sandervl
Message:

fixes for FS macro changes

Location:
trunk/src/kernel32
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/Fileio.cpp

    r4372 r4387  
    1 /* $Id: Fileio.cpp,v 1.42 2000-10-02 13:38:55 sandervl Exp $ */
     1/* $Id: Fileio.cpp,v 1.43 2000-10-02 18:39:32 sandervl Exp $ */
    22
    33/*
    … …  
    435435
    436436  astring = UnicodeToAsciiString((LPWSTR)arg1);
    437   rc = ODIN_DeleteFileA(astring);
     437  rc = CALL_ODINFUNC(DeleteFileA)(astring);
    438438  FreeAsciiString(astring);
    439439  return(rc);
    … …  
    635635
    636636  astring = UnicodeToAsciiString((LPWSTR)arg1);
    637   rc = ODIN_GetFileAttributesA(astring);
     637  rc = CALL_ODINFUNC(GetFileAttributesA)(astring);
    638638  FreeAsciiString(astring);
    639639  return(rc);
    … …  
    692692  astring     = UnicodeToAsciiString((LPWSTR)lpFileName);
    693693
    694   rc = ODIN_GetFullPathNameA(astring,
     694  rc = CALL_ODINFUNC(GetFullPathNameA)(astring,
    695695                             nBufferLength,
    696696                             asciibuffer,

  • trunk/src/kernel32/codepage.cpp

    r3843 r4387  
    1 /* $Id: codepage.cpp,v 1.4 2000-07-18 14:55:12 bird Exp $
     1/* $Id: codepage.cpp,v 1.5 2000-10-02 18:39:33 sandervl Exp $
    22**
    33** Module   :CODEPAGE.CPP
    … …  
    2828
    2929    if(codepage == -1) {
    30         codepage = ODIN_PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "DISPLAY", 0);
     30        codepage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "DISPLAY", 0);
    3131    }
    3232    return codepage;
    … …  
    3838
    3939    if(codepage == -1) {
    40         codepage = ODIN_PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "WINDOWS", 0);
     40        codepage = PROFILE_GetOdinIniInt(CODEPAGE_SECTION, "WINDOWS", 0);
    4141    }
    4242    return codepage;

  • trunk/src/kernel32/critsection.cpp

    r3897 r4387  
    1 /* $Id: critsection.cpp,v 1.6 2000-07-26 18:06:22 sandervl Exp $ */
     1/* $Id: critsection.cpp,v 1.7 2000-10-02 18:39:33 sandervl Exp $ */
    22/*
    33 * Win32 critical sections
    … …  
    2424
    2525
     26#ifdef DEBUG
    2627HANDLE ODIN_EXTERN(CreateSemaphoreA) (LPSECURITY_ATTRIBUTES arg1, LONG arg2, LONG arg3,
    2728                                      LPCSTR arg4);
    … …  
    3031
    3132HANDLE ODIN_EXTERN(ConvertToGlobalHandle)(HANDLE hHandle);
     33#endif
    3234
    3335/***********************************************************************
    … …  
    4042    crit->RecursionCount = 0;
    4143    crit->OwningThread   = 0;
    42     crit->LockSemaphore  = ODIN_CreateSemaphoreA( NULL, 0, 1, NULL );
     44    crit->LockSemaphore  = CALL_ODINFUNC(CreateSemaphoreA)( NULL, 0, 1, NULL );
    4345    crit->Reserved       = GetCurrentProcessId();
    4446}
    … …  
    9193        for (;;)
    9294        {
    93             res = ODIN_WaitForSingleObject( crit->LockSemaphore, 5000L );
     95            res = CALL_ODINFUNC(WaitForSingleObject)( crit->LockSemaphore, 5000L );
    9496            if ( res == WAIT_TIMEOUT )
    9597            {
    9698                dprintf(("Critical section %p wait timed out, retrying (60 sec)\n", crit ));
    97                 res = ODIN_WaitForSingleObject( crit->LockSemaphore, 60000L );
     99                res = CALL_ODINFUNC(WaitForSingleObject)( crit->LockSemaphore, 60000L );
    98100                if ( res == WAIT_TIMEOUT && TRACE_ON(relay) )
    99101                {
    … …  
    175177{
    176178    dprintf(("MakeCriticalSectionGlobal %x", crit));
    177     crit->LockSemaphore = ODIN_ConvertToGlobalHandle( crit->LockSemaphore );
     179    crit->LockSemaphore = CALL_ODINFUNC(ConvertToGlobalHandle)( crit->LockSemaphore );
    178180    crit->Reserved      = 0L;
    179181}

  • trunk/src/kernel32/directory.cpp

    r3799 r4387  
    1 /* $Id: directory.cpp,v 1.29 2000-07-04 08:41:13 sandervl Exp $ */
     1/* $Id: directory.cpp,v 1.30 2000-10-02 18:39:33 sandervl Exp $ */
    22
    33/*
    … …  
    7777        DIR_System[len-1] = 0;
    7878   }
    79    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",DIR_Windows,sizeof(DIR_Windows));
     79   len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",DIR_Windows,sizeof(DIR_Windows));
    8080   if (len > 2) {
    8181        if(DIR_Windows[len-1] == '\\') {

  • trunk/src/kernel32/disk.cpp

    r4189 r4387  
    1 /* $Id: disk.cpp,v 1.16 2000-09-04 18:24:42 sandervl Exp $ */
     1/* $Id: disk.cpp,v 1.17 2000-10-02 18:39:33 sandervl Exp $ */
    22
    33/*
    … …  
    324324    asciiroot = NULL;
    325325
    326   rc = ODIN_GetVolumeInformationA(asciiroot,
     326  rc = CALL_ODINFUNC(GetVolumeInformationA)(asciiroot,
    327327                             asciivol,
    328328                             nVolumeNameSize,

  • trunk/src/kernel32/lang.cpp

    r4214 r4387  
    1 /* $Id: lang.cpp,v 1.28 2000-09-08 04:28:47 phaller Exp $ */
     1/* $Id: lang.cpp,v 1.29 2000-10-02 18:39:33 sandervl Exp $ */
    22/*
    33 * Win32 language API functions for OS/2
    … …  
    870870    lpWStr=NULL; // Query for buffer size
    871871
    872   ret_len = ODIN_GetLocaleInfoW(lcid, LCType, lpWStr, len);
     872  ret_len = CALL_ODINFUNC(GetLocaleInfoW)(lcid, LCType, lpWStr, len);
    873873
    874874  if (ret_len && buf)

  • trunk/src/kernel32/ole2nls.cpp

    r4378 r4387  
    1 /* $Id: ole2nls.cpp,v 1.3 2000-10-02 15:56:47 phaller Exp $ */
     1/* $Id: ole2nls.cpp,v 1.4 2000-10-02 18:39:34 sandervl Exp $ */
    22
    33/*
    … …  
    13991399              LPWORD,  lpCharType)
    14001400{
    1401   return ODIN_GetStringTypeExW(0,
     1401  return CALL_ODINFUNC(GetStringTypeExW)(0,
    14021402                          dwInfoType,
    14031403                          lpSrcStr,

  • trunk/src/kernel32/oslibdebug.cpp

    r3101 r4387  
    1 /* $Id: oslibdebug.cpp,v 1.3 2000-03-13 13:10:10 sandervl Exp $ */
     1/* $Id: oslibdebug.cpp,v 1.4 2000-10-02 18:39:35 sandervl Exp $ */
    22
    33/*
    … …  
    55 *
    66 * Copyright 1999 Edgar Buerkle
    7  *
    8  * NOTE: Including os2.h, so not automatic protection against FS trashing!
    97 *
    108 * Project Odin Software License can be found in LICENSE.TXT

  • trunk/src/kernel32/profile.cpp

    r4372 r4387  
    1 /* $Id: profile.cpp,v 1.26 2000-10-02 13:38:57 sandervl Exp $ */
     1/* $Id: profile.cpp,v 1.27 2000-10-02 18:39:35 sandervl Exp $ */
    22
    33/*
    … …  
    7474    time_t           mtime;
    7575} PROFILE;
    76 
    77 
    78 /****************************************************************************
    79  * internal prototypes                                                      *
    80  ****************************************************************************/
    81 UINT ODIN_INTERNAL ODIN_GetPrivateProfileIntA(LPCSTR, LPCSTR, INT, LPCSTR);
    82 UINT ODIN_INTERNAL ODIN_GetPrivateProfileIntW(LPCWSTR, LPCWSTR, INT, LPCWSTR);
    83 INT  ODIN_INTERNAL ODIN_GetPrivateProfileStringW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, UINT, LPCWSTR);
    84 BOOL ODIN_INTERNAL ODIN_WritePrivateProfileStringA(LPCSTR, LPCSTR, LPCSTR, LPCSTR);
    85 BOOL ODIN_INTERNAL ODIN_WritePrivateProfileStringW(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR);
    8676
    8777
    … …  
    10871077              INT, def_val)
    10881078{
    1089     return ODIN_GetPrivateProfileIntA( section, entry, def_val, WINININAME );
     1079    return CALL_ODINFUNC(GetPrivateProfileIntA)( section, entry, def_val, WINININAME );
    10901080}
    10911081
    … …  
    10991089{
    11001090    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
    1101     return ODIN_GetPrivateProfileIntW( section, entry, def_val, wininiW );
     1091    return CALL_ODINFUNC(GetPrivateProfileIntW)( section, entry, def_val, wininiW );
    11021092}
    11031093
    … …  
    11121102              UINT, len)
    11131103{
    1114     return ODIN_GetPrivateProfileStringA( section, entry, def_val,
     1104    return CALL_ODINFUNC(GetPrivateProfileStringA)( section, entry, def_val,
    11151105                 buffer, len, WINININAME );
    11161106}
    … …  
    11271117{
    11281118    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
    1129     return ODIN_GetPrivateProfileStringW( section, entry, def_val,
     1119    return CALL_ODINFUNC(GetPrivateProfileStringW)( section, entry, def_val,
    11301120                 buffer, len, wininiW );
    11311121}
    … …  
    11391129              LPCSTR, string)
    11401130{
    1141     return ODIN_WritePrivateProfileStringA( section, entry, string, WINININAME );
     1131    return CALL_ODINFUNC(WritePrivateProfileStringA)( section, entry, string, WINININAME );
    11421132}
    11431133
    … …  
    11511141{
    11521142    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
    1153     return ODIN_WritePrivateProfileStringW( section, entry, string, wininiW );
     1143    return CALL_ODINFUNC(WritePrivateProfileStringW)( section, entry, string, wininiW );
    11541144}
    11551145
    … …  
    11671157    long result;
    11681158
    1169     ODIN_GetPrivateProfileStringA( section, entry, "",
     1159    CALL_ODINFUNC(GetPrivateProfileStringA)( section, entry, "",
    11701160                                buffer, sizeof(buffer), filename );
    11711161    if (!buffer[0]) return (UINT)def_val;
    … …  
    11871177    LPSTR entryA    = HEAP_strdupWtoA( GetProcessHeap(), 0, entry );
    11881178    LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
    1189     UINT res = ODIN_GetPrivateProfileIntA(sectionA, entryA, def_val, filenameA);
     1179    UINT res = CALL_ODINFUNC(GetPrivateProfileIntA)(sectionA, entryA, def_val, filenameA);
    11901180    HeapFree( GetProcessHeap(), 0, sectionA );
    11911181    HeapFree( GetProcessHeap(), 0, filenameA );
    … …  
    12401230    LPSTR def_valA  = HEAP_strdupWtoA( GetProcessHeap(), 0, def_val );
    12411231    LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
    1242     INT ret = ODIN_GetPrivateProfileStringA( sectionA, entryA, def_valA,
     1232    INT ret = CALL_ODINFUNC(GetPrivateProfileStringA)( sectionA, entryA, def_valA,
    12431233                                            bufferA, len, filenameA );
    12441234    lstrcpynAtoW( buffer, bufferA, len );
    … …  
    12871277    LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
    12881278    LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
    1289     INT ret = ODIN_GetPrivateProfileSectionA( sectionA, bufferA, len,
     1279    INT ret = CALL_ODINFUNC(GetPrivateProfileSectionA)( sectionA, bufferA, len,
    12901280                  filenameA );
    12911281    MultiByteToWideChar(CP_ACP,0,bufferA,ret,buffer,len);
    … …  
    13041294              DWORD, len)
    13051295{
    1306     return ODIN_GetPrivateProfileSectionA( section, buffer, len, WINININAME );
     1296    return CALL_ODINFUNC(GetPrivateProfileSectionA)( section, buffer, len, WINININAME );
    13071297}
    13081298
    … …  
    13161306{
    13171307    if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME );
    1318     return ODIN_GetPrivateProfileSectionW( section, buffer, len, wininiW );
     1308    return CALL_ODINFUNC(GetPrivateProfileSectionW)( section, buffer, len, wininiW );
    13191309}
    13201310
    … …  
    13571347    LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
    13581348    LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
    1359     BOOL res = ODIN_WritePrivateProfileStringA( sectionA, entryA,
     1349    BOOL res = CALL_ODINFUNC(WritePrivateProfileStringA)( sectionA, entryA,
    13601350                  stringA, filenameA );
    13611351    HeapFree( GetProcessHeap(), 0, sectionA );
    … …  
    13911381    LPSTR stringA   = HEAP_strdupWtoA( GetProcessHeap(), 0, string );
    13921382    LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
    1393     BOOL res = ODIN_WritePrivateProfileSectionA( sectionA, stringA, filenameA );
     1383    BOOL res = CALL_ODINFUNC(WritePrivateProfileSectionA)( sectionA, stringA, filenameA );
    13941384    HeapFree( GetProcessHeap(), 0, sectionA );
    13951385    HeapFree( GetProcessHeap(), 0, stringA );
    … …  
    14051395              LPCSTR, keys_n_values)
    14061396{
    1407     return ODIN_WritePrivateProfileSectionA( section, keys_n_values, WINININAME);
     1397    return CALL_ODINFUNC(WritePrivateProfileSectionA)( section, keys_n_values, WINININAME);
    14081398}
    14091399
    … …  
    14171407   if (!wininiW) wininiW = HEAP_strdupAtoW( SystemHeap, 0, WINININAME);
    14181408
    1419    return (ODIN_WritePrivateProfileSectionW (section,keys_n_values, wininiW));
     1409   return (CALL_ODINFUNC(WritePrivateProfileSectionW) (section,keys_n_values, wininiW));
    14201410}
    14211411
    … …  
    14481438              LPCSTR, filename)
    14491439{
    1450  return (ODIN_GetPrivateProfileSectionNames16 (buffer,size,filename));
     1440 return (CALL_ODINFUNC(GetPrivateProfileSectionNames16) (buffer,size,filename));
    14511441}
    14521442
    … …  
    14621452   LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, size);
    14631453
    1464    INT ret = ODIN_GetPrivateProfileSectionNames16 (bufferA, size, filenameA);
     1454   INT ret = CALL_ODINFUNC(GetPrivateProfileSectionNames16) (bufferA, size, filenameA);
    14651455   lstrcpynAtoW( buffer, bufferA, size);
    14661456   HeapFree( GetProcessHeap(), 0, bufferA);
    … …  
    15111501    LPSTR bufferA   = (LPSTR)HeapAlloc( GetProcessHeap(), 0, len );
    15121502
    1513     INT ret = ODIN_GetPrivateProfileStructA( sectionA, keyA, bufferA,
     1503    INT ret = CALL_ODINFUNC(GetPrivateProfileStructA)( sectionA, keyA, bufferA,
    15141504               len, filenameA );
    15151505    lstrcpynAtoW( (LPWSTR)buffer, bufferA, len );
    … …  
    15361526
    15371527    if (!section && !key && !buf)  /* flush the cache */
    1538         return ODIN_WritePrivateProfileStringA( NULL, NULL, NULL, filename );
     1528        return CALL_ODINFUNC(WritePrivateProfileStringA)( NULL, NULL, NULL, filename );
    15391529
    15401530    EnterCriticalSection( &PROFILE_CritSect );
    … …  
    15611551    LPSTR keyA      = HEAP_strdupWtoA( GetProcessHeap(), 0, key);
    15621552    LPSTR filenameA = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
    1563     INT ret = ODIN_WritePrivateProfileStructA( sectionA, keyA, buf, bufsize,
     1553    INT ret = CALL_ODINFUNC(WritePrivateProfileStructA)( sectionA, keyA, buf, bufsize,
    15641554                 filenameA );
    15651555    HeapFree( GetProcessHeap(), 0, sectionA );

  • trunk/src/kernel32/profile.h

    r2213 r4387  
    1 /* $Id: profile.h,v 1.6 1999-12-27 18:42:25 sandervl Exp $ */
     1/* $Id: profile.h,v 1.7 2000-10-02 18:39:36 sandervl Exp $ */
    22/*
    33 * Profile header for initterm
    … …  
    1717int WINAPI PROFILE_LoadOdinIni(void);
    1818
     19#ifdef DEBUG
     20
    1921INT ODIN_EXTERN(GetPrivateProfileStringA)(LPCSTR section, LPCSTR entry,
    2022                                          LPCSTR def_val, LPSTR buffer,
    … …  
    3133                                          int value);
    3234
     35UINT ODIN_EXTERN(GetPrivateProfileIntA)(LPCSTR, LPCSTR, INT, LPCSTR);
     36UINT ODIN_EXTERN(GetPrivateProfileIntW)(LPCWSTR, LPCWSTR, INT, LPCWSTR);
     37INT  ODIN_EXTERN(GetPrivateProfileStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, UINT, LPCWSTR);
     38BOOL ODIN_EXTERN(WritePrivateProfileStringA)(LPCSTR, LPCSTR, LPCSTR, LPCSTR);
     39BOOL ODIN_EXTERN(WritePrivateProfileStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR);
     40
    3341#endif
     42
     43#include <win\options.h> //for odin profile apis
     44
     45#endif

  • trunk/src/kernel32/version.cpp

    r4372 r4387  
    1 /* $Id: version.cpp,v 1.1 2000-10-02 13:39:18 sandervl Exp $ */
     1/* $Id: version.cpp,v 1.2 2000-10-02 18:39:36 sandervl Exp $ */
    22
    33/*
    … …  
    8484 char szVersion[16];
    8585
    86   if(ODIN_PROFILE_GetOdinIniString(PROFILE_WINVERSION_SECTION, PROFILE_WINVERSION_KEY,
    87                                    "", szVersion,
    88                                    sizeof(szVersion)-1) > 1)
     86  if(PROFILE_GetOdinIniString(PROFILE_WINVERSION_SECTION, PROFILE_WINVERSION_KEY,
     87                              "", szVersion, sizeof(szVersion)-1) > 1)
    8988  {
    9089        if(!stricmp(szVersion, PROFILE_WINVERSION_WIN98)) {

  • trunk/src/kernel32/windllbase.cpp

    r3993 r4387  
    1 /* $Id: windllbase.cpp,v 1.16 2000-08-11 10:56:18 sandervl Exp $ */
     1/* $Id: windllbase.cpp,v 1.17 2000-10-02 18:39:36 sandervl Exp $ */
    22
    33/*
    … …  
    649649 char renameddll[CCHMAXPATH];
    650650
    651   if(ODIN_PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "OLE32", "", renameddll,
     651  if(PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "OLE32", "", renameddll,
    652652                                   sizeof(renameddll)-1) <= 1)
    653653  {
    654         ODIN_PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "OLE32", "OLE32OS2");
    655         ODIN_PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "OLE32OS2", "OLE32");
    656   }
    657   if(ODIN_PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "OLEAUT32", "", renameddll,
     654        PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "OLE32", "OLE32OS2");
     655        PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "OLE32OS2", "OLE32");
     656  }
     657  if(PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "OLEAUT32", "", renameddll,
    658658                                   sizeof(renameddll)-1) <= 1)
    659659  {
    660         ODIN_PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "OLEAUT32", "OLAUTOS2");
    661         ODIN_PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "OLAUTOS2", "OLEAUT32");
    662   }
    663   if(ODIN_PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "NETAPI32", "", renameddll,
     660        PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "OLEAUT32", "OLAUTOS2");
     661        PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "OLAUTOS2", "OLEAUT32");
     662  }
     663  if(PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "NETAPI32", "", renameddll,
    664664                                   sizeof(renameddll)-1) <= 1)
    665665  {
    666         ODIN_PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "NETAPI32", "WNETAP32");
    667         ODIN_PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "WNETAP32", "NETAPI32");
     666        PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "NETAPI32", "WNETAP32");
     667        PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "WNETAP32", "NETAPI32");
    668668  }
    669669}
    … …  
    693693        *dot = 0;
    694694  strupr(modname);
    695   if(ODIN_PROFILE_GetOdinIniString(sectionname, modname, "", renameddll,
     695  if(PROFILE_GetOdinIniString(sectionname, modname, "", renameddll,
    696696                                   sizeof(renameddll)-1) > 1)
    697697  {
Note: See TracChangeset for help on using the changeset viewer.