diff --git a/components/systools/source/design/images/img-systoolsdb.txt b/components/systools/images/img-systools-db.txt
similarity index 100%
rename from components/systools/source/design/images/img-systoolsdb.txt
rename to components/systools/images/img-systools-db.txt
diff --git a/components/systools/source/design/images/img-systools.txt b/components/systools/images/img-systools-general.txt
similarity index 81%
rename from components/systools/source/design/images/img-systools.txt
rename to components/systools/images/img-systools-general.txt
index d8ed68bd1..bfddf0ffe 100644
--- a/components/systools/source/design/images/img-systools.txt
+++ b/components/systools/images/img-systools-general.txt
@@ -5,12 +5,10 @@ tstexceptionlog.png
 tstexpression.png
 tstexpressionedit.png
 tstfiletohtml.png
-tstgenerallog.png
 tstmaxicodebarcode.png
 tstnetconnection.png
 tstnetmessage.png
 tstnetperformance.png
-tstnteventlog.png
 tstnvbits.png
 tstnvcollection.png
 tstnvdictionary.png
@@ -23,6 +21,3 @@ tstnvtree.png
 tstpdf417barcode.png
 tstpnbarcode.png
 tstregex.png
-tstspawnapplication.png
-tstversioninfo.png
-tstwmdatacopy.png
diff --git a/components/systools/images/img-systools-win.txt b/components/systools/images/img-systools-win.txt
new file mode 100644
index 000000000..5d8e38dce
--- /dev/null
+++ b/components/systools/images/img-systools-win.txt
@@ -0,0 +1,5 @@
+tstgenerallog.png
+tstnteventlog.png
+tstspawnapplication.png
+tstversioninfo.png
+tstwmdatacopy.png
diff --git a/components/systools/images/make_res.bat b/components/systools/images/make_res.bat
new file mode 100644
index 000000000..64a7e3b14
--- /dev/null
+++ b/components/systools/images/make_res.bat
@@ -0,0 +1,3 @@
+lazres ..\source\general\design\streg.res        @img-systools-general.txt
+lazres ..\source\db\design\stregdb.res           @img-systools-db.txt
+lazres ..\source\windows_only\design\stregwin.res @img-systools-win.txt
diff --git a/components/systools/source/design/images/tstbarcode.png b/components/systools/images/tstbarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstbarcode.png
rename to components/systools/images/tstbarcode.png
diff --git a/components/systools/source/design/images/tstcode16kbarcode.png b/components/systools/images/tstcode16kbarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstcode16kbarcode.png
rename to components/systools/images/tstcode16kbarcode.png
diff --git a/components/systools/source/design/images/tstdatamatrixbarcode.png b/components/systools/images/tstdatamatrixbarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstdatamatrixbarcode.png
rename to components/systools/images/tstdatamatrixbarcode.png
diff --git a/components/systools/source/design/images/tstdbbarcode.png b/components/systools/images/tstdbbarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstdbbarcode.png
rename to components/systools/images/tstdbbarcode.png
diff --git a/components/systools/source/design/images/tstdbmaxicodebarcode.png b/components/systools/images/tstdbmaxicodebarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstdbmaxicodebarcode.png
rename to components/systools/images/tstdbmaxicodebarcode.png
diff --git a/components/systools/source/design/images/tstdbpdf417barcode.png b/components/systools/images/tstdbpdf417barcode.png
similarity index 100%
rename from components/systools/source/design/images/tstdbpdf417barcode.png
rename to components/systools/images/tstdbpdf417barcode.png
diff --git a/components/systools/source/design/images/tstdbpnbarcode.png b/components/systools/images/tstdbpnbarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstdbpnbarcode.png
rename to components/systools/images/tstdbpnbarcode.png
diff --git a/components/systools/source/design/images/tstexceptionlog.png b/components/systools/images/tstexceptionlog.png
similarity index 100%
rename from components/systools/source/design/images/tstexceptionlog.png
rename to components/systools/images/tstexceptionlog.png
diff --git a/components/systools/source/design/images/tstexpression.png b/components/systools/images/tstexpression.png
similarity index 100%
rename from components/systools/source/design/images/tstexpression.png
rename to components/systools/images/tstexpression.png
diff --git a/components/systools/source/design/images/tstexpressionedit.png b/components/systools/images/tstexpressionedit.png
similarity index 100%
rename from components/systools/source/design/images/tstexpressionedit.png
rename to components/systools/images/tstexpressionedit.png
diff --git a/components/systools/source/design/images/tstfiletohtml.png b/components/systools/images/tstfiletohtml.png
similarity index 100%
rename from components/systools/source/design/images/tstfiletohtml.png
rename to components/systools/images/tstfiletohtml.png
diff --git a/components/systools/source/design/images/tstgenerallog.png b/components/systools/images/tstgenerallog.png
similarity index 100%
rename from components/systools/source/design/images/tstgenerallog.png
rename to components/systools/images/tstgenerallog.png
diff --git a/components/systools/source/design/images/tstmaxicodebarcode.png b/components/systools/images/tstmaxicodebarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstmaxicodebarcode.png
rename to components/systools/images/tstmaxicodebarcode.png
diff --git a/components/systools/source/design/images/tstnetconnection.png b/components/systools/images/tstnetconnection.png
similarity index 100%
rename from components/systools/source/design/images/tstnetconnection.png
rename to components/systools/images/tstnetconnection.png
diff --git a/components/systools/source/design/images/tstnetmessage.png b/components/systools/images/tstnetmessage.png
similarity index 100%
rename from components/systools/source/design/images/tstnetmessage.png
rename to components/systools/images/tstnetmessage.png
diff --git a/components/systools/source/design/images/tstnetperformance.png b/components/systools/images/tstnetperformance.png
similarity index 100%
rename from components/systools/source/design/images/tstnetperformance.png
rename to components/systools/images/tstnetperformance.png
diff --git a/components/systools/source/design/images/tstnteventlog.png b/components/systools/images/tstnteventlog.png
similarity index 100%
rename from components/systools/source/design/images/tstnteventlog.png
rename to components/systools/images/tstnteventlog.png
diff --git a/components/systools/source/design/images/tstnvbits.png b/components/systools/images/tstnvbits.png
similarity index 100%
rename from components/systools/source/design/images/tstnvbits.png
rename to components/systools/images/tstnvbits.png
diff --git a/components/systools/source/design/images/tstnvcollection.png b/components/systools/images/tstnvcollection.png
similarity index 100%
rename from components/systools/source/design/images/tstnvcollection.png
rename to components/systools/images/tstnvcollection.png
diff --git a/components/systools/source/design/images/tstnvdictionary.png b/components/systools/images/tstnvdictionary.png
similarity index 100%
rename from components/systools/source/design/images/tstnvdictionary.png
rename to components/systools/images/tstnvdictionary.png
diff --git a/components/systools/source/design/images/tstnvdque.png b/components/systools/images/tstnvdque.png
similarity index 100%
rename from components/systools/source/design/images/tstnvdque.png
rename to components/systools/images/tstnvdque.png
diff --git a/components/systools/source/design/images/tstnvlarray.png b/components/systools/images/tstnvlarray.png
similarity index 100%
rename from components/systools/source/design/images/tstnvlarray.png
rename to components/systools/images/tstnvlarray.png
diff --git a/components/systools/source/design/images/tstnvlist.png b/components/systools/images/tstnvlist.png
similarity index 100%
rename from components/systools/source/design/images/tstnvlist.png
rename to components/systools/images/tstnvlist.png
diff --git a/components/systools/source/design/images/tstnvlmatrix.png b/components/systools/images/tstnvlmatrix.png
similarity index 100%
rename from components/systools/source/design/images/tstnvlmatrix.png
rename to components/systools/images/tstnvlmatrix.png
diff --git a/components/systools/source/design/images/tstnvsortedcollection.png b/components/systools/images/tstnvsortedcollection.png
similarity index 100%
rename from components/systools/source/design/images/tstnvsortedcollection.png
rename to components/systools/images/tstnvsortedcollection.png
diff --git a/components/systools/source/design/images/tstnvtree.png b/components/systools/images/tstnvtree.png
similarity index 100%
rename from components/systools/source/design/images/tstnvtree.png
rename to components/systools/images/tstnvtree.png
diff --git a/components/systools/source/design/images/tstpdf417barcode.png b/components/systools/images/tstpdf417barcode.png
similarity index 100%
rename from components/systools/source/design/images/tstpdf417barcode.png
rename to components/systools/images/tstpdf417barcode.png
diff --git a/components/systools/source/design/images/tstpnbarcode.png b/components/systools/images/tstpnbarcode.png
similarity index 100%
rename from components/systools/source/design/images/tstpnbarcode.png
rename to components/systools/images/tstpnbarcode.png
diff --git a/components/systools/source/design/images/tstregex.png b/components/systools/images/tstregex.png
similarity index 100%
rename from components/systools/source/design/images/tstregex.png
rename to components/systools/images/tstregex.png
diff --git a/components/systools/source/design/images/tstspawnapplication.png b/components/systools/images/tstspawnapplication.png
similarity index 100%
rename from components/systools/source/design/images/tstspawnapplication.png
rename to components/systools/images/tstspawnapplication.png
diff --git a/components/systools/source/design/images/tstversioninfo.png b/components/systools/images/tstversioninfo.png
similarity index 100%
rename from components/systools/source/design/images/tstversioninfo.png
rename to components/systools/images/tstversioninfo.png
diff --git a/components/systools/source/design/images/tstwmdatacopy.png b/components/systools/images/tstwmdatacopy.png
similarity index 100%
rename from components/systools/source/design/images/tstwmdatacopy.png
rename to components/systools/images/tstwmdatacopy.png
diff --git a/components/systools/laz_systools.lpk b/components/systools/laz_systools.lpk
index c78b4496b..1f794b28e 100644
--- a/components/systools/laz_systools.lpk
+++ b/components/systools/laz_systools.lpk
@@ -8,9 +8,9 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="source\include;source\run"/>
-        <OtherUnitFiles Value="source\run"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\run"/>
+        <IncludeFiles Value="source\include;source\general\run"/>
+        <OtherUnitFiles Value="source\general\run"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\general\run"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Lazarus port of TurboPower SysTools (Delphi version at https://sourceforge.net/projects/tpsystools/) - runtime package
@@ -20,23 +20,23 @@ SysTools is a library of utility routines and classes which  includes 1-D and 2-
     <Version Major="4" Release="4"/>
     <Files Count="60">
       <Item1>
