Zebediah Figura : oleaut32: Handle VT_(U)I8 in get_type_size().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1d15103c2b3c35ee19ee39a8a4ff95c659582b37
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1d15103c2b3c35ee19ee39a8a...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Sun Oct 14 22:41:02 2018 -0500

oleaut32: Handle VT_(U)I8 in get_type_size().

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/oleaut32/tests/usrmarshal.c | 30 ++++++++++++++++++++++++++++++
 dlls/oleaut32/usrmarshal.c       |  3 +++
 2 files changed, 33 insertions(+)

diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c
index 5ea13e4..0185b6d 100644
--- a/dlls/oleaut32/tests/usrmarshal.c
+++ b/dlls/oleaut32/tests/usrmarshal.c
@@ -964,6 +964,36 @@ static void test_marshal_VARIANT(void)
     VARIANT_UserFree(&umcb.Flags, &v2);
     HeapFree(GetProcessHeap(), 0, oldbuffer);
 
+    /*** I8 ***/
+    VariantInit(&v);
+    V_VT(&v) = VT_I8;
+    V_I8(&v) = (LONGLONG)1000000 * 1000000;
+
+    rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v);
+    ok(stubMsg.BufferLength == 32, "size %d\n", stubMsg.BufferLength);
+
+    buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer);
+    stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength;
+    memset(buffer, 0xcc, stubMsg.BufferLength);
+    next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v);
+    ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength);
+    wirev = (DWORD*)buffer;
+
+    wirev = check_variant_header(wirev, &v, stubMsg.BufferLength);
+    ok(*wirev == 0xcccccccc, "wv[5] %08x\n", *wirev); /* pad */
+    wirev++;
+    ok(*(LONGLONG *)wirev == V_I8(&v), "wv[6] %s\n", wine_dbgstr_longlong(*(LONGLONG *)wirev));
+    VariantInit(&v2);
+    stubMsg.Buffer = buffer;
+    next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2);
+    ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength);
+    ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2));
+    ok(V_I8(&v) == V_I8(&v2), "got i8 %s expect %s\n",
+            wine_dbgstr_longlong(V_I8(&v)), wine_dbgstr_longlong(V_I8(&v2)));
+
+    VARIANT_UserFree(&umcb.Flags, &v2);
+    HeapFree(GetProcessHeap(), 0, oldbuffer);
+
     /*** R4 ***/
     VariantInit(&v);
     V_VT(&v) = VT_R4;
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c
index da524c8..d3dc93a 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -227,6 +227,9 @@ unsigned int get_type_size(ULONG *pFlags, VARTYPE vt)
     case VT_INT:
     case VT_UINT:
         return sizeof(INT);
+    case VT_I8:
+    case VT_UI8:
+        return sizeof(LONGLONG);
     case VT_R4:
         return sizeof(FLOAT);
     case VT_R8: