Merge from amd64 branch:

40122 mmsystem.h: 64bit build fixes. (Samuel Serapión)
40123 mmsystem.h: Even more 64bit fixes.  (Samuel Serapión)
40155 mmddk.h/mmsystem.h: Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC, MIXEROPENDESC structures. Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W callbacks. Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen, CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask (Samuel Serapión)
40995 sqltypes.h: 64bit fixes for sqltype.h, also resort and cleanup (Timo Kreuzer)
40996 msacm.h: Fix tag of ACMFILTERCHOOSEA (Timo Kreuzer)
41029 sql.h: Fix SQLFetchScroll prototype. (Timo Kreuzer)
41045 commdlg.h: fix and update definition of OPENFILENAMEAW (Timo Kreuzer)
41449 basetsd.h: Disable wine hack for amd64 (Timo Kreuzer)
43506 wincrypt.h: Fix definition of CryptReleaseContext (Timo Kreuzer)
43840 wingdi.h: Fix LOGBRUSH definition. (Samuel Serapión)
43907 commctrl.h: Fix bad cast. (Timo Kreuzer)
44039 mmddk.h: Fix mmTaskCreate and mciGetDriverData prototypes per MSDN (Timo Kreuzer)
44040 windef.h/winsock.h/winsock2.h: Fix 32bit build. (Samuel Serapión)
44044 ws2spi.h: Fix ws2_32 64bit build (Samuel Serapión)
44294 winnt.h: Fix SLIST_ENTRY for WIN64 (Timo Kreuzer)
44338 winnt.h: fix build. (Samuel Serapión)
44460 winuser.h: Define PHDEVNOTIFY, PDLGITEMTEMPLATEA/W, LPDLGITEMTEMPLATEA/W, PPAINTSTRUCT, PMENUITEMTEMPLATE, PUSEROBJECTFLAGS, PMINIMIZEDMETRICS, PNONCLIENTMETRICSA/W, LPMOUSEINPUT, LPKEYBDINPUT, LPHARDWAREINPUT. Add HARDWAREHOOKSTRUCT structure. (Samuel Serapión)

svn path=/trunk/; revision=44614

diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index 0f338f9..4f15233 100644 (file)
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -568,11 +568,11 @@ InterlockedAdd64(
 #ifndef _SLIST_HEADER_
 #define _SLIST_HEADER_
 
-#define SLIST_ENTRY SINGLE_LIST_ENTRY
-#define _SLIST_ENTRY _SINGLE_LIST_ENTRY
-#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
-
 #if defined(_WIN64)
+typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY;
+typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY {
+       PSLIST_ENTRY Next;
+} SLIST_ENTRY;
 typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER {
     struct {
         ULONGLONG Alignment;
@@ -597,6 +597,9 @@ typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER {
     } Header16;
 } SLIST_HEADER, *PSLIST_HEADER;
 #else
+#define SLIST_ENTRY SINGLE_LIST_ENTRY
+#define _SLIST_ENTRY _SINGLE_LIST_ENTRY
+#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
 typedef union _SLIST_HEADER {
     ULONGLONG Alignment;
     struct {

diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h
index 966ead4..e2e5b93 100644 (file)
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -1,11 +1,13 @@
 #ifndef _BASETSD_H
 #define _BASETSD_H
 
+#ifndef _M_AMD64
 #if !defined(__ROS_LONG64__)
 #ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
+#endif
 
 #ifdef __GNUC__
 #ifndef __int64

diff --git a/reactos/include/psdk/commctrl.h b/reactos/include/psdk/commctrl.h
index 7a40cbc..1c5f31c 100644 (file)
--- a/reactos/include/psdk/commctrl.h
+++ b/reactos/include/psdk/commctrl.h
@@ -2809,7 +2809,7 @@ typedef struct tagTVKEYDOWN
 (LPARAM)(HTREEITEM)(hitem))
 
 #define TreeView_EnsureVisible(hwnd, hitem) \
-    (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem))
+    (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(hitem))
 
 #define TreeView_SortChildrenCB(hwnd, psort, recurse) \
     (BOOL)SNDMSG((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \

diff --git a/reactos/include/psdk/commdlg.h b/reactos/include/psdk/commdlg.h
index ad13cec..9061a4c 100644 (file)
--- a/reactos/include/psdk/commdlg.h
+++ b/reactos/include/psdk/commdlg.h
@@ -334,9 +334,18 @@ typedef struct tagOFNA {
        WORD nFileOffset;
        WORD nFileExtension;
        LPCSTR lpstrDefExt;
-       DWORD lCustData;
+       LPARAM lCustData;
        LPOFNHOOKPROC lpfnHook;
        LPCSTR lpTemplateName;
+#ifdef _MAC
+    LPEDITMENU lpEditInfo;
+    LPCSTR lpstrPrompt;
+#endif
+#if (_WIN32_WINNT >= 0x0500)
+    void *pvReserved;
+    DWORD dwReserved;
+    DWORD FlagsEx;
+#endif
 } OPENFILENAMEA,*LPOPENFILENAMEA;
 typedef struct tagOFNW {
        DWORD lStructSize;
@@ -356,9 +365,18 @@ typedef struct tagOFNW {
        WORD nFileOffset;
        WORD nFileExtension;
        LPCWSTR lpstrDefExt;
-       DWORD lCustData;
+       LPARAM lCustData;
        LPOFNHOOKPROC lpfnHook;
        LPCWSTR lpTemplateName;
+#ifdef _MAC
+    LPEDITMENU lpEditInfo;
+    LPCSTR lpstrPrompt;
+#endif
+#if (_WIN32_WINNT >= 0x0500)
+    void *pvReserved;
+    DWORD dwReserved;
+    DWORD FlagsEx;
+#endif
 } OPENFILENAMEW,*LPOPENFILENAMEW;
 typedef struct _OFNOTIFYA {
        NMHDR hdr;

diff --git a/reactos/include/psdk/mmddk.h b/reactos/include/psdk/mmddk.h
index 18ea88d..5c5ec1e 100644 (file)
--- a/reactos/include/psdk/mmddk.h
+++ b/reactos/include/psdk/mmddk.h
@@ -384,8 +384,8 @@ typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC;
 #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes))
 
 typedef struct {
-       DWORD                   dwCallback;
-       DWORD                   dwInstance;
+       DWORD_PTR               dwCallback;
+       DWORD_PTR               dwInstance;
        HMIDIOUT                hMidi;
        DWORD                   dwFlags;
 } PORTALLOC, *LPPORTALLOC;
@@ -396,7 +396,7 @@ typedef struct {
        DWORD_PTR               dwCallback;
        DWORD_PTR               dwInstance;
        UINT                    uMappedDeviceID;
-       DWORD                   dnDevNode;
+       DWORD_PTR               dnDevNode;
 } WAVEOPENDESC, *LPWAVEOPENDESC;
 
 typedef struct {
@@ -406,9 +406,9 @@ typedef struct {
 
 typedef struct {
        HMIDI                   hMidi;
-       DWORD                   dwCallback;
-       DWORD                   dwInstance;
-        DWORD                          dnDevNode;
+       DWORD_PTR               dwCallback;
+       DWORD_PTR               dwInstance;
+       DWORD_PTR               dnDevNode;
         DWORD                          cIds;
         MIDIOPENSTRMID                 rgIds;
 } MIDIOPENDESC, *LPMIDIOPENDESC;
@@ -436,8 +436,8 @@ typedef struct {
        UINT                    wType;                  /* driver type (filled in by the driver) */
 } MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW;
 
-DWORD                  WINAPI  mciGetDriverData(UINT uDeviceID);
-BOOL                   WINAPI  mciSetDriverData(UINT uDeviceID, DWORD dwData);
+DWORD_PTR              WINAPI  mciGetDriverData(UINT uDeviceID);
+BOOL                   WINAPI  mciSetDriverData(UINT uDeviceID, DWORD_PTR dwData);
 UINT                   WINAPI  mciDriverYield(UINT uDeviceID);
 BOOL                   WINAPI  mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
                                                UINT uStatus);
@@ -460,7 +460,7 @@ typedef void (*LPTASKCALLBACK)(DWORD dwInst);
 
 #define TASKERR_NOTASKSUPPORT 1
 #define TASKERR_OUTOFMEMORY   2
-MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD);
+UINT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD_PTR);
 void     WINAPI mmTaskBlock(DWORD);
 BOOL     WINAPI mmTaskSignal(DWORD);
 void     WINAPI mmTaskYield(void);

diff --git a/reactos/include/psdk/mmsystem.h b/reactos/include/psdk/mmsystem.h
index 102338d..a979ed0 100644 (file)
--- a/reactos/include/psdk/mmsystem.h
+++ b/reactos/include/psdk/mmsystem.h
@@ -1381,7 +1381,7 @@ typedef struct tMIXERCONTROLDETAILS_UNSIGNED {
        DWORD dwValue;
 } MIXERCONTROLDETAILS_UNSIGNED,*PMIXERCONTROLDETAILS_UNSIGNED,*LPMIXERCONTROLDETAILS_UNSIGNED;
 
-typedef void(CALLBACK TIMECALLBACK)(UINT,UINT,DWORD,DWORD,DWORD);
+typedef void(CALLBACK TIMECALLBACK)(UINT,UINT,DWORD_PTR,DWORD_PTR,DWORD_PTR);
 
 typedef TIMECALLBACK *LPTIMECALLBACK;
 
@@ -1509,11 +1509,11 @@ typedef struct _MMCKINFO {
 typedef const MMCKINFO *LPCMMCKINFO;
 
 typedef struct tagMCI_GENERIC_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
 } MCI_GENERIC_PARMS,*PMCI_GENERIC_PARMS,*LPMCI_GENERIC_PARMS;
 
 typedef struct tagMCI_OPEN_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCSTR lpstrDeviceType;
        LPCSTR lpstrElementName;
@@ -1521,7 +1521,7 @@ typedef struct tagMCI_OPEN_PARMSA {
 } MCI_OPEN_PARMSA,*PMCI_OPEN_PARMSA,*LPMCI_OPEN_PARMSA;
 
 typedef struct tagMCI_OPEN_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCWSTR lpstrDeviceType;
        LPCWSTR lpstrElementName;
@@ -1529,13 +1529,13 @@ typedef struct tagMCI_OPEN_PARMSW {
 } MCI_OPEN_PARMSW,*PMCI_OPEN_PARMSW,*LPMCI_OPEN_PARMSW;
 
 typedef struct tagMCI_PLAY_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwFrom;
        DWORD dwTo;
 } MCI_PLAY_PARMS,*PMCI_PLAY_PARMS,*LPMCI_PLAY_PARMS;
 
 typedef struct tagMCI_SEEK_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwTo;
 } MCI_SEEK_PARMS, *PMCI_SEEK_PARMS,*LPMCI_SEEK_PARMS;
 
@@ -1558,32 +1558,32 @@ typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS;
 #endif
 
 typedef struct tagMCI_STATUS_PARMS {
-       DWORD dwCallback;
-       DWORD dwReturn;
+       DWORD_PTR dwCallback;
+       DWORD_PTR dwReturn;
        DWORD dwItem;
        DWORD dwTrack;
 } MCI_STATUS_PARMS,*PMCI_STATUS_PARMS,*LPMCI_STATUS_PARMS;
 
 typedef struct tagMCI_INFO_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPSTR lpstrReturn;
        DWORD dwRetSize;
 } MCI_INFO_PARMSA,*LPMCI_INFO_PARMSA;
 
 typedef struct tagMCI_INFO_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPWSTR lpstrReturn;
        DWORD dwRetSize;
 } MCI_INFO_PARMSW,*LPMCI_INFO_PARMSW;
 
 typedef struct tagMCI_GETDEVCAPS_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwReturn;
        DWORD dwItem;
 } MCI_GETDEVCAPS_PARMS,*PMCI_GETDEVCAPS_PARMS,*LPMCI_GETDEVCAPS_PARMS;
 
 typedef struct tagMCI_SYSINFO_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPSTR lpstrReturn;
        DWORD dwRetSize;
        DWORD dwNumber;