-        <Filename Value="source\run\stbarc.pas"/>
+        <Filename Value="source\general\run\stbarc.pas"/>
         <UnitName Value="StBarC"/>
       </Item1>
       <Item2>
-        <Filename Value="source\run\stbase.pas"/>
+        <Filename Value="source\general\run\stbase.pas"/>
         <UnitName Value="StBase"/>
       </Item2>
       <Item3>
-        <Filename Value="source\run\stconst.pas"/>
+        <Filename Value="source\general\run\stconst.pas"/>
         <UnitName Value="StConst"/>
       </Item3>
       <Item4>
-        <Filename Value="source\run\stbarpn.pas"/>
+        <Filename Value="source\general\run\stbarpn.pas"/>
         <UnitName Value="StBarPN"/>
       </Item4>
       <Item5>
-        <Filename Value="source\run\ststrl.pas"/>
+        <Filename Value="source\general\run\ststrl.pas"/>
         <UnitName Value="StStrL"/>
       </Item5>
       <Item6>
@@ -44,219 +44,219 @@ SysTools is a library of utility routines and classes which  includes 1-D and 2-
         <Type Value="Include"/>
       </Item6>
       <Item7>
-        <Filename Value="source\run\st2dbarc.pas"/>
+        <Filename Value="source\general\run\st2dbarc.pas"/>
         <UnitName Value="St2DBarC"/>
       </Item7>
       <Item8>
-        <Filename Value="source\run\stdate.pas"/>
+        <Filename Value="source\general\run\stdate.pas"/>
         <UnitName Value="StDate"/>
       </Item8>
       <Item9>
-        <Filename Value="source\run\stutils.pas"/>
+        <Filename Value="source\general\run\stutils.pas"/>
         <UnitName Value="StUtils"/>
       </Item9>
       <Item10>
-        <Filename Value="source\run\stcrc.pas"/>
+        <Filename Value="source\general\run\stcrc.pas"/>
         <UnitName Value="StCRC"/>
       </Item10>
       <Item11>
-        <Filename Value="source\run\sthash.pas"/>
+        <Filename Value="source\general\run\sthash.pas"/>
         <UnitName Value="StHASH"/>
       </Item11>
       <Item12>
-        <Filename Value="source\run\sttohtml.pas"/>
+        <Filename Value="source\general\run\sttohtml.pas"/>
         <UnitName Value="StToHTML"/>
       </Item12>
       <Item13>
-        <Filename Value="source\run\ststrms.pas"/>
+        <Filename Value="source\general\run\ststrms.pas"/>
         <UnitName Value="StStrms"/>
       </Item13>
       <Item14>
-        <Filename Value="source\run\stdict.pas"/>
+        <Filename Value="source\general\run\stdict.pas"/>
         <UnitName Value="StDict"/>
       </Item14>
       <Item15>
-        <Filename Value="source\run\stinistm.pas"/>
+        <Filename Value="source\general\run\stinistm.pas"/>
         <UnitName Value="StIniStm"/>
       </Item15>
       <Item16>
-        <Filename Value="source\run\stdecmth.pas"/>
+        <Filename Value="source\general\run\stdecmth.pas"/>
         <UnitName Value="StDecMth"/>
       </Item16>
       <Item17>
-        <Filename Value="source\run\stexpr.pas"/>
+        <Filename Value="source\general\run\stexpr.pas"/>
         <UnitName Value="StExpr"/>
       </Item17>
       <Item18>
-        <Filename Value="source\run\stmath.pas"/>
+        <Filename Value="source\general\run\stmath.pas"/>
         <UnitName Value="StMath"/>
       </Item18>
       <Item19>
-        <Filename Value="source\run\stfin.pas"/>
+        <Filename Value="source\general\run\stfin.pas"/>
         <UnitName Value="StFIN"/>
       </Item19>
       <Item20>
-        <Filename Value="source\run\stdatest.pas"/>
+        <Filename Value="source\general\run\stdatest.pas"/>
         <UnitName Value="StDateSt"/>
       </Item20>
       <Item21>
-        <Filename Value="source\run\stmoney.pas"/>
+        <Filename Value="source\general\run\stmoney.pas"/>
         <UnitName Value="StMoney"/>
       </Item21>
       <Item22>
-        <Filename Value="source\run\strandom.pas"/>
+        <Filename Value="source\general\run\strandom.pas"/>
         <UnitName Value="StRandom"/>
       </Item22>
       <Item23>
-        <Filename Value="source\run\ststat.pas"/>
+        <Filename Value="source\general\run\ststat.pas"/>
         <UnitName Value="StStat"/>
       </Item23>
       <Item24>
-        <Filename Value="source\run\stlarr.pas"/>
+        <Filename Value="source\general\run\stlarr.pas"/>
         <UnitName Value="StLArr"/>
       </Item24>
       <Item25>
-        <Filename Value="source\run\stbcd.pas"/>
+        <Filename Value="source\general\run\stbcd.pas"/>
         <UnitName Value="StBCD"/>
       </Item25>
       <Item26>
-        <Filename Value="source\run\stregex.pas"/>
+        <Filename Value="source\general\run\stregex.pas"/>
         <UnitName Value="StRegEx"/>
       </Item26>
       <Item27>
-        <Filename Value="source\run\ststrs.pas"/>
+        <Filename Value="source\general\run\ststrs.pas"/>
         <UnitName Value="StStrS"/>
       </Item27>
       <Item28>
-        <Filename Value="source\run\stastro.pas"/>
+        <Filename Value="source\general\run\stastro.pas"/>
         <UnitName Value="StAstro"/>
       </Item28>
       <Item29>
-        <Filename Value="source\run\steclpse.pas"/>
+        <Filename Value="source\general\run\steclpse.pas"/>
         <UnitName Value="StEclpse"/>
       </Item29>
       <Item30>
-        <Filename Value="source\run\stlist.pas"/>
+        <Filename Value="source\general\run\stlist.pas"/>
         <UnitName Value="StList"/>
       </Item30>
       <Item31>
-        <Filename Value="source\run\stmerc.pas"/>
+        <Filename Value="source\general\run\stmerc.pas"/>
         <UnitName Value="StMerc"/>
       </Item31>
       <Item32>
-        <Filename Value="source\run\stastrop.pas"/>
+        <Filename Value="source\general\run\stastrop.pas"/>
         <UnitName Value="StAstroP"/>
       </Item32>
       <Item33>
-        <Filename Value="source\run\stvenus.pas"/>
+        <Filename Value="source\general\run\stvenus.pas"/>
         <UnitName Value="StVenus"/>
       </Item33>
       <Item34>
-        <Filename Value="source\run\stmars.pas"/>
+        <Filename Value="source\general\run\stmars.pas"/>
         <UnitName Value="StMars"/>
       </Item34>
       <Item35>
-        <Filename Value="source\run\stjup.pas"/>
+        <Filename Value="source\general\run\stjup.pas"/>
         <UnitName Value="StJup"/>
       </Item35>
       <Item36>
-        <Filename Value="source\run\stsaturn.pas"/>
+        <Filename Value="source\general\run\stsaturn.pas"/>
         <UnitName Value="StSaturn"/>
       </Item36>
       <Item37>
-        <Filename Value="source\run\sturanus.pas"/>
+        <Filename Value="source\general\run\sturanus.pas"/>
         <UnitName Value="StUranus"/>
       </Item37>
       <Item38>
-        <Filename Value="source\run\stneptun.pas"/>
+        <Filename Value="source\general\run\stneptun.pas"/>
         <UnitName Value="StNeptun"/>
       </Item38>
       <Item39>
-        <Filename Value="source\run\stpluto.pas"/>
+        <Filename Value="source\general\run\stpluto.pas"/>
         <UnitName Value="StPluto"/>
       </Item39>
       <Item40>
-        <Filename Value="source\run\stjupsat.pas"/>
+        <Filename Value="source\general\run\stjupsat.pas"/>
         <UnitName Value="StJupsat"/>
       </Item40>
       <Item41>
-        <Filename Value="source\run\stbits.pas"/>
+        <Filename Value="source\general\run\stbits.pas"/>
         <UnitName Value="StBits"/>
       </Item41>
       <Item42>
-        <Filename Value="source\run\stcoll.pas"/>
+        <Filename Value="source\general\run\stcoll.pas"/>
         <UnitName Value="StColl"/>
       </Item42>
       <Item43>
-        <Filename Value="source\run\stdque.pas"/>
+        <Filename Value="source\general\run\stdque.pas"/>
         <UnitName Value="StDQue"/>
       </Item43>
       <Item44>
-        <Filename Value="source\run\stvarr.pas"/>
+        <Filename Value="source\general\run\stvarr.pas"/>
         <UnitName Value="StVArr"/>
       </Item44>
       <Item45>
