- Update headers

svn path=/trunk/; revision=41057
This commit is contained in:
Dmitry Chapyshev 2009-05-23 10:17:04 +00:00
parent 3586ec74c7
commit 299f35372a
10 changed files with 308 additions and 1 deletions

View file

@ -181,6 +181,11 @@ enum ImageType
ImageTypeMetafile
};
enum WarpMode {
WarpModePerspective,
WarpModeBilinear
};
enum WrapMode
{
WrapModeTile,
@ -436,6 +441,7 @@ typedef enum DashStyle DashStyle;
typedef enum MatrixOrder MatrixOrder;
typedef enum ImageType ImageType;
typedef enum ImageFlags ImageFlags;
typedef enum WarpMode WarpMode;
typedef enum WrapMode WrapMode;
typedef enum MetafileType MetafileType;
typedef enum LinearGradientMode LinearGradientMode;

View file

@ -30,7 +30,10 @@ typedef WORD LANGID;
cpp_quote("#endif")
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)")
cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)")
cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)")
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;")
@ -92,6 +95,8 @@ typedef [uuid(77c12f95-b783-450d-879f-1cd2362c6521)] struct TF_PRESERVEDKEY
UINT uModifiers;
} TF_PRESERVEDKEY;
typedef [uuid(5a886226-ae9a-489b-b991-2b1e25ee59a9)] enum { TF_ANCHOR_START = 0, TF_ANCHOR_END = 1 } TfAnchor;
[
object,
uuid(aa80e801-2021-11d2-93e0-0060b067b86e),
@ -704,3 +709,167 @@ interface ITfClientId : IUnknown
[in] REFCLSID rclsid,
[out] TfClientId *ptid);
};
[
object,
uuid(43c9fe15-f494-4c17-9de2-b8a4ac350aa8),
pointer_default(unique)
]
interface ITfLanguageProfileNotifySink : IUnknown
{
HRESULT OnLanguageChange(
[in] LANGID langid,
[out] BOOL *pfAccept);
HRESULT OnLanguageChanged();
}
[
object,
uuid(aa80e803-2021-11d2-93e0-0060b067b86e),
pointer_default(unique)
]
interface ITfEditSession : IUnknown
{
HRESULT DoEditSession(
[in] TfEditCookie ec);
}
[
object,
uuid(aa80e7ff-2021-11d2-93e0-0060b067b86e),
pointer_default(unique)
]
interface ITfRange : IUnknown
{
const WCHAR TF_CHAR_EMBEDDED = TS_CHAR_EMBEDDED;
typedef [uuid(cf610f06-2882-46f6-abe5-298568b664c4)] enum { TF_GRAVITY_BACKWARD = 0, TF_GRAVITY_FORWARD = 1 } TfGravity;
typedef [uuid(1e512533-bbdc-4530-9a8e-a1dc0af67468)] enum { TF_SD_BACKWARD = 0, TF_SD_FORWARD = 1 } TfShiftDir;
const DWORD TF_HF_OBJECT = 1;
const DWORD TF_TF_MOVESTART = 1;
const DWORD TF_TF_IGNOREEND = 2;
const DWORD TF_ST_CORRECTION = 1;
const DWORD TF_IE_CORRECTION = 1;
typedef [uuid(49930d51-7d93-448c-a48c-fea5dac192b1)] struct TF_HALTCOND
{
ITfRange *pHaltRange;
TfAnchor aHaltPos;
DWORD dwFlags;
} TF_HALTCOND;
HRESULT GetText(
[in] TfEditCookie ec,
[in] DWORD dwFlags,
[out, size_is(cchMax), length_is(*pcch)] WCHAR *pchText,
[in] ULONG cchMax,
[out] ULONG *pcch);
HRESULT SetText(
[in] TfEditCookie ec,
[in] DWORD dwFlags,
[in, size_is(cch), unique] const WCHAR *pchText,
[in] LONG cch);
HRESULT GetFormattedText(
[in] TfEditCookie ec,
[out] IDataObject **ppDataObject);
HRESULT GetEmbedded(
[in] TfEditCookie ec,
[in] REFGUID rguidService,
[in] REFIID riid,
[out, iid_is(riid)] IUnknown **ppunk);
HRESULT InsertEmbedded(
[in] TfEditCookie ec,
[in] DWORD dwFlags,
[in] IDataObject *pDataObject);
HRESULT ShiftStart(
[in] TfEditCookie ec,
[in] LONG cchReq,
[out] LONG *pcch,
[in, unique] const TF_HALTCOND *pHalt);
HRESULT ShiftEnd(
[in] TfEditCookie ec,
[in] LONG cchReq,
[out] LONG *pcch,
[in, unique] const TF_HALTCOND *pHalt);
HRESULT ShiftStartToRange(
[in] TfEditCookie ec,
[in] ITfRange *pRange,
[in] TfAnchor aPos);
HRESULT ShiftEndToRange(
[in] TfEditCookie ec,
[in] ITfRange *pRange,
[in] TfAnchor aPos);
HRESULT ShiftStartRegion(
[in] TfEditCookie ec,
[in] TfShiftDir dir,
[out] BOOL *pfNoRegion);
HRESULT ShiftEndRegion(
[in] TfEditCookie ec,
[in] TfShiftDir dir,
[out] BOOL *pfNoRegion);
HRESULT IsEmpty(
[in] TfEditCookie ec,
[out] BOOL *pfEmpty);
HRESULT Collapse(
[in] TfEditCookie ec,
[in] TfAnchor aPos);
HRESULT IsEqualStart(
[in] TfEditCookie ec,
[in] ITfRange *pWith,
[in] TfAnchor aPos,
[out] BOOL *pfEqual);
HRESULT IsEqualEnd(
[in] TfEditCookie ec,
[in] ITfRange *pWith,
[in] TfAnchor aPos,
[out] BOOL *pfEqual);
HRESULT CompareStart(
[in] TfEditCookie ec,
[in] ITfRange *pWith,
[in] TfAnchor aPos,
[out] LONG *plResult);
HRESULT CompareEnd(
[in] TfEditCookie ec,
[in] ITfRange *pWith,
[in] TfAnchor aPos,
[out] LONG *plResult);
HRESULT AdjustForInsert(
[in] TfEditCookie ec,
[in] ULONG cchInsert,
[out] BOOL *pfInsertOk);
HRESULT GetGravity(
[out] TfGravity *pgStart,
[out] TfGravity *pgEnd);
HRESULT SetGravity(
[in] TfEditCookie ec,
[in] TfGravity gStart,
[in] TfGravity gEnd);
HRESULT Clone(
[out] ITfRange **ppClone);
HRESULT GetContext(
[out] ITfContext **ppContext);
};

