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

oleaut32: Add support of VT_USERDEFINED arguments with default value in AddFuncDesc.

This commit is contained in:
Piotr Caban 2013-04-09 12:13:13 +02:00 committed by Alexandre Julliard
parent fc456a3fea
commit 3f7c07f560
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/oleaut32/tests/typelib.c
View File

@ -2048,8 +2048,10 @@ static void test_CreateTypeLib(void) {
elemdesc[0].tdesc.vt = VT_USERDEFINED; elemdesc[0].tdesc.vt = VT_USERDEFINED;
U(elemdesc[0].tdesc).hreftype = hreftype; U(elemdesc[0].tdesc).hreftype = hreftype;
U(elemdesc[0]).paramdesc.pparamdescex = NULL; U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex;
U(elemdesc[0]).paramdesc.wParamFlags = 0; U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT;
V_VT(&paramdescex.varDefaultValue) = VT_INT;
V_INT(&paramdescex.varDefaultValue) = 0x789;
funcdesc.lprgelemdescParam = elemdesc; funcdesc.lprgelemdescParam = elemdesc;
funcdesc.invkind = INVOKE_FUNC; funcdesc.invkind = INVOKE_FUNC;
@ -2077,10 +2079,15 @@ static void test_CreateTypeLib(void) {
ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags);
edesc = pfuncdesc->lprgelemdescParam; edesc = pfuncdesc->lprgelemdescParam;
ok(U(*edesc).paramdesc.pparamdescex == NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex); ok(U(*edesc).paramdesc.pparamdescex != NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex);
ok(U(*edesc).paramdesc.wParamFlags == 0, "got: 0x%x\n", U(*edesc).paramdesc.wParamFlags); ok(U(*edesc).paramdesc.wParamFlags == PARAMFLAG_FHASDEFAULT,
"got: 0x%x\n", U(*edesc).paramdesc.wParamFlags);
ok(edesc->tdesc.vt == VT_USERDEFINED, "got: %d\n", edesc->tdesc.vt); ok(edesc->tdesc.vt == VT_USERDEFINED, "got: %d\n", edesc->tdesc.vt);
ok(U(edesc->tdesc).hreftype == hreftype, "got: 0x%x\n", U(edesc->tdesc).hreftype); ok(U(edesc->tdesc).hreftype == hreftype, "got: 0x%x\n", U(edesc->tdesc).hreftype);
ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_INT, "got: %d\n",
V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue));
ok(V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == 0x789, "got: %d\n",
V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue));
ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc);

2
dlls/oleaut32/typelib2.c
View File

@ -886,7 +886,7 @@ static HRESULT ctl2_encode_variant(
arg_type = VT_UI4; arg_type = VT_UI4;
v = *value; v = *value;
if(arg_type == VT_VARIANT) { if(arg_type==VT_VARIANT || arg_type==VT_USERDEFINED) {
arg_type = V_VT(value); arg_type = V_VT(value);
}else if(V_VT(value) != arg_type) { }else if(V_VT(value) != arg_type) {
hres = VariantChangeType(&v, value, 0, arg_type); hres = VariantChangeType(&v, value, 0, arg_type);