André Hentschel : oledb32: Fix variant to integer conversion.
Alexandre Julliard
julliard at winehq.org
Fri May 28 09:43:10 CDT 2010
Module: wine
Branch: master
Commit: fd5e732a3910948d50e919c09c6b133e608fecb0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5e732a3910948d50e919c09c6b133e608fecb0
Author: André Hentschel <nerv at dawncrow.de>
Date: Thu May 27 20:39:26 2010 +0200
oledb32: Fix variant to integer conversion.
---
dlls/oledb32/convert.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index c9206ba..f6f72d0 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -213,6 +213,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
case DBTYPE_I2:
{
signed short *d = dst;
+ VARIANT tmp;
switch(src_type)
{
case DBTYPE_EMPTY: *d = 0; hr = S_OK; break;
@@ -231,7 +232,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
case DBTYPE_UI4: hr = VarI2FromUI4(*(DWORD*)src, d); break;
case DBTYPE_I8: hr = VarI2FromI8(*(LONGLONG*)src, d); break;
case DBTYPE_UI8: hr = VarI2FromUI8(*(ULONGLONG*)src, d); break;
- case DBTYPE_VARIANT: *d = V_I2((VARIANT*)src); hr = S_OK; break;
+ case DBTYPE_VARIANT:
+ VariantInit(&tmp);
+ if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_I2)) == S_OK)
+ *d = V_I2(&tmp);
+ break;
default: FIXME("Unimplemented conversion %04x -> I2\n", src_type); return E_NOTIMPL;
}
break;
@@ -240,6 +245,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
case DBTYPE_I4:
{
signed int *d = dst;
+ VARIANT tmp;
switch(src_type)
{
case DBTYPE_EMPTY: *d = 0; hr = S_OK; break;
@@ -258,7 +264,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
case DBTYPE_UI4: hr = VarI4FromUI4(*(DWORD*)src, d); break;
case DBTYPE_I8: hr = VarI4FromI8(*(LONGLONG*)src, d); break;
case DBTYPE_UI8: hr = VarI4FromUI8(*(ULONGLONG*)src, d); break;
- case DBTYPE_VARIANT: *d = V_I4((VARIANT*)src); hr = S_OK; break;
+ case DBTYPE_VARIANT:
+ VariantInit(&tmp);
+ if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_I4)) == S_OK)
+ *d = V_I4(&tmp);
+ break;
default: FIXME("Unimplemented conversion %04x -> I4\n", src_type); return E_NOTIMPL;
}
break;
More information about the wine-cvs
mailing list