jcl-checkins-diff Mailing List for JEDI Code Library (Page 30)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3167
          http://jcl.svn.sourceforge.net/jcl/?rev=3167&view=rev
Author:   outchy
Date:     2010-02-03 20:00:25 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
JclHelpUtils is Windows only.

Modified Paths:
--------------
    trunk/jcl/install/HeaderTest/jcl_a2z.cpp
    trunk/jcl/install/HeaderTest/jcl_z2a.cpp
    trunk/jcl/packages/c6/JclDeveloperTools.bpk
    trunk/jcl/packages/c6/JclDeveloperTools.dpk
    trunk/jcl/packages/cs1/JclDeveloperTools.dpk
    trunk/jcl/packages/d10/JclDeveloperTools.dpk
    trunk/jcl/packages/d11/JclDeveloperTools.dpk
    trunk/jcl/packages/d11/JclDeveloperTools.dproj
    trunk/jcl/packages/d12/JclDeveloperTools.dpk
    trunk/jcl/packages/d12/JclDeveloperTools.dproj
    trunk/jcl/packages/d14/JclDeveloperTools.dpk
    trunk/jcl/packages/d14/JclDeveloperTools.dproj
    trunk/jcl/packages/d6/JclDeveloperTools.dpk
    trunk/jcl/packages/d7/JclDeveloperTools.dpk
    trunk/jcl/packages/d8/JclDeveloperTools.dpk
    trunk/jcl/packages/d9/JclDeveloperTools.dpk
    trunk/jcl/packages/fpc/JclDeveloperTools.lpk
    trunk/jcl/packages/fpc/JclDeveloperTools.pas
    trunk/jcl/packages/xml/JclDeveloperTools-R.xml
    trunk/jcl/source/common/JclIDEUtils.pas

Added Paths:
-----------
    trunk/jcl/source/windows/JclHelpUtils.pas

Removed Paths:
-------------
    trunk/jcl/source/common/JclHelpUtils.pas

Modified: trunk/jcl/install/HeaderTest/jcl_a2z.cpp
===================================================================

--- trunk/jcl/install/HeaderTest/jcl_a2z.cpp	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/install/HeaderTest/jcl_a2z.cpp	2010-02-03 20:00:25 UTC (rev 3167)
@@ -131,9 +131,9 @@
 #ifdef TEST_COMMON
 #include <JclHashSets.hpp>
 #endif TEST_COMMON
-#ifdef TEST_COMMON
+#ifdef TEST_WINDOWS
 #include <JclHelpUtils.hpp>
-#endif TEST_COMMON
+#endif TEST_WINDOWS
 #ifdef TEST_WINDOWS
 #include <JclHookExcept.hpp>
 #endif TEST_WINDOWS

Modified: trunk/jcl/install/HeaderTest/jcl_z2a.cpp
===================================================================
--- trunk/jcl/install/HeaderTest/jcl_z2a.cpp	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/install/HeaderTest/jcl_z2a.cpp	2010-02-03 20:00:25 UTC (rev 3167)
@@ -206,9 +206,9 @@
 #ifdef TEST_WINDOWS
 #include <JclHookExcept.hpp>
 #endif TEST_WINDOWS
-#ifdef TEST_COMMON
+#ifdef TEST_WINDOWS
 #include <JclHelpUtils.hpp>
-#endif TEST_COMMON
+#endif TEST_WINDOWS
 #ifdef TEST_COMMON
 #include <JclHashSets.hpp>
 #endif TEST_COMMON

Modified: trunk/jcl/packages/c6/JclDeveloperTools.bpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.bpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/c6/JclDeveloperTools.bpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -5,7 +5,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:54 UTC
 *****************************************************************************
 -->
 <PROJECT>
@@ -16,8 +16,8 @@
       ..\..\lib\c6\JclDeveloperTools.obj
       ..\..\lib\c6\JclCompilerUtils.obj
       ..\..\lib\c6\JclDevToolsResources.obj
+      ..\..\lib\c6\JclIDEUtils.obj
       ..\..\lib\c6\JclHelpUtils.obj
-      ..\..\lib\c6\JclIDEUtils.obj
       ..\..\lib\c6\MSHelpServices_TLB.obj
     "/>
     <RESFILES value="JclDeveloperTools.res"/>
@@ -73,8 +73,8 @@
       <FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclCompilerUtils.pas" FORMNAME="" UNITNAME="JclCompilerUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclDevToolsResources.pas" FORMNAME="" UNITNAME="JclDevToolsResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\source\common\JclHelpUtils.pas" FORMNAME="" UNITNAME="JclHelpUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclIDEUtils.pas" FORMNAME="" UNITNAME="JclIDEUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\source\windows\JclHelpUtils.pas" FORMNAME="" UNITNAME="JclHelpUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\windows\MSHelpServices_TLB.pas" FORMNAME="" UNITNAME="MSHelpServices_TLB" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
   </FILELIST>
   <BUILDTOOLS>

Modified: trunk/jcl/packages/c6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/c6/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -45,8 +45,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 end.

Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/cs1/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  18:57:07 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -45,7 +45,6 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' 
   ;
 

Modified: trunk/jcl/packages/d10/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d10/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d10/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -46,8 +46,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 

Modified: trunk/jcl/packages/d11/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -46,8 +46,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 

Modified: trunk/jcl/packages/d11/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dproj	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dproj	2010-02-03 20:00:25 UTC (rev 3167)
@@ -89,8 +89,8 @@
     <DCCReference Include="Jcl.dcp"/>
     <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
     <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
-    <DCCReference Include="..\..\source\common\JclHelpUtils.pas"/>
     <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
+    <DCCReference Include="..\..\source\windows\JclHelpUtils.pas"/>
     <DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas"/>
   </ItemGroup>
 </Project>

Modified: trunk/jcl/packages/d12/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -46,8 +46,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 