-        <Filename Value="source\run\stpqueue.pas"/>
+        <Filename Value="source\general\run\stpqueue.pas"/>
         <UnitName Value="StPQueue"/>
       </Item45>
       <Item46>
-        <Filename Value="source\run\sttree.pas"/>
+        <Filename Value="source\general\run\sttree.pas"/>
         <UnitName Value="StTree"/>
       </Item46>
       <Item47>
-        <Filename Value="source\run\stnvcont.pas"/>
+        <Filename Value="source\general\run\stnvcont.pas"/>
         <UnitName Value="StNVCont"/>
       </Item47>
       <Item48>
-        <Filename Value="source\run\stnvtree.pas"/>
+        <Filename Value="source\general\run\stnvtree.pas"/>
         <UnitName Value="StNVTree"/>
       </Item48>
       <Item49>
-        <Filename Value="source\run\stnvbits.pas"/>
+        <Filename Value="source\general\run\stnvbits.pas"/>
         <UnitName Value="StNVBits"/>
       </Item49>
       <Item50>
-        <Filename Value="source\run\stnvcoll.pas"/>
+        <Filename Value="source\general\run\stnvcoll.pas"/>
         <UnitName Value="StNVColl"/>
       </Item50>
       <Item51>
-        <Filename Value="source\run\stnvdict.pas"/>
+        <Filename Value="source\general\run\stnvdict.pas"/>
         <UnitName Value="StNVDict"/>
       </Item51>
       <Item52>
-        <Filename Value="source\run\stnvdq.pas"/>
+        <Filename Value="source\general\run\stnvdq.pas"/>
         <UnitName Value="StNVDQ"/>
       </Item52>
       <Item53>
-        <Filename Value="source\run\stnvlary.pas"/>
+        <Filename Value="source\general\run\stnvlary.pas"/>
         <UnitName Value="StNVLAry"/>
       </Item53>
       <Item54>
-        <Filename Value="source\run\stnvlist.pas"/>
+        <Filename Value="source\general\run\stnvlist.pas"/>
         <UnitName Value="StNVList"/>
       </Item54>
       <Item55>
-        <Filename Value="source\run\stnvlmat.pas"/>
+        <Filename Value="source\general\run\stnvlmat.pas"/>
         <UnitName Value="StNVLMat"/>
       </Item55>
       <Item56>
-        <Filename Value="source\run\stnvscol.pas"/>
+        <Filename Value="source\general\run\stnvscol.pas"/>
         <UnitName Value="StNVSCol"/>
       </Item56>
       <Item57>
-        <Filename Value="source\run\stptrns.pas"/>
+        <Filename Value="source\general\run\stptrns.pas"/>
         <UnitName Value="StPtrns"/>
       </Item57>
       <Item58>
-        <Filename Value="source\run\stmerge.pas"/>
+        <Filename Value="source\general\run\stmerge.pas"/>
         <UnitName Value="StMerge"/>
       </Item58>
       <Item59>
-        <Filename Value="source\run\sttxtdat.pas"/>
+        <Filename Value="source\general\run\sttxtdat.pas"/>
         <UnitName Value="StTxtDat"/>
       </Item59>
       <Item60>
-        <Filename Value="source\run\sttext.pas"/>
+        <Filename Value="source\general\run\sttext.pas"/>
         <UnitName Value="StText"/>
       </Item60>
     </Files>
diff --git a/components/systools/laz_systools_design.lpk b/components/systools/laz_systools_design.lpk
index 3634a45dc..74ad24e64 100644
--- a/components/systools/laz_systools_design.lpk
+++ b/components/systools/laz_systools_design.lpk
@@ -10,8 +10,8 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="source\include"/>
-        <OtherUnitFiles Value="source\design"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\design"/>
+        <OtherUnitFiles Value="source\general\design"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\general\design"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Lazarus port of TurboPower SysTools (Delphi version at https://sourceforge.net/projects/tpsystools/) - designtime package.
@@ -21,11 +21,11 @@ SysTools is a library of utility routines and classes which  includes 1-D and 2-
     <Version Major="4" Release="4"/>
     <Files Count="2">
       <Item1>
-        <Filename Value="source\design\stproped.pas"/>
+        <Filename Value="source\general\design\stproped.pas"/>
         <UnitName Value="StPropEd"/>
       </Item1>
       <Item2>
-        <Filename Value="source\design\streg.pas"/>
+        <Filename Value="source\general\design\streg.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="StReg"/>
       </Item2>
diff --git a/components/systools/laz_systoolsdb.lpk b/components/systools/laz_systoolsdb.lpk
index 7c8cf883f..e574539a9 100644
--- a/components/systools/laz_systoolsdb.lpk
+++ b/components/systools/laz_systoolsdb.lpk
@@ -8,9 +8,9 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="source\include;source\db"/>
-        <OtherUnitFiles Value="source\db"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\run\db"/>
+        <IncludeFiles Value="source\include;source\db\run"/>
+        <OtherUnitFiles Value="source\db\run"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\db\run"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Lazarus port of Turbo Power SysTools database components - runtime package
@@ -19,15 +19,15 @@ The package systoolsdb contains data-aware barcode components."/>
     <Version Major="4" Release="4"/>
     <Files Count="3">
       <Item1>
-        <Filename Value="source\db\stdb2dbc.pas"/>
+        <Filename Value="source\db\run\stdb2dbc.pas"/>
         <UnitName Value="StDb2DBC"/>
       </Item1>
       <Item2>
-        <Filename Value="source\db\stdbbarc.pas"/>
+        <Filename Value="source\db\run\stdbbarc.pas"/>
         <UnitName Value="StDbBarC"/>
       </Item2>
       <Item3>
-        <Filename Value="source\db\stdbpnbc.pas"/>
+        <Filename Value="source\db\run\stdbpnbc.pas"/>
         <UnitName Value="StDbPNBC"/>
       </Item3>
     </Files>
diff --git a/components/systools/laz_systoolsdb_design.lpk b/components/systools/laz_systoolsdb_design.lpk
index 39e3f5322..3caaa3e53 100644
--- a/components/systools/laz_systoolsdb_design.lpk
+++ b/components/systools/laz_systoolsdb_design.lpk
@@ -10,8 +10,8 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="source\include"/>
-        <OtherUnitFiles Value="source\design"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\design\db"/>
+        <OtherUnitFiles Value="source\db\design"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\db\design"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Lazarus port of TurboPower SysTools database components - designtime package
@@ -20,7 +20,7 @@ The package systoolsdb contains data-aware barcode components."/>
     <Version Major="4" Release="4"/>
     <Files Count="1">
       <Item1>
-        <Filename Value="source\design\stregdb.pas"/>
+        <Filename Value="source\db\design\stregdb.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="StRegDb"/>
       </Item1>
@@ -31,6 +31,7 @@ The package systoolsdb contains data-aware barcode components."/>
       </Item1>
       <Item2>
         <PackageName Value="laz_systoolsdb"/>
+        <MaxVersion Major="4" Release="4"/>
       </Item2>
       <Item3>
         <PackageName Value="FCL"/>
diff --git a/components/systools/laz_systoolswin.lpk b/components/systools/laz_systoolswin.lpk
index 7d00ebe19..4977269e4 100644
--- a/components/systools/laz_systoolswin.lpk
+++ b/components/systools/laz_systoolswin.lpk
@@ -10,7 +10,7 @@
       <SearchPaths>
         <IncludeFiles Value="source\include"/>
         <OtherUnitFiles Value="source\windows_only\run"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\run\win"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\win\run"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Lazarus port of TurboPower SysTools, Windows-only units - runtime package
diff --git a/components/systools/laz_systoolswin_design.lpk b/components/systools/laz_systoolswin_design.lpk
index dba161be4..16e8f6fc6 100644
--- a/components/systools/laz_systoolswin_design.lpk
+++ b/components/systools/laz_systoolswin_design.lpk
@@ -11,7 +11,7 @@
       <SearchPaths>
         <IncludeFiles Value="source\include"/>
         <OtherUnitFiles Value="source\windows_only\design"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\design\win"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\win\design"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Lazarus port of TurboPower SysTools: Windows-only units, designtime-package
