Changeset 956 for trunk/src/kernel32/winres.cpp

Timestamp:

Sep 16, 1999, 1:39:08 AM (26 years ago)

Author:

sandervl

Message:

Rewrite for new win32 image classes

File:

• trunk/src/kernel32/winres.cpp (modified) (9 diffs)

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.18 1999-09-14 16:56:08 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.19 1999-09-15 23:38:02 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #include <winres.h>
 #include <misc.h>
-#include <nameid.h>
-#include <winexe.h>
+#include <winexepe2lx.h>
+#include <windllpe2lx.h>
 #include "cvtresource.h"
 #include <vmutex.h>
 
 VMutex resmutex;
+
+char *ResTypes[MAX_RES] =
+      {"niks", "CURSOR", "BITMAP", "ICON", "MENU", "DIALOG", "STRING",
+       "FONTDIR", "FONT", "ACCELERATOR", "RCDATA",  "MESSAGETABLE",
+       "GROUP_CURSOR", "niks", "GROUP_ICON", "niks", "VERSION"};
 
 //******************************************************************************
@@ -92 +97 @@
         os2resdata(NULL), winresdata(NULL), resType(RSRC_CUSTOMNODATA)
 {
-  resmutex.enter();
-  next           = module->winres;
-  module->winres = this;
-  resmutex.leave();
-
+  next       = NULL;
   module     = NULL;
+
   id         = -1;
   type       = -1;
@@ -109 +111 @@
 //******************************************************************************
 //******************************************************************************
-Win32Resource::Win32Resource(Win32Image *module, HRSRC hRes, ULONG id, ULONG type) :
+Win32Resource::Win32Resource(Win32ImageBase *module, HRSRC hRes, ULONG id, ULONG type) :
         os2resdata(NULL), winresdata(NULL), resType(RSRC_PE2LX)
 {
@@ -168 +170 @@
 //******************************************************************************
 //******************************************************************************
-Win32Resource::Win32Resource(Win32Image *module, ULONG id, ULONG type,
+Win32Resource::Win32Resource(Win32ImageBase *module, ULONG id, ULONG type,
                  ULONG size, char *resdata) : hres(NULL),
         os2resdata(NULL), winresdata(NULL), resType(RSRC_PELOADER)
@@ -246 +248 @@
     case NTRT_MENU:
     case NTRT_DIALOG:
-        newid = module->getWin32ResourceId(id);
+    {
+//TODO->!!!!
+//        newid = ((Win32Pe2LxImage *)module)->getWin32ResourceId(id);
+//TODO->!!!!
 
         rc = DosGetResource((HMODULE)module->hinstance, RT_RCDATA, (int)newid, (PPVOID)&resdata);
@@ -256 +261 @@
         memcpy(winresdata, resdata, ressize);
         break;
+    }
 
     //TODO:not yet implemented
@@ -329 +335 @@
    }
    return os2resdata;
+}
+//******************************************************************************
+//return size of converted win32 resource
+//******************************************************************************
+ULONG Win32Resource::getOS2Size()
+{
+  switch(type) {
+    case NTRT_NEWBITMAP:
+    case NTRT_BITMAP:
+        return QueryConvertedBitmapSize((WINBITMAPINFOHEADER *)winresdata, ressize);
+
+    case NTRT_CURSOR:
+        return QueryConvertedCursorSize((CursorComponent *)winresdata, ressize);
+
+    case NTRT_ICON:
+        return QueryConvertedIconSize((WINBITMAPINFOHEADER *)winresdata, ressize);
+
+    case NTRT_GROUP_ICON:
+    case NTRT_GROUP_CURSOR:
+    case NTRT_ACCELERATORS:
+    case NTRT_NEWMENU:
+    case NTRT_MENU:
+    case NTRT_NEWDIALOG:
+    case NTRT_DIALOG:
+    case NTRT_FONTDIR:
+    case NTRT_FONT:
+    case NTRT_MESSAGETABLE:
+    case NTRT_RCDATA:
+    case NTRT_VERSION:
+    case NTRT_STRING:
+    default:
+        dprintf(("Win32Resource::getOS2Size SHOULDN'T BE CALLED for this resource type (%d) (NOT IMPLEMENTED)!!", type));
+        break;
+  }
+  return 0;
 }
 //******************************************************************************
@@ -435 +476 @@
 //******************************************************************************
 //******************************************************************************
-void Win32Resource::destroyAll(Win32Image *module)
+void Win32Resource::destroyAll(Win32ImageBase *module)
 {
  Win32Resource *res = module->winres, *next;