Changeset 363 for trunk

Timestamp:

Jul 22, 1999, 1:23:06 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk

Files:

• changelog (modified) (1 diff)
• src/kernel32/os2util.cpp (modified) (3 diffs)
• src/pe2lx/pe.cpp (modified) (2 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.56 1999-07-22 08:23:01 sandervl Exp $ */
+ /* $Id: changelog,v 1.57 1999-07-22 11:22:14 sandervl Exp $ */
+ 99-07-22: Edgar Buerkle <100566.557@compuserve.com>
+        - KERNEL32: Fix for OS2GetResource (os2util.cpp)
+        - PE2LX: Use unique resource id for version resource.
+
  99-07-22: Sander van Leeuwen <sandervl@xs4all.nl>
         - DDRAW: Now compiles

trunk/src/kernel32/os2util.cpp

@@ -1 @@
-/* $Id: os2util.cpp,v 1.5 1999-06-19 17:58:32 sandervl Exp $ */
+/* $Id: os2util.cpp,v 1.6 1999-07-22 11:22:42 sandervl Exp $ */
 
 /*
@@ -193 +193 @@
    if(rc) {
     dprintf(("OS2GetResource: Can't get resource size of %d!!!\n", id));
-    return(0);
+    return(FALSE);
    }
    rc = DosGetResource(hinstance, RT_RCDATA, id, (PPVOID)&resdata);
    if(rc) {
     dprintf(("OS2GetResource: Can't find resource %d!!!\n", id));
-    return(0);
+    return(FALSE);
    }
    dprintf(("OS2GetResoure: bufLength %d, size %d, id %d", bufLength, size, id));
@@ -205 +205 @@
    DosFreeResource(resdata);
 
-   return(FALSE);
+   return(TRUE);
 }
 

trunk/src/pe2lx/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.6 1999-07-07 08:11:11 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.7 1999-07-22 11:23:06 sandervl Exp $ */
 
 /*
@@ -685 +685 @@
 //to retrieve the original for win32's version apis
 //TODO: Only supports one version resource (who would want to use more??)
+//Allocate unique id for version resource to prevent conflicts
+                                id = OS2Exe.GetUniqueId();
                                 OS2Exe.SetVersionResourceId(id);
                         case NTRT_RCDATA: