* More small compat fixes and constants.

git-svn-id: trunk@10190 -

packages/winunits-base/src/commctrl.pp

@@ -657,7 +657,7 @@ function ImageList_GetDragImage(ppt:PPOINT;pptHotspot:PPOINT):HIMAGELIST; stdcal
 Procedure ImageList_RemoveAll(himl:HIMAGELIST);
 
 // Macro 14
-Procedure ImageList_ExtractIcon(hi:longint; himl:HIMAGELIST;i:longint);
+function ImageList_ExtractIcon(hi:longint; himl:HIMAGELIST;i:longint):HICON;
 
 
 // Macro 15
@@ -9152,10 +9152,10 @@ End;
 // Macro 14
 // #define     ImageList_ExtractIcon(hi, himl, i) ImageList_GetIcon(himl, i, 0)
 
-Procedure ImageList_ExtractIcon(hi:longint;  himl:HIMAGELIST;i:longint);
+function  ImageList_ExtractIcon(hi:longint;  himl:HIMAGELIST;i:longint):HICON;
 
 Begin
- ImageList_GetIcon(himl, i,0);
+ result:=ImageList_GetIcon(himl, i,0);
 end;
 
 

rtl/win/wininc/defines.inc

@@ -5425,8 +5425,11 @@
   { e_magic field  }
      IMAGE_DOS_SIGNATURE = $5a4d;
   { nt_signature field  }
-     IMAGE_NT_SIGNATURE = $4550;
+     IMAGE_NT_SIGNATURE = CARDINAL($4550);
 
+    IMAGE_OS2_SIGNATURE       = $454E;      // NE
+    IMAGE_OS2_SIGNATURE_LE    = $454C;      // LE
+    IMAGE_VXD_SIGNATURE       = $454C;      // LE
 
   { Severity values }
     SEVERITY_SUCCESS = 0;
@@ -5519,7 +5522,7 @@ const
   IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER      = 12;
   IMAGE_SUBSYSTEM_EFI_ROM                 = 13;
   IMAGE_SUBSYSTEM_XBOX                    = 14;
-
+  IMAGE_SUBSYSTEM_RESERVED8		  =  IMAGE_SUBSYSTEM_NATIVE_WINDOWS; // older Delphi's? See JCLPEImage
 // DllCharacteristics Entries
 
 //      IMAGE_LIBRARY_PROCESS_INIT           0x0001     // Reserved.
@@ -5558,8 +5561,8 @@ const
   STRRET_OFFSET	= 1;
   STRRET_CSTR	= 2;
 
-{$endif read_interface}
 
+{$endif read_interface}
 
 {$ifdef read_implementation}