Changeset 581 for trunk/src

Timestamp:

Aug 19, 1999, 4:19:15 PM (26 years ago)

Author:

sandervl

Message:

PE loader resource convertion changes

Location:

trunk/src/kernel32

Files:

• cvtaccel.cpp (added)
• cvtbitmap.cpp (added)
• cvticon.cpp (added)
• cvtmenu.cpp (added)
• cvtresource.h (added)
• kernel32exp.def (modified) (2 diffs)
• makefile (modified) (3 diffs)
• winres.cpp (modified) (5 diffs)

trunk/src/kernel32/kernel32exp.def

@@ -1 @@
-; $Id: kernel32exp.def,v 1.10 1999-08-18 17:18:00 sandervl Exp $
+; $Id: kernel32exp.def,v 1.11 1999-08-19 14:19:14 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -841 +841 @@
    _GetThreadTHDB@0                        @1235
 
+   _CreateWin32Exe@4                       @1236

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.19 1999-08-19 12:53:18 sandervl Exp $
+# $Id: makefile,v 1.20 1999-08-19 14:19:15 sandervl Exp $
 
 #
@@ -76 +76 @@
        disk.obj \
        directory.obj \
+       cvtbitmap.obj \
+       cvtmenu.obj \
+       cvtaccel.obj \
+       cvticon.obj \
        stubs.obj
 
@@ -349 +353 @@
 stubs.obj:     stubs.cpp stubs.h
 
+cvtbitmap.obj: cvtbitmap.cpp $(PDWIN32_INCLUDE)\winicon.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
+cvtmenu.obj: cvtmenu.cpp $(PDWIN32_INCLUDE)\winmenu.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
+cvtaccel.obj: cvtaccel.cpp $(PDWIN32_INCLUDE)\winaccel.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
+cvticon.obj: cvticon.cpp $(PDWIN32_INCLUDE)\winicon.h $(PDWIN32_INCLUDE)\misc.h cvtresource.h
 
 clean:

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.7 1999-08-19 12:53:19 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.8 1999-08-19 14:19:15 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include <nameid.h>
 #include <winexe.h>
+#include "cvtresource.h"
 
 static ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy)
@@ -196 +197 @@
         rc = DosGetResource((HMODULE)module->hinstance, RT_BITMAP, id, (PPVOID)&resdata);
         if(rc)  return(NULL);
-        winresdata = ConvertBitmap((BITMAPFILEHEADER2 *)resdata);
+        winresdata = convertOS2Bitmap((BITMAPFILEHEADER2 *)resdata);
         break;
 
@@ -273 +274 @@
    dprintf(("Win32Resource::lockOS2Resource %d\n", id));
    if(os2resdata == NULL) {
-        rc = DosGetResource((HMODULE)module->hinstance, orgos2type, id, (PPVOID)&resdata);
-        if(rc)  return(NULL);
-        os2resdata = resdata;
+        if(resType == RSRC_PELOADER) {
+                os2resdata = convertResource(winresdata);
+        }
+        else {
+                rc = DosGetResource((HMODULE)module->hinstance, orgos2type, id, (PPVOID)&resdata);
+                if(rc)  return(NULL);
+                os2resdata = resdata;
+        }
    }
    return os2resdata;
@@ -281 +287 @@
 //******************************************************************************
 //******************************************************************************
-PVOID Win32Resource::ConvertBitmap(void *bmpdata)
+PVOID Win32Resource::convertResource(void *win32res)
+{
+ ULONG cvtressize;
+
+  switch(type) {
+    case NTRT_NEWBITMAP:
+    case NTRT_BITMAP:
+        return ConvertBitmap((WINBITMAPINFOHEADER *)win32res, ressize, &ressize);
+
+    case NTRT_CURSOR:
+    case NTRT_GROUP_CURSOR:
+    case NTRT_GROUP_ICON:
+    case NTRT_ICON:
+        return ConvertIcon((WINBITMAPINFOHEADER *)win32res, ressize);
+
+    case NTRT_ACCELERATORS:
+        return ConvertAccelerator((WINACCEL *)win32res, ressize);
+
+    case NTRT_NEWMENU:
+    case NTRT_MENU:
+        return ConvertMenu((MenuHeader *)win32res, ressize);
+
+    case NTRT_NEWDIALOG:
+    case NTRT_DIALOG:
+        break;
+    case NTRT_FONTDIR:
+    case NTRT_FONT:
+    case NTRT_MESSAGETABLE:
+    case NTRT_STRING:
+    case NTRT_RCDATA:
+    case NTRT_VERSION:
+    default:
+        break;
+  }
+  dprintf(("Win32Resource::convertResource: Can't convert resource %d (type %d)", id, type));
+  return 0;
+}
+//******************************************************************************
+//NOTE: Will be removed once pe2lx rewrite has been completed
+//******************************************************************************
+PVOID Win32Resource::convertOS2Bitmap(void *bmpdata)
 {
  BITMAPFILEHEADER2   *bmphdr = (BITMAPFILEHEADER2 *)bmpdata;