Vincent Povirk : oleaut32: Map INT and UINT typedesc's to VT_I4 and VT_UI4.
Alexandre Julliard
julliard at winehq.org
Thu Aug 20 12:58:54 CDT 2009
Module: wine
Branch: master
Commit: 3e542bc60e2a77b7b134887666487277b9fe0b86
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e542bc60e2a77b7b134887666487277b9fe0b86
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Wed Aug 19 12:38:15 2009 -0500
oleaut32: Map INT and UINT typedesc's to VT_I4 and VT_UI4.
---
dlls/oleaut32/tests/tmarshal.c | 4 ++--
dlls/oleaut32/typelib.c | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index 0467e16..f79fbc6 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -1324,7 +1324,7 @@ todo_wine
dispparams.rgdispidNamedArgs = NULL;
hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_INT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, ITypeInfo_Invoke);
- todo_wine ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult));
+ ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult));
ok(V_I4(&varresult) == -13, "got %x\n", V_I4(&varresult));
VariantClear(&varresult);
@@ -1335,7 +1335,7 @@ todo_wine
dispparams.rgdispidNamedArgs = NULL;
hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_UINT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, ITypeInfo_Invoke);
- todo_wine ok(V_VT(&varresult) == VT_UI4, "got %x\n", V_VT(&varresult));
+ ok(V_VT(&varresult) == VT_UI4, "got %x\n", V_VT(&varresult));
ok(V_UI4(&varresult) == 42, "got %x\n", V_UI4(&varresult));
VariantClear(&varresult);
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index f16b459..e87095b 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5874,6 +5874,12 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
*vt |= VT_ARRAY;
hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt);
break;
+ case VT_INT:
+ *vt |= VT_I4;
+ break;
+ case VT_UINT:
+ *vt |= VT_UI4;
+ break;
default:
*vt |= tdesc->vt;
break;
More information about the wine-cvs
mailing list