diff --git a/components/systools/source/design/stregdb.pas b/components/systools/source/db/design/stregdb.pas
similarity index 100%
rename from components/systools/source/design/stregdb.pas
rename to components/systools/source/db/design/stregdb.pas
diff --git a/components/systools/source/design/stregdb.res b/components/systools/source/db/design/stregdb.res
similarity index 100%
rename from components/systools/source/design/stregdb.res
rename to components/systools/source/db/design/stregdb.res
diff --git a/components/systools/source/db/run/stdb2dbc.pas b/components/systools/source/db/run/stdb2dbc.pas
new file mode 100644
index 000000000..7fbd25688
--- /dev/null
+++ b/components/systools/source/db/run/stdb2dbc.pas
@@ -0,0 +1,358 @@
+(* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is TurboPower SysTools
+ *
+ * The Initial Developer of the Original Code is
+ * TurboPower Software
+ *
+ * Portions created by the Initial Developer are Copyright (C) 1996-2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+{*********************************************************}
+{* SysTools: StDb2DBC.pas 4.04                           *}
+{*********************************************************}
+{* SysTools: Data-aware Two-Dimensional Barcodes         *}
+{*********************************************************}
+
+{$IFDEF FPC}
+ {$mode DELPHI}
+{$ENDIF}
+
+//{$I StDefine.inc}
+
+unit StDb2DBC;
+
+interface
+
+uses
+ {$IFDEF FPC}
+  LCLIntf, LCLType, LMessages,
+ {$ELSE}
+  Windows, Messages,
+ {$ENDIF}
+  SysUtils,
+  Classes,
+  St2DBarC,
+  Db,
+  DbCtrls;
+
+type
+
+  TStDbPDF417Barcode = class(TStPDF417Barcode)
+    protected {private}
+      {.Z+}
+      FCaptionDataLink : TFieldDataLink;
+      FCodeDataLink    : TFieldDataLink;
+
+      procedure CaptionDataChange(Sender : TObject);
+      procedure CodeDataChange(Sender : TObject);
+      function GetCaptionDataField : string;
+      function GetCodeDataField : string;
+      function GetDataSource : TDataSource;
+      procedure SetCaptionDataField(const Value : string);
+      procedure SetCodeDataField(const Value : string);
+      procedure SetDataSource(Value : TDataSource);
+
+    public
+      constructor Create(AOwner : TComponent); override;
+      destructor Destroy;
+        override;
+      {.Z+}
+    published
+      property Code stored False;
+      property Caption stored False;
+
+      property CaptionDataField : string
+               read GetCaptionDataField write SetCaptionDataField;
+      property CodeDataField : string
+               read GetCodeDataField write SetCodeDataField;
+
+      property DataSource : TDataSource read GetDataSource write SetDataSource;
+  end;
+
+  TStDbMaxiCodeBarcode = class(TStMaxiCodeBarcode)
+    protected {private}
+      {.Z+}
+      FCaptionDataLink      : TFieldDataLink;
+      FCodeDataLink         : TFieldDataLink;
+      FCountryCodeDataLink  : TFieldDataLink;
+      FPostalCodeDataLink   : TFieldDataLink;
+      FServiceClassDataLink : TFieldDataLink;
+
+      procedure CaptionDataChange (Sender : TObject);
+      procedure CodeDataChange (Sender : TObject);
+      procedure CountryCodeChange (Sender : TObject);
+
+      function GetCaptionDataField : string;
+      function GetCodeDataField : string;
+      function GetCountryCodeDataField : string;
+      function GetDataSource : TDataSource;
+      function GetPostalCodeDataField : string;
+      function GetServiceClassDataField : string;
+
+      procedure PostalCodeChange (Sender : TObject);
+      procedure ServiceClassChange (Sender : TObject);
+
+      procedure SetCaptionDataField (const Value : string);
+      procedure SetCodeDataField (const Value : string);
+      procedure SetCountryCodeDataField (const Value : string);
+      procedure SetDataSource (Value : TDataSource);
+      procedure SetPostalCodeDataField (const Value : string);
+      procedure SetServiceClassDataField (const Value : string);
+
+    public
+      constructor Create(AOwner : TComponent); override;
+      destructor Destroy;
+        override;
+      {.Z+}
+    published
+      property Code stored False;
+      property Caption stored False;
+
+      property CaptionDataField : string
+               read GetCaptionDataField write SetCaptionDataField;
+      property CarrierCountryCodeDataField : string
+               read GetCountryCodeDataField write SetCountryCodeDataField;
+      property CarrierPostalCodeDataField : string
+               read GetPostalCodeDataField write SetPostalCodeDataField;
+      property CarrierServiceClassDataField : string
+               read GetServiceClassDataField write SetServiceClassDataField;
+      property CodeDataField : string
+               read GetCodeDataField write SetCodeDataField;
+
+      property DataSource : TDataSource read GetDataSource write SetDataSource;
+  end;
+
+implementation
+
+{ TStDbPDF417Barcode }
+
+constructor TStDbPDF417Barcode.Create(AOwner : TComponent);
+begin
+  inherited Create(AOwner);
+
+  FCaptionDataLink := TFieldDataLink.Create;
+  FCaptionDataLink.OnDataChange := CaptionDataChange;
+  FCodeDataLink := TFieldDataLink.Create;
+  FCodeDataLink.OnDataChange := CodeDataChange;
+end;
+
+destructor TStDbPDF417Barcode.Destroy;
+begin
+  FCaptionDataLink.OnDataChange := nil;
+  FCaptionDataLink.Free;
+  FCaptionDataLink := nil;
+  FCodeDataLink.OnDataChange := nil;
+  FCodeDataLink.Free;
+  FCodeDataLink := nil;
+
+  inherited Destroy;
+end;
+
+procedure TStDbPDF417Barcode.CaptionDataChange(Sender : TObject);
+begin
+  if FCaptionDataLink.Field = nil then
+    Caption := '12345678922'
+  else
+    Caption := FCaptionDataLink.Field.DisplayText;
+end;
+
+procedure TStDbPDF417Barcode.CodeDataChange(Sender : TObject);
+begin
+  if FCodeDataLink.Field = nil then
+    Code := '12345678922'
+  else
+    Code := FCodeDataLink.Field.DisplayText;
+end;
+
+
+function TStDbPDF417Barcode.GetCaptionDataField : string;
+begin
+  Result := FCaptionDataLink.FieldName;
+end;
+
+function TStDbPDF417Barcode.GetCodeDataField : string;
+begin
+  Result := FCodeDataLink.FieldName;
+end;
+
+function TStDbPDF417Barcode.GetDataSource : TDataSource;
+begin
+  Result := FCaptionDataLink.DataSource
+end;
+
+procedure TStDbPDF417Barcode.SetCaptionDataField(const Value : string);
+begin
+  FCaptionDataLink.FieldName := Value;
+end;
+
+procedure TStDbPDF417Barcode.SetCodeDataField(const Value : string);
+begin
+  FCodeDataLink.FieldName := Value;
+end;
+
+procedure TStDbPDF417Barcode.SetDataSource(Value : TDataSource);
+begin
+  FCaptionDataLink.DataSource := Value;
+  FCodeDataLink.DataSource := Value;
+end;
+
+{ TStDbMaxiCodeBarcode }
+
+constructor TStDbMaxiCodeBarcode.Create(AOwner : TComponent);
+begin
+  inherited Create(AOwner);
+
+  FCaptionDataLink := TFieldDataLink.Create;
+  FCaptionDataLink.OnDataChange := CaptionDataChange;
+  FCodeDataLink := TFieldDataLink.Create;
+  FCodeDataLink.OnDataChange := CodeDataChange;
+  FCountryCodeDataLink := TFieldDataLink.Create;
+  FCountryCodeDataLink.OnDataChange := CountryCodeChange;
+  FPostalCodeDataLink := TFieldDataLink.Create;
+  FPostalCodeDataLink.OnDataChange := PostalCodeChange;
+  FServiceClassDataLink := TFieldDataLink.Create;
+  FServiceClassDataLink.OnDataChange := ServiceClassChange; 
+end;
+
+destructor TStDbMaxiCodeBarcode.Destroy;
+begin
+  FCaptionDataLink.OnDataChange := nil;
+  FCaptionDataLink.Free;
+  FCaptionDataLink := nil;
+  FCodeDataLink.OnDataChange := nil;
+  FCodeDataLink.Free;
+  FCodeDataLink := nil;
+  FCountryCodeDataLink.OnDataChange := nil;
+  FCountryCodeDataLink.Free;
+  FCountryCodeDataLink := nil;
+  FPostalCodeDataLink.OnDataChange := nil;
+  FPostalCodeDataLink.Free;
+  FPostalCodeDataLink := nil;
+  FServiceClassDataLink.OnDataChange := nil;
+  FServiceClassDataLink.Free;
+  FServiceClassDataLink := nil;
+
+  inherited Destroy;
+end;
+
+procedure TStDbMaxiCodeBarcode.CaptionDataChange(Sender : TObject);
+begin
+  if FCaptionDataLink.Field = nil then
+    Caption := '12345678922'
+  else
+    Caption := FCaptionDataLink.Field.DisplayText;
+end;
+
+procedure TStDbMaxiCodeBarcode.CodeDataChange(Sender : TObject);
+begin
+  if FCodeDataLink.Field = nil then
+    Code := '12345678922'
+  else
+    Code := FCodeDataLink.Field.DisplayText;
+end;
+
+procedure TStDbMaxiCodeBarcode.CountryCodeChange (Sender : TObject);
+begin
+  if FCountryCodeDataLink.Field = nil then
+    CarrierCountryCode := 0
+  else
+    CarrierCountryCode := FCountryCodeDataLink.Field.AsInteger;
+end;
+
+function TStDbMaxiCodeBarcode.GetCaptionDataField : string;
+begin
+  Result := FCaptionDataLink.FieldName;
+end;
+
+function TStDbMaxiCodeBarcode.GetCodeDataField : string;
+begin
+  Result := FCodeDataLink.FieldName;
+end;
+
+function TStDbMaxiCodeBarcode.GetCountryCodeDataField : string;
+begin
+  Result := FCountryCodeDataLink.FieldName;
+end;
+
+function TStDbMaxiCodeBarcode.GetDataSource : TDataSource;
+begin
+  Result := FCaptionDataLink.DataSource
+end;
+
+function TStDbMaxiCodeBarcode.GetPostalCodeDataField : string;
+begin
+  Result := FPostalCodeDataLink.FieldName;
+end;
+
+function TStDbMaxiCodeBarcode.GetServiceClassDataField : string;
+begin
+  Result := FServiceClassDataLink.FieldName;
+end;
+
+procedure TStDbMaxiCodeBarcode.PostalCodeChange (Sender : TObject);
+begin
+  if FPostalCodeDataLink.Field = nil then
+    CarrierPostalCode := '000'
+  else
+    CarrierPostalCode := FPostalCodeDataLink.Field.DisplayText;
+end;
+
+procedure TStDbMaxiCodeBarcode.ServiceClassChange (Sender : TObject);
+begin
+  if FServiceClassDataLink.Field = nil then
+    CarrierServiceClass := 0
+  else
+    CarrierServiceClass := FServiceClassDataLink.Field.AsInteger;
+end;
+
+procedure TStDbMaxiCodeBarcode.SetCaptionDataField(const Value : string);
+begin
+  FCaptionDataLink.FieldName := Value;
+end;
+
+procedure TStDbMaxiCodeBarcode.SetCodeDataField(const Value : string);
+begin
+  FCodeDataLink.FieldName := Value;
+end;
+
+procedure TStDbMaxiCodeBarcode.SetCountryCodeDataField (const Value : string);
+begin
+  FCountryCodeDataLink.FieldName := Value;
+end;
+
+procedure TStDbMaxiCodeBarcode.SetDataSource(Value : TDataSource);
+begin
+  FCaptionDataLink.DataSource := Value;
+  FCodeDataLink.DataSource := Value;
+  FCountryCodeDataLink.DataSource := Value;
+  FPostalCodeDataLink.DataSource := Value;
+  FServiceClassDataLink.DataSource := Value;
+end;
+
+procedure TStDbMaxiCodeBarcode.SetPostalCodeDataField (const Value : string);
+begin
+  FPostalCodeDataLink.FieldName := Value;
+end;
+
+procedure TStDbMaxiCodeBarcode.SetServiceClassDataField (const Value : string);
+begin
+  FServiceClassDataLink.FieldName := Value;
+end;
+
+end.
diff --git a/components/systools/source/db/run/stdbbarc.pas b/components/systools/source/db/run/stdbbarc.pas
new file mode 100644
index 000000000..186b9aa30
--- /dev/null
+++ b/components/systools/source/db/run/stdbbarc.pas
@@ -0,0 +1,136 @@
+(* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is TurboPower SysTools
+ *
+ * The Initial Developer of the Original Code is
+ * TurboPower Software
+ *
+ * Portions created by the Initial Developer are Copyright (C) 1996-2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+{*********************************************************}
+{* SysTools: StDbBarC.pas 4.04                           *}
+{*********************************************************}
+{* SysTools: data aware bar code components              *}
+{*********************************************************}
+
+{$IFDEF FPC}
+  {$mode DELPHI}
+{$ENDIF}
+
+//{$I StDefine.inc}
+
+unit StDbBarC;
+
+interface
+
+uses
+ {$IFDEF FPC}
+  LCLIntf, LCLType, LMessages,
+ {$ELSE}
+  Windows, Messages, DbTables,
+ {$ENDIF}
+  Classes, //ClipBrd,
+  Controls, Graphics, SysUtils,
+  Db, DbCtrls,
+  StConst, StBarC;
+
+type
+  TStDbBarCode = class(TStBarCode)
+  protected {private}
+    {.Z+}
+    FDataLink : TFieldDataLink;
+
+    procedure DataChange(Sender : TObject);
+    function GetDataField : string;
+    function GetDataSource : TDataSource;
+    procedure SetDataField(const Value : string);
+    procedure SetDataSource(Value : TDataSource);
+
+  public
+    constructor Create(AOwner : TComponent);
+      override;
+    destructor Destroy;
+      override;
+    {.Z+}
+  published
+    property Code
+      stored False;
+
+    property DataField : string
+      read GetDataField
+      write SetDataField;
+
+    property DataSource : TDataSource
+      read GetDataSource
+      write SetDataSource;
+  end;
+
+
+implementation
+
+
+{*** TStDbBarCode ***}
+
+constructor TStDbBarCode.Create(AOwner : TComponent);
+begin
+  inherited Create(AOwner);
+
+  FDataLink := TFieldDataLink.Create;
+  FDataLink.OnDataChange := DataChange;
+end;
+
+procedure TStDbBarCode.DataChange(Sender : TObject);
+begin
+  if FDataLink.Field = nil then
+    Code := '12345678922'
+  else
+    Code := FDataLink.Field.DisplayText;
+end;
+
+destructor TStDbBarCode.Destroy;
+begin
+  FDataLink.OnDataChange := nil;
+  FDataLink.Free;
+  FDataLink := nil;
+
+  inherited Destroy;
+end;
+
+function TStDbBarCode.GetDataField : string;
+begin
+  Result := FDataLink.FieldName;
+end;
+
+function TStDbBarCode.GetDataSource : TDataSource;
+begin
+  Result := FDataLink.DataSource
+end;
+
+procedure TStDbBarCode.SetDataField(const Value : string);
+begin
+  FDataLink.FieldName := Value;
+end;
+
+procedure TStDbBarCode.SetDataSource(Value : TDataSource);
+begin
+  FDataLink.DataSource := Value;
+end;
+
+
+end.
diff --git a/components/systools/source/db/run/stdbpnbc.pas b/components/systools/source/db/run/stdbpnbc.pas
new file mode 100644
index 000000000..b2de9ea2c
--- /dev/null
+++ b/components/systools/source/db/run/stdbpnbc.pas
@@ -0,0 +1,133 @@
+(* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is TurboPower SysTools
+ *
+ * The Initial Developer of the Original Code is
+ * TurboPower Software
+ *
+ * Portions created by the Initial Developer are Copyright (C) 1996-2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK ***** *)
+
+{*********************************************************}
+{* SysTools: StDbPNBC.pas 4.04                           *}
+{*********************************************************}
+{* SysTools: data aware PostNet Bar Code component       *}
+{*********************************************************}
+
+{$IFDEF FPC}
+ {$mode DELPHI}
+{$ENDIF}
+//{$I STDEFINE.INC}
+
+unit StDbPNBC;
+
+interface
+
+uses
+  {$IFDEF FPC}
+  LCLIntf, LCLType, LMessages,
+  {$ELSE}
+  Windows, Messages, DBTables,
+  {$ENDIF}
+  Classes, ClipBrd, Controls, Graphics, SysUtils,
+  Db, DbCtrls,
+  StConst, StBarPN;
+
+type
+  TStDbPNBarCode = class(TStPNBarCode)
+  protected {private}
+    {.Z+}
+    FDataLink : TFieldDataLink;
+
+    procedure DataChange(Sender : TObject);
+    function GetDataField : string;
+    function GetDataSource : TDataSource;
+    procedure SetDataField(const Value : string);
+    procedure SetDataSource(Value : TDataSource);
+
+  public
+    constructor Create(AOwner : TComponent);
+      override;
+    destructor Destroy;
+      override;
+    {.Z+}
+  published
+    property PostalCode
+      stored False;
+
+    property DataField : string
+      read GetDataField
+      write SetDataField;
+
+    property DataSource : TDataSource
+      read GetDataSource
+      write SetDataSource;
+  end;
+
+
+implementation
+
+{*** TStDbPNBarCode ***}
+
+constructor TStDbPNBarCode.Create(AOwner : TComponent);
+begin
+  inherited Create(AOwner);
+
+  FDataLink := TFieldDataLink.Create;
+  FDataLink.OnDataChange := DataChange;
+end;
+
+procedure TStDbPNBarCode.DataChange(Sender : TObject);
+begin
+  if FDataLink.Field = nil then
+    PostalCode := '12345'
+  else
+    PostalCode := FDataLink.Field.DisplayText;
+end;
+
+destructor TStDbPNBarCode.Destroy;
+begin
+  FDataLink.OnDataChange := nil;
+  FDataLink.Free;
+  FDataLink := nil;
+
+  inherited Destroy;
+end;
+
+function TStDbPNBarCode.GetDataField : string;
+begin
+  Result := FDataLink.FieldName;
+end;
+
+function TStDbPNBarCode.GetDataSource : TDataSource;
+begin
+  Result := FDataLink.DataSource
+end;
+
+procedure TStDbPNBarCode.SetDataField(const Value : string);
+begin
+  FDataLink.FieldName := Value;
+end;
+
+procedure TStDbPNBarCode.SetDataSource(Value : TDataSource);
+begin
+  FDataLink.DataSource := Value;
+end;
+
+
+end.
diff --git a/components/systools/source/design/images/make_res.bat b/components/systools/source/design/images/make_res.bat
deleted file mode 100644
index ecab0b6cf..000000000
--- a/components/systools/source/design/images/make_res.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-lazres ..\streg.res @img-systools.txt
-lazres ..\stregdb.res @img-systoolsdb.txt
diff --git a/components/systools/source/design/stproped.pas b/components/systools/source/general/design/stproped.pas
similarity index 100%
rename from components/systools/source/design/stproped.pas
rename to components/systools/source/general/design/stproped.pas
diff --git a/components/systools/source/design/streg.pas b/components/systools/source/general/design/streg.pas
similarity index 98%
rename from components/systools/source/design/streg.pas
rename to components/systools/source/general/design/streg.pas
index ff13876f7..62e1c8cc9 100644
--- a/components/systools/source/design/streg.pas
+++ b/components/systools/source/general/design/streg.pas
@@ -222,13 +222,13 @@ begin
 // new in SysTools 4
      TStPDF417Barcode,
      TStMaxiCodeBarcode
-     {
+(*
      TStGeneralLog,
-{.$IFNDEF BCB} {!!! problem with initialization section in BCB }
+  {.$IFNDEF BCB}     // !!! problem with initialization section in BCB
      TStExceptionLog,
-{.$ENDIF}
+  {.$ENDIF}
      TStNTEventLog
-     }
+*)
      ]);
 
   {non-visual container class components}
