Changeset 581

Timestamp:

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

Author:

sandervl

Message:

PE loader resource convertion changes

Location:

trunk

Files:

• include/winaccel.h (added)
• include/winicon.h (modified) (2 diffs)
• include/winmenu.h (added)
• include/winres.h (modified) (4 diffs)
• src/kernel32/cvtaccel.cpp (added)
• src/kernel32/cvtbitmap.cpp (added)
• src/kernel32/cvticon.cpp (added)
• src/kernel32/cvtmenu.cpp (added)
• src/kernel32/cvtresource.h (added)
• src/kernel32/kernel32exp.def (modified) (2 diffs)
• src/kernel32/makefile (modified) (3 diffs)
• src/kernel32/winres.cpp (modified) (5 diffs)

trunk/include/winicon.h

@@ -1 @@
-/* $Id: winicon.h,v 1.1 1999-08-19 12:52:48 sandervl Exp $ */
+/* $Id: winicon.h,v 1.2 1999-08-19 14:18:24 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 
 #pragma pack(1)
+
+/* Win v4.0 bitmap structs */
+/* Image Color Matching color definitions */
+
+typedef LONG   LCSCSTYPE;
+
+#define LCS_CALIBRATED_RGB              0x00000000L
+#define LCS_DEVICE_RGB                  0x00000001L
+#define LCS_DEVICE_CMYK                 0x00000002L
+typedef LONG    LCSGAMUTMATCH;
+
+#define LCS_GM_BUSINESS                 0x00000001L
+#define LCS_GM_GRAPHICS                 0x00000002L
+#define LCS_GM_IMAGES                   0x00000004L
+
+/* ICM Defines for results from CheckColorInGamut() */
+#define CM_OUT_OF_GAMUT         255
+#define CM_IN_GAMUT                     0
+
+/* Macros to retrieve CMYK values from a COLORREF */
+#define GetKValue(cmyk)      ((BYTE)(cmyk))
+#define GetYValue(cmyk)      ((BYTE)((cmyk)>> 8))
+#define GetMValue(cmyk)      ((BYTE)((cmyk)>>16))
+#define GetCValue(cmyk)      ((BYTE)((cmyk)>>24))
+#define CMYK(c,m,y,k)       ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
+
+typedef long            FXPT16DOT16, FAR *LPFXPT16DOT16;
+typedef long            FXPT2DOT30, FAR *LPFXPT2DOT30;
+
+/* ICM Color Definitions */
+// The following two structures are used for defining RGB's in terms of
+// CIEXYZ. The values are fixed point 16.16.
+typedef struct tagCIEXYZ
+{
+        FXPT2DOT30 ciexyzX;
+        FXPT2DOT30 ciexyzY;
+        FXPT2DOT30 ciexyzZ;
+} CIEXYZ;
+typedef CIEXYZ  FAR *LPCIEXYZ;
+
+typedef struct tagICEXYZTRIPLE
+{
+        CIEXYZ  ciexyzRed;
+        CIEXYZ  ciexyzGreen;
+        CIEXYZ  ciexyzBlue;
+} CIEXYZTRIPLE;
+typedef CIEXYZTRIPLE    FAR *LPCIEXYZTRIPLE;
+
+#ifndef MAX_PATH
+        #define MAX_PATH CCHMAXPATH
+#endif
+// The next structures the logical color space. Unlike pens and brushes,
+// but like palettes, there is only one way to create a LogColorSpace.
+// A pointer to it must be passed, its elements can't be pushed as
+// arguments.
+
+typedef struct tagLOGCOLORSPACEA
+{
+        DWORD lcsSignature;
+        DWORD lcsVersion;
+        DWORD lcsSize;
+        LCSCSTYPE lcsCSType;
+        LCSGAMUTMATCH lcsIntent;
+        CIEXYZTRIPLE lcsEndpoints;
+        DWORD lcsGammaRed;
+        DWORD lcsGammaGreen;
+        DWORD lcsGammaBlue;
+        CHAR   lcsFilename[MAX_PATH];
+} LOGCOLORSPACEA, *LPLOGCOLORSPACEA;
+
+typedef struct tagLOGCOLORSPACEW
+{
+        DWORD lcsSignature;
+        DWORD lcsVersion;
+        DWORD lcsSize;
+        LCSCSTYPE lcsCSType;
+        LCSGAMUTMATCH lcsIntent;
+        CIEXYZTRIPLE lcsEndpoints;
+        DWORD lcsGammaRed;
+        DWORD lcsGammaGreen;
+        DWORD lcsGammaBlue;
+        WCHAR  lcsFilename[MAX_PATH];
+} LOGCOLORSPACEW, *LPLOGCOLORSPACEW;
+
+#ifdef UNICODE
+typedef LOGCOLORSPACEW LOGCOLORSPACE;
+typedef LPLOGCOLORSPACEW LPLOGCOLORSPACE;
+#else
+typedef LOGCOLORSPACEA LOGCOLORSPACE;
+typedef LPLOGCOLORSPACEA LPLOGCOLORSPACE;
+#endif // UNICODE
+
+typedef struct
+{
+        DWORD        bV4Size;
+        LONG         bV4Width;
+        LONG         bV4Height;
+        WORD         bV4Planes;
+        WORD         bV4BitCount;
+        DWORD        bV4V4Compression;
+        DWORD        bV4SizeImage;
+        LONG         bV4XPelsPerMeter;
+        LONG         bV4YPelsPerMeter;
+        DWORD        bV4ClrUsed;
+        DWORD        bV4ClrImportant;
+        DWORD        bV4RedMask;
+        DWORD        bV4GreenMask;
+        DWORD        bV4BlueMask;
+        DWORD        bV4AlphaMask;
+        DWORD        bV4CSType;
+        CIEXYZTRIPLE bV4Endpoints;
+        DWORD        bV4GammaRed;
+        DWORD        bV4GammaGreen;
+        DWORD        bV4GammaBlue;
+} BITMAPV4HEADER,       /*FAR *LPBITMAPV4HEADER,*/ *PBITMAPV4HEADER;
+
+/* constants for the biCompression field */
+#define BI_RGB        0L
+#define BI_RLE8       1L
+#define BI_RLE4       2L
+#define BI_BITFIELDS  3L
 
 typedef struct {

trunk/include/winres.h

@@ -1 @@
-/* $Id: winres.h,v 1.4 1999-08-19 12:52:49 sandervl Exp $ */
+/* $Id: winres.h,v 1.5 1999-08-19 14:18:24 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #define __WINRES_H__
 
-#ifdef INCL_WINRES
-
- typedef struct tagWINBITMAPINFOHEADER{
-        DWORD      biSize;
-        LONG       biWidth;
-        LONG       biHeight;
-        WORD       biPlanes;
-        WORD       biBitCount;
-        DWORD      biCompression;
-        DWORD      biSizeImage;
-        LONG       biXPelsPerMeter;
-        LONG       biYPelsPerMeter;
-        DWORD      biClrUsed;
-        DWORD      biClrImportant;
- } WINBITMAPINFOHEADER;
-
- typedef struct
- {
-   BYTE                      blue;
-   BYTE                      green;
-   BYTE                      red;
-   BYTE                      res;
- }  RGBQUAD;
-
- /*
-  * Defines for the fVirt field of the Accelerator table structure.
-  */
- #define FVIRTKEY  TRUE          /* Assumed to be == TRUE */
- #define FNOINVERT 0x02
- #define FSHIFT    0x04
- #define FCONTROL  0x08
- #define FALT      0x10
-
- //TODO: Aligned at 8 byte boundary or not??
- #pragma pack(1)
- typedef struct tagWINACCEL {
-     BYTE   fVirt;               /* Also called the flags field */
-     WORD   key;
-     WORD   cmd;
-     BYTE   align[3];
- } WINACCEL, *LPWINACCEL;
- #pragma pack()
-
-#endif
-
-#ifdef __cplusplus
 class Win32Image;
 
@@ -88 +42 @@
 
 private:
-             PVOID ConvertBitmap(void *bmpdata);
+             PVOID convertOS2Bitmap(void *bmpdata);
+
+             PVOID convertResource(void *win32res);
 
        Win32Image *module;
@@ -111 +67 @@
 };
 
-#endif // __cplusplus
 
     #define    NTRT_NEWRESOURCE      0x2000

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;