Modified: trunk/jcl/packages/d12/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dproj	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dproj	2010-02-03 20:00:25 UTC (rev 3167)
@@ -64,8 +64,8 @@
 			<DCCReference Include="Jcl.dcp"/>
 			<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
-			<DCCReference Include="..\..\source\common\JclHelpUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
+			<DCCReference Include="..\..\source\windows\JclHelpUtils.pas"/>
 			<DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

Modified: trunk/jcl/packages/d14/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -46,8 +46,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 

Modified: trunk/jcl/packages/d14/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dproj	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dproj	2010-02-03 20:00:25 UTC (rev 3167)
@@ -66,8 +66,8 @@
 			<DCCReference Include="Jcl.dcp"/>
 			<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
-			<DCCReference Include="..\..\source\common\JclHelpUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
+			<DCCReference Include="..\..\source\windows\JclHelpUtils.pas"/>
 			<DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

Modified: trunk/jcl/packages/d6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d6/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d6/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -45,8 +45,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 

Modified: trunk/jcl/packages/d7/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d7/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d7/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -45,8 +45,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 

Modified: trunk/jcl/packages/d8/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d8/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d8/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  18:57:06 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -45,7 +45,6 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' 
   ;
 

Modified: trunk/jcl/packages/d9/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d9/JclDeveloperTools.dpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/d9/JclDeveloperTools.dpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:55 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -45,8 +45,8 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
-  JclHelpUtils in '..\..\source\common\JclHelpUtils.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
+  JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' ,
   MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' 
   ;
 

Modified: trunk/jcl/packages/fpc/JclDeveloperTools.lpk
===================================================================
--- trunk/jcl/packages/fpc/JclDeveloperTools.lpk	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/fpc/JclDeveloperTools.lpk	2010-02-03 20:00:25 UTC (rev 3167)
@@ -49,12 +49,12 @@
         <UnitName Value="JclDevToolsResources"/>
       </Item2>
       <Item3>
-        <Filename Value="..\..\source\common\JclHelpUtils.pas"/>
-        <UnitName Value="JclHelpUtils"/>
+        <Filename Value="..\..\source\common\JclIDEUtils.pas"/>
+        <UnitName Value="JclIDEUtils"/>
       </Item3>
       <Item4>
-        <Filename Value="..\..\source\common\JclIDEUtils.pas"/>
-        <UnitName Value="JclIDEUtils"/>
+        <Filename Value="..\..\source\windows\JclHelpUtils.pas"/>
+        <UnitName Value="JclHelpUtils"/>
       </Item4>
       <Item5>
         <Filename Value="..\..\source\windows\MSHelpServices_TLB.pas"/>

Modified: trunk/jcl/packages/fpc/JclDeveloperTools.pas
===================================================================
--- trunk/jcl/packages/fpc/JclDeveloperTools.pas	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/fpc/JclDeveloperTools.pas	2010-02-03 20:00:25 UTC (rev 3167)
@@ -3,7 +3,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 03-02-2010  19:49:09 UTC
+     Last generated: 03-02-2010  19:54:54 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -14,8 +14,8 @@
 uses
   JclCompilerUtils,
   JclDevToolsResources,
+  JclIDEUtils,
   JclHelpUtils,
-  JclIDEUtils,
   MSHelpServices_TLB
   ;
 

Modified: trunk/jcl/packages/xml/JclDeveloperTools-R.xml
===================================================================
--- trunk/jcl/packages/xml/JclDeveloperTools-R.xml	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/packages/xml/JclDeveloperTools-R.xml	2010-02-03 20:00:25 UTC (rev 3167)
@@ -16,8 +16,8 @@
   <Contains>
     <File Name="..\..\source\common\JclCompilerUtils.pas" Targets="all" Formname="" Condition=""/>
     <File Name="..\..\source\common\JclDevToolsResources.pas" Targets="all" Formname="" Condition=""/>
-    <File Name="..\..\source\common\JclHelpUtils.pas" Targets="all" Formname="" Condition=""/>
     <File Name="..\..\source\common\JclIDEUtils.pas" Targets="all" Formname="" Condition=""/>
+    <File Name="..\..\source\windows\JclHelpUtils.pas" Targets="Windows" Formname="" Condition=""/>
     <File Name="..\..\source\windows\MSHelpServices_TLB.pas" Targets="Windows" Formname="" Condition=""/>
   </Contains>
 </Package>

