I removed a pair of stubs for the OpenFileMapping functions

svn path=/trunk/; revision=686

diff --git a/reactos/lib/kernel32/mem/isbad.c b/reactos/lib/kernel32/mem/isbad.c
index a2e4e2d..175e20f 100644 (file)
--- a/reactos/lib/kernel32/mem/isbad.c
+++ b/reactos/lib/kernel32/mem/isbad.c
@@ -1,111 +1,219 @@
+/* $Id: isbad.c,v 1.2 1999/10/03 23:19:15 ea Exp $
+ *
+ * lib/kernel32/mem/isbad.c
+ *
+ * ReactOS Operating System
+ *
+ */
 #include <windows.h>
 
+/* FIXME: Stubs. What is it for? */
+UINT
+wcsnlen (
+       LPCWSTR lpsz,
+       UINT    ucchMax
+       )
+{
+       return 0;
+}
+
+
+/* FIXME: Stubs. What is it for? */
+UINT
+strnlen (
+       LPCSTR  lpsz,
+       UINT    uiMax
+       )
+{
+       return 0;
+}
+
+/* --- --- --- */
+
 WINBOOL 
 STDCALL
-IsBadReadPtr(  CONST VOID *lp,  UINT ucb     )
+IsBadReadPtr (
+       CONST VOID      * lp,
+       UINT            ucb
+       )
 {      
        MEMORY_BASIC_INFORMATION MemoryInformation;
 
        if ( ucb == 0 )
+       {
                return FALSE;
+       }
 
-       VirtualQuery(  lp, &MemoryInformation,  sizeof(MEMORY_BASIC_INFORMATION) );
+       VirtualQuery (
+               lp,
+               & MemoryInformation,
+               sizeof (MEMORY_BASIC_INFORMATION)
+               );
        
        if ( MemoryInformation.State != MEM_COMMIT )
+       {
                return FALSE;
+       }
                
        if ( MemoryInformation.RegionSize < ucb )
+       {
                return FALSE;
+       }
                
        if ( MemoryInformation.Protect == PAGE_EXECUTE )
+       {
                return FALSE;
+       }
                
        if ( MemoryInformation.Protect == PAGE_NOACCESS )
-               return FALSE;   
+       {
+               return FALSE;
+       }
                
        return TRUE;
                        
 }
+
+
 WINBOOL 
 STDCALL
-IsBadHugeReadPtr(  CONST VOID *lp,  UINT ucb     )
+IsBadHugeReadPtr (
+       CONST VOID      * lp,
+       UINT            ucb
+       )
 {
-       return IsBadReadPtr(lp,ucb);
+       return IsBadReadPtr (lp, ucb);
 }
 
+
 WINBOOL 
 STDCALL
-IsBadCodePtr(  FARPROC lpfn  )
+IsBadCodePtr (
+       FARPROC lpfn
+       )
 {
        MEMORY_BASIC_INFORMATION MemoryInformation;
 
 
-       VirtualQuery(  lpfn, &MemoryInformation,  sizeof(MEMORY_BASIC_INFORMATION) );
+       VirtualQuery (
+               lpfn,
+               & MemoryInformation,
+               sizeof (MEMORY_BASIC_INFORMATION)
+               );
        
        if ( MemoryInformation.State != MEM_COMMIT )
+       {
                return FALSE;
-               
+       }       
                        
-       if ( MemoryInformation.Protect == PAGE_EXECUTE || MemoryInformation.Protect == PAGE_EXECUTE_READ)
+       if (    (MemoryInformation.Protect == PAGE_EXECUTE)
+               || (MemoryInformation.Protect == PAGE_EXECUTE_READ)
+               )
+       {
                return TRUE;
-               
+       }
                
        return FALSE;
 }
 
+
 WINBOOL
-STDCALL IsBadWritePtr(  LPVOID lp,  UINT ucb   )
+STDCALL
+IsBadWritePtr (
+       LPVOID  lp,
+       UINT    ucb
+       )
 {
        MEMORY_BASIC_INFORMATION MemoryInformation;
 
        if ( ucb == 0 )
+       {
                return FALSE;
+       }
 
-       VirtualQuery(  lp, &MemoryInformation,  sizeof(MEMORY_BASIC_INFORMATION) );
+       VirtualQuery (
+               lp,
+               & MemoryInformation,
+               sizeof (MEMORY_BASIC_INFORMATION)
+               );
        
        if ( MemoryInformation.State != MEM_COMMIT )
+       {
                return FALSE;
-               
+       }
                
        if ( MemoryInformation.RegionSize < ucb )
+       {
                return FALSE;
+       }
                
                
        if ( MemoryInformation.Protect == PAGE_READONLY)
-               return FALSE;   
+       {
+               return FALSE;
+       }
                
-       if ( MemoryInformation.Protect == PAGE_EXECUTE || MemoryInformation.Protect == PAGE_EXECUTE_READ)
+       if (    (MemoryInformation.Protect == PAGE_EXECUTE)
+               || (MemoryInformation.Protect == PAGE_EXECUTE_READ)
+               )
+       {
                return FALSE;
+       }
                
        if ( MemoryInformation.Protect == PAGE_NOACCESS )
+       {
                return FALSE;   
+       }
                
        return TRUE;
 }
 
+
 WINBOOL
 STDCALL
-IsBadHugeWritePtr(
-                 LPVOID lp,
-                 UINT ucb
-                 )
+IsBadHugeWritePtr (
+       LPVOID  lp,
+       UINT    ucb
+       )
 {
-       return IsBadWritePtr(lp,ucb);
+       return IsBadWritePtr (lp, ucb);
 }
 
 
 WINBOOL
 STDCALL
-IsBadStringPtrW(  LPCWSTR lpsz,  UINT ucchMax   )
+IsBadStringPtrW (
+       LPCWSTR lpsz,
+       UINT    ucchMax
+       )
 {
-       UINT Len = wcsnlen(lpsz+1,ucchMax>>1);
-       return IsBadReadPtr(lpsz,Len<<1);
+       UINT Len = wcsnlen (
+                       lpsz + 1,
+                       ucchMax >> 1
+                       );
+       return IsBadReadPtr (
+                       lpsz,
+                       Len << 1
+                       );
 }
 
+
 WINBOOL 
 STDCALL
-IsBadStringPtrA(  LPCSTR lpsz,  UINT ucchMax   )
+IsBadStringPtrA (
+       LPCSTR  lpsz,
+       UINT    ucchMax
+       )
 {
-       UINT Len = strnlen(lpsz+1,ucchMax);
-       return IsBadReadPtr(lpsz,Len);
+       UINT Len = strnlen (
+                       lpsz + 1,
+                       ucchMax
+                       );
+       return IsBadReadPtr (
+                       lpsz,
+                       Len
+                       );
 }
+
+
+/* EOF */

diff --git a/reactos/lib/kernel32/mem/section.c b/reactos/lib/kernel32/mem/section.c
index 392985f..ff473d1 100644 (file)
--- a/reactos/lib/kernel32/mem/section.c
+++ b/reactos/lib/kernel32/mem/section.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: section.c,v 1.4 1999/10/03 23:19:15 ea Exp $
+ *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 lib/kernel32/mem/section.c
@@ -13,12 +14,16 @@
 
 /* FUNCTIONS *****************************************************************/
 
