Browse Source

* some stuff for JCL

marco 25 years ago
parent
commit
ebe9dafe19
2 changed files with 27 additions and 14 deletions
  1. 15 12
      rtl/win32/wininc/func.inc
  2. 12 2
      rtl/win32/wininc/redef.inc

+ 15 - 12
rtl/win32/wininc/func.inc

@@ -2107,7 +2107,7 @@ ExitProcess(
 
 
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function SetSysColors(cElements:longint; var lpaElements:INT; var lpaRgbValues:COLORREF):WINBOOL;
+  function SetSysColors(cElements:longint; var lpaElements:wINT; var lpaRgbValues:COLORREF):WINBOOL;
 
 
 (* Const before type ignored *)
 (* Const before type ignored *)
   function DrawFocusRect(hDC:HDC; var lprc:RECT):WINBOOL;
   function DrawFocusRect(hDC:HDC; var lprc:RECT):WINBOOL;
@@ -2325,7 +2325,7 @@ ExitProcess(
 
 
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function CreatePolyPolygonRgn(var _para1:POINT; var _para2:INT; _para3:longint; _para4:longint):HRGN;
+  function CreatePolyPolygonRgn(var _para1:POINT; var _para2:wINT; _para3:longint; _para4:longint):HRGN;
 
 
   function CreatePatternBrush(_para1:HBITMAP):HBRUSH;
   function CreatePatternBrush(_para1:HBITMAP):HBRUSH;
 
 
@@ -2494,7 +2494,7 @@ ExitProcess(
 
 
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function PolyPolygon(_para1:HDC; var _para2:POINT; var _para3:INT; _para4:longint):WINBOOL;
+  function PolyPolygon(_para1:HDC; var _para2:POINT; var _para3:wINT; _para4:longint):WINBOOL;
 
 
   function PtInRegion(_para1:HRGN; _para2:longint; _para3:longint):WINBOOL;
   function PtInRegion(_para1:HRGN; _para2:longint; _para3:longint):WINBOOL;
 
 
@@ -2611,7 +2611,7 @@ ExitProcess(
 
 
   function GetEnhMetaFilePaletteEntries(_para1:HENHMETAFILE; _para2:UINT; _para3:LPPALETTEENTRY):UINT;
   function GetEnhMetaFilePaletteEntries(_para1:HENHMETAFILE; _para2:UINT; _para3:LPPALETTEENTRY):UINT;
 
 
-  function GetWinMetaFileBits(_para1:HENHMETAFILE; _para2:UINT; _para3:LPBYTE; _para4:INT; _para5:HDC):UINT;
+  function GetWinMetaFileBits(_para1:HENHMETAFILE; _para2:UINT; _para3:LPBYTE; _para4:wINT; _para5:HDC):UINT;
 
 
 (* Const before type ignored *)
 (* Const before type ignored *)
   function PlayEnhMetaFile(_para1:HDC; _para2:HENHMETAFILE; var _para3:RECT):WINBOOL;
   function PlayEnhMetaFile(_para1:HDC; _para2:HENHMETAFILE; var _para3:RECT):WINBOOL;
@@ -3024,7 +3024,7 @@ ExitProcess(
   function ListView_GetEditControl(hwndLV : HWND) : LRESULT;
   function ListView_GetEditControl(hwndLV : HWND) : LRESULT;
 
 
   { was #define dname(params) def_expr }
   { was #define dname(params) def_expr }
-  function ListView_GetImageList(hwnd:HWND;iImageList : INT) : LRESULT;
+  function ListView_GetImageList(hwnd:HWND;iImageList : wINT) : LRESULT;
 
 
   { was #define dname(params) def_expr }
   { was #define dname(params) def_expr }
   function ListView_GetISearchString(hwndLV:HWND;lpsz : LPTSTR) : LRESULT;
   function ListView_GetISearchString(hwndLV:HWND;lpsz : LPTSTR) : LRESULT;
@@ -4843,7 +4843,7 @@ in define line 6852 *)
 
 
   function GetSysColorBrush(nIndex:longint):HBRUSH; external 'user32' name 'GetSysColorBrush';
   function GetSysColorBrush(nIndex:longint):HBRUSH; external 'user32' name 'GetSysColorBrush';
 
 
-  function SetSysColors(cElements:longint; var lpaElements:INT; var lpaRgbValues:COLORREF):WINBOOL; external 'user32' name 'SetSysColors';
+  function SetSysColors(cElements:longint; var lpaElements:wINT; var lpaRgbValues:COLORREF):WINBOOL; external 'user32' name 'SetSysColors';
 
 
   function DrawFocusRect(hDC:HDC; var lprc:RECT):WINBOOL; external 'user32' name 'DrawFocusRect';
   function DrawFocusRect(hDC:HDC; var lprc:RECT):WINBOOL; external 'user32' name 'DrawFocusRect';
 
 
@@ -5022,7 +5022,7 @@ in define line 6852 *)
 
 
   function CreatePenIndirect(var _para1:LOGPEN):HPEN; external 'gdi32' name 'CreatePenIndirect';
   function CreatePenIndirect(var _para1:LOGPEN):HPEN; external 'gdi32' name 'CreatePenIndirect';
 
 
-  function CreatePolyPolygonRgn(var _para1:POINT; var _para2:INT; _para3:longint; _para4:longint):HRGN; external 'gdi32' name 'CreatePolyPolygonRgn';
+  function CreatePolyPolygonRgn(var _para1:POINT; var _para2:wINT; _para3:longint; _para4:longint):HRGN; external 'gdi32' name 'CreatePolyPolygonRgn';
 
 
   function CreatePatternBrush(_para1:HBITMAP):HBRUSH; external 'gdi32' name 'CreatePatternBrush';
   function CreatePatternBrush(_para1:HBITMAP):HBRUSH; external 'gdi32' name 'CreatePatternBrush';
 
 
@@ -5185,7 +5185,7 @@ in define line 6852 *)
 
 
   function PaintRgn(_para1:HDC; _para2:HRGN):WINBOOL; external 'gdi32' name 'PaintRgn';
   function PaintRgn(_para1:HDC; _para2:HRGN):WINBOOL; external 'gdi32' name 'PaintRgn';
 
 
-  function PolyPolygon(_para1:HDC; var _para2:POINT; var _para3:INT; _para4:longint):WINBOOL; external 'gdi32' name 'PolyPolygon';
+  function PolyPolygon(_para1:HDC; var _para2:POINT; var _para3:wINT; _para4:longint):WINBOOL; external 'gdi32' name 'PolyPolygon';
 
 
   function PtInRegion(_para1:HRGN; _para2:longint; _para3:longint):WINBOOL; external 'gdi32' name 'PtInRegion';
   function PtInRegion(_para1:HRGN; _para2:longint; _para3:longint):WINBOOL; external 'gdi32' name 'PtInRegion';
 
 
@@ -5289,7 +5289,7 @@ in define line 6852 *)
 
 
   function GetEnhMetaFilePaletteEntries(_para1:HENHMETAFILE; _para2:UINT; _para3:LPPALETTEENTRY):UINT; external 'gdi32' name 'GetEnhMetaFilePaletteEntries';
   function GetEnhMetaFilePaletteEntries(_para1:HENHMETAFILE; _para2:UINT; _para3:LPPALETTEENTRY):UINT; external 'gdi32' name 'GetEnhMetaFilePaletteEntries';
 
 
-  function GetWinMetaFileBits(_para1:HENHMETAFILE; _para2:UINT; _para3:LPBYTE; _para4:INT; _para5:HDC):UINT; external 'gdi32' name 'GetWinMetaFileBits';
+  function GetWinMetaFileBits(_para1:HENHMETAFILE; _para2:UINT; _para3:LPBYTE; _para4:wINT; _para5:HDC):UINT; external 'gdi32' name 'GetWinMetaFileBits';
 
 
   function PlayEnhMetaFile(_para1:HDC; _para2:HENHMETAFILE; var _para3:RECT):WINBOOL; external 'gdi32' name 'PlayEnhMetaFile';
   function PlayEnhMetaFile(_para1:HDC; _para2:HENHMETAFILE; var _para3:RECT):WINBOOL; external 'gdi32' name 'PlayEnhMetaFile';
 
 
@@ -5807,7 +5807,7 @@ in define line 6852 *)
     end;
     end;
 
 
   { was #define dname(params) def_expr }
   { was #define dname(params) def_expr }
-  function ListView_GetImageList(hwnd:HWND;iImageList : INT) : LRESULT;
+  function ListView_GetImageList(hwnd:HWND;iImageList : wINT) : LRESULT;
     begin
     begin
        ListView_GetImageList:=SendMessage(hwnd,LVM_GETIMAGELIST,WPARAM(iImageList),0);
        ListView_GetImageList:=SendMessage(hwnd,LVM_GETIMAGELIST,WPARAM(iImageList),0);
     end;
     end;
@@ -6712,7 +6712,10 @@ end.
 {$endif not windows_include_files}
 {$endif not windows_include_files}
 {
 {
   $Log$
   $Log$
-  Revision 1.5  2000-02-09 16:59:35  peter
+  Revision 1.6  2000-03-19 20:29:06  marco
+   * some stuff for JCL
+
+  Revision 1.5  2000/02/09 16:59:35  peter
     * truncated log
     * truncated log
 
 
   Revision 1.4  2000/01/07 16:41:55  daniel
   Revision 1.4  2000/01/07 16:41:55  daniel
@@ -6727,4 +6730,4 @@ end.
   Revision 1.1  1999/09/16 13:38:22  peter
   Revision 1.1  1999/09/16 13:38:22  peter
     * windows unit include moved to wininc/
     * windows unit include moved to wininc/
 
 
-}
+}

+ 12 - 2
rtl/win32/wininc/redef.inc

@@ -99,10 +99,20 @@ type
      CO_E_APPDIDNTREG = DWORD($800401FE);
      CO_E_APPDIDNTREG = DWORD($800401FE);
      CO_E_RELEASED = DWORD($800401FF);
      CO_E_RELEASED = DWORD($800401FF);
 
 
+{MvdV: JCL templates}
+function GetTimeZoneInformation(var TimeZoneInformation:TTimeZoneInformation):DWORD;
+function FileTimeToLocalFileTime(const lpFileTime:TFILETIME; var LocalFileTime :TFILETIME):WINBOOL;
+function FileTimeToSystemTime(const lpFileTime:TFILETIME; var lpSystemTime:TSYSTEMTIME):WINBOOL;
+function DosDateTimeToFileTime(wFatDate:WORD; wFatTime:WORD; var lpFileTime:tFILETIME):WINBOOL;
+function SystemTimeToFileTime(const lSystemTime:tSYSTEMTIME; var FileTime:TFILETIME):WINBOOL;
+
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.3  2000-02-09 16:59:36  peter
+  Revision 1.4  2000-03-19 20:29:06  marco
+   * some stuff for JCL
+
+  Revision 1.3  2000/02/09 16:59:36  peter
     * truncated log
     * truncated log
 
 
   Revision 1.2  2000/01/07 16:41:56  daniel
   Revision 1.2  2000/01/07 16:41:56  daniel
@@ -111,4 +121,4 @@ type
   Revision 1.1  1999/09/16 13:38:24  peter
   Revision 1.1  1999/09/16 13:38:24  peter
     * windows unit include moved to wininc/
     * windows unit include moved to wininc/
 
 
-}
+}