[ros-diffs] [dchapyshev] 40811: - Sync headers with Wine 1.1.20
dchapyshev at svn.reactos.org
dchapyshev at svn.reactos.org
Wed May 6 10:44:14 CEST 2009
Author: dchapyshev
Date: Wed May 6 12:44:13 2009
New Revision: 40811
URL: http://svn.reactos.org/svn/reactos?rev=40811&view=rev
Log:
- Sync headers with Wine 1.1.20
Modified:
trunk/reactos/include/psdk/msctf.idl
trunk/reactos/include/psdk/urlmon.idl
Modified: trunk/reactos/include/psdk/msctf.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev=40811&r1=40810&r2=40811&view=diff
==============================================================================
--- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Wed May 6 12:44:13 2009
@@ -29,6 +29,7 @@
cpp_quote("#endif")
cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)")
+cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)")
cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;")
cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;")
cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;")
@@ -42,6 +43,18 @@
typedef [uuid(7213778c-7bb0-4270-b050-6189ee594e97)] DWORD TfEditCookie;
typedef [uuid(de403c21-89fd-4f85-8b87-64584d063fbc)] DWORD TfClientId;
typedef [uuid(88a9c478-f3ec-4763-8345-cd9250443f8d)] DWORD TfGuidAtom;
+
+cpp_quote("#define TF_MOD_ALT 0x0001")
+cpp_quote("#define TF_MOD_CONTROL 0x0002")
+cpp_quote("#define TF_MOD_SHIFT 0x0004")
+cpp_quote("#define TF_MOD_RALT 0x0008")
+cpp_quote("#define TF_MOD_RCONTROL 0x0010")
+cpp_quote("#define TF_MOD_RSHIFT 0x0020")
+cpp_quote("#define TF_MOD_LALT 0x0040")
+cpp_quote("#define TF_MOD_LCONTROL 0x0080")
+cpp_quote("#define TF_MOD_LSHIFT 0x0100")
+cpp_quote("#define TF_MOD_ON_KEYUP 0x0200")
+cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400")
interface ITfDocumentMgr;
interface ITfContext;
@@ -61,6 +74,7 @@
interface IEnumTfLanguageProfiles;
interface ITfEditRecord;
interface ITfCompositionView;
+interface ITfKeyEventSink;
typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE
{
@@ -71,6 +85,12 @@
GUID guidProfile;
} TF_LANGUAGEPROFILE;
+typedef [uuid(77c12f95-b783-450d-879f-1cd2362c6521)] struct TF_PRESERVEDKEY
+{
+ UINT uVKey;
+ UINT uModifiers;
+} TF_PRESERVEDKEY;
+
[
object,
uuid(aa80e801-2021-11d2-93e0-0060b067b86e),
@@ -515,3 +535,119 @@
HRESULT OnPopContext(
[in] ITfContext *pic);
};
+
+[
+ object,
+ local,
+ uuid(aa80e7f0-2021-11d2-93e0-0060b067b86e),
+ pointer_default(unique)
+]
+interface ITfKeystrokeMgr : IUnknown
+{
+ HRESULT AdviseKeyEventSink(
+ [in] TfClientId tid,
+ [in] ITfKeyEventSink *pSink,
+ [in] BOOL fForeground);
+
+ HRESULT UnadviseKeyEventSink(
+ [in] TfClientId tid);
+
+ HRESULT GetForeground(
+ [out] CLSID *pclsid);
+
+ HRESULT TestKeyDown(
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT TestKeyUp(
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT KeyDown(
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT KeyUp(
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT GetPreservedKey(
+ [in] ITfContext *pic,
+ [in] const TF_PRESERVEDKEY *pprekey,
+ [out] GUID *pguid);
+
+ HRESULT IsPreservedKey(
+ [in] REFGUID rguid,
+ [in] const TF_PRESERVEDKEY *pprekey,
+ [out] BOOL *pfRegistered);
+
+ HRESULT PreserveKey(
+ [in] TfClientId tid,
+ [in] REFGUID rguid,
+ [in] const TF_PRESERVEDKEY *prekey,
+ [in, size_is(cchDesc)] const WCHAR *pchDesc,
+ [in] ULONG cchDesc);
+
+ HRESULT UnpreserveKey(
+ [in] REFGUID rguid,
+ [in] const TF_PRESERVEDKEY *pprekey);
+
+ HRESULT SetPreservedKeyDescription(
+ [in] REFGUID rguid,
+ [in, size_is(cchDesc)] const WCHAR *pchDesc,
+ [in] ULONG cchDesc);
+
+ HRESULT GetPreservedKeyDescription(
+ [in] REFGUID rguid,
+ [out] BSTR *pbstrDesc);
+
+ HRESULT SimulatePreservedKey(
+ [in] ITfContext *pic,
+ [in] REFGUID rguid,
+ [out] BOOL *pfEaten);
+};
+
+[
+ object,
+ local,
+ uuid(aa80e7f5-2021-11d2-93e0-0060b067b86e),
+ pointer_default(unique)
+]
+interface ITfKeyEventSink : IUnknown
+{
+ HRESULT OnSetFocus(
+ [in] BOOL fForeground);
+
+ HRESULT OnTestKeyDown(
+ [in] ITfContext *pic,
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT OnTestKeyUp(
+ [in] ITfContext *pic,
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT OnKeyDown(
+ [in] ITfContext *pic,
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT OnKeyUp(
+ [in] ITfContext *pic,
+ [in] WPARAM wParam,
+ [in] LPARAM lParam,
+ [out] BOOL *pfEaten);
+
+ HRESULT OnPreservedKey(
+ [in] ITfContext *pic,
+ [in] REFGUID rguid,
+ [out] BOOL *pfEaten);
+};
Modified: trunk/reactos/include/psdk/urlmon.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?rev=40811&r1=40810&r2=40811&view=diff
==============================================================================
--- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Wed May 6 12:44:13 2009
@@ -703,7 +703,7 @@
[in] IInternetProtocolSink *pOIProtSink,
[in] IInternetBindInfo *pOIBindInfo,
[in] DWORD grfPI,
- [in] DWORD dwReserved);
+ [in] HANDLE_PTR dwReserved);
HRESULT Continue(
[in] PROTOCOLDATA *pProtocolData);
@@ -1367,6 +1367,14 @@
FEATURE_ENTRY_COUNT
} INTERNETFEATURELIST;
+typedef struct _tagPROTOCOLFILTERDATA {
+ DWORD cbSize;
+ IInternetProtocolSink *pProtocolSink;
+ IInternetProtocol *pProtocol;
+ IUnknown *pUnk;
+ DWORD dwFilterFlags;
+} PROTOCOLFILTERDATA;
+
/*****************************************************************************
* IUri interface
*/
@@ -1513,6 +1521,7 @@
cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);")
cpp_quote("DEFINE_GUID(IID_IAsyncBindCtx, 0x79EAC9D4, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);")
cpp_quote("DEFINE_GUID(CLSID_StdURLMoniker, 0x79EAC9E0, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);")
+cpp_quote("DEFINE_GUID(CLSID_DeCompMimeFilter, 0x8f6b0360, 0xb80d, 0x11d0, 0xa9,0xb3, 0x00,0x60,0x97,0x94,0x23,0x11);")
cpp_quote("DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02);")
cpp_quote("DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);")
More information about the Ros-diffs
mailing list