oleaut32 low level tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

This should be applied after "oleaut32 low level". It adds a huge
number of 
tests for the low level functions implemented by that patch.

Cheers,
Jon

License: X11

ChangeLog:

  Jon Griffiths <jon_p_griffiths@xxxxxxxxx>

  +dlls/oleaut32/tests/vartype.c dlls/oleaut32/tests/Makefile.in
    Test almost all of the low level variant functions

  +dlls/oleaut32/variant.c
    Oops - VT_EMPTY->VT_RECORD is not allowed.



__________________________________
Do you Yahoo!?
New Yahoo! Photos - easier uploading and sharing.
http://photos.yahoo.com/
--- wine/dlls/oleaut32/tests/Makefile.in	2003-07-04 17:47:09.000000000 +0000
+++ wine-develop/dlls/oleaut32/tests/Makefile.in	2003-12-10 17:38:01.000000000 +0000
@@ -9,7 +9,8 @@
 CTESTS = \
 	olefont.c \
 	safearray.c \
-	vartest.c
+	vartest.c \
+	vartype.c
 
 @MAKE_TEST_RULES@
 
--- wine/dlls/oleaut32/tests/vartype.c	1970-01-01 00:00:00.000000000 +0000
+++ wine-develop/dlls/oleaut32/tests/vartype.c	2003-12-10 18:08:27.000000000 +0000
@@ -0,0 +1,5399 @@
+/*
+ * Low level variant tests
+ *
+ * Copyright 2003 Jon Griffiths
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "wine/test.h"
+#include "wine/unicode.h"
+#include "oleauto.h"
+#include <math.h>
+
+static HMODULE hOleaut32;
+
+/* Get a conversion function ptr, return if function not available */
+#define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \
+  if (!p##func) { \
+    trace("function " # func " not available, not testing it\n"); return; }
+
+/* Is a given function exported from oleaut32? */
+#define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL)
+
+/* Have proper locale conversions? */
+#define HAVE_OLEAUT32_LOCALES HAVE_FUNC(GetVarConversionLocaleSetting)
+/* Have IRecordInfo data type? */
+#define HAVE_OLEAUT32_RECORD  HAVE_FUNC(SafeArraySetRecordInfo)
+/* Have DECIMAL data type with new error checking? */
+#define HAVE_OLEAUT32_DECIMAL HAVE_FUNC(VarDecAdd)
+/* Have CY data type? */
+#define HAVE_OLEAUT32_CY      HAVE_FUNC(VarCyAdd)
+/* Have I8/UI8 data type? */
+#define HAVE_OLEAUT32_I8      HAVE_FUNC(VarI8FromI1)
+
+/* Macros for converting and testing results */
+#define CONVVARS(typ) HRESULT hres; CONV_TYPE out; typ in
+
+#define _EXPECTRES(res, x, fs) \
+  ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
+     "expected " #x ", got " fs "; hres=0x%08lx", out, hres)
+#define EXPECT(x)       EXPECTRES(S_OK, (x))
+#define EXPECT_OVERFLOW EXPECTRES(DISP_E_OVERFLOW, DISP_E_OVERFLOW)
+#define EXPECT_MISMATCH EXPECTRES(DISP_E_TYPEMISMATCH,DISP_E_TYPEMISMATCH)
+#define EXPECT_BADVAR   EXPECTRES(DISP_E_BADVARTYPE, DISP_E_BADVARTYPE)
+#define EXPECT_INVALID  EXPECTRES(E_INVALIDARG, E_INVALIDARG)
+#define EXPECT_LT       EXPECTRES(VARCMP_LT, VARCMP_LT)
+#define EXPECT_GT       EXPECTRES(VARCMP_GT, VARCMP_GT)
+#define EXPECT_EQ       EXPECTRES(VARCMP_EQ, VARCMP_EQ)
+#define EXPECT_DBL(x)   \
+  ok(hres == S_OK && fabs(out-(x))<1e-14, "expected " #x ", got %g; hres=0x%08lx", out, hres)
+
+#define CONVERT(func, val) in = val; hres = p##func(in, &out)
+#define CONVERTRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT(i); };
+#define OVERFLOWRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT_OVERFLOW; };
+
+#define CY_MULTIPLIER   10000
+
+#define DATE_MIN -657434
+#define DATE_MAX 2958465
+
+#define CONVERT_I8(func,hi,lo) in = hi; in = (in << 32) | lo; hres = p##func(in, &out)
+
+#define CONVERT_CY(func,val) in.int64 = (LONGLONG)(val * CY_MULTIPLIER); hres = p##func(in, &out)
+
+#define CONVERT_CY64(func,hi,lo) in.s.Hi = hi; in.s.Lo = lo; in.int64 *= CY_MULTIPLIER; hres = p##func(in, &out)
+
+#define SETDEC(dec, scl, sgn, hi, lo) dec.u.s.scale = (BYTE)scl; dec.u.s.sign = (BYTE)sgn; \
+  dec.Hi32 = (ULONG)hi; dec.u1.Lo64 = (ULONG64)lo
+
+#define SETDEC64(dec, scl, sgn, hi, mid, lo) dec.u.s.scale = (BYTE)scl; dec.u.s.sign = (BYTE)sgn; \
+  dec.Hi32 = (ULONG)hi; dec.u1.s1.Mid32 = mid; dec.u1.s1.Lo32 = lo;
+
+#define CONVERT_DEC(func,scl,sgn,hi,lo) SETDEC(in,scl,sgn,hi,lo); hres = p##func(&in, &out)
+
+#define CONVERT_DEC64(func,scl,sgn,hi,mid,lo) SETDEC64(in,scl,sgn,hi,mid,lo); hres = p##func(&in, &out)
+
+#define CONVERT_BADDEC(func) \
+  if (HAVE_OLEAUT32_DECIMAL) \
+  { \
+    CONVERT_DEC(func,29,0,0,0);   EXPECT_INVALID; \
+    CONVERT_DEC(func,0,0x1,0,0);  EXPECT_INVALID; \
+    CONVERT_DEC(func,0,0x40,0,0); EXPECT_INVALID; \
+    CONVERT_DEC(func,0,0x7f,0,0); EXPECT_INVALID; \
+  }
+
+#define CONVERT_STR(func,str,flags) \
+  SetLastError(0); \
+  if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,sizeof(buff)); \
+  hres = p##func(str ? buff : NULL,in,flags,&out)
+
+#define COPYTEST(val, vt, srcval, dstval, srcref, dstref, fs) \
+  HRESULT hres; VARIANTARG vSrc, vDst; CONV_TYPE in = val; \
+  VariantInit(&vSrc); VariantInit(&vDst); \
+  V_VT(&vSrc) = vt; srcval = in; \
+  hres = VariantCopy(&vDst, &vSrc); \
+  ok(hres == S_OK && V_VT(&vDst) == vt && dstval == in, \
+     "copy hres 0x%lX, type %d, value (" fs ") " fs "\n", hres, V_VT(&vDst), val, dstval); \
+  V_VT(&vSrc) = vt|VT_BYREF; srcref = &in; \
+  hres = VariantCopy(&vDst, &vSrc); \
+  ok(hres == S_OK && V_VT(&vDst) == (vt|VT_BYREF) && dstref == &in, \
+     "ref hres 0x%lX, type %d, ref (%p) %p\n", hres, V_VT(&vDst), &in, dstref); \
+  hres = VariantCopyInd(&vDst, &vSrc); \
+  ok(hres == S_OK && V_VT(&vDst) == vt && dstval == in, \
+     "ind hres 0x%lX, type %d, value (" fs ") " fs "\n", hres, V_VT(&vDst), val, dstval)
+
+#define CHANGETYPEEX(typ) hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, typ)
+
+#define TYPETEST(typ,res,fs) CHANGETYPEEX(typ); \
+  ok(hres == S_OK && V_VT(&vDst) == typ && (CONV_TYPE)res == in, \
+     "hres=0x%lX, type=%d (should be %d(" #typ ")), value=" fs " (should be 1)\n", \
+      hres, V_VT(&vDst), typ, (CONV_TYPE)res);
+#define TYPETESTI8(typ,res) CHANGETYPEEX(typ); \
+  ok(hres == S_OK && V_VT(&vDst) == typ && (CONV_TYPE)res == in, \
+     "hres=0x%lX, type=%d (should be %d(" #typ ")), value=%d (should be 1)\n", \
+      hres, V_VT(&vDst), typ, (int)res);
+#define BADVAR(typ)   CHANGETYPEEX(typ); out = (CONV_TYPE)hres; EXPECT_BADVAR
+#define MISMATCH(typ) CHANGETYPEEX(typ); out = (CONV_TYPE)hres; EXPECT_MISMATCH
+
+#define INITIAL_TYPETEST(vt, val, fs) \
+  VariantInit(&vSrc); \
+  VariantInit(&vDst); \
+  V_VT(&vSrc) = vt; \
+  (val(&vSrc)) = in; \
+  TYPETEST(VT_I1, V_I1(&vDst), fs); \
+  TYPETEST(VT_UI1, V_UI1(&vDst), fs); \
+  TYPETEST(VT_I2, V_I2(&vDst), fs); \
+  TYPETEST(VT_UI2, V_UI2(&vDst), fs); \
+  TYPETEST(VT_I4, V_I4(&vDst), fs); \
+  TYPETEST(VT_UI4, V_UI4(&vDst), fs); \
+  TYPETEST(VT_INT, V_INT(&vDst), fs); \
+  TYPETEST(VT_UINT, V_UINT(&vDst), fs); \
+  TYPETEST(VT_R4, V_R4(&vDst), fs); \
+  TYPETEST(VT_R8, V_R8(&vDst), fs); \
+  TYPETEST(VT_DATE, V_DATE(&vDst), fs); \
+  if (HAVE_OLEAUT32_I8) \
+  { \
+    TYPETEST(VT_I8, V_I8(&vDst), fs); \
+    TYPETEST(VT_UI8, V_UI8(&vDst), fs); \
+  }
+
+#define INITIAL_TYPETESTI8(vt, val) \
+  VariantInit(&vSrc); \
+  VariantInit(&vDst); \
+  V_VT(&vSrc) = vt; \
+  (val(&vSrc)) = in; \
+  TYPETESTI8(VT_I1, V_I1(&vDst)); \
+  TYPETESTI8(VT_UI1, V_UI1(&vDst)); \
+  TYPETESTI8(VT_I2, V_I2(&vDst)); \
+  TYPETESTI8(VT_UI2, V_UI2(&vDst)); \
+  TYPETESTI8(VT_I4, V_I4(&vDst)); \
+  TYPETESTI8(VT_UI4, V_UI4(&vDst)); \
+  TYPETESTI8(VT_INT, V_INT(&vDst)); \
+  TYPETESTI8(VT_UINT, V_UINT(&vDst)); \
+  TYPETESTI8(VT_R4, V_R4(&vDst)); \
+  TYPETESTI8(VT_R8, V_R8(&vDst)); \
+  TYPETESTI8(VT_DATE, V_DATE(&vDst)); \
+  TYPETESTI8(VT_I8, V_I8(&vDst)); \
+  TYPETESTI8(VT_UI8, V_UI8(&vDst))
+
+#define COMMON_TYPETEST \
+  hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_BOOL); \
+  ok(hres == S_OK && V_VT(&vDst) == VT_BOOL && \
+     (V_BOOL(&vDst) == VARIANT_TRUE || (V_VT(&vSrc) == VT_BOOL && V_BOOL(&vDst) == 1)), \
+     "->VT_BOOL hres=0x%lX, type=%d (should be VT_BOOL), value %d (should be VARIANT_TRUE)\n", \
+     hres, V_VT(&vDst), V_BOOL(&vDst)); \
+  if (HAVE_OLEAUT32_CY) \
+  { \
+    hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_CY); \
+    ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == CY_MULTIPLIER, \
+       "->VT_CY hres=0x%lX, type=%d (should be VT_CY), value (%08lx,%08lx) (should be CY_MULTIPLIER)\n", \
+       hres, V_VT(&vDst), V_CY(&vDst).s.Hi, V_CY(&vDst).s.Lo); \
+  } \
+  if (V_VT(&vSrc) != VT_DATE) \
+  { \
+    hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_BSTR); \
+    ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && \
+       V_BSTR(&vDst) && V_BSTR(&vDst)[0] == '1' && V_BSTR(&vDst)[1] == '\0', \
+       "->VT_BSTR hres=0x%lX, type=%d (should be VT_BSTR), *bstr='%c'\n", \
+       hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?'); \
+  } \
+  if (HAVE_OLEAUT32_DECIMAL) \
+  { \
+    hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_DECIMAL); \
+    ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && \
+       V_DECIMAL(&vDst).u.s.sign == 0 && V_DECIMAL(&vDst).u.s.scale == 0 && \
+       V_DECIMAL(&vDst).Hi32 == 0 && V_DECIMAL(&vDst).u1.Lo64 == (ULONGLONG)in, \
+       "->VT_DECIMAL hres=0x%lX, type=%d (should be VT_DECIMAL), sign=%d, scale=%d, hi=%lu, lo=(%8lx %8lx),\n", \
+       hres, V_VT(&vDst), V_DECIMAL(&vDst).u.s.sign, V_DECIMAL(&vDst).u.s.scale, \
+       V_DECIMAL(&vDst).Hi32, V_DECIMAL(&vDst).u1.s1.Mid32, V_DECIMAL(&vDst).u1.s1.Lo32); \
+  } \
+  hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_EMPTY); \
+  ok(hres == S_OK && V_VT(&vDst) == VT_EMPTY, "->VT_EMPTY hres=0x%lX, type=%d (should be VT_EMPTY)\n", hres, V_VT(&vDst)); \
+  hres = VariantChangeTypeEx(&vDst, &vSrc, 0, 0, VT_NULL); \
+  ok(hres == S_OK && V_VT(&vDst) == VT_NULL, "->VT_NULL hres=0x%lX, type=%d (should be VT_NULL)\n", hres, V_VT(&vDst)); \
+  MISMATCH(VT_DISPATCH); \
+  MISMATCH(VT_ERROR); \
+  MISMATCH(VT_UNKNOWN); \
+  MISMATCH(VT_VARIANT); \
+  if (HAVE_OLEAUT32_RECORD) \
+  { \
+    MISMATCH(VT_RECORD); \
+  } \
+  BADVAR(VT_VOID); \
+  BADVAR(VT_HRESULT); \
+  BADVAR(VT_SAFEARRAY); \
+  BADVAR(VT_CARRAY); \
+  BADVAR(VT_USERDEFINED); \
+  BADVAR(VT_LPSTR); \
+  BADVAR(VT_LPWSTR); \
+  BADVAR(VT_PTR); \
+  BADVAR(VT_INT_PTR); \
+  BADVAR(VT_UINT_PTR); \
+  BADVAR(VT_FILETIME); \
+  BADVAR(VT_BLOB); \
+  BADVAR(VT_STREAM); \
+  BADVAR(VT_STORAGE); \
+  BADVAR(VT_STREAMED_OBJECT); \
+  BADVAR(VT_STORED_OBJECT); \
+  BADVAR(VT_BLOB_OBJECT); \
+  BADVAR(VT_CF); \
+  BADVAR(VT_CLSID); \
+  BADVAR(VT_BSTR_BLOB)
+
+/* Early versions of oleaut32 are missing many functions */
+static HRESULT (WINAPI *pVarI1FromUI1)(BYTE,signed char*);
+static HRESULT (WINAPI *pVarI1FromI2)(SHORT,signed char*);
+static HRESULT (WINAPI *pVarI1FromI4)(LONG,signed char*);
+static HRESULT (WINAPI *pVarI1FromR4)(FLOAT,signed char*);
+static HRESULT (WINAPI *pVarI1FromR8)(double,signed char*);
+static HRESULT (WINAPI *pVarI1FromDate)(DATE,signed char*);
+static HRESULT (WINAPI *pVarI1FromCy)(CY,signed char*);
+static HRESULT (WINAPI *pVarI1FromStr)(OLECHAR*,LCID,ULONG,signed char*);
+static HRESULT (WINAPI *pVarI1FromBool)(VARIANT_BOOL,signed char*);
+static HRESULT (WINAPI *pVarI1FromUI2)(USHORT,signed char*);
+static HRESULT (WINAPI *pVarI1FromUI4)(ULONG,signed char*);
+static HRESULT (WINAPI *pVarI1FromDec)(DECIMAL*,signed char*);
+static HRESULT (WINAPI *pVarI1FromI8)(LONG64,signed char*);
+static HRESULT (WINAPI *pVarI1FromUI8)(ULONG64,signed char*);
+static HRESULT (WINAPI *pVarUI1FromI2)(SHORT,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromI4)(LONG,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromR4)(FLOAT,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromR8)(double,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromCy)(CY,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromDate)(DATE,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromStr)(OLECHAR*,LCID,ULONG,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromBool)(VARIANT_BOOL,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromI1)(signed char,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromUI2)(USHORT,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromUI4)(ULONG,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromDec)(DECIMAL*,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromI8)(LONG64,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromUI8)(ULONG64,BYTE*);
+static HRESULT (WINAPI *pVarUI1FromDisp)(IDispatch*,LCID,BYTE*);
+
+static HRESULT (WINAPI *pVarI2FromUI1)(BYTE,SHORT*);
+static HRESULT (WINAPI *pVarI2FromI4)(LONG,SHORT*);
+static HRESULT (WINAPI *pVarI2FromR4)(FLOAT,SHORT*);
+static HRESULT (WINAPI *pVarI2FromR8)(double,SHORT*);
+static HRESULT (WINAPI *pVarI2FromCy)(CY,SHORT*);
+static HRESULT (WINAPI *pVarI2FromDate)(DATE,SHORT*);
+static HRESULT (WINAPI *pVarI2FromStr)(OLECHAR*,LCID,ULONG,SHORT*);
+static HRESULT (WINAPI *pVarI2FromBool)(VARIANT_BOOL,SHORT*);
+static HRESULT (WINAPI *pVarI2FromI1)(signed char,SHORT*);
+static HRESULT (WINAPI *pVarI2FromUI2)(USHORT,SHORT*);
+static HRESULT (WINAPI *pVarI2FromUI4)(ULONG,SHORT*);
+static HRESULT (WINAPI *pVarI2FromDec)(DECIMAL*,SHORT*);
+static HRESULT (WINAPI *pVarI2FromI8)(LONG64,SHORT*);
+static HRESULT (WINAPI *pVarI2FromUI8)(ULONG64,SHORT*);
+static HRESULT (WINAPI *pVarUI2FromUI1)(BYTE,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromI2)(SHORT,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromI4)(LONG,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromR4)(FLOAT,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromR8)(double,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromDate)(DATE,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromCy)(CY,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromStr)(OLECHAR*,LCID,ULONG,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromBool)(VARIANT_BOOL,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromI1)(signed char,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromUI4)(ULONG,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromDec)(DECIMAL*,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromI8)(LONG64,USHORT*);
+static HRESULT (WINAPI *pVarUI2FromUI8)(ULONG64,USHORT*);
+
+static HRESULT (WINAPI *pVarI4FromUI1)(BYTE,LONG*);
+static HRESULT (WINAPI *pVarI4FromI2)(SHORT,LONG*);
+static HRESULT (WINAPI *pVarI4FromR4)(FLOAT,LONG*);
+static HRESULT (WINAPI *pVarI4FromR8)(DOUBLE,LONG*);
+static HRESULT (WINAPI *pVarI4FromCy)(CY,LONG*);
+static HRESULT (WINAPI *pVarI4FromDate)(DATE,LONG*);
+static HRESULT (WINAPI *pVarI4FromStr)(OLECHAR*,LCID,ULONG,LONG*);
+static HRESULT (WINAPI *pVarI4FromBool)(VARIANT_BOOL,LONG*);
+static HRESULT (WINAPI *pVarI4FromI1)(signed char,LONG*);
+static HRESULT (WINAPI *pVarI4FromUI2)(USHORT,LONG*);
+static HRESULT (WINAPI *pVarI4FromUI4)(ULONG,LONG*);
+static HRESULT (WINAPI *pVarI4FromDec)(DECIMAL*,LONG*);
+static HRESULT (WINAPI *pVarI4FromI8)(LONG64,LONG*);
+static HRESULT (WINAPI *pVarI4FromUI8)(ULONG64,LONG*);
+static HRESULT (WINAPI *pVarUI4FromUI1)(BYTE,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromI2)(SHORT,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromI4)(LONG,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromR4)(FLOAT,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromR8)(DOUBLE,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromDate)(DATE,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromCy)(CY,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromStr)(OLECHAR*,LCID,ULONG,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromBool)(VARIANT_BOOL,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromI1)(signed char,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromUI2)(USHORT,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromDec)(DECIMAL*,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromI8)(LONG64,ULONG*);
+static HRESULT (WINAPI *pVarUI4FromUI8)(ULONG64,ULONG*);
+
+static HRESULT (WINAPI *pVarI8FromUI1)(BYTE,LONG64*);
+static HRESULT (WINAPI *pVarI8FromI2)(SHORT,LONG64*);
+static HRESULT (WINAPI *pVarI8FromR4)(FLOAT,LONG64*);
+static HRESULT (WINAPI *pVarI8FromR8)(double,LONG64*);
+static HRESULT (WINAPI *pVarI8FromCy)(CY,LONG64*);
+static HRESULT (WINAPI *pVarI8FromDate)(DATE,LONG64*);
+static HRESULT (WINAPI *pVarI8FromStr)(OLECHAR*,LCID,ULONG,LONG64*);
+static HRESULT (WINAPI *pVarI8FromBool)(VARIANT_BOOL,LONG64*);
+static HRESULT (WINAPI *pVarI8FromI1)(signed char,LONG64*);
+static HRESULT (WINAPI *pVarI8FromUI2)(USHORT,LONG64*);
+static HRESULT (WINAPI *pVarI8FromUI4)(ULONG,LONG64*);
+static HRESULT (WINAPI *pVarI8FromDec)(DECIMAL*,LONG64*);
+static HRESULT (WINAPI *pVarI8FromUI8)(ULONG64,LONG64*);
+static HRESULT (WINAPI *pVarUI8FromI8)(LONG64,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromUI1)(BYTE,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromI2)(SHORT,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromR4)(FLOAT,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromR8)(double,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromCy)(CY,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromDate)(DATE,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromStr)(OLECHAR*,LCID,ULONG,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromBool)(VARIANT_BOOL,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromI1)(signed char,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromUI2)(USHORT,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromUI4)(ULONG,ULONG64*);
+static HRESULT (WINAPI *pVarUI8FromDec)(DECIMAL*,ULONG64*);
+
+static HRESULT (WINAPI *pVarR4FromUI1)(BYTE,float*);
+static HRESULT (WINAPI *pVarR4FromI2)(SHORT,float*);
+static HRESULT (WINAPI *pVarR4FromI4)(LONG,float*);
+static HRESULT (WINAPI *pVarR4FromR8)(double,float*);
+static HRESULT (WINAPI *pVarR4FromCy)(CY,float*);
+static HRESULT (WINAPI *pVarR4FromDate)(DATE,float*);
+static HRESULT (WINAPI *pVarR4FromStr)(OLECHAR*,LCID,ULONG,float*);
+static HRESULT (WINAPI *pVarR4FromBool)(VARIANT_BOOL,float*);
+static HRESULT (WINAPI *pVarR4FromI1)(signed char,float*);
+static HRESULT (WINAPI *pVarR4FromUI2)(USHORT,float*);
+static HRESULT (WINAPI *pVarR4FromUI4)(ULONG,float*);
+static HRESULT (WINAPI *pVarR4FromDec)(DECIMAL*,float*);
+static HRESULT (WINAPI *pVarR4FromI8)(LONG64,float*);
+static HRESULT (WINAPI *pVarR4FromUI8)(ULONG64,float*);
+
+static HRESULT (WINAPI *pVarR8FromUI1)(BYTE,double*);
+static HRESULT (WINAPI *pVarR8FromI2)(SHORT,double*);
+static HRESULT (WINAPI *pVarR8FromI4)(LONG,double*);
+static HRESULT (WINAPI *pVarR8FromR4)(FLOAT,double*);
+static HRESULT (WINAPI *pVarR8FromCy)(CY,double*);
+static HRESULT (WINAPI *pVarR8FromDate)(DATE,double*);
+static HRESULT (WINAPI *pVarR8FromStr)(OLECHAR*,LCID,ULONG,double*);
+static HRESULT (WINAPI *pVarR8FromBool)(VARIANT_BOOL,double*);
+static HRESULT (WINAPI *pVarR8FromI1)(signed char,double*);
+static HRESULT (WINAPI *pVarR8FromUI2)(USHORT,double*);
+static HRESULT (WINAPI *pVarR8FromUI4)(ULONG,double*);
+static HRESULT (WINAPI *pVarR8FromDec)(DECIMAL*,double*);
+static HRESULT (WINAPI *pVarR8FromI8)(LONG64,double*);
+static HRESULT (WINAPI *pVarR8FromUI8)(ULONG64,double*);
+static HRESULT (WINAPI *pVarR8Round)(double,int,double*);
+
+static HRESULT (WINAPI *pVarDateFromUI1)(BYTE,DATE*);
+static HRESULT (WINAPI *pVarDateFromI2)(SHORT,DATE*);
+static HRESULT (WINAPI *pVarDateFromI4)(LONG,DATE*);
+static HRESULT (WINAPI *pVarDateFromR4)(FLOAT,DATE*);
+static HRESULT (WINAPI *pVarDateFromCy)(CY,DATE*);
+static HRESULT (WINAPI *pVarDateFromR8)(double,DATE*);
+static HRESULT (WINAPI *pVarDateFromStr)(OLECHAR*,LCID,ULONG,DATE*);
+static HRESULT (WINAPI *pVarDateFromBool)(VARIANT_BOOL,DATE*);
+static HRESULT (WINAPI *pVarDateFromI1)(signed char,DATE*);
+static HRESULT (WINAPI *pVarDateFromUI2)(USHORT,DATE*);
+static HRESULT (WINAPI *pVarDateFromUI4)(ULONG,DATE*);
+static HRESULT (WINAPI *pVarDateFromDec)(DECIMAL*,DATE*);
+static HRESULT (WINAPI *pVarDateFromI8)(LONG64,DATE*);
+static HRESULT (WINAPI *pVarDateFromUI8)(ULONG64,DATE*);
+
+static HRESULT (WINAPI *pVarCyFromUI1)(BYTE,CY*);
+static HRESULT (WINAPI *pVarCyFromI2)(SHORT,CY*);
+static HRESULT (WINAPI *pVarCyFromI4)(LONG,CY*);
+static HRESULT (WINAPI *pVarCyFromR4)(FLOAT,CY*);
+static HRESULT (WINAPI *pVarCyFromR8)(double,CY*);
+static HRESULT (WINAPI *pVarCyFromDate)(DATE,CY*);
+static HRESULT (WINAPI *pVarCyFromBool)(VARIANT_BOOL,CY*);
+static HRESULT (WINAPI *pVarCyFromI1)(signed char,CY*);
+static HRESULT (WINAPI *pVarCyFromUI2)(USHORT,CY*);
+static HRESULT (WINAPI *pVarCyFromUI4)(ULONG,CY*);
+static HRESULT (WINAPI *pVarCyFromDec)(DECIMAL*,CY*);
+static HRESULT (WINAPI *pVarCyFromI8)(LONG64,CY*);
+static HRESULT (WINAPI *pVarCyFromUI8)(ULONG64,CY*);
+static HRESULT (WINAPI *pVarCyAdd)(const CY,const CY,CY*);
+static HRESULT (WINAPI *pVarCyMul)(const CY,const CY,CY*);
+static HRESULT (WINAPI *pVarCyMulI4)(const CY,LONG,CY*);
+static HRESULT (WINAPI *pVarCySub)(const CY,const CY,CY*);
+static HRESULT (WINAPI *pVarCyAbs)(const CY,CY*);
+static HRESULT (WINAPI *pVarCyFix)(const CY,CY*);
+static HRESULT (WINAPI *pVarCyInt)(const CY,CY*);
+static HRESULT (WINAPI *pVarCyNeg)(const CY,CY*);
+static HRESULT (WINAPI *pVarCyRound)(const CY,int,CY*);
+static HRESULT (WINAPI *pVarCyCmp)(const CY,const CY);
+static HRESULT (WINAPI *pVarCyCmpR8)(const CY,double);
+static HRESULT (WINAPI *pVarCyMulI8)(const CY,LONG64,CY*);
+
+static HRESULT (WINAPI *pVarDecFromUI1)(BYTE,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromI2)(SHORT,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromI4)(LONG,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromI8)(LONG64,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromR4)(FLOAT,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromR8)(DOUBLE,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromDate)(DATE,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromStr)(OLECHAR*,LCID,ULONG,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromBool)(VARIANT_BOOL,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromI1)(signed char,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromUI2)(USHORT,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromUI4)(ULONG,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromUI8)(ULONG64,DECIMAL*);
+static HRESULT (WINAPI *pVarDecFromCy)(CY,DECIMAL*);
+static HRESULT (WINAPI *pVarDecAbs)(const DECIMAL*,DECIMAL*);
+static HRESULT (WINAPI *pVarDecAdd)(const DECIMAL*,const DECIMAL*,DECIMAL*);
+static HRESULT (WINAPI *pVarDecSub)(const DECIMAL*,const DECIMAL*,DECIMAL*);
+static HRESULT (WINAPI *pVarDecCmp)(const DECIMAL*,const DECIMAL*);
+static HRESULT (WINAPI *pVarDecNeg)(const DECIMAL*,DECIMAL*);
+
+static HRESULT (WINAPI *pVarBoolFromUI1)(BYTE,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromI2)(SHORT,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromI4)(LONG,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromR4)(FLOAT,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromR8)(DOUBLE,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromDate)(DATE,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromCy)(CY,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromStr)(OLECHAR*,LCID,ULONG,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromI1)(signed char,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromUI2)(USHORT,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromUI4)(ULONG,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromDec)(DECIMAL*,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromI8)(LONG64,VARIANT_BOOL*);
+static HRESULT (WINAPI *pVarBoolFromUI8)(ULONG64,VARIANT_BOOL*);
+
+static HRESULT (WINAPI *pVarBstrFromR4)(FLOAT,LCID,ULONG,BSTR*);
+static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*);
+
+static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*);
+
+/* Internal representation of a BSTR */
+typedef struct tagINTERNAL_BSTR
+{
+  DWORD   dwLen;
+  OLECHAR szString[1];
+} INTERNAL_BSTR, *LPINTERNAL_BSTR;
+
+typedef struct
+{
+  ICOM_VFIELD(IDispatch);
+  ULONG ref;
+  VARTYPE vt;
+  BOOL bFailInvoke;
+} DummyDispatch;
+
+static DummyDispatch dispatch;
+
+static ULONG WINAPI DummyDispatch_AddRef(LPDISPATCH iface)
+{
+  trace("AddRef(%p)\n", iface);
+  return ++((DummyDispatch*)iface)->ref;
+}
+
+static ULONG WINAPI DummyDispatch_Release(LPDISPATCH iface)
+{
+  trace("Release(%p)\n", iface);
+  return ((DummyDispatch*)iface)->ref--;
+}
+
+static HRESULT WINAPI DummyDispatch_QueryInterface(LPDISPATCH iface,
+                                                   REFIID riid,
+                                                   void** ppvObject)
+{
+  trace("QueryInterface(%p)\n", iface);
+  if (ppvObject)
+  {
+    *ppvObject = NULL;
+    if (IsEqualIID(riid, &IID_IDispatch))
+    {
+      trace("Asked for IID_IDispatch\n");
+      *ppvObject = iface;
+    }
+    else if (IsEqualIID(riid, &IID_IUnknown))
+    {
+      trace("Asked for IID_IUnknown\n");
+      *ppvObject = iface;
+    }
+    if (*ppvObject)
+    {
+      DummyDispatch_AddRef((IDispatch*)*ppvObject);
+      return S_OK;
+    }
+  }
+  return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI DummyDispatch_Invoke(LPDISPATCH iface,
+                                           DISPID dispIdMember, REFIID riid,
+                                           LCID lcid, WORD wFlags,
+                                           DISPPARAMS *pDispParams,
+                                           VARIANT *pVarResult,
+                                           EXCEPINFO *pExcepInfo,
+                                           UINT *puArgErr)
+{
+  ICOM_THIS(DummyDispatch, iface);
+
+  trace("Invoke(%p)\n", iface);
+  ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n");
+  ok(pDispParams->cArgs == 0, "Property get has args\n");
+
+  if (dispatch.bFailInvoke)
+    return E_OUTOFMEMORY;
+
+  memset(pVarResult, 0, sizeof(*pVarResult));
+  V_VT(pVarResult) = dispatch.vt;
+  return S_OK;
+}
+
+static ICOM_VTABLE(IDispatch) DummyDispatch_VTable =
+{
+  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+  DummyDispatch_QueryInterface,
+  DummyDispatch_AddRef,
+  DummyDispatch_Release,
+  NULL,
+  NULL,
+  NULL,
+  DummyDispatch_Invoke
+};
+
+static DummyDispatch dispatch = { &DummyDispatch_VTable, 1, 0, 0 };
+
+/*
+ * VT_I1/VT_UI1
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE signed char
+#undef EXPECTRES
+#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d")
+
+static void test_VarI1FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarI1FromI2);
+  OVERFLOWRANGE(VarI1FromI2, -32768, -128);
+  CONVERTRANGE(VarI1FromI2, -128, 128);
+  OVERFLOWRANGE(VarI1FromI2, 129, 32768);
+}
+
+static void test_VarI1FromI4(void)
+{
+  CONVVARS(LONG);
+  int i;
+
+  CHECKPTR(VarI1FromI4);
+  CONVERT(VarI1FromI4, -129); EXPECT_OVERFLOW;
+  CONVERTRANGE(VarI1FromI4, -128, 128);
+  CONVERT(VarI1FromI4, 128);  EXPECT_OVERFLOW;
+}
+
+static void test_VarI1FromI8(void)
+{
+  CONVVARS(LONG64);
+  int i;
+
+  CHECKPTR(VarI1FromI8);
+  CONVERT(VarI1FromI8, -129);   EXPECT_OVERFLOW;
+  CONVERTRANGE(VarI1FromI8, -127, 128);
+  CONVERT(VarI1FromI8, 128);    EXPECT_OVERFLOW;
+}
+
+static void test_VarI1FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarI1FromUI1);
+  CONVERTRANGE(VarI1FromUI1, 0, 127);
+  OVERFLOWRANGE(VarI1FromUI1, 128, 255);
+}
+
+static void test_VarI1FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarI1FromUI2);
+  CONVERTRANGE(VarI1FromUI2, 0, 127);
+  OVERFLOWRANGE(VarI1FromUI2, 128, 32768);
+}
+
+static void test_VarI1FromUI4(void)
+{
+  CONVVARS(ULONG);
+  int i;
+
+  CHECKPTR(VarI1FromUI4);
+  CONVERTRANGE(VarI1FromUI4, 0, 127);
+  CONVERT(VarI1FromUI4, 128); EXPECT_OVERFLOW;
+}
+
+static void test_VarI1FromUI8(void)
+{
+  CONVVARS(ULONG64);
+  int i;
+
+  CHECKPTR(VarI1FromUI8);
+  CONVERTRANGE(VarI1FromUI8, 0, 127);
+  CONVERT(VarI1FromUI8, 128); EXPECT_OVERFLOW;
+}
+
+static void test_VarI1FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarI1FromBool);
+  /* Note that conversions from bool wrap around! */
+  CONVERT(VarI1FromBool, -129);  EXPECT(127);
+  CONVERTRANGE(VarI1FromBool, -128, 128);
+  CONVERT(VarI1FromBool, 128); EXPECT(-128);
+}
+
+static void test_VarI1FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarI1FromR4);
+  CONVERT(VarI1FromR4, -129.0f); EXPECT_OVERFLOW;
+  CONVERT(VarI1FromR4, -128.0f); EXPECT(-128);
+  CONVERT(VarI1FromR4, -1.0f);   EXPECT(-1);
+  CONVERT(VarI1FromR4, 0.0f);    EXPECT(0);
+  CONVERT(VarI1FromR4, 1.0f);    EXPECT(1);
+  CONVERT(VarI1FromR4, 127.0f);  EXPECT(127);
+  CONVERT(VarI1FromR4, 128.0f);  EXPECT_OVERFLOW;
+
+  CONVERT(VarI1FromR4, -1.5f); EXPECT(-2);
+  CONVERT(VarI1FromR4, -0.6f); EXPECT(-1);
+  CONVERT(VarI1FromR4, -0.5f); EXPECT(0);
+  CONVERT(VarI1FromR4, -0.4f); EXPECT(0);
+  CONVERT(VarI1FromR4, 0.4f);  EXPECT(0);
+  CONVERT(VarI1FromR4, 0.5f);  EXPECT(0);
+  CONVERT(VarI1FromR4, 0.6f);  EXPECT(1);
+  CONVERT(VarI1FromR4, 1.5f);  EXPECT(2);
+}
+
+static void test_VarI1FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarI1FromR8);
+  CONVERT(VarI1FromR8, -129.0); EXPECT_OVERFLOW;
+  CONVERT(VarI1FromR8, -128.0); EXPECT(-128);
+  CONVERT(VarI1FromR8, -1.0);   EXPECT(-1);
+  CONVERT(VarI1FromR8, 0.0);    EXPECT(0);
+  CONVERT(VarI1FromR8, 1.0);    EXPECT(1);
+  CONVERT(VarI1FromR8, 127.0);  EXPECT(127);
+  CONVERT(VarI1FromR8, 128.0);  EXPECT_OVERFLOW;
+
+  CONVERT(VarI1FromR8, -1.5); EXPECT(-2);
+  CONVERT(VarI1FromR8, -0.6); EXPECT(-1);
+  CONVERT(VarI1FromR8, -0.5); EXPECT(0);
+  CONVERT(VarI1FromR8, -0.4); EXPECT(0);
+  CONVERT(VarI1FromR8, 0.4);  EXPECT(0);
+  CONVERT(VarI1FromR8, 0.5);  EXPECT(0);
+  CONVERT(VarI1FromR8, 0.6);  EXPECT(1);
+  CONVERT(VarI1FromR8, 1.5);  EXPECT(2);
+}
+
+static void test_VarI1FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarI1FromDate);
+  CONVERT(VarI1FromDate, -129.0); EXPECT_OVERFLOW;
+  CONVERT(VarI1FromDate, -128.0); EXPECT(-128);
+  CONVERT(VarI1FromDate, -1.0);   EXPECT(-1);
+  CONVERT(VarI1FromDate, 0.0);    EXPECT(0);
+  CONVERT(VarI1FromDate, 1.0);    EXPECT(1);
+  CONVERT(VarI1FromDate, 127.0);  EXPECT(127);
+  CONVERT(VarI1FromDate, 128.0);  EXPECT_OVERFLOW;
+
+  CONVERT(VarI1FromDate, -1.5); EXPECT(-2);
+  CONVERT(VarI1FromDate, -0.6); EXPECT(-1);
+  CONVERT(VarI1FromDate, -0.5); EXPECT(0);
+  CONVERT(VarI1FromDate, -0.4); EXPECT(0);
+  CONVERT(VarI1FromDate, 0.4);  EXPECT(0);
+  CONVERT(VarI1FromDate, 0.5);  EXPECT(0);
+  CONVERT(VarI1FromDate, 0.6);  EXPECT(1);
+  CONVERT(VarI1FromDate, 1.5);  EXPECT(2);
+}
+
+static void test_VarI1FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarI1FromCy);
+  CONVERT_CY(VarI1FromCy,-129); EXPECT_OVERFLOW;
+  CONVERT_CY(VarI1FromCy,-128); EXPECT(128);
+  CONVERT_CY(VarI1FromCy,-1);   EXPECT(-1);
+  CONVERT_CY(VarI1FromCy,0);    EXPECT(0);
+  CONVERT_CY(VarI1FromCy,1);    EXPECT(1);
+  CONVERT_CY(VarI1FromCy,127);  EXPECT(127);
+  CONVERT_CY(VarI1FromCy,128);  EXPECT_OVERFLOW;
+
+  CONVERT_CY(VarI1FromCy,-1.5); EXPECT(-2);
+  CONVERT_CY(VarI1FromCy,-0.6); EXPECT(-1);
+  CONVERT_CY(VarI1FromCy,-0.5); EXPECT(0);
+  CONVERT_CY(VarI1FromCy,-0.4); EXPECT(0);
+  CONVERT_CY(VarI1FromCy,0.4);  EXPECT(0);
+  CONVERT_CY(VarI1FromCy,0.5);  EXPECT(0);
+  CONVERT_CY(VarI1FromCy,0.6);  EXPECT(1);
+  CONVERT_CY(VarI1FromCy,1.5);  EXPECT(2);
+}
+
+static void test_VarI1FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarI1FromDec);
+
+  CONVERT_BADDEC(VarI1FromDec);
+
+  CONVERT_DEC(VarI1FromDec,0,0x80,0,129); EXPECT_OVERFLOW;
+  CONVERT_DEC(VarI1FromDec,0,0x80,0,128); EXPECT(-128);
+  CONVERT_DEC(VarI1FromDec,0,0x80,0,1);   EXPECT(-1);
+  CONVERT_DEC(VarI1FromDec,0,0,0,0);      EXPECT(0);
+  CONVERT_DEC(VarI1FromDec,0,0,0,1);      EXPECT(1);
+  CONVERT_DEC(VarI1FromDec,0,0,0,127);    EXPECT(127);
+  CONVERT_DEC(VarI1FromDec,0,0,0,128);    EXPECT_OVERFLOW;
+
+  CONVERT_DEC(VarI1FromDec,2,0x80,0,12800); EXPECT(-128);
+  CONVERT_DEC(VarI1FromDec,2,0,0,12700);    EXPECT(127);
+}
+
+static void test_VarI1FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarI1FromStr);
+
+  CONVERT_STR(VarI1FromStr,NULL, 0);   EXPECT_MISMATCH;
+  CONVERT_STR(VarI1FromStr,"0", 0);    EXPECT(0);
+  CONVERT_STR(VarI1FromStr,"-129", 0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarI1FromStr,"-128", 0); EXPECT(-128);
+  CONVERT_STR(VarI1FromStr,"127", 0);  EXPECT(127);
+  CONVERT_STR(VarI1FromStr,"128", 0);  EXPECT_OVERFLOW;
+
+  CONVERT_STR(VarI1FromStr,"-1.5", 0); EXPECT(-2);
+  CONVERT_STR(VarI1FromStr,"-0.6", 0); EXPECT(-1);
+  CONVERT_STR(VarI1FromStr,"-0.5", 0); EXPECT(0);
+  CONVERT_STR(VarI1FromStr,"-0.4", 0); EXPECT(0);
+  CONVERT_STR(VarI1FromStr,"0.4", 0);  EXPECT(0);
+  CONVERT_STR(VarI1FromStr,"0.5", 0);  EXPECT(0);
+  CONVERT_STR(VarI1FromStr,"0.6", 0);  EXPECT(1);
+  CONVERT_STR(VarI1FromStr,"1.5", 0);  EXPECT(2);
+}
+
+static void test_VarI1Copy(void)
+{
+  COPYTEST(1, VT_I1, V_I1(&vSrc), V_I1(&vDst), V_I1REF(&vSrc), V_I1REF(&vDst), "%d");
+}
+
+static void test_VarI1ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1;
+
+  INITIAL_TYPETEST(VT_I1, V_I1, "%d");
+  COMMON_TYPETEST;
+}
+
+#undef CONV_TYPE
+#define CONV_TYPE BYTE
+
+static void test_VarUI1FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarUI1FromI1);
+  OVERFLOWRANGE(VarUI1FromI1, -128, 0);
+  CONVERTRANGE(VarUI1FromI1, 0, 128);
+}
+
+static void test_VarUI1FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarUI1FromI2);
+  OVERFLOWRANGE(VarUI1FromI2, -32768, 0);
+  CONVERTRANGE(VarUI1FromI2, 0, 256);
+  OVERFLOWRANGE(VarUI1FromI2, 256, 32768);
+}
+
+static void test_VarUI1FromI4(void)
+{
+  CONVVARS(LONG);
+  int i;
+
+  CHECKPTR(VarUI1FromI4);
+  CONVERT(VarUI1FromI4, -1);  EXPECT_OVERFLOW;
+  CONVERTRANGE(VarUI1FromI4, 0, 256);
+  CONVERT(VarUI1FromI4, 256); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI1FromI8(void)
+{
+  CONVVARS(LONG64);
+  int i;
+
+  CHECKPTR(VarUI1FromI8);
+  CONVERT(VarUI1FromI8, -1);  EXPECT_OVERFLOW;
+  CONVERTRANGE(VarUI1FromI8, 0, 256);
+  CONVERT(VarUI1FromI8, 256); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI1FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarUI1FromUI2);
+  CONVERTRANGE(VarUI1FromUI2, 0, 256);
+  OVERFLOWRANGE(VarUI1FromUI2, 256, 65536);
+}
+
+static void test_VarUI1FromUI4(void)
+{
+  CONVVARS(ULONG);
+  int i;
+
+  CHECKPTR(VarUI1FromUI4);
+  CONVERTRANGE(VarUI1FromUI4, 0, 256);
+  CONVERT(VarUI1FromUI4, 256); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI1FromUI8(void)
+{
+  CONVVARS(ULONG64);
+  int i;
+
+  CHECKPTR(VarUI1FromUI8);
+  CONVERTRANGE(VarUI1FromUI8, 0, 256);
+  CONVERT(VarUI1FromUI8, 256); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI1FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarUI1FromBool);
+  /* Note that conversions from bool overflow! */
+  CONVERT(VarUI1FromBool, -1); EXPECT(255);
+  CONVERTRANGE(VarUI1FromBool, 0, 256);
+  CONVERT(VarUI1FromBool, 256); EXPECT(0);
+}
+
+static void test_VarUI1FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarUI1FromR4);
+  CONVERT(VarUI1FromR4, -1.0f);  EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromR4, 0.0f);   EXPECT(0);
+  CONVERT(VarUI1FromR4, 1.0f);   EXPECT(1);
+  CONVERT(VarUI1FromR4, 255.0f); EXPECT(255);
+  CONVERT(VarUI1FromR4, 256.0f); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarUI1FromR4, -1.5f); EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromR4, -0.6f); EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromR4, -0.5f); EXPECT(0);
+  CONVERT(VarUI1FromR4, -0.4f); EXPECT(0);
+  CONVERT(VarUI1FromR4, 0.4f);  EXPECT(0);
+  CONVERT(VarUI1FromR4, 0.5f);  EXPECT(0);
+  CONVERT(VarUI1FromR4, 0.6f);  EXPECT(1);
+  CONVERT(VarUI1FromR4, 1.5f);  EXPECT(2);
+}
+
+static void test_VarUI1FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarUI1FromR8);
+  CONVERT(VarUI1FromR8, -1.0);  EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromR8, 0.0);   EXPECT(0);
+  CONVERT(VarUI1FromR8, 1.0);   EXPECT(1);
+  CONVERT(VarUI1FromR8, 255.0); EXPECT(255);
+  CONVERT(VarUI1FromR8, 256.0); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarUI1FromR8, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromR8, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromR8, -0.5); EXPECT(0);
+  CONVERT(VarUI1FromR8, -0.4); EXPECT(0);
+  CONVERT(VarUI1FromR8, 0.4);  EXPECT(0);
+  CONVERT(VarUI1FromR8, 0.5);  EXPECT(0);
+  CONVERT(VarUI1FromR8, 0.6);  EXPECT(1);
+  CONVERT(VarUI1FromR8, 1.5);  EXPECT(2);
+}
+
+static void test_VarUI1FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarUI1FromDate);
+  CONVERT(VarUI1FromDate, -1.0);  EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromDate, 0.0);   EXPECT(0);
+  CONVERT(VarUI1FromDate, 1.0);   EXPECT(1);
+  CONVERT(VarUI1FromDate, 255.0); EXPECT(255);
+  CONVERT(VarUI1FromDate, 256.0); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarUI1FromDate, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromDate, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI1FromDate, -0.5); EXPECT(0);
+  CONVERT(VarUI1FromDate, -0.4); EXPECT(0);
+  CONVERT(VarUI1FromDate, 0.4);  EXPECT(0);
+  CONVERT(VarUI1FromDate, 0.5);  EXPECT(0);
+  CONVERT(VarUI1FromDate, 0.6);  EXPECT(1);
+  CONVERT(VarUI1FromDate, 1.5);  EXPECT(2);
+}
+
+static void test_VarUI1FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarUI1FromCy);
+  CONVERT_CY(VarUI1FromCy,-1);  EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI1FromCy,0);   EXPECT(0);
+  CONVERT_CY(VarUI1FromCy,1);   EXPECT(1);
+  CONVERT_CY(VarUI1FromCy,255); EXPECT(255);
+  CONVERT_CY(VarUI1FromCy,256); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_CY(VarUI1FromCy,-1.5); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI1FromCy,-0.6); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI1FromCy,-0.5); EXPECT(0);
+  CONVERT_CY(VarUI1FromCy,-0.4); EXPECT(0);
+  CONVERT_CY(VarUI1FromCy,0.4);  EXPECT(0);
+  CONVERT_CY(VarUI1FromCy,0.5);  EXPECT(0);
+  CONVERT_CY(VarUI1FromCy,0.6);  EXPECT(1);
+  CONVERT_CY(VarUI1FromCy,1.5);  EXPECT(2);
+}
+
+static void test_VarUI1FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarUI1FromDec);
+
+  CONVERT_BADDEC(VarUI1FromDec);
+
+  CONVERT_DEC(VarUI1FromDec,0,0x80,0,1); EXPECT_OVERFLOW;
+  CONVERT_DEC(VarUI1FromDec,0,0,0,0);    EXPECT(0);
+  CONVERT_DEC(VarUI1FromDec,0,0,0,1);    EXPECT(1);
+  CONVERT_DEC(VarUI1FromDec,0,0,0,255);  EXPECT(255);
+  CONVERT_DEC(VarUI1FromDec,0,0,0,256);  EXPECT_OVERFLOW;
+
+  CONVERT_DEC(VarUI1FromDec,2,0x80,0,100); EXPECT_OVERFLOW;
+  CONVERT_DEC(VarUI1FromDec,2,0,0,25500);  EXPECT(255);
+}
+
+static void test_VarUI1FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarUI1FromStr);
+
+  CONVERT_STR(VarUI1FromStr,NULL, 0);   EXPECT_MISMATCH;
+  CONVERT_STR(VarUI1FromStr,"0", 0);    EXPECT(0);
+  CONVERT_STR(VarUI1FromStr,"-1", 0);   EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI1FromStr,"255", 0);  EXPECT(255);
+  CONVERT_STR(VarUI1FromStr,"256", 0);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_STR(VarUI1FromStr,"-1.5", 0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI1FromStr,"-0.6", 0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI1FromStr,"-0.5", 0); EXPECT(0);
+  CONVERT_STR(VarUI1FromStr,"-0.4", 0); EXPECT(0);
+  CONVERT_STR(VarUI1FromStr,"0.4", 0);  EXPECT(0);
+  CONVERT_STR(VarUI1FromStr,"0.5", 0);  EXPECT(0);
+  CONVERT_STR(VarUI1FromStr,"0.6", 0);  EXPECT(1);
+  CONVERT_STR(VarUI1FromStr,"1.5", 0);  EXPECT(2);
+}
+
+static void test_VarUI1FromDisp(void)
+{
+  CONVVARS(LCID);
+  VARIANTARG vSrc, vDst;
+
+  CHECKPTR(VarUI1FromDisp);
+
+  /* FIXME
+   * Conversions from IDispatch should get the default 'value' property
+   * from the IDispatch pointer and return it. The following tests this.
+   * However, I can't get these tests to return a valid value under native
+   * oleaut32, regardless of the value returned in response to the Invoke()
+   * call (early versions of oleaut32 call AddRef/Release, but not Invoke.
+   * I'm obviously missing something, as these conversions work fine
+   * when called through VBA on an object to get its default value property.
+   *
+   * Should this test be corrected so that it works under native it should be
+   * generalised and the remaining types checked as well.
+   */
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  VariantInit(&vSrc);
+  VariantInit(&vDst);
+
+  V_VT(&vSrc) = VT_DISPATCH;
+  V_DISPATCH(&vSrc) = (IDispatch*)&dispatch;
+  dispatch.vt = VT_UI1;
+  dispatch.bFailInvoke = FALSE;
+
+  hres = VarUI1FromDisp((IDispatch*)&dispatch, in, &out);
+  trace("0x%08lx\n", hres);
+
+  hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1);
+  trace("0x%08lx\n", hres);
+
+  dispatch.bFailInvoke = TRUE;
+
+  hres = VarUI1FromDisp((IDispatch*)&dispatch, in, &out);
+  trace("0x%08lx\n", hres);
+
+  hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1);
+  trace("0x%08lx\n", hres);
+}
+
+static void test_VarUI1Copy(void)
+{
+  COPYTEST(1, VT_UI1, V_UI1(&vSrc), V_UI1(&vDst), V_UI1REF(&vSrc), V_UI1REF(&vDst), "%d");
+}
+
+static void test_VarUI1ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1;
+
+  INITIAL_TYPETEST(VT_UI1, V_UI1, "%d");
+  COMMON_TYPETEST;
+}
+
+/*
+ * VT_I2/VT_UI2
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE SHORT
+#undef EXPECTRES
+#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d")
+
+static void test_VarI2FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarI2FromI1);
+  CONVERTRANGE(VarI2FromI1, -128, 128);
+}
+
+static void test_VarI2FromI4(void)
+{
+  CONVVARS(LONG);
+  int i;
+
+  CHECKPTR(VarI2FromI4);
+  CONVERT(VarI2FromI4, -32769); EXPECT_OVERFLOW;
+  CONVERTRANGE(VarI2FromI4, -32768, 32768);
+  CONVERT(VarI2FromI4, 32768);  EXPECT_OVERFLOW;
+}
+
+static void test_VarI2FromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarI2FromI8);
+  CONVERT(VarI2FromI8, -32769); EXPECT_OVERFLOW;
+  CONVERT(VarI2FromI8, -32768); EXPECT(-32768);
+  CONVERT(VarI2FromI8, 32767);  EXPECT(32767);
+  CONVERT(VarI2FromI8, 32768);  EXPECT_OVERFLOW;
+}
+
+static void test_VarI2FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarI2FromUI1);
+  CONVERTRANGE(VarI2FromUI1, 0, 256);
+}
+
+static void test_VarI2FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarI2FromUI2);
+  CONVERTRANGE(VarI2FromUI2, 0, 32768);
+  CONVERT(VarI2FromUI2, 32768); EXPECT_OVERFLOW;
+}
+
+static void test_VarI2FromUI4(void)
+{
+  CONVVARS(ULONG);
+  int i;
+
+  CHECKPTR(VarI2FromUI4);
+  CONVERTRANGE(VarI2FromUI4, 0, 32768);
+  CONVERT(VarI2FromUI4, 32768); EXPECT_OVERFLOW;
+}
+
+static void test_VarI2FromUI8(void)
+{
+  CONVVARS(ULONG64);
+  int i;
+
+  CHECKPTR(VarI2FromUI8);
+  CONVERTRANGE(VarI2FromUI8, 0, 32768);
+  CONVERT(VarI2FromUI8, 32768); EXPECT_OVERFLOW;
+}
+
+static void test_VarI2FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarI2FromBool);
+  CONVERTRANGE(VarI2FromBool, -32768, 32768);
+}
+
+static void test_VarI2FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarI2FromR4);
+  CONVERT(VarI2FromR4, -32769.0f); EXPECT_OVERFLOW;
+  CONVERT(VarI2FromR4, -32768.0f); EXPECT(-32768);
+  CONVERT(VarI2FromR4, -1.0f);     EXPECT(-1);
+  CONVERT(VarI2FromR4, 0.0f);      EXPECT(0);
+  CONVERT(VarI2FromR4, 1.0f);      EXPECT(1);
+  CONVERT(VarI2FromR4, 32767.0f);  EXPECT(32767);
+  CONVERT(VarI2FromR4, 32768.0f);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarI2FromR4, -1.5f); EXPECT(-2);
+  CONVERT(VarI2FromR4, -0.6f); EXPECT(-1);
+  CONVERT(VarI2FromR4, -0.5f); EXPECT(0);
+  CONVERT(VarI2FromR4, -0.4f); EXPECT(0);
+  CONVERT(VarI2FromR4, 0.4f);  EXPECT(0);
+  CONVERT(VarI2FromR4, 0.5f);  EXPECT(0);
+  CONVERT(VarI2FromR4, 0.6f);  EXPECT(1);
+  CONVERT(VarI2FromR4, 1.5f);  EXPECT(2);
+}
+
+static void test_VarI2FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarI2FromR8);
+  CONVERT(VarI2FromR8, -32769.0); EXPECT_OVERFLOW;
+  CONVERT(VarI2FromR8, -32768.0); EXPECT(-32768);
+  CONVERT(VarI2FromR8, -1.0);     EXPECT(-1);
+  CONVERT(VarI2FromR8, 0.0);      EXPECT(0);
+  CONVERT(VarI2FromR8, 1.0);      EXPECT(1);
+  CONVERT(VarI2FromR8, 32767.0);  EXPECT(32767);
+  CONVERT(VarI2FromR8, 32768.0);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarI2FromR8, -1.5); EXPECT(-2);
+  CONVERT(VarI2FromR8, -0.6); EXPECT(-1);
+  CONVERT(VarI2FromR8, -0.5); EXPECT(0);
+  CONVERT(VarI2FromR8, -0.4); EXPECT(0);
+  CONVERT(VarI2FromR8, 0.4);  EXPECT(0);
+  CONVERT(VarI2FromR8, 0.5);  EXPECT(0);
+  CONVERT(VarI2FromR8, 0.6);  EXPECT(1);
+  CONVERT(VarI2FromR8, 1.5);  EXPECT(2);
+}
+
+static void test_VarI2FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarI2FromDate);
+  CONVERT(VarI2FromDate, -32769.0); EXPECT_OVERFLOW;
+  CONVERT(VarI2FromDate, -32768.0); EXPECT(-32768);
+  CONVERT(VarI2FromDate, -1.0);   EXPECT(-1);
+  CONVERT(VarI2FromDate, 0.0);    EXPECT(0);
+  CONVERT(VarI2FromDate, 1.0);    EXPECT(1);
+  CONVERT(VarI2FromDate, 32767.0);  EXPECT(32767);
+  CONVERT(VarI2FromDate, 32768.0);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarI2FromDate, -1.5); EXPECT(-2);
+  CONVERT(VarI2FromDate, -0.6); EXPECT(-1);
+  CONVERT(VarI2FromDate, -0.5); EXPECT(0);
+  CONVERT(VarI2FromDate, -0.4); EXPECT(0);
+  CONVERT(VarI2FromDate, 0.4);  EXPECT(0);
+  CONVERT(VarI2FromDate, 0.5);  EXPECT(0);
+  CONVERT(VarI2FromDate, 0.6);  EXPECT(1);
+  CONVERT(VarI2FromDate, 1.5);  EXPECT(2);
+}
+
+static void test_VarI2FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarI2FromCy);
+  CONVERT_CY(VarI2FromCy,-32769); EXPECT_OVERFLOW;
+  CONVERT_CY(VarI2FromCy,-32768); EXPECT(32768);
+  CONVERT_CY(VarI2FromCy,-1);     EXPECT(-1);
+  CONVERT_CY(VarI2FromCy,0);      EXPECT(0);
+  CONVERT_CY(VarI2FromCy,1);      EXPECT(1);
+  CONVERT_CY(VarI2FromCy,32767);  EXPECT(32767);
+  CONVERT_CY(VarI2FromCy,32768);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_CY(VarI2FromCy,-1.5); EXPECT(-2);
+  CONVERT_CY(VarI2FromCy,-0.6); EXPECT(-1);
+  CONVERT_CY(VarI2FromCy,-0.5); EXPECT(0);
+  CONVERT_CY(VarI2FromCy,-0.4); EXPECT(0);
+  CONVERT_CY(VarI2FromCy,0.4);  EXPECT(0);
+  CONVERT_CY(VarI2FromCy,0.5);  EXPECT(0);
+  CONVERT_CY(VarI2FromCy,0.6);  EXPECT(1);
+  CONVERT_CY(VarI2FromCy,1.5);  EXPECT(2);
+}
+
+static void test_VarI2FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarI2FromDec);
+
+  CONVERT_BADDEC(VarI2FromDec);
+
+  CONVERT_DEC(VarI2FromDec,0,0x80,0,32769); EXPECT_OVERFLOW;
+  CONVERT_DEC(VarI2FromDec,0,0x80,0,32768); EXPECT(-32768);
+  CONVERT_DEC(VarI2FromDec,0,0x80,0,1);     EXPECT(-1);
+  CONVERT_DEC(VarI2FromDec,0,0,0,0);        EXPECT(0);
+  CONVERT_DEC(VarI2FromDec,0,0,0,1);        EXPECT(1);
+  CONVERT_DEC(VarI2FromDec,0,0,0,32767);    EXPECT(32767);
+  CONVERT_DEC(VarI2FromDec,0,0,0,32768);    EXPECT_OVERFLOW;
+
+  CONVERT_DEC(VarI2FromDec,2,0x80,0,3276800); EXPECT(-32768);
+  CONVERT_DEC(VarI2FromDec,2,0,0,3276700);    EXPECT(32767);
+  CONVERT_DEC(VarI2FromDec,2,0,0,3276800);    EXPECT_OVERFLOW;
+}
+
+static void test_VarI2FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarI2FromStr);
+
+  CONVERT_STR(VarI2FromStr,NULL, 0);     EXPECT_MISMATCH;
+  CONVERT_STR(VarI2FromStr,"0", 0);      EXPECT(0);
+  CONVERT_STR(VarI2FromStr,"-32769", 0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarI2FromStr,"-32768", 0); EXPECT(-32768);
+  CONVERT_STR(VarI2FromStr,"32767", 0);  EXPECT(32767);
+  CONVERT_STR(VarI2FromStr,"32768", 0);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_STR(VarI2FromStr,"-1.5", 0); EXPECT(-2);
+  CONVERT_STR(VarI2FromStr,"-0.6", 0); EXPECT(-1);
+  CONVERT_STR(VarI2FromStr,"-0.5", 0); EXPECT(0);
+  CONVERT_STR(VarI2FromStr,"-0.4", 0); EXPECT(0);
+  CONVERT_STR(VarI2FromStr,"0.4", 0);  EXPECT(0);
+  CONVERT_STR(VarI2FromStr,"0.5", 0);  EXPECT(0);
+  CONVERT_STR(VarI2FromStr,"0.6", 0);  EXPECT(1);
+  CONVERT_STR(VarI2FromStr,"1.5", 0);  EXPECT(2);
+}
+
+static void test_VarI2Copy(void)
+{
+  COPYTEST(1, VT_I2, V_I2(&vSrc), V_I2(&vDst), V_I2REF(&vSrc), V_I2REF(&vDst), "%d");
+}
+
+static void test_VarI2ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1;
+
+  INITIAL_TYPETEST(VT_I2, V_I2, "%d");
+  COMMON_TYPETEST;
+}
+
+#undef CONV_TYPE
+#define CONV_TYPE USHORT
+
+static void test_VarUI2FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarUI2FromI1);
+  OVERFLOWRANGE(VarUI2FromI1, -128, 0);
+  CONVERTRANGE(VarUI2FromI1, 0, 128);
+}
+
+static void test_VarUI2FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarUI2FromI2);
+  OVERFLOWRANGE(VarUI2FromI2, -32768, 0);
+  CONVERTRANGE(VarUI2FromI2, 0, 32768);
+}
+
+static void test_VarUI2FromI4(void)
+{
+  CONVVARS(LONG);
+  int i;
+
+  CHECKPTR(VarUI2FromI4);
+  OVERFLOWRANGE(VarUI2FromI4, -32768, 0);
+  CONVERT(VarUI2FromI4, 0);     EXPECT(0);
+  CONVERT(VarUI2FromI4, 65535); EXPECT(65535);
+  CONVERT(VarUI2FromI4, 65536); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI2FromI8(void)
+{
+  CONVVARS(LONG64);
+  int i;
+
+  CHECKPTR(VarUI2FromI8);
+  OVERFLOWRANGE(VarUI2FromI8, -32768, 0);
+  CONVERT(VarUI2FromI8, 0);     EXPECT(0);
+  CONVERT(VarUI2FromI8, 65535); EXPECT(65535);
+  CONVERT(VarUI2FromI8, 65536); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI2FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarUI2FromUI1);
+  CONVERTRANGE(VarUI2FromUI1, 0, 256);
+}
+
+static void test_VarUI2FromUI4(void)
+{
+  CONVVARS(ULONG);
+
+  CHECKPTR(VarUI2FromUI4);
+  CONVERT(VarUI2FromUI4, 0);     EXPECT(0);
+  CONVERT(VarUI2FromUI4, 65535); EXPECT(65535);
+  CONVERT(VarUI2FromUI4, 65536); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI2FromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarUI2FromUI8);
+  CONVERT(VarUI2FromUI8, 0);     EXPECT(0);
+  CONVERT(VarUI2FromUI8, 65535); EXPECT(65535);
+  CONVERT(VarUI2FromUI8, 65536); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI2FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarUI2FromBool);
+  CONVERT(VarUI2FromBool, -1); EXPECT(65535); /* Wraps! */
+  CONVERTRANGE(VarUI2FromBool, 0, 32768);
+}
+
+static void test_VarUI2FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarUI2FromR4);
+  CONVERT(VarUI2FromR4, -1.0f);    EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromR4, 0.0f);     EXPECT(0);
+  CONVERT(VarUI2FromR4, 1.0f);     EXPECT(1);
+  CONVERT(VarUI2FromR4, 65535.0f); EXPECT(65535);
+  CONVERT(VarUI2FromR4, 65536.0f); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarUI2FromR4, -1.5f); EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromR4, -0.6f); EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromR4, -0.5f); EXPECT(0);
+  CONVERT(VarUI2FromR4, -0.4f); EXPECT(0);
+  CONVERT(VarUI2FromR4, 0.4f);  EXPECT(0);
+  CONVERT(VarUI2FromR4, 0.5f);  EXPECT(0);
+  CONVERT(VarUI2FromR4, 0.6f);  EXPECT(1);
+  CONVERT(VarUI2FromR4, 1.5f);  EXPECT(2);
+}
+
+static void test_VarUI2FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarUI2FromR8);
+  CONVERT(VarUI2FromR8, -1.0);    EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromR8, 0.0);     EXPECT(0);
+  CONVERT(VarUI2FromR8, 1.0);     EXPECT(1);
+  CONVERT(VarUI2FromR8, 65535.0); EXPECT(65535);
+  CONVERT(VarUI2FromR8, 65536.0); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarUI2FromR8, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromR8, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromR8, -0.5); EXPECT(0);
+  CONVERT(VarUI2FromR8, -0.4); EXPECT(0);
+  CONVERT(VarUI2FromR8, 0.4);  EXPECT(0);
+  CONVERT(VarUI2FromR8, 0.5);  EXPECT(0);
+  CONVERT(VarUI2FromR8, 0.6);  EXPECT(1);
+  CONVERT(VarUI2FromR8, 1.5);  EXPECT(2);
+}
+
+static void test_VarUI2FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarUI2FromDate);
+  CONVERT(VarUI2FromDate, -1.0);    EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromDate, 0.0);     EXPECT(0);
+  CONVERT(VarUI2FromDate, 1.0);     EXPECT(1);
+  CONVERT(VarUI2FromDate, 65535.0); EXPECT(65535);
+  CONVERT(VarUI2FromDate, 65536.0); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarUI2FromDate, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromDate, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI2FromDate, -0.5); EXPECT(0);
+  CONVERT(VarUI2FromDate, -0.4); EXPECT(0);
+  CONVERT(VarUI2FromDate, 0.4);  EXPECT(0);
+  CONVERT(VarUI2FromDate, 0.5);  EXPECT(0);
+  CONVERT(VarUI2FromDate, 0.6);  EXPECT(1);
+  CONVERT(VarUI2FromDate, 1.5);  EXPECT(2);
+}
+
+static void test_VarUI2FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarUI2FromCy);
+  CONVERT_CY(VarUI2FromCy,-1);    EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI2FromCy,0);     EXPECT(0);
+  CONVERT_CY(VarUI2FromCy,1);     EXPECT(1);
+  CONVERT_CY(VarUI2FromCy,65535); EXPECT(65535);
+  CONVERT_CY(VarUI2FromCy,65536); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_CY(VarUI2FromCy,-1.5); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI2FromCy,-0.6); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI2FromCy,-0.5); EXPECT(0);
+  CONVERT_CY(VarUI2FromCy,-0.4); EXPECT(0);
+  CONVERT_CY(VarUI2FromCy,0.4);  EXPECT(0);
+  CONVERT_CY(VarUI2FromCy,0.5);  EXPECT(0);
+  CONVERT_CY(VarUI2FromCy,0.6);  EXPECT(1);
+  CONVERT_CY(VarUI2FromCy,1.5);  EXPECT(2);
+}
+
+static void test_VarUI2FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarUI2FromDec);
+
+  CONVERT_BADDEC(VarUI2FromDec);
+
+  CONVERT_DEC(VarUI2FromDec,0,0x80,0,1);  EXPECT_OVERFLOW;
+  CONVERT_DEC(VarUI2FromDec,0,0,0,0);     EXPECT(0);
+  CONVERT_DEC(VarUI2FromDec,0,0,0,1);     EXPECT(1);
+  CONVERT_DEC(VarUI2FromDec,0,0,0,65535); EXPECT(65535);
+  CONVERT_DEC(VarUI2FromDec,0,0,0,65536); EXPECT_OVERFLOW;
+
+  CONVERT_DEC(VarUI2FromDec,2,0x80,0,100);  EXPECT_OVERFLOW;
+  CONVERT_DEC(VarUI2FromDec,2,0,0,6553500); EXPECT(65535);
+  CONVERT_DEC(VarUI2FromDec,2,0,0,6553600); EXPECT_OVERFLOW;
+}
+
+static void test_VarUI2FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarUI2FromStr);
+
+  CONVERT_STR(VarUI2FromStr,NULL, 0);    EXPECT_MISMATCH;
+  CONVERT_STR(VarUI2FromStr,"0", 0);     EXPECT(0);
+  CONVERT_STR(VarUI2FromStr,"-1", 0);    EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI2FromStr,"65535", 0); EXPECT(65535);
+  CONVERT_STR(VarUI2FromStr,"65536", 0); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_STR(VarUI2FromStr,"-1.5", 0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI2FromStr,"-0.6", 0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI2FromStr,"-0.5", 0); EXPECT(0);
+  CONVERT_STR(VarUI2FromStr,"-0.4", 0); EXPECT(0);
+  CONVERT_STR(VarUI2FromStr,"0.4", 0);  EXPECT(0);
+  CONVERT_STR(VarUI2FromStr,"0.5", 0);  EXPECT(0);
+  CONVERT_STR(VarUI2FromStr,"0.6", 0);  EXPECT(1);
+  CONVERT_STR(VarUI2FromStr,"1.5", 0);  EXPECT(2);
+}
+
+static void test_VarUI2Copy(void)
+{
+  COPYTEST(1, VT_UI2, V_UI2(&vSrc), V_UI2(&vDst), V_UI2REF(&vSrc), V_UI2REF(&vDst), "%d");
+}
+
+static void test_VarUI2ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1;
+
+  INITIAL_TYPETEST(VT_UI2, V_UI2, "%d");
+  COMMON_TYPETEST;
+}
+
+/*
+ * VT_I4/VT_UI4
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE LONG
+#undef EXPECTRES
+#define EXPECTRES(res, x) _EXPECTRES(res, x, "%ld")
+
+
+static void test_VarI4FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarI4FromI1);
+  CONVERTRANGE(VarI4FromI1, -128, 128);
+}
+
+static void test_VarI4FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarI4FromI2);
+  CONVERTRANGE(VarI4FromI2, -32768, 32768);
+}
+
+static void test_VarI4FromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarI4FromI8);
+  CHECKPTR(VarI4FromDec);
+
+  CONVERT(VarI4FromI8, -1);                   EXPECT(-1);
+  CONVERT(VarI4FromI8, 0);                    EXPECT(0);
+  CONVERT(VarI4FromI8, 1);                    EXPECT(1);
+
+  CONVERT_I8(VarI4FromI8, -1, 2147483647ul); EXPECT_OVERFLOW;
+  CONVERT_I8(VarI4FromI8, -1, 2147483648ul); EXPECT(-2147483647 - 1);
+  CONVERT_I8(VarI4FromI8, 0, 2147483647ul);  EXPECT(2147483647);
+  CONVERT_I8(VarI4FromI8, 0, 2147483648ul);  EXPECT_OVERFLOW;
+}
+
+static void test_VarI4FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarI4FromUI1);
+  CONVERTRANGE(VarI4FromUI1, 0, 256);
+}
+
+static void test_VarI4FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarI4FromUI2);
+  CONVERTRANGE(VarI4FromUI2, 0, 65536);
+}
+
+static void test_VarI4FromUI4(void)
+{
+  CONVVARS(ULONG);
+
+  CHECKPTR(VarI4FromUI4);
+  CONVERT(VarI4FromUI4, 0);            EXPECT(0);
+  CONVERT(VarI4FromUI4, 1);            EXPECT(1);
+  CONVERT(VarI4FromUI4, 2147483647);   EXPECT(2147483647);
+  CONVERT(VarI4FromUI4, 2147483648ul); EXPECT_OVERFLOW;
+}
+
+static void test_VarI4FromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarI4FromUI8);
+  CONVERT(VarI4FromUI8, 0);             EXPECT(0);
+  CONVERT(VarI4FromUI8, 1);             EXPECT(1);
+  CONVERT(VarI4FromUI8, 2147483647);    EXPECT(2147483647);
+  CONVERT(VarI4FromUI8, 2147483648ul);  EXPECT_OVERFLOW;
+}
+
+static void test_VarI4FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarI4FromBool);
+  CONVERTRANGE(VarI4FromBool, -32768, 32768);
+}
+
+static void test_VarI4FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarI4FromR4);
+
+  /* min/max values are not exactly representable in a float */
+  CONVERT(VarI4FromR4, -1.0f); EXPECT(-1);
+  CONVERT(VarI4FromR4, 0.0f);  EXPECT(0);
+  CONVERT(VarI4FromR4, 1.0f);  EXPECT(1);
+
+  CONVERT(VarI4FromR4, -1.5f); EXPECT(-2);
+  CONVERT(VarI4FromR4, -0.6f); EXPECT(-1);
+  CONVERT(VarI4FromR4, -0.5f); EXPECT(0);
+  CONVERT(VarI4FromR4, -0.4f); EXPECT(0);
+  CONVERT(VarI4FromR4, 0.4f);  EXPECT(0);
+  CONVERT(VarI4FromR4, 0.5f);  EXPECT(0);
+  CONVERT(VarI4FromR4, 0.6f);  EXPECT(1);
+  CONVERT(VarI4FromR4, 1.5f);  EXPECT(2);
+}
+
+static void test_VarI4FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarI4FromR8);
+  CONVERT(VarI4FromR8, -2147483649.0); EXPECT_OVERFLOW;
+  CONVERT(VarI4FromR8, -2147483648.0); EXPECT(-2147483647 - 1);
+  CONVERT(VarI4FromR8, -1.0);          EXPECT(-1);
+  CONVERT(VarI4FromR8, 0.0);           EXPECT(0);
+  CONVERT(VarI4FromR8, 1.0);           EXPECT(1);
+  CONVERT(VarI4FromR8, 2147483647.0);  EXPECT(2147483647);
+  CONVERT(VarI4FromR8, 2147483648.0);  EXPECT_OVERFLOW;
+
+  CONVERT(VarI4FromR8, -1.5); EXPECT(-2);
+  CONVERT(VarI4FromR8, -0.6); EXPECT(-1);
+  CONVERT(VarI4FromR8, -0.5); EXPECT(0);
+  CONVERT(VarI4FromR8, -0.4); EXPECT(0);
+  CONVERT(VarI4FromR8, 0.4);  EXPECT(0);
+  CONVERT(VarI4FromR8, 0.5);  EXPECT(0);
+  CONVERT(VarI4FromR8, 0.6);  EXPECT(1);
+  CONVERT(VarI4FromR8, 1.5);  EXPECT(2);
+}
+
+static void test_VarI4FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarI4FromDate);
+  CONVERT(VarI4FromDate, -2147483649.0); EXPECT_OVERFLOW;
+  CONVERT(VarI4FromDate, -2147483648.0); EXPECT(-2147483647 - 1);
+  CONVERT(VarI4FromDate, -1.0);          EXPECT(-1);
+  CONVERT(VarI4FromDate, 0.0);           EXPECT(0);
+  CONVERT(VarI4FromDate, 1.0);           EXPECT(1);
+  CONVERT(VarI4FromDate, 2147483647.0);  EXPECT(2147483647);
+  CONVERT(VarI4FromDate, 2147483648.0);  EXPECT_OVERFLOW;
+
+  CONVERT(VarI4FromDate, -1.5); EXPECT(-2);
+  CONVERT(VarI4FromDate, -0.6); EXPECT(-1);
+  CONVERT(VarI4FromDate, -0.5); EXPECT(0);
+  CONVERT(VarI4FromDate, -0.4); EXPECT(0);
+  CONVERT(VarI4FromDate, 0.4);  EXPECT(0);
+  CONVERT(VarI4FromDate, 0.5);  EXPECT(0);
+  CONVERT(VarI4FromDate, 0.6);  EXPECT(1);
+  CONVERT(VarI4FromDate, 1.5);  EXPECT(2);
+}
+
+static void test_VarI4FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarI4FromCy);
+  CONVERT_CY(VarI4FromCy,-1); EXPECT(-1);
+  CONVERT_CY(VarI4FromCy,0);  EXPECT(0);
+  CONVERT_CY(VarI4FromCy,1);  EXPECT(1);
+
+  CONVERT_CY64(VarI4FromCy,-1,2147483647ul); EXPECT_OVERFLOW;
+  CONVERT_CY64(VarI4FromCy,-1,2147483648ul); EXPECT(-2147483647 - 1);
+  CONVERT_CY64(VarI4FromCy,0,2147483647ul);  EXPECT(2147483647ul);
+  CONVERT_CY64(VarI4FromCy,0,2147483648ul);  EXPECT_OVERFLOW;
+
+  CONVERT_CY(VarI4FromCy,-1.5); EXPECT(-2);
+  CONVERT_CY(VarI4FromCy,-0.6); EXPECT(-1);
+  CONVERT_CY(VarI4FromCy,-0.5); EXPECT(0);
+  CONVERT_CY(VarI4FromCy,-0.4); EXPECT(0);
+  CONVERT_CY(VarI4FromCy,0.4);  EXPECT(0);
+  CONVERT_CY(VarI4FromCy,0.5);  EXPECT(0);
+  CONVERT_CY(VarI4FromCy,0.6);  EXPECT(1);
+  CONVERT_CY(VarI4FromCy,1.5);  EXPECT(2);
+}
+
+static void test_VarI4FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarI4FromDec);
+
+  CONVERT_BADDEC(VarI4FromDec);
+
+  CONVERT_DEC(VarI4FromDec,0,0x80,0,1); EXPECT(-1);
+  CONVERT_DEC(VarI4FromDec,0,0,0,0);    EXPECT(0);
+  CONVERT_DEC(VarI4FromDec,0,0,0,1);    EXPECT(1);
+
+  CONVERT_DEC64(VarI4FromDec,0,0x80,0,0,2147483649ul);  EXPECT_OVERFLOW;
+  CONVERT_DEC64(VarI4FromDec,0,0x80,0,0,2147483648ul);  EXPECT(-2147483647 - 1);
+  CONVERT_DEC64(VarI4FromDec,0,0,0,0,2147483647ul);     EXPECT(2147483647ul);
+  CONVERT_DEC64(VarI4FromDec,0,0,0,0,2147483648ul);     EXPECT_OVERFLOW;
+
+  CONVERT_DEC64(VarI4FromDec,2,0x80,0,50,100);       EXPECT_OVERFLOW;
+  CONVERT_DEC64(VarI4FromDec,2,0x80,0,50,0);         EXPECT(-2147483647 - 1);
+  CONVERT_DEC64(VarI4FromDec,2,0,0,49,4294967196ul); EXPECT(2147483647);
+  CONVERT_DEC64(VarI4FromDec,2,0,0,50,0);            EXPECT_OVERFLOW;
+}
+
+static void test_VarI4FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarI4FromStr);
+
+  CONVERT_STR(VarI4FromStr,NULL,0);          EXPECT_MISMATCH;
+  CONVERT_STR(VarI4FromStr,"0",0);           EXPECT(0);
+  CONVERT_STR(VarI4FromStr,"-2147483649",0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarI4FromStr,"-2147483648",0); EXPECT(-2147483647 -1);
+  CONVERT_STR(VarI4FromStr,"2147483647",0);  EXPECT(2147483647);
+  CONVERT_STR(VarI4FromStr,"2147483648",0);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_STR(VarI4FromStr,"-1.5",0); EXPECT(-2);
+  CONVERT_STR(VarI4FromStr,"-0.6",0); EXPECT(-1);
+  CONVERT_STR(VarI4FromStr,"-0.5",0); EXPECT(0);
+  CONVERT_STR(VarI4FromStr,"-0.4",0); EXPECT(0);
+  CONVERT_STR(VarI4FromStr,"0.4",0);  EXPECT(0);
+  CONVERT_STR(VarI4FromStr,"0.5",0);  EXPECT(0);
+  CONVERT_STR(VarI4FromStr,"0.6",0);  EXPECT(1);
+  CONVERT_STR(VarI4FromStr,"1.5",0);  EXPECT(2);
+}
+
+static void test_VarI4Copy(void)
+{
+  COPYTEST(1l, VT_I4, V_I4(&vSrc), V_I4(&vDst), V_I4REF(&vSrc), V_I4REF(&vDst), "%ld");
+}
+
+static void test_VarI4ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1;
+
+  INITIAL_TYPETEST(VT_I4, V_I4, "%ld");
+  COMMON_TYPETEST;
+}
+
+#undef CONV_TYPE
+#define CONV_TYPE ULONG
+#undef EXPECTRES
+#define EXPECTRES(res, x) _EXPECTRES(res, x, "%lu")
+
+static void test_VarUI4FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarUI4FromI1);
+  OVERFLOWRANGE(VarUI4FromI1, -127, 0);
+  CONVERTRANGE(VarUI4FromI1, 0, 128);
+}
+
+static void test_VarUI4FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarUI4FromI2);
+  OVERFLOWRANGE(VarUI4FromI2, -32768, 0);
+  CONVERTRANGE(VarUI4FromI2, 0, 32768);
+}
+
+static void test_VarUI4FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarUI4FromUI2);
+  CONVERTRANGE(VarUI4FromUI2, 0, 65536);
+}
+
+static void test_VarUI4FromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarUI4FromI8);
+  CONVERT(VarUI4FromI8, -1);           EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromI8, 0);            EXPECT(0);
+  CONVERT(VarUI4FromI8, 1);            EXPECT(1);
+  CONVERT(VarUI4FromI8, 4294967295ul); EXPECT(4294967295ul);
+  CONVERT_I8(VarUI4FromI8, 1, 0);      EXPECT_OVERFLOW;
+}
+
+static void test_VarUI4FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarUI4FromUI1);
+  CONVERTRANGE(VarUI4FromUI1, 0, 256);
+}
+
+static void test_VarUI4FromI4(void)
+{
+  CONVVARS(int);
+
+  CHECKPTR(VarUI4FromI4);
+  CONVERT(VarUI4FromI4, -1);         EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromI4, 0);          EXPECT(0);
+  CONVERT(VarUI4FromI4, 1);          EXPECT(1);
+  CONVERT(VarUI4FromI4, 2147483647); EXPECT(2147483647);
+}
+
+static void test_VarUI4FromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarUI4FromUI8);
+  CONVERT(VarUI4FromUI8, 0);           EXPECT(0);
+  CONVERT(VarUI4FromUI8, 1);           EXPECT(1);
+  CONVERT(VarUI4FromI8, 4294967295ul); EXPECT(4294967295ul);
+  CONVERT_I8(VarUI4FromI8, 1, 0);      EXPECT_OVERFLOW;
+}
+
+static void test_VarUI4FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarUI4FromBool);
+  CONVERTRANGE(VarUI4FromBool, -32768, 32768);
+}
+
+static void test_VarUI4FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarUI4FromR4);
+  /* We can't test max values as they are not exactly representable in a float */
+  CONVERT(VarUI4FromR4, -1.0f); EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromR4, 0.0f);  EXPECT(0);
+  CONVERT(VarUI4FromR4, 1.0f);  EXPECT(1);
+
+  CONVERT(VarUI4FromR4, -1.5f); EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromR4, -0.6f); EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromR4, -0.5f); EXPECT(0);
+  CONVERT(VarUI4FromR4, -0.4f); EXPECT(0);
+  CONVERT(VarUI4FromR4, 0.4f);  EXPECT(0);
+  CONVERT(VarUI4FromR4, 0.5f);  EXPECT(0);
+  CONVERT(VarUI4FromR4, 0.6f);  EXPECT(1);
+  CONVERT(VarUI4FromR4, 1.5f);  EXPECT(2);
+
+}
+
+static void test_VarUI4FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarUI4FromR8);
+  CONVERT(VarUI4FromR8, -1.0);         EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromR8, 0.0);          EXPECT(0);
+  CONVERT(VarUI4FromR8, 1.0);          EXPECT(1);
+  CONVERT(VarUI4FromR8, 4294967295.0); EXPECT(4294967295ul);
+  CONVERT(VarUI4FromR8, 4294967296.0); EXPECT_OVERFLOW;
+
+  CONVERT(VarUI4FromR8, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromR8, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromR8, -0.5); EXPECT(0);
+  CONVERT(VarUI4FromR8, -0.4); EXPECT(0);
+  CONVERT(VarUI4FromR8, 0.4);  EXPECT(0);
+  CONVERT(VarUI4FromR8, 0.5);  EXPECT(0);
+  CONVERT(VarUI4FromR8, 0.6);  EXPECT(1);
+  CONVERT(VarUI4FromR8, 1.5);  EXPECT(2);
+}
+
+static void test_VarUI4FromDate(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarUI4FromDate);
+  CONVERT(VarUI4FromDate, -1.0);         EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromDate, 0.0);          EXPECT(0);
+  CONVERT(VarUI4FromDate, 1.0);          EXPECT(1);
+  CONVERT(VarUI4FromDate, 4294967295.0); EXPECT(4294967295ul);
+  CONVERT(VarUI4FromDate, 4294967296.0); EXPECT_OVERFLOW;
+
+  CONVERT(VarUI4FromDate, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromDate, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI4FromDate, -0.5); EXPECT(0);
+  CONVERT(VarUI4FromDate, -0.4); EXPECT(0);
+  CONVERT(VarUI4FromDate, 0.4);  EXPECT(0);
+  CONVERT(VarUI4FromDate, 0.5);  EXPECT(0);
+  CONVERT(VarUI4FromDate, 0.6);  EXPECT(1);
+  CONVERT(VarUI4FromDate, 1.5);  EXPECT(2);
+}
+
+static void test_VarUI4FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarUI4FromCy);
+  CONVERT_CY(VarUI4FromCy,-1);               EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI4FromCy,0);                EXPECT(0);
+  CONVERT_CY(VarUI4FromCy,1);                EXPECT(1);
+  CONVERT_CY64(VarUI4FromCy,0,4294967295ul); EXPECT(4294967295ul);
+  CONVERT_CY64(VarUI4FromCy,1,0);            EXPECT_OVERFLOW;
+
+  CONVERT_CY(VarUI4FromCy,-1.5); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI4FromCy,-0.6); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI4FromCy,-0.5); EXPECT(0);
+  CONVERT_CY(VarUI4FromCy,-0.4); EXPECT(0);
+  CONVERT_CY(VarUI4FromCy,0.4);  EXPECT(0);
+  CONVERT_CY(VarUI4FromCy,0.5);  EXPECT(0);
+  CONVERT_CY(VarUI4FromCy,0.6);  EXPECT(1);
+  CONVERT_CY(VarUI4FromCy,1.5);  EXPECT(2);
+}
+
+static void test_VarUI4FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarUI4FromDec);
+
+  CONVERT_BADDEC(VarUI4FromDec);
+
+  CONVERT_DEC(VarUI4FromDec,0,0x80,0,1);              EXPECT_OVERFLOW;
+  CONVERT_DEC(VarUI4FromDec,0,0,0,0);                 EXPECT(0);
+  CONVERT_DEC(VarUI4FromDec,0,0,0,1);                 EXPECT(1);
+  CONVERT_DEC64(VarUI4FromDec,0,0,0,0,4294967295ul);  EXPECT(4294967295ul);
+  CONVERT_DEC64(VarUI4FromDec,0,0,0,1,0);             EXPECT_OVERFLOW;
+
+  CONVERT_DEC64(VarUI4FromDec,2,0,0,99,4294967196ul); EXPECT(4294967295ul);
+  CONVERT_DEC64(VarUI4FromDec,2,0,0,100,0);           EXPECT_OVERFLOW;
+}
+
+static void test_VarUI4FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarUI4FromStr);
+
+  CONVERT_STR(VarUI4FromStr,NULL,0);         EXPECT_MISMATCH;
+  CONVERT_STR(VarUI4FromStr,"-1",0);         EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI4FromStr,"0",0);          EXPECT(0);
+  CONVERT_STR(VarUI4FromStr,"4294967295",0); EXPECT(4294967295ul);
+  CONVERT_STR(VarUI4FromStr,"4294967296",0); EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT_STR(VarUI4FromStr,"-1.5",0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI4FromStr,"-0.6",0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI4FromStr,"-0.5",0); EXPECT(0);
+  CONVERT_STR(VarUI4FromStr,"-0.4",0); EXPECT(0);
+  CONVERT_STR(VarUI4FromStr,"0.4",0);  EXPECT(0);
+  CONVERT_STR(VarUI4FromStr,"0.5",0);  EXPECT(0);
+  CONVERT_STR(VarUI4FromStr,"0.6",0);  EXPECT(1);
+  CONVERT_STR(VarUI4FromStr,"1.5",0);  EXPECT(2);
+}
+
+static void test_VarUI4Copy(void)
+{
+  COPYTEST(1ul, VT_UI4, V_UI4(&vSrc), V_UI4(&vDst), V_UI4REF(&vSrc), V_UI4REF(&vDst), "%lu");
+}
+
+static void test_VarUI4ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1;
+
+  INITIAL_TYPETEST(VT_UI4, V_UI4, "%lu");
+  COMMON_TYPETEST;
+}
+
+/*
+ * VT_I8/VT_UI8
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE LONG64
+#undef EXPECTRES
+#define EXPECTRES(res, x) \
+  ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
+     "expected hres " #x ", got hres=0x%08lx", hres)
+
+#define EXPECTI8(x) \
+  ok((hres == S_OK && out == (CONV_TYPE)(x)), \
+     "expected " #x "(%lu,%lu), got (%lu,%lu); hres=0x%08lx", \
+      (ULONG)((LONG64)(x) >> 32), (ULONG)((x) & 0xffffffff), \
+      (ULONG)(out >> 32), (ULONG)(out & 0xffffffff), hres)
+
+#define EXPECTI864(x,y) \
+  ok(hres == S_OK && (out >> 32) == (CONV_TYPE)(x) && (out & 0xffffffff) == (CONV_TYPE)(y), \
+     "expected " #x "(%lu,%lu), got (%lu,%lu); hres=0x%08lx", \
+      (ULONG)(x), (ULONG)(y), \
+      (ULONG)(out >> 32), (ULONG)(out & 0xffffffff), hres)
+
+static void test_VarI8FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarI8FromI1);
+  for (i = -128; i < 128; i++)
+  {
+    CONVERT(VarI8FromI1,i); EXPECTI8(i);
+  }
+}
+
+static void test_VarI8FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarI8FromUI1);
+  for (i = 0; i < 256; i++)
+  {
+    CONVERT(VarI8FromUI1,i); EXPECTI8(i);
+  }
+}
+
+static void test_VarI8FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarI8FromI2);
+  for (i = -32768; i < 32768; i++)
+  {
+    CONVERT(VarI8FromI2,i); EXPECTI8(i);
+  }
+}
+
+static void test_VarI8FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarI8FromUI2);
+  for (i = -0; i < 65535; i++)
+  {
+    CONVERT(VarI8FromUI2,i); EXPECTI8(i);
+  }
+}
+
+static void test_VarI8FromUI4(void)
+{
+  CONVVARS(ULONG);
+
+  CHECKPTR(VarI8FromUI4);
+  CONVERT(VarI8FromUI4, 0);            EXPECTI8(0);
+  CONVERT(VarI8FromUI4, 1);            EXPECTI8(1);
+  CONVERT(VarI8FromUI4, 4294967295ul); EXPECTI8(4294967295ul);
+}
+
+static void test_VarI8FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarI8FromR4);
+
+  CONVERT(VarI8FromR4, -128.0f); EXPECTI8(-128);
+  CONVERT(VarI8FromR4, -1.0f);   EXPECTI8(-1);
+  CONVERT(VarI8FromR4, 0.0f);    EXPECTI8(0);
+  CONVERT(VarI8FromR4, 1.0f);    EXPECTI8(1);
+  CONVERT(VarI8FromR4, 127.0f);  EXPECTI8(127);
+
+  CONVERT(VarI8FromR4, -1.5f); EXPECTI8(-2);
+  CONVERT(VarI8FromR4, -0.6f); EXPECTI8(-1);
+  CONVERT(VarI8FromR4, -0.5f); EXPECTI8(0);
+  CONVERT(VarI8FromR4, -0.4f); EXPECTI8(0);
+  CONVERT(VarI8FromR4, 0.4f);  EXPECTI8(0);
+  CONVERT(VarI8FromR4, 0.5f);  EXPECTI8(0);
+  CONVERT(VarI8FromR4, 0.6f);  EXPECTI8(1);
+  CONVERT(VarI8FromR4, 1.5f);  EXPECTI8(2);
+}
+
+static void test_VarI8FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarI8FromR8);
+  CONVERT(VarI8FromR8, -128.0); EXPECTI8(-128);
+  CONVERT(VarI8FromR8, -1.0);   EXPECTI8(-1);
+  CONVERT(VarI8FromR8, 0.0);    EXPECTI8(0);
+  CONVERT(VarI8FromR8, 1.0);    EXPECTI8(1);
+  CONVERT(VarI8FromR8, 127.0);  EXPECTI8(127);
+
+  CONVERT(VarI8FromR8, -1.5); EXPECTI8(-2);
+  CONVERT(VarI8FromR8, -0.6); EXPECTI8(-1);
+  CONVERT(VarI8FromR8, -0.5); EXPECTI8(0);
+  CONVERT(VarI8FromR8, -0.4); EXPECTI8(0);
+  CONVERT(VarI8FromR8, 0.4);  EXPECTI8(0);
+  CONVERT(VarI8FromR8, 0.5);  EXPECTI8(0);
+  CONVERT(VarI8FromR8, 0.6);  EXPECTI8(1);
+  CONVERT(VarI8FromR8, 1.5);  EXPECTI8(2);
+}
+
+static void test_VarI8FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarI8FromDate);
+  CONVERT(VarI8FromDate, -128.0); EXPECTI8(-128);
+  CONVERT(VarI8FromDate, -1.0);   EXPECTI8(-1);
+  CONVERT(VarI8FromDate, 0.0);    EXPECTI8(0);
+  CONVERT(VarI8FromDate, 1.0);    EXPECTI8(1);
+  CONVERT(VarI8FromDate, 127.0);  EXPECTI8(127);
+
+  CONVERT(VarI8FromDate, -1.5); EXPECTI8(-2);
+  CONVERT(VarI8FromDate, -0.6); EXPECTI8(-1);
+  CONVERT(VarI8FromDate, -0.5); EXPECTI8(0);
+  CONVERT(VarI8FromDate, -0.4); EXPECTI8(0);
+  CONVERT(VarI8FromDate, 0.4);  EXPECTI8(0);
+  CONVERT(VarI8FromDate, 0.5);  EXPECTI8(0);
+  CONVERT(VarI8FromDate, 0.6);  EXPECTI8(1);
+  CONVERT(VarI8FromDate, 1.5);  EXPECTI8(2);
+}
+
+static void test_VarI8FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarI8FromBool);
+  for (i = -32768; i < 32768; i++)
+  {
+    CONVERT(VarI8FromBool,i); EXPECTI8(i);
+  }
+}
+
+static void test_VarI8FromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarI8FromUI8);
+  CONVERT(VarI8FromUI8, 0); EXPECTI8(0);
+  CONVERT(VarI8FromUI8, 1); EXPECTI8(1);
+  CONVERT_I8(VarI8FromUI8, 0x7fffffff, 0xffffffff); EXPECTI864(0x7fffffff, 0xffffffff);
+  CONVERT_I8(VarI8FromUI8, 0x80000000, 0);          EXPECT_OVERFLOW;
+}
+
+static void test_VarI8FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarI8FromCy);
+  CONVERT_CY(VarI8FromCy,-128); EXPECTI8(-129);
+  CONVERT_CY(VarI8FromCy,-1);   EXPECTI8(-2);
+  CONVERT_CY(VarI8FromCy,0);    EXPECTI8(0);
+  CONVERT_CY(VarI8FromCy,1);    EXPECTI8(1);
+  CONVERT_CY(VarI8FromCy,127);  EXPECTI8(127);
+
+  CONVERT_CY(VarI8FromCy,-1.5); EXPECTI8(-2);
+  CONVERT_CY(VarI8FromCy,-0.6); EXPECTI8(-1);
+  CONVERT_CY(VarI8FromCy,-0.5); EXPECTI8(-1);
+  CONVERT_CY(VarI8FromCy,-0.4); EXPECTI8(-1);
+  CONVERT_CY(VarI8FromCy,0.4);  EXPECTI8(0);
+  CONVERT_CY(VarI8FromCy,0.5);  EXPECTI8(0);
+  CONVERT_CY(VarI8FromCy,0.6);  EXPECTI8(1);
+  CONVERT_CY(VarI8FromCy,1.5);  EXPECTI8(2);
+}
+
+static void test_VarI8FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarI8FromDec);
+
+  CONVERT_BADDEC(VarI8FromDec);
+
+  CONVERT_DEC(VarI8FromDec,0,0x80,0,128); EXPECTI8(-128);
+  CONVERT_DEC(VarI8FromDec,0,0x80,0,1);   EXPECTI8(-1);
+  CONVERT_DEC(VarI8FromDec,0,0,0,0);      EXPECTI8(0);
+  CONVERT_DEC(VarI8FromDec,0,0,0,1);      EXPECTI8(1);
+  CONVERT_DEC(VarI8FromDec,0,0,0,127);    EXPECTI8(127);
+
+  CONVERT_DEC(VarI8FromDec,2,0x80,0,12700); EXPECTI8(-127);
+  CONVERT_DEC(VarI8FromDec,2,0,0,12700);    EXPECTI8(127);
+}
+
+static void test_VarI8FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarI8FromStr);
+
+  CONVERT_STR(VarI8FromStr,NULL,0);         EXPECT_MISMATCH;
+  CONVERT_STR(VarI8FromStr,"0",0);          EXPECTI8(0);
+  CONVERT_STR(VarI8FromStr,"-1",0);         EXPECTI8(-1);
+  CONVERT_STR(VarI8FromStr,"2147483647",0); EXPECTI8(2147483647);
+
+  CONVERT_STR(VarI8FromStr,"-1.5",0); EXPECTI8(-2);
+  CONVERT_STR(VarI8FromStr,"-0.6",0); EXPECTI8(-1);
+  CONVERT_STR(VarI8FromStr,"-0.5",0); EXPECTI8(0);
+  CONVERT_STR(VarI8FromStr,"-0.4",0); EXPECTI8(0);
+  CONVERT_STR(VarI8FromStr,"0.4",0);  EXPECTI8(0);
+  CONVERT_STR(VarI8FromStr,"0.5",0);  EXPECTI8(0);
+  CONVERT_STR(VarI8FromStr,"0.6",0);  EXPECTI8(1);
+  CONVERT_STR(VarI8FromStr,"1.5",0);  EXPECTI8(2);
+}
+
+static void test_VarI8Copy(void)
+{
+  if (!HAVE_OLEAUT32_I8)
+    return;
+
+  COPYTEST(1, VT_I8, ((int)V_I8(&vSrc)), ((int)V_I8(&vDst)), V_I8REF(&vSrc), V_I8REF(&vDst), "%d");
+}
+
+static void test_VarI8ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  if (!HAVE_OLEAUT32_I8)
+    return;
+
+  in = 1;
+
+  INITIAL_TYPETESTI8(VT_I8, V_I8);
+  COMMON_TYPETEST;
+}
+
+/* Adapt the test macros to UI8 */
+#undef CONV_TYPE
+#define CONV_TYPE ULONG64
+
+static void test_VarUI8FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarUI8FromI1);
+  for (i = -128; i < 128; i++)
+  {
+    CONVERT(VarUI8FromI1,i);
+    if (i < 0)
+      EXPECT_OVERFLOW;
+    else
+      EXPECTI8(i);
+  }
+}
+
+static void test_VarUI8FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarUI8FromUI1);
+  for (i = 0; i < 256; i++)
+  {
+    CONVERT(VarUI8FromUI1,i); EXPECTI8(i);
+  }
+}
+
+static void test_VarUI8FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarUI8FromI2);
+  for (i = -32768; i < 32768; i++)
+  {
+    CONVERT(VarUI8FromI2,i);
+    if (i < 0)
+      EXPECT_OVERFLOW;
+    else
+      EXPECTI8(i);
+  }
+}
+
+static void test_VarUI8FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarUI8FromUI2);
+  for (i = 0; i < 65535; i++)
+  {
+    CONVERT(VarUI8FromUI2,i); EXPECTI8(i);
+  }
+}
+
+static void test_VarUI8FromUI4(void)
+{
+  CONVVARS(ULONG);
+
+  CHECKPTR(VarUI8FromUI4);
+  CONVERT(VarUI8FromUI4, 0); EXPECTI8(0);
+  CONVERT(VarUI8FromUI4, 0xffffffff); EXPECTI8(0xffffffff);
+}
+
+static void test_VarUI8FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarUI8FromR4);
+  CONVERT(VarUI8FromR4, -1.0f);  EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromR4, 0.0f);   EXPECTI8(0);
+  CONVERT(VarUI8FromR4, 1.0f);   EXPECTI8(1);
+  CONVERT(VarUI8FromR4, 255.0f); EXPECTI8(255);
+
+  CONVERT(VarUI8FromR4, -1.5f); EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromR4, -0.6f); EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromR4, -0.5f); EXPECTI8(0);
+  CONVERT(VarUI8FromR4, -0.4f); EXPECTI8(0);
+  CONVERT(VarUI8FromR4, 0.4f);  EXPECTI8(0);
+  CONVERT(VarUI8FromR4, 0.5f);  EXPECTI8(0);
+  CONVERT(VarUI8FromR4, 0.6f);  EXPECTI8(1);
+  CONVERT(VarUI8FromR4, 1.5f);  EXPECTI8(2);
+}
+
+static void test_VarUI8FromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarUI8FromR8);
+  CONVERT(VarUI8FromR8, -1.0);  EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromR8, 0.0);   EXPECTI8(0);
+  CONVERT(VarUI8FromR8, 1.0);   EXPECTI8(1);
+  CONVERT(VarUI8FromR8, 255.0); EXPECTI8(255);
+
+  CONVERT(VarUI8FromR8, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromR8, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromR8, -0.5); EXPECTI8(0);
+  CONVERT(VarUI8FromR8, -0.4); EXPECTI8(0);
+  CONVERT(VarUI8FromR8, 0.4);  EXPECTI8(0);
+  CONVERT(VarUI8FromR8, 0.5);  EXPECTI8(0);
+  CONVERT(VarUI8FromR8, 0.6);  EXPECTI8(1);
+  CONVERT(VarUI8FromR8, 1.5);  EXPECTI8(2);
+}
+
+static void test_VarUI8FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarUI8FromDate);
+  CONVERT(VarUI8FromDate, -1.0);  EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromDate, 0.0);   EXPECTI8(0);
+  CONVERT(VarUI8FromDate, 1.0);   EXPECTI8(1);
+  CONVERT(VarUI8FromDate, 255.0); EXPECTI8(255);
+
+  CONVERT(VarUI8FromDate, -1.5); EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromDate, -0.6); EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromDate, -0.5); EXPECTI8(0);
+  CONVERT(VarUI8FromDate, -0.4); EXPECTI8(0);
+  CONVERT(VarUI8FromDate, 0.4);  EXPECTI8(0);
+  CONVERT(VarUI8FromDate, 0.5);  EXPECTI8(0);
+  CONVERT(VarUI8FromDate, 0.6);  EXPECTI8(1);
+  CONVERT(VarUI8FromDate, 1.5);  EXPECTI8(2);
+}
+
+static void test_VarUI8FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarUI8FromBool);
+  CONVERTRANGE(VarUI8FromBool, -32768, 32768);
+}
+
+static void test_VarUI8FromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarUI8FromI8);
+  CONVERT(VarUI8FromI8, -1); EXPECT_OVERFLOW;
+  CONVERT(VarUI8FromI8, 0);  EXPECTI8(0);
+  CONVERT(VarUI8FromI8, 1);  EXPECTI8(1);
+}
+
+static void test_VarUI8FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarUI8FromCy);
+  CONVERT_CY(VarUI8FromCy,-1);  EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI8FromCy,0);   EXPECTI8(0);
+  CONVERT_CY(VarUI8FromCy,1);   EXPECTI8(1);
+  CONVERT_CY(VarUI8FromCy,255); EXPECTI8(255);
+
+  CONVERT_CY(VarUI8FromCy,-1.5); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI8FromCy,-0.6); EXPECT_OVERFLOW;
+  CONVERT_CY(VarUI8FromCy,-0.5); EXPECTI8(0);
+  CONVERT_CY(VarUI8FromCy,-0.4); EXPECTI8(0);
+  CONVERT_CY(VarUI8FromCy,0.4);  EXPECTI8(0);
+  CONVERT_CY(VarUI8FromCy,0.5);  EXPECTI8(0);
+  CONVERT_CY(VarUI8FromCy,0.6);  EXPECTI8(1);
+  CONVERT_CY(VarUI8FromCy,1.5);  EXPECTI8(2);
+}
+
+static void test_VarUI8FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarUI8FromDec);
+
+  CONVERT_BADDEC(VarUI8FromDec);
+
+#if 0
+  /* This returns 1 under native; Wine fixes this bug and returns overflow */
+  CONVERT_DEC(VarUI8FromDec,0,0x80,0,1);
+#endif
+  CONVERT_DEC(VarUI8FromDec,0,0,0,0);   EXPECTI8(0);
+  CONVERT_DEC(VarUI8FromDec,0,0,0,1);   EXPECTI8(1);
+  CONVERT_DEC(VarUI8FromDec,0,0,0,255); EXPECTI8(255);
+
+  CONVERT_DEC(VarUI8FromDec,2,0x80,0,100); EXPECT_OVERFLOW;
+  CONVERT_DEC(VarUI8FromDec,2,0,0,25500);  EXPECTI8(255);
+}
+
+static void test_VarUI8FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarUI8FromStr);
+
+  CONVERT_STR(VarUI8FromStr,NULL,0);         EXPECT_MISMATCH;
+  CONVERT_STR(VarUI8FromStr,"0",0);          EXPECTI8(0);
+  CONVERT_STR(VarUI8FromStr,"-1",0);         EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI8FromStr,"2147483647",0); EXPECTI8(2147483647);
+
+  CONVERT_STR(VarUI8FromStr,"-1.5",0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI8FromStr,"-0.6",0); EXPECT_OVERFLOW;
+  CONVERT_STR(VarUI8FromStr,"-0.5",0); EXPECTI8(0);
+  CONVERT_STR(VarUI8FromStr,"-0.4",0); EXPECTI8(0);
+  CONVERT_STR(VarUI8FromStr,"0.4",0);  EXPECTI8(0);
+  CONVERT_STR(VarUI8FromStr,"0.5",0);  EXPECTI8(0);
+  CONVERT_STR(VarUI8FromStr,"0.6",0);  EXPECTI8(1);
+  CONVERT_STR(VarUI8FromStr,"1.5",0);  EXPECTI8(2);
+}
+
+static void test_VarUI8Copy(void)
+{
+  if (!HAVE_OLEAUT32_I8)
+    return;
+
+  COPYTEST(1, VT_UI8, ((unsigned)V_UI8(&vSrc)), ((unsigned)V_I8(&vDst)),
+           V_UI8REF(&vSrc), V_UI8REF(&vDst), "%u");
+}
+
+static void test_VarUI8ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  if (!HAVE_OLEAUT32_I8)
+    return;
+
+  in = 1;
+
+  INITIAL_TYPETESTI8(VT_UI8, V_UI8);
+  COMMON_TYPETEST;
+}
+
+/*
+ * VT_R4
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE float
+#undef EXPECTRES
+#define EXPECTRES(res, x) _EXPECTRES(res, x, "%15.15f")
+
+static void test_VarR4FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarR4FromI1);
+  CONVERTRANGE(VarR4FromI1, -128, 128);
+}
+
+static void test_VarR4FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarR4FromUI1);
+  CONVERTRANGE(VarR4FromUI1, 0, 256);
+}
+
+static void test_VarR4FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarR4FromI2);
+  CONVERTRANGE(VarR4FromI2, -32768, 32768);
+}
+
+static void test_VarR4FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarR4FromUI2);
+  CONVERTRANGE(VarR4FromUI2, 0, 65536);
+}
+
+static void test_VarR4FromI4(void)
+{
+  CONVVARS(int);
+
+  CHECKPTR(VarR4FromI4);
+  CONVERT(VarR4FromI4, -2147483647-1); EXPECT(-2147483648.0f);
+  CONVERT(VarR4FromI4, -1);            EXPECT(-1.0f);
+  CONVERT(VarR4FromI4, 0);             EXPECT(0.0f);
+  CONVERT(VarR4FromI4, 1);             EXPECT(1.0f);
+  CONVERT(VarR4FromI4, 2147483647);    EXPECT(2147483647.0f);
+}
+
+static void test_VarR4FromUI4(void)
+{
+  CONVVARS(unsigned int);
+
+  CHECKPTR(VarR4FromUI4);
+  CONVERT(VarR4FromUI4, 0);          EXPECT(0.0f);
+  CONVERT(VarR4FromUI4, 1);          EXPECT(1.0f);
+#if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__))
+  CONVERT(VarR4FromUI4, 0xffffffff); EXPECT(4294967296.0f);
+#endif
+}
+
+static void test_VarR4FromR8(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarR4FromR8);
+  CONVERT(VarR4FromR8, -1.0); EXPECT(-1.0f);
+  CONVERT(VarR4FromR8, 0.0); EXPECT(0.0f);
+  CONVERT(VarR4FromR8, 1.0); EXPECT(1.0f);
+  CONVERT(VarR4FromR8, 1.5); EXPECT(1.5f);
+
+  /* Skip rounding tests - no rounding is done */
+}
+
+static void test_VarR4FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+
+  CHECKPTR(VarR4FromBool);
+  CONVERT(VarR4FromBool, VARIANT_TRUE);  EXPECT(VARIANT_TRUE * 1.0f);
+  CONVERT(VarR4FromBool, VARIANT_FALSE); EXPECT(VARIANT_FALSE * 1.0f);
+}
+
+static void test_VarR4FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarR4FromCy);
+  CONVERT_CY(VarR4FromCy,-32768); EXPECT(-32768.0f);
+  CONVERT_CY(VarR4FromCy,-1);     EXPECT(-1.0f);
+  CONVERT_CY(VarR4FromCy,0);      EXPECT(0.0f);
+  CONVERT_CY(VarR4FromCy,1);      EXPECT(1.0f);
+  CONVERT_CY(VarR4FromCy,32768);  EXPECT(32768.0f);
+
+  CONVERT_CY(VarR4FromCy,-1.5); EXPECT(-1.5f);
+  CONVERT_CY(VarR4FromCy,-0.6); EXPECT(-0.6f);
+  CONVERT_CY(VarR4FromCy,-0.5); EXPECT(-0.5f);
+  CONVERT_CY(VarR4FromCy,-0.4); EXPECT(-0.4f);
+  CONVERT_CY(VarR4FromCy,0.4);  EXPECT(0.4f);
+  CONVERT_CY(VarR4FromCy,0.5);  EXPECT(0.5f);
+  CONVERT_CY(VarR4FromCy,0.6);  EXPECT(0.6f);
+  CONVERT_CY(VarR4FromCy,1.5);  EXPECT(1.5f);
+}
+
+static void test_VarR4FromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarR4FromI8);
+  CONVERT(VarR4FromI8, -1); EXPECT(-1.0f);
+  CONVERT(VarR4FromI8, 0);  EXPECT(0.0f);
+  CONVERT(VarR4FromI8, 1);  EXPECT(1.0f);
+}
+
+static void test_VarR4FromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarR4FromUI8);
+  CONVERT(VarR4FromUI8, 0); EXPECT(0.0f);
+  CONVERT(VarR4FromUI8, 1); EXPECT(1.0f);
+}
+
+static void test_VarR4FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarR4FromDec);
+
+  CONVERT_BADDEC(VarR4FromDec);
+
+  CONVERT_DEC(VarR4FromDec,0,0x80,0,32768); EXPECT(-32768.0f);
+  CONVERT_DEC(VarR4FromDec,0,0x80,0,1);     EXPECT(-1.0f);
+  CONVERT_DEC(VarR4FromDec,0,0,0,0);        EXPECT(0.0f);
+  CONVERT_DEC(VarR4FromDec,0,0,0,1);        EXPECT(1.0f);
+  CONVERT_DEC(VarR4FromDec,0,0,0,32767);    EXPECT(32767.0f);
+
+  CONVERT_DEC(VarR4FromDec,2,0x80,0,3276800); EXPECT(-32768.0f);
+  CONVERT_DEC(VarR4FromDec,2,0,0,3276700);    EXPECT(32767.0f);
+}
+
+static void test_VarR4FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarR4FromDate);
+  CONVERT(VarR4FromDate, -1.0); EXPECT(-1.0f);
+  CONVERT(VarR4FromDate, 0.0);  EXPECT(0.0f);
+  CONVERT(VarR4FromDate, 1.0);  EXPECT(1.0f);
+}
+
+static void test_VarR4FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarR4FromStr);
+
+  CONVERT_STR(VarR4FromStr,NULL,0);    EXPECT_MISMATCH;
+  CONVERT_STR(VarR4FromStr,"-1", 0);   EXPECT(-1.0f);
+  CONVERT_STR(VarR4FromStr,"0", 0);    EXPECT(0.0f);
+  CONVERT_STR(VarR4FromStr,"1", 0);    EXPECT(1.0f);
+
+  CONVERT_STR(VarR4FromStr,"-1.5",0); EXPECT(-1.5f);
+  CONVERT_STR(VarR4FromStr,"-0.6",0); EXPECT(-0.6f);
+  CONVERT_STR(VarR4FromStr,"-0.5",0); EXPECT(-0.5f);
+  CONVERT_STR(VarR4FromStr,"-0.4",0); EXPECT(-0.4f);
+  CONVERT_STR(VarR4FromStr,"0.4",0);  EXPECT(0.4f);
+  CONVERT_STR(VarR4FromStr,"0.5",0);  EXPECT(0.5f);
+  CONVERT_STR(VarR4FromStr,"0.6",0);  EXPECT(0.6f);
+  CONVERT_STR(VarR4FromStr,"1.5",0);  EXPECT(1.5f);
+}
+
+static void test_VarR4Copy(void)
+{
+  COPYTEST(77665544.0f, VT_R4, V_R4(&vSrc), V_R4(&vDst), V_R4REF(&vSrc),V_R4REF(&vDst), "%15.15f");
+}
+
+static void test_VarR4ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1.0f;
+
+  INITIAL_TYPETEST(VT_R4, V_R4, "%f");
+  COMMON_TYPETEST;
+}
+
+/*
+ * VT_R8
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE double
+#undef EXPECTRES
+#define EXPECTRES(res, x) _EXPECTRES(res, x, "%15.15f")
+
+static void test_VarR8FromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarR8FromI1);
+  CONVERTRANGE(VarR8FromI1, -128, 128);
+}
+
+static void test_VarR8FromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarR8FromUI1);
+  CONVERTRANGE(VarR8FromUI1, 0, 256);
+}
+
+static void test_VarR8FromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarR8FromI2);
+  CONVERTRANGE(VarR8FromI2, -32768, 32768);
+}
+
+static void test_VarR8FromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarR8FromUI2);
+  CONVERTRANGE(VarR8FromUI2, 0, 65536);
+}
+
+static void test_VarR8FromI4(void)
+{
+  CONVVARS(int);
+
+  CHECKPTR(VarR8FromI4);
+  CONVERT(VarR8FromI4, -2147483647-1); EXPECT(-2147483648.0);
+  CONVERT(VarR8FromI4, -1);            EXPECT(-1.0);
+  CONVERT(VarR8FromI4, 0);             EXPECT(0.0);
+  CONVERT(VarR8FromI4, 1);             EXPECT(1.0);
+  CONVERT(VarR8FromI4, 0x7fffffff);    EXPECT(2147483647.0);
+}
+
+static void test_VarR8FromUI4(void)
+{
+  CONVVARS(unsigned int);
+
+  CHECKPTR(VarR8FromUI4);
+  CONVERT(VarR8FromUI4, 0);          EXPECT(0.0);
+  CONVERT(VarR8FromUI4, 1);          EXPECT(1.0);
+  CONVERT(VarR8FromUI4, 0xffffffff); EXPECT(4294967295.0);
+}
+
+static void test_VarR8FromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarR8FromR4);
+  CONVERT(VarR8FromR4, -1.0f); EXPECT(-1.0);
+  CONVERT(VarR8FromR4, 0.0f);  EXPECT(0.0);
+  CONVERT(VarR8FromR4, 1.0f);  EXPECT(1.0);
+  CONVERT(VarR8FromR4, 1.5f);  EXPECT(1.5);
+
+  /* Skip rounding tests - no rounding is done */
+}
+
+static void test_VarR8FromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+
+  CHECKPTR(VarR8FromBool);
+  CONVERT(VarR8FromBool, VARIANT_TRUE);  EXPECT(VARIANT_TRUE * 1.0);
+  CONVERT(VarR8FromBool, VARIANT_FALSE); EXPECT(VARIANT_FALSE * 1.0);
+}
+
+static void test_VarR8FromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarR8FromCy);
+  CONVERT_CY(VarR8FromCy,-32769); EXPECT(-32769.0);
+  CONVERT_CY(VarR8FromCy,-32768); EXPECT(-32768.0);
+  CONVERT_CY(VarR8FromCy,-1);     EXPECT(-1.0);
+  CONVERT_CY(VarR8FromCy,0);      EXPECT(0.0);
+  CONVERT_CY(VarR8FromCy,1);      EXPECT(1.0);
+  CONVERT_CY(VarR8FromCy,32767);  EXPECT(32767.0);
+  CONVERT_CY(VarR8FromCy,32768);  EXPECT(32768.0);
+
+  CONVERT_CY(VarR8FromCy,-1.5); EXPECT(-1.5);
+  CONVERT_CY(VarR8FromCy,-0.6); EXPECT(-0.6);
+  CONVERT_CY(VarR8FromCy,-0.5); EXPECT(-0.5);
+  CONVERT_CY(VarR8FromCy,-0.4); EXPECT(-0.4);
+  CONVERT_CY(VarR8FromCy,0.4);  EXPECT(0.4);
+  CONVERT_CY(VarR8FromCy,0.5);  EXPECT(0.5);
+  CONVERT_CY(VarR8FromCy,0.6);  EXPECT(0.6);
+  CONVERT_CY(VarR8FromCy,1.5);  EXPECT(1.5);
+}
+
+static void test_VarR8FromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarR8FromI8);
+  CONVERT(VarR8FromI8, -1); EXPECT(-1.0);
+  CONVERT(VarR8FromI8, 0);  EXPECT(0.0);
+  CONVERT(VarR8FromI8, 1);  EXPECT(1.0);
+#if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__))
+  CONVERT_I8(VarR8FromI8, 0x7fffffff,0xffffffff); EXPECT(9223372036854775808.0);
+#endif
+}
+
+static void test_VarR8FromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarR8FromUI8);
+  CONVERT(VarR8FromUI8, 0); EXPECT(0.0);
+  CONVERT(VarR8FromUI8, 1); EXPECT(1.0);
+#if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__))
+  CONVERT_I8(VarR8FromUI8, 0x80000000,0); EXPECT(9223372036854775808.0);
+#endif
+}
+
+static void test_VarR8FromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarR8FromDec);
+
+  CONVERT_BADDEC(VarR8FromDec);
+
+  CONVERT_DEC(VarR8FromDec,0,0x80,0,32768); EXPECT(-32768.0);
+  CONVERT_DEC(VarR8FromDec,0,0x80,0,1);     EXPECT(-1.0);
+  CONVERT_DEC(VarR8FromDec,0,0,0,0);        EXPECT(0.0);
+  CONVERT_DEC(VarR8FromDec,0,0,0,1);        EXPECT(1.0);
+  CONVERT_DEC(VarR8FromDec,0,0,0,32767);    EXPECT(32767.0);
+
+  CONVERT_DEC(VarR8FromDec,2,0x80,0,3276800); EXPECT(-32768.0);
+  CONVERT_DEC(VarR8FromDec,2,0,0,3276700);    EXPECT(32767.0);
+}
+
+static void test_VarR8FromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarR8FromDate);
+  CONVERT(VarR8FromDate, -1.0); EXPECT(-1.0);
+  CONVERT(VarR8FromDate, -0.0); EXPECT(0.0);
+  CONVERT(VarR8FromDate, 1.0);  EXPECT(1.0);
+}
+
+static void test_VarR8FromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarR8FromStr);
+
+  CONVERT_STR(VarR8FromStr,NULL,0);   EXPECT_MISMATCH;
+  CONVERT_STR(VarR8FromStr,"",0);     EXPECT_MISMATCH;
+  CONVERT_STR(VarR8FromStr," ",0);    EXPECT_MISMATCH;
+
+  CONVERT_STR(VarR8FromStr,"0",0);    EXPECT(0.0);
+  CONVERT_STR(VarR8FromStr,"-1.5",0); EXPECT(-1.5);
+  CONVERT_STR(VarR8FromStr,"-0.6",0); EXPECT(-0.6);
+  CONVERT_STR(VarR8FromStr,"-0.5",0); EXPECT(-0.5);
+  CONVERT_STR(VarR8FromStr,"-0.4",0); EXPECT(-0.4);
+  CONVERT_STR(VarR8FromStr,"0.4",0);  EXPECT(0.4);
+  CONVERT_STR(VarR8FromStr,"0.5",0);  EXPECT(0.5);
+  CONVERT_STR(VarR8FromStr,"0.6",0);  EXPECT(0.6);
+  CONVERT_STR(VarR8FromStr,"1.5",0);  EXPECT(1.5);
+
+  /* We already have exhaustive tests for number parsing, so skip those tests here */
+}
+
+static void test_VarR8Copy(void)
+{
+  COPYTEST(77665544.0, VT_R8, V_R8(&vSrc), V_R8(&vDst), V_R8REF(&vSrc),V_R8REF(&vDst), "%16.16g");
+}
+
+static void test_VarR8ChangeTypeEx(void)
+{
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+
+  in = 1.0;
+
+  INITIAL_TYPETEST(VT_R8, V_R8, "%g");
+  COMMON_TYPETEST;
+}
+
+#define MATHRND(l, r) left = l; right = r; hres = pVarR8Round(left, right, &out)
+
+static void test_VarR8Round(void)
+{
+  HRESULT hres;
+  double left = 0.0, out;
+  int right;
+
+  CHECKPTR(VarR8Round);
+  MATHRND(0.5432, 5);  EXPECT(0.5432);
+  MATHRND(0.5432, 4);  EXPECT(0.5432);
+  MATHRND(0.5432, 3);  EXPECT(0.543);
+  MATHRND(0.5432, 2);  EXPECT(0.54);
+  MATHRND(0.5432, 1);  EXPECT(0.5);
+  MATHRND(0.5532, 0);  EXPECT(1);
+  MATHRND(0.5532, -1); EXPECT_INVALID;
+
+  MATHRND(0.5568, 5);  EXPECT(0.5568);
+  MATHRND(0.5568, 4);  EXPECT(0.5568);
+  MATHRND(0.5568, 3);  EXPECT(0.557);
+  MATHRND(0.5568, 2);  EXPECT(0.56);
+  MATHRND(0.5568, 1);  EXPECT(0.6);
+  MATHRND(0.5568, 0);  EXPECT(1);
+  MATHRND(0.5568, -1); EXPECT_INVALID;
+
+  MATHRND(0.4999, 0); EXPECT(0);
+  MATHRND(0.5000, 0); EXPECT(0);
+  MATHRND(0.5001, 0); EXPECT(1);
+  MATHRND(1.4999, 0); EXPECT(1);
+  MATHRND(1.5000, 0); EXPECT(2);
+  MATHRND(1.5001, 0); EXPECT(2);
+}
+
+/*
+ * VT_DATE
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE DATE
+
+static void test_VarDateFromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarDateFromI1);
+  CONVERTRANGE(VarDateFromI1, -128, 128);
+}
+
+static void test_VarDateFromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarDateFromUI1);
+  CONVERTRANGE(VarDateFromUI1, 0, 256);
+}
+
+static void test_VarDateFromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarDateFromI2);
+  CONVERTRANGE(VarDateFromI2, -32768, 32768);
+}
+
+static void test_VarDateFromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarDateFromUI2);
+  CONVERTRANGE(VarDateFromUI2, 0, 65536);
+}
+
+static void test_VarDateFromI4(void)
+{
+  CONVVARS(int);
+
+  CHECKPTR(VarDateFromI4);
+  CONVERT(VarDateFromI4, DATE_MIN-1);
+  if (hres != DISP_E_TYPEMISMATCH) /* Early versions return this, incorrectly */
+    EXPECT_OVERFLOW;
+  CONVERT(VarDateFromI4, DATE_MIN);   EXPECT(DATE_MIN);
+  CONVERT(VarDateFromI4, -1);         EXPECT(-1.0);
+  CONVERT(VarDateFromI4, 0);          EXPECT(0.0);
+  CONVERT(VarDateFromI4, 1);          EXPECT(1.0);
+  CONVERT(VarDateFromI4, DATE_MAX);   EXPECT(DATE_MAX);
+  CONVERT(VarDateFromI4, DATE_MAX+1);
+  if (hres != DISP_E_TYPEMISMATCH) /* Early versions return this, incorrectly */
+    EXPECT_OVERFLOW;
+}
+
+static void test_VarDateFromUI4(void)
+{
+  CONVVARS(unsigned int);
+
+  CHECKPTR(VarDateFromUI4);
+  CONVERT(VarDateFromUI4, 0);          EXPECT(0.0);
+  CONVERT(VarDateFromUI4, 1);          EXPECT(1.0);
+  CONVERT(VarDateFromUI4, DATE_MAX);   EXPECT(DATE_MAX);
+  CONVERT(VarDateFromUI4, DATE_MAX+1);
+  if (hres != DISP_E_TYPEMISMATCH) /* Early versions return this, incorrectly */
+    EXPECT_OVERFLOW;
+}
+
+static void test_VarDateFromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarDateFromR4);
+  CONVERT(VarDateFromR4, -1.0f); EXPECT(-1.0);
+  CONVERT(VarDateFromR4, 0.0f);  EXPECT(0.0);
+  CONVERT(VarDateFromR4, 1.0f);  EXPECT(1.0);
+  CONVERT(VarDateFromR4, 1.5f);  EXPECT(1.5);
+}
+
+static void test_VarDateFromR8(void)
+{
+  CONVVARS(double);
+
+  CHECKPTR(VarDateFromR8);
+  CONVERT(VarDateFromR8, -1.0f); EXPECT(-1.0);
+  CONVERT(VarDateFromR8, 0.0f);  EXPECT(0.0);
+  CONVERT(VarDateFromR8, 1.0f);  EXPECT(1.0);
+  CONVERT(VarDateFromR8, 1.5f);  EXPECT(1.5);
+}
+
+static void test_VarDateFromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+
+  CHECKPTR(VarDateFromBool);
+  CONVERT(VarDateFromBool, VARIANT_TRUE);  EXPECT(VARIANT_TRUE * 1.0);
+  CONVERT(VarDateFromBool, VARIANT_FALSE); EXPECT(VARIANT_FALSE * 1.0);
+}
+
+static void test_VarDateFromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarDateFromCy);
+  CONVERT_CY(VarDateFromCy,-32769); EXPECT(-32769.0);
+  CONVERT_CY(VarDateFromCy,-32768); EXPECT(-32768.0);
+  CONVERT_CY(VarDateFromCy,-1);     EXPECT(-1.0);
+  CONVERT_CY(VarDateFromCy,0);      EXPECT(0.0);
+  CONVERT_CY(VarDateFromCy,1);      EXPECT(1.0);
+  CONVERT_CY(VarDateFromCy,32767);  EXPECT(32767.0);
+  CONVERT_CY(VarDateFromCy,32768);  EXPECT(32768.0);
+
+  CONVERT_CY(VarDateFromCy,-1.5); EXPECT(-1.5);
+  CONVERT_CY(VarDateFromCy,-0.6); EXPECT(-0.6);
+  CONVERT_CY(VarDateFromCy,-0.5); EXPECT(-0.5);
+  CONVERT_CY(VarDateFromCy,-0.4); EXPECT(-0.4);
+  CONVERT_CY(VarDateFromCy,0.4);  EXPECT(0.4);
+  CONVERT_CY(VarDateFromCy,0.5);  EXPECT(0.5);
+  CONVERT_CY(VarDateFromCy,0.6);  EXPECT(0.6);
+  CONVERT_CY(VarDateFromCy,1.5);  EXPECT(1.5);
+}
+
+static void test_VarDateFromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarDateFromI8);
+  CONVERT(VarDateFromI8, DATE_MIN-1); EXPECT_OVERFLOW;
+  CONVERT(VarDateFromI8, DATE_MIN);   EXPECT(DATE_MIN);
+  CONVERT(VarDateFromI8, -1);         EXPECT(-1.0);
+  CONVERT(VarDateFromI8, 0);          EXPECT(0.0);
+  CONVERT(VarDateFromI8, 1);          EXPECT(1.0);
+  CONVERT(VarDateFromI8, DATE_MAX);   EXPECT(DATE_MAX);
+  CONVERT(VarDateFromI8, DATE_MAX+1); EXPECT_OVERFLOW;
+}
+
+static void test_VarDateFromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarDateFromUI8);
+  CONVERT(VarDateFromUI8, 0);          EXPECT(0.0);
+  CONVERT(VarDateFromUI8, 1);          EXPECT(1.0);
+  CONVERT(VarDateFromUI8, DATE_MAX);   EXPECT(DATE_MAX);
+  CONVERT(VarDateFromUI8, DATE_MAX+1); EXPECT_OVERFLOW;
+}
+
+static void test_VarDateFromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarDateFromDec);
+
+  CONVERT_BADDEC(VarDateFromDec);
+
+  CONVERT_DEC(VarDateFromDec,0,0x80,0,32768); EXPECT(-32768.0);
+  CONVERT_DEC(VarDateFromDec,0,0x80,0,1);     EXPECT(-1.0);
+  CONVERT_DEC(VarDateFromDec,0,0,0,0);        EXPECT(0.0);
+  CONVERT_DEC(VarDateFromDec,0,0,0,1);        EXPECT(1.0);
+  CONVERT_DEC(VarDateFromDec,0,0,0,32767);    EXPECT(32767.0);
+
+  CONVERT_DEC(VarDateFromDec,2,0x80,0,3276800); EXPECT(-32768.0);
+  CONVERT_DEC(VarDateFromDec,2,0,0,3276700);    EXPECT(32767.0);
+}
+
+#define DFS(str) \
+  buff[0] = '\0'; out = 0.0; \
+  if (str) MultiByteToWideChar(CP_ACP,0,str,-1,buff,sizeof(buff)); \
+  hres = pVarDateFromStr(str ? buff : NULL,lcid,LOCALE_NOUSEROVERRIDE,&out)
+
+#define MKRELDATE(day,mth) st.wMonth = mth; st.wDay = day; \
+  pSystemTimeToVariantTime(&st,&relative)
+
+static const char *BadDateStrings[] =
+{
+  "True", "False", /* Plain text */
+  "0.", ".0", "-1.1", "1.1-", /* Partial specifications */
+  "1;2;3", "1*2*3", "1@2@3", "1#2#3", "(1:2)","<1:2>","1|2|3", /* Bad chars */
+  "0", "1", /* 1 element */
+  "0.60", "24.00", "0:60", "24:00", "1 2 am", "1 am 2", /* 2 elements */
+  "1.5 2", "1 5.2", "2 32 3", "1 2 am 3", /* 3 elements */
+  "1 2.3 4", "1.2.3 4", "1 2.3.4", "1.2 3.4", "1.2.3.4", "1 2 3 4",
+  "1 am 2 3.4", "1 2 am 3.4", "1.2 3 am 4", "1.2 3 4 am", /* 4 elements */
+  "1.2.3.4.5", "1.2.3.4 5", "1.2.3 4.5", "1.2 3.4.5", "1.2 3.4 5", "1.2 3 4.5",
+  "1 2.3.4.5", "1 2.3.4 5", "1 2.3 4.5", "1 2.3 4 5", "1 2 3.4 5", "1 2 3 4 5",
+  "1.2.3 4 am 5", "1.2.3 4 5 am", "1.2 3 am 4 5",
+  "1.2 3 4 am 5", "1.2 3 4 5 am", "1 am 2 3.4.5", "1 2 am 3.4.5",
+  "1 am 2 3 4.5", "1 2 am 3 4.5", "1 2 3 am 4.5", /* 5 elements */
+  /* 6 elements */
+  "1.2.3.4.5.6", "1.2.3.4.5 6", "1.2.3.4 5.6", "1.2.3.4 5 6", "1.2.3 4.5.6",
+  "1.2.3 4.5 6", "1.2.3 4 5.6", "1.2 3.4.5.6", "1.2 3.4.5 6", "1.2 3.4 5.6",
+  "1.2 3.4 5 6", "1.2 3 4.5.6", "1.2 3 4.5 6", "1.2 3 4 5.6", "1.2 3 4 5 6",
+  "1 2.3.4.5.6", "1 2.3.4.5 6", "1 2.3.4 5.6", "1 2.3.4 5 6", "1 2.3 4.5.6",
+  "1 2.3 4.5 6", "1 2.3 4 5.6", "1 2.3 4 5 6", "1 2 3.4.5.6", "1 2 3.4.5 6",
+  "1 2 3.4 5.6", "1 2 3.4 5 6", "1 2 3 4.5 6", "1 2 3 4 5.6", "1 2 3 4 5 6",
+  "1.2.3 4 am 5 6", "1.2.3 4 5 am 6" "1.2.3 4 5 6 am", "1 am 2 3 4.5.6",
+  "1 2 am 3 4.5.6", "1 2 3 am 4.5.6"
+};
+
+static void test_VarDateFromStr(void)
+{
+  LCID lcid;
+  DATE out, relative;
+  HRESULT hres;
+  SYSTEMTIME st;
+  OLECHAR buff[128];
+  size_t i;
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  CHECKPTR(VarDateFromStr);
+  CHECKPTR(SystemTimeToVariantTime);
+
+  /* Some date formats are relative, so we need to find the cuurent year */
+  GetSystemTime(&st);
+  st.wHour = st.wMinute = st.wSecond = st.wMilliseconds = 0;
+  DFS(NULL); EXPECT_MISMATCH;
+
+  /* Floating point number are not recognised */
+  DFS("0.0");
+  if (hres == S_OK)
+    EXPECT_DBL(0.0); /* Very old versions accept this string */
+  else
+    EXPECT_MISMATCH;
+
+  /* 1 element - can only be a time, and only if it has am/pm */
+  DFS("1 am"); EXPECT_DBL(0.04166666666666666);
+  /* 2 elements */
+  /* A decimal point is treated as a time seperator.
+   * The following are converted as hours/minutes.
+   */
+  DFS("0.1");  EXPECT_DBL(0.0006944444444444445);
+  DFS("0.40"); EXPECT_DBL(0.02777777777777778);
+  DFS("2.5");  EXPECT_DBL(0.08680555555555555);
+  /* A colon acts as a decimal point */
+  DFS("0:1");  EXPECT_DBL(0.0006944444444444445);
+  DFS("0:20"); EXPECT_DBL(0.01388888888888889);
+  DFS("0:40"); EXPECT_DBL(0.02777777777777778);
+  DFS("3:5");  EXPECT_DBL(0.1284722222222222);
+  /* Check the am/pm limits */
+  DFS("00:00 AM"); EXPECT_DBL(0.0);
+  DFS("00:00 a");  EXPECT_DBL(0.0);
+  DFS("12:59 AM"); EXPECT_DBL(0.04097222222222222);
+  DFS("12:59 A");  EXPECT_DBL(0.04097222222222222);
+  DFS("00:00 pm"); EXPECT_DBL(0.5);
+  DFS("00:00 p");  EXPECT_DBL(0.5);
+  DFS("12:59 pm"); EXPECT_DBL(0.5409722222222222);
+  DFS("12:59 p");  EXPECT_DBL(0.5409722222222222);
+  /* AM/PM is ignored if hours > 12 */
+  DFS("13:00 AM"); EXPECT_DBL(0.5416666666666666);
+  DFS("13:00 PM"); EXPECT_DBL(0.5416666666666666);
+
+  /* Space, dash and slash all indicate a date format. */
+  /* If both numbers are valid month values => month/day of current year */
+  DFS("1 2"); MKRELDATE(2,1); EXPECT_DBL(relative);
+  DFS("2 1"); MKRELDATE(1,2); EXPECT_DBL(relative);
+  /* one number not valid month, is a valid day, other number valid month:
+   * that number becomes the day.
+   */
+  DFS("14 1");   MKRELDATE(14,1); EXPECT_DBL(relative);
+  DFS("1 14");   EXPECT_DBL(relative);
+  /* If the numbers can't be day/month, they are assumed to be year/month */
+  DFS("30 2");   EXPECT_DBL(10990.0);
+  DFS("2 30");   EXPECT_DBL(10990.0);
+  DFS("32 49");  EXPECT_MISMATCH; /* Cant be any format */
+  DFS("0 49");   EXPECT_MISMATCH; /* Cant be any format */
+  /* If a month name is given the other number is the day */
+  DFS("Jan 2");  MKRELDATE(2,1); EXPECT_DBL(relative);
+  DFS("2 Jan");  EXPECT_DBL(relative);
+  /* Unless it can't be, in which case it becomes the year */
+  DFS("Jan 35"); EXPECT_DBL(12785.0);
+  DFS("35 Jan"); EXPECT_DBL(12785.0);
+  DFS("Jan-35"); EXPECT_DBL(12785.0);
+  DFS("35-Jan"); EXPECT_DBL(12785.0);
+  DFS("Jan/35"); EXPECT_DBL(12785.0);
+  DFS("35/Jan"); EXPECT_DBL(12785.0);
+  /* 3 elements */
+  /* 3 numbers and time seperator => h:m:s */
+  DFS("0.1.0");  EXPECT_DBL(0.0006944444444444445);
+  DFS("1.5.2");  EXPECT_DBL(0.04516203703703704);
+  /* 3 numbers => picks date giving preference to lcid format */
+  DFS("1 2 3");  EXPECT_DBL(37623.0);
+  DFS("14 2 3"); EXPECT_DBL(41673.0);
+  DFS("2 14 3"); EXPECT_DBL(37666.0);
+  DFS("2 3 14"); EXPECT_DBL(41673.0);
+  DFS("32 2 3"); EXPECT_DBL(11722.0);
+  DFS("2 3 32"); EXPECT_DBL(11722.0);
+  DFS("1 2 29"); EXPECT_DBL(47120.0);
+  /* After 30, two digit dates are expected to be in the 1900's */
+  DFS("1 2 30"); EXPECT_DBL(10960.0);
+  DFS("1 2 31"); EXPECT_DBL(11325.0);
+  DFS("3 am 1 2"); EXPECT_DBL(37623.125);
+  DFS("1 2 3 am"); EXPECT_DBL(37623.125);
+
+  /* 4 elements -interpreted as 2 digit date & time */
+  DFS("1.2 3 4");   MKRELDATE(4,3); relative += 0.04305555556; EXPECT_DBL(relative);
+  DFS("3 4 1.2");   EXPECT_DBL(relative);
+  /* 5 elements - interpreted as 2 & 3 digit date/times */
+  DFS("1.2.3 4 5"); EXPECT_DBL(37716.04309027778);
+  DFS("1.2 3 4 5"); EXPECT_DBL(38415.04305555556);
+  DFS("1 2 3.4.5"); EXPECT_DBL(37623.12783564815);
+  DFS("1 2 3 4.5"); EXPECT_DBL(37623.17013888889);
+  /* 6 elements - interpreted as 3 digit date/times */
+  DFS("1.2.3 4 5 6"); EXPECT_DBL(38812.04309027778);
+  DFS("1 2 3 4.5.6"); EXPECT_DBL(37623.17020833334);
+
+  for (i = 0; i < sizeof(BadDateStrings)/sizeof(char*); i++)
+  {
+    DFS(BadDateStrings[i]); EXPECT_MISMATCH;
+  }
+
+  /* Some normal-ish strings */
+  DFS("2 January, 1970"); EXPECT_DBL(25570.0);
+  DFS("2 January 1970");  EXPECT_DBL(25570.0);
+  DFS("2 Jan 1970");      EXPECT_DBL(25570.0);
+  DFS("2/Jan/1970");      EXPECT_DBL(25570.0);
+  DFS("2-Jan-1970");      EXPECT_DBL(25570.0);
+  DFS("1 2 1970");        EXPECT_DBL(25570.0);
+  DFS("1/2/1970");        EXPECT_DBL(25570.0);
+  DFS("1-2-1970");        EXPECT_DBL(25570.0);
+  /* Native fails "1999 January 3, 9AM". I consider that a bug in native */
+}
+
+static void test_VarDateCopy(void)
+{
+  COPYTEST(77665544.0, VT_DATE, V_DATE(&vSrc), V_DATE(&vDst), V_DATEREF(&vSrc),
+           V_DATEREF(&vDst), "%16.16g");
+}
+
+#define DATE_STR(flags, str) hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, flags, VT_BSTR); \
+  ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && \
+     V_BSTR(&vDst) && !strcmpW(V_BSTR(&vDst), str), \
+     "hres=0x%lX, type=%d (should be VT_BSTR), *bstr='%c'\n", \
+     hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?')
+
+static void test_VarDateChangeTypeEx(void)
+{
+  static const WCHAR sz25570[] = {
+    '1','/','2','/','1','9','7','0','\0' };
+  static const WCHAR sz25570Nls[] = {
+    '1','/','2','/','1','9','7','0',' ','1','2',':','0','0',':','0','0',' ','A','M','\0' };
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+  LCID lcid;
+
+  in = 1.0;
+
+  INITIAL_TYPETEST(VT_DATE, V_DATE, "%g");
+  COMMON_TYPETEST;
+
+  V_VT(&vDst) = VT_EMPTY;
+  V_VT(&vSrc) = VT_DATE;
+  V_DATE(&vSrc) = 25570.0;
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+  DATE_STR(VARIANT_NOUSEROVERRIDE, sz25570);
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+  if (HAVE_OLEAUT32_LOCALES)
+  {
+    DATE_STR(VARIANT_NOUSEROVERRIDE|VARIANT_USE_NLS, sz25570Nls);
+  }
+}
+
+/*
+ * VT_CY
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE CY
+#undef EXPECTRES
+#define EXPECTRES(res, x) \
+  ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
+     "expected hres " #x ", got hres=0x%08lx", hres)
+
+#define EXPECTCY(x) \
+  ok((hres == S_OK && out.int64 == (LONGLONG)(x*CY_MULTIPLIER)), \
+     "expected " #x "*CY_MULTIPLIER, got (%8lx %8lx); hres=0x%08lx", out.s.Hi, out.s.Lo, hres)
+
+#define EXPECTCY64(x,y) \
+  ok(hres == S_OK && out.s.Hi == (long)x && out.s.Lo == y, \
+     "expected " #x #y "(%lu,%lu), got (%lu,%lu); hres=0x%08lx", \
+      (ULONG)(x), (ULONG)(y), out.s.Hi, out.s.Lo, hres)
+
+static void test_VarCyFromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarCyFromI1);
+  for (i = -128; i < 128; i++)
+  {
+    CONVERT(VarCyFromI1,i); EXPECTCY(i);
+  }
+}
+
+static void test_VarCyFromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarCyFromUI1);
+  for (i = 0; i < 256; i++)
+  {
+    CONVERT(VarCyFromUI1,i); EXPECTCY(i);
+  }
+}
+
+static void test_VarCyFromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarCyFromI2);
+  for (i = -16384; i < 16384; i++)
+  {
+    CONVERT(VarCyFromI2,i); EXPECTCY(i);
+  }
+}
+
+static void test_VarCyFromUI2(void)
+{
+  CONVVARS(int);
+  int i;
+
+  CHECKPTR(VarCyFromUI2);
+  for (i = 0; i < 32768; i++)
+  {
+    CONVERT(VarCyFromUI2,i); EXPECTCY(i);
+  }
+}
+
+static void test_VarCyFromI4(void)
+{
+  CONVVARS(int);
+
+  CHECKPTR(VarCyFromI4);
+  CONVERT(VarCyFromI4, -1);         EXPECTCY(-1);
+  CONVERT(VarCyFromI4, 0);          EXPECTCY(0);
+  CONVERT(VarCyFromI4, 1);          EXPECTCY(1);
+  CONVERT(VarCyFromI4, 0x7fffffff); EXPECTCY64(0x1387, 0xffffd8f0);
+  CONVERT(VarCyFromI4, 0x80000000); EXPECTCY64(0xffffec78, 0);
+}
+
+static void test_VarCyFromUI4(void)
+{
+  CONVVARS(unsigned int);
+
+  CHECKPTR(VarCyFromUI4);
+  CONVERT(VarCyFromUI4, 0); EXPECTCY(0);
+  CONVERT(VarCyFromUI4, 1); EXPECTCY(1);
+  CONVERT(VarCyFromUI4, 0x80000000); EXPECTCY64(5000, 0);
+}
+
+static void test_VarCyFromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarCyFromR4);
+  CONVERT(VarCyFromR4, -1.0f); EXPECTCY(-1);
+  CONVERT(VarCyFromR4, 0.0f);  EXPECTCY(0);
+  CONVERT(VarCyFromR4, 1.0f);  EXPECTCY(1);
+  CONVERT(VarCyFromR4, 1.5f);  EXPECTCY(1.5);
+
+  CONVERT(VarCyFromR4, -1.5f);     EXPECTCY(-1.5);
+  CONVERT(VarCyFromR4, -0.6f);     EXPECTCY(-0.6);
+  CONVERT(VarCyFromR4, -0.5f);     EXPECTCY(-0.5);
+  CONVERT(VarCyFromR4, -0.4f);     EXPECTCY(-0.4);
+  CONVERT(VarCyFromR4, 0.4f);      EXPECTCY(0.4);
+  CONVERT(VarCyFromR4, 0.5f);      EXPECTCY(0.5);
+  CONVERT(VarCyFromR4, 0.6f);      EXPECTCY(0.6);
+  CONVERT(VarCyFromR4, 1.5f);      EXPECTCY(1.5);
+  CONVERT(VarCyFromR4, 1.00009f);  EXPECTCY(1.0001);
+  CONVERT(VarCyFromR4, -1.00001f); EXPECTCY(-1);
+  CONVERT(VarCyFromR4, -1.00005f); EXPECTCY(-1);
+  CONVERT(VarCyFromR4, -0.00009f); EXPECTCY(-0.0001);
+  CONVERT(VarCyFromR4, -0.00005f); EXPECTCY(0);
+  CONVERT(VarCyFromR4, -0.00001f); EXPECTCY(0);
+  CONVERT(VarCyFromR4, 0.00001f);  EXPECTCY(0);
+  CONVERT(VarCyFromR4, 0.00005f);  EXPECTCY(0);
+  CONVERT(VarCyFromR4, 0.00009f);  EXPECTCY(0.0001);
+  CONVERT(VarCyFromR4, -1.00001f); EXPECTCY(-1);
+  CONVERT(VarCyFromR4, -1.00005f); EXPECTCY(-1);
+  CONVERT(VarCyFromR4, -1.00009f); EXPECTCY(-1.0001);
+}
+
+static void test_VarCyFromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  CHECKPTR(VarCyFromR8);
+
+#if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__))
+  /* Test our rounding is exactly the same. This fails if the special x86
+   * code is taken out of VarCyFromR8.
+   */
+  CONVERT(VarCyFromR8, -461168601842738.7904); EXPECTCY64(0xbfffffff, 0xffffff23);
+#endif
+
+  CONVERT(VarCyFromR8, -4611686018427388416.1); EXPECT_OVERFLOW;
+  CONVERT(VarCyFromR8, -1.0);                   EXPECTCY(-1);
+  CONVERT(VarCyFromR8, -0.0);                   EXPECTCY(0);
+  CONVERT(VarCyFromR8, 1.0);                    EXPECTCY(1);
+  CONVERT(VarCyFromR8, 4611686018427387648.0);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarCyFromR8, -1.5f);     EXPECTCY(-1.5);
+  CONVERT(VarCyFromR8, -0.6f);     EXPECTCY(-0.6);
+  CONVERT(VarCyFromR8, -0.5f);     EXPECTCY(-0.5);
+  CONVERT(VarCyFromR8, -0.4f);     EXPECTCY(-0.4);
+  CONVERT(VarCyFromR8, 0.4f);      EXPECTCY(0.4);
+  CONVERT(VarCyFromR8, 0.5f);      EXPECTCY(0.5);
+  CONVERT(VarCyFromR8, 0.6f);      EXPECTCY(0.6);
+  CONVERT(VarCyFromR8, 1.5f);      EXPECTCY(1.5);
+  CONVERT(VarCyFromR8, 1.00009f);  EXPECTCY(1.0001);
+  CONVERT(VarCyFromR8, -1.00001f); EXPECTCY(-1);
+  CONVERT(VarCyFromR8, -1.00005f); EXPECTCY(-1);
+  CONVERT(VarCyFromR8, -0.00009f); EXPECTCY(-0.0001);
+  CONVERT(VarCyFromR8, -0.00005f); EXPECTCY(0);
+  CONVERT(VarCyFromR8, -0.00001f); EXPECTCY(0);
+  CONVERT(VarCyFromR8, 0.00001f);  EXPECTCY(0);
+  CONVERT(VarCyFromR8, 0.00005f);  EXPECTCY(0);
+  CONVERT(VarCyFromR8, 0.00009f);  EXPECTCY(0.0001);
+  CONVERT(VarCyFromR8, -1.00001f); EXPECTCY(-1);
+  CONVERT(VarCyFromR8, -1.00005f); EXPECTCY(-1);
+  CONVERT(VarCyFromR8, -1.00009f); EXPECTCY(-1.0001);
+}
+
+static void test_VarCyFromBool(void)
+{
+  CONVVARS(VARIANT_BOOL);
+  int i;
+
+  CHECKPTR(VarCyFromBool);
+  for (i = -32768; i < 32768; i++)
+  {
+    CONVERT(VarCyFromBool, i);  EXPECTCY(i);
+  }
+}
+
+static void test_VarCyFromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarCyFromI8);
+  CONVERT_I8(VarCyFromI8, -214749, 2728163227ul);   EXPECT_OVERFLOW;
+  CONVERT_I8(VarCyFromI8, -214749, 2728163228ul);   EXPECTCY64(2147483648ul,15808);
+  CONVERT(VarCyFromI8, -1); EXPECTCY(-1);
+  CONVERT(VarCyFromI8, 0);  EXPECTCY(0);
+  CONVERT(VarCyFromI8, 1);  EXPECTCY(1);
+  CONVERT_I8(VarCyFromI8, 214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul);
+  CONVERT_I8(VarCyFromI8, 214748, 1566804069); EXPECT_OVERFLOW;
+}
+
+static void test_VarCyFromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarCyFromUI8);
+  CONVERT(VarCyFromUI8, 0); EXPECTCY(0);
+  CONVERT(VarCyFromUI8, 1); EXPECTCY(1);
+  CONVERT_I8(VarCyFromUI8, 214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul);
+  CONVERT_I8(VarCyFromUI8, 214748, 1566804069); EXPECT_OVERFLOW;
+}
+
+static void test_VarCyFromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarCyFromDec);
+
+  CONVERT_BADDEC(VarCyFromDec);
+
+  CONVERT_DEC(VarCyFromDec,0,0x80,0,1); EXPECTCY(-1);
+  CONVERT_DEC(VarCyFromDec,0,0,0,0);    EXPECTCY(0);
+  CONVERT_DEC(VarCyFromDec,0,0,0,1);    EXPECTCY(1);
+
+  CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul);
+  CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804069); EXPECT_OVERFLOW;
+
+  CONVERT_DEC(VarCyFromDec,2,0,0,100);     EXPECTCY(1);
+  CONVERT_DEC(VarCyFromDec,2,0x80,0,100);  EXPECTCY(-1);
+  CONVERT_DEC(VarCyFromDec,2,0x80,0,1);    EXPECTCY(-0.01);
+  CONVERT_DEC(VarCyFromDec,2,0,0,1);       EXPECTCY(0.01);
+  CONVERT_DEC(VarCyFromDec,2,0x80,0,1);    EXPECTCY(-0.01);
+  CONVERT_DEC(VarCyFromDec,2,0,0,999);     EXPECTCY(9.99);
+  CONVERT_DEC(VarCyFromDec,2,0x80,0,999);  EXPECTCY(-9.99);
+  CONVERT_DEC(VarCyFromDec,2,0,0,1500);    EXPECTCY(15);
+  CONVERT_DEC(VarCyFromDec,2,0x80,0,1500); EXPECTCY(-15);
+}
+
+static void test_VarCyFromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarCyFromDate);
+
+#if defined(__i386__) && (defined(_MSC_VER) || defined(__GNUC__))
+  CONVERT(VarCyFromR8, -461168601842738.7904); EXPECTCY64(0xbfffffff, 0xffffff23);
+#endif
+
+  CONVERT(VarCyFromDate, -1.0); EXPECTCY(-1);
+  CONVERT(VarCyFromDate, -0.0); EXPECTCY(0);
+  CONVERT(VarCyFromDate, 1.0);  EXPECTCY(1);
+  CONVERT(VarCyFromDate, -4611686018427388416.1); EXPECT_OVERFLOW;
+  CONVERT(VarCyFromDate, 4611686018427387648.0);  EXPECT_OVERFLOW;
+
+  /* Rounding */
+  CONVERT(VarCyFromDate, -1.5f);     EXPECTCY(-1.5);
+  CONVERT(VarCyFromDate, -0.6f);     EXPECTCY(-0.6);
+  CONVERT(VarCyFromDate, -0.5f);     EXPECTCY(-0.5);
+  CONVERT(VarCyFromDate, -0.4f);     EXPECTCY(-0.4);
+  CONVERT(VarCyFromDate, 0.4f);      EXPECTCY(0.4);
+  CONVERT(VarCyFromDate, 0.5f);      EXPECTCY(0.5);
+  CONVERT(VarCyFromDate, 0.6f);      EXPECTCY(0.6);
+  CONVERT(VarCyFromDate, 1.5f);      EXPECTCY(1.5);
+  CONVERT(VarCyFromDate, 1.00009f);  EXPECTCY(1.0001);
+  CONVERT(VarCyFromDate, -1.00001f); EXPECTCY(-1);
+  CONVERT(VarCyFromDate, -1.00005f); EXPECTCY(-1);
+  CONVERT(VarCyFromDate, -0.00009f); EXPECTCY(-0.0001);
+  CONVERT(VarCyFromDate, -0.00005f); EXPECTCY(0);
+  CONVERT(VarCyFromDate, -0.00001f); EXPECTCY(0);
+  CONVERT(VarCyFromDate, 0.00001f);  EXPECTCY(0);
+  CONVERT(VarCyFromDate, 0.00005f);  EXPECTCY(0);
+  CONVERT(VarCyFromDate, 0.00009f);  EXPECTCY(0.0001);
+  CONVERT(VarCyFromDate, -1.00001f); EXPECTCY(-1);
+  CONVERT(VarCyFromDate, -1.00005f); EXPECTCY(-1);
+  CONVERT(VarCyFromDate, -1.00009f); EXPECTCY(-1.0001);
+}
+
+#define MATHVARS1 HRESULT hres; double left = 0.0; CY cyLeft, out
+#define MATHVARS2 MATHVARS1; double right = 0.0; CY cyRight
+#define MATH1(func, l) left = (double)l; pVarCyFromR8(left, &cyLeft); hres = p##func(cyLeft, &out)
+#define MATH2(func, l, r) left = (double)l; right = (double)r; \
+  pVarCyFromR8(left, &cyLeft); pVarCyFromR8(right, &cyRight); \
+  hres = p##func(cyLeft, cyRight, &out)
+
+static void test_VarCyAdd(void)
+{
+  MATHVARS2;
+
+  CHECKPTR(VarCyAdd);
+  MATH2(VarCyAdd, 0.5, 0.5);   EXPECTCY(1);
+  MATH2(VarCyAdd, 0.5, -0.4);  EXPECTCY(0.1);
+  MATH2(VarCyAdd, 0.5, -0.6);  EXPECTCY(-0.1);
+  MATH2(VarCyAdd, -0.5, -0.5); EXPECTCY(-1);
+  MATH2(VarCyAdd, -922337203685476.0, -922337203685476.0); EXPECT_OVERFLOW;
+  MATH2(VarCyAdd, -922337203685476.0, 922337203685476.0);  EXPECTCY(0);
+  MATH2(VarCyAdd, 922337203685476.0, -922337203685476.0);  EXPECTCY(0);
+  MATH2(VarCyAdd, 922337203685476.0, 922337203685476.0);   EXPECT_OVERFLOW;
+}
+
+static void test_VarCyMul(void)
+{
+  MATHVARS2;
+
+  CHECKPTR(VarCyMul);
+  MATH2(VarCyMul, 534443.0, 0.0); EXPECTCY(0);
+  MATH2(VarCyMul, 0.5, 0.5);      EXPECTCY(0.25);
+  MATH2(VarCyMul, 0.5, -0.4);     EXPECTCY(-0.2);
+  MATH2(VarCyMul, 0.5, -0.6);     EXPECTCY(-0.3);
+  MATH2(VarCyMul, -0.5, -0.5);    EXPECTCY(0.25);
+  MATH2(VarCyMul, 922337203685476.0, 20000); EXPECT_OVERFLOW;
+}
+
+static void test_VarCySub(void)
+{
+  MATHVARS2;
+
+  CHECKPTR(VarCySub);
+  MATH2(VarCySub, 0.5, 0.5);   EXPECTCY(0);
+  MATH2(VarCySub, 0.5, -0.4);  EXPECTCY(0.9);
+  MATH2(VarCySub, 0.5, -0.6);  EXPECTCY(1.1);
+  MATH2(VarCySub, -0.5, -0.5); EXPECTCY(0);
+  MATH2(VarCySub, -922337203685476.0, -922337203685476.0); EXPECTCY(0);
+  MATH2(VarCySub, -922337203685476.0, 922337203685476.0);  EXPECT_OVERFLOW;
+  MATH2(VarCySub, 922337203685476.0, -922337203685476.0);  EXPECT_OVERFLOW;
+  MATH2(VarCySub, 922337203685476.0, 922337203685476.0);   EXPECTCY(0);
+}
+
+static void test_VarCyAbs(void)
+{
+  MATHVARS1;
+
+  CHECKPTR(VarCyAbs);
+  MATH1(VarCyAbs, 0.5);  EXPECTCY(0.5);
+  MATH1(VarCyAbs, -0.5); EXPECTCY(0.5);
+  MATH1(VarCyAbs, 922337203685476.0);  EXPECTCY64(2147483647ul,4294951488ul);
+  MATH1(VarCyAbs, -922337203685476.0); EXPECTCY64(2147483647ul,4294951488ul);
+}
+
+static void test_VarCyNeg(void)
+{
+  MATHVARS1;
+
+  CHECKPTR(VarCyNeg);
+  MATH1(VarCyNeg, 0.5); EXPECTCY(-0.5);
+  MATH1(VarCyNeg, -0.5); EXPECTCY(0.5);
+  MATH1(VarCyNeg, 922337203685476.0);  EXPECTCY64(2147483648ul,15808);
+  MATH1(VarCyNeg, -922337203685476.0); EXPECTCY64(2147483647ul,4294951488ul);
+}
+
+#define MATHMULI4(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \
+  hres = pVarCyMulI4(cyLeft, right, &out)
+
+static void test_VarCyMulI4(void)
+{
+  MATHVARS1;
+  LONG right;
+
+  CHECKPTR(VarCyMulI4);
+  MATHMULI4(534443.0, 0); EXPECTCY(0);
+  MATHMULI4(0.5, 1);      EXPECTCY(0.5);
+  MATHMULI4(0.5, 2);      EXPECTCY(1);
+  MATHMULI4(922337203685476.0, 1); EXPECTCY64(2147483647ul,4294951488ul);
+  MATHMULI4(922337203685476.0, 2); EXPECT_OVERFLOW;
+}
+
+#define MATHMULI8(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \
+  hres = pVarCyMulI8(cyLeft, right, &out)
+
+static void test_VarCyMulI8(void)
+{
+  MATHVARS1;
+  LONG64 right;
+
+  CHECKPTR(VarCyMulI8);
+  MATHMULI8(534443.0, 0); EXPECTCY(0);
+  MATHMULI8(0.5, 1);      EXPECTCY(0.5);
+  MATHMULI8(0.5, 2);      EXPECTCY(1);
+  MATHMULI8(922337203685476.0, 1); EXPECTCY64(2147483647ul,4294951488ul);
+  MATHMULI8(922337203685476.0, 2); EXPECT_OVERFLOW;
+}
+
+#define MATHCMP(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); pVarCyFromR8(right, &cyRight); \
+  hres = pVarCyCmp(cyLeft, cyRight); out.int64 = hres
+
+static void test_VarCyCmp(void)
+{
+  MATHVARS2;
+
+  CHECKPTR(VarCyCmp);
+  MATHCMP(-1.0, -1.0); EXPECT_EQ;
+  MATHCMP(-1.0, 0.0);  EXPECT_LT;
+  MATHCMP(-1.0, 1.0);  EXPECT_LT;
+  MATHCMP(-1.0, 2.0);  EXPECT_LT;
+  MATHCMP(0.0, 1.0);   EXPECT_LT;
+  MATHCMP(0.0, 0.0);   EXPECT_EQ;
+  MATHCMP(0.0, -1.0);  EXPECT_GT;
+  MATHCMP(1.0, -1.0);  EXPECT_GT;
+  MATHCMP(1.0, 0.0);   EXPECT_GT;
+  MATHCMP(1.0, 1.0);   EXPECT_EQ;
+  MATHCMP(1.0, 2.0);   EXPECT_LT;
+}
+
+#define MATHCMPR8(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \
+  hres = pVarCyCmpR8(cyLeft, right); out.int64 = hres
+
+static void test_VarCyCmpR8(void)
+{
+  MATHVARS1;
+  double right;
+
+  CHECKPTR(VarCyCmpR8);
+  MATHCMPR8(-1.0, -1.0); EXPECT_EQ;
+  MATHCMPR8(-1.0, 0.0);  EXPECT_LT;
+  MATHCMPR8(-1.0, 1.0);  EXPECT_LT;
+  MATHCMPR8(-1.0, 2.0);  EXPECT_LT;
+  MATHCMPR8(0.0, 1.0);   EXPECT_LT;
+  MATHCMPR8(0.0, 0.0);   EXPECT_EQ;
+  MATHCMPR8(0.0, -1.0);  EXPECT_GT;
+  MATHCMPR8(1.0, -1.0);  EXPECT_GT;
+  MATHCMPR8(1.0, 0.0);   EXPECT_GT;
+  MATHCMPR8(1.0, 1.0);   EXPECT_EQ;
+  MATHCMPR8(1.0, 2.0);   EXPECT_LT;
+}
+
+#undef MATHRND
+#define MATHRND(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \
+  hres = pVarCyRound(cyLeft, right, &out)
+
+static void test_VarCyRound(void)
+{
+  MATHVARS1;
+  int right;
+
+  CHECKPTR(VarCyRound);
+  MATHRND(0.5432, 5);  EXPECTCY(0.5432);
+  MATHRND(0.5432, 4);  EXPECTCY(0.5432);
+  MATHRND(0.5432, 3);  EXPECTCY(0.543);
+  MATHRND(0.5432, 2);  EXPECTCY(0.54);
+  MATHRND(0.5432, 1);  EXPECTCY(0.5);
+  MATHRND(0.5532, 0);  EXPECTCY(1);
+  MATHRND(0.5532, -1); EXPECT_INVALID;
+
+  MATHRND(0.5568, 5);  EXPECTCY(0.5568);
+  MATHRND(0.5568, 4);  EXPECTCY(0.5568);
+  MATHRND(0.5568, 3);  EXPECTCY(0.557);
+  MATHRND(0.5568, 2);  EXPECTCY(0.56);
+  MATHRND(0.5568, 1);  EXPECTCY(0.6);
+  MATHRND(0.5568, 0);  EXPECTCY(1);
+  MATHRND(0.5568, -1); EXPECT_INVALID;
+
+  MATHRND(0.4999, 0); EXPECTCY(0);
+  MATHRND(0.5000, 0); EXPECTCY(0);
+  MATHRND(0.5001, 0); EXPECTCY(1);
+  MATHRND(1.4999, 0); EXPECTCY(1);
+  MATHRND(1.5000, 0); EXPECTCY(2);
+  MATHRND(1.5001, 0); EXPECTCY(2);
+}
+
+#define MATHFIX(l) left = l; pVarCyFromR8(left, &cyLeft); \
+  hres = pVarCyFix(cyLeft, &out)
+
+static void test_VarCyFix(void)
+{
+  MATHVARS1;
+
+  CHECKPTR(VarCyFix);
+  MATHFIX(-1.0001); EXPECTCY(-1);
+  MATHFIX(-1.4999); EXPECTCY(-1);
+  MATHFIX(-1.5001); EXPECTCY(-1);
+  MATHFIX(-1.9999); EXPECTCY(-1);
+  MATHFIX(-0.0001); EXPECTCY(0);
+  MATHFIX(-0.4999); EXPECTCY(0);
+  MATHFIX(-0.5001); EXPECTCY(0);
+  MATHFIX(-0.9999); EXPECTCY(0);
+  MATHFIX(0.0001);  EXPECTCY(0);
+  MATHFIX(0.4999);  EXPECTCY(0);
+  MATHFIX(0.5001);  EXPECTCY(0);
+  MATHFIX(0.9999);  EXPECTCY(0);
+  MATHFIX(1.0001);  EXPECTCY(1);
+  MATHFIX(1.4999);  EXPECTCY(1);
+  MATHFIX(1.5001);  EXPECTCY(1);
+  MATHFIX(1.9999);  EXPECTCY(1);
+}
+
+#define MATHINT(l) left = l; pVarCyFromR8(left, &cyLeft); \
+  hres = pVarCyInt(cyLeft, &out)
+
+static void test_VarCyInt(void)
+{
+  MATHVARS1;
+
+  CHECKPTR(VarCyInt);
+  MATHINT(-1.0001); EXPECTCY(-2);
+  MATHINT(-1.4999); EXPECTCY(-2);
+  MATHINT(-1.5001); EXPECTCY(-2);
+  MATHINT(-1.9999); EXPECTCY(-2);
+  MATHINT(-0.0001); EXPECTCY(-1);
+  MATHINT(-0.4999); EXPECTCY(-1);
+  MATHINT(-0.5001); EXPECTCY(-1);
+  MATHINT(-0.9999); EXPECTCY(-1);
+  MATHINT(0.0001);  EXPECTCY(0);
+  MATHINT(0.4999);  EXPECTCY(0);
+  MATHINT(0.5001);  EXPECTCY(0);
+  MATHINT(0.9999);  EXPECTCY(0);
+  MATHINT(1.0001);  EXPECTCY(1);
+  MATHINT(1.4999);  EXPECTCY(1);
+  MATHINT(1.5001);  EXPECTCY(1);
+  MATHINT(1.9999);  EXPECTCY(1);
+}
+
+/*
+ * VT_DECIMAL
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE DECIMAL
+#undef EXPECTRES
+#define EXPECTRES(res, x) \
+  ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
+     "expected hres " #x ", got hres=0x%08lx", hres)
+
+#define EXPECTDEC(scl, sgn, hi, lo) ok(hres == S_OK && \
+  out.u.s.scale == (BYTE)scl && out.u.s.sign == (BYTE)sgn && \
+  out.Hi32 == (ULONG)hi && out.u1.Lo64 == (ULONG64)lo, \
+  "expected (%d,%d,%d,(%lx %lx)), got (%d,%d,%ld,(%lx %lx)) hres 0x%08lx\n", \
+  scl, sgn, hi, (LONG)((LONG64)lo >> 32), (LONG)(lo & 0xffffffff), out.u.s.scale, \
+  out.u.s.sign, out.Hi32, out.u1.s1.Mid32, out.u1.s1.Lo32, hres)
+
+#define EXPECTDEC64(scl, sgn, hi, mid, lo) ok(hres == S_OK && \
+  out.u.s.scale == (BYTE)scl && out.u.s.sign == (BYTE)sgn && \
+  out.Hi32 == (ULONG)hi && out.u1.s1.Mid32 == (ULONG)mid && \
+  out.u1.s1.Lo32 == (ULONG)lo, \
+  "expected (%d,%d,%d,(%lx %lx)), got (%d,%d,%ld,(%lx %lx)) hres 0x%08lx\n", \
+  scl, sgn, hi, (LONG)(mid), (LONG)(lo), out.u.s.scale, \
+  out.u.s.sign, out.Hi32, out.u1.s1.Mid32, out.u1.s1.Lo32, hres)
+
+#define EXPECTDECI if (i < 0) EXPECTDEC(0, 0x80, 0, -i); else EXPECTDEC(0, 0, 0, i)
+
+static void test_VarDecFromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarDecFromI1);
+  for (i = -128; i < 128; i++)
+  {
+    CONVERT(VarDecFromI1,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarDecFromI2);
+  for (i = -32768; i < 32768; i++)
+  {
+    CONVERT(VarDecFromI2,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromI4(void)
+{
+  CONVVARS(LONG);
+  int i;
+
+  CHECKPTR(VarDecFromI4);
+  for (i = -32768; i < 32768; i++)
+  {
+    CONVERT(VarDecFromI4,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromI8(void)
+{
+  CONVVARS(LONG64);
+  int i;
+
+  CHECKPTR(VarDecFromI8);
+  for (i = -32768; i < 32768; i++)
+  {
+    CONVERT(VarDecFromI8,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarDecFromUI1);
+  for (i = 0; i < 256; i++)
+  {
+    CONVERT(VarDecFromUI1,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarDecFromUI2);
+  for (i = 0; i < 65536; i++)
+  {
+    CONVERT(VarDecFromUI2,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromUI4(void)
+{
+  CONVVARS(ULONG);
+  int i;
+
+  CHECKPTR(VarDecFromUI4);
+  for (i = 0; i < 65536; i++)
+  {
+    CONVERT(VarDecFromUI4,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromUI8(void)
+{
+  CONVVARS(ULONG64);
+  int i;
+
+  CHECKPTR(VarDecFromUI8);
+  for (i = 0; i < 65536; i++)
+  {
+    CONVERT(VarDecFromUI8,i); EXPECTDECI;
+  }
+}
+
+static void test_VarDecFromBool(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarDecFromBool);
+  /* Test all possible type values. Note that the result is reduced to 0 or -1 */
+  for (i = -32768; i < 0; i++)
+  {
+    CONVERT(VarDecFromBool,i);
+    if (i)
+      EXPECTDEC(0,0x80,0,1);
+    else
+      EXPECTDEC(0,0,0,0);
+  }
+}
+
+static void test_VarDecFromR4(void)
+{
+  CONVVARS(float);
+
+  CHECKPTR(VarDecFromR4);
+
+  CONVERT(VarDecFromR4,-0.6f); EXPECTDEC(1,0x80,0,6);
+  CONVERT(VarDecFromR4,-0.5f); EXPECTDEC(1,0x80,0,5);
+  CONVERT(VarDecFromR4,-0.4f); EXPECTDEC(1,0x80,0,4);
+  CONVERT(VarDecFromR4,0.0f);  EXPECTDEC(0,0,0,0);
+  CONVERT(VarDecFromR4,0.4f);  EXPECTDEC(1,0,0,4);
+  CONVERT(VarDecFromR4,0.5f);  EXPECTDEC(1,0,0,5);
+  CONVERT(VarDecFromR4,0.6f);  EXPECTDEC(1,0,0,6);
+}
+
+static void test_VarDecFromR8(void)
+{
+  CONVVARS(double);
+
+  CHECKPTR(VarDecFromR8);
+
+  CONVERT(VarDecFromR8,-0.6); EXPECTDEC(1,0x80,0,6);
+  CONVERT(VarDecFromR8,-0.5); EXPECTDEC(1,0x80,0,5);
+  CONVERT(VarDecFromR8,-0.4); EXPECTDEC(1,0x80,0,4);
+  CONVERT(VarDecFromR8,0.0);  EXPECTDEC(0,0,0,0);
+  CONVERT(VarDecFromR8,0.4);  EXPECTDEC(1,0,0,4);
+  CONVERT(VarDecFromR8,0.5);  EXPECTDEC(1,0,0,5);
+  CONVERT(VarDecFromR8,0.6);  EXPECTDEC(1,0,0,6);
+}
+
+static void test_VarDecFromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarDecFromDate);
+
+  CONVERT(VarDecFromDate,-0.6); EXPECTDEC(1,0x80,0,6);
+  CONVERT(VarDecFromDate,-0.5); EXPECTDEC(1,0x80,0,5);
+  CONVERT(VarDecFromDate,-0.4); EXPECTDEC(1,0x80,0,4);
+  CONVERT(VarDecFromDate,0.0);  EXPECTDEC(0,0,0,0);
+  CONVERT(VarDecFromDate,0.4);  EXPECTDEC(1,0,0,4);
+  CONVERT(VarDecFromDate,0.5);  EXPECTDEC(1,0,0,5);
+  CONVERT(VarDecFromDate,0.6);  EXPECTDEC(1,0,0,6);
+}
+
+static void test_VarDecFromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  CHECKPTR(VarDecFromStr);
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  CONVERT_STR(VarDecFromStr,NULL,0);                       EXPECT_MISMATCH;
+  CONVERT_STR(VarDecFromStr,"-1",  LOCALE_NOUSEROVERRIDE); EXPECTDEC(0,0x80,0,1);
+  CONVERT_STR(VarDecFromStr,"0",   LOCALE_NOUSEROVERRIDE); EXPECTDEC(0,0,0,0);
+  CONVERT_STR(VarDecFromStr,"1",   LOCALE_NOUSEROVERRIDE); EXPECTDEC(0,0,0,1);
+  CONVERT_STR(VarDecFromStr,"0.5", LOCALE_NOUSEROVERRIDE); EXPECTDEC(1,0,0,5);
+}
+
+static void test_VarDecFromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarDecFromCy);
+
+  CONVERT_CY(VarDecFromCy, -1);  EXPECTDEC(4,0x80,0,10000);
+  CONVERT_CY(VarDecFromCy, 0);   EXPECTDEC(4,0,0,0);
+  CONVERT_CY(VarDecFromCy, 1);   EXPECTDEC(4,0,0,10000);
+  CONVERT_CY(VarDecFromCy, 0.5); EXPECTDEC(4,0,0,5000);
+}
+
+#undef MATHVARS1
+#define MATHVARS1 HRESULT hres; DECIMAL l, out
+#undef MATHVARS2
+#define MATHVARS2 MATHVARS1; DECIMAL r
+#undef MATH1
+#define MATH1(func) hres = p##func(&l, &out)
+#undef MATH2
+#define MATH2(func) hres = p##func(&l, &r, &out)
+
+static void test_VarDecAbs(void)
+{
+  MATHVARS1;
+
+  CHECKPTR(VarDecAbs);
+  SETDEC(l,0,0x80,0,1);  MATH1(VarDecAbs); EXPECTDEC(0,0,0,1);
+  SETDEC(l,0,0,0,0);     MATH1(VarDecAbs); EXPECTDEC(0,0,0,0);
+  SETDEC(l,0,0x80,0,0);  MATH1(VarDecAbs); EXPECTDEC(0,0,0,0);
+  SETDEC(l,0,0,0,1);     MATH1(VarDecAbs); EXPECTDEC(0,0,0,1);
+
+  /* Doesn't check for invalid input */
+  SETDEC(l,0,0x7f,0,1);  MATH1(VarDecAbs); EXPECTDEC(0,0x7f,0,1);
+  SETDEC(l,0,0x80,29,1); MATH1(VarDecAbs); EXPECTDEC(0,0,29,1);
+}
+
+static void test_VarDecNeg(void)
+{
+  MATHVARS1;
+
+  CHECKPTR(VarDecNeg);
+  SETDEC(l,0,0x80,0,1); MATH1(VarDecNeg); EXPECTDEC(0,0,0,1);
+  SETDEC(l,0,0,0,0);    MATH1(VarDecNeg); EXPECTDEC(0,0x80,0,0); /* '-0'! */
+  SETDEC(l,0,0x80,0,0); MATH1(VarDecNeg); EXPECTDEC(0,0,0,0);
+  SETDEC(l,0,0,0,1);    MATH1(VarDecNeg); EXPECTDEC(0,0x80,0,1);
+
+  /* Doesn't check for invalid input */
+  SETDEC(l,0,0x7f,0,1);  MATH1(VarDecNeg); EXPECTDEC(0,0xff,0,1);
+  SETDEC(l,0,0x80,29,1); MATH1(VarDecNeg); EXPECTDEC(0,0,29,1);
+  SETDEC(l,0,0,29,1);    MATH1(VarDecNeg); EXPECTDEC(0,0x80,29,1);
+}
+
+static void test_VarDecAdd(void)
+{
+  MATHVARS2;
+
+  CHECKPTR(VarDecAdd);
+  SETDEC(l,0,0,0,0);    SETDEC(r,0,0,0,0);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,0);
+  SETDEC(l,0,0,0,0);    SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,1);
+  SETDEC(l,0,0,0,0);    SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,1);
+
+  SETDEC(l,0,0,0,1);    SETDEC(r,0,0,0,0);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,1);
+  SETDEC(l,0,0,0,1);    SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,2);
+  SETDEC(l,0,0,0,1);    SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,0); /* '-0'! */
+  SETDEC(l,0,0,0,1);    SETDEC(r,0,0x80,0,2); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,1);
+
+  SETDEC(l,0,0x80,0,0); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,1);
+  SETDEC(l,0,0x80,0,1); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,0);
+  SETDEC(l,0,0x80,0,1); SETDEC(r,0,0,0,2);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,1);
+  SETDEC(l,0,0x80,0,1); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,2);
+  SETDEC(l,0,0x80,0,2); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0x80,0,1);
+
+  SETDEC(l,0,0,0,0xffffffff); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd); EXPECTDEC(0,0,0,0xfffffffe);
+  SETDEC(l,0,0,0,0xffffffff); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,0x100000000);
+  SETDEC(l,0,0,0,0xffffffff); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,0,0x100000000);
+
+  SETDEC64(l,0,0,0,0xffffffff,0); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC64(0,0,0,0xffffffff,1);
+  SETDEC64(l,0,0,0,0xffffffff,0); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd);
+  EXPECTDEC64(0,0,0,0xfffffffe,0xffffffff);
+
+  SETDEC64(l,0,0,0,0xffffffff,0xffffffff); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,1,0);
+  SETDEC64(l,0,0,0,0xffffffff,0xffffffff); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd);
+  EXPECTDEC64(0,0,0,0xffffffff,0xfffffffe);
+
+  SETDEC(l,0,0,0xffffffff,0); SETDEC(r,0,0,0,1);    MATH2(VarDecAdd); EXPECTDEC(0,0,0xffffffff,1);
+  SETDEC(l,0,0,0xffffffff,0); SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd);
+  EXPECTDEC64(0,0,0xfffffffe,0xffffffff,0xffffffff);
+
+  SETDEC64(l,0,0,0xffffffff,0xffffffff,0xffffffff);SETDEC(r,0,0x80,0,1); MATH2(VarDecAdd);
+  EXPECTDEC64(0,0,0xffffffff,0xffffffff,0xfffffffe);
+  SETDEC64(l,0,0,0xffffffff,0xffffffff,0xffffffff);SETDEC(r,0,0,0,1); MATH2(VarDecAdd);
+  ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%ld,(%8lx,%8lx)x) hres 0x%08lx\n",
+     out.u.s.scale, out.u.s.sign, out.Hi32, out.u1.s1.Mid32, out.u1.s1.Lo32, hres);
+
+  /* Promotes to the highest scale, so here the results are in the scale of 2 */
+  SETDEC(l,2,0,0,0);   SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0);
+  SETDEC(l,2,0,0,100); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(2,0,0,200);
+}
+
+static void test_VarDecSub(void)
+{
+  MATHVARS2;
+
+  CHECKPTR(VarDecSub);
+  SETDEC(l,0,0,0,0);    SETDEC(r,0,0,0,0);    MATH2(VarDecSub); EXPECTDEC(0,0x80,0,0);
+  SETDEC(l,0,0,0,0);    SETDEC(r,0,0,0,1);    MATH2(VarDecSub); EXPECTDEC(0,0x80,0,1);
+  SETDEC(l,0,0,0,1);    SETDEC(r,0,0,0,1);    MATH2(VarDecSub); EXPECTDEC(0,0x80,0,0);
+  SETDEC(l,0,0,0,1);    SETDEC(r,0,0x80,0,1); MATH2(VarDecSub); EXPECTDEC(0,0,0,2);
+}
+
+static void test_VarDecCmp(void)
+{
+  MATHVARS1;
+
+  CHECKPTR(VarDecCmp);
+  SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_EQ;
+  SETDEC(l,0,0,0,1); SETDEC(out,0,0,0,0); MATH1(VarDecCmp); EXPECT_GT;
+  SETDEC(l,0,0,0,0); SETDEC(out,0,0,0,1); MATH1(VarDecCmp); EXPECT_LT;
+}
+
+/*
+ * VT_BOOL
+ */
+
+#undef CONV_TYPE
+#define CONV_TYPE VARIANT_BOOL
+#undef _EXPECTRES
+#define _EXPECTRES(res, x, fs) \
+  ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
+     "expected " #x ", got " fs "; hres=0x%08lx", out, hres)
+#undef EXPECTRES
+#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d")
+#undef CONVERTRANGE
+#define CONVERTRANGE(func,start,end) for (i = start; i < end; i++) { \
+  CONVERT(func, i); if (i) { EXPECT(VARIANT_TRUE); } else { EXPECT(VARIANT_FALSE); } }
+
+static void test_VarBoolFromI1(void)
+{
+  CONVVARS(signed char);
+  int i;
+
+  CHECKPTR(VarBoolFromI1);
+  CONVERTRANGE(VarBoolFromI1, -128, 128);
+}
+
+static void test_VarBoolFromUI1(void)
+{
+  CONVVARS(BYTE);
+  int i;
+
+  CHECKPTR(VarBoolFromUI1);
+  CONVERTRANGE(VarBoolFromUI1, 0, 256);
+}
+
+static void test_VarBoolFromI2(void)
+{
+  CONVVARS(SHORT);
+  int i;
+
+  CHECKPTR(VarBoolFromI2);
+  CONVERTRANGE(VarBoolFromI2, -32768, 32768);
+}
+
+static void test_VarBoolFromUI2(void)
+{
+  CONVVARS(USHORT);
+  int i;
+
+  CHECKPTR(VarBoolFromUI2);
+  CONVERTRANGE(VarBoolFromUI2, 0, 65536);
+}
+
+static void test_VarBoolFromI4(void)
+{
+  CONVVARS(int);
+
+  CHECKPTR(VarBoolFromI4);
+  CONVERT(VarBoolFromI4, 0x80000000); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromI4, -1);         EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromI4, 0);          EXPECT(VARIANT_FALSE);
+  CONVERT(VarBoolFromI4, 1);          EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromI4, 0x7fffffff); EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromUI4(void)
+{
+  CONVVARS(ULONG);
+
+  CHECKPTR(VarBoolFromUI4);
+  CONVERT(VarBoolFromI4, 0);          EXPECT(VARIANT_FALSE);
+  CONVERT(VarBoolFromI4, 1);          EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromI4, 0x80000000); EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromR4(void)
+{
+  CONVVARS(FLOAT);
+
+  CHECKPTR(VarBoolFromR4);
+  CONVERT(VarBoolFromR4, -1.0f); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, 0.0f);  EXPECT(VARIANT_FALSE);
+  CONVERT(VarBoolFromR4, 1.0f);  EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, 1.5f);  EXPECT(VARIANT_TRUE);
+
+  /* Rounding */
+  CONVERT(VarBoolFromR4, -1.5f); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, -0.6f); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, -0.5f); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, -0.4f); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, 0.4f);  EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, 0.5f);  EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, 0.6f);  EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR4, 1.5f);  EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromR8(void)
+{
+  CONVVARS(DOUBLE);
+
+  /* Hopefully we made the point with R4 above that rounding is
+   * irrelevant, so we'll skip that for R8 and Date
+   */
+  CHECKPTR(VarBoolFromR8);
+  CONVERT(VarBoolFromR8, -1.0); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromR8, -0.0); EXPECT(VARIANT_FALSE);
+  CONVERT(VarBoolFromR8, 1.0);  EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromCy(void)
+{
+  CONVVARS(CY);
+
+  CHECKPTR(VarBoolFromCy);
+  CONVERT_CY(VarBoolFromCy, -32769); EXPECT(VARIANT_TRUE);
+  CONVERT_CY(VarBoolFromCy, -32768); EXPECT(VARIANT_TRUE);
+  CONVERT_CY(VarBoolFromCy, -1);     EXPECT(VARIANT_TRUE);
+  CONVERT_CY(VarBoolFromCy, 0);      EXPECT(VARIANT_FALSE);
+  CONVERT_CY(VarBoolFromCy, 1);      EXPECT(VARIANT_TRUE);
+  CONVERT_CY(VarBoolFromCy, 32767);  EXPECT(VARIANT_TRUE);
+  CONVERT_CY(VarBoolFromCy, 32768);  EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromI8(void)
+{
+  CONVVARS(LONG64);
+
+  CHECKPTR(VarBoolFromI8);
+  CONVERT(VarBoolFromI8, -1); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromI8, 0);  EXPECT(VARIANT_FALSE);
+  CONVERT(VarBoolFromI8, 1);  EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromUI8(void)
+{
+  CONVVARS(ULONG64);
+
+  CHECKPTR(VarBoolFromUI8);
+  CONVERT(VarBoolFromUI8, 0); EXPECT(VARIANT_FALSE);
+  CONVERT(VarBoolFromUI8, 1); EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromDec(void)
+{
+  CONVVARS(DECIMAL);
+
+  CHECKPTR(VarBoolFromDec);
+  CONVERT_BADDEC(VarBoolFromDec);
+
+  if (HAVE_OLEAUT32_DECIMAL)
+  {
+    /* Early versions of oleaut32 don't catch these errors */
+    CONVERT_DEC(VarBoolFromDec,29,0,0,0);   EXPECT_INVALID;
+    CONVERT_DEC(VarBoolFromDec,0,0x1,0,0);  EXPECT_INVALID;
+    CONVERT_DEC(VarBoolFromDec,0,0x40,0,0); EXPECT_INVALID;
+    CONVERT_DEC(VarBoolFromDec,0,0x7f,0,0); EXPECT_INVALID;
+  }
+
+  CONVERT_DEC(VarBoolFromDec,0,0x80,0,1); EXPECT(VARIANT_TRUE);
+  CONVERT_DEC(VarBoolFromDec,0,0,0,0);    EXPECT(VARIANT_FALSE);
+  CONVERT_DEC(VarBoolFromDec,0,0,0,1);    EXPECT(VARIANT_TRUE);
+  CONVERT_DEC(VarBoolFromDec,0,0,1,0);    EXPECT(VARIANT_TRUE);
+
+  CONVERT_DEC(VarBoolFromDec,2,0,0,CY_MULTIPLIER);    EXPECT(VARIANT_TRUE);
+  CONVERT_DEC(VarBoolFromDec,2,0x80,0,CY_MULTIPLIER); EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromDate(void)
+{
+  CONVVARS(DATE);
+
+  CHECKPTR(VarBoolFromDate);
+  CONVERT(VarBoolFromDate, -1.0); EXPECT(VARIANT_TRUE);
+  CONVERT(VarBoolFromDate, -0.0); EXPECT(VARIANT_FALSE);
+  CONVERT(VarBoolFromDate, 1.0);  EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolFromStr(void)
+{
+  CONVVARS(LCID);
+  OLECHAR buff[128];
+
+  CHECKPTR(VarBoolFromStr);
+
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  CONVERT_STR(VarBoolFromStr,NULL,0);
+  if (hres != E_INVALIDARG)
+    EXPECT_MISMATCH;
+
+  /* #FALSE# and #TRUE# Are always accepted */
+  CONVERT_STR(VarBoolFromStr,"#FALSE#",0); EXPECT(VARIANT_FALSE);
+  CONVERT_STR(VarBoolFromStr,"#TRUE#",0);  EXPECT(VARIANT_TRUE);
+
+  /* Match of #FALSE# and #TRUE# is case sensitive */
+  CONVERT_STR(VarBoolFromStr,"#False#",0); EXPECT_MISMATCH;
+  /* But match against English is not */
+  CONVERT_STR(VarBoolFromStr,"false",0);   EXPECT(VARIANT_FALSE);
+  CONVERT_STR(VarBoolFromStr,"False",0);   EXPECT(VARIANT_FALSE);
+  /* On/Off and yes/no are not acceptable inputs, with any flags set */
+  CONVERT_STR(VarBoolFromStr,"On",0xffffffff);  EXPECT_MISMATCH;
+  CONVERT_STR(VarBoolFromStr,"Yes",0xffffffff); EXPECT_MISMATCH;
+
+  /* Change the LCID. This doesn't make any difference for text,unless we ask
+   * to check local boolean text with the VARIANT_LOCALBOOL flag. */
+  in = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT);
+
+  /* #FALSE# and #TRUE# are accepted in all locales */
+  CONVERT_STR(VarBoolFromStr,"#FALSE#",0); EXPECT(VARIANT_FALSE);
+  CONVERT_STR(VarBoolFromStr,"#TRUE#",0);  EXPECT(VARIANT_TRUE);
+  CONVERT_STR(VarBoolFromStr,"#FALSE#",VARIANT_LOCALBOOL); EXPECT(VARIANT_FALSE);
+  CONVERT_STR(VarBoolFromStr,"#TRUE#",VARIANT_LOCALBOOL);  EXPECT(VARIANT_TRUE);
+
+  /* English is accepted regardless of the locale */
+  CONVERT_STR(VarBoolFromStr,"false",0); EXPECT(VARIANT_FALSE);
+  /* And is still not case sensitive */
+  CONVERT_STR(VarBoolFromStr,"False",0); EXPECT(VARIANT_FALSE);
+
+  if (HAVE_OLEAUT32_LOCALES)
+  {
+    /* French is rejected without VARIANT_LOCALBOOL */
+    CONVERT_STR(VarBoolFromStr,"faux",0); EXPECT_MISMATCH;
+    /* But accepted if this flag is given */
+    CONVERT_STR(VarBoolFromStr,"faux",VARIANT_LOCALBOOL); EXPECT(VARIANT_FALSE);
+    /* Regardless of case - from this we assume locale text comparasons ignore case */
+    CONVERT_STR(VarBoolFromStr,"Faux",VARIANT_LOCALBOOL); EXPECT(VARIANT_FALSE);
+
+    /* Changing the locale prevents the localised text from being compared -
+     * this demonstrates that only the indicated LCID and English are searched */
+    in = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
+    CONVERT_STR(VarBoolFromStr,"faux",VARIANT_LOCALBOOL); EXPECT_MISMATCH;
+  }
+
+  /* Numeric strings are read as 0 or non-0 */
+  CONVERT_STR(VarBoolFromStr,"0",0);  EXPECT(VARIANT_FALSE);
+  CONVERT_STR(VarBoolFromStr,"-1",0); EXPECT(VARIANT_TRUE);
+  CONVERT_STR(VarBoolFromStr,"+1",0); EXPECT(VARIANT_TRUE);
+
+  if (HAVE_OLEAUT32_LOCALES)
+  {
+    /* Numeric strings are read as floating point numbers. The line below fails
+     * because '.' is not a valid decimal seperator for Polish numbers */
+    CONVERT_STR(VarBoolFromStr,"0.1",0); EXPECT_MISMATCH;
+  }
+
+  /* Changing the lcid back to US English reads the r8 correctly */
+  in = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+  CONVERT_STR(VarBoolFromStr,"0.1",0); EXPECT(VARIANT_TRUE);
+}
+
+static void test_VarBoolCopy(void)
+{
+  COPYTEST(1, VT_BOOL, V_BOOL(&vSrc), V_BOOL(&vDst), V_BOOLREF(&vSrc), V_BOOLREF(&vDst), "%d");
+}
+
+#define BOOL_STR(flags, str) hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, flags, VT_BSTR); \
+  ok(hres == S_OK && V_VT(&vDst) == VT_BSTR && \
+     V_BSTR(&vDst) && !memcmp(V_BSTR(&vDst), str, sizeof(str)), \
+     "hres=0x%lX, type=%d (should be VT_BSTR), *bstr='%c'\n", \
+     hres, V_VT(&vDst), V_BSTR(&vDst) ? *V_BSTR(&vDst) : '?')
+
+static void test_VarBoolChangeTypeEx(void)
+{
+  static const WCHAR szTrue[] = { 'T','r','u','e','\0' };
+  static const WCHAR szFalse[] = { 'F','a','l','s','e','\0' };
+  static const WCHAR szFaux[] = { 'F','a','u','x','\0' };
+  CONVVARS(CONV_TYPE);
+  VARIANTARG vSrc, vDst;
+  LCID lcid;
+
+  in = 1;
+
+  INITIAL_TYPETEST(VT_BOOL, V_BOOL, "%d");
+  COMMON_TYPETEST;
+
+  /* The common tests convert to a number. Try the different flags */
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  V_VT(&vSrc) = VT_BOOL;
+  V_BOOL(&vSrc) = 1;
+
+  BOOL_STR(VARIANT_ALPHABOOL, szTrue);
+  V_BOOL(&vSrc) = 0;
+  BOOL_STR(VARIANT_ALPHABOOL, szFalse);
+
+  if (HAVE_OLEAUT32_LOCALES)
+  {
+    lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT);
+
+    /* VARIANT_ALPHABOOL is always English */
+    BOOL_STR(VARIANT_ALPHABOOL, szFalse);
+    /* VARIANT_LOCALBOOL uses the localised text */
+    BOOL_STR(VARIANT_LOCALBOOL, szFaux);
+    /* Both flags together acts as VARIANT_LOCALBOOL */
+    BOOL_STR(VARIANT_ALPHABOOL|VARIANT_LOCALBOOL, szFaux);
+  }
+}
+
+/*
+ * BSTR
+ */
+
+static void test_VarBstrFromR4(void)
+{
+  static const WCHAR szNative[] = { '6','5','4','3','2','2','.','3','\0' };
+  LCID lcid;
+  HRESULT hres;
+  BSTR bstr = NULL;
+
+  float f;
+
+  CHECKPTR(VarBstrFromR4);
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+  f = 654322.23456,
+  hres = pVarBstrFromR4(f, lcid, 0, &bstr);
+  ok(hres == S_OK, "got hres 0x%08lx\n", hres);
+  if (bstr)
+  {
+    todo_wine {
+    /* MSDN states that rounding of R4/R8 is dependant on the underlying
+     * bit pattern of the number and so is architecture dependant. In this
+     * case Wine returns .2 (which is more correct) and Native returns .3
+     */
+    ok(memcmp(bstr, szNative, sizeof(szNative)) == 0, "string different\n");
+    }
+  }
+}
+
+#define BSTR_DATE(dt,str) SysFreeString(bstr); bstr = NULL; \
+  hres = pVarBstrFromDate(dt,lcid,LOCALE_NOUSEROVERRIDE,&bstr); \
+  if (bstr) WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); \
+  else buff[0] = 0; \
+  ok(hres == S_OK && !strcmp(str,buff), "Expected '%s', got '%s', hres = 0x%08lx\n", \
+     str, buff, hres)
+
+static void test_VarBstrFromDate(void)
+{
+  char buff[256];
+  LCID lcid;
+  HRESULT hres;
+  BSTR bstr = NULL;
+
+  CHECKPTR(VarBstrFromDate);
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
+
+  BSTR_DATE(0.0, "12:00:00 AM");
+  BSTR_DATE(3.34, "1/2/1900 8:09:36 AM");
+  BSTR_DATE(3339.34, "2/20/1909 8:09:36 AM");
+  BSTR_DATE(365.00, "12/30/1900");
+  BSTR_DATE(365.25, "12/30/1900 6:00:00 AM");
+  BSTR_DATE(1461.0, "12/31/1903");
+  BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM");
+}
+
+/* Get the internal representation of a BSTR */
+static inline LPINTERNAL_BSTR Get(const BSTR lpszString)
+{
+  return lpszString ? (LPINTERNAL_BSTR)((char*)lpszString - sizeof(DWORD)) : NULL;
+}
+
+static inline BSTR GetBSTR(const LPINTERNAL_BSTR bstr)
+{
+  return (BSTR)bstr->szString;
+}
+
+static void test_SysStringLen()
+{
+  INTERNAL_BSTR bstr;
+  BSTR str = GetBSTR(&bstr);
+
+  bstr.dwLen = 0;
+  ok (SysStringLen(str) == 0, "Expected dwLen 0, got %d\n", SysStringLen(str));
+  bstr.dwLen = 2;
+  ok (SysStringLen(str) == 1, "Expected dwLen 1, got %d\n", SysStringLen(str));
+}
+
+static void test_SysStringByteLen()
+{
+  INTERNAL_BSTR bstr;
+  BSTR str = GetBSTR(&bstr);
+
+  bstr.dwLen = 0;
+  ok (SysStringByteLen(str) == 0, "Expected dwLen 0, got %d\n", SysStringLen(str));
+  bstr.dwLen = 2;
+  ok (SysStringByteLen(str) == 2, "Expected dwLen 2, got %d\n", SysStringByteLen(str));
+}
+
+static void test_SysAllocString()
+{
+  const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
+  BSTR str;
+
+  str = SysAllocString(NULL);
+  ok (str == NULL, "Expected NULL, got %p\n", str);
+
+  str = SysAllocString(szTest);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr = Get(str);
+
+    ok (bstr->dwLen == 8, "Expected 8, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szTest), "String different\n");
+    SysFreeString(str);
+  }
+}
+
+static void test_SysAllocStringLen()
+{
+  const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
+  BSTR str;
+
+  str = SysAllocStringLen(szTest, 0x80000000);
+  todo_wine {
+  ok (str == NULL, "Expected NULL, got %p\n", str);
+  }
+  
+  str = SysAllocStringLen(NULL, 0);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr = Get(str);
+
+    ok (bstr->dwLen == 0, "Expected 0, got %ld\n", bstr->dwLen);
+    ok (!bstr->szString[0], "String not empty\n");
+    SysFreeString(str);
+  }
+
+  str = SysAllocStringLen(szTest, 4);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr = Get(str);
+
+    ok (bstr->dwLen == 8, "Expected 8, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szTest), "String different\n");
+    SysFreeString(str);
+  }
+}
+
+static void test_SysAllocStringByteLen()
+{
+  const OLECHAR szTest[10] = { 'T','e','s','t','\0' };
+  const CHAR szTestA[6] = { 'T','e','s','t','\0','?' };
+  BSTR str;
+
+  str = SysAllocStringByteLen(szTestA, 0x80000000);
+  ok (str == NULL, "Expected NULL, got %p\n", str);
+
+  str = SysAllocStringByteLen(NULL, 0);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr = Get(str);
+
+    ok (bstr->dwLen == 0, "Expected 0, got %ld\n", bstr->dwLen);
+    ok (!bstr->szString[0], "String not empty\n");
+    SysFreeString(str);
+  }
+
+  str = SysAllocStringByteLen(szTestA, 4);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr = Get(str);
+
+    ok (bstr->dwLen == 4, "Expected 4, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpA((LPCSTR)bstr->szString, szTestA), "String different\n");
+    SysFreeString(str);
+  }
+
+  /* Odd lengths are allocated rounded up, but truncated at the right position */
+  str = SysAllocStringByteLen(szTestA, 3);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    const CHAR szTestTruncA[4] = { 'T','e','s','\0' };
+    LPINTERNAL_BSTR bstr = Get(str);
+
+    ok (bstr->dwLen == 3, "Expected 3, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpA((LPCSTR)bstr->szString, szTestTruncA), "String different\n");
+    SysFreeString(str);
+  }
+
+  str = SysAllocStringByteLen((LPCSTR)szTest, 8);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr = Get(str);
+
+    ok (bstr->dwLen == 8, "Expected 8, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szTest), "String different\n");
+    SysFreeString(str);
+  }
+}
+
+static void test_SysReAllocString()
+{
+  const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
+  const OLECHAR szSmaller[2] = { 'x','\0' };
+  const OLECHAR szLarger[7] = { 'L','a','r','g','e','r','\0' };
+  BSTR str;
+
+  str = SysAllocStringLen(szTest, 4);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr;
+    BSTR oldstr = str;
+    int changed;
+
+    bstr = Get(str);
+    ok (bstr->dwLen == 8, "Expected 8, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szTest), "String different\n");
+
+    changed = SysReAllocString(&str, szSmaller);
+    ok (changed == 1, "Expected 1, got %d\n", changed);
+    ok (str == oldstr, "Created new string\n");
+    bstr = Get(str);
+    ok (bstr->dwLen == 2, "Expected 2, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n");
+
+    oldstr = str;
+    changed = SysReAllocString(&str, szLarger);
+    ok (changed == 1, "Expected 1, got %d\n", changed);
+    /* Early versions always make new strings rather than resizing */
+    /* ok (str == oldstr, "Created new string\n"); */
+    bstr = Get(str);
+    ok (bstr->dwLen == 12, "Expected 12, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szLarger), "String different\n");
+
+    SysFreeString(str);
+  }
+}
+
+static void test_SysReAllocStringLen()
+{
+  const OLECHAR szTest[5] = { 'T','e','s','t','\0' };
+  const OLECHAR szSmaller[2] = { 'x','\0' };
+  const OLECHAR szLarger[7] = { 'L','a','r','g','e','r','\0' };
+  BSTR str;
+
+  str = SysAllocStringLen(szTest, 4);
+  ok (str != NULL, "Expected non-NULL\n");
+  if (str)
+  {
+    LPINTERNAL_BSTR bstr;
+    BSTR oldstr = str;
+    int changed;
+
+    bstr = Get(str);
+    ok (bstr->dwLen == 8, "Expected 8, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szTest), "String different\n");
+
+    changed = SysReAllocStringLen(&str, szSmaller, 1);
+    ok (changed == 1, "Expected 1, got %d\n", changed);
+    ok (str == oldstr, "Created new string\n");
+    bstr = Get(str);
+    ok (bstr->dwLen == 2, "Expected 2, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n");
+
+    oldstr = str;
+    changed = SysReAllocStringLen(&str, szLarger, 6);
+    ok (changed == 1, "Expected 1, got %d\n", changed);
+    /* Early versions always make new strings rather than resizing */
+    /* ok (str == oldstr, "Created new string\n"); */
+    bstr = Get(str);
+    ok (bstr->dwLen == 12, "Expected 12, got %ld\n", bstr->dwLen);
+    ok (!lstrcmpW(bstr->szString, szLarger), "String different\n");
+
+    SysFreeString(str);
+  }
+}
+
+/* IUnknown */
+
+static void test_IUnknownClear(void)
+{
+  HRESULT hres;
+  VARIANTARG v;
+  DummyDispatch u = { &DummyDispatch_VTable, 1, VT_UI1, FALSE };
+  IUnknown* pu = (IUnknown*)&u;
+
+  /* Test that IUnknown_Release is called on by-value */
+  V_VT(&v) = VT_UNKNOWN;
+  V_UNKNOWN(&v) = (IUnknown*)&u;
+  hres = VariantClear(&v);
+  ok(hres == S_OK && u.ref == 0 && V_VT(&v) == VT_EMPTY,
+     "clear unknown: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 0, VT_EMPTY, hres, u.ref, V_VT(&v));
+
+  /* But not when clearing a by-reference*/
+  u.ref = 1;
+  V_VT(&v) = VT_UNKNOWN|VT_BYREF;
+  V_UNKNOWNREF(&v) = &pu;
+  hres = VariantClear(&v);
+  ok(hres == S_OK && u.ref == 1 && V_VT(&v) == VT_EMPTY,
+     "clear dispatch: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 1, VT_EMPTY, hres, u.ref, V_VT(&v));
+}
+
+static void test_IUnknownCopy(void)
+{
+  HRESULT hres;
+  VARIANTARG vSrc, vDst;
+  DummyDispatch u = { &DummyDispatch_VTable, 1, VT_UI1, FALSE };
+  IUnknown* pu = (IUnknown*)&u;
+
+  /* AddRef is called on by-value copy */
+  VariantInit(&vDst);
+  V_VT(&vSrc) = VT_UNKNOWN;
+  V_UNKNOWN(&vSrc) = pu;
+  hres = VariantCopy(&vDst, &vSrc);
+  ok(hres == S_OK && u.ref == 2 && V_VT(&vDst) == VT_UNKNOWN,
+     "copy unknown: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 2, VT_EMPTY, hres, u.ref, V_VT(&vDst));
+
+  /* AddRef is skipped on copy of by-reference IDispatch */
+  VariantInit(&vDst);
+  u.ref = 1;
+  V_VT(&vSrc) = VT_UNKNOWN|VT_BYREF;
+  V_UNKNOWNREF(&vSrc) = &pu;
+  hres = VariantCopy(&vDst, &vSrc);
+  ok(hres == S_OK && u.ref == 1 && V_VT(&vDst) == (VT_UNKNOWN|VT_BYREF),
+     "copy unknown: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 1, VT_DISPATCH, hres, u.ref, V_VT(&vDst));
+
+  /* AddRef is called copying by-reference IDispatch with indirection */
+  VariantInit(&vDst);
+  u.ref = 1;
+  V_VT(&vSrc) = VT_UNKNOWN|VT_BYREF;
+  V_UNKNOWNREF(&vSrc) = &pu;
+  hres = VariantCopyInd(&vDst, &vSrc);
+  ok(hres == S_OK && u.ref == 2 && V_VT(&vDst) == VT_UNKNOWN,
+     "copy unknown: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 2, VT_DISPATCH, hres, u.ref, V_VT(&vDst));
+
+  /* Indirection in place also calls AddRef */
+  u.ref = 1;
+  V_VT(&vSrc) = VT_UNKNOWN|VT_BYREF;
+  V_UNKNOWNREF(&vSrc) = &pu;
+  hres = VariantCopyInd(&vSrc, &vSrc);
+  ok(hres == S_OK && u.ref == 2 && V_VT(&vSrc) == VT_UNKNOWN,
+     "copy unknown: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 2, VT_DISPATCH, hres, u.ref, V_VT(&vSrc));
+}
+
+static void test_IUnknownChangeTypeEx(void)
+{
+  HRESULT hres;
+  VARIANTARG vSrc, vDst;
+  LCID lcid;
+  VARTYPE vt;
+  DummyDispatch u = { &DummyDispatch_VTable, 1, VT_UI1, FALSE };
+  IUnknown* pu = (IUnknown*)&u;
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  V_VT(&vSrc) = VT_UNKNOWN;
+  V_UNKNOWN(&vSrc) = pu;
+
+  /* =>IDispatch in place */
+  hres = VariantChangeTypeEx(&vSrc, &vSrc, lcid, 0, VT_DISPATCH);
+  ok(hres == S_OK && u.ref == 1 &&
+     V_VT(&vSrc) == VT_DISPATCH && V_DISPATCH(&vSrc) == (IDispatch*)pu,
+     "change unk(src=src): expected 0x%08lx,%d,%d,%p, got 0x%08lx,%ld,%d,%p\n",
+     S_OK, 1, VT_DISPATCH, pu, hres, u.ref, V_VT(&vSrc), V_DISPATCH(&vSrc));
+
+  /* =>IDispatch */
+  u.ref = 1;
+  V_VT(&vSrc) = VT_UNKNOWN;
+  V_UNKNOWN(&vSrc) = (IUnknown*)pu;
+  VariantInit(&vDst);
+  hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN);
+  /* Note vSrc is not cleared, as final refcount is 2 */
+  ok(hres == S_OK && u.ref == 2 &&
+     V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == (IUnknown*)pu,
+     "change unk(src,dst): expected 0x%08lx,%d,%d,%p, got 0x%08lx,%ld,%d,%p\n",
+     S_OK, 2, VT_UNKNOWN, pu, hres, u.ref, V_VT(&vDst), V_UNKNOWN(&vDst));
+
+  /* Can't change unknown to anything else */
+  for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
+  {
+    HRESULT hExpected = DISP_E_BADVARTYPE;
+
+    V_VT(&vSrc) = VT_UNKNOWN;
+    V_UNKNOWN(&vSrc) = (IUnknown*)pu;
+    VariantInit(&vDst);
+
+    if (vt == VT_UNKNOWN || vt == VT_DISPATCH || vt == VT_EMPTY || vt == VT_NULL)
+      hExpected = S_OK;
+    else
+    {
+      if (vt == VT_I8 || vt == VT_UI8)
+      {
+        if (HAVE_OLEAUT32_I8)
+          hExpected = DISP_E_TYPEMISMATCH;
+      }
+      else if (vt == VT_RECORD)
+      {
+        if (HAVE_OLEAUT32_RECORD)
+          hExpected = DISP_E_TYPEMISMATCH;
+      }
+      else if (vt  >= VT_I2 && vt <= VT_UINT && vt != (VARTYPE)15)
+        hExpected = DISP_E_TYPEMISMATCH;
+    }
+    hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt);
+    ok(hres == hExpected,
+       "change unk(badvar): vt %d expected 0x%08lx, got 0x%08lx\n",
+       vt, hExpected, hres);
+  }
+}
+
+/* IDispatch */
+static void test_IDispatchClear(void)
+{
+  HRESULT hres;
+  VARIANTARG v;
+  DummyDispatch d = { &DummyDispatch_VTable, 1, VT_UI1, FALSE };
+  IDispatch* pd = (IDispatch*)&d;
+
+  /* As per IUnknown */
+
+  V_VT(&v) = VT_DISPATCH;
+  V_DISPATCH(&v) = pd;
+  hres = VariantClear(&v);
+  ok(hres == S_OK && d.ref == 0 && V_VT(&v) == VT_EMPTY,
+     "clear dispatch: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 0, VT_EMPTY, hres, d.ref, V_VT(&v));
+
+  d.ref = 1;
+  V_VT(&v) = VT_DISPATCH|VT_BYREF;
+  V_DISPATCHREF(&v) = &pd;
+  hres = VariantClear(&v);
+  ok(hres == S_OK && d.ref == 1 && V_VT(&v) == VT_EMPTY,
+     "clear dispatch: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 1, VT_EMPTY, hres, d.ref, V_VT(&v));
+}
+
+static void test_IDispatchCopy(void)
+{
+  HRESULT hres;
+  VARIANTARG vSrc, vDst;
+  DummyDispatch d = { &DummyDispatch_VTable, 1, VT_UI1, FALSE };
+  IDispatch* pd = (IDispatch*)&d;
+
+  /* As per IUnknown */
+
+  VariantInit(&vDst);
+  V_VT(&vSrc) = VT_DISPATCH;
+  V_DISPATCH(&vSrc) = pd;
+  hres = VariantCopy(&vDst, &vSrc);
+  ok(hres == S_OK && d.ref == 2 && V_VT(&vDst) == VT_DISPATCH,
+     "copy dispatch: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 2, VT_EMPTY, hres, d.ref, V_VT(&vDst));
+
+  VariantInit(&vDst);
+  d.ref = 1;
+  V_VT(&vSrc) = VT_DISPATCH|VT_BYREF;
+  V_DISPATCHREF(&vSrc) = &pd;
+  hres = VariantCopy(&vDst, &vSrc);
+  ok(hres == S_OK && d.ref == 1 && V_VT(&vDst) == (VT_DISPATCH|VT_BYREF),
+     "copy dispatch: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 1, VT_DISPATCH, hres, d.ref, V_VT(&vDst));
+
+  VariantInit(&vDst);
+  d.ref = 1;
+  V_VT(&vSrc) = VT_DISPATCH|VT_BYREF;
+  V_DISPATCHREF(&vSrc) = &pd;
+  hres = VariantCopyInd(&vDst, &vSrc);
+  ok(hres == S_OK && d.ref == 2 && V_VT(&vDst) == VT_DISPATCH,
+     "copy dispatch: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 2, VT_DISPATCH, hres, d.ref, V_VT(&vDst));
+
+  d.ref = 1;
+  V_VT(&vSrc) = VT_DISPATCH|VT_BYREF;
+  V_DISPATCHREF(&vSrc) = &pd;
+  hres = VariantCopyInd(&vSrc, &vSrc);
+  ok(hres == S_OK && d.ref == 2 && V_VT(&vSrc) == VT_DISPATCH,
+     "copy dispatch: expected 0x%08lx, %d, %d, got 0x%08lx, %ld, %d\n",
+     S_OK, 2, VT_DISPATCH, hres, d.ref, V_VT(&vSrc));
+}
+
+static void test_IDispatchChangeTypeEx(void)
+{
+  HRESULT hres;
+  VARIANTARG vSrc, vDst;
+  LCID lcid;
+  DummyDispatch d = { &DummyDispatch_VTable, 1, VT_UI1, FALSE };
+  IDispatch* pd = (IDispatch*)&d;
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  V_VT(&vSrc) = VT_DISPATCH;
+  V_DISPATCH(&vSrc) = pd;
+
+  /* =>IUnknown in place */
+  hres = VariantChangeTypeEx(&vSrc, &vSrc, lcid, 0, VT_UNKNOWN);
+  ok(hres == S_OK && d.ref == 1 &&
+     V_VT(&vSrc) == VT_UNKNOWN && V_UNKNOWN(&vSrc) == (IUnknown*)pd,
+     "change disp(src=src): expected 0x%08lx,%d,%d,%p, got 0x%08lx,%ld,%d,%p\n",
+     S_OK, 1, VT_UNKNOWN, pd, hres, d.ref, V_VT(&vSrc), V_UNKNOWN(&vSrc));
+
+  /* =>IUnknown */
+  d.ref = 1;
+  V_VT(&vSrc) = VT_DISPATCH;
+  V_DISPATCH(&vSrc) = pd;
+  VariantInit(&vDst);
+  hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN);
+  /* Note vSrc is not cleared, as final refcount is 2 */
+  ok(hres == S_OK && d.ref == 2 &&
+     V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == (IUnknown*)pd,
+     "change disp(src,dst): expected 0x%08lx,%d,%d,%p, got 0x%08lx,%ld,%d,%p\n",
+     S_OK, 2, VT_UNKNOWN, pd, hres, d.ref, V_VT(&vDst), V_UNKNOWN(&vDst));
+
+  /* FIXME: Verify that VARIANT_NOVALUEPROP prevents conversion to integral
+   *        types. this requires that the xxxFromDisp tests work first.
+   */
+}
+
+/* VT_ERROR */
+static void test_ErrorChangeTypeEx(void)
+{
+  HRESULT hres;
+  VARIANTARG vSrc, vDst;
+  VARTYPE vt;
+  LCID lcid;
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
+  {
+    HRESULT hExpected = DISP_E_BADVARTYPE;
+
+    V_VT(&vSrc) = VT_ERROR;
+    V_ERROR(&vSrc) = 1;
+    VariantInit(&vDst);
+    hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt);
+
+    if (vt == VT_ERROR)
+      hExpected = S_OK;
+    else
+    {
+      if (vt == VT_I8 || vt == VT_UI8)
+      {
+        if (HAVE_OLEAUT32_I8)
+          hExpected = DISP_E_TYPEMISMATCH;
+      }
+      else if (vt == VT_RECORD)
+      {
+        if (HAVE_OLEAUT32_RECORD)
+          hExpected = DISP_E_TYPEMISMATCH;
+      }
+      else if (vt <= VT_UINT && vt != (VARTYPE)15)
+        hExpected = DISP_E_TYPEMISMATCH;
+    }
+
+    ok(hres == hExpected,
+     "change err: vt %d expected 0x%08lx, got 0x%08lx\n", vt, hExpected, hres);
+  }
+}
+
+/* VT_EMPTY */
+static void test_EmptyChangeTypeEx(void)
+{
+  HRESULT hres;
+  VARIANTARG vSrc, vDst;
+  VARTYPE vt;
+  LCID lcid;
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
+  {
+    HRESULT hExpected = DISP_E_BADVARTYPE;
+
+    VariantInit(&vSrc);
+    memset(&vDst, 0, sizeof(vDst));
+    V_VT(&vDst) = VT_EMPTY;
+
+    if (vt == VT_I8 || vt == VT_UI8)
+    {
+      if (HAVE_OLEAUT32_I8)
+        hExpected = S_OK;
+    }
+    else if (vt == VT_RECORD)
+    {
+      if (HAVE_OLEAUT32_RECORD)
+        hExpected = DISP_E_TYPEMISMATCH;
+    }
+    else if (vt == VT_VARIANT || vt == VT_DISPATCH ||
+              vt == VT_UNKNOWN || vt == VT_ERROR)
+    {
+      hExpected = DISP_E_TYPEMISMATCH;
+    }
+    else if (vt <= VT_UINT && vt != (VARTYPE)15)
+      hExpected = S_OK;
+
+    hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt);
+
+    ok(hres == hExpected && (hres != S_OK || V_VT(&vDst) == vt),
+       "change err: vt %d expected 0x%08lx, got 0x%08lx, vt %d\n",
+       vt, hExpected, hres, V_VT(&vDst));
+  }
+}
+
+/* VT_NULL */
+static void test_NullChangeTypeEx(void)
+{
+  HRESULT hres;
+  VARIANTARG vSrc, vDst;
+  VARTYPE vt;
+  LCID lcid;
+
+  lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);
+
+  for (vt = 0; vt <= VT_BSTR_BLOB; vt++)
+  {
+    HRESULT hExpected = DISP_E_BADVARTYPE;
+
+    VariantInit(&vSrc);
+    V_VT(&vSrc) = VT_NULL;
+    memset(&vDst, 0, sizeof(vDst));
+    V_VT(&vDst) = VT_EMPTY;
+
+    if (vt == VT_I8 || vt == VT_UI8)
+    {
+      if (HAVE_OLEAUT32_I8)
+        hExpected = DISP_E_TYPEMISMATCH;
+    }
+    else if (vt == VT_RECORD)
+    {
+      if (HAVE_OLEAUT32_RECORD)
+        hExpected = DISP_E_TYPEMISMATCH;
+    }
+    else if (vt == VT_NULL)
+    {
+      hExpected = S_OK;
+    }
+    else if (vt == VT_VARIANT || vt == VT_DISPATCH ||
+              vt == VT_UNKNOWN || vt == VT_ERROR ||
+              (vt <= VT_UINT && vt != (VARTYPE)15))
+      hExpected = DISP_E_TYPEMISMATCH;
+
+    hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt);
+
+    ok(hres == hExpected && (hres != S_OK || V_VT(&vDst) == vt),
+       "change null: vt %d expected 0x%08lx, got 0x%08lx, vt %d\n",
+       vt, hExpected, hres, V_VT(&vDst));
+  }
+}
+
+START_TEST(vartype)
+{
+  hOleaut32 = LoadLibraryA("oleaut32.dll");
+  ok(hOleaut32 != 0, "Failed to load oleaut32.dll\n");
+  if (!hOleaut32)
+    return;
+
+  test_VarI1FromI2();
+  test_VarI1FromI4();
+  test_VarI1FromI8();
+  test_VarI1FromUI1();
+  test_VarI1FromUI2();
+  test_VarI1FromUI4();
+  test_VarI1FromUI8();
+  test_VarI1FromBool();
+  test_VarI1FromR4();
+  test_VarI1FromR8();
+  test_VarI1FromDate();
+  test_VarI1FromCy();
+  test_VarI1FromDec();
+  test_VarI1FromStr();
+  test_VarUI1FromDisp();
+  test_VarI1Copy();
+  test_VarI1ChangeTypeEx();
+
+  test_VarUI1FromI1();
+  test_VarUI1FromI2();
+  test_VarUI1FromI4();
+  test_VarUI1FromI8();
+  test_VarUI1FromUI2();
+  test_VarUI1FromUI4();
+  test_VarUI1FromUI8();
+  test_VarUI1FromBool();
+  test_VarUI1FromR4();
+  test_VarUI1FromR8();
+  test_VarUI1FromDate();
+  test_VarUI1FromCy();
+  test_VarUI1FromDec();
+  test_VarUI1FromStr();
+  test_VarUI1Copy();
+  test_VarUI1ChangeTypeEx();
+
+  test_VarI2FromI1();
+  test_VarI2FromI4();
+  test_VarI2FromI8();
+  test_VarI2FromUI1();
+  test_VarI2FromUI2();
+  test_VarI2FromUI4();
+  test_VarI2FromUI8();
+  test_VarI2FromBool();
+  test_VarI2FromR4();
+  test_VarI2FromR8();
+  test_VarI2FromDate();
+  test_VarI2FromCy();
+  test_VarI2FromDec();
+  test_VarI2FromStr();
+  test_VarI2Copy();
+  test_VarI2ChangeTypeEx();
+
+  test_VarUI2FromI1();
+  test_VarUI2FromI2();
+  test_VarUI2FromI4();
+  test_VarUI2FromI8();
+  test_VarUI2FromUI1();
+  test_VarUI2FromUI4();
+  test_VarUI2FromUI8();
+  test_VarUI2FromBool();
+  test_VarUI2FromR4();
+  test_VarUI2FromR8();
+  test_VarUI2FromDate();
+  test_VarUI2FromCy();
+  test_VarUI2FromDec();
+  test_VarUI2FromStr();
+  test_VarUI2Copy();
+  test_VarUI2ChangeTypeEx();
+
+  test_VarI4FromI1();
+  test_VarI4FromI2();
+  test_VarI4FromI8();
+  test_VarI4FromUI1();
+  test_VarI4FromUI2();
+  test_VarI4FromUI4();
+  test_VarI4FromUI8();
+  test_VarI4FromBool();
+  test_VarI4FromR4();
+  test_VarI4FromR8();
+  test_VarI4FromDate();
+  test_VarI4FromCy();
+  test_VarI4FromDec();
+  test_VarI4FromStr();
+  test_VarI4Copy();
+  test_VarI4ChangeTypeEx();
+
+  test_VarUI4FromI1();
+  test_VarUI4FromI2();
+  test_VarUI4FromUI2();
+  test_VarUI4FromI8();
+  test_VarUI4FromUI1();
+  test_VarUI4FromI4();
+  test_VarUI4FromUI8();
+  test_VarUI4FromBool();
+  test_VarUI4FromR4();
+  test_VarUI4FromR8();
+  test_VarUI4FromDate();
+  test_VarUI4FromCy();
+  test_VarUI4FromDec();
+  test_VarUI4FromStr();
+  test_VarUI4Copy();
+  test_VarUI4ChangeTypeEx();
+
+  test_VarI8FromI1();
+  test_VarI8FromUI1();
+  test_VarI8FromI2();
+  test_VarI8FromUI2();
+  test_VarI8FromUI4();
+  test_VarI8FromR4();
+  test_VarI8FromR8();
+  test_VarI8FromBool();
+  test_VarI8FromUI8();
+  test_VarI8FromCy();
+  test_VarI8FromDec();
+  test_VarI8FromDate();
+  test_VarI8FromStr();
+  test_VarI8Copy();
+  test_VarI8ChangeTypeEx();
+
+  test_VarUI8FromI1();
+  test_VarUI8FromUI1();
+  test_VarUI8FromI2();
+  test_VarUI8FromUI2();
+  test_VarUI8FromUI4();
+  test_VarUI8FromR4();
+  test_VarUI8FromR8();
+  test_VarUI8FromBool();
+  test_VarUI8FromI8();
+  test_VarUI8FromCy();
+  test_VarUI8FromDec();
+  test_VarUI8FromDate();
+  test_VarUI8FromStr();
+  test_VarUI8Copy();
+  test_VarUI8ChangeTypeEx();
+
+  test_VarR4FromI1();
+  test_VarR4FromUI1();
+  test_VarR4FromI2();
+  test_VarR4FromUI2();
+  test_VarR4FromI4();
+  test_VarR4FromUI4();
+  test_VarR4FromR8();
+  test_VarR4FromBool();
+  test_VarR4FromCy();
+  test_VarR4FromI8();
+  test_VarR4FromUI8();
+  test_VarR4FromDec();
+  test_VarR4FromDate();
+  test_VarR4FromStr();
+  test_VarR4Copy();
+  test_VarR4ChangeTypeEx();
+
+  test_VarR8FromI1();
+  test_VarR8FromUI1();
+  test_VarR8FromI2();
+  test_VarR8FromUI2();
+  test_VarR8FromI4();
+  test_VarR8FromUI4();
+  test_VarR8FromR4();
+  test_VarR8FromBool();
+  test_VarR8FromCy();
+  test_VarR8FromI8();
+  test_VarR8FromUI8();
+  test_VarR8FromDec();
+  test_VarR8FromDate();
+  test_VarR8FromStr();
+  test_VarR8Copy();
+  test_VarR8ChangeTypeEx();
+  test_VarR8Round();
+
+  test_VarDateFromI1();
+  test_VarDateFromUI1();
+  test_VarDateFromI2();
+  test_VarDateFromUI2();
+  test_VarDateFromI4();
+  test_VarDateFromUI4();
+  test_VarDateFromR4();
+  test_VarDateFromR8();
+  test_VarDateFromBool();
+  test_VarDateFromCy();
+  test_VarDateFromI8();
+  test_VarDateFromUI8();
+  test_VarDateFromDec();
+  test_VarDateFromStr();
+  test_VarDateCopy();
+  test_VarDateChangeTypeEx();
+
+  test_VarCyFromI1();
+  test_VarCyFromUI1();
+  test_VarCyFromI2();
+  test_VarCyFromUI2();
+  test_VarCyFromI4();
+  test_VarCyFromUI4();
+  test_VarCyFromR4();
+  test_VarCyFromR8();
+  test_VarCyFromBool();
+  test_VarCyFromI8();
+  test_VarCyFromUI8();
+  test_VarCyFromDec();
+  test_VarCyFromDate();
+
+  test_VarCyAdd();
+  test_VarCyMul();
+  test_VarCySub();
+  test_VarCyAbs();
+  test_VarCyNeg();
+  test_VarCyMulI4();
+  test_VarCyMulI8();
+  test_VarCyCmp();
+  test_VarCyCmpR8();
+  test_VarCyRound();
+  test_VarCyFix();
+  test_VarCyInt();
+
+  test_VarDecFromI1();
+  test_VarDecFromI2();
+  test_VarDecFromI4();
+  test_VarDecFromI8();
+  test_VarDecFromUI1();
+  test_VarDecFromUI2();
+  test_VarDecFromUI4();
+  test_VarDecFromUI8();
+  test_VarDecFromR4();
+  test_VarDecFromR8();
+  test_VarDecFromDate();
+  test_VarDecFromStr();
+  test_VarDecFromCy();
+  test_VarDecFromDate();
+  test_VarDecFromBool();
+
+  test_VarDecAbs();
+  test_VarDecNeg();
+  test_VarDecAdd();
+  test_VarDecSub();
+  test_VarDecCmp();
+
+  test_VarBoolFromI1();
+  test_VarBoolFromUI1();
+  test_VarBoolFromI2();
+  test_VarBoolFromUI2();
+  test_VarBoolFromI4();
+  test_VarBoolFromUI4();
+  test_VarBoolFromR4();
+  test_VarBoolFromR8();
+  test_VarBoolFromCy();
+  test_VarBoolFromI8();
+  test_VarBoolFromUI8();
+  test_VarBoolFromDec();
+  test_VarBoolFromDate();
+  test_VarBoolFromStr();
+  test_VarBoolCopy();
+  test_VarBoolChangeTypeEx();
+
+  test_VarBstrFromR4();
+  test_VarBstrFromDate();
+  test_SysStringLen();
+  test_SysStringByteLen();
+  test_SysAllocString();
+  test_SysAllocStringLen();
+  test_SysAllocStringByteLen();
+  test_SysReAllocString();
+  test_SysReAllocStringLen();
+
+  test_IUnknownClear();
+  test_IUnknownCopy();
+  test_IUnknownChangeTypeEx();
+
+  test_IDispatchClear();
+  test_IDispatchCopy();
+  test_IDispatchChangeTypeEx();
+
+  test_ErrorChangeTypeEx();
+  test_EmptyChangeTypeEx();
+  test_NullChangeTypeEx();
+}
--- wine/dlls/oleaut32/variant.c	2003-12-10 18:14:00.000000000 +0000
+++ wine-develop/dlls/oleaut32/variant.c	2003-12-10 18:14:05.000000000 +0000
@@ -518,13 +518,6 @@
     break;
 
   case VT_RECORD:
-    switch (vtFrom)
-    {
-    case VT_EMPTY:
-        V_UNION(pd,brecVal).pvRecord = NULL;
-        V_UNION(pd,brecVal).pRecInfo = NULL;
-        return S_OK;
-    }
     break;
 
   }

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux