Changeset 1151 for trunk/src/kernel32/virtual.cpp

Timestamp:

Oct 6, 1999, 11:58:24 AM (26 years ago)

Author:

phaller

Message:

Fix: VirtualFree not freeing memory fixed

File:

• trunk/src/kernel32/virtual.cpp (modified) (4 diffs)

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.12 1999-09-01 19:12:18 phaller Exp $ */
+/* $Id: virtual.cpp,v 1.13 1999-10-06 09:58:24 phaller Exp $ */
 
 /*
@@ -15 +15 @@
  *
  */
+
+#include <odin.h>
+#include <odinwrap.h>
 
 #include <os2win.h>
@@ -24 +27 @@
 #include "mmap.h"
 #include "oslibdos.h"
+
+
+ODINDEBUGCHANNEL(KERNEL32-VIRTUAL)
+
 
 /***********************************************************************
@@ -358 +365 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API VirtualFree(LPVOID lpvAddress, DWORD cbSize, DWORD FreeType)
-{
- DWORD rc;
-
-  dprintf(("VirtualFree at %d; %d bytes, freetype %d\n", (int)lpvAddress, cbSize, FreeType));
-
-  if(lpvAddress == NULL || cbSize == 0) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return(FALSE);
-  }
-  if(FreeType & MEM_DECOMMIT) {
-        rc = OSLibDosSetMem(lpvAddress, cbSize, PAG_DECOMMIT);
-  }
-  else  rc = OSLibDosFreeMem(lpvAddress);    //MEM_RELEASE, cbSize == 0 (or should be)
-
-  if(rc) {
-        SetLastError(ERROR_GEN_FAILURE);
-        return(FALSE);
-  }
+ODINFUNCTION3(BOOL, VirtualFree, LPVOID, lpvAddress,
+                                 DWORD,  cbSize,
+                                 DWORD,  FreeType)
+{
+  DWORD rc;
+
+  // verify parameters
+  if ( (lpvAddress == NULL) ||
+       ( (FreeType & MEM_RELEASE) &&
+         (cbSize   != 0) )
+     )
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return(FALSE);
+  }
+
+  if(FreeType & MEM_DECOMMIT)
+    rc = OSLibDosSetMem(lpvAddress, cbSize, PAG_DECOMMIT);
+  else
+    rc = OSLibDosFreeMem(lpvAddress);    //MEM_RELEASE, cbSize == 0 (or should be)
+
+  if(rc)
+  {
+    SetLastError(ERROR_GEN_FAILURE);
+    return(FALSE);
+  }
+
   return(TRUE);
 }