[HHCTRL.OCX]

* Add the typelib related registration data.
* Set the correct dependencies for the resource file.

svn path=/trunk/; revision=58837

diff --git a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
index ae5554a..7346565 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -19,7 +19,12 @@ add_library(hhctrl SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def)
 
 add_typelib(hhctrl_tlb.idl)
-set_source_files_properties(hhctrl.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/hhctrl_tlb.tlb)
+
+list(APPEND hhctrl_rc_deps
+    ${CMAKE_CURRENT_SOURCE_DIR}/hhctrl_tlb.rgs
+    ${CMAKE_CURRENT_BINARY_DIR}/hhctrl_tlb.tlb)
+
+set_source_files_properties(hhctrl.rc PROPERTIES OBJECT_DEPENDS "${hhctrl_rc_deps}")
 
 # hhctrl_tlb.tlb needs stdole2.tlb
 add_dependencies(hhctrl stdole2)

diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
index 751fbdc..cbb63cb 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
@@ -115,6 +115,8 @@ IDB_HHTREEVIEW BITMAP hhtreeview.bmp
 
 1 TYPELIB hhctrl_tlb.tlb
 
+1 WINE_REGISTRY hhctrl_tlb.rgs
+
 #define WINE_FILEDESCRIPTION_STR "Wine htmlhelp OCX"
 #define WINE_FILENAME_STR "hhctrl.ocx"
 #define WINE_FILEVERSION 5,2,3790,2744

diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl_tlb.rgs b/reactos/dll/win32/hhctrl.ocx/hhctrl_tlb.rgs
new file mode 100644 (file)
index 0000000..c16bd38
--- /dev/null
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl_tlb.rgs
@@ -0,0 +1,83 @@
+HKCR
+{
+    NoRemove Typelib
+    {
+        NoRemove '{ADB880A2-D8FF-11CF-9377-00AA003B7A11}'
+        {
+            '4.0' = s 'HHCtrl 4.0 Type Library'
+            {
+                '0' { win32 = s '%MODULE%' }
+                FLAGS = s '0'
+            }
+        }
+    }
+    NoRemove Interface
+    {
+        '{ADB880A1-D8FF-11CF-9377-00AA003B7A11}' = s 'IHHCtrl'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{ADB880A2-D8FF-11CF-9377-00AA003B7A11}' { val Version = s '4.0' }
+        }
+        '{ADB880A3-D8FF-11CF-9377-00AA003B7A11}' = s '_HHCtrlEvents'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{ADB880A2-D8FF-11CF-9377-00AA003B7A11}' { val Version = s '4.0' }
+        }
+    }
+    NoRemove CLSID
+    {
+        '{ADB880A6-D8FF-11CF-9377-00AA003B7A11}' = s 'HHCtrl Object'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' }
+            ProgId = s 'Internet.HHCtrl.1'
+            TypeLib = s '{ADB880A2-D8FF-11CF-9377-00AA003B7A11}'
+            Version = s '1.0'
+            VersionIndependentProgId = s 'Internet.HHCtrl'
+        }
+        '{41B23C28-488E-4E5C-ACE2-BB0BBABE99E8}' = s 'HHCtrl Object'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' }
+            ProgId = s 'Internet.HHCtrl.1'
+            TypeLib = s '{ADB880A2-D8FF-11CF-9377-00AA003B7A11}'
+            Version = s '1.0'
+            VersionIndependentProgId = s 'Internet.HHCtrl'
+        }
+        '{52A2AAAE-085D-4187-97EA-8C30DB990436}' = s 'HHCtrl Object'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' }
+            ProgId = s 'Internet.HHCtrl.1'
+            TypeLib = s '{ADB880A2-D8FF-11CF-9377-00AA003B7A11}'
+            Version = s '1.0'
+            VersionIndependentProgId = s 'Internet.HHCtrl'
+        }
+    }
+    'Internet.HHCtrl.1' = s 'HHCtrl Object'
+    {
+        CLSID = s '{ADB880A6-D8FF-11CF-9377-00AA003B7A11}'
+    }
+    'Internet.HHCtrl' = s 'HHCtrl Object'
+    {
+        CLSID = s '{ADB880A6-D8FF-11CF-9377-00AA003B7A11}'
+        CurVer = s 'Internet.HHCtrl.1'
+    }
+    'Internet.HHCtrl.1' = s 'HHCtrl Object'
+    {
+        CLSID = s '{41B23C28-488E-4E5C-ACE2-BB0BBABE99E8}'
+    }
+    'Internet.HHCtrl' = s 'HHCtrl Object'
+    {
+        CLSID = s '{41B23C28-488E-4E5C-ACE2-BB0BBABE99E8}'
+        CurVer = s 'Internet.HHCtrl.1'
+    }
+    'Internet.HHCtrl.1' = s 'HHCtrl Object'
+    {
+        CLSID = s '{52A2AAAE-085D-4187-97EA-8C30DB990436}'
+    }
+    'Internet.HHCtrl' = s 'HHCtrl Object'
+    {
+        CLSID = s '{52A2AAAE-085D-4187-97EA-8C30DB990436}'
+        CurVer = s 'Internet.HHCtrl.1'
+    }
+}