-HANDLE CreationFileMappingA(HANDLE hFile,
-                           LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
-                           DWORD flProtect,
-                           DWORD dwMaximumSizeHigh,
-                           DWORD dwMaximumSizeLow,
-                           LPCSTR lpName)
+HANDLE
+STDCALL
+CreateFileMappingA (
+       HANDLE                  hFile,
+       LPSECURITY_ATTRIBUTES   lpFileMappingAttributes,
+       DWORD                   flProtect,
+       DWORD                   dwMaximumSizeHigh,
+       DWORD                   dwMaximumSizeLow,
+       LPCSTR                  lpName
+       )
 {
    NTSTATUS Status;
    HANDLE SectionHandle;
@@ -52,12 +57,17 @@ HANDLE CreationFileMappingA(HANDLE hFile,
        return SectionHandle;
 }
 
-HANDLE CreationFileMappingW(HANDLE hFile,
-                           LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
-                           DWORD flProtect,
-                           DWORD dwMaximumSizeHigh,
-                           DWORD dwMaximumSizeLow,
-                           LPCWSTR lpName)
+
+HANDLE
+STDCALL
+CreateFileMappingW (
+       HANDLE                  hFile,
+       LPSECURITY_ATTRIBUTES   lpFileMappingAttributes,
+       DWORD                   flProtect,
+       DWORD                   dwMaximumSizeHigh,
+       DWORD                   dwMaximumSizeLow,
+       LPCWSTR                 lpName
+       )
 {
    NTSTATUS Status;
    HANDLE SectionHandle;
@@ -89,12 +99,17 @@ HANDLE CreationFileMappingW(HANDLE hFile,
        return SectionHandle;
 }
 
-LPVOID MapViewOfFileEx(HANDLE hFileMappingObject,
-                      DWORD dwDesiredAccess,
-                      DWORD dwFileOffsetHigh,
-                      DWORD dwFileOffsetLow,
-                      DWORD dwNumberOfBytesToMap,
-                      LPVOID lpBaseAddress)
+
+LPVOID
+STDCALL
+MapViewOfFileEx (
+       HANDLE  hFileMappingObject,
+       DWORD   dwDesiredAccess,
+       DWORD   dwFileOffsetHigh,
+       DWORD   dwFileOffsetLow,
+       DWORD   dwNumberOfBytesToMap,
+       LPVOID  lpBaseAddress
+       )
 {
    NTSTATUS Status;
    
@@ -182,11 +197,14 @@ UnmapViewOfFile (
        return TRUE;
 }
 
-HANDLE OpenFileMappingA(
-       DWORD  dwDesiredAccess,
-       WINBOOL  bInheritHandle,        
-       LPCSTR  lpName  
-   )
+
+HANDLE
+STDCALL
+OpenFileMappingA (
+       DWORD   dwDesiredAccess,
+       WINBOOL bInheritHandle, 
+       LPCSTR  lpName  
+       )
 {
    NTSTATUS Status;
    HANDLE SectionHandle;
@@ -221,11 +239,14 @@ HANDLE OpenFileMappingA(
        return SectionHandle;
 }
 
-HANDLE OpenFileMappingW(
-       DWORD  dwDesiredAccess,
-       WINBOOL  bInheritHandle,        
-       LPCWSTR  lpName         
-   )
+
+HANDLE
+STDCALL
+OpenFileMappingW (
+       DWORD   dwDesiredAccess,
+       WINBOOL bInheritHandle, 
+       LPCWSTR lpName  
+       )
 {
    NTSTATUS Status;
    HANDLE SectionHandle;
@@ -256,8 +277,4 @@ HANDLE OpenFileMappingW(
 }
 
 
-
-
-
-
-
+/* EOF */

diff --git a/reactos/lib/kernel32/misc/stubs.c b/reactos/lib/kernel32/misc/stubs.c
index b9c9f0e..f910f3a 100644 (file)
--- a/reactos/lib/kernel32/misc/stubs.c
+++ b/reactos/lib/kernel32/misc/stubs.c
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.5 1999/10/02 20:20:44 ariadne Exp $
+/* $Id: stubs.c,v 1.6 1999/10/03 23:19:15 ea Exp $
  *
  * KERNEL32.DLL stubs (unimplemented functions)
  * Remove from this file, if you implement them.
@@ -3035,32 +3035,6 @@ OpenConsoleW (
 }
 
 
-HANDLE
-STDCALL
-OpenFileMappingA (
-       DWORD   dwDesiredAccess,
-       WINBOOL bInheritHandle,
-       LPCSTR  lpName
-       )
-{
-       SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-       return INVALID_HANDLE_VALUE;
-}
-
-
-HANDLE
-STDCALL
-OpenFileMappingW (
-       DWORD   dwDesiredAccess,
-       WINBOOL bInheritHandle,
-       LPCWSTR lpName
-       )
-{
-       SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-       return INVALID_HANDLE_VALUE;
-}
-
-
 HANDLE
 STDCALL
 OpenMutexA (