[ros-diffs] [dchapyshev] 40845: - Sync headers with Wine 1.1.21
dchapyshev at svn.reactos.org
dchapyshev at svn.reactos.org
Sat May 9 11:17:00 CEST 2009
Author: dchapyshev
Date: Sat May 9 13:16:59 2009
New Revision: 40845
URL: http://svn.reactos.org/svn/reactos?rev=40845&view=rev
Log:
- Sync headers with Wine 1.1.21
Modified:
trunk/reactos/include/psdk/gdiplusflat.h
trunk/reactos/include/psdk/gdiplusimaging.h
trunk/reactos/include/psdk/msctf.idl
trunk/reactos/include/psdk/pdh.h
Modified: trunk/reactos/include/psdk/gdiplusflat.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h?rev=40845&r1=40844&r2=40845&view=diff
==============================================================================
--- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Sat May 9 13:16:59 2009
@@ -82,6 +82,7 @@
GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**);
GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**);
GpStatus WINGDIPAPI GdipDeleteFont(GpFont*);
+GpStatus WINGDIPAPI GdipGetLogFontA(GpFont*,GpGraphics*,LOGFONTA*);
GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*);
GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**);
GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*);
@@ -92,6 +93,7 @@
GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*);
/* FontCollection */
+GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**);
GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**);
GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**);
GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*);
@@ -326,6 +328,7 @@
GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*);
GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*);
GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*);
+GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage*,UINT,UINT,GpImage**,GetThumbnailImageAbort,VOID*);
GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*);
GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*);
GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*);
@@ -337,6 +340,7 @@
GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*);
GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*);
GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT);
+GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType);
GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT);
GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**);
GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**);
@@ -380,6 +384,8 @@
GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*);
GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*,
GDIPCONST REAL*,INT);
+GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT);
+GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*);
GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB);
GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL);
GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL);
Modified: trunk/reactos/include/psdk/gdiplusimaging.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusimaging.h?rev=40845&r1=40844&r2=40845&view=diff
==============================================================================
--- trunk/reactos/include/psdk/gdiplusimaging.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/gdiplusimaging.h [iso-8859-1] Sat May 9 13:16:59 2009
@@ -38,6 +38,33 @@
ImageLockModeUserInputBuf = 4
};
+enum RotateFlipType
+{
+ RotateNoneFlipNone = 0,
+ Rotate180FlipXY = RotateNoneFlipNone,
+
+ Rotate90FlipNone = 1,
+ Rotate270FlipXY = Rotate90FlipNone,
+
+ Rotate180FlipNone = 2,
+ RotateNoneFlipXY = Rotate180FlipNone,
+
+ Rotate270FlipNone = 3,
+ Rotate90FlipXY = Rotate270FlipNone,
+
+ RotateNoneFlipX = 4,
+ Rotate180FlipY = RotateNoneFlipX,
+
+ Rotate90FlipX = 5,
+ Rotate270FlipY = Rotate90FlipX,
+
+ Rotate180FlipX = 6,
+ RotateNoneFlipY = Rotate180FlipX,
+
+ Rotate270FlipX = 7,
+ Rotate90FlipY = Rotate270FlipX
+};
+
#ifdef __cplusplus
class EncoderParameter
{
@@ -108,6 +135,7 @@
#else /* end of c++ typedefs */
typedef enum ImageLockMode ImageLockMode;
+typedef enum RotateFlipType RotateFlipType;
typedef struct EncoderParameter
{
Modified: trunk/reactos/include/psdk/msctf.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev=40845&r1=40844&r2=40845&view=diff
==============================================================================
--- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Sat May 9 13:16:59 2009
@@ -22,6 +22,7 @@
import "textstor.idl";
/* import "ctfutb.idl"; */
#endif
+cpp_quote("#include <winuser.h>")
/* FIXME: LANGID is defined in winnt.h and mlang.h in the platform SDK */
cpp_quote("#ifndef _WINNT_H")
@@ -651,3 +652,55 @@
[in] REFGUID rguid,
[out] BOOL *pfEaten);
};
+
+[
+ object,
+ local,
+ uuid(8f1b8ad8-0b6b-4874-90c5-bd76011e8f7c),
+ pointer_default(unique)
+]
+interface ITfMessagePump : IUnknown
+{
+ HRESULT PeekMessageA(
+ [out] LPMSG pMsg,
+ [in] HWND hwnd,
+ [in] UINT wMsgFilterMin,
+ [in] UINT wMsgFilterMax,
+ [in] UINT wRemoveMsg,
+ [out] BOOL *pfResult);
+
+ HRESULT GetMessageA(
+ [out] LPMSG pMsg,
+ [in] HWND hwnd,
+ [in] UINT wMsgFilterMin,
+ [in] UINT wMsgFilterMax,
+ [out] BOOL *pfResult);
+
+ HRESULT PeekMessageW(
+ [out] LPMSG pMsg,
+ [in] HWND hwnd,
+ [in] UINT wMsgFilterMin,
+ [in] UINT wMsgFilterMax,
+ [in] UINT wRemoveMsg,
+ [out] BOOL *pfResult);
+
+ HRESULT GetMessageW(
+ [out] LPMSG pMsg,
+ [in] HWND hwnd,
+ [in] UINT wMsgFilterMin,
+ [in] UINT wMsgFilterMax,
+ [out] BOOL *pfResult);
+};
+
+[
+ object,
+ local,
+ uuid(d60a7b49-1b9f-4be2-b702-47e9dc05dec3),
+ pointer_default(unique)
+]
+interface ITfClientId : IUnknown
+{
+ HRESULT GetClientId(
+ [in] REFCLSID rclsid,
+ [out] TfClientId *ptid);
+};
Modified: trunk/reactos/include/psdk/pdh.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pdh.h?rev=40845&r1=40844&r2=40845&view=diff
==============================================================================
--- trunk/reactos/include/psdk/pdh.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/pdh.h [iso-8859-1] Sat May 9 13:16:59 2009
@@ -190,6 +190,9 @@
PDH_STATUS WINAPI PdhLookupPerfNameByIndexA(LPCSTR, DWORD, LPSTR, LPDWORD);
PDH_STATUS WINAPI PdhLookupPerfNameByIndexW(LPCWSTR, DWORD, LPWSTR, LPDWORD);
#define PdhLookupPerfNameByIndex WINELIB_NAME_AW(PdhLookupPerfNameByIndex)
+PDH_STATUS WINAPI PdhMakeCounterPathA(PDH_COUNTER_PATH_ELEMENTS_A *, LPSTR, LPDWORD, DWORD);
+PDH_STATUS WINAPI PdhMakeCounterPathW(PDH_COUNTER_PATH_ELEMENTS_W *, LPWSTR, LPDWORD, DWORD);
+#define PdhMakeCounterPath WINELIB_NAME_AW(PdhMakeCounterPath)
PDH_STATUS WINAPI PdhOpenQueryA(LPCSTR, DWORD_PTR, PDH_HQUERY *);
PDH_STATUS WINAPI PdhOpenQueryW(LPCWSTR, DWORD_PTR, PDH_HQUERY *);
#define PdhOpenQuery WINELIB_NAME_AW(PdhOpenQuery)
More information about the Ros-diffs
mailing list