@@ -1591,7 +1591,7 @@ typedef struct tagMCI_SYSINFO_PARMSA {
 } MCI_SYSINFO_PARMSA,*PMCI_SYSINFO_PARMSA,*LPMCI_SYSINFO_PARMSA;
 
 typedef struct tagMCI_SYSINFO_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPWSTR lpstrReturn;
        DWORD dwRetSize;
        DWORD dwNumber;
@@ -1599,67 +1599,67 @@ typedef struct tagMCI_SYSINFO_PARMSW {
 } MCI_SYSINFO_PARMSW,*PMCI_SYSINFO_PARMSW,*LPMCI_SYSINFO_PARMSW;
 
 typedef struct tagMCI_SET_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwTimeFormat;
        DWORD dwAudio;
 } MCI_SET_PARMS,*PMCI_SET_PARMS,*LPMCI_SET_PARMS;
 
 typedef struct tagMCI_BREAK_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        int nVirtKey;
        HWND hwndBreak;
 } MCI_BREAK_PARMS,*PMCI_BREAK_PARMS,*LPMCI_BREAK_PARMS;
 
 typedef struct tagMCI_SAVE_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCSTR lpfilename;
 } MCI_SAVE_PARMSA,*PMCI_SAVE_PARMSA,*LPMCI_SAVE_PARMSA;
 
 typedef struct tagMCI_SAVE_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCWSTR lpfilename;
 } MCI_SAVE_PARMSW,*PMCI_SAVE_PARMSW,*LPMCI_SAVE_PARMSW;
 
 typedef struct tagMCI_LOAD_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCSTR lpfilename;
 } MCI_LOAD_PARMSA,*PMCI_LOAD_PARMSA,*LPMCI_LOAD_PARMSA;
 
 typedef struct tagMCI_LOAD_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCWSTR lpfilename;
 } MCI_LOAD_PARMSW,*PMCI_LOAD_PARMSW,*LPMCI_LOAD_PARMSW;
 
 typedef struct tagMCI_RECORD_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwFrom;
        DWORD dwTo;
 } MCI_RECORD_PARMS,*LPMCI_RECORD_PARMS;
 
 typedef struct tagMCI_VD_PLAY_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwFrom;
        DWORD dwTo;
        DWORD dwSpeed;
 } MCI_VD_PLAY_PARMS,*PMCI_VD_PLAY_PARMS,*LPMCI_VD_PLAY_PARMS;
 
 typedef struct tagMCI_VD_STEP_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwFrames;
 } MCI_VD_STEP_PARMS,*PMCI_VD_STEP_PARMS,*LPMCI_VD_STEP_PARMS;
 
 typedef struct tagMCI_VD_ESCAPE_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCSTR lpstrCommand;
 } MCI_VD_ESCAPE_PARMSA,*PMCI_VD_ESCAPE_PARMSA,*LPMCI_VD_ESCAPE_PARMSA;
 
 typedef struct tagMCI_VD_ESCAPE_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCWSTR lpstrCommand;
 } MCI_VD_ESCAPE_PARMSW,*PMCI_VD_ESCAPE_PARMSW,*LPMCI_VD_ESCAPE_PARMSW;
 
 typedef struct tagMCI_WAVE_OPEN_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCSTR lpstrDeviceType;
        LPCSTR lpstrElementName;
@@ -1668,7 +1668,7 @@ typedef struct tagMCI_WAVE_OPEN_PARMSA {
 } MCI_WAVE_OPEN_PARMSA,*PMCI_WAVE_OPEN_PARMSA,*LPMCI_WAVE_OPEN_PARMSA;
 
 typedef struct tagMCI_WAVE_OPEN_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCWSTR lpstrDeviceType;
        LPCWSTR lpstrElementName;
