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

Timestamp:

Aug 31, 1999, 7:15:53 PM (26 years ago)

Author:

sandervl

Message:

Menu resource changes

File:

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

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.13 1999-08-31 14:36:46 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.14 1999-08-31 17:15:30 sandervl Exp $ */
 
 /*
@@ -103 +103 @@
   orgos2type = -1;
   OS2ResHandle = 0;
+  //resources are in Unicode format by default; indirectly created resources
+  //can also be in ascii format
+  isUnicode  = TRUE; 
 }
 //******************************************************************************
@@ -160 +163 @@
     ressize = 0;
   }
+  //resources are in Unicode format by default
+  isUnicode  = TRUE; 
 }
 //******************************************************************************
@@ -189 +194 @@
   }
   else  memcpy(winresdata, resdata, size);
+
+  //resources are in Unicode format by default
+  isUnicode  = TRUE; 
 }
 //******************************************************************************
@@ -197 +205 @@
 
   //returned by DosGetResource, so we don't (and mustn't) free it
-  if(os2resdata && resType == RSRC_PELOADER)    
+  if(os2resdata && (resType == RSRC_PELOADER || resType == RSRC_CUSTOMINDIRECT))
         free(os2resdata);
 
@@ -350 +358 @@
     case NTRT_NEWMENU:
     case NTRT_MENU:
-        return ConvertMenu((MenuHeader *)win32res, ressize);
+        return ConvertMenu((MenuHeader *)win32res, ressize, isUnicode);
 
     case NTRT_NEWDIALOG: