From 892c213bdcc1e0c5efc32888cb5aa1dc62d2f76a Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 27 Nov 2009 17:23:05 +0000 Subject: [PATCH] Fix SLIST_ENTRY for WIN64 svn path=/branches/ros-amd64-bringup/; revision=44294 --- reactos/include/ddk/wdm.h | 11 +++++++---- reactos/include/psdk/winnt.h | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h index 2b7492d403f..38fdb0eb1d6 100644 --- a/reactos/include/ddk/wdm.h +++ b/reactos/include/ddk/wdm.h @@ -575,11 +575,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; @@ -604,6 +604,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/winnt.h b/reactos/include/psdk/winnt.h index b1b61a8a66a..630605da041 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -3248,11 +3248,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 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; @@ -3277,6 +3277,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 {