[akhaldi] 61766: [HHCTRL.OCX] * Remove one time mshtmhst.h inclusion from the main header and put it back where it belongs. * Move resource.h inclusion to the main header. * Remove redundant winnls...

Author: akhaldi
Date: Thu Jan 23 11:27:43 2014
New Revision: 61766

URL: http://svn.reactos.org/svn/reactos?rev=61766&view=rev
Log:
[HHCTRL.OCX]
* Remove one time mshtmhst.h inclusion from the main header and put it back where it belongs.
* Move resource.h inclusion to the main header.
* Remove redundant winnls.h inclusion.
CORE-7716

Modified:
    trunk/reactos/dll/win32/hhctrl.ocx/content.c
    trunk/reactos/dll/win32/hhctrl.ocx/help.c
    trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h
    trunk/reactos/dll/win32/hhctrl.ocx/stream.h
    trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c

Modified: trunk/reactos/dll/win32/hhctrl.ocx/content.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/conten...
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/content.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/content.c	[iso-8859-1] Thu Jan 23 11:27:43 2014
@@ -19,8 +19,6 @@

#include "hhctrl.h"

-#include "resource.h"
-
 typedef enum {
     INSERT_NEXT,
     INSERT_CHILD

Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.c...
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/help.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/help.c	[iso-8859-1] Thu Jan 23 11:27:43 2014
@@ -24,8 +24,6 @@

#include <wingdi.h>
 #include <wininet.h>
-
-#include "resource.h"

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

Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctrl...
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h	[iso-8859-1] Thu Jan 23 11:27:43 2014
@@ -26,19 +26,16 @@
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-
-#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>
 #include <commctrl.h>

#include <wine/itss.h>
@@ -48,6 +45,7 @@
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);

+#include "resource.h"
 #include "stream.h"

#define WB_GOBACK     0
@@ -326,4 +324,4 @@
 extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN;
 extern BOOL hh_process DECLSPEC_HIDDEN;

-#endif
+#endif /* HHCTRL_H */

Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/stream...
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/stream.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/stream.h	[iso-8859-1] Thu Jan 23 11:27:43 2014
@@ -45,4 +45,4 @@
 BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN;
 const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN;

-#endif
+#endif /* HHCTRL_STREAM_H */

Modified: trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/webbro...
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c	[iso-8859-1] Thu Jan 23 11:27:43 2014
@@ -19,6 +19,8 @@
  */

#include "hhctrl.h"
+
+#include <mshtmhst.h>

typedef struct IOleClientSiteImpl
 {