Ignore:
Timestamp:
Feb 9, 2002, 1:45:14 PM (24 years ago)
Author:
sandervl
Message:

logging updates

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/directory.cpp

    r7798 r7849  
    1 /* $Id: directory.cpp,v 1.43 2002-02-03 21:06:40 sandervl Exp $ */
     1/* $Id: directory.cpp,v 1.44 2002-02-09 12:45:12 sandervl Exp $ */
    22
    33/*
    … …  
    140140 *****************************************************************************/
    141141
    142 ODINFUNCTION2(UINT, GetCurrentDirectoryA, UINT,  nBufferLength,
    143                                           LPSTR, lpBuffer)
     142UINT WIN32API GetCurrentDirectoryA(UINT nBufferLength, LPSTR lpBuffer)
    144143{
    145144 UINT rc;
    … …  
    166165 *****************************************************************************/
    167166
    168 ODINFUNCTION2(UINT, GetCurrentDirectoryW, UINT,   nBufferLength,
    169                                           LPWSTR, lpBuffer)
     167UINT WIN32API GetCurrentDirectoryW(UINT nBufferLength, LPWSTR lpBuffer)
    170168{
    171169  char *asciidir = (char *)malloc(nBufferLength+1);
    172170  int  rc;
    173171
    174   rc = CALL_ODINFUNC(GetCurrentDirectoryA)(nBufferLength, asciidir);
     172  rc = GetCurrentDirectoryA(nBufferLength, asciidir);
    175173  if(rc != 0)
    176174    AsciiToUnicode(asciidir, lpBuffer);
    … …  
    191189 * Author    : Patrick Haller [Wed, 1999/09/28 20:44]
    192190 *****************************************************************************/
    193 
    194 
    195 ODINFUNCTION1(BOOL,   SetCurrentDirectoryA,
    196               LPCSTR, lpstrDirectory)
     191BOOL WIN32API SetCurrentDirectoryA(LPCSTR lpstrDirectory)
    197192{
    198193  if(HIWORD(lpstrDirectory) == 0)
    … …  
    233228 *****************************************************************************/
    234229
    235 ODINFUNCTION1(BOOL,SetCurrentDirectoryW,LPCWSTR,lpPathName)
     230BOOL WIN32API SetCurrentDirectoryW(LPCWSTR lpPathName)
    236231{
    237232  char *asciipath;
    … …  
    257252 *****************************************************************************/
    258253
    259 ODINFUNCTION2(BOOL,                CreateDirectoryA,
    260               LPCSTR,              lpstrDirectory,
    261               PSECURITY_ATTRIBUTES,arg2)
     254BOOL WIN32API CreateDirectoryA(LPCSTR lpstrDirectory, PSECURITY_ATTRIBUTES arg2)
    262255{
    263256  // 2001-05-28 PH
    … …  
    311304 *****************************************************************************/
    312305
    313 ODINFUNCTION2(BOOL,CreateDirectoryW,LPCWSTR,             arg1,
    314                                     PSECURITY_ATTRIBUTES,arg2)
     306BOOL WIN32API CreateDirectoryW(LPCWSTR arg1, PSECURITY_ATTRIBUTES arg2)
    315307{
    316308  BOOL  rc;
    … …  
    318310
    319311  astring = UnicodeToAsciiString((LPWSTR)arg1);
    320   rc = CALL_ODINFUNC(CreateDirectoryA)(astring, arg2);
     312  rc = CreateDirectoryA(astring, arg2);
    321313  FreeAsciiString(astring);
    322314  return(rc);
    … …  
    413405 *****************************************************************************/
    414406
    415 ODINFUNCTION2(UINT,GetSystemDirectoryA,LPSTR,lpBuffer,
    416                                        UINT,uSize)
     407UINT WIN32API GetSystemDirectoryA(LPSTR lpBuffer, UINT uSize)
    417408{
    418409 int   len;
    … …  
    439430 *****************************************************************************/
    440431
    441 ODINFUNCTION2(UINT,GetSystemDirectoryW,LPWSTR,lpBuffer,
    442                                        UINT,  uSize)
     432UINT WIN32API GetSystemDirectoryW(LPWSTR lpBuffer, UINT uSize)
    443433{
    444434  char *asciibuffer = NULL;
    … …  
    473463 *****************************************************************************/
    474464
    475 ODINFUNCTION2(UINT,GetWindowsDirectoryA,LPSTR,lpBuffer,
    476                                         UINT,uSize)
     465UINT WIN32API GetWindowsDirectoryA(LPSTR lpBuffer, UINT uSize)
    477466{
    478467 char *dir;
    … …  
    499488 *****************************************************************************/
    500489
    501 ODINFUNCTION2(UINT,GetWindowsDirectoryW,LPWSTR,lpBuffer,
    502                                         UINT,  uSize)
     490UINT WIN32API GetWindowsDirectoryW(LPWSTR lpBuffer, UINT uSize)
    503491{
    504492  char *asciibuffer = NULL;
    … …  
    534522
    535523
    536 ODINFUNCTION1(BOOL, RemoveDirectoryA, LPCSTR, lpstrDirectory)
     524BOOL WIN32API RemoveDirectoryA(LPCSTR lpstrDirectory)
    537525{
    538526  int len = strlen(lpstrDirectory);
    … …  
    571559 *****************************************************************************/
    572560
    573 ODINFUNCTION1(BOOL,RemoveDirectoryW,LPCWSTR,lpPathName)
     561BOOL WIN32API RemoveDirectoryW(LPCWSTR lpPathName)
    574562{
    575563  char *asciipath;
    … …  
    756744//******************************************************************************
    757745//******************************************************************************
    758 ODINFUNCTION2(UINT, GetTempPathA,
    759               UINT, count, LPSTR, path)
     746UINT WIN32API GetTempPathA(UINT count, LPSTR path)
    760747{
    761748    UINT ret;
    … …  
    773760//******************************************************************************
    774761//******************************************************************************
    775 ODINFUNCTION2(UINT, GetTempPathW,
    776               UINT, count, LPWSTR, path)
     762UINT WIN32API GetTempPathW(UINT count, LPWSTR path)
    777763{
    778764    static const WCHAR tmp[]  = { 'T', 'M', 'P', 0 };
Note: See TracChangeset for help on using the changeset viewer.