oleaut32: BSTRs should have 8 byte alignment on 64 bits.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

oleaut32: BSTRs should have 8 byte alignment on 64 bits.
36f454cd · Huw Davies · Alexandre Julliard · 13bc86c0 · 36f454cd · 36f454cd
Commit 36f454cd authored Jan 21, 2016 by Huw Davies Committed by Alexandre Julliard Jan 22, 2016
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

oleaut.c dlls/oleaut32/oleaut.c +3 -0

vartype.c dlls/oleaut32/tests/vartype.c +3 -0

No files found.
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -84,6 +84,9 @@ static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg =
 static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 };
 typedef struct {
+#ifdef _WIN64
+    DWORD pad;
+#endif
    DWORD size;
    union {
        char ptr[1];

--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -5398,9 +5398,12 @@ static void test_SysAllocString(void)
  if (str)
  {
    LPINTERNAL_BSTR bstr = Get(str);
+    DWORD_PTR p = (DWORD_PTR)str;
+    int align = sizeof(void *);
    ok (bstr->dwLen == 8, "Expected 8, got %d\n", bstr->dwLen);
    ok (!lstrcmpW(bstr->szString, szTest), "String different\n");
+    ok ((p & ~(align-1)) == p, "Not aligned to %d\n", align);
    SysFreeString(str);
  }
 }