PATCH: dlls/oleaut32/tests/vartype.c

[Marcus Meissner]

Hi,

This fixes the currently last gcc4 problem.

I had to split up MSVC / non-MSVC cases since glibc/sprintf
and msvcrt/sprintf disagree on how to print out 64bit integers.

Ciao, Marcus

Changelog:
	Fixed lvalue assignment problem.

Index: dlls/oleaut32/tests/vartype.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tests/vartype.c,v
retrieving revision 1.19
diff -u -r1.19 vartype.c
--- dlls/oleaut32/tests/vartype.c	22 Sep 2004 19:12:18 -0000	1.19
+++ dlls/oleaut32/tests/vartype.c	16 Dec 2004 08:22:55 -0000
@@ -2339,10 +2339,15 @@
 
 static void test_VarI8Copy(void)
 {
+  LONGLONG lval = 1;
   if (!HAVE_OLEAUT32_I8)
     return;
 
-  COPYTEST(1, VT_I8, ((int)V_I8(&vSrc)), ((int)V_I8(&vDst)), V_I8REF(&vSrc), V_I8REF(&vDst), "%d");
+#ifndef _MSC_VER
+  COPYTEST(lval, VT_I8, (V_I8(&vSrc)), (V_I8(&vDst)), V_I8REF(&vSrc), V_I8REF(&vDst), "%lld");
+#else
+  COPYTEST(lval, VT_I8, (V_I8(&vSrc)), (V_I8(&vDst)), V_I8REF(&vSrc), V_I8REF(&vDst), "%I64d");
+#endif
 }
 
 static void test_VarI8ChangeTypeEx(void)
@@ -2573,11 +2578,18 @@
 
 static void test_VarUI8Copy(void)
 {
+  ULONGLONG lval = 1;
+
   if (!HAVE_OLEAUT32_I8)
     return;
 
-  COPYTEST(1, VT_UI8, ((unsigned)V_UI8(&vSrc)), ((unsigned)V_I8(&vDst)),
-           V_UI8REF(&vSrc), V_UI8REF(&vDst), "%u");
+#ifndef _MSC_VER
+  COPYTEST(lval, VT_UI8, (V_UI8(&vSrc)), (V_I8(&vDst)),
+           V_UI8REF(&vSrc), V_UI8REF(&vDst), "%llu");
+#else
+  COPYTEST(lval, VT_UI8, (V_UI8(&vSrc)), (V_I8(&vDst)),
+           V_UI8REF(&vSrc), V_UI8REF(&vDst), "%I64u");
+#endif
 }
 
 static void test_VarUI8ChangeTypeEx(void)