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/Fileio.cpp

    r7798 r7849  
    1 /* $Id: Fileio.cpp,v 1.64 2002-02-03 21:06:40 sandervl Exp $ */
     1/* $Id: Fileio.cpp,v 1.65 2002-02-09 12:45:11 sandervl Exp $ */
    22
    33/*
    … …  
    188188//******************************************************************************
    189189//******************************************************************************
    190 ODINFUNCTION7(HFILE,  CreateFileA,
    191               LPCSTR, lpszName,
    192               DWORD,  fdwAccess,
    193               DWORD,  fdwShareMode,
    194               LPSECURITY_ATTRIBUTES, lpsa,
    195               DWORD,  fdwCreate,
    196               DWORD,  fdwAttrsAndFlags,
    197               HANDLE, hTemplateFile)
     190HFILE WIN32API CreateFileA(LPCSTR lpszName, DWORD fdwAccess, DWORD fdwShareMode,
     191                           LPSECURITY_ATTRIBUTES lpsa, DWORD fdwCreate,
     192                           DWORD  fdwAttrsAndFlags, HANDLE hTemplateFile)
    198193{
    199194  dprintf(("CreateFileA %s", lpszName));
    … …  
    209204//******************************************************************************
    210205//******************************************************************************
    211 ODINFUNCTION7(HFILE,   CreateFileW,
    212               LPCWSTR, arg1,
    213               DWORD,   arg2,
    214               DWORD,   arg3,
    215               PSECURITY_ATTRIBUTES, arg4,
    216               DWORD,   arg5,
    217               DWORD,   arg6,
    218               HANDLE,  arg7)
     206HFILE WIN32API CreateFileW(LPCWSTR lpszName, DWORD fdwAccess, DWORD fdwShareMode,
     207                           LPSECURITY_ATTRIBUTES lpsa, DWORD fdwCreate,
     208                           DWORD fdwAttrsAndFlags, HANDLE hTemplateFile)
    219209{
    220210  HANDLE rc;
    221211  char  *astring;
    222212
    223   astring = UnicodeToAsciiString((LPWSTR)arg1);
    224   rc = CreateFileA(astring, arg2, arg3, arg4, arg5, arg6, arg7);
     213  astring = UnicodeToAsciiString((LPWSTR)lpszName);
     214  rc = CreateFileA(astring, fdwAccess, fdwShareMode,
     215                   lpsa, fdwCreate, fdwAttrsAndFlags,
     216                   hTemplateFile);
    225217  FreeAsciiString(astring);
    226218  return(rc);
    … …  
    255247 * Author    : SvL
    256248 *****************************************************************************/
    257 ODINFUNCTION6(HANDLE, FindFirstFileExA, LPCSTR, lpFileName,
    258                                         FINDEX_INFO_LEVELS, fInfoLevelId,
    259                                         LPVOID, lpFindFileData,
    260                                         FINDEX_SEARCH_OPS, fSearchOp,
    261                                         LPVOID, lpSearchFilter,
    262                                         DWORD, dwAdditionalFlags)
     249HANDLE WIN32API FindFirstFileExA(LPCSTR lpFileName, FINDEX_INFO_LEVELS fInfoLevelId,
     250                                 LPVOID lpFindFileData,
     251                                 FINDEX_SEARCH_OPS fSearchOp,
     252                                 LPVOID lpSearchFilter,
     253                                 DWORD dwAdditionalFlags)
    263254{   
    264255  HANDLE hFind;
    … …  
    343334 * Author    : Wine
    344335 *****************************************************************************/
    345 ODINFUNCTION6(HANDLE, FindFirstFileExW, LPCWSTR, lpFileName,
    346                                         FINDEX_INFO_LEVELS, fInfoLevelId,
    347                                         LPVOID, lpFindFileData,
    348                                         FINDEX_SEARCH_OPS, fSearchOp,
    349                                         LPVOID, lpSearchFilter,
    350                                         DWORD, dwAdditionalFlags)
     336HANDLE WIN32API FindFirstFileExW(LPCWSTR lpFileName,
     337                                 FINDEX_INFO_LEVELS fInfoLevelId,
     338                                 LPVOID lpFindFileData,
     339                                 FINDEX_SEARCH_OPS fSearchOp,
     340                                 LPVOID lpSearchFilter,
     341                                 DWORD dwAdditionalFlags)
    351342{
    352343    HANDLE handle;
    … …  
    397388// internal function for faster access (SHELL32)
    398389//******************************************************************************
    399 ODINFUNCTION3(HANDLE, FindFirstFileMultiA,
    400               LPCSTR, lpFileName,
    401               WIN32_FIND_DATAA *, lpFindFileData,
    402               DWORD *,count)
     390HANDLE WIN32API FindFirstFileMultiA(LPCSTR lpFileName,
     391                                    WIN32_FIND_DATAA * lpFindFileData,
     392                                    DWORD * count)
    403393{
    404394    return (HANDLE)OSLibDosFindFirstMulti(lpFileName,lpFindFileData,count);
    … …  
    406396//******************************************************************************
    407397//******************************************************************************
    408 ODINFUNCTION2(BOOL,   FindNextFileA,
    409               HANDLE, hFindFile,
    410               WIN32_FIND_DATAA *, lpFindFileData)
     398BOOL WIN32API FindNextFileA(HANDLE hFindFile, WIN32_FIND_DATAA * lpFindFileData)
    411399{
    412400    return OSLibDosFindNext(hFindFile,lpFindFileData);
    … …  
    415403// internal function for faster access (SHELL32)
    416404//******************************************************************************
    417 ODINFUNCTION3(BOOL,   FindNextFileMultiA,
    418               HANDLE, hFindFile,
    419               WIN32_FIND_DATAA *, lpFindFileData,
    420               DWORD *,count)
     405BOOL WIN32API FindNextFileMultiA(HANDLE hFindFile, WIN32_FIND_DATAA * lpFindFileData,
     406              DWORD *count)
    421407{
    422408  return OSLibDosFindNextMulti(hFindFile,lpFindFileData,count);
    … …  
    424410//******************************************************************************
    425411//******************************************************************************
    426 ODINFUNCTION2(BOOL, FindNextFileW,
    427               HANDLE, hFindFile,
    428               WIN32_FIND_DATAW *, lpFindFileData)
     412BOOL WIN32API FindNextFileW(HANDLE hFindFile, WIN32_FIND_DATAW * lpFindFileData)
    429413{
    430414  WIN32_FIND_DATAA wfda;
    … …  
    454438//******************************************************************************
    455439//******************************************************************************
    456 ODINFUNCTION1(BOOL, FindClose,
    457               HANDLE, hFindFile)
     440BOOL WIN32API FindClose(HANDLE hFindFile)
    458441{
    459442  return OSLibDosFindClose(hFindFile);
    … …  
    461444//******************************************************************************
    462445//******************************************************************************
    463 ODINFUNCTION1(DWORD, GetFileType,
    464               HANDLE, hFile)
     446DWORD WIN32API GetFileType(HANDLE hFile)
    465447{
    466448  return(HMGetFileType(hFile));
    … …  
    468450//******************************************************************************
    469451//******************************************************************************
    470 ODINFUNCTION2(DWORD, GetFileInformationByHandle,
    471               HANDLE, arg1,
    472               BY_HANDLE_FILE_INFORMATION *, arg2)
     452DWORD WIN32API GetFileInformationByHandle(HANDLE arg1, BY_HANDLE_FILE_INFORMATION * arg2)
    473453{
    474454  return(HMGetFileInformationByHandle(arg1,arg2));
    … …  
    476456//******************************************************************************
    477457//******************************************************************************
    478 ODINFUNCTION1(BOOL, SetEndOfFile,
    479               HANDLE, arg1)
     458BOOL WIN32API SetEndOfFile(HANDLE arg1)
    480459{
    481460  return HMSetEndOfFile(arg1);
    … …  
    483462//******************************************************************************
    484463//******************************************************************************
    485 ODINFUNCTION4(BOOL, SetFileTime,
    486               HANDLE, arg1,
    487               const FILETIME *, arg2,
    488               const FILETIME *, arg3,
    489               const FILETIME *, arg4)
     464BOOL WIN32API  SetFileTime(HANDLE arg1, const FILETIME * arg2,
     465                           const FILETIME * arg3,
     466                           const FILETIME * arg4)
    490467{
    491468  return HMSetFileTime(arg1,
    … …  
    496473//******************************************************************************
    497474//******************************************************************************
    498 ODINFUNCTION2(INT, CompareFileTime,
    499               FILETIME *, lpft1,
    500               FILETIME *, lpft2)
     475INT WIN32API CompareFileTime(FILETIME * lpft1, FILETIME * lpft2)
    501476{
    502477   if (lpft1 == NULL || lpft2 == NULL) {
    … …  
    521496//******************************************************************************
    522497//******************************************************************************
    523 ODINFUNCTION4(BOOL, GetFileTime, HANDLE, hFile, LPFILETIME, arg2, LPFILETIME, arg3, LPFILETIME, arg4)
     498BOOL WIN32API GetFileTime(HANDLE hFile, LPFILETIME arg2, LPFILETIME arg3, LPFILETIME arg4)
    524499{
    525500    return HMGetFileTime(hFile, arg2, arg3, arg4);
    … …  
    527502//******************************************************************************
    528503//******************************************************************************
    529 ODINFUNCTION3(BOOL, CopyFileA,
    530               LPCSTR, arg1,
    531               LPCSTR, arg2,
    532               BOOL, arg3)
     504BOOL WIN32API CopyFileA(LPCSTR arg1, LPCSTR arg2, BOOL arg3)
    533505{
    534506  return OSLibDosCopyFile(arg1, arg2, arg3);
    535507}
    536508//******************************************************************************
    537 //SvL: 24-6-'97 - Added
    538 //******************************************************************************
    539 ODINFUNCTION3(BOOL, CopyFileW,
    540               LPCWSTR, arg1,
    541               LPCWSTR, arg2,
    542               BOOL, arg3)
     509//******************************************************************************
     510BOOL WIN32API CopyFileW(LPCWSTR arg1, LPCWSTR arg2, BOOL arg3)
    543511{
    544512  BOOL  rc;
    … …  
    547515  astring1 = UnicodeToAsciiString((LPWSTR)arg1);
    548516  astring2 = UnicodeToAsciiString((LPWSTR)arg2);
    549   rc = CALL_ODINFUNC(CopyFileA)(astring1, astring2, arg3);
     517  rc = CopyFileA(astring1, astring2, arg3);
    550518  FreeAsciiString(astring2);
    551519  FreeAsciiString(astring1);
    … …  
    576544
    577545BOOL WIN32API CopyFileExA( LPCSTR             lpExistingFileName,
    578                               LPCSTR             lpNewFileName,
    579                               LPPROGRESS_ROUTINE lpProgressRoutine,
    580                               LPVOID             lpData,
    581                               LPBOOL             pbCancel,
    582                               DWORD              dwCopyFlags)
     546                           LPCSTR             lpNewFileName,
     547                           LPPROGRESS_ROUTINE lpProgressRoutine,
     548                           LPVOID             lpData,
     549                           LPBOOL             pbCancel,
     550                           DWORD              dwCopyFlags)
    583551{
    584552
    … …  
    653621//******************************************************************************
    654622//******************************************************************************
    655 ODINFUNCTION2(DWORD, GetFileSize,
    656               HANDLE, arg1,
    657               PDWORD, arg2)
     623DWORD WIN32API GetFileSize(HANDLE arg1, PDWORD arg2)
    658624{
    659625  return HMGetFileSize(arg1,
    … …  
    662628//******************************************************************************
    663629//******************************************************************************
    664 ODINFUNCTION1(BOOL, DeleteFileA,
    665               LPCSTR, lpszFile)
     630BOOL WIN32API DeleteFileA(LPCSTR lpszFile)
    666631{
    667632 BOOL rc;
    668633
    669 #if 0
    670   dprintf(("DeleteFileA %s", lpszFile));
    671   return 1;
    672 #else
    673634  rc = OSLibDosDelete((LPSTR)lpszFile);
    674635  if(!rc) {
    … …  
    681642
    682643  return rc;
    683 #endif
    684 }
    685 //******************************************************************************
    686 //******************************************************************************
    687 ODINFUNCTION1(BOOL, DeleteFileW,
    688               LPCWSTR, arg1)
     644}
     645//******************************************************************************
     646//******************************************************************************
     647BOOL WIN32API DeleteFileW(LPCWSTR arg1)
    689648{
    690649  BOOL  rc;
    … …  
    692651
    693652  astring = UnicodeToAsciiString((LPWSTR)arg1);
    694   rc = CALL_ODINFUNC(DeleteFileA)(astring);
     653  rc = DeleteFileA(astring);
    695654  FreeAsciiString(astring);
    696655  return(rc);
    … …  
    698657//******************************************************************************
    699658//******************************************************************************
    700 ODINFUNCTION4(UINT, GetTempFileNameA,
    701               LPCSTR, arg1,
    702               LPCSTR, arg2,
    703               UINT, arg3,
    704               LPSTR, arg4)
     659UINT WIN32API GetTempFileNameA(LPCSTR arg1, LPCSTR arg2, UINT arg3, LPSTR arg4)
    705660{
    706661  return O32_GetTempFileName(arg1, arg2, arg3, arg4);
    … …  
    708663//******************************************************************************
    709664//******************************************************************************
    710 ODINFUNCTION4(UINT, GetTempFileNameW,
    711               LPCWSTR, lpPathName,
    712               LPCWSTR, lpPrefixString,
    713               UINT, uUnique,
    714               LPWSTR, lpTempFileName)
     665UINT WIN32API GetTempFileNameW(LPCWSTR lpPathName, LPCWSTR lpPrefixString,
     666                               UINT uUnique, LPWSTR lpTempFileName)
    715667{
    716668  char *asciipath, *asciiprefix;
    … …  
    729681//******************************************************************************
    730682//******************************************************************************
    731 ODINFUNCTION5(BOOL,         ReadFile,
    732               HANDLE,       hFile,
    733               PVOID,        pBuffer,
    734               DWORD,        dwLength,
    735               PDWORD,       lpNumberOfBytesRead,
    736               LPOVERLAPPED, lpOverlapped)
     683BOOL WIN32API ReadFile(HANDLE hFile, PVOID pBuffer, DWORD dwLength,
     684                       PDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped)
    737685{
    738686  if(lpNumberOfBytesRead) *lpNumberOfBytesRead = 0;
    … …  
    750698//******************************************************************************
    751699//******************************************************************************
    752 ODINFUNCTION5(BOOL,         ReadFileEx,
    753               HANDLE,       hFile,
    754               LPVOID,       lpBuffer,
    755               DWORD,        nNumberOfBytesToRead,
    756               LPOVERLAPPED, lpOverlapped,
    757               LPOVERLAPPED_COMPLETION_ROUTINE,  lpCompletionRoutine)
     700BOOL WIN32API ReadFileEx(HANDLE       hFile,
     701                         LPVOID       lpBuffer,
     702                         DWORD        nNumberOfBytesToRead,
     703                         LPOVERLAPPED lpOverlapped,
     704                         LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
    758705{
    759706  if(nNumberOfBytesToRead == 0) {
    … …  
    780727//******************************************************************************
    781728//******************************************************************************
    782 ODINFUNCTION5(BOOL, WriteFile,
    783               HANDLE, hFile,
    784               LPCVOID, buffer,
    785               DWORD, nrbytes,
    786               LPDWORD, nrbyteswritten,
    787               LPOVERLAPPED, lpOverlapped)
     729BOOL WIN32API WriteFile(HANDLE hFile, LPCVOID buffer, DWORD nrbytes,
     730                        LPDWORD nrbyteswritten, LPOVERLAPPED lpOverlapped)
    788731{
    789732  if(nrbyteswritten) *nrbyteswritten = 0;
    … …  
    821764 *****************************************************************************/
    822765
    823 ODINFUNCTION5(BOOL,         WriteFileEx,
    824               HANDLE,       hFile,
    825               LPCVOID,      lpBuffer,
    826               DWORD,        nNumberOfBytesToWrite,
    827               LPOVERLAPPED, lpOverlapped,
    828               LPOVERLAPPED_COMPLETION_ROUTINE,  lpCompletionRoutine)
     766BOOL WIN32API WriteFileEx(HANDLE       hFile,
     767                          LPCVOID      lpBuffer,
     768                          DWORD        nNumberOfBytesToWrite,
     769                          LPOVERLAPPED lpOverlapped,
     770                          LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
    829771{
    830772  if(nNumberOfBytesToWrite == 0) {
    … …  
    851793//******************************************************************************
    852794//******************************************************************************
    853 ODINFUNCTION4(DWORD, SetFilePointer,
    854               HANDLE, hFile,
    855               LONG, lDistanceToMove,
    856               PLONG, lpDistanceToMoveHigh,
    857               DWORD, dwMoveMethod)
     795DWORD WIN32API SetFilePointer(HANDLE hFile, LONG lDistanceToMove,
     796                              PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod)
    858797{
    859798  return(HMSetFilePointer(hFile,
    … …  
    864803//******************************************************************************
    865804//******************************************************************************
    866 ODINFUNCTION1(DWORD, GetFileAttributesA,
    867               LPCSTR, lpszFileName)
     805DWORD WIN32API GetFileAttributesA(LPCSTR lpszFileName)
    868806{
    869807    DWORD rc, error;
    … …  
    908846//******************************************************************************
    909847//******************************************************************************
    910 ODINFUNCTION1(DWORD, GetFileAttributesW,
    911               LPCWSTR, arg1)
     848DWORD WIN32API GetFileAttributesW(LPCWSTR arg1)
    912849{
    913850  DWORD rc;
    … …  
    915852
    916853  astring = UnicodeToAsciiString((LPWSTR)arg1);
    917   rc = CALL_ODINFUNC(GetFileAttributesA)(astring);
     854  rc = GetFileAttributesA(astring);
    918855  FreeAsciiString(astring);
    919856  return(rc);
    … …  
    921858//******************************************************************************
    922859//******************************************************************************
    923 ODINFUNCTION2(BOOL, SetFileAttributesA,
    924               LPCSTR, arg1,
    925               DWORD, arg2)
    926 {
    927     dprintf(("KERNEL32:  SetFileAttributes of %s\n", arg1));
    928     return O32_SetFileAttributes(arg1, arg2);
    929 }
    930 //******************************************************************************
    931 //******************************************************************************
    932 ODINFUNCTION2(BOOL, SetFileAttributesW,
    933               LPCWSTR, lpFileName,
    934               DWORD, dwFileAttributes)
     860BOOL WIN32API SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes)
     861{
     862    dprintf(("KERNEL32: SetFileAttributes of %s", lpFileName));
     863    return O32_SetFileAttributes(lpFileName, dwFileAttributes);
     864}
     865//******************************************************************************
     866//******************************************************************************
     867BOOL WIN32API SetFileAttributesW(LPCWSTR lpFileName, DWORD dwFileAttributes)
    935868{
    936869  char *asciifile;
    … …  
    938871
    939872  asciifile = UnicodeToAsciiString((LPWSTR)lpFileName);
    940   rc = O32_SetFileAttributes(asciifile, dwFileAttributes);
     873  rc = SetFileAttributesA(asciifile, dwFileAttributes);
    941874  FreeAsciiString(asciifile);
    942875  return(rc);
    … …  
    944877//******************************************************************************
    945878//******************************************************************************
    946 ODINFUNCTION4(DWORD, GetFullPathNameA,
    947               LPCSTR, arg1,
    948               DWORD, arg2,
    949               LPSTR, arg3,
    950               LPSTR *, arg4)
     879DWORD WIN32API GetFullPathNameA(LPCSTR arg1, DWORD arg2, LPSTR  arg3,
     880                                LPSTR * arg4)
    951881{
    952882    char *ptr;
    … …  
    960890//******************************************************************************
    961891//******************************************************************************
    962 ODINFUNCTION4(DWORD, GetFullPathNameW,
    963               LPCWSTR, lpFileName,
    964               DWORD, nBufferLength,
    965               LPWSTR, lpBuffer,
    966               LPWSTR *, lpFilePart)
     892DWORD WIN32API GetFullPathNameW(LPCWSTR lpFileName, DWORD nBufferLength,
     893                                LPWSTR lpBuffer, LPWSTR *lpFilePart)
    967894{
    968895 char *astring, *asciibuffer, *asciipart;
    … …  
    972899  astring     = UnicodeToAsciiString((LPWSTR)lpFileName);
    973900
    974   rc = CALL_ODINFUNC(GetFullPathNameA)(astring,
    975                              nBufferLength,
    976                              asciibuffer,
    977                              &asciipart);
     901  rc = GetFullPathNameA(astring, nBufferLength,
     902                        asciibuffer, &asciipart);
    978903
    979904  dprintf(("KERNEL32: GetFullPathNameW %s returns %s\n",
    … …  
    998923//******************************************************************************
    999924//******************************************************************************
    1000 ODINFUNCTION5(BOOL, LockFile,
    1001               HANDLE, arg1,
    1002               DWORD, arg2,
    1003               DWORD, arg3,
    1004               DWORD, arg4,
    1005               DWORD, arg5)
     925BOOL WIN32API LockFile(HANDLE arg1, DWORD arg2,
     926                       DWORD arg3, DWORD arg4,
     927                       DWORD arg5)
    1006928{
    1007929  return HMLockFile(arg1,
    … …  
    1030952 *****************************************************************************/
    1031953
    1032 ODINFUNCTION6(BOOL, LockFileEx,
    1033               HANDLE, hFile,
    1034               DWORD, dwFlags,
    1035               DWORD, dwReserved,
    1036               DWORD, nNumberOfBytesToLockLow,
    1037               DWORD, nNumberOfBytesToLockHigh,
    1038               LPOVERLAPPED, lpOverlapped)
     954BOOL LockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved,
     955                DWORD nNumberOfBytesToLockLow,
     956                DWORD nNumberOfBytesToLockHigh,
     957                LPOVERLAPPED lpOverlapped)
    1039958{
    1040959  return(HMLockFile(hFile,
    … …  
    1046965//******************************************************************************
    1047966//******************************************************************************
    1048 ODINFUNCTION2(BOOL, MoveFileA,
    1049               LPCSTR, arg1,
    1050               LPCSTR, arg2)
     967BOOL WIN32API MoveFileA(LPCSTR arg1, LPCSTR arg2)
    1051968{
    1052969    dprintf(("KERNEL32: MoveFileA %s %s", arg1, arg2));
    … …  
    1071988 *****************************************************************************/
    1072989
    1073 ODINFUNCTION3(BOOL, MoveFileExA,
    1074               LPCSTR, lpszOldFilename,
    1075               LPCSTR, lpszNewFilename,
    1076               DWORD, fdwFlags)
     990BOOL WIN32API MoveFileExA(LPCSTR lpszOldFilename,
     991                          LPCSTR lpszNewFilename,
     992                          DWORD fdwFlags)
    1077993{
    1078994  dprintf(("KERNEL32:  MoveFileExA %s to %s %x, not complete!\n",
    … …  
    11341050//******************************************************************************
    11351051//******************************************************************************
    1136 ODINFUNCTION2(BOOL, MoveFileW,
    1137               LPCWSTR, lpSrc,
    1138               LPCWSTR, lpDest)
     1052BOOL WIN32API MoveFileW(LPCWSTR lpSrc, LPCWSTR lpDest)
    11391053{
    11401054  char *asciisrc, *asciidest;
    … …  
    11501064//******************************************************************************
    11511065//******************************************************************************
    1152 ODINFUNCTION3(BOOL, MoveFileExW,
    1153               LPCWSTR, lpSrc,
    1154               LPCWSTR, lpDest,
    1155               DWORD, fdwFlags)
     1066BOOL WIN32API MoveFileExW(LPCWSTR lpSrc, LPCWSTR lpDest, DWORD fdwFlags)
    11561067{
    11571068  dprintf(("KERNEL32: MoveFileExW %ls to %ls %x",
    … …  
    11961107 *****************************************************************************/
    11971108
    1198 ODINFUNCTION3(HFILE, OpenFile,
    1199               LPCSTR, lpszFile,
    1200               OFSTRUCT *, lpOpenBuff,
    1201               UINT, fuMode)
     1109HFILE WIN32API OpenFile(LPCSTR lpszFile, OFSTRUCT *lpOpenBuff,
     1110                        UINT fuMode)
    12021111{
    12031112  HFILE hFile;
    … …  
    12161125//******************************************************************************
    12171126//******************************************************************************
    1218 ODINFUNCTION5(BOOL, UnlockFile,
    1219               HANDLE, arg1,
    1220               DWORD, arg2,
    1221               DWORD, arg3,
    1222               DWORD, arg4,
    1223               DWORD, arg5)
     1127BOOL WIN32API UnlockFile(HANDLE arg1, DWORD arg2, DWORD arg3,
     1128                         DWORD arg4,  DWORD arg5)
    12241129{
    12251130  return HMUnlockFile(arg1,
    … …  
    12471152 *****************************************************************************/
    12481153
    1249 ODINFUNCTION5(BOOL, UnlockFileEx,
    1250               HANDLE, hFile,
    1251               DWORD, dwReserved,
    1252               DWORD, nNumberOfBytesToLockLow,
    1253               DWORD, nNumberOfBytesToLockHigh,
    1254               LPOVERLAPPED, lpOverlapped)
     1154BOOL WIN32API UnlockFileEx(HANDLE hFile, DWORD dwReserved,
     1155                           DWORD nNumberOfBytesToLockLow,
     1156                           DWORD nNumberOfBytesToLockHigh,
     1157                           LPOVERLAPPED lpOverlapped)
    12551158{
    12561159  return(HMUnlockFileEx(hFile, dwReserved,
    … …  
    12701173//- if successful -> return length of string (excluding 0 terminator)
    12711174//******************************************************************************
    1272 ODINFUNCTION3(DWORD, GetShortPathNameA,
    1273               LPCTSTR, lpszLongPath,
    1274               LPTSTR, lpszShortPath,
    1275               DWORD, cchBuffer)
     1175DWORD WIN32API GetShortPathNameA(LPCTSTR lpszLongPath,
     1176                                 LPTSTR lpszShortPath,
     1177                                 DWORD cchBuffer)
    12761178{
    12771179 int length;
    … …  
    12861188  length = lstrlenA(lpszLongPath) + 1;
    12871189  if(length > cchBuffer) {
    1288   if(lpszShortPath) {
     1190      if(lpszShortPath) {
    12891191          *lpszShortPath = 0;
    1290   }
    1291         return(length); //return length required (including 0 terminator)
     1192      }
     1193      return(length); //return length required (including 0 terminator)
    12921194  }
    12931195  lstrcpyA(lpszShortPath, lpszLongPath);
    … …  
    12961198//******************************************************************************
    12971199//******************************************************************************
    1298 ODINFUNCTION3(DWORD, GetShortPathNameW,
    1299               LPCWSTR, lpszLongPath,
    1300               LPWSTR, lpszShortPath,
    1301               DWORD, cchBuffer)
     1200DWORD WIN32API GetShortPathNameW(LPCWSTR lpszLongPath, LPWSTR lpszShortPath,
     1201                                 DWORD cchBuffer)
    13021202{
    13031203 int length;
    … …  
    13111211  length = lstrlenW(lpszLongPath) + 1;
    13121212  if(length > cchBuffer) {
    1313   if(lpszShortPath) {
     1213      if(lpszShortPath) {
    13141214          *lpszShortPath = 0;
    1315   }
    1316         return(length); //return length required (including 0 terminator)
     1215      }
     1216      return(length); //return length required (including 0 terminator)
    13171217  }
    13181218  lstrcpyW(lpszShortPath, lpszLongPath);
    … …  
    13791279//******************************************************************************
    13801280//******************************************************************************
    1381 ODINPROCEDURE0(SetFileApisToANSI)
     1281void WIN32API SetFileApisToANSI()
    13821282{
    13831283    dprintf(("!WARNING! SetFileApisToANSI() stub\n"));
    … …  
    13991299 *****************************************************************************/
    14001300
    1401 ODINFUNCTION2(DWORD, GetCompressedFileSizeA,
    1402               LPCTSTR, lpFileName,
    1403               LPDWORD, lpFileSizeHigh)
     1301DWORD WIN32API GetCompressedFileSizeA(LPCTSTR lpFileName, LPDWORD lpFileSizeHigh)
    14041302{
    14051303  dprintf(("KERNEL32: GetCompressedFileSizeA (%s, %08xh) not implemented.\n",
    … …  
    14271325 *****************************************************************************/
    14281326
    1429 ODINFUNCTION2(DWORD, GetCompressedFileSizeW,
    1430               LPCWSTR, lpFileName,
    1431               LPDWORD, lpFileSizeHigh)
     1327DWORD WIN32API GetCompressedFileSizeW(LPCWSTR lpFileName, LPDWORD lpFileSizeHigh)
    14321328{
    14331329  LPCTSTR lpAsciiFileName;                             /* converted filename */
    … …  
    14611357 *****************************************************************************/
    14621358
    1463 ODINFUNCTION3(BOOL, GetFileAttributesExA,
    1464               LPCSTR, lpFileName,
    1465               GET_FILEEX_INFO_LEVELS, fInfoLevelId,
    1466               LPVOID, lpFileInformation)
     1359BOOL WIN32API GetFileAttributesExA(LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId,
     1360                                   LPVOID lpFileInformation)
    14671361{
    14681362  BOOL rc;
    … …  
    15061400 *****************************************************************************/
    15071401
    1508 ODINFUNCTION3(BOOL, GetFileAttributesExW,
    1509               LPCWSTR, lpFileName,
    1510               GET_FILEEX_INFO_LEVELS, fInfoLevelId,
    1511               LPVOID, lpFileInformation)
     1402BOOL WIN32API GetFileAttributesExW(LPCWSTR lpFileName,
     1403                                   GET_FILEEX_INFO_LEVELS fInfoLevelId,
     1404                                   LPVOID lpFileInformation)
    15121405{
    15131406  LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpFileName );
    … …  
    15191412//******************************************************************************
    15201413//******************************************************************************
    1521 ODINFUNCTION3(HANDLE, FindFirstChangeNotificationA,
    1522               LPCSTR, lpPathName,
    1523               BOOL, bWatchSubtree,
    1524               DWORD, dwNotifyFilter)
     1414HANDLE WIN32API FindFirstChangeNotificationA(LPCSTR lpPathName,
     1415                                             BOOL bWatchSubtree,
     1416                                             DWORD dwNotifyFilter)
    15251417{
    15261418  dprintf(("KERNEL32:  FindFirstChangeNotificationA %s, Not implemented (faked)", lpPathName));
    … …  
    15291421//******************************************************************************
    15301422//******************************************************************************
    1531 ODINFUNCTION1(BOOL, FindNextChangeNotification,
    1532               HANDLE, hChange)
     1423BOOL WIN32API FindNextChangeNotification(HANDLE hChange)
    15331424{
    15341425  dprintf(("KERNEL32: FindNextChangeNotification (%08xh), Not implemented\n",
    … …  
    15391430//******************************************************************************
    15401431//******************************************************************************
    1541 ODINFUNCTION1(BOOL, FindCloseChangeNotification, HANDLE, hChange)
     1432BOOL WIN32API FindCloseChangeNotification(HANDLE hChange)
    15421433{
    15431434  dprintf(("KERNEL32:  OS2FindNextChangeNotification, Not implemented\n"));
    … …  
    15651456 * Author    : Markus Montkowski [Tha, 1998/05/21 20:57]
    15661457 *****************************************************************************/
    1567 ODINFUNCTION3(HANDLE, FindFirstChangeNotificationW, LPCWSTR, lpPathName,
    1568                                                     BOOL, bWatchSubtree,
    1569                                                     DWORD, dwNotifyFilter)
     1458HANDLE WIN32API FindFirstChangeNotificationW(LPCWSTR lpPathName,
     1459                                             BOOL bWatchSubtree,
     1460                                             DWORD dwNotifyFilter)
    15701461{
    15711462  LPSTR  lpAsciiPath;
    … …  
    15801471//******************************************************************************
    15811472//******************************************************************************
    1582 ODINFUNCTION8(BOOL, DeviceIoControl, HANDLE, hDevice, DWORD, dwIoControlCode,
    1583               LPVOID, lpInBuffer, DWORD, nInBufferSize,
    1584               LPVOID, lpOutBuffer, DWORD, nOutBufferSize,
    1585               LPDWORD, lpBytesReturned, LPOVERLAPPED, lpOverlapped)
     1473BOOL WIN32API DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
     1474                              LPVOID lpInBuffer, DWORD nInBufferSize,
     1475                              LPVOID lpOutBuffer, DWORD nOutBufferSize,
     1476                              LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
    15861477{
    15871478    return HMDeviceIoControl(hDevice, dwIoControlCode, lpInBuffer, nInBufferSize,
    … …  
    16021493 *             To get extended error information, call GetLastError.
    16031494 * Remark    : If there are any I/O operations in progress for the specified
    1604  *             file handle, and they were issued by the calling thread, the
     1495 *             file HANDLE and they were issued by the calling thread, the
    16051496 *             CancelIO function cancels them.
    16061497 *             Note that the I/O operations must have been issued as
    … …  
    16121503 *             error ERROR_OPERATION_ABORTED. All completion notifications
    16131504 *             for the I/O operations will occur normally.
    1614  * Status    : UNTESTED STUB
     1505 * Status    :
    16151506 *
    16161507 * Author    : Markus Montkowski [Thu, 1998/05/19 11:46]
    16171508 *****************************************************************************/
    1618 ODINFUNCTION1(BOOL, CancelIo, HANDLE, hFile)
     1509BOOL WIN32API CancelIo(HANDLE hFile)
    16191510{
    16201511  return HMCancelIo(hFile);
    … …  
    16321523 *****************************************************************************/
    16331524
    1634 ODINFUNCTION4(BOOL, GetOverlappedResult,
    1635               HANDLE, hFile,              /* [in] handle of file to check on */
    1636               LPOVERLAPPED, lpOverlapped, /* [in/out] pointer to overlapped  */
    1637               LPDWORD, lpTransferred,     /* [in/out] number of bytes transferred  */
    1638               BOOL, bWait)                /* [in] wait for the transfer to complete ? */
     1525BOOL WIN32API  GetOverlappedResult(HANDLE hFile,              /* [in] handle of file to check on */
     1526                                   LPOVERLAPPED lpOverlapped, /* [in/out] pointer to overlapped  */
     1527                                   LPDWORD lpTransferred,     /* [in/out] number of bytes transferred  */
     1528                                   BOOL bWait)                /* [in] wait for the transfer to complete ? */
    16391529{
    16401530  //NOTE: According to the SDK docs lpOverlapped->hEvent can be 0. This function
Note: See TracChangeset for help on using the changeset viewer.