--- Merging r41636 into '.':

U    rtl/win/sysosh.inc
--- Recording mergeinfo for merge of r41636 into '.':
 U   .
--- Merging r41795 into '.':
U    rtl/objpas/classes/classesh.inc
U    rtl/objpas/classes/collect.inc
--- Recording mergeinfo for merge of r41795 into '.':
 G   .
--- Merging r41881 into '.':
U    rtl/objpas/sysutils/syshelph.inc
--- Recording mergeinfo for merge of r41881 into '.':
 G   .
--- Merging r42149 into '.':
U    rtl/msdos/dos.pp
--- Recording mergeinfo for merge of r42149 into '.':
 G   .
--- Merging r42180 into '.':
U    rtl/freebsd/sysnr.inc
--- Recording mergeinfo for merge of r42180 into '.':
 G   .
--- Merging r42452 into '.':
U    rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r42452 into '.':
 G   .
--- Merging r42775 into '.':
U    packages/winunits-base/src/mmsystem.pp
--- Recording mergeinfo for merge of r42775 into '.':
 G   .

# revisions: 41636,41795,41881,42149,42180,42452,42775

git-svn-id: branches/fixes_3_2@42911 -

packages/winunits-base/src/mmsystem.pp

@@ -1250,7 +1250,7 @@ Type
                     dwUser: DWORD_PTR;
                     dwFlags: DWORD;
                     lpNext: PMIDIHDR;
-                    reserved: DWORD;
+                    reserved: DWORD_PTR;
                     dwOffset: DWORD;
                     dwReserved: array [0..Pred(8)] Of DWORD_PTR;
 	    End;
@@ -1605,7 +1605,7 @@ _MIXERCONTROLDETAILS_BOOLEAN = packed Record
  TMIXERCONTROLDETAILS_UNSIGNED  = _MIXERCONTROLDETAILS_UNSIGNED;
 
  LPTIMECALLBACK =
-    Procedure (uTimerID, uMsg: UINT; dwUser, dw1, dw2: DWORD);stdcall;
+    Procedure (uTimerID, uMsg: UINT; dwUser, dw1, dw2: DWORD_PTR);stdcall;
  TTIMECALLBACK=LPTIMECALLBACK;
 
  TFNTimeCallBack = TTimeCallback; // delphi compat

rtl/freebsd/sysnr.inc

@@ -104,6 +104,7 @@ const
  syscall_nr_waitpid                     =   7;
  syscall_nr_write                       =   4;
  syscall_nr_munmap                      =  73;
+ syscall_nr_mprotect                    =  74;
  syscall_nr_getsockopt                  = 118;
  syscall_nr_rfork                       = 251;
  syscall_nr_clock_gettime               = 232;

rtl/msdos/dos.pp

@@ -316,6 +316,7 @@ end;
 procedure setverify(verify : boolean);
 begin
   dosregs.ah:=$2e;
+  dosregs.dl:=0;
   dosregs.al:=ord(verify);
   msdos(dosregs);
 end;

rtl/objpas/classes/classesh.inc

@@ -558,6 +558,7 @@ type
     function Insert(Index: Integer): TCollectionItem;
     function FindItemID(ID: Integer): TCollectionItem;
     procedure Exchange(Const Index1, index2: integer);
+    procedure Move(Const Index1, index2: integer);
     procedure Sort(Const Compare : TCollectionSortCompare);
     property Count: Integer read GetCount;
     property ItemClass: TCollectionItemClass read FItemClass;

rtl/objpas/classes/collect.inc

@@ -434,6 +434,11 @@ begin
     FPONotifyObservers(Self,ooChange,Nil);
 end;
 
+procedure TCollection.Move(const Index1, index2: integer);
+begin
+  Items[Index1].Index:=Index2;
+end;
+
 
 {****************************************************************************}
 {*                             TOwnedCollection                             *}

rtl/objpas/sysutils/datih.inc

@@ -26,7 +26,9 @@ const
    MinsPerHour = 60;
    SecsPerMin  = 60;
    MSecsPerSec = 1000;
+
    MinsPerDay  = HoursPerDay * MinsPerHour;
+   SecsPerHour = SecsPerMin * MinsPerHour;
    SecsPerDay  = MinsPerDay * SecsPerMin;
    MSecsPerDay = SecsPerDay * MSecsPerSec;
 

rtl/objpas/sysutils/syshelph.inc

@@ -523,7 +523,7 @@ Type
   public
     const
       MaxValue = High(NativeInt);
-      MinValue = Low(NativeUInt);
+      MinValue = Low(NativeInt);
   Public
     Class Function Parse(const AString: string): NativeInt; inline; static;
     Class Function Size: Integer; inline; static;

rtl/win/sysosh.inc

@@ -22,7 +22,7 @@ type
   THandle = DWord;
   ULONG_PTR = DWord;
 {$endif CPU64}
-  TThreadID = THandle;
+  TThreadID = DWord;
   SIZE_T = ULONG_PTR;
 
   { the fields of this record are os dependent  }