@@ -1677,13 +1677,13 @@ typedef struct tagMCI_WAVE_OPEN_PARMSW {
 } MCI_WAVE_OPEN_PARMSW,*PMCI_WAVE_OPEN_PARMSW,*LPMCI_WAVE_OPEN_PARMSW;
 
 typedef struct tagMCI_WAVE_DELETE_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwFrom;
        DWORD dwTo;
 } MCI_WAVE_DELETE_PARMS, *PMCI_WAVE_DELETE_PARMS,*LPMCI_WAVE_DELETE_PARMS;
 
 typedef struct tagMCI_WAVE_SET_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwTimeFormat;
        DWORD dwAudio;
        UINT wInput;
@@ -1700,9 +1700,9 @@ typedef struct tagMCI_WAVE_SET_PARMS {
        WORD wReserved5;
 } MCI_WAVE_SET_PARMS,*PMCI_WAVE_SET_PARMS,*LPMCI_WAVE_SET_PARMS;
 
-LRESULT WINAPI CloseDriver(HDRVR,LONG,LONG);
-HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LONG);
-LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG);
+LRESULT WINAPI CloseDriver(HDRVR,LPARAM,LPARAM);
+HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LPARAM);
+LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LPARAM,LPARAM);
 HMODULE WINAPI DrvGetModuleHandle(HDRVR);
 HMODULE WINAPI GetDriverModuleHandle(HDRVR);
 LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM);
@@ -1875,8 +1875,8 @@ LRESULT WINAPI mmioSendMessage(HMMIO,UINT,LPARAM,LPARAM);
 MMRESULT WINAPI mmioDescend(HMMIO,LPMMCKINFO,const MMCKINFO*,UINT);
 MMRESULT WINAPI mmioAscend(HMMIO,LPMMCKINFO,UINT);
 MMRESULT WINAPI mmioCreateChunk(HMMIO,LPMMCKINFO,UINT);
-MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD_PTR);
-MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD_PTR);
+MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD_PTR,DWORD_PTR);
+MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD_PTR,DWORD_PTR);
 MCIERROR WINAPI mciSendStringA(LPCSTR,LPSTR,UINT,HWND);
 MCIERROR WINAPI mciSendStringW(LPCWSTR,LPWSTR,UINT,HWND);
 MCIDEVICEID WINAPI mciGetDeviceIDA(LPCSTR);
@@ -1894,7 +1894,7 @@ DWORD WINAPI GetDriverFlags(HDRVR hDriver);
 #endif
 
 typedef struct tagMCI_SEQ_SET_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwTimeFormat;
        DWORD dwAudio;
        DWORD dwTempo;
@@ -1904,7 +1904,7 @@ typedef struct tagMCI_SEQ_SET_PARMS {
        DWORD dwOffset;
 } MCI_SEQ_SET_PARMS,*PMCI_SEQ_SET_PARMS,*LPMCI_SEQ_SET_PARMS;
 typedef struct tagMCI_ANIM_OPEN_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCSTR lpstrDeviceType;
        LPCSTR lpstrElementName;
@@ -1913,7 +1913,7 @@ typedef struct tagMCI_ANIM_OPEN_PARMSA {
        HWND hWndParent;
 } MCI_ANIM_OPEN_PARMSA,*PMCI_ANIM_OPEN_PARMSA,*LPMCI_ANIM_OPEN_PARMSA;
 typedef struct tagMCI_ANIM_OPEN_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCWSTR lpstrDeviceType;
        LPCWSTR lpstrElementName;
@@ -1922,29 +1922,29 @@ typedef struct tagMCI_ANIM_OPEN_PARMSW {
        HWND hWndParent;
 } MCI_ANIM_OPEN_PARMSW,*PMCI_ANIM_OPEN_PARMSW,*LPMCI_ANIM_OPEN_PARMSW;
 typedef struct tagMCI_ANIM_PLAY_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwFrom;
        DWORD dwTo;
        DWORD dwSpeed;
 } MCI_ANIM_PLAY_PARMS,*PMCI_ANIM_PLAY_PARMS,*LPMCI_ANIM_PLAY_PARMS;
 typedef struct tagMCI_ANIM_STEP_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        DWORD dwFrames;
 } MCI_ANIM_STEP_PARMS,*PMCI_ANIM_STEP_PARMS,*LPMCI_ANIM_STEP_PARMS;
 typedef struct tagMCI_ANIM_WINDOW_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        HWND hWnd;
        UINT nCmdShow;
        LPCSTR lpstrText;
 } MCI_ANIM_WINDOW_PARMSA,*PMCI_ANIM_WINDOW_PARMSA,*LPMCI_ANIM_WINDOW_PARMSA;
 typedef struct tagMCI_ANIM_WINDOW_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        HWND hWnd;
        UINT nCmdShow;
        LPCWSTR lpstrText;
 } MCI_ANIM_WINDOW_PARMSW,*PMCI_ANIM_WINDOW_PARMSW,*LPMCI_ANIM_WINDOW_PARMSW;
 typedef struct tagMCI_ANIM_RECT_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
 #ifdef MCI_USE_OFFEXT
        POINT ptOffset;
        POINT ptExtent;
