Changeset 634 for trunk/src

Timestamp:

Aug 23, 1999, 12:11:23 AM (26 years ago)

Author:

sandervl

Message:

Bugfixes + def files changes

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• cvtcursor.cpp (modified) (4 diffs)
• exceptions.cpp (modified) (3 diffs)
• exceptutil.h (modified) (2 diffs)
• heapstring.cpp (modified) (2 diffs)
• kernel32exp.def (modified) (2 diffs)
• windll.cpp (modified) (2 diffs)
• winimgres.cpp (modified) (4 diffs)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.26 1999-08-21 16:29:27 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.27 1999-08-22 22:11:22 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -999 +999 @@
     HEAP_strdupW               = _HEAP_strdupW@12                 @1248
 
-
     VIRTUAL_MapFileA           = _VIRTUAL_MapFileA@4              @1249
     VIRTUAL_MapFileW           = _VIRTUAL_MapFileW@4              @1250
-

trunk/src/kernel32/cvtcursor.cpp

@@ -1 @@
-/* $Id: cvtcursor.cpp,v 1.1 1999-08-19 19:50:40 sandervl Exp $ */
+/* $Id: cvtcursor.cpp,v 1.2 1999-08-22 22:11:21 sandervl Exp $ */
 
 /*
@@ -34 +34 @@
 {
  RGBQUAD   *rgb;
- RGB       *os2rgb;
+ RGB2      *os2rgb;
  WINBITMAPINFOHEADER *bhdr = (WINBITMAPINFOHEADER *)(curHdr+1);
- BITMAPFILEHEADER    *cursorhdr;
+ BITMAPFILEHEADER2   *cursorhdr;
  int        i, bwsize, bmpsize, cursorsize;
 
   dprintf(("ConvertCursor: Cursor size %d", size));
   bmpsize = size - sizeof(CursorComponent) - (1<<bhdr->biBitCount)*sizeof(RGBQUAD);
-  cursorsize = sizeof(BITMAPFILEHEADER) + bmpsize + (1<<bhdr->biBitCount)*sizeof(RGB);
+  cursorsize = sizeof(BITMAPFILEHEADER2) + bmpsize + (1<<bhdr->biBitCount)*sizeof(RGB2);
 
-  cursorhdr  = (BITMAPFILEHEADER *)malloc(cursorsize);
+  cursorhdr  = (BITMAPFILEHEADER2 *)malloc(cursorsize);
   cursorhdr->usType        = BFT_POINTER;
-  cursorhdr->cbSize        = sizeof(BITMAPFILEHEADER);
+  cursorhdr->cbSize        = sizeof(BITMAPFILEHEADER2);
   cursorhdr->xHotspot      = curHdr->xHotspot;
 
@@ -55 +55 @@
   dprintf(("Cursor Hot.y   : %d", curHdr->yHotspot));
 
-  cursorhdr->offBits       = sizeof(BITMAPFILEHEADER) + 2*sizeof(RGB) + offsetBits;
-  cursorhdr->bmp.cbFix     = sizeof(BITMAPINFOHEADER);
-  cursorhdr->bmp.cx        = (USHORT)bhdr->biWidth;
-  cursorhdr->bmp.cy        = (USHORT)(bhdr->biHeight);
-  cursorhdr->bmp.cPlanes   = bhdr->biPlanes;
-  cursorhdr->bmp.cBitCount = bhdr->biBitCount;
+  cursorhdr->offBits       = sizeof(BITMAPFILEHEADER2) + 2*sizeof(RGB2) + offsetBits;
+  cursorhdr->bmp2.cbFix     = sizeof(BITMAPINFOHEADER);
+  cursorhdr->bmp2.cx        = (USHORT)bhdr->biWidth;
+  cursorhdr->bmp2.cy        = (USHORT)(bhdr->biHeight);
+  cursorhdr->bmp2.cPlanes   = bhdr->biPlanes;
+  cursorhdr->bmp2.cBitCount = bhdr->biBitCount;
   dprintf(("Cursor size    : %d", bhdr->biSizeImage));
   dprintf(("Cursor Width   : %d", bhdr->biWidth));
@@ -68 +68 @@
   dprintf(("Cursor Compress: %d", bhdr->biCompression));
 
-  os2rgb                   = (RGB *)(cursorhdr+1);
+  os2rgb                   = (RGB2 *)(cursorhdr+1);
   rgb                      = (RGBQUAD *)(bhdr+1);
   for(i=0;i<(1<<bhdr->biBitCount);i++) {

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.10 1999-08-22 11:11:10 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.11 1999-08-22 22:11:21 sandervl Exp $ */
 
 /*
@@ -935 +935 @@
  PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)exceptframe;
 
-  pExceptRec->prev_structure   = 0;
+  pExceptRec->prev_structure   = (PEXCEPTIONREGISTRATIONRECORD)-1;
   pExceptRec->ExceptionHandler = OS2ExceptionHandler;
 
@@ -960 +960 @@
 }
 
+void SetOS2ExceptionChain(ULONG val)
+{
+ USHORT sel = GetFS();
+
+    SetExceptionChain(val);    
+    SetFS(sel);
+}
+
 /*****************************************************************************
  * Name      : void ReplaceExceptionHandler

trunk/src/kernel32/exceptutil.h

@@ -1 @@
-/* $Id: exceptutil.h,v 1.1 1999-08-22 12:55:57 sandervl Exp $ */
+/* $Id: exceptutil.h,v 1.2 1999-08-22 22:11:21 sandervl Exp $ */
 
 /*
@@ -25 +25 @@
 void  OS2SetExceptionHandler(void *exceptframe);
 void  OS2UnsetExceptionHandler(void *exceptframe);
+void  SetOS2ExceptionChain(ULONG val);
 
 ULONG  getEAX();

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id */
+/* $Id: heapstring.cpp,v 1.8 1999-08-22 22:11:21 sandervl Exp $ */
 
 /*
@@ -845 +845 @@
 
 
+
 #if 0
 

trunk/src/kernel32/kernel32exp.def

@@ -1 @@
-; $Id: kernel32exp.def,v 1.13 1999-08-21 16:29:27 sandervl Exp $
+; $Id: kernel32exp.def,v 1.14 1999-08-22 22:11:22 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -851 +851 @@
 _VIRTUAL_MapFileA@4              @1249
 _VIRTUAL_MapFileW@4              @1250
+
+; HEAP Management (heap.cpp, heapstring.cpp)
+_HEAP_xalloc@12                  @1240
+_HEAP_xrealloc@16                @1241
+_HEAP_malloc@4                   @1242
+_HEAP_realloc@8                  @1243
+_HEAP_free@4                     @1244
+_HEAP_strdupWtoA@12              @1245
+_HEAP_strdupAtoW@12              @1246
+_HEAP_strdupA@12                 @1247
+_HEAP_strdupW@12                 @1248

trunk/src/kernel32/windll.cpp

@@ -1 @@
-/* $Id: windll.cpp,v 1.12 1999-08-22 15:11:35 sandervl Exp $ */
+/* $Id: windll.cpp,v 1.13 1999-08-22 22:11:22 sandervl Exp $ */
 
 /*
@@ -48 +48 @@
   head = this;
 
+  dllEntryPoint = 0;
+
   dprintf(("Win32Dll::Win32Dll %s %s", szFileName, szModule));
 }

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.11 1999-08-20 11:52:44 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.12 1999-08-22 22:11:22 sandervl Exp $ */
 
 /*
@@ -81 +81 @@
         pstring = (PIMAGE_RESOURCE_DIR_STRING_U)((ULONG)pResDir + nameOffset);
         char *typename = (char *)malloc(pstring->Length+1);
-        lstrcpynWtoA(typename, pstring->NameString, pstring->Length);
+        lstrcpynWtoA(typename, pstring->NameString, pstring->Length+1);
         typename[pstring->Length] = 0;
         
@@ -170 +170 @@
 
                 resname = (char *)malloc(pstring->Length+1);
-                lstrcpynWtoA(resname, pstring->NameString, pstring->Length);
+                lstrcpynWtoA(resname, pstring->NameString, pstring->Length+1);
                 resname[pstring->Length] = 0;
                 if(stricmp(resname, (char *)*nodeData) == 0) {
@@ -253 +253 @@
   pData = getPEResourceEntry(id, type, lang);
   if(pData == NULL) {
-        dprintf(("Win32Image::getPEResource: couldn't find resource %d (type %d, lang %d)", id, type, lang));
+        if(HIWORD(id)) {
+                dprintf(("Win32Image::getPEResource: couldn't find resource %s (type %d, lang %d)", id, type, lang));
+        }
+        else    dprintf(("Win32Image::getPEResource: couldn't find resource %d (type %d, lang %d)", id, type, lang));
         return 0;
   }

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.25 1999-08-22 14:24:35 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.26 1999-08-22 22:11:23 sandervl Exp $ */
 
 /*
@@ -329 +329 @@
   dprintf(("KERNEL32:  ExitProcess FS = %x\n", GetFS()));
 
+  SetOS2ExceptionChain(-1);
+
   //avoid crashes since win32 & OS/2 exception handler aren't identical
   //(terminate process generates two exceptions)
@@ -674 +676 @@
 
     if(O32_CreateProcess(lpszImageName, lpszCommandLine, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) == TRUE)
-    return(TRUE);
+        return(TRUE);
 
     //probably a win32 exe, so run it in the pe loader
     if(lpszImageName) {
-     if(lpszCommandLine) {
-        cmdline = (char *)malloc(strlen(lpszImageName)+strlen(lpszCommandLine) + 16);
-        sprintf(cmdline, "%s %s", lpszImageName, lpszCommandLine);
-        fAllocStr = TRUE;
-     }
-     else   cmdline = (char *)lpszImageName;
+         if(lpszCommandLine) {
+                cmdline = (char *)malloc(strlen(lpszImageName)+strlen(lpszCommandLine) + 16);
+                sprintf(cmdline, "%s %s", lpszImageName, lpszCommandLine);
+                fAllocStr = TRUE;
+         }
+         else   cmdline = (char *)lpszImageName;
     }
     else cmdline = (char *)lpszCommandLine;