Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-14 08:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[HHCTRL.OCX]

Browse source 
* 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

svn path=/trunk/; revision=61766
This commit is contained in:
Amine Khaldi 2014-01-23 11:27:43 +00:00
parent 0c66b2f86c
commit f91ac77f24
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/hhctrl.ocx/content.c
View file

@ -19,8 +19,6 @@
#include "hhctrl.h" #include "hhctrl.h"
#include "resource.h"
typedef enum { typedef enum {
INSERT_NEXT, INSERT_NEXT,
INSERT_CHILD INSERT_CHILD

2
reactos/dll/win32/hhctrl.ocx/help.c
View file

@ -25,8 +25,6 @@
#include <wingdi.h> #include <wingdi.h>
#include <wininet.h> #include <wininet.h>
#include "resource.h"
static LRESULT Help_OnSize(HWND hWnd); static LRESULT Help_OnSize(HWND hWnd);
static void ExpandContract(HHInfo *pHHInfo); static void ExpandContract(HHInfo *pHHInfo);

8
reactos/dll/win32/hhctrl.ocx/hhctrl.h
View file

@ -26,19 +26,16 @@
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#define COBJMACROS
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winuser.h> #include <winuser.h>
#include <winnls.h>
#include <htmlhelp.h> #include <htmlhelp.h>
#include <ole2.h> #include <ole2.h>
#include <exdisp.h> #include <exdisp.h>
#include <mshtmhst.h>
#include <commctrl.h> #include <commctrl.h>
#include <wine/itss.h> #include <wine/itss.h>
@ -48,6 +45,7 @@
#include <wine/debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
#include "resource.h"
#include "stream.h" #include "stream.h"
#define WB_GOBACK 0 #define WB_GOBACK 0
@ -326,4 +324,4 @@ static inline LPSTR strdupWtoA(LPCWSTR str)
extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN; extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN;
extern BOOL hh_process DECLSPEC_HIDDEN; extern BOOL hh_process DECLSPEC_HIDDEN;
#endif #endif /* HHCTRL_H */

2
reactos/dll/win32/hhctrl.ocx/stream.h
View file

@ -45,4 +45,4 @@ BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN;
BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; 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; const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN;
#endif #endif /* HHCTRL_STREAM_H */

2
reactos/dll/win32/hhctrl.ocx/webbrowser.c
View file

@ -20,6 +20,8 @@
#include "hhctrl.h" #include "hhctrl.h"
#include <mshtmhst.h>
typedef struct IOleClientSiteImpl typedef struct IOleClientSiteImpl
{ {
IOleClientSite IOleClientSite_iface; IOleClientSite IOleClientSite_iface;