From aa78c4f6f32d58c70fb8bde30c7b2555b65475df Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Fri, 14 Nov 2008 23:23:30 +0000 Subject: [PATCH] - Remove more duplicate definitions - Make definitions compatible when they are present in multiple headers svn path=/trunk/; revision=37368 --- reactos/include/psdk/shellapi.h | 3 --- reactos/include/psdk/winbase.h | 8 +------ reactos/include/psdk/winnls.h | 3 ++- reactos/include/psdk/winnt.h | 6 +---- reactos/include/psdk/winuser.h | 29 +++++++---------------- reactos/include/reactos/win32k/callback.h | 2 -- 6 files changed, 12 insertions(+), 39 deletions(-) diff --git a/reactos/include/psdk/shellapi.h b/reactos/include/psdk/shellapi.h index 0ec5510a089..3af5034076a 100644 --- a/reactos/include/psdk/shellapi.h +++ b/reactos/include/psdk/shellapi.h @@ -126,9 +126,6 @@ extern "C" { #define SHGFI_SHELLICONSIZE 4 #define SHGFI_PIDL 8 #define SHGFI_USEFILEATTRIBUTES 16 -#define SHERB_NOCONFIRMATION 1 -#define SHERB_NOPROGRESSUI 2 -#define SHERB_NOSOUND 4 typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; diff --git a/reactos/include/psdk/winbase.h b/reactos/include/psdk/winbase.h index 21363ee54b3..cfc130ee007 100644 --- a/reactos/include/psdk/winbase.h +++ b/reactos/include/psdk/winbase.h @@ -850,7 +850,7 @@ typedef struct _WIN32_FIND_DATAW { typedef enum _STREAM_INFO_LEVELS { FindStreamInfoStandard } STREAM_INFO_LEVELS; -typedef struct _WIN32_FIND_STREAM_DATAW { +typedef struct _WIN32_FIND_STREAM_DATA { LARGE_INTEGER StreamSize; WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA, *PWIN32_FIND_STREAM_DATA; @@ -1085,9 +1085,6 @@ typedef LONG(CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(LPEXCEPTION_POINTERS); typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; typedef void(APIENTRY *PAPCFUNC)(ULONG_PTR); typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD); -#if (_WIN32_WINNT >= 0x0500) -typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN); -#endif #if (_WIN32_WINNT >= 0x0600) typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); #endif @@ -2196,9 +2193,6 @@ BOOL WINAPI MapUserPhysicalPagesScatter(PVOID*,ULONG_PTR,PULONG_PTR); #ifdef UNICODE typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO; typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA; -#if (_WIN32_WINNT >= 0x0501) -typedef WIN32_FIND_STREAM_DATA WIN32_FIND_STREAM_DATA,*LPWIN32_FIND_STREAM_DATA; -#endif typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; typedef ENUMRESLANGPROCW ENUMRESLANGPROC; typedef ENUMRESNAMEPROCW ENUMRESNAMEPROC; diff --git a/reactos/include/psdk/winnls.h b/reactos/include/psdk/winnls.h index fb51248218d..28750a00ca2 100644 --- a/reactos/include/psdk/winnls.h +++ b/reactos/include/psdk/winnls.h @@ -167,7 +167,9 @@ extern "C" { #define WC_DEFAULTCHAR 0x0040 #define WC_ERR_INVALID_CHARS 0x0080 #define WC_COMPOSITECHECK 0x0200 +#if (WINVER >= 0x0500) #define WC_NO_BEST_FIT_CHARS 0x0400 +#endif #define CP_ACP 0 #define CP_OEMCP 1 @@ -426,7 +428,6 @@ extern "C" { #define DATE_LTRREADING 16 #define DATE_RTLREADING 32 #define MAP_EXPAND_LIGATURES 0x2000 -#define WC_NO_BEST_FIT_CHARS 1024 #define CAL_SYEARMONTH 47 #define CAL_ITWODIGITYEARMAX 48 #define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index d78f2fe49e9..d1138a501e1 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -2837,7 +2837,7 @@ typedef CONTEXT *PCONTEXT,*LPCONTEXT; PVOID ExceptionAddress; DWORD NumberParameters; ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; - } EXCEPTION_RECORD, *PEXCEPTION_RECORD, *LPEXCEPTION_RECORD; + } EXCEPTION_RECORD; typedef EXCEPTION_RECORD *PEXCEPTION_RECORD; @@ -3864,7 +3864,6 @@ typedef struct _IMAGE_BOUND_FORWARDER_REF { WORD OffsetModuleName; WORD Reserved; } IMAGE_BOUND_FORWARDER_REF,*PIMAGE_BOUND_FORWARDER_REF; -typedef void(NTAPI *PIMAGE_TLS_CALLBACK)(PVOID,DWORD,PVOID); typedef struct _IMAGE_RESOURCE_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; @@ -4381,9 +4380,6 @@ typedef enum _POWER_INFORMATION_LEVEL { ProcessorPowerPolicyCurrent } POWER_INFORMATION_LEVEL; -#if (_WIN32_WINNT >= 0x0500) -typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS); -#endif #if 1 /* (WIN32_WINNT >= 0x0500) */ typedef struct _SYSTEM_POWER_INFORMATION { ULONG MaxIdlenessAllowed; diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h index c29848fc4fe..2682662525f 100644 --- a/reactos/include/psdk/winuser.h +++ b/reactos/include/psdk/winuser.h @@ -1779,14 +1779,6 @@ extern "C" { #define WM_CHANGEUISTATE 295 #define WM_UPDATEUISTATE 296 #define WM_QUERYUISTATE 297 -#define UIS_SET 1 -#define UIS_CLEAR 2 -#define UIS_INITIALIZE 3 -#define UISF_HIDEFOCUS 1 -#define UISF_HIDEACCEL 2 -#if(_WIN32_WINNT >= 0x0501) -#define UISF_ACTIVE 4 -#endif /* _WIN32_WINNT >= 0x0501 */ #endif /* _WIN32_WINNT >= 0x0500 */ #endif /* _WIN32_WCE */ #define BM_CLICK 245 @@ -2470,14 +2462,10 @@ extern "C" { #define HBMMENU_POPUP_RESTORE ((HBITMAP)9) #define HBMMENU_POPUP_MAXIMIZE ((HBITMAP)10) #define HBMMENU_POPUP_MINIMIZE ((HBITMAP)11) -#define MOD_ALT 1 -#define MOD_CONTROL 2 -#define MOD_SHIFT 4 -#define MOD_WIN 8 -#define MOD_IGNORE_ALL_MODIFIER 1024 -#define MOD_ON_KEYUP 2048 -#define MOD_RIGHT 16384 -#define MOD_LEFT 32768 +#define MOD_ALT 0x0001 +#define MOD_CONTROL 0x0002 +#define MOD_SHIFT 0x0004 +#define MOD_WIN 0x0008 #define LLKHF_EXTENDED 0x00000001 #define LLKHF_INJECTED 0x00000010 #define LLKHF_ALTDOWN 0x00000020 @@ -2643,10 +2631,10 @@ extern "C" { #define RIM_TYPEMOUSE 0x00000000 #define RIM_TYPEKEYBOARD 0x00000001 #define RIM_TYPEHID 0x00000002 -#define MOUSE_MOVE_RELATIVE 0x00000000 -#define MOUSE_MOVE_ABSOLUTE 0x00000001 -#define MOUSE_VIRTUAL_DESKTOP 0x00000002 -#define MOUSE_ATTRIBUTES_CHANGED 0x00000004 +#define MOUSE_MOVE_RELATIVE 0 +#define MOUSE_MOVE_ABSOLUTE 1 +#define MOUSE_VIRTUAL_DESKTOP 0x02 +#define MOUSE_ATTRIBUTES_CHANGED 0x04 #define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 #define RI_MOUSE_LEFT_BUTTON_UP 0x0002 #define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 @@ -2869,7 +2857,6 @@ typedef struct { short cx; short cy; } DLGTEMPLATE,*LPDLGTEMPLATE,*LPDLGTEMPLATEA,*LPDLGTEMPLATEW; -typedef const DLGTEMPLATE *LPCDLGTEMPLATE; typedef const DLGTEMPLATE *LPCDLGTEMPLATEA; typedef const DLGTEMPLATE *LPCDLGTEMPLATEW; #ifdef UNICODE diff --git a/reactos/include/reactos/win32k/callback.h b/reactos/include/reactos/win32k/callback.h index 903a457bab7..feecdd1c8f5 100644 --- a/reactos/include/reactos/win32k/callback.h +++ b/reactos/include/reactos/win32k/callback.h @@ -51,8 +51,6 @@ typedef struct _HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS /* WCHAR szClass[] */ } HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS, *PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS; -typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD); - typedef struct _EVENTPROC_CALLBACK_ARGUMENTS { HWINEVENTHOOK hook;