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

Timestamp:

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

Author:

sandervl

Message:

PE loader resource fixes

File:

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

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;