hhctrl.ocx: Add a typelib and register it.

.gitignore

@@ -51,6 +51,7 @@ dlls/dispex/disp_ex.h
 dlls/dispex/disp_ex_p.c
 dlls/dxdiagn/fil_data.h
 dlls/gameux/gameux_tlb.tlb
+dlls/hhctrl.ocx/hhctrl_tlb.tlb
 dlls/infosoft/infosoft.h
 dlls/jscript/jscript_classes.h
 dlls/jscript/jsglobal.tlb

dlls/hhctrl.ocx/Makefile.in

@@ -7,11 +7,13 @@ C_SRCS = \
 	help.c \
 	hhctrl.c \
 	index.c \
-	regsvr.c \
 	search.c \
 	stream.c \
 	webbrowser.c
 
+IDL_TLB_SRCS = hhctrl_tlb.idl
+IDL_R_SRCS   = hhctrl_tlb.idl
+
 RC_SRCS = \
 	Cs.rc \
 	Da.rc \
@@ -39,6 +41,6 @@ RC_SRCS = \
 	Tr.rc \
 	Uk.rc \
 	Zh.rc \
-	version.rc
+	rsrc.rc
 
 @MAKE_DLL_RULES@

dlls/hhctrl.ocx/hhctrl.c

@@ -21,6 +21,18 @@
 
 #include "wine/debug.h"
 
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "htmlhelp.h"
+#include "ole2.h"
+#include "rpcproxy.h"
+
 #define INIT_GUID
 #include "hhctrl.h"
 
@@ -353,3 +365,19 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
     return CLASS_E_CLASSNOTAVAILABLE;
 }
+
+/***********************************************************************
+ *		DllRegisterServer (HHCTRL.OCX.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( hhctrl_hinstance, NULL );
+}
+
+/***********************************************************************
+ *		DllUnregisterServer (HHCTRL.OCX.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return __wine_unregister_resources( hhctrl_hinstance, NULL );
+}

dlls/hhctrl.ocx/hhctrl_tlb.idl

+/*
+ * Typelib for hhctrl
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+import "unknwn.idl";
+import "objidl.idl";
+import "oaidl.idl";
+
+[
+    helpstring("HHCtrl 4.0 Type Library"),
+    version(4.0),
+    uuid(adb880a2-d8ff-11cf-9377-00aa003b7a11)
+]
+library HHCTRLLib
+{
+    importlib("stdole2.tlb");
+
+    [
+        helpstring("IHHCtrl Interface"),
+        odl,
+        dual,
+        oleautomation,
+        uuid(adb880a1-d8ff-11cf-9377-00aa003b7a11)
+    ]
+    interface IHHCtrl : IDispatch
+    {
+      /* FIXME */
+    }
+
+    [
+        helpstring("Event interface for HHCtrl"),
+        uuid(adb880a3-d8ff-11cf-9377-00aa003b7a11)
+    ]
+    dispinterface _HHCtrlEvents
+    {
+        properties:
+        methods:
+            [id(0)] void Click(BSTR ParamString);
+    }
+
+    [
+        helpstring("HHCtrl Object"),
+        progid("Internet.HHCtrl.1"),
+        vi_progid("Internet.HHCtrl"),
+        threading(apartment),
+        version(1.0),
+        uuid(adb880a6-d8ff-11cf-9377-00aa003b7a11)
+    ]
+    coclass OldHHCtrl1
+    {
+        [default] interface  IHHCtrl;
+        [default, source] dispinterface  _HHCtrlEvents;
+    }
+
+    [
+        helpstring("HHCtrl Object"),
+        progid("Internet.HHCtrl.1"),
+        vi_progid("Internet.HHCtrl"),
+        threading(apartment),
+        version(1.0),
+        uuid(41b23c28-488e-4e5c-ace2-bb0bbabe99e8)
+    ]
+    coclass OldHHCtrl2
+    {
+        [default] interface IHHCtrl;
+        [default, source] dispinterface _HHCtrlEvents;
+    }
+
+    [
+        helpstring("HHCtrl Object"),
+        progid("Internet.HHCtrl.1"),
+        vi_progid("Internet.HHCtrl"),
+        threading(apartment),
+        version(1.0),
+        uuid(52a2aaae-085d-4187-97ea-8c30db990436)
+    ]
+    coclass HHCtrl
+    {
+        [default] interface IHHCtrl;
+        [default, source] dispinterface _HHCtrlEvents;
+    }
+}

dlls/hhctrl.ocx/version.rc → dlls/hhctrl.ocx/rsrc.rc

 /*
- * Version information for hhctrl.ocx
+ * Resources for hhctrl.ocx
  *
  * Copyright 2004 Hans Leidekker
  * Copyright 2004 Tom Wickline
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+/* @makedep: hhctrl_tlb.tlb */
+1 TYPELIB hhctrl_tlb.tlb
+
 #define WINE_FILEDESCRIPTION_STR "Wine htmlhelp OCX"
 #define WINE_FILENAME_STR "hhctrl.ocx"
 #define WINE_FILEVERSION 5,2,3790,2744