@@ -1953,12 +1953,12 @@ typedef struct tagMCI_ANIM_RECT_PARMS {
 #endif
 } MCI_ANIM_RECT_PARMS,*PMCI_ANIM_RECT_PARMS,*LPMCI_ANIM_RECT_PARMS;
 typedef struct tagMCI_ANIM_UPDATE_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        RECT rc;
        HDC hDC;
 } MCI_ANIM_UPDATE_PARMS,*PMCI_ANIM_UPDATE_PARMS,*LPMCI_ANIM_UPDATE_PARMS;
 typedef struct tagMCI_OVLY_OPEN_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCSTR lpstrDeviceType;
        LPCSTR lpstrElementName;
@@ -1967,7 +1967,7 @@ typedef struct tagMCI_OVLY_OPEN_PARMSA {
        HWND hWndParent;
 } MCI_OVLY_OPEN_PARMSA,*PMCI_OVLY_OPEN_PARMSA,*LPMCI_OVLY_OPEN_PARMSA;
 typedef struct tagMCI_OVLY_OPEN_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        MCIDEVICEID wDeviceID;
        LPCWSTR lpstrDeviceType;
        LPCWSTR lpstrElementName;
@@ -1976,19 +1976,19 @@ typedef struct tagMCI_OVLY_OPEN_PARMSW {
        HWND hWndParent;
 } MCI_OVLY_OPEN_PARMSW,*PMCI_OVLY_OPEN_PARMSW,*LPMCI_OVLY_OPEN_PARMSW;
 typedef struct tagMCI_OVLY_WINDOW_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        HWND hWnd;
        UINT nCmdShow;
        LPCSTR lpstrText;
 } MCI_OVLY_WINDOW_PARMSA,*PMCI_OVLY_WINDOW_PARMSA,*LPMCI_OVLY_WINDOW_PARMSA;
 typedef struct tagMCI_OVLY_WINDOW_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        HWND hWnd;
        UINT nCmdShow;
        LPCWSTR lpstrText;
 } MCI_OVLY_WINDOW_PARMSW,*PMCI_OVLY_WINDOW_PARMSW,*LPMCI_OVLY_WINDOW_PARMSW;
 typedef struct tagMCI_OVLY_RECT_PARMS {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
 #ifdef MCI_USE_OFFEXT
        POINT ptOffset;
        POINT ptExtent;
@@ -1997,22 +1997,22 @@ typedef struct tagMCI_OVLY_RECT_PARMS {
 #endif
 } MCI_OVLY_RECT_PARMS,*PMCI_OVLY_RECT_PARMS,*LPMCI_OVLY_RECT_PARMS;
 typedef struct tagMCI_OVLY_SAVE_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCSTR lpfilename;
        RECT rc;
 } MCI_OVLY_SAVE_PARMSA,*PMCI_OVLY_SAVE_PARMSA,*LPMCI_OVLY_SAVE_PARMSA;
 typedef struct tagMCI_OVLY_SAVE_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCWSTR lpfilename;
        RECT rc;
 } MCI_OVLY_SAVE_PARMSW,*PMCI_OVLY_SAVE_PARMSW,*LPMCI_OVLY_SAVE_PARMSW;
 typedef struct tagMCI_OVLY_LOAD_PARMSA {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCSTR lpfilename;
        RECT rc;
 } MCI_OVLY_LOAD_PARMSA,*PMCI_OVLY_LOAD_PARMSA,*LPMCI_OVLY_LOAD_PARMSA;
 typedef struct tagMCI_OVLY_LOAD_PARMSW {
-       DWORD dwCallback;
+       DWORD_PTR dwCallback;
        LPCWSTR lpfilename;
        RECT rc;
 } MCI_OVLY_LOAD_PARMSW,*PMCI_OVLY_LOAD_PARMSW,*LPMCI_OVLY_LOAD_PARMSW;

diff --git a/reactos/include/psdk/msacm.h b/reactos/include/psdk/msacm.h
index 73788fe..44d1d3a 100644 (file)
--- a/reactos/include/psdk/msacm.h
+++ b/reactos/include/psdk/msacm.h
@@ -323,7 +323,7 @@ DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS)
 DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS)
 DECL_WINELIB_TYPE_AW(LPACMDRIVERDETAILS)
 
-typedef struct _ACMFILTERCHOOSEA
+typedef struct tACMFILTERCHOOSEA
 {
   DWORD         cbStruct;
   DWORD         fdwStyle;

diff --git a/reactos/include/psdk/sql.h b/reactos/include/psdk/sql.h
index 30b61d0..2718cce 100644 (file)
--- a/reactos/include/psdk/sql.h
+++ b/reactos/include/psdk/sql.h
@@ -381,7 +381,7 @@ SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT);
 SQLRETURN SQL_API SQLColAttribute(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER);
 SQLRETURN SQL_API SQLCopyDesc(SQLHDESC,SQLHDESC);
 SQLRETURN SQL_API SQLEndTran(SQLSMALLINT,SQLHANDLE,SQLSMALLINT);
-SQLRETURN SQL_API SQLFetchScroll(SQLHSTMT,SQLSMALLINT,SQLROWOFFSET);
+SQLRETURN SQL_API SQLFetchScroll(SQLHSTMT,SQLSMALLINT,SQLLEN);
 SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT,SQLHANDLE);
 SQLRETURN SQL_API SQLGetConnectAttr(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
 SQLRETURN SQL_API SQLGetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);