View file

@ -989,7 +989,8 @@ interface ITypeLib : IUnknown
typedef [v1_enum] enum tagSYSKIND {
SYS_WIN16 = 0,
SYS_WIN32,
SYS_MAC
SYS_MAC,
SYS_WIN64
} SYSKIND;
typedef [v1_enum] enum tagLIBFLAGS {

View file

@ -640,6 +640,9 @@ extern "C" {
/* Flags for StringTableAddString and StringTableLookUpString */
#define ST_CASE_SENSITIVE_COMPARE 0x00000001
/* SetupUninstallOEMInf Flags values */
#define SUOI_FORCEDELETE 0x00000001
#ifndef RC_INVOKED
typedef PVOID HINF;
typedef PVOID HDSKSPC;

View file

@ -68,6 +68,21 @@ interface IPersistFolder2 : IPersistFolder
}
/*****************************************************************************
* IPersistIDList interface
*/
[
object,
uuid(1079acfc-29bd-11d3-8e0d-00c04f6837d5),
pointer_default(unique)
]
interface IPersistIDList : IPersist
{
HRESULT SetIDList( [in] LPCITEMIDLIST pidl );
HRESULT GetIDList( [out] LPITEMIDLIST *ppidl );
}
/*****************************************************************************
* IEnumIDList interface
*/
@ -340,7 +355,41 @@ interface IShellFolder2 : IShellFolder
HRESULT MapColumnToSCID( [in] UINT iColumn, [in] SHCOLUMNID *pscid );
}
/*****************************************************************************
* IShellItem interface
*/
[
object,
uuid(43826d1e-e718-42ee-bc55-a1e261c37bfe),
pointer_default(unique)
]
interface IShellItem : IUnknown
{
typedef DWORD SIGDN;
typedef DWORD SICHINTF;
HRESULT BindToHandler(
[in] IBindCtx *pbc,
[in] REFGUID rbhid,
[in] REFIID riid,
[out, iid_is(riid)] void **ppvOut);
HRESULT GetParent( [out] IShellItem **ppsi );
HRESULT GetDisplayName(
[in] SIGDN sigdnName,
[out] LPWSTR *ppszName);
HRESULT GetAttributes(
[in] SFGAOF sfgaoMask,
[out] SFGAOF *psfgaoAttribs);
HRESULT Compare(
[in] IShellItem *psi,
[in] SICHINTF hint,
[out] int *piOrder);
}
/*****************************************************************************
* FOLDERSETTINGS

View file

@ -20,6 +20,10 @@
import "oaidl.idl";
#endif
cpp_quote("#define TS_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)")
cpp_quote("#define TS_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)")
const ULONG TS_DEFAULT_SELECTION = ~0u;
const DWORD TS_SD_READONLY = 0x001;
@ -38,6 +42,13 @@ const DWORD TS_AS_STATUS_CHANGE = 0x10;
const DWORD TS_AS_ALL_SINKS = (TS_AS_TEXT_CHANGE | TS_AS_SEL_CHANGE | TS_AS_LAYOUT_CHANGE | TS_AS_ATTR_CHANGE | TS_AS_STATUS_CHANGE);
const DWORD TS_LF_SYNC = 0x1;
const DWORD TS_LF_READ = 0x2;
const DWORD TS_LF_READWRITE = 0x6;
const WCHAR TS_CHAR_EMBEDDED = 0xfffc;
const WCHAR TS_CHAR_REGION = 0x0000;
const WCHAR TS_CHAR_REPLACEMENT = 0xfffd;
typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd;
typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType;

View file

@ -0,0 +1,48 @@
/*
* TRAFFIC definitions
*
* Copyright (c) 2009 Stefan Leichter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_TRAFFIC_H
#define __WINE_TRAFFIC_H
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
typedef VOID (CALLBACK * TCI_ADD_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG);
typedef VOID (CALLBACK * TCI_DEL_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG);
typedef VOID (CALLBACK * TCI_MOD_FLOW_COMPLETE_HANDLER)(HANDLE, ULONG);
typedef VOID (CALLBACK * TCI_NOTIFY_HANDLER)
(HANDLE,HANDLE,ULONG,HANDLE,ULONG,PVOID);
typedef struct _TCI_CLIENT_FUNC_LIST
{
TCI_NOTIFY_HANDLER ClNotifyHandler;
TCI_ADD_FLOW_COMPLETE_HANDLER ClAddFlowCompleteHandler;
TCI_MOD_FLOW_COMPLETE_HANDLER ClModifyFlowCompleteHandler;
TCI_DEL_FLOW_COMPLETE_HANDLER ClDeleteFlowCompleteHandler;
} TCI_CLIENT_FUNC_LIST, *PTCI_CLIENT_FUNC_LIST;
ULONG WINAPI TcRegisterClient(ULONG,HANDLE,PTCI_CLIENT_FUNC_LIST,PHANDLE);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_TRAFFIC_H */

