Rebase against 3bb824f98891e8eb907c9c652fe528373a17b10d.

patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch

@@ -1,4 +1,4 @@
-From 494fc3abe1eddabcf7cede677ee907284e89eea8 Mon Sep 17 00:00:00 2001
+From a349cc8bdcc3a083ea507dbbdeba9053e3a338e4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
 Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
@@ -11,7 +11,7 @@ Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
  3 files changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/include/wine/list.h b/include/wine/list.h
-index b4d681fe..287ad394 100644
+index b4d681fe0f3..287ad394fae 100644
 --- a/include/wine/list.h
 +++ b/include/wine/list.h
 @@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src )
@@ -31,7 +31,7 @@ index b4d681fe..287ad394 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index dc50b5e7..8130deb5 100644
+index 8aae29c8c10..330b3e8fbc9 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
 @@ -23,8 +23,14 @@
@@ -52,10 +52,10 @@ index dc50b5e7..8130deb5 100644
  struct wine_rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 2b489382..a156efc4 100644
+index 46e17c546a7..d5c65d2017b 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -760,8 +760,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+@@ -793,8 +793,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
  #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
  #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
  
@@ -70,8 +70,8 @@ index 2b489382..a156efc4 100644
 +   ((type *)((PCHAR)(address) - offsetof(type, field)))
 +#endif
  
+ #define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
  #ifdef __WINESRC__
- # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 -- 
-2.20.1
+2.26.2