diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h index 58e04a6e321..db2a0ac21b3 100644 --- a/reactos/include/psdk/basetsd.h +++ b/reactos/include/psdk/basetsd.h @@ -35,6 +35,7 @@ #define ULongToPtr( ul ) ((VOID*)(ULONG_PTR)((unsigned long)ul)) #endif /* !_WIN64 */ +#define UlongToHandle(ul) ULongToHandle(ul) #define UlongToPtr(ul) ULongToPtr(ul) #define UintToPtr(ui) UIntToPtr(ui) #define MAXUINT_PTR (~((UINT_PTR)0)) diff --git a/reactos/include/psdk/setupapi.h b/reactos/include/psdk/setupapi.h index 8e0fd34160d..4e039da25ab 100644 --- a/reactos/include/psdk/setupapi.h +++ b/reactos/include/psdk/setupapi.h @@ -338,6 +338,7 @@ extern "C" { #define ERROR_INTERFACE_DEVICE_REMOVED ERROR_DEVICE_INTERFACE_REMOVED #define ERROR_NO_DEFAULT_INTERFACE_DEVICE ERROR_NO_DEFAULT_DEVICE_INTERFACE #define ERROR_NO_SUCH_INTERFACE_DEVICE ERROR_NO_SUCH_DEVICE_INTERFACE +#define ERROR_WRONG_INF_TYPE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24A) #define FILEOP_COPY 0 #define FILEOP_ABORT 0 diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h index 7e9cd301754..f2f277cb4c5 100644 --- a/reactos/include/psdk/winuser.h +++ b/reactos/include/psdk/winuser.h @@ -1410,6 +1410,7 @@ extern "C" { #define SPI_SETSHOWIMEUI 0x006F /* Correct ? */ #define SPI_GETWHEELSCROLLCHARS 0x006C + #define SPI_SETWHEELSCROLLCHARS 0x006D #endif #if(WINVER >= 0x0500) @@ -1582,6 +1583,9 @@ extern "C" { #define WM_GETHOTKEY 51 #define WM_QUERYDRAGICON 55 #define WM_COMPAREITEM 57 +#if (WINVER >= 0x0500) +#define WM_GETOBJECT 61 +#endif /* (WINVER >= 0x0500) */ #define WM_COMPACTING 65 #define WM_COMMNOTIFY 68 /* obsolete */ #define WM_WINDOWPOSCHANGING 70 @@ -2500,11 +2504,11 @@ extern "C" { #endif /* (WINVER >= 0x0500) */ #define CURSOR_SHOWING 0x00000001 #define WS_ACTIVECAPTION 0x00000001 -#if (_WIN32_WINNT >= 0x0403) -#define INPUT_MOUSE 0x00000000 -#define INPUT_KEYBOARD 0x00000001 -#define INPUT_HARDWARE 0x00000002 -#endif /* (_WIN32_WINNT >= 0x0403) */ +#if (_WIN32_WINNT >= 0x0400) +#define INPUT_MOUSE 0 +#define INPUT_KEYBOARD 1 +#define INPUT_HARDWARE 2 +#endif /* (_WIN32_WINNT >= 0x0400) */ #if (WINVER >= 0x0400) #define ENDSESSION_LOGOFF 0x80000000 #endif @@ -3494,7 +3498,7 @@ typedef struct tagMOUSEMOVEPOINT { ULONG_PTR dwExtraInfo; } MOUSEMOVEPOINT,*PMOUSEMOVEPOINT,*LPMOUSEMOVEPOINT; #endif -#if (_WIN32_WINNT >= 0x0403) +#if (_WIN32_WINNT >= 0x0400) typedef struct tagMOUSEINPUT { LONG dx; LONG dy; @@ -3523,7 +3527,7 @@ typedef struct tagINPUT { HARDWAREINPUT hi; } DUMMYUNIONNAME; } INPUT,*PINPUT,*LPINPUT; -#endif /* (_WIN32_WINNT >= 0x0403) */ +#endif /* (_WIN32_WINNT >= 0x0400) */ #if (WINVER >= 0x0500) typedef struct tagGUITHREADINFO { DWORD cbSize;