Changeset 37 for trunk/src/kernel32

Timestamp:

Jun 6, 1999, 2:25:49 PM (26 years ago)

Author:

cbratschi

Message:

hiho

Location:

trunk/src/kernel32

Files:

• heap.cpp (modified) (7 diffs)
• resource.cpp (modified) (4 diffs)
• winres.cpp (modified) (6 diffs)

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.4 1999-05-31 23:17:17 phaller Exp $ */
+/* $Id: heap.cpp,v 1.5 1999-06-06 12:25:49 cbratschi Exp $ */
 
 /*
@@ -71 +71 @@
   curheap = new OS2Heap(hHeap, flOptions, dwInitialSize, dwMaximumSize);
   if(curheap == NULL) {
-        O32_HeapDestroy(hHeap);
+        O32_HeapDestroy(hHeap);
         return(NULL);
   }
   if(curheap->getHeapHandle() == NULL) {
-        O32_HeapDestroy(hHeap);
+        O32_HeapDestroy(hHeap);
         delete curheap;
         return(NULL);
@@ -98 +98 @@
 /* PH: Though "HeapSize" is a reserved word for the linker, ILINK can be
    tricked by placing the word HEAPSIZE in quotes. It then exports it properly
-   to the target DLL. 
+   to the target DLL.
  */
 DWORD WIN32API HeapSize(HANDLE hHeap, DWORD arg2, PVOID  arg3)
@@ -154 +154 @@
     //SvL: Only one process heap per process
     if(processheap == NULL) {
-        //TODO: I haven't thought real hard about this.  I added it just to make "hdr.exe" happy.
-        hHeap = O32_HeapCreate(HEAP_GENERATE_EXCEPTIONS, 1, 0x4000);
-        OS2ProcessHeap = new OS2Heap(hHeap, HEAP_GENERATE_EXCEPTIONS, 0x4000, 0);
-        if(OS2ProcessHeap == NULL) {
-                O32_HeapDestroy(hHeap);
-                return(NULL);
-        }
-        processheap = hHeap;
+        //TODO: I haven't thought real hard about this.  I added it just to make "hdr.exe" happy.
+        hHeap = O32_HeapCreate(HEAP_GENERATE_EXCEPTIONS, 1, 0x4000);
+        OS2ProcessHeap = new OS2Heap(hHeap, HEAP_GENERATE_EXCEPTIONS, 0x4000, 0);
+        if(OS2ProcessHeap == NULL) {
+                O32_HeapDestroy(hHeap);
+                return(NULL);
+        }
+        processheap = hHeap;
     }
     return(processheap);
@@ -173 +173 @@
 
   if(processheap == NULL) {
-        if(GetProcessHeap() == NULL)
-                return(NULL);
+        if(GetProcessHeap() == NULL)
+                return(NULL);
   }
   if(fuFlags & LMEM_ZEROINIT)
@@ -209 +209 @@
 
     if(OS2ProcessHeap->GetLockCnt((LPVOID)hMem) != 0) {
-        dprintf(("LocalFree, lock count != 0\n"));
-        return(hMem);   //TODO: SetLastError
+        dprintf(("LocalFree, lock count != 0\n"));
+        return(hMem);   //TODO: SetLastError
     }
     if(OS2ProcessHeap->Free(0, (LPVOID)hMem) == FALSE) {
-        return(hMem);   //TODO: SetLastError
+        return(hMem);   //TODO: SetLastError
     }
     return NULL; //success
@@ -238 +238 @@
 HLOCAL WIN32API LocalReAlloc(HLOCAL hMem, DWORD cbBytes, UINT fuFlags)
 {
- LPVOID lpMem;
+ HLOCAL lpMem;
 
     dprintf(("KERNEL32: LocalReAlloc %X %d %X\n", hMem, cbBytes, fuFlags));
     //SvL: 8-8-'98: Notepad bugfix (assumes address is identical when new size < old size)
-    if(OS2ProcessHeap->Size(0, (LPVOID)hMem) > cbBytes)
-        return hMem;
-
-    lpMem = (LPVOID)O32_LocalAlloc(fuFlags, cbBytes);
-    memcpy(lpMem, (LPVOID)hMem, min(cbBytes, OS2ProcessHeap->Size(0, (LPVOID)hMem)));
+    if(OS2ProcessHeap->Size(0, (LPVOID)hMem) >= cbBytes)
+    {
+        dprintf(("KERNEL32:  LocalReAlloc returned %X\n", hMem));
+        return hMem;
+    }
+
+    lpMem = LocalAlloc(fuFlags, cbBytes);
+    memcpy((LPVOID)lpMem, (LPVOID)hMem, min(cbBytes, OS2ProcessHeap->Size(0, (LPVOID)hMem)));
     OS2ProcessHeap->Free(0, (LPVOID)hMem);
+
+    dprintf(("KERNEL32:  LocalReAlloc returned %X\n", lpMem));
     return((HLOCAL)lpMem);
 }

