[zguo] 33081: Header updates from Samuel

Author: zguo
Date: Sun Apr 20 21:13:57 2008
New Revision: 33081

URL: http://svn.reactos.org/svn/reactos?rev=33081&view=rev
Log:
Header updates from Samuel

Modified:
    trunk/reactos/include/psdk/imm.h
    trunk/reactos/include/psdk/winreg.h
    trunk/reactos/include/psdk/winuser.h

Modified: trunk/reactos/include/psdk/imm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=330…
==============================================================================
--- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Sun Apr 20 21:13:57 2008
@@ -344,7 +344,7 @@
 BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD);
 BOOL WINAPI ImmGetOpenStatus(HIMC);
 BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL);
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA);
 BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW);
 BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA);

Modified: trunk/reactos/include/psdk/winreg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/winreg.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winreg.h [iso-8859-1] Sun Apr 20 21:13:57 2008
@@ -37,7 +37,6 @@
 #define REG_NOTIFY_CHANGE_LAST_SET 4
 #define REG_NOTIFY_CHANGE_SECURITY 8
 
-#if (_WIN32_WINNT >= 0x0600)
 #define RRF_RT_REG_NONE         (1 << 0)
 #define RRF_RT_REG_SZ           (1 << 1)
 #define RRF_RT_REG_EXPAND_SZ    (1 << 2)
@@ -50,7 +49,6 @@
 #define RRF_RT_ANY              (0x0000FFFF)
 #define RRF_NOEXPAND            (1 << 28)
 #define RRF_ZEROONFAILURE       (1 << 29)
-#endif
 
 #ifndef RC_INVOKED
 typedef ACCESS_MASK REGSAM;

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Apr 20 21:13:57 2008
@@ -3027,7 +3027,7 @@
 	DWORD dwFlags;
 	LPWSTR lpszDefaultScheme;
 } HIGHCONTRASTW,*LPHIGHCONTRASTW;
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 typedef struct tagICONMETRICSA {
 	UINT cbSize;
 	int iHorzSpacing;
@@ -3059,7 +3059,7 @@
 	DWORD dwReserved1;
 	DWORD dwReserved2;
 } MOUSEKEYS,*LPMOUSEKEYS;
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 typedef struct tagNONCLIENTMETRICSA {
 	UINT cbSize;
 	int iBorderWidth;
@@ -3552,7 +3552,7 @@
 LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
 WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*);
 BOOL WINAPI ChangeClipboardChain(HWND,HWND);
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD);
 LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD);
 LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
@@ -3603,7 +3603,7 @@
 HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
 BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
 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
CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
 #endif
@@ -3704,7 +3704,7 @@
 BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
 BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM);
 BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
 BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
 #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
@@ -4215,7 +4215,7 @@
 #endif
 #if (_WIN32_WINNT >= 0x0500)
 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);
 #endif
 #endif
@@ -4548,7 +4548,7 @@
 #define WinHelp WinHelpA
 #define wsprintf wsprintfA
 #define wvsprintf wvsprintfA
-#ifndef NOGDI
+#if defined(_WINGDI_) && !defined(NOGDI)
 typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
 typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define ChangeDisplaySettings ChangeDisplaySettingsA