* type HINSTANCE -> HINST

rtl/win32/base.pp

@@ -26,8 +26,8 @@ unit base;
 
 {  Automatically converted by H2PAS.EXE from base.h
    Utility made by Florian Klaempfl 25th-28th september 96
-   Improvements made by Mark A. Malakanov 22nd-25th may 97 
-   Further improvements by Michael Van Canneyt, April 1998 
+   Improvements made by Mark A. Malakanov 22nd-25th may 97
+   Further improvements by Michael Van Canneyt, April 1998
    define handling and error recovery by Pierre Muller, June 1998 }
 
 
@@ -40,33 +40,33 @@ unit base;
   { C default packing is dword }
 
 {$PACKRECORDS 4}
-  { 
+  {
      Base.h
-  
+
      Base definitions
-  
+
      Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-  
+
      Author: Scott Christley <[email protected]>
-  
+
      This file is part of the Windows32 API Library.
-  
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
-     
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
-  
+
      If you are interested in a warranty or support for this source code,
      contact Scott Christley <[email protected]> for more information.
-     
+
      You should have received a copy of the GNU Library General Public
      License along with this library; see the file COPYING.LIB.
-     If not, write to the Free Software Foundation, 
+     If not, write to the Free Software Foundation,
      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    }
 
@@ -101,13 +101,10 @@ unit base;
   type
 
      ATOM = word;
-  { Changed from BOOL to WINBOOL to avoid Objective-C conflict  }
 
      WINBOOL = longbool;
-  {  Not convertable by H2PAS
-  typedef unsigned char BOOLEAN;
-  typedef unsigned char BYTE;
-   }
+
+     BOOL = WINBOOL;
 
      CALTYPE = cardinal;
 
@@ -157,9 +154,9 @@ unit base;
   { typedef GLOBALHANDLE;  }
 
   {   HANDLE = pointer;
-    need to be compatible 
+    need to be compatible
     with longint for Delphi !! }
-     HANDLE = longint;{ or should it be cardinal ?? PM }
+     HANDLE = longint; { or should it be cardinal ?? PM }
 
      HACCEL = HANDLE;
 
@@ -207,7 +204,9 @@ unit base;
 
      HIMAGELIST = HANDLE;
 
-     HINSTANCE = HANDLE;
+     { Not HINSTANCE, that will create prolems with the var hInstance
+       and in delphi its also called HINST (PFV) }
+     HINST = HANDLE;
 
      HKEY = HANDLE;
 
@@ -263,31 +262,26 @@ unit base;
      LPBOOL = ^WINBOOL;
 
      LPBYTE = ^BYTE;
-(* Const before type ignored *)
 
      LPCCH = ^CHAR;
 
      LPCH = ^CHAR;
 
      LPCOLORREF = ^COLORREF;
-(* Const before type ignored *)
 
      LPCSTR = ^char;
 {$ifdef UNICODE}
-(* Const before type ignored *)
 
   type
 
      LPCTSTR = ^word;
 {$else}
-(* Const before type ignored *)
 
   type
 
      LPCTSTR = ^char;
 {$endif}
   { UNICODE  }
-(* Const before type ignored *)
 
   type
 
@@ -491,7 +485,7 @@ unit base;
   #define WINAPI      STDCALL
   #define APIENTRY    STDCALL
   #define WINGDIAPI
-  
+
   #define _export
       }
   {
@@ -571,7 +565,7 @@ unit base;
   {  Not convertable by H2PAS
   #define FORWARD_WM_NOTIFY(hwnd, idFrom, pnmhdr, fn) \
       (void)(fn)((hwnd), WM_NOTIFY, (WPARAM)(int)(id), \
-      (LPARAM)(NMHDR FAR )(pnmhdr)) 
+      (LPARAM)(NMHDR FAR )(pnmhdr))
    }
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -591,7 +585,7 @@ unit base;
 
   {  Not convertable by H2PAS
   #define HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) \
-      (fn)((hwnd), (int)(wParam), (NMHDR FAR )(lParam)) 
+      (fn)((hwnd), (int)(wParam), (NMHDR FAR )(lParam))
    }
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -620,15 +614,15 @@ unit base;
   { original Cygnus headers also had the following defined:  }
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function SEXT_HIWORD(l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function ZEXT_HIWORD(l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -636,15 +630,15 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function INDEXTOOVERLAYMASK(i : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function INDEXTOSTATEIMAGEMASK(i : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -656,9 +650,9 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function MAKELANGID(p,s : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -666,9 +660,9 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function SUBLANGID(lgid : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -691,7 +685,7 @@ unit base;
   function MAKELRESULT(l,h : longint) : LRESULT;
 
   {  Not convertable by H2PAS
-  #define MAKEPOINTS(l)   ( ((POINTS FAR  ) & (l))) 
+  #define MAKEPOINTS(l)   ( ((POINTS FAR  ) & (l)))
    }
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -704,17 +698,17 @@ unit base;
 {$ifndef max}
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function max(a,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
 {$endif}
 {$ifndef min}
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function min(a,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
 {$endif}
   { was #define dname(params) def_expr }
@@ -723,23 +717,23 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function PALETTERGB(r,g,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   (*  Not convertable by H2PAS
   #define POINTSTOPOINT(pt, pts) {(pt).x = (SHORT) LOWORD(pts); \
-        (pt).y = (SHORT) HIWORD(pts);} 
+        (pt).y = (SHORT) HIWORD(pts);}
   #define POINTTOPOINTS(pt) \
-      (MAKELONG((short) ((pt).x), (short) ((pt).y))) 
+      (MAKELONG((short) ((pt).x), (short) ((pt).y)))
    *)
   { already declared before
   #define INDEXTOOVERLAYMASK(i) ((i) << 8)
-  #define INDEXTOSTATEIMAGEMASK(i) ((i) << 12)  
+  #define INDEXTOSTATEIMAGEMASK(i) ((i) << 12)
    }
   {  Not convertable by H2PAS
   #ifdef UNICODE
-  #define TEXT(quote) L##quote 
+  #define TEXT(quote) L##quote
   #else
   #define TEXT(quote) quote
   #endif
@@ -781,7 +775,7 @@ unit base;
 
      WNDPROC = function (_para1:HWND; _para2:UINT; _para3:WPARAM; _para4:LPARAM):LRESULT;
 
-     FARPROC = function :longint;
+     FARPROC = pointer; {function :longint;}
 
      PROC = FARPROC;
 
@@ -1025,18 +1019,18 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function SEXT_HIWORD(l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        SEXT_HIWORD:=(longint(l)) shr 16;
     end;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function ZEXT_HIWORD(l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        ZEXT_HIWORD:=(cardinal(l)) shr 16;
     end;
@@ -1050,18 +1044,18 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function INDEXTOOVERLAYMASK(i : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        INDEXTOOVERLAYMASK:=i shl 8;
     end;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function INDEXTOSTATEIMAGEMASK(i : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        INDEXTOSTATEIMAGEMASK:=i shl 12;
     end;
@@ -1082,9 +1076,9 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function MAKELANGID(p,s : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        MAKELANGID:=((WORD(s)) shl 10) or (WORD(p));
     end;
@@ -1100,9 +1094,9 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function SUBLANGID(lgid : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        SUBLANGID:=(WORD(lgid)) shr 10;
     end;
@@ -1158,9 +1152,9 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function max(a,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     var
        if_local1 : longint;
     (* result types are not known *)
@@ -1174,9 +1168,9 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function min(a,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     var
        if_local1 : longint;
     (* result types are not known *)
@@ -1197,9 +1191,9 @@ unit base;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function PALETTERGB(r,g,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        PALETTERGB:=$02000000 or (RGB(r,g,b));
     end;
@@ -1213,7 +1207,10 @@ end.
 
 {
   $Log$
-  Revision 1.7  1998-09-08 14:30:03  pierre
+  Revision 1.8  1998-10-27 11:17:11  peter
+    * type HINSTANCE -> HINST
+
+  Revision 1.7  1998/09/08 14:30:03  pierre
     * WINBOOL changed from longint to longbool
 
   Revision 1.6  1998/09/04 17:17:32  pierre

rtl/win32/defines.pp

@@ -26,8 +26,8 @@ unit defines;
 
 {  Automatically converted by H2PAS.EXE from defines.h
    Utility made by Florian Klaempfl 25th-28th september 96
-   Improvements made by Mark A. Malakanov 22nd-25th may 97 
-   Further improvements by Michael Van Canneyt, April 1998 
+   Improvements made by Mark A. Malakanov 22nd-25th may 97
+   Further improvements by Michael Van Canneyt, April 1998
    define handling and error recovery by Pierre Muller, June 1998 }
 
 
@@ -36,33 +36,33 @@ unit defines;
   { C default packing is dword }
 
 {$PACKRECORDS 4}
-  { 
+  {
      Defines.h
-  
+
      Windows32 API definitions
-  
+
      Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-  
+
      Author: Scott Christley <[email protected]>
-  
+
      This file is part of the Windows32 API Library.
-  
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
-     
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
-  
+
      If you are interested in a warranty or support for this source code,
      contact Scott Christley <[email protected]> for more information.
-     
+
      You should have received a copy of the GNU Library General Public
      License along with this library; see the file COPYING.LIB.
-     If not, write to the Free Software Foundation, 
+     If not, write to the Free Software Foundation,
      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    }
   { WARNING:  This file is automatically generated.  }
@@ -437,22 +437,22 @@ unit defines;
      FILE_WRITE_ATTRIBUTES = $0100;
   { displaced lower
   #define FILE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF)
-  
+
   #define FILE_GENERIC_READ         (STANDARD_RIGHTS_READ     |\
                                      FILE_READ_DATA           |\
                                      FILE_READ_ATTRIBUTES     |\
                                      FILE_READ_EA             |\
                                      SYNCHRONIZE)
-  
-  
+
+
   #define FILE_GENERIC_WRITE        (STANDARD_RIGHTS_WRITE    |\
                                      FILE_WRITE_DATA          |\
                                      FILE_WRITE_ATTRIBUTES    |\
                                      FILE_WRITE_EA            |\
                                      FILE_APPEND_DATA         |\
                                      SYNCHRONIZE)
-  
-  
+
+
   #define FILE_GENERIC_EXECUTE      (STANDARD_RIGHTS_EXECUTE  |\
                                      FILE_READ_ATTRIBUTES     |\
                                      FILE_EXECUTE             |\
@@ -587,7 +587,7 @@ unit defines;
      LR_DEFAULTCOLOR = 0;
      LR_LOADREALSIZE = 128;
   { already defined above !!
-  #define LR_MONOCHROME	(1)
+  #define LR_MONOCHROME (1)
    }
   { CreateMailslot, GetMailslotInfo  }
      MAILSLOT_WAIT_FOREVER = $ffffffff;
@@ -660,16 +660,16 @@ unit defines;
      READ_CONTROL = $20000;
      GENERIC_EXECUTE = $20000000;
   { already defined above !!
-  #define SERVICE_WIN32_OWN_PROCESS	(16)
-  #define SERVICE_WIN32_SHARE_PROCESS	(32)
-  #define SERVICE_KERNEL_DRIVER	(1)
-  #define SERVICE_FILE_SYSTEM_DRIVER	(2)
-  #define SERVICE_INTERACTIVE_PROCESS	(256)
-  #define SERVICE_BOOT_START	(0)
-  #define SERVICE_SYSTEM_START	(1)
-  #define SERVICE_AUTO_START	(2)
-  #define SERVICE_DEMAND_START	(3)
-  #define SERVICE_DISABLED	(4)
+  #define SERVICE_WIN32_OWN_PROCESS     (16)
+  #define SERVICE_WIN32_SHARE_PROCESS   (32)
+  #define SERVICE_KERNEL_DRIVER (1)
+  #define SERVICE_FILE_SYSTEM_DRIVER    (2)
+  #define SERVICE_INTERACTIVE_PROCESS   (256)
+  #define SERVICE_BOOT_START    (0)
+  #define SERVICE_SYSTEM_START  (1)
+  #define SERVICE_AUTO_START    (2)
+  #define SERVICE_DEMAND_START  (3)
+  #define SERVICE_DISABLED      (4)
    }
      SERVICE_ERROR_IGNORE = 0;
      SERVICE_ERROR_NORMAL = 1;
@@ -882,7 +882,7 @@ unit defines;
      WH_SHELL = 10;
      WH_SYSMSGFILTER = 6;
   { already defined above !!
-  #define WH_MSGFILTER	(-1)  }
+  #define WH_MSGFILTER  (-1)  }
      WH_FOREGROUNDIDLE = 11;
   { DefineDosDevice  }
      DDD_RAW_TARGET_PATH = 1;
@@ -914,7 +914,7 @@ unit defines;
      DC_VERSION = 10;
      DC_BINADJUST = 19;
   { already defined above !!
-  #define DC_DATATYPE_PRODUCED	(21)
+  #define DC_DATATYPE_PRODUCED  (21)
    }
   { DeviceIoControl  }
   { DlgDirList  }
@@ -1429,8 +1429,8 @@ unit defines;
      CP_OEMCP = 1;
   { GetDateFormat  }
   { already defined above !!
-  #define DATE_SHORTDATE	(1)
-  #define DATE_LONGDATE	(2)
+  #define DATE_SHORTDATE        (1)
+  #define DATE_LONGDATE (2)
    }
      DATE_USE_ALT_CALENDAR = 4;
   { GetDCEx  }
@@ -1475,12 +1475,12 @@ unit defines;
      NUMRESERVED = 106;
      COLORRES = 108;
   { already defined above !!
-  #define PHYSICALWIDTH	(110)
-  #define PHYSICALHEIGHT	(111)
-  #define PHYSICALOFFSETX	(112)
-  #define PHYSICALOFFSETY	(113)
-  #define SCALINGFACTORX	(114)
-  #define SCALINGFACTORY	(115)
+  #define PHYSICALWIDTH (110)
+  #define PHYSICALHEIGHT        (111)
+  #define PHYSICALOFFSETX       (112)
+  #define PHYSICALOFFSETY       (113)
+  #define SCALINGFACTORX        (114)
+  #define SCALINGFACTORY        (115)
    }
      VREFRESH = 116;
      DESKTOPHORZRES = 118;
@@ -3581,7 +3581,7 @@ unit defines;
      HHT_TORIGHT = 1024;
   { TBADDBITMAP structure  }
     { was #define dname def_expr }
-    function HINST_COMMCTRL : HINSTANCE;
+    function HINST_COMMCTRL : HINST;
 
 
   const
@@ -3736,7 +3736,7 @@ unit defines;
   {const this is a function in fact !!
      LPSTR_TEXTCALLBACK = LPSTR_TEXTCALLBACKW;}
     function LPSTR_TEXTCALLBACK : LPWSTR;
-     
+
 {$else}
 
   {const
@@ -3833,7 +3833,7 @@ unit defines;
        TREEITEM = record
                   end;
        HTREEITEM = ^TREEITEM;
-       
+
     { was #define dname def_expr }
     function TVI_ROOT : HTREEITEM;
 
@@ -4824,15 +4824,15 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_COMMAND_CMD(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_COMMAND_ID(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -4844,9 +4844,9 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_HSCROLL_CODE(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -4854,15 +4854,15 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_HSCROLL_POS(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_MDIACTIVATE_FACTIVATE(h,a,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -4874,9 +4874,9 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_VSCROLL_CODE(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
@@ -4884,9 +4884,9 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_VSCROLL_POS(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   {  Not convertable by H2PAS
   #define FORWARD_WM_CLOSE(h, fn)                 __CRACK_VOID_F(fn,(h, WM_CLOSE, 0, 0))
@@ -4905,7 +4905,7 @@ unit defines;
   #define FORWARD_WM_QUERYENDSESSION(h, fn)       __CRACK_BOOL_F(fn,(h, WM_QUERYENDSESSION, 0, 0))
   #define FORWARD_WM_SIZE(h, state, cx, cy, fn)   __CRACK_VOID_F(fn,(h, WM_SIZE, (WPARAM)state, MAKELPARAM(cx, cy)))
   #define FORWARD_WM_SYSCOMMAND(h, c, x, y, fn)   __CRACK_VOID_F(fn,(h, WM_SYSCOMMAND, (WPARAM)c, MAKELPARAM(x, y)))
-  
+
   #define HANDLE_WM_CLOSE(h, w, l, fn)            __CRACK_ZERO_F(fn,(h));
   #define HANDLE_WM_COMMAND(h, w, l, fn)          __CRACK_ZERO_F(fn,(h, SEXT_LOWORD(w), (HWND)l, HIWORD(w)))
   #define HANDLE_WM_CREATE(h, w, l, fn)           (LRESULT)((fn(h, (CREATESTRUCT  )l)) ? 0 : -1)
@@ -5038,19 +5038,19 @@ unit defines;
      PROCESSOR_ARCHITECTURE_ALPHA = 2;
      PROCESSOR_ARCHITECTURE_PPC = 3;
   { was #define dname(params) def_expr }
-  function FreeModule(h:HINSTANCE):WINBOOL;
+  function FreeModule(h:HINST):WINBOOL;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function MakeProcInstance(p,i : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function FreeProcInstance(p : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
 
 
   const
@@ -5138,7 +5138,7 @@ unit defines;
       ascdef,
 {$endif UNICODE}
       func;
-    
+
     const External_library='kernel32'; {Setup as you need!}
 
 {$endif not windows_include_files}
@@ -5505,9 +5505,9 @@ unit defines;
       end;
 
     { was #define dname def_expr }
-    function HINST_COMMCTRL : HINSTANCE;
+    function HINST_COMMCTRL : HINST;
       begin
-         HINST_COMMCTRL:=HINSTANCE(-(1));
+         HINST_COMMCTRL:=HINST(-(1));
       end;
 
     { was #define dname def_expr }
@@ -5529,7 +5529,7 @@ unit defines;
       begin
          LPSTR_TEXTCALLBACK:=LPWSTR(-(1));
       end;
-     
+
 {$else}
 
   {const
@@ -5596,18 +5596,18 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_COMMAND_CMD(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        GET_WM_COMMAND_CMD:=HIWORD(w);
     end;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_COMMAND_ID(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        GET_WM_COMMAND_ID:=LOWORD(w);
     end;
@@ -5628,9 +5628,9 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_HSCROLL_CODE(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        GET_WM_HSCROLL_CODE:=LOWORD(w);
     end;
@@ -5644,18 +5644,18 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_HSCROLL_POS(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        GET_WM_HSCROLL_POS:=HIWORD(w);
     end;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_MDIACTIVATE_FACTIVATE(h,a,b : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        GET_WM_MDIACTIVATE_FACTIVATE:=b = (LONG(h));
     end;
@@ -5676,9 +5676,9 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_VSCROLL_CODE(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        GET_WM_VSCROLL_CODE:=LOWORD(w);
     end;
@@ -5692,33 +5692,33 @@ unit defines;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function GET_WM_VSCROLL_POS(w,l : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        GET_WM_VSCROLL_POS:=HIWORD(w);
     end;
 
   { was #define dname(params) def_expr }
-  function FreeModule(h:HINSTANCE):WINBOOL;
+  function FreeModule(h:HINST):WINBOOL;
     begin
        FreeModule:=FreeLibrary(h);
     end;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function MakeProcInstance(p,i : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        MakeProcInstance:=p;
     end;
 
   { was #define dname(params) def_expr }
   { argument types are unknown }
-  { return type might be wrong }   
+  { return type might be wrong }
   function FreeProcInstance(p : longint) : longint;
-    { return type might be wrong }   
+    { return type might be wrong }
     begin
        FreeProcInstance:=p;
     end;
@@ -5730,7 +5730,10 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.5  1998-08-31 11:53:54  pierre
+  Revision 1.6  1998-10-27 11:17:12  peter
+    * type HINSTANCE -> HINST
+
+  Revision 1.5  1998/08/31 11:53:54  pierre
     * compilable windows.pp file
       still to do :
        - findout problems

rtl/win32/struct.pp

@@ -26,8 +26,8 @@ unit struct;
 
 {  Automatically converted by H2PAS.EXE from structures.h
    Utility made by Florian Klaempfl 25th-28th september 96
-   Improvements made by Mark A. Malakanov 22nd-25th may 97 
-   Further improvements by Michael Van Canneyt, April 1998 
+   Improvements made by Mark A. Malakanov 22nd-25th may 97
+   Further improvements by Michael Van Canneyt, April 1998
    define handling and error recovery by Pierre Muller, June 1998 }
 
 
@@ -43,34 +43,34 @@ unit struct;
   { C default packing is dword }
 
 {$PACKRECORDS 4}
-  { 
+  {
      Structures.h
-  
+
      Declarations for all the Windows32 API Structures
-  
+
      Copyright (C) 1996 Free Software Foundation, Inc.
-  
+
      Author:  Scott Christley <[email protected]>
      Date: 1996
-     
+
      This file is part of the Windows32 API Library.
-  
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
-     
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
-  
+
      If you are interested in a warranty or support for this source code,
      contact Scott Christley <[email protected]> for more information.
-     
+
      You should have received a copy of the GNU Library General Public
      License along with this library; see the file COPYING.LIB.
-     If not, write to the Free Software Foundation, 
+     If not, write to the Free Software Foundation,
      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    }
 {$ifndef _GNU_H_WINDOWS32_STRUCTURES}
@@ -315,9 +315,9 @@ unit struct;
      LPBITMAPCOREINFO = ^BITMAPCOREINFO;
 
      _BITMAPCOREINFO = BITMAPCOREINFO;
-(* error 
-  WORD    bfReserved1; 
-  WORD    bfReserved2; 
+(* error
+  WORD    bfReserved1;
+  WORD    bfReserved2;
  in declarator_list *)
 
      BITMAPINFOHEADER = record
@@ -550,7 +550,7 @@ unit struct;
 
      CREATESTRUCT = record
           lpCreateParams : LPVOID;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           hMenu : HMENU;
           hwndParent : HWND;
           cy : longint;
@@ -689,7 +689,7 @@ unit struct;
           lCustData : LPARAM;
           lpfnHook : LPCFHOOKPROC;
           lpTemplateName : LPCTSTR;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           lpszStyle : LPTSTR;
           nFontType : WORD;
           ___MISSING_ALIGNMENT__ : WORD;
@@ -1311,12 +1311,12 @@ unit struct;
   } SOCKET_ADDRESS,  PSOCKET_ADDRESS,  LPSOCKET_ADDRESS;
    }
   {
-  typedef struct _CSADDR_INFO { 
-    SOCKET_ADDRESS  LocalAddr; 
-    SOCKET_ADDRESS  RemoteAddr; 
-    INT             iSocketType; 
-    INT             iProtocol; 
-  } CSADDR_INFO; 
+  typedef struct _CSADDR_INFO {
+    SOCKET_ADDRESS  LocalAddr;
+    SOCKET_ADDRESS  RemoteAddr;
+    INT             iSocketType;
+    INT             iProtocol;
+  } CSADDR_INFO;
     *)
 
      CURRENCYFMT = record
@@ -3068,15 +3068,15 @@ unit struct;
 
      tagENUMLOGFONTEX = ENUMLOGFONTEX;
   {
-    Then follow: 
-    
-    TCHAR SourceName[] 
-    TCHAR Computername[] 
-    SID   UserSid 
-    TCHAR Strings[] 
-    BYTE  Data[] 
-    CHAR  Pad[] 
-    DWORD Length; 
+    Then follow:
+
+    TCHAR SourceName[]
+    TCHAR Computername[]
+    SID   UserSid
+    TCHAR Strings[]
+    BYTE  Data[]
+    CHAR  Pad[]
+    DWORD Length;
    }
 
      EVENTLOGRECORD = record
@@ -3164,7 +3164,7 @@ unit struct;
      FINDREPLACE = record
           lStructSize : DWORD;
           hwndOwner : HWND;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           Flags : DWORD;
           lpstrFindWhat : LPTSTR;
           lpstrReplaceWith : LPTSTR;
@@ -4134,7 +4134,7 @@ unit struct;
      MSGBOXPARAMS = record
           cbSize : UINT;
           hwndOwner : HWND;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           lpszText : LPCSTR;
           lpszCaption : LPCSTR;
           dwStyle : DWORD;
@@ -4444,7 +4444,7 @@ unit struct;
      OPENFILENAME = record
           lStructSize : DWORD;
           hwndOwner : HWND;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           lpstrFilter : LPCTSTR;
           lpstrCustomFilter : LPTSTR;
           nMaxCustFilter : DWORD;
@@ -4581,7 +4581,7 @@ unit struct;
           ptPaperSize : POINT;
           rtMinMargin : RECT;
           rtMargin : RECT;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           lCustData : LPARAM;
           lpfnPageSetupHook : LPPAGESETUPHOOK;
           lpfnPagePaintHook : LPPAGEPAINTHOOK;
@@ -4739,7 +4739,7 @@ unit struct;
           nMinPage : WORD;
           nMaxPage : WORD;
           nCopies : WORD;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           lCustData : DWORD;
           lpfnPrintHook : LPPRINTHOOKPROC;
           lpfnSetupHook : LPSETUPHOOKPROC;
@@ -4924,7 +4924,7 @@ unit struct;
      PROPSHEETPAGE = record
           dwSize : DWORD;
           dwFlags : DWORD;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           u1 : record
               case longint of
                  0 : ( pszTemplate : LPCTSTR );
@@ -4957,7 +4957,7 @@ unit struct;
           dwSize : DWORD;
           dwFlags : DWORD;
           hwndParent : HWND;
-          hInstance : HINSTANCE;
+          hInstance : HINST;
           u1 : record
               case longint of
                  0 : ( hIcon : HICON );
@@ -5164,18 +5164,18 @@ unit struct;
      _REMOTE_NAME_INFO = REMOTE_NAME_INFO;
   (*
    TODO: OLE
-  typedef struct _reobject { 
-    DWORD  cbStruct;           
-    LONG   cp;                 
-    CLSID  clsid;              
-    LPOLEOBJECT      poleobj;  
-    LPSTORAGE        pstg;     
-    LPOLECLIENTSITE  polesite; 
-    SIZEL  sizel;              
-    DWORD  dvaspect;           
-    DWORD  dwFlags;            
-    DWORD  dwUser;             
-  } REOBJECT; 
+  typedef struct _reobject {
+    DWORD  cbStruct;
+    LONG   cp;
+    CLSID  clsid;
+    LPOLEOBJECT      poleobj;
+    LPSTORAGE        pstg;
+    LPOLECLIENTSITE  polesite;
+    SIZEL  sizel;
+    DWORD  dvaspect;
+    DWORD  dwFlags;
+    DWORD  dwUser;
+  } REOBJECT;
    *)
 
      REPASTESPECIAL = record
@@ -5591,7 +5591,7 @@ unit struct;
      _TAPE_WRITE_MARKS = TAPE_WRITE_MARKS;
 
      TBADDBITMAP = record
-          hInst : HINSTANCE;
+          hInst : HINST;
           nID : UINT;
        end;
 
@@ -5780,7 +5780,7 @@ unit struct;
           hwnd : HWND;
           uId : UINT;
           rect : RECT;
-          hinst : HINSTANCE;
+          hinst : HINST;
           lpszText : LPTSTR;
        end;
 
@@ -5792,7 +5792,7 @@ unit struct;
           hdr : NMHDR;
           lpszText : LPTSTR;
           szText : array[0..79] of char;
-          hinst : HINSTANCE;
+          hinst : HINST;
           uFlags : UINT;
        end;
 
@@ -6813,7 +6813,10 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.4  1998-08-31 11:53:59  pierre
+  Revision 1.5  1998-10-27 11:17:17  peter
+    * type HINSTANCE -> HINST
+
+  Revision 1.4  1998/08/31 11:53:59  pierre
     * compilable windows.pp file
       still to do :
        - findout problems