trunk/src/kernel32/resource.cpp

@@ -1 @@
-/* $Id: resource.cpp,v 1.3 1999-06-01 15:47:38 phaller Exp $ */
+/* $Id: resource.cpp,v 1.4 1999-06-06 12:25:49 cbratschi Exp $ */
 
 /*
@@ -31 +31 @@
 
     dprintf(("FindResourceA %X", hModule));
-    if(hModule == 0 || hModule == -1)
-        module = (Win32Image *)WinExe;
-    else    module = (Win32Image *)Win32Dll::findModule(hModule);
+    // EB: ->>> added real exe module handle
+    if(hModule == 0 || hModule == -1 || (WinExe != NULL && hModule == WinExe->getOS2InstanceHandle()))
+      module = (Win32Image *)WinExe;
+    else
+      module = (Win32Image *)Win32Dll::findModule(hModule);
 
     if(module == NULL)
@@ -43 +45 @@
 //******************************************************************************
 HRSRC WIN32API FindResourceW(HINSTANCE hModule, LPCWSTR lpszName,
-                             LPCWSTR lpszType)
+                             LPCWSTR lpszType)
 {
  Win32Image *module;
@@ -53 +55 @@
 
     if(module == NULL)
-        return(NULL);
+        return(NULL);
 
     return module->findResourceW((LPWSTR)lpszName, (LPWSTR)lpszType);

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.1 1999-05-24 20:19:50 ktk Exp $ */
+/* $Id: winres.cpp,v 1.2 1999-06-06 12:25:49 cbratschi Exp $ */
 
 /*
@@ -32 +32 @@
 #include "winexe.h"
 
+static ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy)
+{
+        ULONG alignment;
+        ULONG factor;
+        BOOL flag = TRUE;       //true: '*'     false: '/'
+
+        cy = cy < 0 ? -cy : cy;
+
+        switch(cBits)
+        {
+                case 1:
+                        factor = 8;
+                        flag = FALSE;
+                        break;
+
+                case 4:
+                        factor = 2;
+                        flag = FALSE;
+                        break;
+
+                case 8:
+                        factor = 1;
+                        break;
+
+                case 16:
+                        factor = 2;
+                        break;
+
+                case 24:
+                        factor = 3;
+                        break;
+
+                case 32:
+                        return cx*cy;
+
+                default:
+                        return 0;
+        }
+
+        if (flag)
+                alignment = (cx = (cx*factor)) % 4;
+        else
+                alignment = (cx = ((cx+factor-1)/factor)) % 4;
+
+        if (alignment != 0)
+                cx += 4 - alignment;
+
+        return cx*cy;
+}
+
 //******************************************************************************
 //******************************************************************************
@@ -187 +237 @@
  RGB2                *os2rgb;
  int                  palsize = 0;
+ int                  imgsize;
 
   if(bmphdr->cbSize != sizeof(BITMAPFILEHEADER2))
@@ -194 +245 @@
     palsize = (1 << bmphdr->bmp2.cBitCount) * sizeof(RGBQUAD);
   }
+
+  // EB: ->>> added imgsize
+  if(bmphdr->bmp2.cbImage == 0)
+    imgsize =  CalcBitmapSize(bmphdr->bmp2.cBitCount,
+                              bmphdr->bmp2.cx,
+                              bmphdr->bmp2.cy);
+  else
+    imgsize = bmphdr->bmp2.cbImage;
+
   winbmphdr = (WINBITMAPINFOHEADER *)malloc(sizeof(WINBITMAPINFOHEADER) +
-                        bmphdr->bmp2.cbImage + palsize);
-  memset((char *)winbmphdr, 0, sizeof(WINBITMAPINFOHEADER) + bmphdr->bmp2.cbImage +
-                   palsize);
+                        imgsize + palsize);
+  memset((char *)winbmphdr, 0, sizeof(WINBITMAPINFOHEADER) + imgsize + palsize);
 
   winbmphdr->biSize          = sizeof(WINBITMAPINFOHEADER);
@@ -206 +265 @@
   //TODO: Identical except for BI_BITFIELDS (3L) type!
   winbmphdr->biCompression   = bmphdr->bmp2.ulCompression;
-  winbmphdr->biSizeImage     = bmphdr->bmp2.cbImage;
+  winbmphdr->biSizeImage     = bmphdr->bmp2.cbImage; //imgsize;
   //TODO: Doesn't seem to be completely identical..
   winbmphdr->biClrUsed       = bmphdr->bmp2.cclrUsed;
@@ -221 +280 @@
     rgb    = (RGBQUAD *)((int)rgb    + palsize);
   }
-  memcpy((char *)rgb, (char *)os2rgb, winbmphdr->biSizeImage);
+  memcpy((char *)rgb, (char *)os2rgb, imgsize);
   return((PVOID)winbmphdr);
 }