From 26824d4a01697c162f41a813f27d05dde1fcdf15 Mon Sep 17 00:00:00 2001
From: christian_u <christian_u@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 17 Jan 2008 19:21:36 +0000
Subject: [PATCH] removed-Facthreads from package maked 64 bit compatible

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@326 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../virtualtreeview/linux/virtualtreeslcl.lpk | 31 ++++++++-----------
 components/virtualtreeview/virtualtrees.pas   | 20 ++++++++----
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/components/virtualtreeview/linux/virtualtreeslcl.lpk b/components/virtualtreeview/linux/virtualtreeslcl.lpk
index 66e44eb92..d59febc8c 100644
--- a/components/virtualtreeview/linux/virtualtreeslcl.lpk
+++ b/components/virtualtreeview/linux/virtualtreeslcl.lpk
@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="2">
-    <PathDelim Value="\"/>
+  <Package Version="3">
     <Name Value="virtualtreeslcl"/>
     <Author Value="Joerg Thaler,Christian Ulrich"/>
     <CompilerOptions>
       <Version Value="5"/>
-      <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="..\"/>
-        <OtherUnitFiles Value="..\"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <IncludeFiles Value="../"/>
+        <OtherUnitFiles Value="../"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <CodeGeneration>
         <Generate Value="Faster"/>
@@ -37,27 +35,27 @@ specific language governing rights and limitations under the License.
     <Version Major="4" Release="17" Build="25"/>
     <Files Count="6">
       <Item1>
-        <Filename Value="..\virtualTrees.lrs"/>
+        <Filename Value="../virtualTrees.lrs"/>
         <Type Value="LRS"/>
       </Item1>
       <Item2>
-        <Filename Value="..\virtualtrees.pas"/>
+        <Filename Value="../virtualtrees.pas"/>
         <UnitName Value="VirtualTrees"/>
       </Item2>
       <Item3>
-        <Filename Value="..\virtualdrawtree.pas"/>
+        <Filename Value="../virtualdrawtree.pas"/>
         <UnitName Value="VirtualDrawTree"/>
       </Item3>
       <Item4>
-        <Filename Value="..\virtualstringtree.pas"/>
+        <Filename Value="../virtualstringtree.pas"/>
         <UnitName Value="VirtualStringTree"/>
       </Item4>
       <Item5>
-        <Filename Value="..\vtheaderpopup.pas"/>
+        <Filename Value="../vtheaderpopup.pas"/>
         <UnitName Value="VTHeaderPopup"/>
       </Item5>
       <Item6>
-        <Filename Value="..\vtregister.pas"/>
+        <Filename Value="../vtregister.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="VTRegister"/>
       </Item6>
@@ -65,20 +63,17 @@ specific language governing rights and limitations under the License.
     <Type Value="DesignTime"/>
     <RequiredPkgs Count="2">
       <Item1>
-        <PackageName Value="LCL"/>
+        <PackageName Value="FCL"/>
       </Item1>
       <Item2>
-        <PackageName Value="FCL"/>
+        <PackageName Value="LCL"/>
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <CustomOptions Value="-Facthreads
-"/>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)/"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
-      <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
       <IgnoreBinaries Value="False"/>
     </PublishOptions>
   </Package>
diff --git a/components/virtualtreeview/virtualtrees.pas b/components/virtualtreeview/virtualtrees.pas
index dfb45bd16..7ba8bb5ec 100644
--- a/components/virtualtreeview/virtualtrees.pas
+++ b/components/virtualtreeview/virtualtrees.pas
@@ -76,6 +76,14 @@ uses
 //  ,CommCtrl  // image lists, common controls tree structures
   ;
 
+type
+{$IFDEF CPU32}
+  PointerIncType = Cardinal;
+{$ENDIF}
+{$IFDEF CPU64}
+  PointerIncType = Int64;
+{$ENDIF}
+
 const
   VTVersion = '4.0.17';
   VTTreeStreamVersion = 2;
@@ -2987,9 +2995,9 @@ begin
     J := R;
     P := TheArray[(L + R) shr 1];
     repeat
-      while Cardinal(TheArray[I]) < Cardinal(P) do
+      while PointerIncType(TheArray[I]) < PointerIncType(P) do
         Inc(I);
-      while Cardinal(TheArray[J]) > Cardinal(P) do
+      while PointerIncType(TheArray[J]) > PointerIncType(P) do
         Dec(J);
       if I <= J then
       begin
@@ -3580,7 +3588,7 @@ begin exit;
   if Height > 0 then  // bottom-up DIB
     Row := Height - Row - 1;
   // Return DWORD aligned address of the requested scanline.
-  Integer(Result) := Integer(Bits) + Row * ((Width * 32 + 31) and not 31) div 8;
+//  Integer(Result) := Integer(Bits) + Row * ((Width * 32 + 31) and not 31) div 8;
 end;
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -18388,7 +18396,7 @@ begin
       if ([vsSelected, vsDisabled] * NewItems[I]^.States <> []) or
          (Constrained and (Cardinal(FLastSelectionLevel) <> GetNodeLevel(NewItems[I]))) or
          (SiblingConstrained and (FRangeAnchor^.Parent <> NewItems[I]^.Parent)) then
-        Inc(Cardinal(NewItems[I]))
+        Inc(PointerIncType(NewItems[I]))
       else
         Include(NewItems[I]^.States, vsSelected);
   end;
@@ -18418,7 +18426,7 @@ begin
       // array and only the remaining new items must be inserted.
       if CurrentEnd >= 0 then
       begin
-        while (J >= 0) and (Cardinal(NewItems[J]) > Cardinal(FSelection[CurrentEnd])) do
+        while (J >= 0) and (PointerIncType(NewItems[J]) > PointerIncType(FSelection[CurrentEnd])) do
         begin
           FSelection[CurrentEnd + J + 1] := NewItems[J];
           Dec(J);
@@ -18774,7 +18782,7 @@ begin
   if FindNodeInSelection(Node, Index, -1, -1) then
   begin
     Exclude(Node^.States, vsSelected);
-    Inc(Cardinal(FSelection[Index]));
+    Inc(PointerIncType(FSelection[Index]));
   end;
 end;