Browse Source

* Moved TExceptionRecord definition to sysos.inc, it is identical for all Windows targets.

git-svn-id: trunk@19868 -
sergei 13 years ago
parent
commit
ebb2205c63
5 changed files with 13 additions and 35 deletions
  1. 13 0
      rtl/win/sysos.inc
  2. 0 2
      rtl/win/syswin.inc
  3. 0 10
      rtl/win32/system.pp
  4. 0 10
      rtl/win64/system.pp
  5. 0 13
      rtl/wince/system.pp

+ 13 - 0
rtl/win/sysos.inc

@@ -106,6 +106,8 @@ const
     ERROR_DIR_NOT_EMPTY = 145;
     ERROR_DIR_NOT_EMPTY = 145;
     ERROR_ALREADY_EXISTS = 183;
     ERROR_ALREADY_EXISTS = 183;
 
 
+    EXCEPTION_MAXIMUM_PARAMETERS = 15;
+
 type
 type
    {UINT  = longint;
    {UINT  = longint;
    BOOL  = longint; obsolete }
    BOOL  = longint; obsolete }
@@ -173,6 +175,17 @@ type
     flags : dword;
     flags : dword;
   end;
   end;
 
 
+  PExceptionRecord = ^TExceptionRecord;
+  TExceptionRecord = record
+    ExceptionCode   : cardinal;
+    ExceptionFlags  : cardinal;
+    ExceptionRecord : PExceptionRecord;
+    ExceptionAddress : Pointer;
+    NumberParameters : Longint;
+    ExceptionInformation : array[0..EXCEPTION_MAXIMUM_PARAMETERS-1] of Pointer;
+  end;
+
+
 threadvar
 threadvar
   errno : longint;
   errno : longint;
 
 

+ 0 - 2
rtl/win/syswin.inc

@@ -85,8 +85,6 @@ const
   EXCEPTION_CONTINUE_EXECUTION            = -1;
   EXCEPTION_CONTINUE_EXECUTION            = -1;
   EXCEPTION_CONTINUE_SEARCH               = 0;
   EXCEPTION_CONTINUE_SEARCH               = 0;
 
 
-  EXCEPTION_MAXIMUM_PARAMETERS            = 15;
-
   CONTEXT_X86                             = $00010000;
   CONTEXT_X86                             = $00010000;
   CONTEXT_CONTROL                         = CONTEXT_X86 or $00000001;
   CONTEXT_CONTROL                         = CONTEXT_X86 or $00000001;
   CONTEXT_INTEGER                         = CONTEXT_X86 or $00000002;
   CONTEXT_INTEGER                         = CONTEXT_X86 or $00000002;

+ 0 - 10
rtl/win32/system.pp

@@ -339,16 +339,6 @@ type
           ExtendedRegisters : array[0..MAXIMUM_SUPPORTED_EXTENSION-1] of Byte;
           ExtendedRegisters : array[0..MAXIMUM_SUPPORTED_EXTENSION-1] of Byte;
   end;
   end;
 
 
-type
-  PExceptionRecord = ^TExceptionRecord;
-  TExceptionRecord = packed record
-          ExceptionCode   : cardinal;
-          ExceptionFlags  : Longint;
-          ExceptionRecord : PExceptionRecord;
-          ExceptionAddress : Pointer;
-          NumberParameters : Longint;
-          ExceptionInformation : array[0..EXCEPTION_MAXIMUM_PARAMETERS-1] of Pointer;
-  end;
 
 
   PExceptionPointers = ^TExceptionPointers;
   PExceptionPointers = ^TExceptionPointers;
   TExceptionPointers = packed record
   TExceptionPointers = packed record

+ 0 - 10
rtl/win64/system.pp

@@ -338,16 +338,6 @@ type
  end;
  end;
 
 
 type
 type
-  PExceptionRecord = ^TExceptionRecord;
-  TExceptionRecord = record
-    ExceptionCode   : DWord;
-    ExceptionFlags  : DWord;
-    ExceptionRecord : PExceptionRecord;
-    ExceptionAddress : Pointer;
-    NumberParameters : DWord;
-    ExceptionInformation : array[0..EXCEPTION_MAXIMUM_PARAMETERS-1] of Pointer;
-  end;
-
   PExceptionPointers = ^TExceptionPointers;
   PExceptionPointers = ^TExceptionPointers;
   TExceptionPointers = packed record
   TExceptionPointers = packed record
     ExceptionRecord   : PExceptionRecord;
     ExceptionRecord   : PExceptionRecord;

+ 0 - 13
rtl/wince/system.pp

@@ -981,8 +981,6 @@ const
 
 
   CONTEXT_FULL                    = CONTEXT_CONTROL or CONTEXT_INTEGER or CONTEXT_SEGMENTS;
   CONTEXT_FULL                    = CONTEXT_CONTROL or CONTEXT_INTEGER or CONTEXT_SEGMENTS;
 
 
-  EXCEPTION_MAXIMUM_PARAMETERS    = 15;
-
   NUM_VFP_REGS = 32;
   NUM_VFP_REGS = 32;
   NUM_EXTRA_CONTROL_REGS = 8;
   NUM_EXTRA_CONTROL_REGS = 8;
 
 
@@ -1030,7 +1028,6 @@ const
   CONTEXT_EXTENDED_REGISTERS      = CONTEXT_X86 or $00000020;
   CONTEXT_EXTENDED_REGISTERS      = CONTEXT_X86 or $00000020;
 
 
   MAXIMUM_SUPPORTED_EXTENSION     = 512;
   MAXIMUM_SUPPORTED_EXTENSION     = 512;
-  EXCEPTION_MAXIMUM_PARAMETERS    = 15;
 
 
 type
 type
   PFloatingSaveArea = ^TFloatingSaveArea;
   PFloatingSaveArea = ^TFloatingSaveArea;
@@ -1101,16 +1098,6 @@ type
 {$endif CPUI386}
 {$endif CPUI386}
 
 
 type
 type
-  PExceptionRecord = ^TExceptionRecord;
-  TExceptionRecord = packed record
-    ExceptionCode   : Longint;
-    ExceptionFlags  : Longint;
-    ExceptionRecord : PExceptionRecord;
-    ExceptionAddress : Pointer;
-    NumberParameters : Longint;
-    ExceptionInformation : array[0..EXCEPTION_MAXIMUM_PARAMETERS-1] of Pointer;
-  end;
-
   PExceptionPointers = ^TExceptionPointers;
   PExceptionPointers = ^TExceptionPointers;
   TExceptionPointers = packed record
   TExceptionPointers = packed record
     ExceptionRecord   : PExceptionRecord;
     ExceptionRecord   : PExceptionRecord;