Author: cwittich Date: Thu Feb 26 14:43:22 2015 New Revision: 66470
URL: http://svn.reactos.org/svn/reactos?rev=66470&view=rev Log: [PSDK] fix some AMD64 specific issues (structure alignment, 32 Bit pointer)
Modified: trunk/reactos/include/psdk/nb30.h trunk/reactos/include/psdk/ntddscsi.h trunk/reactos/include/psdk/setupapi.h
Modified: trunk/reactos/include/psdk/nb30.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/nb30.h?rev=664... ============================================================================== --- trunk/reactos/include/psdk/nb30.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/nb30.h [iso-8859-1] Thu Feb 26 14:43:22 2015 @@ -159,7 +159,11 @@ void (CALLBACK *ncb_post)(struct _NCB*); UCHAR ncb_lana_num; UCHAR ncb_cmd_cplt; +#ifdef _WIN64 + UCHAR ncb_reserve[18]; +#else UCHAR ncb_reserve[10]; +#endif HANDLE ncb_event; } NCB,*PNCB; typedef struct _SESSION_BUFFER {
Modified: trunk/reactos/include/psdk/ntddscsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddscsi.h?rev... ============================================================================== --- trunk/reactos/include/psdk/ntddscsi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddscsi.h [iso-8859-1] Thu Feb 26 14:43:22 2015 @@ -98,7 +98,7 @@ UCHAR DataIn; ULONG DataTransferLength; ULONG TimeOutValue; - VOID *DataBuffer; + VOID * POINTER_32 DataBuffer; ULONG SenseInfoOffset; UCHAR Cdb[16]; } SCSI_PASS_THROUGH_DIRECT32,*PSCSI_PASS_THROUGH_DIRECT32; @@ -161,7 +161,7 @@ ULONG DataTransferLength; ULONG TimeOutValue; ULONG ReservedAsUlong; - VOID *DataBuffer; + VOID * POINTER_32 DataBuffer; UCHAR PreviousTaskFile[8]; UCHAR CurrentTaskFile[8]; } ATA_PASS_THROUGH_DIRECT32,*PATA_PASS_THROUGH_DIRECT32;
Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?rev... ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Thu Feb 26 14:43:22 2015 @@ -2,8 +2,11 @@ #define _SETUPAPI_H_
#include <commctrl.h> +#if defined(_WIN64) +#include <pshpack8.h> +#else #include <pshpack1.h> - +#endif #ifdef __cplusplus extern "C" { #endif