Deleted: trunk/jcl/source/common/JclHelpUtils.pas
===================================================================
--- trunk/jcl/source/common/JclHelpUtils.pas	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/source/common/JclHelpUtils.pas	2010-02-03 20:00:25 UTC (rev 3167)
@@ -1,531 +0,0 @@
-{**************************************************************************************************}
-{                                                                                                  }
-{ Project JEDI Code Library (JCL)                                                                  }
-{                                                                                                  }
-{ 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 DelphiInstall.pas.                                                          }
-{                                                                                                  }
-{ The Initial Developer of the Original Code is Petr Vones. Portions created by Petr Vones are     }
-{ Copyright (C) of Petr Vones. All Rights Reserved.                                                }
-{                                                                                                  }
-{ Contributor(s):                                                                                  }
-{   Andreas Hausladen (ahuser)                                                                     }
-{   Florent Ouchet (outchy)                                                                        }
-{   Robert Marquardt (marquardt)                                                                   }
-{   Robert Rossmair (rrossmair) - crossplatform & BCB support                                      }
-{   Uwe Schuster (uschuster)                                                                       }
-{                                                                                                  }
-{**************************************************************************************************}
-{                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
-{ Revision:      $Rev::                                                                          $ }
-{ Author:        $Author::                                                                       $ }
-{                                                                                                  }
-{**************************************************************************************************}
-
-unit JclHelpUtils;
-
-{$I jcl.inc}
-{$I crossplatform.inc}
-
-interface
-
-uses
-  {$IFDEF UNITVERSIONING}
-  JclUnitVersioning,
-  {$ENDIF UNITVERSIONING}
-  {$IFDEF MSWINDOWS}
-  MSHelpServices_TLB,
-  {$ENDIF MSWINDOWS}
-  Classes, SysUtils,
-  JclBase, JclSysUtils;
-
-{$IFDEF MSWINDOWS}
-
-// Various definitions
-type
-  EJclHelpUtilsException = class(EJclError);
-
-type
-  TJclBorlandOpenHelp = class
-  private
-    FHelpPrefix: string;
-    FRootDirectory: string;
-    function GetContentFileName: string;
-    function GetIndexFileName: string;
-    function GetLinkFileName: string;
-    function GetGidFileName: string;
-    function GetProjectFileName: string;
-    function ReadFileName(const FormatName: string): string;
-  public
-    constructor Create(const ARootDirectory, AHelpPrefix: string);
-    function AddHelpFile(const HelpFileName, IndexName: string): Boolean;
-    function RemoveHelpFile(const HelpFileName, IndexName: string): Boolean;
-    property ContentFileName: string read GetContentFileName;
-    property GidFileName: string read GetGidFileName;
-    property HelpPrefix: string read FHelpPrefix;
-    property IndexFileName: string read GetIndexFileName;
-    property LinkFileName: string read GetLinkFileName;
-    property ProjectFileName: string read GetProjectFileName;
-    property RootDirectory: string read FRootDirectory;
-  end;
-
-  TJclHelp2Object = (hoRegisterSession, hoRegister, hoPlugin);
-  TJclHelp2Objects = set of TJclHelp2Object;
-
-  TJclHelp2Manager = class
-  private
-    FHxRegisterSession: IHxRegisterSession;
-    FHxRegister: IHxRegister;
-    FHxPlugin: IHxPlugIn;
-    FIdeNameSpace: WideString;
-    function RequireObject(HelpObjects: TJclHelp2Objects): Boolean;
-    function GetHxPlugin: IHxPlugin;
-    function GetHxRegister: IHxRegister;
-    function GetHxRegisterSession: IHxRegisterSession;
-  public
-    constructor Create(IDEVersionNumber: Integer);
-    destructor Destroy; override;
-    function CreateTransaction: Boolean;
-    function CommitTransaction: Boolean;
-    function RegisterNameSpace(const Name, Collection, Description: WideString): Boolean;
-    function UnregisterNameSpace(const Name: WideString): Boolean;
-    function RegisterHelpFile(const NameSpace, Identifier: WideString;
-      const LangId: Integer; const HxSFile, HxIFile: WideString): Boolean;
-    function UnregisterHelpFile(const NameSpace, Identifier: WideString;
-      const LangId: Integer): Boolean;
-    function PlugNameSpaceIn(const SourceNameSpace,
-      TargetNameSpace: WideString): Boolean;
-    function UnPlugNameSpace(const SourceNameSpace,
-      TargetNameSpace: WideString): Boolean;
-    function PlugNameSpaceInBorlandHelp(const NameSpace: WideString): Boolean;
-    function UnPlugNameSpaceFromBorlandHelp(const NameSpace: WideString): Boolean;
-    property HxRegisterSession: IHxRegisterSession read GetHxRegisterSession;
-    property HxRegister: IHxRegister read GetHxRegister;
-    property HxPlugin: IHxPlugin read GetHxPlugin;
-    property IdeNamespace: WideString read FIdeNameSpace;
-  end;
-
-{$ENDIF MSWINDOWS}
-
-{$IFDEF UNITVERSIONING}
-const
-  UnitVersioning: TUnitVersionInfo = (
-    RCSfile: '$URL$';
-    Revision: '$Revision$';
-    Date: '$Date$';
-    LogPath: 'JCL\source\common';
-    Extra: '';
-    Data: nil
-    );
-{$ENDIF UNITVERSIONING}
-
-implementation
-
-uses
-  {$IFDEF MSWINDOWS}
-  Windows, JclRegistry,
-  {$ENDIF MSWINDOWS}
-  {$IFDEF HAS_UNIT_LIBC}
-  Libc,
-  {$ENDIF HAS_UNIT_LIBC}
-  JclFileUtils, JclDevToolsResources;
-
-{$IFDEF MSWINDOWS}
-
-type
-  TBDSVersionInfo = record
-    Name: PResStringRec;
-    VersionStr: string;
-    Version: Integer;
-    CoreIdeVersion: string;
-    Supported: Boolean;
-  end;
-
-const
-  MSHelpSystemKeyName = '\SOFTWARE\Microsoft\Windows\Help';
-
-  HelpContentFileName        = '%s\Help\%s%d.ohc';
-  HelpIndexFileName          = '%s\Help\%s%d.ohi';
-  HelpLinkFileName           = '%s\Help\%s%d.ohl';
-  HelpProjectFileName        = '%s\Help\%s%d.ohp';
-  HelpGidFileName            = '%s\Help\%s%d.gid';
-
-//=== { TJclBorlandOpenHelp } ================================================
-
-function TJclBorlandOpenHelp.AddHelpFile(const HelpFileName, IndexName: string): Boolean;
-var
-  CntFileName, HelpName, CntName: string;
-  List: TStringList;
-
-  procedure AddToList(const FileName, Text: string);
-  var
-    I, Attr: Integer;
-    Found: Boolean;
-  begin
-    List.LoadFromFile(FileName);
-    Found := False;
-    for I := 0 to List.Count - 1 do
-      if AnsiSameText(Trim(List[I]), Text) then
-      begin
-        Found := True;
-        Break;
-      end;
-    if not Found then
-    begin
-      List.Add(Text);
-      Attr := FileGetAttr(FileName);
-      FileSetAttr(FileName, faArchive);
-      List.SaveToFile(FileName);
-      FileSetAttr(FileName, Attr);
-    end;
-  end;
-
-begin
-  CntFileName := ChangeFileExt(HelpFileName, '.cnt');
-  Result := FileExists(HelpFileName) and FileExists(CntFileName);
-  if Result then
-  begin
-    HelpName := ExtractFileName(HelpFileName);
-    CntName := ExtractFileName(CntFileName);
-    RegWriteString(HKLM, MSHelpSystemKeyName, HelpName, ExtractFilePath(HelpFileName));
-    RegWriteString(HKLM, MSHelpSystemKeyName, CntName, ExtractFilePath(CntFileName));
-    List := TStringList.Create;
-    try
-      AddToList(ContentFileName, Format(':Include %s', [CntName]));
-      AddToList(LinkFileName, Format(':Link %s', [HelpName]));
-      AddToList(IndexFileName, Format(':Index %s=%s', [IndexName, HelpName]));
-      SetFileLastWrite(ProjectFileName, Now);
-      FileDelete(GidFileName);
-    finally
-      List.Free;
-    end;
-  end;
-end;
-
-constructor TJclBorlandOpenHelp.Create(const ARootDirectory,
-  AHelpPrefix: string);
-begin
-  inherited Create;
-  FHelpPrefix := AHelpPrefix;
-  FRootDirectory := ARootDirectory;
-end;
-
-function TJclBorlandOpenHelp.GetContentFileName: string;
-begin
-  Result := ReadFileName(HelpContentFileName);
-end;
-
-function TJclBorlandOpenHelp.GetGidFileName: string;
-begin
-  Result := ReadFileName(HelpGidFileName);
-end;
-
-function TJclBorlandOpenHelp.GetIndexFileName: string;
-begin
-  Result := ReadFileName(HelpIndexFileName);
-end;
-
-function TJclBorlandOpenHelp.GetLinkFileName: string;
-begin
-  Result := ReadFileName(HelpLinkFileName);
-end;
-
-function TJclBorlandOpenHelp.GetProjectFileName: string;
-begin
-  Result := ReadFileName(HelpProjectFileName);
-end;
-
-function TJclBorlandOpenHelp.ReadFileName(const FormatName: string): string;
-begin
-  if HelpPrefix <> '' then
-    Result := Format(FormatName, [RootDirectory, HelpPrefix])
-  else
-    raise EJclHelpUtilsException.CreateRes(@RsENoOpenHelp);
-end;
-
-function TJclBorlandOpenHelp.RemoveHelpFile(const HelpFileName, IndexName: string): Boolean;
-var
-  CntFileName, HelpName, CntName: string;
-  List: TStringList;
-
-  procedure RemoveFromList(const FileName, Text: string);
-  var
-    I, Attr: Integer;
-    Found: Boolean;
-  begin
-    List.LoadFromFile(FileName);
-    Found := False;
-    for I := 0 to List.Count - 1 do
-      if AnsiSameText(Trim(List[I]), Text) then
-      begin
-        Found := True;
-        List.Delete(I);
-        Break;
-      end;
-    if Found then
-    begin
-      Attr := FileGetAttr(FileName);
-      FileSetAttr(FileName, faArchive);
-      List.SaveToFile(FileName);
-      FileSetAttr(FileName, Attr);
-    end;
-  end;
-
-begin
-  CntFileName := ChangeFileExt(HelpFileName, '.cnt');
-  Result := FileExists(HelpFileName) and FileExists(CntFileName);
-  if Result then
-  begin
-    HelpName := ExtractFileName(HelpFileName);
-    CntName := ExtractFileName(CntFileName);
-    //RegDeleteEntry(HKEY_LOCAL_MACHINE, MSHelpSystemKeyName, HelpName);
-    //RegDeleteEntry(HKEY_LOCAL_MACHINE, MSHelpSystemKeyName, CntName);
-    List := TStringList.Create;
-    try
-      RemoveFromList(ContentFileName, Format(':Include %s', [CntName]));
-      RemoveFromList(LinkFileName, Format(':Link %s', [HelpName]));
-      RemoveFromList(IndexFileName, Format(':Index %s=%s', [IndexName, HelpName]));
-      SetFileLastWrite(ProjectFileName, Now);
-      FileDelete(GidFileName);
-    finally
-      List.Free;
-    end;
-  end;
-end;
-
-//== { TJclHelp2Manager } ====================================================
-
-const
-  Help2BorlandNameSpace = 'Borland.BDS%d';
-  Help2DefaultKeyWord   = '_DEFAULT';
-
-constructor TJclHelp2Manager.Create(IDEVersionNumber: Integer);
-begin
-  inherited Create;
-  FHxRegisterSession := nil;
-  FHxRegister := nil;
-  FHxPlugin := nil;
-  if IDEVersionNumber > 0 then
-  begin
-    if (IDEVersionNumber = 7) then
-      FIdeNameSpace := 'embarcadero.rs2010'
-    else
-    if (IDEVersionNumber = 6) then
-      FIdeNameSpace := 'embarcadero.rs2009'
-    else
-      FIdeNameSpace := Format(Help2BorlandNameSpace, [IDEVersionNumber]);
-  end
-  else
-    FIdeNameSpace := '';
-end;
-
-destructor TJclHelp2Manager.Destroy;
-begin
-  FHxRegisterSession := nil;
-  FHxRegister := nil;
-  FHxPlugin := nil;
-  inherited Destroy;
-end;
-
-function TJclHelp2Manager.CommitTransaction: Boolean;
-begin
-  Result := RequireObject([hoRegisterSession]);
-  if Result then
-  begin
-    try
-      FHxRegisterSession.CommitTransaction;
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.CreateTransaction: Boolean;
-begin
-  Result := RequireObject([hoRegisterSession]);
-  if Result then
-  begin
-    try
-      FHxRegisterSession.CreateTransaction('');
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.GetHxPlugin: IHxPlugin;
-begin
-  RequireObject([hoPlugin]);
-  Result := FHxPlugin;
-end;
-
-function TJclHelp2Manager.GetHxRegister: IHxRegister;
-begin
-  RequireObject([hoRegister]);
-  Result := FHxRegister;
-end;
-
-function TJclHelp2Manager.GetHxRegisterSession: IHxRegisterSession;
-begin
-  RequireObject([hoRegisterSession]);
-  Result := FHxRegisterSession;
-end;
-
-function TJclHelp2Manager.PlugNameSpaceIn(const SourceNameSpace, TargetNameSpace: WideString): Boolean;
-var
-  Help2Default: WideString;
-begin
-  Result := RequireObject([hoPlugin]);
-  if Result then
-  begin
-    try
-      Help2Default := Help2DefaultKeyWord;
-      FHxPlugin.RegisterHelpPlugIn(TargetNameSpace, Help2Default,
-        SourceNameSpace, Help2Default, '', 0);
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.PlugNameSpaceInBorlandHelp(
-  const NameSpace: WideString): Boolean;
-begin
-  Result := (IdeNamespace <> '') and PlugNameSpaceIn(NameSpace, IdeNamespace);
-end;
-
-function TJclHelp2Manager.RegisterHelpFile(const NameSpace, Identifier: WideString;
-  const LangId: Integer; const HxSFile, HxIFile: WideString): Boolean;
-begin
-  Result := RequireObject([hoRegister]);
-  if Result then
-  begin
-    try
-      FHxRegister.RegisterHelpFileSet(NameSpace, Identifier, LangId, HxSFile,
-        HxIFile, '', '', 0, 0, 0, 0);
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.RegisterNameSpace(const Name, Collection, Description: WideString): Boolean;
-begin
-  Result := RequireObject([hoRegister]);
-  if Result then
-  begin
-    try
-      FHxRegister.RegisterNamespace(Name, Collection, Description);
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.RequireObject(HelpObjects: TJclHelp2Objects): Boolean;
-begin
-  // dependencies
-  if (hoRegister in HelpObjects) or (hoPlugin in HelpObjects) then
-    Include(HelpObjects, hoRegisterSession);
-
-  Result := True;
-
-  if (hoRegisterSession in HelpObjects) and not Assigned(FHxRegisterSession) then
-  begin
-    try
-      FHxRegisterSession := CoHxRegisterSession.Create;
-    except
-      Result := False;
-    end;
-  end;
-
-  if Result and (hoRegister in HelpObjects) and not Assigned(FHxRegister) then
-  begin
-    try
-      Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxRegister),
-        IHxRegister, FHxRegister);
-    except
-      Result := False;
-    end;
-  end;
-
-  if Result and (hoPlugin in HelpObjects) and not Assigned(FHxPlugin) then
-  begin
-    try
-      Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxPlugIn),
-        IHxPlugin, FHxPlugin);
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.UnPlugNameSpace(const SourceNameSpace, TargetNameSpace: WideString): Boolean;
-var
-  Help2Default: WideString;
-begin
-  Result := RequireObject([hoPlugin]);
-  if Result then
-  begin
-    try
-      Help2Default := Help2DefaultKeyWord;
-      FHxPlugin.RemoveHelpPlugIn(TargetNameSpace, Help2Default,
-        SourceNameSpace, Help2Default, '');
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.UnPlugNameSpaceFromBorlandHelp(const NameSpace: WideString): Boolean;
-begin
-  Result := (IdeNamespace <> '') and UnPlugNameSpace(NameSpace, IdeNamespace);
-end;
-
-function TJclHelp2Manager.UnregisterHelpFile(const NameSpace, Identifier: WideString;
-  const LangId: Integer): Boolean;
-begin
-  Result := RequireObject([hoRegister]);
-  if Result then
-  begin
-    try
-      FHxRegister.RemoveHelpFile(NameSpace, Identifier, LangId);
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-function TJclHelp2Manager.UnregisterNameSpace(const Name: WideString): Boolean;
-begin
-  Result := RequireObject([hoRegister]);
-  if Result then
-  begin
-    try
-      FHxRegister.RemoveNamespace(Name);
-    except
-      Result := False;
-    end;
-  end;
-end;
-
-{$ENDIF MSWINDOWS}
-
-{$IFDEF UNITVERSIONING}
-initialization
-  RegisterUnitVersion(HInstance, UnitVersioning);
-
-finalization
-  UnregisterUnitVersion(HInstance);
-{$ENDIF UNITVERSIONING}
-
-end.
-

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2010-02-03 19:52:44 UTC (rev 3166)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2010-02-03 20:00:25 UTC (rev 3167)
@@ -1,4 +1,4 @@
-{**************************************************************************************************}
+{**************************************************************************************************}
 {                                                                                                  }
 { Project JEDI Code Library (JCL)                                                                  }
 {                                                                                                  }