diff --git a/reactos/include/psdk/sqltypes.h b/reactos/include/psdk/sqltypes.h
index 29db4cc..1e84606 100644 (file)
--- a/reactos/include/psdk/sqltypes.h
+++ b/reactos/include/psdk/sqltypes.h
@@ -1,13 +1,16 @@
-#ifndef _SQLTYPES_H
-#define _SQLTYPES_H
+#ifndef __SQLTYPES
+#define __SQLTYPES
 
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 #define SQL_API __stdcall
+
 #ifndef RC_INVOKED
 #define __need_wchar_t
 #include <stddef.h>
+
 typedef signed char SCHAR;
 typedef long SDWORD;
 typedef short SWORD;
@@ -24,63 +27,38 @@ typedef PVOID HDBC;
 typedef PVOID HSTMT;
 typedef short RETCODE;
 typedef UCHAR SQLCHAR;
-typedef SCHAR SQLSCHAR;
 typedef SDWORD SQLINTEGER;
 typedef SWORD SQLSMALLINT;
-#ifndef __WIN64
 typedef UDWORD SQLUINTEGER;
-#endif
 typedef UWORD SQLUSMALLINT;
 typedef PVOID SQLPOINTER;
-#if (ODBCVER >= 0x0300)
-typedef void* SQLHANDLE;
-typedef SQLHANDLE SQLHENV;
-typedef SQLHANDLE SQLHDBC;
-typedef SQLHANDLE SQLHSTMT;
-typedef SQLHANDLE SQLHDESC;
-#else
 typedef void* SQLHENV;
 typedef void* SQLHDBC;
 typedef void* SQLHSTMT;
-#endif
 typedef SQLSMALLINT SQLRETURN;
 typedef HWND SQLHWND;
-typedef ULONG BOOKMARK;
+
 #ifdef _WIN64
 typedef INT64 SQLLEN;
-typedef INT64 SQLROWOFFSET;
-typedef UINT64 SQLROWCOUNT;
 typedef UINT64 SQLULEN;
-typedef UINT64 SQLTRANSID;
-typedef unsigned long SQLSETPOSIROW;
+typedef UINT64 SQLSETPOSIROW;
 #else
 #define SQLLEN SQLINTEGER
-#define SQLROWOFFSET SQLINTEGER
-#define SQLROWCOUNT SQLUINTEGER
 #define SQLULEN SQLUINTEGER
-#define SQLTRANSID DWORD
 #define SQLSETPOSIROW SQLUSMALLINT
-#endif
+#endif /* _WIN64 */
+
+typedef SQLULEN BOOKMARK;
+typedef SQLLEN SQLROWOFFSET;
+typedef SQLULEN SQLROWCOUNT;
+typedef SQLULEN SQLTRANSID;
+
 typedef wchar_t SQLWCHAR;
 #ifdef UNICODE
 typedef SQLWCHAR        SQLTCHAR;
 #else
 typedef SQLCHAR         SQLTCHAR;
 #endif  /* UNICODE */
-#if (ODBCVER >= 0x0300)
-typedef unsigned char   SQLDATE;
-typedef unsigned char   SQLDECIMAL;
-typedef double          SQLDOUBLE;
-typedef double          SQLFLOAT;
-typedef unsigned char   SQLNUMERIC;
-typedef float           SQLREAL;
-typedef unsigned char   SQLTIME;
-typedef unsigned char   SQLTIMESTAMP;
-typedef unsigned char   SQLVARCHAR;
-#define ODBCINT64      __int64
-typedef __int64 SQLBIGINT;
-typedef unsigned __int64 SQLUBIGINT;
-#endif
 
 typedef struct tagDATE_STRUCT {
        SQLSMALLINT year;
@@ -101,7 +79,23 @@ typedef struct tagTIMESTAMP_STRUCT {
        SQLUSMALLINT second;
        SQLUINTEGER fraction;
 } TIMESTAMP_STRUCT;
+
 #if (ODBCVER >= 0x0300)
+typedef SCHAR SQLSCHAR;
+typedef void* SQLHANDLE;
+typedef void* SQLHDESC;
+typedef unsigned char   SQLDATE;
+typedef unsigned char   SQLDECIMAL;
+typedef double          SQLDOUBLE;
+typedef double          SQLFLOAT;
+typedef unsigned char   SQLNUMERIC;
+typedef float           SQLREAL;
+typedef unsigned char   SQLTIME;
+typedef unsigned char   SQLTIMESTAMP;
+typedef unsigned char   SQLVARCHAR;
+#define ODBCINT64      __int64
+typedef __int64 SQLBIGINT;
+typedef unsigned __int64 SQLUBIGINT;
 typedef DATE_STRUCT    SQL_DATE_STRUCT;
 typedef TIME_STRUCT    SQL_TIME_STRUCT;
 typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT;
@@ -138,6 +132,7 @@ typedef struct tagSQL_NUMERIC_STRUCT {
        SQLCHAR val[SQL_MAX_NUMERIC_LEN];
 } SQL_NUMERIC_STRUCT;
 #endif  /* ODBCVER >= 0x0300 */
+
 #if (ODBCVER >= 0x0350)
 
 #ifdef _GUID_DEFINED
@@ -156,7 +151,9 @@ typedef struct tagSQLGUID{
 #endif  /* GUID_DEFINED */
 #endif  /* ODBCVER >= 0x0350 */
 #endif     /* RC_INVOKED */
+
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __SQLTYPES */

diff --git a/reactos/include/psdk/wincrypt.h b/reactos/include/psdk/wincrypt.h
index b98ef79..af79c64 100644 (file)
--- a/reactos/include/psdk/wincrypt.h
+++ b/reactos/include/psdk/wincrypt.h
@@ -3827,7 +3827,11 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *);
 WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD);
 WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD);
 WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *);
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD);
+#else
 WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR);
