Nikolay Sivov : include: Update msctf.idl.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu May 7 09:01:45 CDT 2015
Module: wine
Branch: master
Commit: 298216f1b66af05058aa8100caa7c71e15a20a9e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=298216f1b66af05058aa8100caa7c71e15a20a9e
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu May 7 13:01:57 2015 +0300
include: Update msctf.idl.
---
include/msctf.idl | 231 ++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 181 insertions(+), 50 deletions(-)
diff --git a/include/msctf.idl b/include/msctf.idl
index bce38ab..0e2b8b4 100644
--- a/include/msctf.idl
+++ b/include/msctf.idl
@@ -90,19 +90,12 @@ interface ITfDocumentMgr;
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 +132,46 @@ typedef [uuid(5a886226-ae9a-489b-b991-2b1e25ee59a9)] enum { TF_ANCHOR_START = 0
[
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 +211,7 @@ interface ITfThreadMgr: IUnknown
HRESULT GetGlobalCompartment(
[out] ITfCompartmentMgr **ppCompMgr);
-};
+}
[
object,
@@ -222,7 +255,87 @@ interface ITfDocumentMgr: IUnknown
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 +438,7 @@ interface ITfContext : IUnknown
[in] TfEditCookie ec,
[in] ITfRange *pRange,
[out] ITfRangeBackup **ppBackup);
-
-};
+}
const DWORD TF_INVALID_COOKIE = 0xffffffff;
@@ -344,7 +456,7 @@ interface ITfSource : IUnknown
HRESULT UnadviseSink(
[in] DWORD dwCookie);
-};
+}
[
object,
@@ -442,7 +554,7 @@ interface ITfInputProcessorProfiles : IUnknown
[in] LANGID langid,
[in] REFGUID guidProfile,
[in] HKL hKL);
-};
+}
typedef [uuid(44d2825a-10e5-43b2-877f-6cb2f43b7e7e)]
struct TF_INPUTPROCESSORPROFILE {
@@ -703,7 +815,45 @@ interface ITfCategoryMgr : IUnknown
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 +866,7 @@ interface ITfTextEditSink : IUnknown
[in] ITfContext *pic,
[in] TfEditCookie ecReadOnly,
[in] ITfEditRecord *pEditRecord);
-};
+}
[
object,
@@ -735,7 +885,7 @@ interface ITfContextOwnerCompositionSink : IUnknown
HRESULT OnEndComposition(
[in] ITfCompositionView *pComposition);
-};
+}
[
object,
@@ -769,7 +919,7 @@ interface IEnumTfLanguageProfiles : IUnknown
HRESULT Skip(
[in] ULONG ulCount);
-};
+}
[
object,
@@ -784,7 +934,7 @@ interface ITfTextInputProcessor : IUnknown
[in] TfClientId tid);
HRESULT Deactivate();
-};
+}
[
object,
@@ -808,7 +958,7 @@ interface ITfThreadMgrEventSink : IUnknown
HRESULT OnPopContext(
[in] ITfContext *pic);
-};
+}
[
object,
@@ -883,7 +1033,7 @@ interface ITfKeystrokeMgr : IUnknown
[in] ITfContext *pic,
[in] REFGUID rguid,
[out] BOOL *pfEaten);
-};
+}
[
object,
@@ -924,7 +1074,7 @@ interface ITfKeyEventSink : IUnknown
[in] ITfContext *pic,
[in] REFGUID rguid,
[out] BOOL *pfEaten);
-};
+}
[
object,
@@ -963,7 +1113,7 @@ interface ITfMessagePump : IUnknown
[in] UINT wMsgFilterMin,
[in] UINT wMsgFilterMax,
[out] BOOL *pfResult);
-};
+}
[
object,
@@ -976,7 +1126,7 @@ interface ITfClientId : IUnknown
HRESULT GetClientId(
[in] REFCLSID rclsid,
[out] TfClientId *ptid);
-};
+}
[
object,
@@ -1140,7 +1290,7 @@ interface ITfRange : IUnknown
HRESULT GetContext(
[out] ITfContext **ppContext);
-};
+}
[
object,
@@ -1179,7 +1329,7 @@ interface ITfInsertAtSelection : IUnknown
[in] DWORD dwFlags,
[in] IDataObject *pDataObject,
[out] ITfRange **ppRange);
-};
+}
[
object,
@@ -1223,25 +1373,6 @@ interface ITfPropertyStore : IUnknown
[
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(5efd22Ba-7838-46cb-88e2-cadb14124f8f),
pointer_default(unique)
]
@@ -1436,7 +1567,7 @@ interface ITfCompartment : IUnknown
HRESULT GetValue(
[out] VARIANT *pvarValue);
-};
+}
[
object,
@@ -1455,7 +1586,7 @@ interface ITfCompartmentMgr : IUnknown
HRESULT EnumCompartments(
[out] IEnumGUID **ppEnum);
-};
+}
[
object,
@@ -1487,7 +1618,7 @@ interface IEnumTfContexts : IUnknown
HRESULT Skip(
[in] ULONG ulCount);
-};
+}
[
object,
@@ -1508,7 +1639,7 @@ interface IEnumTfDocumentMgrs : IUnknown
HRESULT Skip(
[in] ULONG ulCount);
-};
+}
[
object,
@@ -1525,7 +1656,7 @@ interface ITfSourceSingle : IUnknown
HRESULT UnadviseSingleSink(
[in] TfClientId tid,
[in] REFIID riid);
-};
+}
[
object,
@@ -1538,7 +1669,7 @@ interface ITfThreadFocusSink : IUnknown
HRESULT OnSetThreadFocus();
HRESULT OnKillThreadFocus();
-};
+}
[
object,
More information about the wine-cvs
mailing list