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

Timestamp:

Sep 14, 1999, 6:56:08 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.17 1999-09-14 16:55:38 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.18 1999-09-14 16:56:08 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #include <winres.h>
 #include <misc.h>
-#include <winexebase.h>
-#include <winexepe2lx.h>
+#include <nameid.h>
+#include <winexe.h>
 #include "cvtresource.h"
 #include <vmutex.h>
@@ -92 +92 @@
         os2resdata(NULL), winresdata(NULL), resType(RSRC_CUSTOMNODATA)
 {
+  resmutex.enter();
+  next           = module->winres;
+  module->winres = this;
+  resmutex.leave();
+
   module     = NULL;
   id         = -1;
@@ -104 +109 @@
 //******************************************************************************
 //******************************************************************************
-Win32Resource::Win32Resource(Win32ImageBase *module, HRSRC hRes, ULONG id, ULONG type) :
+Win32Resource::Win32Resource(Win32Image *module, HRSRC hRes, ULONG id, ULONG type) :
         os2resdata(NULL), winresdata(NULL), resType(RSRC_PE2LX)
 {
@@ -163 +168 @@
 //******************************************************************************
 //******************************************************************************
-Win32Resource::Win32Resource(Win32ImageBase *module, ULONG id, ULONG type,
+Win32Resource::Win32Resource(Win32Image *module, ULONG id, ULONG type,
                  ULONG size, char *resdata) : hres(NULL),
         os2resdata(NULL), winresdata(NULL), resType(RSRC_PELOADER)
@@ -241 +246 @@
     case NTRT_MENU:
     case NTRT_DIALOG:
-        newid = ((Win32Pe2LxImage *)module)->getWin32ResourceId(id);
+        newid = module->getWin32ResourceId(id);
 
         rc = DosGetResource((HMODULE)module->hinstance, RT_RCDATA, (int)newid, (PPVOID)&resdata);
@@ -324 +329 @@
    }
    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;
 }
 //******************************************************************************
@@ -465 +435 @@
 //******************************************************************************
 //******************************************************************************
-void Win32Resource::destroyAll(Win32ImageBase *module)
+void Win32Resource::destroyAll(Win32Image *module)
 {
  Win32Resource *res = module->winres, *next;