Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 10:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RICHED20]

Browse source 
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61470
This commit is contained in:
Amine Khaldi 2014-01-01 18:22:31 +00:00
parent 756543625e
commit 7599273da4
15 changed files with 37 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/riched20/caret.c
View file

@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "editor.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit);

6
reactos/dll/win32/riched20/editor.c
View file

@ -225,12 +225,10 @@
*/
#include "editor.h"
#include <commdlg.h>
//#include "winreg.h"
#define NO_SHLWAPI_STREAM
//#include "shlwapi.h"
#include "rtf.h"
//#include "imm.h"
#include "res.h"
#define STACK_SIZE_DEFAULT 100

32
reactos/dll/win32/riched20/editor.h
View file

@ -18,9 +18,39 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "editstr.h"
#include <config.h>
#include <assert.h>
#include <stdio.h>
#ifndef _WIN32_IE
#define _WIN32_IE 0x0400
#endif
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <richedit.h>
#include <ole2.h>
#include <richole.h>
#include <imm.h>
#include <textserv.h>
#include <wine/debug.h>
#include <wine/list.h>
#include <wine/unicode.h>
#include "editstr.h"
struct _RTF_Info;
extern HANDLE me_heap DECLSPEC_HIDDEN;

34
reactos/dll/win32/riched20/editstr.h
View file

@ -21,40 +21,6 @@
#ifndef __EDITSTR_H
#define __EDITSTR_H
#ifndef _WIN32_IE
#define _WIN32_IE 0x0400
#endif
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <assert.h>
//#include <stdarg.h>
#include <stdio.h>
//#include <stdlib.h>
//#include <limits.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include <winnls.h>
//#include <winnt.h>
#include <wingdi.h>
#include <winuser.h>
#include <richedit.h>
//#include <commctrl.h>
#include <ole2.h>
#include <richole.h>
#include <imm.h>
#include <textserv.h>
#include <wine/debug.h>
#include <wine/list.h>
#ifdef __i386__
extern const struct ITextHostVtbl itextHostStdcallVtbl;
#endif /* __i386__ */

1
reactos/dll/win32/riched20/list.c
View file

@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "editor.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists);

1
reactos/dll/win32/riched20/msvc-thiscall.c
View file

@ -1,4 +1,3 @@
#include "config.h"
#include "editor.h"
#define DEFINE_THISCALL_WRAPPER(func,args) \

11
reactos/dll/win32/riched20/reader.c
View file

@ -36,17 +36,6 @@
* any purpose whatsoever.
*/
//#include <stdio.h>
//#include <ctype.h>
//#include <string.h>
//#include <stdarg.h>
//#include <stdlib.h>
//#include <assert.h>
//#include "windef.h"
//#include "winbase.h"
//#include "wine/debug.h"
#include "editor.h"
#include "rtf.h"

2
reactos/dll/win32/riched20/res.h
View file

@ -18,4 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#pragma once
#define OCR_REVERSE 107

16
reactos/dll/win32/riched20/richole.c
View file

@ -19,27 +19,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
//#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#define COBJMACROS
//#include "windef.h"
//#include "winbase.h"
//#include "wingdi.h"
//#include "winuser.h"
//#include "ole2.h"
//#include "richole.h"
#include "editor.h"
#include <tom.h>
//#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit);
/* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/
#include "initguid.h"
#include <initguid.h>
DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5);
DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1);
DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1);

1
reactos/dll/win32/riched20/row.c
View file

@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "editor.h"
/* I'm sure these functions would simplify some code in caret ops etc,

10
reactos/dll/win32/riched20/rtf.h
View file

@ -1,16 +1,6 @@
#ifndef _RTF
#define _RTF
//#include <stdarg.h>
//#include <stdio.h>
//#include "windef.h"
//#include "winbase.h"
//#include "wingdi.h"
//#include "winuser.h"
//#include "richedit.h"
/*
* rtf.h - RTF document processing stuff. Release 1.10.
*/

13
reactos/dll/win32/riched20/txthost.c
View file

@ -18,20 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
//#include "wine/port.h"
#define NONAMELESSSTRUCT
#define NONAMELESSUNION
#define COBJMACROS
#include "editor.h"
//#include "ole2.h"
//#include "richole.h"
//#include "imm.h"
//#include "textserv.h"
//#include "wine/debug.h"
//#include "editstr.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit);

14
reactos/dll/win32/riched20/txtsrv.c
View file

@ -18,21 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
//#include "wine/port.h"
#define NONAMELESSSTRUCT
#define NONAMELESSUNION
#define COBJMACROS
#include "editor.h"
//#include "ole2.h"
//#include "oleauto.h"
//#include "richole.h"
//#include "imm.h"
//#include "textserv.h"
//#include "wine/debug.h"
//#include "editstr.h"
#ifdef __i386__ /* thiscall functions are i386-specific */

1
reactos/dll/win32/riched20/wrap.c
View file

@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "editor.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit);

4
reactos/dll/win32/riched20/writer.c
View file

@ -18,15 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <config.h>
//#include "wine/port.h"
#include "editor.h"
#include "rtf.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit);
static BOOL
ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars);