commit 982a223f362b004b191dff7a49eb5cfc4f9ffa06
author Alexandre Julliard <julliard@winehq.org> Wed Dec 13 20:20:09 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Dec 13 20:20:09 2000 +0000
tree 510d5e2d462693a011868f2a42c9c18ffc33221a
parent f6168db69088c1455525bd2ae8357862ecab649e

Replaced PTR_SEG_TO_LIN macro by exported MapSL function.
Fixed a few ptr/segptr mismatches.
Moved CONV_RECT/POINT macros to wingdi16.h.

memory/global.c

diff --git a/memory/global.c b/memory/global.c
index 57d1e7f..5d74018 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -14,6 +14,7 @@
 
 #include "wine/winbase16.h"
 #include "wine/exception.h"
+#include "wine/port.h"
 #include "global.h"
 #include "heap.h"
 #include "toolhelp.h"
@@ -412,7 +413,7 @@
     }
 
     CURRENT_STACK16->ecx = sel;  /* selector must be returned in CX as well */
-    return PTR_SEG_OFF_TO_SEGPTR( sel, 0 );
+    return MAKESEGPTR( sel, 0 );
 }
 
 
@@ -930,7 +931,7 @@
      * (under Windows) always fills the structure and returns true.
      */
     GlobalMemoryStatus( &status );
-    info->wPageSize            = VIRTUAL_GetPageSize();
+    info->wPageSize            = getpagesize();
     info->dwLargestFreeBlock   = status.dwAvailVirtual;
     info->dwMaxPagesAvailable  = info->dwLargestFreeBlock / info->wPageSize;
     info->dwMaxPagesLockable   = info->dwMaxPagesAvailable;
@@ -1046,13 +1047,13 @@
       /* HeapLock(heap); */
 
       pintern=HeapAlloc(heap, 0,  sizeof(GLOBAL32_INTERN));
-      if (!pintern) return NULL;
+      if (!pintern) return 0;
       if(size)
       {
 	 size = (size + 0x1f) & ~0x1f;
 	 if (!(palloc=HeapAlloc(heap, hpflags, size+sizeof(HGLOBAL)))) {
 	    HeapFree(heap, 0, pintern);
-	    return NULL;
+	    return 0;
 	 }
 	 *(HGLOBAL *)palloc=INTERN_TO_HANDLE(pintern);
 	 pintern->Pointer=(char *) palloc+sizeof(HGLOBAL);