+#endif
 WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD);
 WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD);
 WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);

diff --git a/reactos/include/psdk/windef.h b/reactos/include/psdk/windef.h
index 42f9efd..b1de03d 100644 (file)
--- a/reactos/include/psdk/windef.h
+++ b/reactos/include/psdk/windef.h
@@ -1,11 +1,13 @@
 #ifndef _WINDEF_H
 #define _WINDEF_H
 
+#ifndef _M_AMD64
 #if !defined(__ROS_LONG64__)
 #ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
+#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/reactos/include/psdk/wingdi.h b/reactos/include/psdk/wingdi.h
index b604a50..ef233ab 100644 (file)
--- a/reactos/include/psdk/wingdi.h
+++ b/reactos/include/psdk/wingdi.h
@@ -1655,7 +1655,7 @@ typedef struct tagEMRBITBLT {
 typedef struct tagLOGBRUSH {
        UINT lbStyle;
        COLORREF lbColor;
-       LONG lbHatch;
+       ULONG_PTR lbHatch;
 } LOGBRUSH,*PLOGBRUSH,*LPLOGBRUSH;
 typedef LOGBRUSH PATTERN,*PPATTERN,*LPPATTERN;
 typedef struct tagLOGBRUSH32 {

diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h
index 149332b..8237b3c 100644 (file)
--- a/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@ -3245,11 +3245,11 @@ typedef struct _SINGLE_LIST_ENTRY {
 #ifndef _SLIST_HEADER_
 #define _SLIST_HEADER_
 
-#define SLIST_ENTRY SINGLE_LIST_ENTRY
-#define _SLIST_ENTRY _SINGLE_LIST_ENTRY
-#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
-
 #if defined(_WIN64)
+typedef struct _SLIST_ENTRY *PSLIST_ENTRY;
+typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY {
+       PSLIST_ENTRY Next;
+} SLIST_ENTRY;
 typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER {
     struct {
         ULONGLONG Alignment;
@@ -3274,6 +3274,9 @@ typedef union DECLSPEC_ALIGN(16) _SLIST_HEADER {
     } Header16;
 } SLIST_HEADER, *PSLIST_HEADER;
 #else
+#define SLIST_ENTRY SINGLE_LIST_ENTRY
+#define _SLIST_ENTRY _SINGLE_LIST_ENTRY
+#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
 typedef union _SLIST_HEADER {
     ULONGLONG Alignment;
     struct {

diff --git a/reactos/include/psdk/winsock.h b/reactos/include/psdk/winsock.h
index 63fbd99..4357e34 100644 (file)
--- a/reactos/include/psdk/winsock.h
+++ b/reactos/include/psdk/winsock.h
@@ -11,11 +11,13 @@
 #ifndef _WINSOCK_H
 #define _WINSOCK_H
 
+#ifndef _M_AMD64
 #if !defined(__ROS_LONG64__)
 #ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
+#endif
 
 #define _GNU_H_WINDOWS32_SOCKETS
 #include <windows.h>

diff --git a/reactos/include/psdk/winsock2.h b/reactos/include/psdk/winsock2.h
index 2e40dc8..4a42a27 100644 (file)
--- a/reactos/include/psdk/winsock2.h
+++ b/reactos/include/psdk/winsock2.h
@@ -16,11 +16,13 @@
 
 #define _GNU_H_WINDOWS32_SOCKETS
 
+#ifndef _M_AMD64
 #if !defined(__ROS_LONG64__)
 #ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
+#endif
 
 #include <windows.h>
 

diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index f21c54c..2d38fe2 100644 (file)
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -2782,6 +2782,7 @@ typedef void(CALLBACK *SENDASYNCPROC)(HWND,UINT,DWORD,LRESULT);
 DECLARE_HANDLE(HHOOK);
 DECLARE_HANDLE(HDWP);
 DECLARE_HANDLE(HDEVNOTIFY);
+typedef HDEVNOTIFY *PHDEVNOTIFY;
 
 typedef struct tagACCEL {
        BYTE fVirt;
@@ -2859,7 +2860,7 @@ typedef struct tagCOMPAREITEMSTRUCT {
        UINT    itemID2;
        ULONG_PTR       itemData2;
        DWORD   dwLocaleId;
-} COMPAREITEMSTRUCT,*LPCOMPAREITEMSTRUCT;
+} COMPAREITEMSTRUCT, *PCOMPAREITEMSTRUCT,*LPCOMPAREITEMSTRUCT;
 
 typedef struct tagCOPYDATASTRUCT {
        ULONG_PTR dwData;
@@ -2931,6 +2932,12 @@ typedef struct {
 
 typedef const DLGTEMPLATE *LPCDLGTEMPLATEA;
 typedef const DLGTEMPLATE *LPCDLGTEMPLATEW;
+typedef DLGITEMTEMPLATE *PDLGITEMTEMPLATEA;
+typedef DLGITEMTEMPLATE *PDLGITEMTEMPLATEW;
+DECL_WINELIB_TYPE_AW(PDLGITEMTEMPLATE)
+typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEA;
+typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEW;
+
 
 #ifdef UNICODE
 typedef LPCDLGTEMPLATEW LPCDLGTEMPLATE;
@@ -2966,7 +2973,7 @@ typedef struct tagPAINTSTRUCT {
        BOOL fRestore;
        BOOL fIncUpdate;
        BYTE rgbReserved[32];
-} PAINTSTRUCT,*LPPAINTSTRUCT;
+} PAINTSTRUCT, *PPAINTSTRUCT,*LPPAINTSTRUCT;
 
 typedef struct tagMSG {
        HWND hwnd;
@@ -3107,13 +3114,13 @@ typedef struct _WINDOWPLACEMENT {
 typedef struct {
        WORD versionNumber;
        WORD offset;
-} MENUITEMTEMPLATEHEADER;
+} MENUITEMTEMPLATEHEADER, *PMENUITEMTEMPLATEHEADER;
 
 typedef struct {
        WORD mtOption;
        WORD mtID;
        WCHAR mtString[1];
-} MENUITEMTEMPLATE;
+} MENUITEMTEMPLATE, *PMENUITEMTEMPLATE;
 
 typedef void MENUTEMPLATE,MENUTEMPLATEA,MENUTEMPLATEW,*LPMENUTEMPLATEA,*LPMENUTEMPLATEW,*LPMENUTEMPLATE;
 
@@ -3158,7 +3165,7 @@ typedef struct tagUSEROBJECTFLAGS {
        BOOL fInherit;
        BOOL fReserved;
        DWORD dwFlags;
-} USEROBJECTFLAGS;
+} USEROBJECTFLAGS, *PUSEROBJECTFLAGS;
 
 typedef struct tagFILTERKEYS {
        UINT cbSize;
@@ -3211,7 +3218,7 @@ typedef struct tagMINIMIZEDMETRICS {
        int iHorzGap;
        int iVertGap;
        int iArrange;
-} MINIMIZEDMETRICS,*LPMINIMIZEDMETRICS;
+} MINIMIZEDMETRICS, *PMINIMIZEDMETRICS,*LPMINIMIZEDMETRICS;
 
 typedef struct tagMOUSEKEYS{
        UINT cbSize;
@@ -3240,7 +3247,7 @@ typedef struct tagNONCLIENTMETRICSA {
        LOGFONTA lfMenuFont;
        LOGFONTA lfStatusFont;
        LOGFONTA lfMessageFont;
-} NONCLIENTMETRICSA,*LPNONCLIENTMETRICSA;
+} NONCLIENTMETRICSA, *PNONCLIENTMETRICSA,*LPNONCLIENTMETRICSA;
 
 typedef struct tagNONCLIENTMETRICSW {
        UINT cbSize;
@@ -3258,7 +3265,7 @@ typedef struct tagNONCLIENTMETRICSW {
        LOGFONTW lfMenuFont;
        LOGFONTW lfStatusFont;
        LOGFONTW lfMessageFont;
-} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
+} NONCLIENTMETRICSW, *PNONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
 
 #ifdef UNICODE
 typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
@@ -3334,6 +3341,13 @@ typedef struct tagMOUSEHOOKSTRUCT {
        ULONG_PTR dwExtraInfo;
 } MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT;
 
+typedef struct tagHARDWAREHOOKSTRUCT {
+    HWND    hwnd;
+    UINT    message;
+    WPARAM  wParam;
+    LPARAM  lParam;
+} HARDWAREHOOKSTRUCT, *PHARDWAREHOOKSTRUCT, *LPHARDWAREHOOKSTRUCT;
+
 #if ( _WIN32_WINNT >= 0x0500 )
 #ifdef __cplusplus
 typedef struct tagMOUSEHOOKSTRUCTEX : public tagMOUSEHOOKSTRUCT
@@ -3633,7 +3647,7 @@ typedef struct tagMOUSEINPUT {
   DWORD dwFlags;
   DWORD time;
   ULONG_PTR dwExtraInfo;
-} MOUSEINPUT,*PMOUSEINPUT;
+} MOUSEINPUT,*PMOUSEINPUT, *LPMOUSEINPUT;
 
 typedef struct tagKEYBDINPUT {
   WORD wVk;
@@ -3641,13 +3655,13 @@ typedef struct tagKEYBDINPUT {
   DWORD dwFlags;
   DWORD time;
   ULONG_PTR dwExtraInfo;
-} KEYBDINPUT,*PKEYBDINPUT;
+} KEYBDINPUT, *PKEYBDINPUT, *LPKEYBDINPUT;
 
 typedef struct tagHARDWAREINPUT {
   DWORD uMsg;
   WORD wParamL;
   WORD wParamH;
-} HARDWAREINPUT,*PHARDWAREINPUT;
+} HARDWAREINPUT, *PHARDWAREINPUT, *LPHARDWAREINPUT;
 
 typedef struct tagINPUT {
   DWORD type;