@@ -65,10 +65,10 @@
   JclUnitVersioning,
   {$ENDIF UNITVERSIONING}
   {$IFDEF MSWINDOWS}
-  Windows, ShlObj,
+  Windows, ShlObj, JclHelpUtils,
   {$ENDIF MSWINDOWS}
   Classes, SysUtils, IniFiles, Contnrs,
-  JclBase, JclSysUtils, JclCompilerUtils, JclHelpUtils;
+  JclBase, JclSysUtils, JclCompilerUtils;
 
 // Various definitions
 type

Copied: trunk/jcl/source/windows/JclHelpUtils.pas (from rev 3162, trunk/jcl/source/common/JclHelpUtils.pas)
===================================================================
--- trunk/jcl/source/windows/JclHelpUtils.pas	                        (rev 0)
+++ trunk/jcl/source/windows/JclHelpUtils.pas	2010-02-03 20:00:25 UTC (rev 3167)
@@ -0,0 +1,519 @@
+{**************************************************************************************************}
+{                                                                                                  }
+{ Project JEDI Code Library (JCL)                                                                  }
+{                                                                                                  }
+{ 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 DelphiInstall.pas.                                                          }
+{                                                                                                  }
+{ The Initial Developer of the Original Code is Petr Vones. Portions created by Petr Vones are     }
+{ Copyright (C) of Petr Vones. All Rights Reserved.                                                }
+{                                                                                                  }
+{ Contributor(s):                                                                                  }
+{   Andreas Hausladen (ahuser)                                                                     }
+{   Florent Ouchet (outchy)                                                                        }
+{   Robert Marquardt (marquardt)                                                                   }
+{   Robert Rossmair (rrossmair) - crossplatform & BCB support                                      }
+{   Uwe Schuster (uschuster)                                                                       }
+{                                                                                                  }
+{**************************************************************************************************}
+{                                                                                                  }
+{ Last modified: $Date::                                                                         $ }
+{ Revision:      $Rev::                                                                          $ }
+{ Author:        $Author::                                                                       $ }
+{                                                                                                  }
+{**************************************************************************************************}
+
+unit JclHelpUtils;
+
+{$I jcl.inc}
+{$I crossplatform.inc}
+
+interface
+
+uses
+  {$IFDEF UNITVERSIONING}
+  JclUnitVersioning,
+  {$ENDIF UNITVERSIONING}
+  MSHelpServices_TLB,
+  Classes, SysUtils,
+  JclBase, JclSysUtils;
+
+// Various definitions
+type
+  EJclHelpUtilsException = class(EJclError);
+
+type
+  TJclBorlandOpenHelp = class
+  private
+    FHelpPrefix: string;
+    FRootDirectory: string;
+    function GetContentFileName: string;
+    function GetIndexFileName: string;
+    function GetLinkFileName: string;
+    function GetGidFileName: string;
+    function GetProjectFileName: string;
+    function ReadFileName(const FormatName: string): string;
+  public
+    constructor Create(const ARootDirectory, AHelpPrefix: string);
+    function AddHelpFile(const HelpFileName, IndexName: string): Boolean;
+    function RemoveHelpFile(const HelpFileName, IndexName: string): Boolean;
+    property ContentFileName: string read GetContentFileName;
+    property GidFileName: string read GetGidFileName;
+    property HelpPrefix: string read FHelpPrefix;
+    property IndexFileName: string read GetIndexFileName;
+    property LinkFileName: string read GetLinkFileName;
+    property ProjectFileName: string read GetProjectFileName;
+    property RootDirectory: string read FRootDirectory;
+  end;
+
+  TJclHelp2Object = (hoRegisterSession, hoRegister, hoPlugin);
+  TJclHelp2Objects = set of TJclHelp2Object;
+
+  TJclHelp2Manager = class
+  private
+    FHxRegisterSession: IHxRegisterSession;
+    FHxRegister: IHxRegister;
+    FHxPlugin: IHxPlugIn;
+    FIdeNameSpace: WideString;
+    function RequireObject(HelpObjects: TJclHelp2Objects): Boolean;
+    function GetHxPlugin: IHxPlugin;
+    function GetHxRegister: IHxRegister;
+    function GetHxRegisterSession: IHxRegisterSession;
+  public
+    constructor Create(IDEVersionNumber: Integer);
+    destructor Destroy; override;
+    function CreateTransaction: Boolean;
+    function CommitTransaction: Boolean;
+    function RegisterNameSpace(const Name, Collection, Description: WideString): Boolean;
+    function UnregisterNameSpace(const Name: WideString): Boolean;
+    function RegisterHelpFile(const NameSpace, Identifier: WideString;
+      const LangId: Integer; const HxSFile, HxIFile: WideString): Boolean;
+    function UnregisterHelpFile(const NameSpace, Identifier: WideString;
+      const LangId: Integer): Boolean;
+    function PlugNameSpaceIn(const SourceNameSpace,
+      TargetNameSpace: WideString): Boolean;
+    function UnPlugNameSpace(const SourceNameSpace,
+      TargetNameSpace: WideString): Boolean;
+    function PlugNameSpaceInBorlandHelp(const NameSpace: WideString): Boolean;
+    function UnPlugNameSpaceFromBorlandHelp(const NameSpace: WideString): Boolean;
+    property HxRegisterSession: IHxRegisterSession read GetHxRegisterSession;
+    property HxRegister: IHxRegister read GetHxRegister;
+    property HxPlugin: IHxPlugin read GetHxPlugin;
+    property IdeNamespace: WideString read FIdeNameSpace;
+  end;
+
+{$IFDEF UNITVERSIONING}
+const
+  UnitVersioning: TUnitVersionInfo = (
+    RCSfile: '$URL$';
+    Revision: '$Revision$';
+    Date: '$Date$';
+    LogPath: 'JCL\source\common';
+    Extra: '';
+    Data: nil
+    );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+uses
+  Windows, JclRegistry,
+  {$IFDEF HAS_UNIT_LIBC}
+  Libc,
+  {$ENDIF HAS_UNIT_LIBC}
+  JclFileUtils, JclDevToolsResources;
+
+type
+  TBDSVersionInfo = record
+    Name: PResStringRec;
+    VersionStr: string;
+    Version: Integer;
+    CoreIdeVersion: string;
+    Supported: Boolean;
+  end;
+
+const
+  MSHelpSystemKeyName = '\SOFTWARE\Microsoft\Windows\Help';
+
+  HelpContentFileName        = '%s\Help\%s%d.ohc';
+  HelpIndexFileName          = '%s\Help\%s%d.ohi';
+  HelpLinkFileName           = '%s\Help\%s%d.ohl';
+  HelpProjectFileName        = '%s\Help\%s%d.ohp';
+  HelpGidFileName            = '%s\Help\%s%d.gid';
+
+//=== { TJclBorlandOpenHelp } ================================================
+
+function TJclBorlandOpenHelp.AddHelpFile(const HelpFileName, IndexName: string): Boolean;
+var
+  CntFileName, HelpName, CntName: string;
+  List: TStringList;
+
+  procedure AddToList(const FileName, Text: string);
+  var
+    I, Attr: Integer;
+    Found: Boolean;
+  begin
+    List.LoadFromFile(FileName);
+    Found := False;
+    for I := 0 to List.Count - 1 do
+      if AnsiSameText(Trim(List[I]), Text) then
+      begin
+        Found := True;
+        Break;
+      end;
+    if not Found then
+    begin
+      List.Add(Text);
+      Attr := FileGetAttr(FileName);
+      FileSetAttr(FileName, faArchive);
+      List.SaveToFile(FileName);
+      FileSetAttr(FileName, Attr);
+    end;
+  end;
+
+begin
+  CntFileName := ChangeFileExt(HelpFileName, '.cnt');
+  Result := FileExists(HelpFileName) and FileExists(CntFileName);
+  if Result then
+  begin
+    HelpName := ExtractFileName(HelpFileName);
+    CntName := ExtractFileName(CntFileName);
+    RegWriteString(HKLM, MSHelpSystemKeyName, HelpName, ExtractFilePath(HelpFileName));
+    RegWriteString(HKLM, MSHelpSystemKeyName, CntName, ExtractFilePath(CntFileName));
+    List := TStringList.Create;
+    try
+      AddToList(ContentFileName, Format(':Include %s', [CntName]));
+      AddToList(LinkFileName, Format(':Link %s', [HelpName]));
+      AddToList(IndexFileName, Format(':Index %s=%s', [IndexName, HelpName]));
+      SetFileLastWrite(ProjectFileName, Now);
+      FileDelete(GidFileName);
+    finally
+      List.Free;
+    end;
+  end;
+end;
+
+constructor TJclBorlandOpenHelp.Create(const ARootDirectory,
+  AHelpPrefix: string);
+begin
+  inherited Create;
+  FHelpPrefix := AHelpPrefix;
+  FRootDirectory := ARootDirectory;
+end;
+
+function TJclBorlandOpenHelp.GetContentFileName: string;
+begin
+  Result := ReadFileName(HelpContentFileName);
+end;
+
+function TJclBorlandOpenHelp.GetGidFileName: string;
+begin
+  Result := ReadFileName(HelpGidFileName);
+end;
+
+function TJclBorlandOpenHelp.GetIndexFileName: string;
+begin
+  Result := ReadFileName(HelpIndexFileName);
+end;
+
+function TJclBorlandOpenHelp.GetLinkFileName: string;
+begin
+  Result := ReadFileName(HelpLinkFileName);
+end;
+
+function TJclBorlandOpenHelp.GetProjectFileName: string;
+begin
+  Result := ReadFileName(HelpProjectFileName);
+end;
+
+function TJclBorlandOpenHelp.ReadFileName(const FormatName: string): string;
+begin
+  if HelpPrefix <> '' then
+    Result := Format(FormatName, [RootDirectory, HelpPrefix])
+  else
+    raise EJclHelpUtilsException.CreateRes(@RsENoOpenHelp);
+end;
+
+function TJclBorlandOpenHelp.RemoveHelpFile(const HelpFileName, IndexName: string): Boolean;
+var
+  CntFileName, HelpName, CntName: string;
+  List: TStringList;
+
+  procedure RemoveFromList(const FileName, Text: string);
+  var
+    I, Attr: Integer;
+    Found: Boolean;
+  begin
+    List.LoadFromFile(FileName);
+    Found := False;
+    for I := 0 to List.Count - 1 do
+      if AnsiSameText(Trim(List[I]), Text) then
+      begin
+        Found := True;
+        List.Delete(I);
+        Break;
+      end;
+    if Found then
+    begin
+      Attr := FileGetAttr(FileName);
+      FileSetAttr(FileName, faArchive);
+      List.SaveToFile(FileName);
+      FileSetAttr(FileName, Attr);
+    end;
+  end;
+
+begin
+  CntFileName := ChangeFileExt(HelpFileName, '.cnt');
+  Result := FileExists(HelpFileName) and FileExists(CntFileName);
+  if Result then
+  begin
+    HelpName := ExtractFileName(HelpFileName);
+    CntName := ExtractFileName(CntFileName);
+    //RegDeleteEntry(HKEY_LOCAL_MACHINE, MSHelpSystemKeyName, HelpName);
+    //RegDeleteEntry(HKEY_LOCAL_MACHINE, MSHelpSystemKeyName, CntName);
+    List := TStringList.Create;
+    try
+      RemoveFromList(ContentFileName, Format(':Include %s', [CntName]));
+      RemoveFromList(LinkFileName, Format(':Link %s', [HelpName]));
+      RemoveFromList(IndexFileName, Format(':Index %s=%s', [IndexName, HelpName]));
+      SetFileLastWrite(ProjectFileName, Now);
+      FileDelete(GidFileName);
+    finally
+      List.Free;
+    end;
+  end;
+end;
+
+//== { TJclHelp2Manager } ====================================================
+
+const
+  Help2BorlandNameSpace = 'Borland.BDS%d';
+  Help2DefaultKeyWord   = '_DEFAULT';
+
+constructor TJclHelp2Manager.Create(IDEVersionNumber: Integer);
+begin
+  inherited Create;
+  FHxRegisterSession := nil;
+  FHxRegister := nil;
+  FHxPlugin := nil;
+  if IDEVersionNumber > 0 then
+  begin
+    if (IDEVersionNumber = 7) then
+      FIdeNameSpace := 'embarcadero.rs2010'
+    else
+    if (IDEVersionNumber = 6) then
+      FIdeNameSpace := 'embarcadero.rs2009'
+    else
+      FIdeNameSpace := Format(Help2BorlandNameSpace, [IDEVersionNumber]);
+  end
+  else
+    FIdeNameSpace := '';
+end;
+
+destructor TJclHelp2Manager.Destroy;
+begin
+  FHxRegisterSession := nil;
+  FHxRegister := nil;
+  FHxPlugin := nil;
+  inherited Destroy;
+end;
+
+function TJclHelp2Manager.CommitTransaction: Boolean;
+begin
+  Result := RequireObject([hoRegisterSession]);
+  if Result then
+  begin
+    try
+      FHxRegisterSession.CommitTransaction;
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.CreateTransaction: Boolean;
+begin
+  Result := RequireObject([hoRegisterSession]);
+  if Result then
+  begin
+    try
+      FHxRegisterSession.CreateTransaction('');
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.GetHxPlugin: IHxPlugin;
+begin
+  RequireObject([hoPlugin]);
+  Result := FHxPlugin;
+end;
+
+function TJclHelp2Manager.GetHxRegister: IHxRegister;
+begin
+  RequireObject([hoRegister]);
+  Result := FHxRegister;
+end;
+
+function TJclHelp2Manager.GetHxRegisterSession: IHxRegisterSession;
+begin
+  RequireObject([hoRegisterSession]);
+  Result := FHxRegisterSession;
+end;
+
+function TJclHelp2Manager.PlugNameSpaceIn(const SourceNameSpace, TargetNameSpace: WideString): Boolean;
+var
+  Help2Default: WideString;
+begin
+  Result := RequireObject([hoPlugin]);
+  if Result then
+  begin
+    try
+      Help2Default := Help2DefaultKeyWord;
+      FHxPlugin.RegisterHelpPlugIn(TargetNameSpace, Help2Default,
+        SourceNameSpace, Help2Default, '', 0);
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.PlugNameSpaceInBorlandHelp(
+  const NameSpace: WideString): Boolean;
+begin
+  Result := (IdeNamespace <> '') and PlugNameSpaceIn(NameSpace, IdeNamespace);
+end;
+
+function TJclHelp2Manager.RegisterHelpFile(const NameSpace, Identifier: WideString;
+  const LangId: Integer; const HxSFile, HxIFile: WideString): Boolean;
+begin
+  Result := RequireObject([hoRegister]);
+  if Result then
+  begin
+    try
+      FHxRegister.RegisterHelpFileSet(NameSpace, Identifier, LangId, HxSFile,
+        HxIFile, '', '', 0, 0, 0, 0);
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.RegisterNameSpace(const Name, Collection, Description: WideString): Boolean;
+begin
+  Result := RequireObject([hoRegister]);
+  if Result then
+  begin
+    try
+      FHxRegister.RegisterNamespace(Name, Collection, Description);
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.RequireObject(HelpObjects: TJclHelp2Objects): Boolean;
+begin
+  // dependencies
+  if (hoRegister in HelpObjects) or (hoPlugin in HelpObjects) then
+    Include(HelpObjects, hoRegisterSession);
+
+  Result := True;
+
+  if (hoRegisterSession in HelpObjects) and not Assigned(FHxRegisterSession) then
+  begin
+    try
+      FHxRegisterSession := CoHxRegisterSession.Create;
+    except
+      Result := False;
+    end;
+  end;
+
+  if Result and (hoRegister in HelpObjects) and not Assigned(FHxRegister) then
+  begin
+    try
+      Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxRegister),
+        IHxRegister, FHxRegister);
+    except
+      Result := False;
+    end;
+  end;
+
+  if Result and (hoPlugin in HelpObjects) and not Assigned(FHxPlugin) then
+  begin
+    try
+      Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxPlugIn),
+        IHxPlugin, FHxPlugin);
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.UnPlugNameSpace(const SourceNameSpace, TargetNameSpace: WideString): Boolean;
+var
+  Help2Default: WideString;
+begin
+  Result := RequireObject([hoPlugin]);
+  if Result then
+  begin
+    try
+      Help2Default := Help2DefaultKeyWord;
+      FHxPlugin.RemoveHelpPlugIn(TargetNameSpace, Help2Default,
+        SourceNameSpace, Help2Default, '');
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.UnPlugNameSpaceFromBorlandHelp(const NameSpace: WideString): Boolean;
+begin
+  Result := (IdeNamespace <> '') and UnPlugNameSpace(NameSpace, IdeNamespace);
+end;
+
+function TJclHelp2Manager.UnregisterHelpFile(const NameSpace, Identifier: WideString;
+  const LangId: Integer): Boolean;
+begin
+  Result := RequireObject([hoRegister]);
+  if Result then
+  begin
+    try
+      FHxRegister.RemoveHelpFile(NameSpace, Identifier, LangId);
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+function TJclHelp2Manager.UnregisterNameSpace(const Name: WideString): Boolean;
+begin
+  Result := RequireObject([hoRegister]);
+  if Result then
+  begin
+    try
+      FHxRegister.RemoveNamespace(Name);
+    except
+      Result := False;
+    end;
+  end;
+end;
+
+{$IFDEF UNITVERSIONING}
+initialization
+  RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+  UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
+end.
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr (20)	May (48)	Jun (8)	Jul (23)	Aug (41)	Sep (42)	Oct (22)	Nov (17)	Dec (36)
2007	Jan (43)	Feb (42)	Mar (17)	Apr (39)	May (16)	Jun (35)	Jul (37)	Aug (47)	Sep (49)	Oct (9)	Nov (52)	Dec (37)
2008	Jan (48)	Feb (21)	Mar (7)	Apr (2)	May (5)	Jun (17)	Jul (17)	Aug (40)	Sep (58)	Oct (38)	Nov (19)	Dec (32)
2009	Jan (67)	Feb (46)	Mar (54)	Apr (34)	May (37)	Jun (52)	Jul (67)	Aug (72)	Sep (48)	Oct (35)	Nov (27)	Dec (12)
2010	Jan (56)	Feb (46)	Mar (19)	Apr (14)	May (21)	Jun (3)	Jul (13)	Aug (48)	Sep (34)	Oct (51)	Nov (16)	Dec (32)
2011	Jan (36)	Feb (14)	Mar (12)	Apr (3)	May (5)	Jun (24)	Jul (15)	Aug (30)	Sep (21)	Oct (4)	Nov (25)	Dec (23)
2012	Jan (45)	Feb (42)	Mar (19)	Apr (14)	May (13)	Jun (7)	Jul (3)	Aug (46)	Sep (21)	Oct (10)	Nov (2)	Dec
2013	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

jcl-checkins-diff Mailing List for JEDI Code Library (Page 30)

jcl-checkins-diff — SVN file check-in notifications with file differences included