Changeset 597

Timestamp:

Aug 20, 1999, 1:52:44 PM (26 years ago)

Author:

sandervl

Message:

PE loader resource fixes

Location:

trunk/src/kernel32

Files:

• kernel32exp.def (modified) (2 diffs)
• winimgres.cpp (modified) (11 diffs)
• winres.cpp (modified) (6 diffs)

trunk/src/kernel32/kernel32exp.def ¶

@@ -1 @@
-; $Id: kernel32exp.def,v 1.11 1999-08-19 14:19:14 sandervl Exp $
+; $Id: kernel32exp.def,v 1.12 1999-08-20 11:52:44 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -800 +800 @@
 _lstrlenA@4                 @779
 _lstrlenW@4                 @780
+_lstrcpynAtoW@12            @781
+_lstrcpynWtoA@12            @782
+_lstrcpyAtoW@8              @783
+_lstrcpyWtoA@8              @784
+_lstrncmpA@12               @785
+_lstrncmpW@12               @786
 
 OS2memmove                    @906

trunk/src/kernel32/winimgres.cpp ¶

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.10 1999-08-19 19:50:40 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.11 1999-08-20 11:52:44 sandervl Exp $ */
 
 /*
@@ -9 +9 @@
  * Project Odin Software License can be found in LICENSE.TXT
  *
+ * TODO: Check created resource objects before loading the resource!
+ *
  */
 #include <os2win.h>
@@ -15 +17 @@
 #include <string.h>
 
-#include "misc.h"
-#include "nameid.h"
-#include "winimage.h"
-#include "windll.h"
-#include "winexe.h"
-#include "winres.h"
+#include <misc.h>
+#include <nameid.h>
+#include <winimage.h>
+#include <windll.h>
+#include <winexe.h>
+#include <winres.h>
+#include <unicode.h>
+#include <heapstring.h>
 #include "pefile.h"
-#include "unicode.h"
 
 char *ResTypes[MAX_RES] =
@@ -39 +42 @@
  PIMAGE_RESOURCE_DIRECTORY       prdType;
  PIMAGE_RESOURCE_DIRECTORY_ENTRY prde;
+ PIMAGE_RESOURCE_DIR_STRING_U    pstring;
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
- ULONG  nodeData[3], i, j;
+ ULONG  nodeData[3], i, j, nameOffset;
  BOOL  fFound = FALSE, fNumType;
 
@@ -73 +77 @@
     {//name or id entry?
         //SvL: 30-10-'97, high bit is set, so clear to get real offset
-        prde->u1.Name &= ~0x80000000;
-        char *typename = UnicodeToAsciiStringN((WCHAR *)((ULONG)pResDir + (ULONG)prde->u1.Name + sizeof(WCHAR)), *(WCHAR *)((ULONG)pResDir + (ULONG)prde->u1.Name));  // first word = string length
-
+        nameOffset = prde->u1.Name & ~0x80000000;
+
+        pstring = (PIMAGE_RESOURCE_DIR_STRING_U)((ULONG)pResDir + nameOffset);
+        char *typename = (char *)malloc(pstring->Length+1);
+        lstrcpynWtoA(typename, pstring->NameString, pstring->Length);
+        typename[pstring->Length] = 0;
+        
         if(!fNumType) {
             if(stricmp(typename, (char *)type) == 0) {
@@ -90 +98 @@
             }
         }
-        FreeAsciiString(typename);
+        free(typename);
     }
     else {
@@ -125 +133 @@
  PIMAGE_RESOURCE_DATA_ENTRY      pData;
  BOOL  fFound = FALSE, fNumId;
- ULONG nrres;
+ ULONG nrres, nameOffset;
  char *resname;
  int   i;
@@ -155 +163 @@
 
         if(!fNumId) {//name or id entry?
+                nameOffset = prde->u1.Name;
                 if(prde->u1.s.NameIsString) //unicode directory string /*PLF Sat  97-06-21 22:30:35*/
-                        prde->u1.Name &= ~0x80000000;
-
-                pstring = (PIMAGE_RESOURCE_DIR_STRING_U)((ULONG)pResDir + (ULONG)prde->u1.Name);
-                resname = UnicodeToAsciiStringN(pstring->NameString, pstring->Length);
+                        nameOffset &= ~0x80000000;
+
+                pstring = (PIMAGE_RESOURCE_DIR_STRING_U)((ULONG)pResDir + nameOffset);
+
+                resname = (char *)malloc(pstring->Length+1);
+                lstrcpynWtoA(resname, pstring->NameString, pstring->Length);
+                resname[pstring->Length] = 0;
                 if(stricmp(resname, (char *)*nodeData) == 0) {
                         fFound = TRUE;
                 }
-                FreeAsciiString(resname);
+                free(resname);
         }
         else {
@@ -229 +241 @@
     if(type == NTRT_STRING) {
         stringid = id & 0xF;
-        id       = (id >> 4);
+        id       = (id >> 4)+1;
     }
   }
@@ -235 +247 @@
     if(stricmp((char *)type, ResTypes[NTRT_STRING]) == 0) {
         stringid = id & 0xF;
-        id       = (id >> 4);
+        id       = (id >> 4)+1;
     }
   }
