Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 09:16:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK]

Browse source 
- Fix the CMYK macro which was totally broken.
- Code formatting around RGB macro.

svn path=/trunk/; revision=63497
This commit is contained in:
Hermès Bélusca-Maïto 2014-05-29 22:37:43 +00:00
parent cb2c49a1ea
commit 63f0cf2a3a
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
reactos/include/psdk/wingdi.h
View file

@ -2894,11 +2894,17 @@ typedef UINT (CALLBACK *LPFNDEVMODE)(HWND,HMODULE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMO
typedef DWORD (CALLBACK *LPFNDEVCAPS)(LPSTR,LPSTR,UINT,LPSTR,LPDEVMODEA); typedef DWORD (CALLBACK *LPFNDEVCAPS)(LPSTR,LPSTR,UINT,LPSTR,LPDEVMODEA);
#define RGB(r,g,b) ((DWORD)(((BYTE)(r)|((WORD)(g)<<8))|(((DWORD)(BYTE)(b))<<16))) #define GetRValue(rgb) ((BYTE)(rgb))
#define GetGValue(rgb) ((BYTE)(((WORD)(rgb)) >> 8))
#define GetBValue(rgb) ((BYTE)((rgb)>>16))
#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
#define PALETTERGB(r,g,b) (0x02000000 | RGB(r,g,b))
#define PALETTEINDEX(i) ((COLORREF)(0x01000000 | (DWORD)(WORD)(i)))
#define MAKEPOINTS(l) (*((POINTS*)&(l))) #define MAKEPOINTS(l) (*((POINTS*)&(l)))
#define MAKEROP4(f,b) (DWORD)((((b)<<8)&0xFF000000)|(f)) #define MAKEROP4(f,b) (DWORD)((((b)<<8)&0xFF000000)|(f))
#define PALETTEINDEX(i) ((0x01000000|(COLORREF)(WORD)(i)))
#define PALETTERGB(r,g,b) (0x02000000|RGB(r,g,b))
int WINAPI AbortDoc(_In_ HDC); int WINAPI AbortDoc(_In_ HDC);
BOOL WINAPI AbortPath(_In_ HDC); BOOL WINAPI AbortPath(_In_ HDC);
int WINAPI AddFontResourceA(LPCSTR); int WINAPI AddFontResourceA(LPCSTR);
@ -3197,14 +3203,13 @@ GdiGradientFill(
BOOL WINAPI GdiTransparentBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ UINT); BOOL WINAPI GdiTransparentBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ UINT);
BOOL WINAPI GdiIsMetaFileDC(HDC); BOOL WINAPI GdiIsMetaFileDC(HDC);
#define GetCValue(cmyk) ((BYTE)(cmyk))
#define GetMValue(cmyk) ((BYTE)((cmyk)>> 8)) #define GetKValue(cmyk) ((BYTE)(cmyk))
#define GetYValue(cmyk) ((BYTE)((cmyk)>>16)) #define GetYValue(cmyk) ((BYTE)((cmyk)>> 8))
#define GetKValue(cmyk) ((BYTE)((cmyk)>>24)) #define GetMValue(cmyk) ((BYTE)((cmyk)>>16))
#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(c)|((WORD)((BYTE)(m))<<8))|(((DWORD)(BYTE)(y))<<16))|(((DWORD)(BYTE)(k))<<24))) #define GetCValue(cmyk) ((BYTE)((cmyk)>>24))
#define GetRValue(c) ((BYTE)(c)) #define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
#define GetGValue(c) ((BYTE)(((WORD)(c))>>8))
#define GetBValue(c) ((BYTE)((c)>>16))
int WINAPI GetArcDirection(_In_ HDC); int WINAPI GetArcDirection(_In_ HDC);
BOOL WINAPI GetAspectRatioFilterEx(_In_ HDC, _Out_ LPSIZE); BOOL WINAPI GetAspectRatioFilterEx(_In_ HDC, _Out_ LPSIZE);