[PATCH] comctl32: toolbar: fix the layout of TBUTTON_INFO on Win64

[Mikołaj Zalewski]

---
 dlls/comctl32/toolbar.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 2aa5c4c..518a71c 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -88,6 +88,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(toolbar);
 
 static HCURSOR hCursorDrag = NULL;
 
+/* Note: TOOLBAR_DumpButton assumes the layout of the beginning of the structure
+ * is the same as of TBBUTTON */
 typedef struct
 {
     INT iBitmap;
@@ -96,6 +98,9 @@ typedef struct
     BYTE  fsStyle;
     BYTE  bHot;
     BYTE  bDropDownPressed;
+#ifdef _WIN64
+    BYTE bReserved64[4];
+#endif
     DWORD_PTR dwData;
     INT_PTR iString;
     INT nRow;
-- 
1.5.4


--------------030206040201000302040707--