hhctrl.ocx: Merge chm.h and webbrowser.h to hhctrl.h.

dlls/hhctrl.ocx/chm.c

@@ -18,20 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "ole2.h"
-#include "htmlhelp.h"
-
-#include "initguid.h"
-#include "chm.h"
+#include "hhctrl.h"
 
 static LPWSTR CHM_ANSIToUnicode(LPCSTR ansi)
 {

dlls/hhctrl.ocx/help.c

@@ -18,27 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "hhctrl.h"
 
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
 #include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
 #include "commctrl.h"
-#include "htmlhelp.h"
-#include "ole2.h"
-#include "exdisp.h"
 #include "wininet.h"
 
 #include "wine/unicode.h"
 #include "wine/debug.h"
 
 #include "resource.h"
-#include "chm.h"
-#include "webbrowser.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 

dlls/hhctrl.ocx/hhctrl.c

@@ -18,15 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winnls.h"
-#include "winuser.h"
 #include "wine/debug.h"
-#include "htmlhelp.h"
+
+#define INIT_GUID
+#include "hhctrl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 

dlls/hhctrl.ocx/chm.h → dlls/hhctrl.ocx/hhctrl.h

 /*
- * CHM Utility API
- *
  * Copyright 2005 James Hawkins
  *
  * This library is free software; you can redistribute it and/or
@@ -18,11 +16,35 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef CHM_H
-#define CHM_H
+#ifndef HHCTRL_H
+#define HHCTRL_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 "exdisp.h"
+#include "mshtmhst.h"
+
+#ifdef INIT_GUID
+#include "initguid.h"
+#endif
 
 #include "wine/itss.h"
 
+#define WB_GOBACK     0
+#define WB_GOFORWARD  1
+#define WB_GOHOME     2
+#define WB_SEARCH     3
+#define WB_REFRESH    4
+#define WB_STOP       5
+
 typedef struct CHMInfo
 {
     IITStorage *pITStorage;
@@ -30,6 +52,20 @@ typedef struct CHMInfo
     LPCWSTR szFile;
 } CHMInfo;
 
+
+typedef struct WBInfo
+{
+    IOleClientSite *pOleClientSite;
+    IWebBrowser2 *pWebBrowser2;
+    IOleObject *pBrowserObject;
+    HWND hwndParent;
+} WBInfo;
+
+BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent);
+void WB_UnEmbedBrowser(WBInfo *pWBInfo);
+void WB_ResizeBrowser(WBInfo *pWBInfo, DWORD dwWidth, DWORD dwHeight);
+void WB_DoPageAction(WBInfo *pWBInfo, DWORD dwAction);
+
 BOOL CHM_OpenCHM(CHMInfo *pCHMInfo, LPCWSTR szFile);
 BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType);
 void CHM_CloseCHM(CHMInfo *pCHMInfo);

dlls/hhctrl.ocx/webbrowser.c

@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "ole2.h"
-
-#include "webbrowser.h"
+#include "hhctrl.h"
 
 #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
 

dlls/hhctrl.ocx/webbrowser.h

-/*
- * WebBrowser Include
- *
- * Copyright 2005 James Hawkins
- *
- * 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
- */
-
-#ifndef __WINE_WEBBROWSER_H
-#define __WINE_WEBBROWSER_H
-
-#include "exdisp.h"
-#include "mshtml.h"
-#include "mshtmhst.h"
-
-#define WB_GOBACK       0
-#define WB_GOFORWARD    1
-#define WB_GOHOME       2
-#define WB_SEARCH       3
-#define WB_REFRESH      4
-#define WB_STOP         5
-
-typedef struct WBInfo
-{
-    IOleClientSite *pOleClientSite;
-    IWebBrowser2 *pWebBrowser2;
-    IOleObject *pBrowserObject;
-    HWND hwndParent;
-} WBInfo;
-
-BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent);
-void WB_UnEmbedBrowser(WBInfo *pWBInfo);
-void WB_ResizeBrowser(WBInfo *pWBInfo, DWORD dwWidth, DWORD dwHeight);
-void WB_DoPageAction(WBInfo *pWBInfo, DWORD dwAction);
-
-#endif /* __WINE_WEBBROWSER_H */