Changeset 1015 for trunk/src

Timestamp:

Sep 23, 1999, 3:54:37 PM (26 years ago)

Author:

phaller

Message:

Fix: WinImgRes:findResourceW erroneously tried to free numerical resource IDs

File:

• trunk/src/kernel32/winimgres.cpp (modified) (7 diffs)

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.15 1999-09-18 17:47:10 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.16 1999-09-23 13:53:38 phaller Exp $ */
 
 /*
@@ -11 +11 @@
  * TODO: Check created resource objects before loading the resource!
  * TODO: Is the name id of the version resource always 1?
- * TODO: Once the resource handling in PE2LX/win32k is changed, 
+ * TODO: Once the resource handling in PE2LX/win32k is changed,
  *       getVersionStruct/Size can be moved into the Win32ImageBase class
  *
@@ -36 +36 @@
 //PE spec says names & ids are sorted; keep on searching just to be sure
 //******************************************************************************
-PIMAGE_RESOURCE_DATA_ENTRY 
+PIMAGE_RESOURCE_DATA_ENTRY
  Win32ImageBase::getPEResourceEntry(ULONG id, ULONG type, ULONG lang)
 {
@@ -73 +73 @@
     prdType = (PIMAGE_RESOURCE_DIRECTORY)((int)pResDir + (int)prde->u2.OffsetToData);
 
-    if(i < pResDir->NumberOfNamedEntries) 
+    if(i < pResDir->NumberOfNamedEntries)
     {//name or id entry?
         //SvL: 30-10-'97, high bit is set, so clear to get real offset
@@ -82 +82 @@
         lstrcpynWtoA(typename, pstring->NameString, pstring->Length+1);
         typename[pstring->Length] = 0;
-        
+
         if(!fNumType) {
             if(stricmp(typename, (char *)type) == 0) {
@@ -381 +381 @@
 {
  HRSRC hres;
- char *astring1 = NULL, *astring2 = NULL;
-
-    if(HIWORD(lpszType) != 0) {
-                astring1 = UnicodeToAsciiString(lpszType);
-    } 
-    else        astring1 = (char *)lpszType;
-
-    if(HIWORD(lpszName) != 0) {
-                astring2 = UnicodeToAsciiString(lpszName);
-    }
-    else        astring2 = (char *)lpszName;
+ char *astring1 = NULL,
+      *astring2 = NULL;
+
+    if(HIWORD(lpszType) != 0) astring1 = UnicodeToAsciiString(lpszType);
+    else                      astring1 = (char *)lpszType;
+    if(HIWORD(lpszName) != 0) astring2 = UnicodeToAsciiString(lpszName);
+    else                      astring2 = (char *)lpszName;
 
     hres = (HRSRC) findResourceA(astring1, astring2);
-    if(astring1) FreeAsciiString(astring1);
-    if(astring2) FreeAsciiString(astring2);
+
+    /* do NOT free untranslated numerical Resource IDs */
+    if(HIWORD(astring1)) FreeAsciiString(astring1);
+    if(HIWORD(astring2)) FreeAsciiString(astring2);
 
     return(hres);
@@ -422 +420 @@
     if(HIWORD(lpszType) != 0) {
                 char *resname = UnicodeToAsciiString(lpszType);
-    } 
+    }
     else        astring1 = (char *)lpszType;