@@ -250 +262 @@
 
         for(i=0;i<stringid;i++) {
-                unicodestr += *unicodestr;
+                unicodestr += *unicodestr+1;
         }
-        res = new Win32Resource(this, id, NTRT_STRING, (ULONG)*unicodestr, (char *)unicodestr);
+        res = new Win32Resource(this, id, NTRT_STRING, (*unicodestr+1)*sizeof(WCHAR),
+                                (char *)(unicodestr+1));
         if(res == NULL) {
                 dprintf(("new Win32Resource failed!\n"));

trunk/src/kernel32/winres.cpp ¶

@@ -1 @@
-/* $Id: winres.cpp,v 1.9 1999-08-19 19:50:41 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.10 1999-08-20 11:52:44 sandervl Exp $ */
 
 /*
@@ -8 +8 @@
  *
  * Project Odin Software License can be found in LICENSE.TXT
+ *
  *
  */
@@ -31 +32 @@
 #include "cvtresource.h"
 
+//******************************************************************************
+//******************************************************************************
 static ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy)
 {
@@ -155 +158 @@
     return;
   }
-  memcpy(winresdata, resdata, size);
+  OS2ResHandle = 0;
+
+  if(type == NTRT_STRING) {
+        memcpy(winresdata, resdata, size-sizeof(WCHAR));
+        ((USHORT *)winresdata)[size/sizeof(WCHAR)-1] = 0;
+  }
+  else  memcpy(winresdata, resdata, size);
 }
 //******************************************************************************
@@ -253 +262 @@
 
   if(winresdata == NULL) {
-    rc = DosGetResource((HMODULE)module->hinstance, os2type, id, (PPVOID)&resdata);
-    if(rc) {
-        dprintf(("Can't find original string!!!\n"));
-        return(NULL);
-    }
-    winresdata = (char *)malloc(ressize);
-    memcpy(winresdata, resdata, ressize);
+        rc = DosGetResource((HMODULE)module->hinstance, os2type, id, (PPVOID)&resdata);
+        if(rc) {
+                dprintf(("Can't find original resource!!!\n"));
+                return(NULL);
+        }
+        winresdata = (char *)malloc(ressize);
+        memcpy(winresdata, resdata, ressize);
   }
   if(resdata)
-    DosFreeResource(resdata);
+        DosFreeResource(resdata);
+
   return winresdata;
 }
@@ -321 +331 @@
     case NTRT_FONT:
     case NTRT_MESSAGETABLE:
-    case NTRT_STRING:
     case NTRT_RCDATA:
     case NTRT_VERSION:
+    case NTRT_STRING:
+        break;
+
     default:
         break;