[HHCTRL.OCX]

* Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. CORE-7716 svn path=/trunk/; revision=61362
2025-01-03 21:09:19 +00:00 · 2013-12-23 18:59:26 +00:00 · 2013-12-23 18:59:26 +00:00 · c91602e5b7
commit c91602e5b7
parent 58253c16bd
36 changed files with 18 additions and 124 deletions
--- a/reactos/dll/win32/hhctrl.ocx/chm.c
+++ b/reactos/dll/win32/hhctrl.ocx/chm.c
@ -20,13 +20,9 @@
 */

 #include "hhctrl.h"
-#include "stream.h"

 #include <winreg.h>
 #include <shlwapi.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);

 /* Reads a string from the #STRINGS section in the CHM file */
 static LPCSTR GetChmString(CHMInfo *chm, DWORD offset)
--- a/reactos/dll/win32/hhctrl.ocx/content.c
+++ b/reactos/dll/win32/hhctrl.ocx/content.c
@ -17,17 +17,10 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "hhctrl.h"
-#include "stream.h"
+
 #include "resource.h"

-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
-
 typedef enum {
    INSERT_NEXT,
    INSERT_CHILD
--- a/reactos/dll/win32/hhctrl.ocx/help.c
+++ b/reactos/dll/win32/hhctrl.ocx/help.c
@ -22,16 +22,11 @@

 #include "hhctrl.h"

-//#include "wingdi.h"
-//#include "commctrl.h"
+#include <wingdi.h>
 #include <wininet.h>

-#include "wine/debug.h"
-
 #include "resource.h"

-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
-
 static LRESULT Help_OnSize(HWND hWnd);
 static void ExpandContract(HHInfo *pHHInfo);

--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.c
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.c
@ -19,24 +19,9 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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"

-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
+#include <rpcproxy.h>

 HINSTANCE hhctrl_hinstance;
 BOOL hh_process = FALSE;
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.h
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.h
@ -20,14 +20,19 @@
 #ifndef HHCTRL_H
 #define HHCTRL_H

+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

-#include <stdarg.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT

 #define COBJMACROS

+#include <initguid.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
@ -38,14 +43,15 @@
 #include <mshtmhst.h>
 #include <commctrl.h>

-#ifdef INIT_GUID
-#include <initguid.h>
-#endif
-
 #include <wine/itss.h>
 #include <wine/unicode.h>
 #include <wine/list.h>

+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
+
+#include "stream.h"
+
 #define WB_GOBACK     0
 #define WB_GOFORWARD  1
 #define WB_GOHOME     2
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
@ -19,13 +19,10 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#define WIN32_NO_STATUS
 #include <windef.h>
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winnls.h"
-//#include "htmlhelp.h"
-//#include "resource.h"
+#include <htmlhelp.h>
+
+#include "resource.h"

 #ifdef LANGUAGE_CS_CZ
    #include "lang/Cs.rc"
--- a/reactos/dll/win32/hhctrl.ocx/index.c
+++ b/reactos/dll/win32/hhctrl.ocx/index.c
@ -17,15 +17,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "hhctrl.h"
-#include "stream.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);

 /* Fill the TreeView object corresponding to the Index items */
 static void fill_index_tree(HWND hwnd, IndexItem *item)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc
@ -21,8 +21,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

 /* Czech strings in CP1250 */
--- a/reactos/dll/win32/hhctrl.ocx/lang/Da.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Da.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/De.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/De.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 #pragma code_page(65001)

 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
--- a/reactos/dll/win32/hhctrl.ocx/lang/El.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/El.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/En.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/En.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Es.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Es.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/lang/He.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/He.rc
@ -21,8 +21,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/It.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/It.rc
@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc
@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc
@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/No.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/No.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc
@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc
@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 #pragma code_page(65001)

 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
--- a/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc
@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 #pragma code_page(65001)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/lang/Si.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Si.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 #pragma code_page(65001)

 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
--- a/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc
@ -19,8 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

 STRINGTABLE
--- a/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc
@ -21,8 +21,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc
@ -18,8 +18,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "resource.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

--- a/reactos/dll/win32/hhctrl.ocx/resource.h
+++ b/reactos/dll/win32/hhctrl.ocx/resource.h
@ -18,10 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-//#include <windef.h>
-//#include <winbase.h>
-#include <wingdi.h>
-#include <htmlhelp.h>
+#pragma once

 #define IDS_CONTENTS    1
 #define IDS_INDEX       2
--- a/reactos/dll/win32/hhctrl.ocx/search.c
+++ b/reactos/dll/win32/hhctrl.ocx/search.c
@ -16,15 +16,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "hhctrl.h"
-#include "stream.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);

 static SearchItem *SearchCHM_Folder(SearchItem *item, IStorage *pStorage,
                                    const WCHAR *folder, const char *needle);
--- a/reactos/dll/win32/hhctrl.ocx/stream.c
+++ b/reactos/dll/win32/hhctrl.ocx/stream.c
@ -17,11 +17,6 @@
 */

 #include "hhctrl.h"
-#include "stream.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);

 void strbuf_init(strbuf_t *buf)
 {
--- a/reactos/dll/win32/hhctrl.ocx/webbrowser.c
+++ b/reactos/dll/win32/hhctrl.ocx/webbrowser.c
@ -20,10 +20,6 @@

 #include "hhctrl.h"

-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
-
 typedef struct IOleClientSiteImpl
 {
    IOleClientSite IOleClientSite_iface;