From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/msctf/msctf_internal.h | 68 ++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 45a39806c22..24c8c017ff3 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -36,42 +36,42 @@ #define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0 #define COOKIE_MAGIC_ACTIVELANGSINK 0x00c0
-extern DWORD tlsIndex DECLSPEC_HIDDEN; -extern TfClientId processId DECLSPEC_HIDDEN; -extern ITfCompartmentMgr *globalCompartmentMgr DECLSPEC_HIDDEN; +extern DWORD tlsIndex; +extern TfClientId processId; +extern ITfCompartmentMgr *globalCompartmentMgr;
-extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut) DECLSPEC_HIDDEN; -extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) DECLSPEC_HIDDEN; -extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; -extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This) DECLSPEC_HIDDEN; -extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; +extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); +extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore); +extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); +extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); +extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); +extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +extern HRESULT DisplayAttributeMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut);
-extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager) DECLSPEC_HIDDEN; -extern HRESULT Context_Uninitialize(ITfContext *cxt) DECLSPEC_HIDDEN; -extern void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr) DECLSPEC_HIDDEN; -extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp) DECLSPEC_HIDDEN; +extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); +extern HRESULT Context_Uninitialize(ITfContext *cxt); +extern void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr); +extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp);
/* cookie function */ -extern DWORD generate_Cookie(DWORD magic, LPVOID data) DECLSPEC_HIDDEN; -extern DWORD get_Cookie_magic(DWORD id) DECLSPEC_HIDDEN; -extern LPVOID get_Cookie_data(DWORD id) DECLSPEC_HIDDEN; -extern LPVOID remove_Cookie(DWORD id) DECLSPEC_HIDDEN; -extern DWORD enumerate_Cookie(DWORD magic, DWORD *index) DECLSPEC_HIDDEN; +extern DWORD generate_Cookie(DWORD magic, LPVOID data); +extern DWORD get_Cookie_magic(DWORD id); +extern LPVOID get_Cookie_data(DWORD id); +extern LPVOID remove_Cookie(DWORD id); +extern DWORD enumerate_Cookie(DWORD magic, DWORD *index);
/* activated text services functions */ -extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; -extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp) DECLSPEC_HIDDEN; -extern HRESULT activate_textservices(ITfThreadMgrEx *tm) DECLSPEC_HIDDEN; -extern HRESULT deactivate_textservices(void) DECLSPEC_HIDDEN; +extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp); +extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp); +extern HRESULT activate_textservices(ITfThreadMgrEx *tm); +extern HRESULT deactivate_textservices(void);
-extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN; -extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink) DECLSPEC_HIDDEN; -extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN; +extern CLSID get_textservice_clsid(TfClientId tid); +extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink); +extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink);
typedef struct { struct list entry; @@ -91,11 +91,11 @@ typedef struct { (cursor) != (list); \ (cursor) = (cursor)->next, elem = SINK_ENTRY(cursor,type))
-HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie) DECLSPEC_HIDDEN; -HRESULT unadvise_sink(DWORD cookie) DECLSPEC_HIDDEN; -void free_sinks(struct list *sink_list) DECLSPEC_HIDDEN; +HRESULT advise_sink(struct list *sink_list, REFIID riid, DWORD cookie_magic, IUnknown *unk, DWORD *cookie); +HRESULT unadvise_sink(DWORD cookie); +void free_sinks(struct list *sink_list);
-extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; -extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; +extern const WCHAR szwSystemTIPKey[]; +extern const WCHAR szwSystemCTFKey[];
#endif /* __WINE_MSCTF_I_H */