From dcca45c4803406220b2d6375193f84ec9c473c80 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Wed, 19 Aug 2009 12:38:15 -0500 Subject: [PATCH] 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 5b90d4d..742ee7e 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1404,7 +1404,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); @@ -1415,7 +1415,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; -- 1.5.4.3