[ros-diffs] [akhaldi] 61412: [MSCTF] * 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 t...

Author: akhaldi
Date: Wed Dec 25 15:51:35 2013
New Revision: 61412

URL: http://svn.reactos.org/svn/reactos?rev=61412&view=rev
Log:
[MSCTF]
* 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.
CORE-7716

Modified:
    trunk/reactos/dll/win32/msctf/categorymgr.c
    trunk/reactos/dll/win32/msctf/compartmentmgr.c
    trunk/reactos/dll/win32/msctf/context.c
    trunk/reactos/dll/win32/msctf/displayattributemgr.c
    trunk/reactos/dll/win32/msctf/documentmgr.c
    trunk/reactos/dll/win32/msctf/inputprocessor.c
    trunk/reactos/dll/win32/msctf/langbarmgr.c
    trunk/reactos/dll/win32/msctf/msctf.c
    trunk/reactos/dll/win32/msctf/msctf_internal.h
    trunk/reactos/dll/win32/msctf/range.c
    trunk/reactos/dll/win32/msctf/threadmgr.c

Modified: trunk/reactos/dll/win32/msctf/categorymgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg…
==============================================================================
--- trunk/reactos/dll/win32/msctf/categorymgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/categorymgr.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-#include <winreg.h>
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-
-#include <wine/unicode.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 typedef struct tagCategoryMgr {
     ITfCategoryMgr ITfCategoryMgr_iface;

Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmen…
==============================================================================
--- trunk/reactos/dll/win32/msctf/compartmentmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/compartmentmgr.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,34 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
+#include "msctf_internal.h"
+
 #include <oleauto.h>
-#include <olectl.h>
-
-//#include "wine/unicode.h"
-#include <wine/list.h>
-
-#include <msctf.h>
-#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 typedef struct tagCompartmentValue {
     struct list entry;

Modified: trunk/reactos/dll/win32/msctf/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?…
==============================================================================
--- trunk/reactos/dll/win32/msctf/context.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/context.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,33 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <olectl.h>
-
-//#include "wine/unicode.h"
-#include <wine/list.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 typedef struct tagContextSink {
     struct list         entry;

Modified: trunk/reactos/dll/win32/msctf/displayattributemgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/displayatt…
==============================================================================
--- trunk/reactos/dll/win32/msctf/displayattributemgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/displayattributemgr.c	[iso-8859-1] Wed Dec 25 15:51:35
2013
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-
-#include <msctf.h>
-//#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include "msctf_internal.h"
 
 typedef struct tagDisplayAttributeMgr {
     ITfDisplayAttributeMgr ITfDisplayAttributeMgr_iface;

Modified: trunk/reactos/dll/win32/msctf/documentmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg…
==============================================================================
--- trunk/reactos/dll/win32/msctf/documentmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/documentmgr.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-
-//#include "wine/unicode.h"
-
-#include <msctf.h>
 #include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 typedef struct tagDocumentMgr {
     ITfDocumentMgr ITfDocumentMgr_iface;

Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce…
==============================================================================
--- trunk/reactos/dll/win32/msctf/inputprocessor.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/inputprocessor.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,33 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-#include <winreg.h>
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <olectl.h>
-
-#include <wine/unicode.h>
-#include <wine/list.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 static const WCHAR szwLngp[] =
{'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0};
 static const WCHAR szwEnable[] =
{'E','n','a','b','l','e',0};

Modified: trunk/reactos/dll/win32/msctf/langbarmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/langbarmgr…
==============================================================================
--- trunk/reactos/dll/win32/msctf/langbarmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/langbarmgr.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,21 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-
-#include <msctf.h>
-//#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include "msctf_internal.h"
 
 typedef struct tagLangBarMgr {
     ITfLangBarMgr ITfLangBarMgr_iface;

Modified: trunk/reactos/dll/win32/msctf/msctf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msctf/msctf.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/msctf.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,32 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-#include <wine/list.h>
-//#include "windef.h"
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-//#include "shlguid.h"
-//#include "comcat.h"
+#include "msctf_internal.h"
+
 #include <rpcproxy.h>
-#include <msctf.h>
 #include <inputscope.h>
-
-#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 static LONG MSCTF_refCount;
 

Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte…
==============================================================================
--- trunk/reactos/dll/win32/msctf/msctf_internal.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/msctf_internal.h	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -20,6 +20,30 @@
 
 #ifndef __WINE_MSCTF_I_H
 #define __WINE_MSCTF_I_H
+
+#include <wine/config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <objbase.h>
+#include <olectl.h>
+#include <msctf.h>
+#include <shlwapi.h>
+
+#include <wine/list.h>
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 #define COOKIE_MAGIC_TMSINK  0x0010
 #define COOKIE_MAGIC_CONTEXTSINK 0x0020
@@ -67,4 +91,5 @@
 
 extern const WCHAR szwSystemTIPKey[];
 extern const WCHAR szwSystemCTFKey[];
+
 #endif /* __WINE_MSCTF_I_H */

Modified: trunk/reactos/dll/win32/msctf/range.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/range.c?re…
==============================================================================
--- trunk/reactos/dll/win32/msctf/range.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/range.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-
-//#include "wine/unicode.h"
-
-#include <msctf.h>
-//#include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
+#include "msctf_internal.h"
 
 typedef struct tagRange {
     ITfRange ITfRange_iface;

Modified: trunk/reactos/dll/win32/msctf/threadmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.…
==============================================================================
--- trunk/reactos/dll/win32/msctf/threadmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msctf/threadmgr.c	[iso-8859-1] Wed Dec 25 15:51:35 2013
@@ -18,33 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <wine/debug.h>
-//#include "windef.h"
-#include <winbase.h>
-//#include "winreg.h"
-//#include "winuser.h"
-//#include "shlwapi.h"
-//#include "winerror.h"
-#include <objbase.h>
-#include <olectl.h>
-
-//#include "wine/unicode.h"
-#include <wine/list.h>
-
-#include <msctf.h>
 #include "msctf_internal.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msctf);
 
 typedef struct tagThreadMgrSink {
     struct list         entry;