ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Map INT and UINT typedesc's to VT_I4 and VT_UI4.

This commit is contained in:
Vincent Povirk 2009-08-19 12:38:15 -05:00 committed by Alexandre Julliard
parent 2ae20e45c7
commit 3e542bc60e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/oleaut32/tests/tmarshal.c
View File

@ -1324,7 +1324,7 @@ todo_wine
dispparams.rgdispidNamedArgs = NULL; dispparams.rgdispidNamedArgs = NULL;
hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_INT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_INT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, ITypeInfo_Invoke); 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)); ok(V_I4(&varresult) == -13, "got %x\n", V_I4(&varresult));
VariantClear(&varresult); VariantClear(&varresult);
@ -1335,7 +1335,7 @@ todo_wine
dispparams.rgdispidNamedArgs = NULL; dispparams.rgdispidNamedArgs = NULL;
hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_UINT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_UINT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, ITypeInfo_Invoke); 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)); ok(V_UI4(&varresult) == 42, "got %x\n", V_UI4(&varresult));
VariantClear(&varresult); VariantClear(&varresult);

6
dlls/oleaut32/typelib.c
View File

@ -5874,6 +5874,12 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
*vt |= VT_ARRAY; *vt |= VT_ARRAY;
hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt); hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt);
break; break;
case VT_INT:
*vt |= VT_I4;
break;
case VT_UINT:
*vt |= VT_UI4;
break;
default: default:
*vt |= tdesc->vt; *vt |= tdesc->vt;
break; break;