Author: akhaldi
Date: Mon Nov 23 20:47:28 2015
New Revision: 70075
URL:
http://svn.reactos.org/svn/reactos?rev=70075&view=rev
Log:
[PSDK] Update msctf.idl. CORE-10536
Modified:
trunk/reactos/include/psdk/msctf.idl
Modified: trunk/reactos/include/psdk/msctf.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev…
==============================================================================
--- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Mon Nov 23 20:47:28 2015
@@ -22,7 +22,6 @@
import "textstor.idl";
import "ctfutb.idl";
#endif
-cpp_quote("#include <winuser.h>")
cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF,
0x0501)")
cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF,
0x0504)")
@@ -90,19 +89,12 @@
interface ITfContext;
interface IEnumTfDocumentMgrs;
interface IEnumTfContexts;
-interface ITfFunctionProvider;
-interface IEnumTfFunctionProviders;
interface ITfCompartmentMgr;
interface ITfEditSession;
interface ITfRange;
-interface ITfContextView;
-interface IEnumTfContextViews;
interface ITfProperty;
interface ITfReadOnlyProperty;
-interface IEnumTfProperties;
-interface ITfRangeBackup;
interface IEnumTfLanguageProfiles;
-interface ITfEditRecord;
interface ITfCompositionView;
interface ITfKeyEventSink;
@@ -139,6 +131,46 @@
[
object,
+ uuid(101d6610-0990-11d3-8df0-00105a2799b5),
+ pointer_default(unique)
+]
+interface ITfFunctionProvider : IUnknown
+{
+ HRESULT GetType(
+ [out] GUID *guid);
+
+ HRESULT GetDescription(
+ [out] BSTR *desc);
+
+ HRESULT GetFunction(
+ [in] REFGUID guid,
+ [in] REFIID riid,
+ [out, iid_is(riid)] IUnknown **func);
+}
+
+[
+ object,
+ uuid(e4b24db0-0990-11d3-8df0-00105a2799b5),
+ pointer_default(unique)
+]
+interface IEnumTfFunctionProviders : IUnknown
+{
+ HRESULT Clone(
+ [out] IEnumTfFunctionProviders **ret);
+
+ HRESULT Next(
+ [in] ULONG count,
+ [out, size_is(count), length_is(*fetched)] ITfFunctionProvider **prov,
+ [out] ULONG *fetched);
+
+ HRESULT Reset();
+
+ HRESULT Skip(
+ [in] ULONG count);
+}
+
+[
+ object,
uuid(aa80e801-2021-11d2-93e0-0060b067b86e),
pointer_default(unique)
]
@@ -178,7 +210,21 @@
HRESULT GetGlobalCompartment(
[out] ITfCompartmentMgr **ppCompMgr);
-};
+}
+
+[
+ object,
+ uuid(3e90ade3-7594-4cb0-bb58-69628f5f458c),
+ pointer_default(unique)
+]
+interface ITfThreadMgrEx : ITfThreadMgr
+{
+ HRESULT ActivateEx(
+ [out] TfClientId *id,
+ [in] DWORD flags);
+ HRESULT GetActiveFlags(
+ [out] DWORD *flags);
+}
[
object,
@@ -222,7 +268,87 @@
HRESULT EnumContexts(
[out] IEnumTfContexts **ppEnum);
-};
+}
+
+[
+ object,
+ uuid(2433bf8e-0f9b-435c-ba2c-180611978c30),
+ pointer_default(unique)
+]
+interface ITfContextView : IUnknown
+{
+ HRESULT GetRangeFromPoint(
+ [in] TfEditCookie cookie,
+ [in] const POINT *pt,
+ [in] DWORD flags,
+ [out] ITfRange **range);
+
+ HRESULT GetTextExt(
+ [in] TfEditCookie cookie,
+ [in] ITfRange *range,
+ [out] RECT *rect,
+ [out] BOOL *clipped);
+
+ HRESULT GetScreenExt(
+ [out] RECT *rect);
+
+ HRESULT GetWnd(
+ [out] HWND *hwnd);
+}
+
+[
+ object,
+ uuid(f0c0f8dd-cf38-44e1-bb0f-68cf0d551c78),
+ pointer_default(unique)
+]
+interface IEnumTfContextViews : IUnknown
+{
+ HRESULT Clone(
+ [out] IEnumTfContextViews **ret);
+
+ HRESULT Next(
+ [in] ULONG count,
+ [out, size_is(count), length_is(*fetched)] ITfContextView **views,
+ [out] ULONG *fetched);
+
+ HRESULT Reset();
+
+ HRESULT Skip(
+ [in] ULONG count);
+}
+
+[
+ object,
+ uuid(19188cb0-aca9-11d2-afc5-00105a2799b5),
+ pointer_default(unique)
+]
+interface IEnumTfProperties : IUnknown
+{
+ HRESULT Clone(
+ [out] IEnumTfProperties **ret);
+
+ HRESULT Next(
+ [in] ULONG count,
+ [out, size_is(count), length_is(*fetched)] ITfProperty **props,
+ [out] ULONG *fetched);
+
+ HRESULT Reset();
+
+ HRESULT Skip(
+ [in] ULONG count);
+}
+
+[
+ object,
+ uuid(463a506d-6992-49d2-9b88-93d55e70bb16),
+ pointer_default(unique)
+]
+interface ITfRangeBackup : IUnknown
+{
+ HRESULT Restore(
+ [in] TfEditCookie cookie,
+ [in] ITfRange *range);
+}
[
object,
@@ -325,8 +451,7 @@
[in] TfEditCookie ec,
[in] ITfRange *pRange,
[out] ITfRangeBackup **ppBackup);
-
-};
+}
const DWORD TF_INVALID_COOKIE = 0xffffffff;
@@ -344,7 +469,7 @@
HRESULT UnadviseSink(
[in] DWORD dwCookie);
-};
+}
[
object,
@@ -442,7 +567,7 @@
[in] LANGID langid,
[in] REFGUID guidProfile,
[in] HKL hKL);
-};
+}
typedef [uuid(44d2825a-10e5-43b2-877f-6cb2f43b7e7e)]
struct TF_INPUTPROCESSORPROFILE {
@@ -703,7 +828,45 @@
HRESULT IsEqualTfGuidAtom([in] TfGuidAtom guidatom,
[in] REFGUID rguid,
[out] BOOL *pfEqual);
-};
+}
+
+[
+ object,
+ uuid(f99d3f40-8e32-11d2-bf46-00105a2799b5),
+ pointer_default(unique)
+]
+interface IEnumTfRanges : IUnknown
+{
+ HRESULT Clone([out] IEnumTfRanges **ppEnum);
+
+ HRESULT Next(
+ [in] ULONG ulCount,
+ [out, size_is(ulCount), length_is(*pcFetched)] ITfRange **ppRange,
+ [out] ULONG *pcFetched);
+
+ HRESULT Reset();
+
+ HRESULT Skip(ULONG ulCount);
+}
+
+[
+ object,
+ uuid(42d4d099-7c1a-4a89-b836-6c6f22160df0),
+ pointer_default(unique)
+]
+interface ITfEditRecord : IUnknown
+{
+ const DWORD TF_GTP_INCL_TEXT = 0x1;
+
+ HRESULT GetSelectionStatus(
+ [out] BOOL *changed);
+
+ HRESULT GetTextAndPropertyUpdates(
+ [in] DWORD flags,
+ [in, size_is(count)] const GUID **props,
+ [in] ULONG count,
+ [out] IEnumTfRanges **ret);
+}
[
object,
@@ -716,7 +879,7 @@
[in] ITfContext *pic,
[in] TfEditCookie ecReadOnly,
[in] ITfEditRecord *pEditRecord);
-};
+}
[
object,
@@ -735,7 +898,7 @@
HRESULT OnEndComposition(
[in] ITfCompositionView *pComposition);
-};
+}
[
object,
@@ -769,7 +932,7 @@
HRESULT Skip(
[in] ULONG ulCount);
-};
+}
[
object,
@@ -784,7 +947,7 @@
[in] TfClientId tid);
HRESULT Deactivate();
-};
+}
[
object,
@@ -808,7 +971,7 @@
HRESULT OnPopContext(
[in] ITfContext *pic);
-};
+}
[
object,
@@ -883,7 +1046,7 @@
[in] ITfContext *pic,
[in] REFGUID rguid,
[out] BOOL *pfEaten);
-};
+}
[
object,
@@ -924,7 +1087,7 @@
[in] ITfContext *pic,
[in] REFGUID rguid,
[out] BOOL *pfEaten);
-};
+}
[
object,
@@ -963,7 +1126,7 @@
[in] UINT wMsgFilterMin,
[in] UINT wMsgFilterMax,
[out] BOOL *pfResult);
-};
+}
[
object,
@@ -976,7 +1139,7 @@
HRESULT GetClientId(
[in] REFCLSID rclsid,
[out] TfClientId *ptid);
-};
+}
[
object,
@@ -1140,7 +1303,7 @@
HRESULT GetContext(
[out] ITfContext **ppContext);
-};
+}
[
object,
@@ -1179,7 +1342,7 @@
[in] DWORD dwFlags,
[in] IDataObject *pDataObject,
[out] ITfRange **ppRange);
-};
+}
[
object,
@@ -1219,25 +1382,6 @@
HRESULT Serialize(
[in] IStream *pStream,
[out] ULONG *pcb);
-}
-
-[
- object,
- uuid(f99d3f40-8e32-11d2-bf46-00105a2799b5),
- pointer_default(unique)
-]
-interface IEnumTfRanges : IUnknown
-{
- HRESULT Clone([out] IEnumTfRanges **ppEnum);
-
- HRESULT Next(
- [in] ULONG ulCount,
- [out, size_is(ulCount), length_is(*pcFetched)] ITfRange **ppRange,
- [out] ULONG *pcFetched);
-
- HRESULT Reset();
-
- HRESULT Skip(ULONG ulCount);
}
[
@@ -1436,7 +1580,7 @@
HRESULT GetValue(
[out] VARIANT *pvarValue);
-};
+}
[
object,
@@ -1455,7 +1599,7 @@
HRESULT EnumCompartments(
[out] IEnumGUID **ppEnum);
-};
+}
[
object,
@@ -1487,7 +1631,7 @@
HRESULT Skip(
[in] ULONG ulCount);
-};
+}
[
object,
@@ -1508,7 +1652,77 @@
HRESULT Skip(
[in] ULONG ulCount);
-};
+}
+
+[
+ object,
+ local,
+ uuid(ea1ea137-19df-11d7-a6d2-00065b84435c),
+ pointer_default(unique)
+]
+interface ITfUIElement : IUnknown
+{
+ HRESULT GetDescription(
+ [out] BSTR *description);
+
+ HRESULT GetGUID(
+ [out] GUID *guid);
+
+ HRESULT Show(
+ [in] BOOL show);
+
+ HRESULT IsShown(
+ [out] BOOL *show);
+}
+
+[
+ object,
+ local,
+ uuid(887aa91e-acba-4931-84da-3c5208cf543f),
+ pointer_default(unique)
+]
+interface IEnumTfUIElements : IUnknown
+{
+ HRESULT Clone(
+ [out] IEnumTfUIElements **enum_elements);
+
+ HRESULT Next(
+ [in] ULONG count,
+ [out, size_is(count), length_is(fetched)] ITfUIElement **element,
+ [out] ULONG fetched);
+
+ HRESULT Reset();
+
+ HRESULT Skip(
+ [in] ULONG count);
+}
+
+[
+ object,
+ local,
+ uuid(ea1ea135-19df-11d7-a6d2-00065b84435c),
+ pointer_default(unique)
+]
+interface ITfUIElementMgr : IUnknown
+{
+ HRESULT BeginUIElement(
+ [in] ITfUIElement *element,
+ [in, out] BOOL *show,
+ [out] DWORD *id);
+
+ HRESULT UpdateUIElement(
+ [in] DWORD id);
+
+ HRESULT EndUIElement(
+ [in] DWORD id);
+
+ HRESULT GetUIElement(
+ [in] DWORD id,
+ [out] ITfUIElement **element);
+
+ HRESULT EnumUIElements(
+ [out] IEnumTfUIElements **enum_elements);
+}
[
object,
@@ -1525,7 +1739,7 @@
HRESULT UnadviseSingleSink(
[in] TfClientId tid,
[in] REFIID riid);
-};
+}
[
object,
@@ -1538,7 +1752,7 @@
HRESULT OnSetThreadFocus();
HRESULT OnKillThreadFocus();
-};
+}
[
object,