Changeset 1018

Timestamp:

Sep 23, 1999, 4:25:25 PM (26 years ago)

Author:

phaller

Message:

Fix: fix in getmoreShared, erronous for loop index

Location:

trunk

Files:

• changelog (modified) (2 diffs)
• src/user32/heapshared.cpp (modified) (6 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.226 1999-09-23 13:54:37 phaller Exp $ */
+ /* $Id: changelog,v 1.227 1999-09-23 14:25:25 phaller Exp $ */
 
  99-09-23: Patrick Haller <phaller@gmx.net>
@@ -5 +5 @@
                         numerical resource IDs instead of translated Unicode
                         strings.
+        - USER32:       fix in USER32:HeapShared:getmoreShared()
 
  99-09-23: Jens Wiessner <wiessnej@rfi.de>

trunk/src/user32/heapshared.cpp

@@ -1 @@
-/* $Id: heapshared.cpp,v 1.1 1999-09-15 23:18:50 sandervl Exp $ */
+/* $Id: heapshared.cpp,v 1.2 1999-09-23 14:24:57 phaller Exp $ */
 /*
  * Shared heap functions for OS/2
@@ -40 +40 @@
         return FALSE;
   }
-  sharedHeap = _ucreate(pSharedMem, INCR_HEAPSIZE, _BLOCK_CLEAN, 
+  sharedHeap = _ucreate(pSharedMem, INCR_HEAPSIZE, _BLOCK_CLEAN,
                         _HEAP_REGULAR|_HEAP_SHARED,
                         getmoreShared, releaseShared);
@@ -78 +78 @@
 ULONG GetPageRangeFree(ULONG pageoffset)
 {
+  dprintf(("USER32: GetPageRangeFree(%08xh)\n",
+           pageoffset));
+
   for(int i=pageoffset;i<MAX_HEAPPAGES;i++) {
         if(pageBitmap[i] == 1) {
@@ -93 +96 @@
  PVOID newblock;
 
+ dprintf(("USER32: getmoreShared(%08xh, %08xh, %08xh)\n",
+          pHeap,
+          *size,
+          *clean));
+
   /* round the size up to a multiple of 4K */
   *size = (*size / 4096) * 4096 + 4096;
   *size = max(*size, INCR_HEAPSIZE);
 
-  for(int i=0;i<MAX_HEAPPAGES;i++) 
+  for(int i=0;i<MAX_HEAPPAGES;i++)
   {
         int nrpagesfree = GetPageRangeFree(i);
@@ -107 +115 @@
                         return NULL;
                 }
-                for(int j=i;j<i+*size/PAGE_SIZE;i++) {
-                        pageBitmap[i] = 1; //mark as committed
+                for(int j=0;
+        j < *size/PAGE_SIZE;
+        j++)
+  {
+                        pageBitmap[i+j] = 1; //mark as committed
                 }
 
@@ -140 +151 @@
 DWORD  HeapGetSharedMemBase()
 {
+  dprintf(("USER32: HeapGetSharedMemBase()\n"));
   return (DWORD) pSharedMem;
 }