[akhaldi] 61470: [RICHED20] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716

Author: akhaldi
Date: Wed Jan  1 18:22:31 2014
New Revision: 61470

URL: http://svn.reactos.org/svn/reactos?rev=61470&view=rev
Log:
[RICHED20]
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

Modified:
    trunk/reactos/dll/win32/riched20/caret.c
    trunk/reactos/dll/win32/riched20/editor.c
    trunk/reactos/dll/win32/riched20/editor.h
    trunk/reactos/dll/win32/riched20/editstr.h
    trunk/reactos/dll/win32/riched20/list.c
    trunk/reactos/dll/win32/riched20/msvc-thiscall.c
    trunk/reactos/dll/win32/riched20/reader.c
    trunk/reactos/dll/win32/riched20/res.h
    trunk/reactos/dll/win32/riched20/richole.c
    trunk/reactos/dll/win32/riched20/row.c
    trunk/reactos/dll/win32/riched20/rtf.h
    trunk/reactos/dll/win32/riched20/txthost.c
    trunk/reactos/dll/win32/riched20/txtsrv.c
    trunk/reactos/dll/win32/riched20/wrap.c
    trunk/reactos/dll/win32/riched20/writer.c

Modified: trunk/reactos/dll/win32/riched20/caret.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c?...
==============================================================================
--- trunk/reactos/dll/win32/riched20/caret.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/caret.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -18,7 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-

#include "editor.h"

Modified: trunk/reactos/dll/win32/riched20/editor.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.c...
==============================================================================
--- trunk/reactos/dll/win32/riched20/editor.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/editor.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -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

Modified: trunk/reactos/dll/win32/riched20/editor.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.h...
==============================================================================
--- trunk/reactos/dll/win32/riched20/editor.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/editor.h	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -18,8 +18,38 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#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"
-#include <wine/unicode.h>

struct _RTF_Info;

Modified: trunk/reactos/dll/win32/riched20/editstr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr....
==============================================================================
--- trunk/reactos/dll/win32/riched20/editstr.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/editstr.h	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -20,40 +20,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;

Modified: trunk/reactos/dll/win32/riched20/list.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/list.c?r...
==============================================================================
--- trunk/reactos/dll/win32/riched20/list.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/list.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -17,7 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-

#include "editor.h"

Modified: trunk/reactos/dll/win32/riched20/msvc-thiscall.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/msvc-thi...
==============================================================================
--- trunk/reactos/dll/win32/riched20/msvc-thiscall.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/msvc-thiscall.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -1,4 +1,3 @@
-#include "config.h"
 #include "editor.h"

#define DEFINE_THISCALL_WRAPPER(func,args) \

Modified: trunk/reactos/dll/win32/riched20/reader.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.c...
==============================================================================
--- trunk/reactos/dll/win32/riched20/reader.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/reader.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -35,17 +35,6 @@
  * This software may be redistributed without restriction and used for
  * 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"

Modified: trunk/reactos/dll/win32/riched20/res.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/res.h?re...
==============================================================================
--- trunk/reactos/dll/win32/riched20/res.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/res.h	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -18,4 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#pragma once
+
 #define OCR_REVERSE 107

Modified: trunk/reactos/dll/win32/riched20/richole.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole....
==============================================================================
--- trunk/reactos/dll/win32/riched20/richole.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/richole.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -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);

Modified: trunk/reactos/dll/win32/riched20/row.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/row.c?re...
==============================================================================
--- trunk/reactos/dll/win32/riched20/row.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/row.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -20,7 +20,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */ 
-

#include "editor.h"

Modified: trunk/reactos/dll/win32/riched20/rtf.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?re...
==============================================================================
--- trunk/reactos/dll/win32/riched20/rtf.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/rtf.h	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -1,15 +1,5 @@
 #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.

Modified: trunk/reactos/dll/win32/riched20/txthost.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txthost....
==============================================================================
--- trunk/reactos/dll/win32/riched20/txthost.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/txthost.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -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);

Modified: trunk/reactos/dll/win32/riched20/txtsrv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.c...
==============================================================================
--- trunk/reactos/dll/win32/riched20/txtsrv.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/txtsrv.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -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 */

Modified: trunk/reactos/dll/win32/riched20/wrap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?r...
==============================================================================
--- trunk/reactos/dll/win32/riched20/wrap.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/wrap.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-
 #include "editor.h"

WINE_DEFAULT_DEBUG_CHANNEL(richedit);

Modified: trunk/reactos/dll/win32/riched20/writer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.c...
==============================================================================
--- trunk/reactos/dll/win32/riched20/writer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/writer.c	[iso-8859-1] Wed Jan  1 18:22:31 2014
@@ -18,14 +18,10 @@
  * 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);