Changeset 576 for trunk/src

Timestamp:

Aug 19, 1999, 2:53:19 PM (26 years ago)

Author:

sandervl

Message:

PE Resource changes

Location:

trunk/src/kernel32

Files:

• makefile (modified) (2 diffs)
• winimgres.cpp (modified) (2 diffs)
• winres.cpp (modified) (4 diffs)

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.18 1999-08-16 16:28:02 sandervl Exp $
+# $Id: makefile,v 1.19 1999-08-19 12:53:18 sandervl Exp $
 
 #
@@ -343 +343 @@
 
 pefile.OBJ:    pefile.cpp $(PDWIN32_INCLUDE)\pefile.h
-winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h
+winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h
 winimgres.OBJ: winimgres.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winexe.h $(PDWIN32_INCLUDE)\winres.h
 windll.OBJ:    windll.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.8 1999-08-19 10:25:27 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.9 1999-08-19 12:53:18 sandervl Exp $ */
 
 /*
@@ -129 +129 @@
   }
   if(pData == NULL) {
-    dprintf(("getResource: res not found!\n"));
-    return(NULL);
+        dprintf(("getResource: res not found!\n"));
+        return(NULL);
   }
 
   char *resdata = (char *)((char *)pResDir + pData->OffsetToData - pResSection->virtaddr);
   if(stringid != -1) {//search for string in table
-    USHORT *unicodestr = (USHORT *)resdata;
-
-    for(i=0;i<stringid;i++) {
-        unicodestr += *unicodestr;
-    }
-    res = new Win32Resource(this, id, NTRT_STRING, (ULONG)*unicodestr, (char *)unicodestr);
-    if(res == NULL) {
-        dprintf(("new Win32Resource failed!\n"));
-        return(NULL);
-    }
+        USHORT *unicodestr = (USHORT *)resdata;
+
+        for(i=0;i<stringid;i++) {
+                unicodestr += *unicodestr;
+        }
+        res = new Win32Resource(this, id, NTRT_STRING, (ULONG)*unicodestr, (char *)unicodestr);
+        if(res == NULL) {
+                dprintf(("new Win32Resource failed!\n"));
+                return(NULL);
+        }
   }
   else  res = new Win32Resource(this, id, type, pData->Size, resdata);

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.6 1999-08-05 11:44:35 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.7 1999-08-19 12:53:19 sandervl Exp $ */
 
 /*
@@ -83 +83 @@
 //******************************************************************************
 Win32Resource::Win32Resource(Win32Image *module, HRSRC hRes, ULONG id, ULONG type) :
-        os2resdata(NULL), winresdata(NULL)
+        os2resdata(NULL), winresdata(NULL), resType(RSRC_PE2LX)
 {
  APIRET rc;
@@ -139 +139 @@
 Win32Resource::Win32Resource(Win32Image *module, ULONG id, ULONG type,
                  ULONG size, char *resdata) : hres(NULL),
-        os2resdata(NULL), winresdata(NULL)
+        os2resdata(NULL), winresdata(NULL), resType(RSRC_PELOADER)
 {
   next           = module->winres;
@@ -162 +162 @@
  Win32Resource *res = module->winres;
 
-#if 0
   //returned by DosGetResource, so we don't (and mustn't) free it
-  if(os2resdata)    free(os2resdata);
-#endif
+  if(os2resdata && resType == RSRC_PELOADER)    
+        free(os2resdata);
+
   if(winresdata)    free(winresdata);