some __stdcall fixes in ntoskrnl and ntdll

[reactos.git] / reactos / lib / kernel32 / file / lfile.c

diff --git a/reactos/lib/kernel32/file/lfile.c b/reactos/lib/kernel32/file/lfile.c
index ce4ff86..a246481 100644 (file)
--- a/reactos/lib/kernel32/file/lfile.c
+++ b/reactos/lib/kernel32/file/lfile.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: lfile.c,v 1.4 1999/08/29 06:59:01 ea Exp $
+ *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/lfile.c
@@ -16,67 +17,104 @@
 
 
 
-long _hread(
-    HFILE  hFile,      
-    LPVOID  lpBuffer,  
-    long  lBytes       
-   )
+long
+STDCALL
+_hread(
+       HFILE   hFile,  
+       LPVOID  lpBuffer,       
+       long    lBytes  
+       )
 {
-       DWORD  NumberOfBytesRead;
-       if ( ReadFile((HANDLE)hFile,(LPVOID)lpBuffer,(DWORD)lBytes,&NumberOfBytesRead, NULL) == FALSE )
+       DWORD   NumberOfBytesRead;
+       
+       if (ReadFile(
+               (HANDLE) hFile,
+               (LPVOID) lpBuffer,
+               (DWORD) lBytes,
+               & NumberOfBytesRead,
+               NULL
+               ) == FALSE)
+       {
                return -1;
-       else
-               return NumberOfBytesRead;
-
+       }
+       return NumberOfBytesRead;
 }
 
