Changeset 921 for trunk/src

Timestamp:

Sep 13, 1999, 4:31:06 PM (26 years ago)

Author:

sandervl

Message:

Win32Resource ctor bugfix

File:

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

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.15 1999-09-04 12:41:46 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.16 1999-09-13 14:31:06 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);
+    {
+//        newid = ((Win32Pe2LxImage *)module)->getWin32ResourceId(id);
 
         rc = DosGetResource((HMODULE)module->hinstance, RT_RCDATA, (int)newid, (PPVOID)&resdata);
@@ -256 +259 @@
         memcpy(winresdata, resdata, ressize);
         break;
+    }
 
     //TODO:not yet implemented
@@ -470 +474 @@
 //******************************************************************************
 //******************************************************************************
-void Win32Resource::destroyAll(Win32Image *module)
+void Win32Resource::destroyAll(Win32ImageBase *module)
 {
  Win32Resource *res = module->winres, *next;