View file

@ -1499,6 +1499,20 @@ interface IUri : IUnknown
[out] BOOL *pfEqual);
}
/*****************************************************************************
* IUriContainer interface
*/
[
local,
object,
uuid(a158a630-ed6f-45fb-b987-f68676f57752),
pointer_default(unique)
]
interface IUriContainer : IUnknown
{
HRESULT GetIUri([out] IUri **ppIUri);
}
/*****************************************************************************
* IInternetProtocolEx interface
*/

View file

@ -2898,6 +2898,7 @@ int WINAPI FillRgn(HDC,HRGN,HBRUSH);
BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT);
BOOL WINAPI FlattenPath(HDC);
BOOL WINAPI FloodFill(HDC,int,int,COLORREF);
BOOL WINAPI GdiAlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
BOOL WINAPI GdiComment(HDC,UINT,const BYTE*);
BOOL WINAPI GdiFlush(void);
DWORD WINAPI GdiGetBatchLimit(void);

View file

@ -540,6 +540,7 @@ BOOLAPI InternetUnlockRequestFile(HANDLE);
#define INTERNET_OPTION_ERROR_MASK 62
#define INTERNET_OPTION_FROM_CACHE_TIMEOUT 63
#define INTERNET_OPTION_BYPASS_EDITED_ENTRY 64
#define INTERNET_OPTION_HTTP_DECODING 65
#define INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO 67
#define INTERNET_OPTION_CODEPAGE 68
#define INTERNET_OPTION_CACHE_TIMESTAMPS 69
@ -571,6 +572,10 @@ BOOLAPI InternetUnlockRequestFile(HANDLE);
#define INTERNET_OPTION_PROXY_SETTINGS_CHANGED 95
#define INTERNET_OPTION_DATAFILE_EXT 96
#define INTERNET_OPTION_CODEPAGE_PATH 100
#define INTERNET_OPTION_CODEPAGE_EXTRA 101
#define INTERNET_OPTION_IDN 102
#define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK
#define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT