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

Timestamp:

Sep 14, 1999, 6:55:38 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

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

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.16 1999-09-13 14:31:06 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.17 1999-09-14 16:55:38 sandervl Exp $ */
 
 /*
@@ -28 +28 @@
 #include <winres.h>
 #include <misc.h>
+#include <winexebase.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"};
 
 //******************************************************************************
@@ -97 +92 @@
         os2resdata(NULL), winresdata(NULL), resType(RSRC_CUSTOMNODATA)
 {
-  next       = NULL;
   module     = NULL;
-
   id         = -1;
   type       = -1;
@@ -248 +241 @@
     case NTRT_MENU:
     case NTRT_DIALOG:
-    {
-//        newid = ((Win32Pe2LxImage *)module)->getWin32ResourceId(id);
+        newid = ((Win32Pe2LxImage *)module)->getWin32ResourceId(id);
 
         rc = DosGetResource((HMODULE)module->hinstance, RT_RCDATA, (int)newid, (PPVOID)&resdata);
@@ -259 +251 @@
         memcpy(winresdata, resdata, ressize);
         break;
-    }
 
     //TODO:not yet implemented