Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 20:43:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCTF]

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

svn path=/trunk/; revision=61412
This commit is contained in:
Amine Khaldi 2013-12-25 15:51:35 +00:00
parent dca5c07bbe
commit 0b68d9fedb
11 changed files with 31 additions and 231 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/dll/win32/msctf/categorymgr.c
View file

@ -18,32 +18,8 @@
* 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;
LONG refCount;

27
reactos/dll/win32/msctf/compartmentmgr.c
View file

@ -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 <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);
#include <oleauto.h>
typedef struct tagCompartmentValue {
struct list entry;

26
reactos/dll/win32/msctf/context.c
View file

@ -18,34 +18,8 @@
* 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;
union {

16
reactos/dll/win32/msctf/displayattributemgr.c
View file

@ -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;

24
reactos/dll/win32/msctf/documentmgr.c
View file

@ -18,32 +18,8 @@
* 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;
ITfSource ITfSource_iface;

26
reactos/dll/win32/msctf/inputprocessor.c
View file

@ -18,34 +18,8 @@
* 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};
static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0};

16
reactos/dll/win32/msctf/langbarmgr.c
View file

@ -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;

26
reactos/dll/win32/msctf/msctf.c
View file

@ -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 <rpcproxy.h>
#include <msctf.h>
#include <inputscope.h>
#include "msctf_internal.h"
WINE_DEFAULT_DEBUG_CHANNEL(msctf);
#include <rpcproxy.h>
#include <inputscope.h>
static LONG MSCTF_refCount;

25
reactos/dll/win32/msctf/msctf_internal.h
View file

@ -21,6 +21,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
#define COOKIE_MAGIC_GUIDATOM 0x0030
@ -67,4 +91,5 @@ extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink
extern const WCHAR szwSystemTIPKey[];
extern const WCHAR szwSystemCTFKey[];
#endif /* __WINE_MSCTF_I_H */

26
reactos/dll/win32/msctf/range.c
View file

@ -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;

26
reactos/dll/win32/msctf/threadmgr.c
View file

@ -18,34 +18,8 @@
* 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;
union {