mirror of
https://github.com/reactos/reactos.git
synced 2024-09-08 19:59:49 +00:00
Header updates from Samuel
svn path=/trunk/; revision=33081
This commit is contained in:
parent
bab8dc90be
commit
24328c0181
|
@ -344,7 +344,7 @@ BOOL WINAPI ImmGetConversionStatus(HIMC,LPDWORD,PDWORD);
|
||||||
BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD);
|
BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD);
|
||||||
BOOL WINAPI ImmGetOpenStatus(HIMC);
|
BOOL WINAPI ImmGetOpenStatus(HIMC);
|
||||||
BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL);
|
BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL);
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA);
|
BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA);
|
||||||
BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW);
|
BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW);
|
||||||
BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA);
|
BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA);
|
||||||
|
|
|
@ -37,7 +37,6 @@ extern "C" {
|
||||||
#define REG_NOTIFY_CHANGE_LAST_SET 4
|
#define REG_NOTIFY_CHANGE_LAST_SET 4
|
||||||
#define REG_NOTIFY_CHANGE_SECURITY 8
|
#define REG_NOTIFY_CHANGE_SECURITY 8
|
||||||
|
|
||||||
#if (_WIN32_WINNT >= 0x0600)
|
|
||||||
#define RRF_RT_REG_NONE (1 << 0)
|
#define RRF_RT_REG_NONE (1 << 0)
|
||||||
#define RRF_RT_REG_SZ (1 << 1)
|
#define RRF_RT_REG_SZ (1 << 1)
|
||||||
#define RRF_RT_REG_EXPAND_SZ (1 << 2)
|
#define RRF_RT_REG_EXPAND_SZ (1 << 2)
|
||||||
|
@ -50,7 +49,6 @@ extern "C" {
|
||||||
#define RRF_RT_ANY (0x0000FFFF)
|
#define RRF_RT_ANY (0x0000FFFF)
|
||||||
#define RRF_NOEXPAND (1 << 28)
|
#define RRF_NOEXPAND (1 << 28)
|
||||||
#define RRF_ZEROONFAILURE (1 << 29)
|
#define RRF_ZEROONFAILURE (1 << 29)
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef RC_INVOKED
|
#ifndef RC_INVOKED
|
||||||
typedef ACCESS_MASK REGSAM;
|
typedef ACCESS_MASK REGSAM;
|
||||||
|
|
|
@ -3027,7 +3027,7 @@ typedef struct tagHIGHCONTRASTW {
|
||||||
DWORD dwFlags;
|
DWORD dwFlags;
|
||||||
LPWSTR lpszDefaultScheme;
|
LPWSTR lpszDefaultScheme;
|
||||||
} HIGHCONTRASTW,*LPHIGHCONTRASTW;
|
} HIGHCONTRASTW,*LPHIGHCONTRASTW;
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
typedef struct tagICONMETRICSA {
|
typedef struct tagICONMETRICSA {
|
||||||
UINT cbSize;
|
UINT cbSize;
|
||||||
int iHorzSpacing;
|
int iHorzSpacing;
|
||||||
|
@ -3059,7 +3059,7 @@ typedef struct tagMOUSEKEYS{
|
||||||
DWORD dwReserved1;
|
DWORD dwReserved1;
|
||||||
DWORD dwReserved2;
|
DWORD dwReserved2;
|
||||||
} MOUSEKEYS,*LPMOUSEKEYS;
|
} MOUSEKEYS,*LPMOUSEKEYS;
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
typedef struct tagNONCLIENTMETRICSA {
|
typedef struct tagNONCLIENTMETRICSA {
|
||||||
UINT cbSize;
|
UINT cbSize;
|
||||||
int iBorderWidth;
|
int iBorderWidth;
|
||||||
|
@ -3552,7 +3552,7 @@ LRESULT WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
|
||||||
LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
|
LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
|
||||||
WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*);
|
WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*);
|
||||||
BOOL WINAPI ChangeClipboardChain(HWND,HWND);
|
BOOL WINAPI ChangeClipboardChain(HWND,HWND);
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD);
|
LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD);
|
||||||
LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD);
|
LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD);
|
||||||
LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
|
LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
|
||||||
|
@ -3603,7 +3603,7 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int);
|
||||||
HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
|
HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
|
||||||
BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
|
BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
|
||||||
HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
|
HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
|
HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
|
||||||
HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
|
HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
|
||||||
#endif
|
#endif
|
||||||
|
@ -3704,7 +3704,7 @@ BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
|
||||||
BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
|
BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
|
||||||
BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM);
|
BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM);
|
||||||
BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
|
BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
|
BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
|
||||||
BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
|
BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
|
||||||
#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
|
#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
|
||||||
|
@ -4215,7 +4215,7 @@ BOOL WINAPI LockSetForegroundWindow(UINT);
|
||||||
#endif
|
#endif
|
||||||
#if (_WIN32_WINNT >= 0x0500)
|
#if (_WIN32_WINNT >= 0x0500)
|
||||||
BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
|
BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
|
BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -4548,7 +4548,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
|
||||||
#define WinHelp WinHelpA
|
#define WinHelp WinHelpA
|
||||||
#define wsprintf wsprintfA
|
#define wsprintf wsprintfA
|
||||||
#define wvsprintf wvsprintfA
|
#define wvsprintf wvsprintfA
|
||||||
#ifndef NOGDI
|
#if defined(_WINGDI_) && !defined(NOGDI)
|
||||||
typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
|
typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
|
||||||
typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
|
typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
|
||||||
#define ChangeDisplaySettings ChangeDisplaySettingsA
|
#define ChangeDisplaySettings ChangeDisplaySettingsA
|
||||||
|
|
Loading…
Reference in a new issue