-UINT STDCALL _lread(HFILE fd,LPVOID buffer,UINT count)
+
+/*
+//19990828.EA: aliased in DEF
+UINT
+STDCALL
+_lread (
+       HFILE   fd,
+       LPVOID  buffer,
+       UINT    count
+       )
 {
-    return _hread(fd,buffer, count);
+       return _hread(
+                fd,
+                buffer,
+                count
+                );
 }
+*/
 
 
-long _hwrite(
-    HFILE  hFile,      
-    LPCSTR  lpBuffer,  
-    long  lBytes       
-   )
+long
+STDCALL
+_hwrite (
+       HFILE   hFile,  
+       LPCSTR  lpBuffer,       
+       long    lBytes  
+       )
 {
-
-       DWORD  NumberOfBytesWritten;
-       if ( lBytes == 0 ) {
+       DWORD   NumberOfBytesWritten;
+       
+       if (lBytes == 0)
+       {
                if ( SetEndOfFile((HANDLE) hFile ) == FALSE )
+               {
                        return -1;
-               else
-                       return 0;
+               }
+               return 0;
        }
-       if ( WriteFile((HANDLE)hFile,(LPVOID)lpBuffer,(DWORD)lBytes, &NumberOfBytesWritten,NULL) == FALSE )
+       if ( WriteFile(
+               (HANDLE) hFile,
+               (LPVOID) lpBuffer,
+               (DWORD) lBytes,
+               & NumberOfBytesWritten,
+               NULL
+               ) == FALSE )
+       {
                return -1;
-       else
-               return NumberOfBytesWritten;
-
+       }
+       return NumberOfBytesWritten;
 }
 
+
+/*
+//19990828.EA: aliased in DEF
+
 UINT
 STDCALL
 _lwrite(
-       HFILE hFile,
-       LPCSTR lpBuffer,
-       UINT uBytes
+       HFILE   hFile,
+       LPCSTR  lpBuffer,
+       UINT    uBytes
        )
 {
        return _hwrite(hFile,lpBuffer,uBytes);
 }
+*/
 
 
-
-
-
-HFILE _lopen( LPCSTR  lpPathName, int  iReadWrite       )
+HFILE
+STDCALL
+_lopen (
+       LPCSTR  lpPathName,
+       int     iReadWrite
+       )
 {
-
-
-       
        DWORD dwAccessMask = 0;
        DWORD dwShareMode = 0;
        
@@ -87,31 +125,39 @@ HFILE _lopen( LPCSTR  lpPathName, int  iReadWrite   )
        else if ( (iReadWrite & OF_WRITE ) == OF_WRITE )
                dwAccessMask = GENERIC_WRITE;
 
-
-
-
-
-if ((iReadWrite & OF_SHARE_COMPAT) == OF_SHARE_COMPAT )
-       dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
-else if ((iReadWrite & OF_SHARE_DENY_NONE) == OF_SHARE_DENY_NONE)
-       dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
-else if ((iReadWrite & OF_SHARE_DENY_READ) == OF_SHARE_DENY_READ)
-       dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_DELETE;     
-else if ((iReadWrite & OF_SHARE_DENY_WRITE) == OF_SHARE_DENY_WRITE )
-       dwShareMode = FILE_SHARE_READ | FILE_SHARE_DELETE;              
-else if ((iReadWrite & OF_SHARE_EXCLUSIVE) == OF_SHARE_EXCLUSIVE)
-       dwShareMode = 0;        
+       if ((iReadWrite & OF_SHARE_COMPAT) == OF_SHARE_COMPAT )
+               dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
+       else if ((iReadWrite & OF_SHARE_DENY_NONE) == OF_SHARE_DENY_NONE)
+               dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE;
+       else if ((iReadWrite & OF_SHARE_DENY_READ) == OF_SHARE_DENY_READ)
+               dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_DELETE;     
+       else if ((iReadWrite & OF_SHARE_DENY_WRITE) == OF_SHARE_DENY_WRITE )
+               dwShareMode = FILE_SHARE_READ | FILE_SHARE_DELETE;              
+       else if ((iReadWrite & OF_SHARE_EXCLUSIVE) == OF_SHARE_EXCLUSIVE)
+               dwShareMode = 0;        
 
        
 
        SetLastError(0);
-       return (HFILE) CreateFileA( lpPathName,dwAccessMask,dwShareMode,
-                       NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL); 
+       return (HFILE) CreateFileA(
+                       lpPathName,
+                       dwAccessMask,
+                       dwShareMode,
+                       NULL,
+                       OPEN_EXISTING,
+                       FILE_ATTRIBUTE_NORMAL,
+                       NULL
+                       );      
 
 }
 
 
-HFILE _lcreat(  LPCSTR  lpPathName,     int  iAttribute         )
+HFILE
+STDCALL
+_lcreat (
+       LPCSTR  lpPathName,
+       int     iAttribute
+       )
 {
 
        DWORD FileAttributes = 0;
@@ -125,28 +171,47 @@ HFILE _lcreat(  LPCSTR  lpPathName,        int  iAttribute         )
        else if (  iAttribute == 4 )
                FileAttributes |= FILE_ATTRIBUTE_SYSTEM;
 
-       return(HFILE) CreateFileA( lpPathName,GENERIC_ALL,FILE_SHARE_READ|FILE_SHARE_WRITE,
-                       NULL,CREATE_ALWAYS,iAttribute ,NULL);   
+       return (HFILE) CreateFileA(
+                       lpPathName,
+                       GENERIC_ALL,
+                       (FILE_SHARE_READ | FILE_SHARE_WRITE),
+                       NULL,
+                       CREATE_ALWAYS,
+                       iAttribute,
+                       NULL
+                       );      
 }
 
 
-int _lclose(
-    HFILE  hFile       
-   )
+int
+STDCALL
+_lclose (
+       HFILE  hFile    
+       )
 {
        if ( CloseHandle((HANDLE)hFile) )
+       {
                return 0;
-       else
-               return -1; 
+       }
+       return -1; 
 }
 
-LONG _llseek(
-    HFILE  hFile,
-    LONG  lOffset, 
-    int  iOrigin 
-   )
+
+LONG
+STDCALL
+_llseek(
+       HFILE   hFile,
+       LONG    lOffset, 
+       int     iOrigin 
+       )
 {
-       return  SetFilePointer((HANDLE)  hFile,  lOffset, NULL,(DWORD)iOrigin );
+       return  SetFilePointer(
+                       (HANDLE) hFile,
+                       lOffset,
+                       NULL,
+                       (DWORD) iOrigin
+                       );
 }
 
 
+/* EOF */