diff --git a/components/systools/source/design/streg.res b/components/systools/source/general/design/streg.res
similarity index 79%
rename from components/systools/source/design/streg.res
rename to components/systools/source/general/design/streg.res
index 8919d0ea1..cc9a9730b 100644
Binary files a/components/systools/source/design/streg.res and b/components/systools/source/general/design/streg.res differ
diff --git a/components/systools/source/run/st2dbarc.pas b/components/systools/source/general/run/st2dbarc.pas
similarity index 100%
rename from components/systools/source/run/st2dbarc.pas
rename to components/systools/source/general/run/st2dbarc.pas
diff --git a/components/systools/source/run/stastro.pas b/components/systools/source/general/run/stastro.pas
similarity index 100%
rename from components/systools/source/run/stastro.pas
rename to components/systools/source/general/run/stastro.pas
diff --git a/components/systools/source/run/stastrop.pas b/components/systools/source/general/run/stastrop.pas
similarity index 100%
rename from components/systools/source/run/stastrop.pas
rename to components/systools/source/general/run/stastrop.pas
diff --git a/components/systools/source/run/stbarc.pas b/components/systools/source/general/run/stbarc.pas
similarity index 100%
rename from components/systools/source/run/stbarc.pas
rename to components/systools/source/general/run/stbarc.pas
diff --git a/components/systools/source/run/stbarpn.pas b/components/systools/source/general/run/stbarpn.pas
similarity index 100%
rename from components/systools/source/run/stbarpn.pas
rename to components/systools/source/general/run/stbarpn.pas
diff --git a/components/systools/source/run/stbase.pas b/components/systools/source/general/run/stbase.pas
similarity index 100%
rename from components/systools/source/run/stbase.pas
rename to components/systools/source/general/run/stbase.pas
diff --git a/components/systools/source/run/stbcd.pas b/components/systools/source/general/run/stbcd.pas
similarity index 100%
rename from components/systools/source/run/stbcd.pas
rename to components/systools/source/general/run/stbcd.pas
diff --git a/components/systools/source/run/stbits.pas b/components/systools/source/general/run/stbits.pas
similarity index 100%
rename from components/systools/source/run/stbits.pas
rename to components/systools/source/general/run/stbits.pas
diff --git a/components/systools/source/run/stccy.dat b/components/systools/source/general/run/stccy.dat
similarity index 100%
rename from components/systools/source/run/stccy.dat
rename to components/systools/source/general/run/stccy.dat
diff --git a/components/systools/source/run/stccycnv.dat b/components/systools/source/general/run/stccycnv.dat
similarity index 100%
rename from components/systools/source/run/stccycnv.dat
rename to components/systools/source/general/run/stccycnv.dat
diff --git a/components/systools/source/run/stcoll.pas b/components/systools/source/general/run/stcoll.pas
similarity index 96%
rename from components/systools/source/run/stcoll.pas
rename to components/systools/source/general/run/stcoll.pas
index 2e12f896d..cf22c0776 100644
--- a/components/systools/source/run/stcoll.pas
+++ b/components/systools/source/general/run/stcoll.pas
@@ -254,14 +254,14 @@ function AssignData(Container : TStContainer;
 constructor TPageDescriptor.Create(AData : Pointer);
 begin
   inherited Create(AData);
-  GetMem(pdPage, LongInt(Data)*SizeOf(Pointer));
-  FillChar(pdPage^, LongInt(Data)*SizeOf(Pointer), 0);
+  GetMem(pdPage, PtrInt(Data)*SizeOf(Pointer));
+  FillChar(pdPage^, PtrInt(Data)*SizeOf(Pointer), 0);
 end;
 
 destructor TPageDescriptor.Destroy;
 begin
   if Assigned(pdPage) then
-    FreeMem(pdPage, LongInt(Data)*SizeOf(Pointer));
+    FreeMem(pdPage, PtrInt(Data)*SizeOf(Pointer));
   inherited Destroy;
 end;
 
@@ -438,7 +438,7 @@ begin
           Inc(N.pdCount, NC);
         end else begin
           {insert on a new page before this one}
-          N := TPageDescriptor(colPageList.PlaceBefore(Pointer(colPageElements), N));
+          N := TPageDescriptor(colPageList.PlaceBefore(Pointer(PtrInt(colPageElements)), N));
           N.pdCount := 1;
         end;
         N.pdStart := Index;
@@ -455,7 +455,7 @@ begin
     end;
 
     {should be inserted after all existing pages}
-    N := TPageDescriptor(colPageList.Append(Pointer(colPageElements)));
+    N := TPageDescriptor(colPageList.Append(Pointer(PtrInt(colPageElements))));
     N.pdStart := Index;
     N.pdCount := 1;
     N.pdPage^[0] := Data;
@@ -484,7 +484,7 @@ begin
       if T.pdCount >= colPageElements then begin
         {last page is full, add another}
         Start := T.pdStart+colPageElements;
-        T := TPageDescriptor(colPageList.Append(Pointer(colPageElements)));
+        T := TPageDescriptor(colPageList.Append(Pointer(PtrInt(colPageElements))));
         T.pdStart := Start;
         {T.pdCount := 0;}
       end;
@@ -500,7 +500,7 @@ begin
         Start := N.pdStart;
         if Index < Start then begin
           {element has not been set before}
-          N := TPageDescriptor(colPageList.PlaceBefore(Pointer(colPageElements), N));
+          N := TPageDescriptor(colPageList.PlaceBefore(Pointer(PtrInt(colPageElements)), N));
           N.pdStart := Index;
           N.pdCount := 1;
           N.pdPage^[0] := Data;
@@ -528,7 +528,7 @@ begin
         Start := N.pdStart;
         if (Index >= Start+N.pdCount) then begin
           {element has not been set before}
-          N := TPageDescriptor(colPageList.PlaceBefore(Pointer(colPageElements), N));
+          N := TPageDescriptor(colPageList.PlaceBefore(Pointer(PtrInt(colPageElements)), N));
           N.pdStart := Index;
           N.pdCount := 1;
           N.pdPage^[0] := Data;
@@ -545,7 +545,7 @@ begin
     end;
 
     {an element after all existing ones}
-    N := TPageDescriptor(colPageList.Append(Pointer(colPageElements)));
+    N := TPageDescriptor(colPageList.Append(Pointer(PtrInt(colPageElements))));
     colCachePage := N;
     N.pdStart := Index;
     N.pdCount := 1;
@@ -628,7 +628,7 @@ begin
   with N do
     if pdCount >= colPageElements then begin
       {page is full, add another}
-      P := TPageDescriptor(colPageList.Place(Pointer(colPageElements), N));
+      P := TPageDescriptor(colPageList.Place(Pointer(PtrInt(colPageElements)), N));
       {new page starts with element after the new one}
       P.pdStart := pdStart+PageIndex+1;
       PC := colPageElements-PageIndex;
@@ -737,7 +737,7 @@ begin
   colPageElements := PageElements;
 
   {start with one empty page}
-  colPageList.Append(Pointer(colPageElements));
+  colPageList.Append(Pointer(PtrInt(colPageElements)));
   colCachePage := TPageDescriptor(colPageList.Head);
 end;
 
@@ -807,7 +807,7 @@ begin
     if N.pdCount >= colPageElements then begin
       {last page is full, add another}
       Start := N.pdStart+colPageElements;
-      N := TPageDescriptor(colPageList.Append(Pointer(colPageElements)));
+      N := TPageDescriptor(colPageList.Append(Pointer(PtrInt(colPageElements))));
       N.pdStart := Start;
       {N.pdCount := 0;}
     end;
@@ -931,7 +931,7 @@ begin
           begin
             colPageList.Clear;
             colPageElements := PageElements;
-            colPageList.Append(Pointer(colPageElements));
+            colPageList.Append(Pointer(PtrInt(colPageElements)));
             colCachePage := TPageDescriptor(colPageList.Head);
           end;
         ReadListBegin;
@@ -1162,7 +1162,7 @@ begin
           begin
             colPageList.Clear;
             colPageElements := PageElements;
-            colPageList.Append(Pointer(colPageElements));
+            colPageList.Append(Pointer(PtrInt(colPageElements)));
             colCachePage := TPageDescriptor(colPageList.Head);
           end;
       FDuplicates := ReadBoolean;
diff --git a/components/systools/source/run/stconst.pas b/components/systools/source/general/run/stconst.pas
similarity index 100%
rename from components/systools/source/run/stconst.pas
rename to components/systools/source/general/run/stconst.pas
diff --git a/components/systools/source/run/stcrc.pas b/components/systools/source/general/run/stcrc.pas
similarity index 100%
rename from components/systools/source/run/stcrc.pas
rename to components/systools/source/general/run/stcrc.pas
diff --git a/components/systools/source/run/stdate.pas b/components/systools/source/general/run/stdate.pas
similarity index 100%
rename from components/systools/source/run/stdate.pas
rename to components/systools/source/general/run/stdate.pas
diff --git a/components/systools/source/run/stdatest.pas b/components/systools/source/general/run/stdatest.pas
similarity index 100%
rename from components/systools/source/run/stdatest.pas
rename to components/systools/source/general/run/stdatest.pas
diff --git a/components/systools/source/run/stdecmth.pas b/components/systools/source/general/run/stdecmth.pas
similarity index 100%
rename from components/systools/source/run/stdecmth.pas
rename to components/systools/source/general/run/stdecmth.pas
diff --git a/components/systools/source/run/stdict.pas b/components/systools/source/general/run/stdict.pas
similarity index 100%
rename from components/systools/source/run/stdict.pas
rename to components/systools/source/general/run/stdict.pas
diff --git a/components/systools/source/run/stdque.pas b/components/systools/source/general/run/stdque.pas
similarity index 100%
rename from components/systools/source/run/stdque.pas
rename to components/systools/source/general/run/stdque.pas
diff --git a/components/systools/source/run/steclpse.pas b/components/systools/source/general/run/steclpse.pas
similarity index 100%
rename from components/systools/source/run/steclpse.pas
rename to components/systools/source/general/run/steclpse.pas
diff --git a/components/systools/source/run/stexpr.pas b/components/systools/source/general/run/stexpr.pas
similarity index 100%
rename from components/systools/source/run/stexpr.pas
rename to components/systools/source/general/run/stexpr.pas
diff --git a/components/systools/source/run/stexpr.txt b/components/systools/source/general/run/stexpr.txt
similarity index 100%
rename from components/systools/source/run/stexpr.txt
rename to components/systools/source/general/run/stexpr.txt
diff --git a/components/systools/source/run/stfin.pas b/components/systools/source/general/run/stfin.pas
similarity index 100%
rename from components/systools/source/run/stfin.pas
rename to components/systools/source/general/run/stfin.pas
diff --git a/components/systools/source/run/sthash.pas b/components/systools/source/general/run/sthash.pas
similarity index 100%
rename from components/systools/source/run/sthash.pas
rename to components/systools/source/general/run/sthash.pas
diff --git a/components/systools/source/run/stinistm.pas b/components/systools/source/general/run/stinistm.pas
similarity index 100%
rename from components/systools/source/run/stinistm.pas
rename to components/systools/source/general/run/stinistm.pas
diff --git a/components/systools/source/run/stjup.pas b/components/systools/source/general/run/stjup.pas
similarity index 100%
rename from components/systools/source/run/stjup.pas
rename to components/systools/source/general/run/stjup.pas
diff --git a/components/systools/source/run/stjupsat.pas b/components/systools/source/general/run/stjupsat.pas
similarity index 100%
rename from components/systools/source/run/stjupsat.pas
rename to components/systools/source/general/run/stjupsat.pas
diff --git a/components/systools/source/run/stlarr.pas b/components/systools/source/general/run/stlarr.pas
similarity index 100%
rename from components/systools/source/run/stlarr.pas
rename to components/systools/source/general/run/stlarr.pas
diff --git a/components/systools/source/run/stlist.pas b/components/systools/source/general/run/stlist.pas
similarity index 100%
rename from components/systools/source/run/stlist.pas
rename to components/systools/source/general/run/stlist.pas
diff --git a/components/systools/source/run/stmars.pas b/components/systools/source/general/run/stmars.pas
similarity index 100%
rename from components/systools/source/run/stmars.pas
rename to components/systools/source/general/run/stmars.pas
diff --git a/components/systools/source/run/stmath.pas b/components/systools/source/general/run/stmath.pas
similarity index 100%
rename from components/systools/source/run/stmath.pas
rename to components/systools/source/general/run/stmath.pas
diff --git a/components/systools/source/run/stmerc.pas b/components/systools/source/general/run/stmerc.pas
similarity index 100%
rename from components/systools/source/run/stmerc.pas
rename to components/systools/source/general/run/stmerc.pas
diff --git a/components/systools/source/run/stmerge.pas b/components/systools/source/general/run/stmerge.pas
similarity index 100%
rename from components/systools/source/run/stmerge.pas
rename to components/systools/source/general/run/stmerge.pas
diff --git a/components/systools/source/run/stmoney.pas b/components/systools/source/general/run/stmoney.pas
similarity index 100%
rename from components/systools/source/run/stmoney.pas
rename to components/systools/source/general/run/stmoney.pas
diff --git a/components/systools/source/run/stneptun.pas b/components/systools/source/general/run/stneptun.pas
similarity index 100%
rename from components/systools/source/run/stneptun.pas
rename to components/systools/source/general/run/stneptun.pas
diff --git a/components/systools/source/run/stnvbits.pas b/components/systools/source/general/run/stnvbits.pas
similarity index 100%
rename from components/systools/source/run/stnvbits.pas
rename to components/systools/source/general/run/stnvbits.pas
diff --git a/components/systools/source/run/stnvcoll.pas b/components/systools/source/general/run/stnvcoll.pas
similarity index 100%
rename from components/systools/source/run/stnvcoll.pas
rename to components/systools/source/general/run/stnvcoll.pas
diff --git a/components/systools/source/run/stnvcont.pas b/components/systools/source/general/run/stnvcont.pas
similarity index 100%
rename from components/systools/source/run/stnvcont.pas
rename to components/systools/source/general/run/stnvcont.pas
diff --git a/components/systools/source/run/stnvdict.pas b/components/systools/source/general/run/stnvdict.pas
similarity index 100%
rename from components/systools/source/run/stnvdict.pas
rename to components/systools/source/general/run/stnvdict.pas
diff --git a/components/systools/source/run/stnvdq.pas b/components/systools/source/general/run/stnvdq.pas
similarity index 100%
rename from components/systools/source/run/stnvdq.pas
rename to components/systools/source/general/run/stnvdq.pas
diff --git a/components/systools/source/run/stnvlary.pas b/components/systools/source/general/run/stnvlary.pas
similarity index 100%
rename from components/systools/source/run/stnvlary.pas
rename to components/systools/source/general/run/stnvlary.pas
diff --git a/components/systools/source/run/stnvlist.pas b/components/systools/source/general/run/stnvlist.pas
similarity index 100%
rename from components/systools/source/run/stnvlist.pas
rename to components/systools/source/general/run/stnvlist.pas
diff --git a/components/systools/source/run/stnvlmat.pas b/components/systools/source/general/run/stnvlmat.pas
similarity index 100%
rename from components/systools/source/run/stnvlmat.pas
rename to components/systools/source/general/run/stnvlmat.pas
diff --git a/components/systools/source/run/stnvscol.pas b/components/systools/source/general/run/stnvscol.pas
similarity index 100%
rename from components/systools/source/run/stnvscol.pas
rename to components/systools/source/general/run/stnvscol.pas
diff --git a/components/systools/source/run/stnvtree.pas b/components/systools/source/general/run/stnvtree.pas
similarity index 100%
rename from components/systools/source/run/stnvtree.pas
rename to components/systools/source/general/run/stnvtree.pas
diff --git a/components/systools/source/run/stpluto.pas b/components/systools/source/general/run/stpluto.pas
similarity index 100%
rename from components/systools/source/run/stpluto.pas
rename to components/systools/source/general/run/stpluto.pas
diff --git a/components/systools/source/run/stpqueue.pas b/components/systools/source/general/run/stpqueue.pas
similarity index 100%
rename from components/systools/source/run/stpqueue.pas
rename to components/systools/source/general/run/stpqueue.pas
diff --git a/components/systools/source/run/stptrns.pas b/components/systools/source/general/run/stptrns.pas
similarity index 100%
rename from components/systools/source/run/stptrns.pas
rename to components/systools/source/general/run/stptrns.pas
diff --git a/components/systools/source/run/strandom.pas b/components/systools/source/general/run/strandom.pas
similarity index 100%
rename from components/systools/source/run/strandom.pas
rename to components/systools/source/general/run/strandom.pas
diff --git a/components/systools/source/run/stregex.pas b/components/systools/source/general/run/stregex.pas
similarity index 100%
rename from components/systools/source/run/stregex.pas
rename to components/systools/source/general/run/stregex.pas
diff --git a/components/systools/source/run/stsaturn.pas b/components/systools/source/general/run/stsaturn.pas
similarity index 100%
rename from components/systools/source/run/stsaturn.pas
rename to components/systools/source/general/run/stsaturn.pas
diff --git a/components/systools/source/run/ststat.pas b/components/systools/source/general/run/ststat.pas
similarity index 100%
rename from components/systools/source/run/ststat.pas
rename to components/systools/source/general/run/ststat.pas
diff --git a/components/systools/source/run/ststrl.pas b/components/systools/source/general/run/ststrl.pas
similarity index 100%
rename from components/systools/source/run/ststrl.pas
rename to components/systools/source/general/run/ststrl.pas
diff --git a/components/systools/source/run/ststrms.pas b/components/systools/source/general/run/ststrms.pas
similarity index 100%
rename from components/systools/source/run/ststrms.pas
rename to components/systools/source/general/run/ststrms.pas
diff --git a/components/systools/source/run/ststrs.pas b/components/systools/source/general/run/ststrs.pas
similarity index 100%
rename from components/systools/source/run/ststrs.pas
rename to components/systools/source/general/run/ststrs.pas
diff --git a/components/systools/source/run/sttext.pas b/components/systools/source/general/run/sttext.pas
similarity index 100%
rename from components/systools/source/run/sttext.pas
rename to components/systools/source/general/run/sttext.pas
diff --git a/components/systools/source/run/sttohtml.pas b/components/systools/source/general/run/sttohtml.pas
similarity index 100%
rename from components/systools/source/run/sttohtml.pas
rename to components/systools/source/general/run/sttohtml.pas
diff --git a/components/systools/source/run/sttree.pas b/components/systools/source/general/run/sttree.pas
similarity index 100%
rename from components/systools/source/run/sttree.pas
rename to components/systools/source/general/run/sttree.pas
diff --git a/components/systools/source/run/sttxtdat.pas b/components/systools/source/general/run/sttxtdat.pas
similarity index 100%
rename from components/systools/source/run/sttxtdat.pas
rename to components/systools/source/general/run/sttxtdat.pas
diff --git a/components/systools/source/run/sturanus.pas b/components/systools/source/general/run/sturanus.pas
similarity index 100%
rename from components/systools/source/run/sturanus.pas
rename to components/systools/source/general/run/sturanus.pas
diff --git a/components/systools/source/run/stutils.pas b/components/systools/source/general/run/stutils.pas
similarity index 100%
rename from components/systools/source/run/stutils.pas
rename to components/systools/source/general/run/stutils.pas
diff --git a/components/systools/source/run/stvarr.pas b/components/systools/source/general/run/stvarr.pas
similarity index 100%
rename from components/systools/source/run/stvarr.pas
rename to components/systools/source/general/run/stvarr.pas
diff --git a/components/systools/source/run/stvenus.pas b/components/systools/source/general/run/stvenus.pas
similarity index 100%
rename from components/systools/source/run/stvenus.pas
rename to components/systools/source/general/run/stvenus.pas
diff --git a/components/systools/source/windows_only/design/stregwin.pas b/components/systools/source/windows_only/design/stregwin.pas
index 7dfdc91d5..7a7df308b 100644
--- a/components/systools/source/windows_only/design/stregwin.pas
+++ b/components/systools/source/windows_only/design/stregwin.pas
@@ -31,7 +31,7 @@
 
 //{$I StDefine.inc}
 
-//{$R streg.r32}
+{$R stregwin.res}
 
 unit StRegWin;
 
@@ -40,7 +40,7 @@ interface
 uses
   Classes,
 {$IFDEF FPC}
-  PropEdits //, LazarusPackageIntf //, FieldsEditor,  ComponentEditors
+  PropEdits
 {$ELSE}
  {$IFDEF VERSION6}
   DesignIntf,
diff --git a/components/systools/source/windows_only/run/stgenlog.pas b/components/systools/source/windows_only/run/stgenlog.pas
index f3a3dd180..9c26add8c 100644
--- a/components/systools/source/windows_only/run/stgenlog.pas
+++ b/components/systools/source/windows_only/run/stgenlog.pas
@@ -254,7 +254,7 @@ begin
   FLogFileHeader := StLogFileHeader;
   HighLevel := StDefHighLevel;
   glHighLevelTriggered := False;
-  glTimeBase := GetTickCount;
+  glTimeBase := GetTickCount64;
 end;
 
 destructor TStGeneralLog.Destroy;
@@ -309,7 +309,7 @@ begin
     { Bail if we're not logging }
     if not Enabled then Exit;
 
-    TimeMrk := GetTickCount;
+    TimeMrk := GetTickCount64;
 
     { Determine size needed }
     SizeReq := SizeOf(TStLogRec);
@@ -495,7 +495,7 @@ begin
 
         { Copy second half }
         Move(glBuffer[0], glTempBuffer[ChunkSize], (LogRec.lrData4 - ChunkSize));
-        LogRec.lrData3 := DWORD(@glTempBuffer[0]);
+        LogRec.lrData3 := DWORD(PtrInt((@glTempBuffer[0])));
         glBufferHead := LogRec.lrData4 - ChunkSize;
       end;
     end
diff --git a/components/systools/source/windows_only/run/sttext.pas b/components/systools/source/windows_only/run/sttext.pas
deleted file mode 100644
index 394d6c92d..000000000
--- a/components/systools/source/windows_only/run/sttext.pas
+++ /dev/null
@@ -1,175 +0,0 @@
-// Upgraded to Delphi 2009: Sebastian Zierer
-
-(* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TurboPower SysTools
- *
- * The Initial Developer of the Original Code is
- * TurboPower Software
- *
- * Portions created by the Initial Developer are Copyright (C) 1996-2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * ***** END LICENSE BLOCK ***** *)
-
-{*********************************************************}
-{* SysTools: StText.pas 4.04                             *}
-{*********************************************************}
-{* SysTools: Routines for manipulating Delphi Text files *}
-{*********************************************************}
-
-{$IFDEF FPC}
-  {$mode DELPHI}
-{$ENDIF}
-
-{$I StDefine.inc}
-
-unit StText;
-
-interface
-
-uses
-  Windows,
-  SysUtils, STConst, StBase, StSystem;
-
-function TextSeek(var F : TextFile; Target : LongInt) : Boolean;
- {-Seek to the specified position in a text file opened for input}
-
-function TextFileSize(var F : TextFile) : LongInt;
-  {-Return the size of a text file}
-
-function TextPos(var F : TextFile) : LongInt;
- {-Return the current position of the logical file pointer (that is,
-   the position of the physical file pointer, adjusted to account for
-   buffering)}
-
-function TextFlush(var F : TextFile) : Boolean;
-  {-Flush the buffer(s) for a text file}
-
-implementation
-
-function TextSeek(var F : TextFile; Target : LongInt) : Boolean;
-  {-Do a Seek for a text file opened for input. Returns False in case of I/O
-    error.}
-var
-  Pos : LongInt;
-begin
-  with TTextRec(F) do begin
-    {assume failure}
-    Result := False;
-    {check for file opened for input}
-    if Mode <> fmInput then Exit;
-    Pos := FileSeek(Handle, 0, FILE_CURRENT);
-    if Pos = -1 then Exit;
-    Dec(Pos, BufEnd);
-    {see if the Target is within the buffer}
-    Pos := Target-Pos;
-    if (Pos >= 0) and (Pos < LongInt(BufEnd)) then
-      {it is--just move the buffer pointer}
-      BufPos := Pos
-    else begin
-      if FileSeek(Handle, Target, FILE_BEGIN) = -1 then Exit;
-      {tell Delphi its buffer is empty}
-      BufEnd := 0;
-      BufPos := 0;
-    end;
-  end;
-  {if we get to here we succeeded}
-  Result := True;
-end;
-
-function TextFileSize(var F : TextFile) : LongInt;
-  {-Return the size of text file F. Returns -1 in case of I/O error.}
-var
-  Old : LongInt;
-  Res : LongInt;
-begin
-  Result := -1;
-  with TTextRec(F) do begin
-    {check for open file}
-    if Mode = fmClosed then Exit;
-    {get/save current pos of the file pointer}
-    Old := FileSeek(Handle, 0, FILE_CURRENT);
-    if Old = -1 then Exit;
-    {have OS move to end-of-file}
-    Res := FileSeek(Handle, 0, FILE_END);
-    if Res = -1 then Exit;
-    {reset the old position of the file pointer}
-    if FileSeek(Handle, Old, FILE_BEGIN) = - 1 then Exit;
-  end;
-  Result := Res;
-end;
-
-function TextPos(var F : TextFile) : LongInt;
-  {-Return the current position of the logical file pointer (that is,
-    the position of the physical file pointer, adjusted to account for
-    buffering). Returns -1 in case of I/O error.}
-var
-  Position : LongInt;
-begin
-  Result := -1;
-  with TTextRec(F) do begin
-    {check for open file}
-    if Mode = fmClosed then Exit;
-    Position := FileSeek(Handle, 0, FILE_CURRENT);
-    if Position = -1 then Exit;
-  end;
-  with TTextRec(F) do
-    if Mode = fmOutput then     {writing}
-      Inc(Position, BufPos)
-    else if BufEnd <> 0 then    {reading}
-      Dec(Position, BufEnd-BufPos);
-  {return the calculated position}
-  Result := Position;
-end;
-
-function TextFlush(var F : TextFile) : Boolean;
-  {-Flush the buffer(s) for a text file. Returns False in case of I/O error.}
-var
-  Position : LongInt;
-  Code : Integer;
-begin
-  Result := False;
-  with TTextRec(F) do begin
-    {check for open file}
-    if Mode = fmClosed then Exit;
-    {see if file is opened for reading or writing}
-    if Mode = fmInput then begin
-      {get current position of the logical file pointer}
-      Position := TextPos(F);
-      {exit in case of I/O error}
-      if Position = -1 then Exit;
-      if FileSeek(Handle, Position, FILE_BEGIN) = - 1 then Exit;
-    end
-    else begin
-      {write the current contents of the buffer, if any}
-      if BufPos <> 0 then begin
-        Code := FileWrite(Handle, BufPtr^, BufPos);
-        if Code = -1 {<> 0} then Exit;
-      end;
-      {flush OS's buffers}
-      if not FlushOsBuffers(Handle) then Exit;
-    end;
-    {tell Delphi its buffer is empty}
-    BufEnd := 0;
-    BufPos := 0;
-  end;
-  {if we get to here we succeeded}
-  Result := True;
-end;
-
-
-end.
diff --git a/components/systools/source/windows_only/run/stwmdcpy.pas b/components/systools/source/windows_only/run/stwmdcpy.pas
index c7c91c253..506e115ef 100644
--- a/components/systools/source/windows_only/run/stwmdcpy.pas
+++ b/components/systools/source/windows_only/run/stwmdcpy.pas
@@ -117,9 +117,9 @@ begin
       Exit;
     if Value then begin
       PrevWndProc:= Pointer(
-        SetWindowLong(TForm(Owner).Handle, GWL_WNDPROC, LongInt(NewWndProc)))
+        SetWindowLong(TForm(Owner).Handle, GWL_WNDPROC, PtrInt(NewWndProc)))
     end else if Assigned(PrevWndProc) then begin
-      SetWindowLong(TForm(Owner).Handle, GWL_WNDPROC, LongInt(PrevWndProc));
+      SetWindowLong(TForm(Owner).Handle, GWL_WNDPROC, PtrInt(PrevWndProc));
       PrevWndProc := nil;
     end;
   end;
@@ -131,7 +131,7 @@ var
 begin
   with Msg do begin
     if (Msg = WM_COPYDATA) then begin
-      CDS := PCopyDataStruct(Pointer(lParam))^;
+      CDS := PCopyDataStruct(Pointer(PtrInt(lParam)))^;
       if (CDS.dwData = WMCOPYID) then begin
         if (Assigned(FOnDataReceived)) then
           FOnDataReceived(Self, CDS);