Browse Source

* some data types cleaned up

florian 22 years ago
parent
commit
bc2d795aab
5 changed files with 54 additions and 25 deletions
  1. 11 2
      rtl/inc/systemh.inc
  2. 6 1
      rtl/win32/system.pp
  3. 4 2
      rtl/win32/win32.inc
  4. 5 3
      rtl/win32/wininc/base.inc
  5. 28 17
      rtl/win32/wininc/messages.inc

+ 11 - 2
rtl/inc/systemh.inc

@@ -264,6 +264,12 @@ Type
 
 { procedure type }
   TProcedure  = Procedure;
+  
+{$ifdef CPU64}
+  THandle = QWord;
+{$else CPU64}
+  THandle = DWord;
+{$endif CPU64}
 
 const
 { Maximum value of the biggest signed and unsigned integer type available}
@@ -692,7 +698,10 @@ const
 
 {
   $Log$
-  Revision 1.72  2003-09-04 16:07:31  florian
+  Revision 1.73  2003-10-06 23:52:53  florian
+    * some data types cleaned up
+
+  Revision 1.72  2003/09/04 16:07:31  florian
     * fixed qword_to_double conversion on powerpc
 
   Revision 1.71  2003/09/03 14:09:37  florian
@@ -815,4 +824,4 @@ const
       instead of direct comparisons of low/high values of orddefs because
       qword is a special case
 
-}
+}

+ 6 - 1
rtl/win32/system.pp

@@ -111,6 +111,8 @@ const
   Dll_Thread_Attach_Hook : TDLL_Entry_Hook = nil;
   Dll_Thread_Detach_Hook : TDLL_Entry_Hook = nil;
 
+type
+  HMODULE = THandle;
 
 implementation
 
@@ -1530,7 +1532,10 @@ end.
 
 {
   $Log$
-  Revision 1.44  2003-09-27 11:52:36  peter
+  Revision 1.45  2003-10-06 23:52:53  florian
+    * some data types cleaned up
+
+  Revision 1.44  2003/09/27 11:52:36  peter
     * sbrk returns pointer
 
   Revision 1.43  2003/09/26 07:30:34  michael

+ 4 - 2
rtl/win32/win32.inc

@@ -83,7 +83,6 @@ type
    LPVOID  = pointer;
    LPCVOID = pointer;
    LPDWORD = ^DWORD;
-   THandle = longint;
    HLocal  = THandle;
    PStr    = pchar;
    LPStr   = pchar;
@@ -126,7 +125,10 @@ type
 
 {
   $Log$
-  Revision 1.9  2002-09-07 16:01:29  peter
+  Revision 1.10  2003-10-06 23:52:53  florian
+    * some data types cleaned up
+
+  Revision 1.9  2002/09/07 16:01:29  peter
     * old logs removed and tabs fixed
 
   Revision 1.8  2002/05/09 08:28:23  carl

+ 5 - 3
rtl/win32/wininc/base.inc

@@ -76,7 +76,7 @@
      DWORDLONG  = qword;  { was unsigned long  }
      PDWORDLONG = ^DWORDLONG;
 
-     HANDLE = type Cardinal;
+     HANDLE = System.THandle;
      HRESULT = System.HResult;
 
      HACCEL = HANDLE;
@@ -108,7 +108,6 @@
      HLOCAL = HANDLE;
      HMENU = HANDLE;
      HMETAFILE = HANDLE;
-     HMODULE = HANDLE;
      HPALETTE = HANDLE;
      HPEN = HANDLE;
      HRASCONN = HANDLE;
@@ -938,7 +937,10 @@ type
 
 {
   $Log$
-  Revision 1.18  2003-08-20 23:12:32  marco
+  Revision 1.19  2003-10-06 23:52:53  florian
+    * some data types cleaned up
+
+  Revision 1.18  2003/08/20 23:12:32  marco
    * HSTR fix
 
   Revision 1.17  2003/04/23 11:35:00  peter

+ 28 - 17
rtl/win32/wininc/messages.inc

@@ -1171,28 +1171,39 @@ Type
 
      PMessage = ^TMessage;
      TMessage = packed record       {fields according to ICS}
-                    msg      : UINT;
-                    case longint of
-                      0: (
-                          wParam : WPARAM;
-                          lParam : LPARAM;
-                          Result : DWORD;
-                         );
-                      1: (
-                          wParamlo,
-                          wParamhi : WORD;  // Is there Windows type for half an wparam?
-                          lParamlo,
-                          lParamhi : WORD;
-                          Resultlo,
-                          Resulthi : WORD;
-                         );
-                   end;
+        msg      : UINT;
+        case longint of
+          0: (
+              wParam : WPARAM;
+              lParam : LPARAM;
+              Result : DWORD;
+             );
+          1: (
+              wParamlo,
+              wParamhi : WORD;  // Is there Windows type for half an wparam?
+              lParamlo,
+              lParamhi : WORD;
+              Resultlo,
+              Resulthi : WORD;
+             );
+       end;
+
+    TWMSize = packed record
+      Msg: Cardinal;
+      SizeType: LongInt;
+      Width : Word;
+      Height : Word;
+      Result : LongInt;
+    End;
 
 {$endif read_interface}
 
 {
   $Log$
-  Revision 1.5  2003-01-02 22:07:00  peter
+  Revision 1.6  2003-10-06 23:52:53  florian
+    * some data types cleaned up
+
+  Revision 1.5  2003/01/02 22:07:00  peter
     * missing items
 
   Revision 1.4  2002/11/04 12:17:42  marco