August 2010 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Correct CryptVerifyMessageSignature' s use of pcbDecoded.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 78c901586193d20092e992a460f00f4070c67ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c901586193d20092e992a46… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 20 16:26:35 2010 -0700 crypt32: Correct CryptVerifyMessageSignature's use of pcbDecoded. --- dlls/crypt32/message.c | 17 ++++++++++++++--- dlls/crypt32/tests/message.c | 1 - 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 779959a..f06af0e 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -210,9 +210,6 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, if (msg) { ret = CryptMsgUpdate(msg, pbSignedBlob, cbSignedBlob, TRUE); - if (ret && pcbDecoded) - ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbDecoded, - pcbDecoded); if (ret) { CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, @@ -244,6 +241,20 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, } CryptMemFree(certInfo); } + if (ret) + { + /* The caller is expected to pass a valid pointer to pcbDecoded + * when the message verifies successfully. + */ + if (pcbDecoded) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbDecoded, + pcbDecoded); + else + { + SetLastError(CRYPT_E_NOT_FOUND); + ret = FALSE; + } + } CryptMsgClose(msg); } if(!ret && pcbDecoded) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index b18e78c..26b8030 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -580,7 +580,6 @@ static void test_verify_message_signature(void) ret = CryptVerifyMessageSignature(&para, 0, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), NULL, 0, NULL); - todo_wine ok(!ret, "Expected failure\n"); /* Finally, a message signed with a valid public key verifies successfully */

1 0

Andrew Eikum : oleaut32: Properly mask size from funcdesc typedata.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 471475ec28885c8cc160b41a575466ae205676b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=471475ec28885c8cc160b41a5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 20 14:59:09 2010 -0500 oleaut32: Properly mask size from funcdesc typedata. The high word of a funcdesc's typedata[0] is used for other data and needs to be masked out. --- dlls/oleaut32/typelib2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index ef43cab..84c51a2 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2293,7 +2293,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( if (*((INT*)namedata) == -1) *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; - len = iter->u.data[0]/4 - iter->u.data[5]*3; + len = (iter->u.data[0]&0xFFFF)/4 - iter->u.data[5]*3; for (i = 1; i < cNames; i++) { offset = ctl2_alloc_name(This->typelib, rgszNames[i]); @@ -3327,7 +3327,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation( if (iter->indice == memid) { if (iter->type == CyclicListFunc) { const int *typedata = iter->u.data; - int size = typedata[0] - typedata[5]*(typedata[4]&0x1000?16:12); + int size = (typedata[0]&0xFFFF) - typedata[5]*(typedata[4]&0x1000?16:12); nameoffset = iter->name; /* FIXME implement this once SetFuncDocString is implemented */

1 0

Andrew Eikum : oleaut32: Improve MEMBERID assignment in ICreateTypeInfo:: LayOut.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 3788a080cf5b0f5e67cc5da9ff31510b96700162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3788a080cf5b0f5e67cc5da9f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 20 14:59:17 2010 -0500 oleaut32: Improve MEMBERID assignment in ICreateTypeInfo::LayOut. --- dlls/oleaut32/typelib2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 84c51a2..77f072a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2638,13 +2638,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { if(iter == iter2) continue; if(iter2->indice == iter->indice) { - iter->indice = 0x5fffffff + This->typeinfo->cElement + i + (This->typeinfo->datatype2<<16); + iter->indice = 0x60000000 + This->typeinfo->cElement + (This->typeinfo->datatype2<<16); for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) { if(iter == iter2) continue; if(iter2->indice == iter->indice) { - HeapFree(GetProcessHeap(), 0, typedata); - return E_ACCESSDENIED; + ++iter->indice; + iter2 = This->typedata->next; } }

1 0

Juan Lang : crypt32/tests: Test pcbDecoded parameter to CryptVerifyMessageSignature more thoroughly.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: faa917b567ea891ec81e8a536d089b0d88da5d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa917b567ea891ec81e8a536… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 20 16:21:44 2010 -0700 crypt32/tests: Test pcbDecoded parameter to CryptVerifyMessageSignature more thoroughly. --- dlls/crypt32/tests/message.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index fa8df0e..b18e78c 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -453,6 +453,34 @@ static const BYTE signedWithCertWithPubKeyContent[] = { 0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20, 0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48, 0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x00 }; +static const BYTE signedWithCertWithValidPubKeyContent[] = { +0x30,0x82,0x01,0x89,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02, +0xa0,0x82,0x01,0x7a,0x30,0x82,0x01,0x76,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c, +0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x13,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x06,0x04,0x04,0x01, +0x02,0x03,0x04,0xa0,0x81,0xd2,0x30,0x81,0xcf,0x02,0x01,0x01,0x30,0x02,0x06, +0x00,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a, +0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36, +0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f, +0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a, +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x30,0x5c,0x30,0x0d,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x4b,0x00,0x30,0x48, +0x02,0x41,0x00,0xe2,0x54,0x3a,0xa7,0x83,0xb1,0x27,0x14,0x3e,0x59,0xbb,0xb4, +0x53,0xe6,0x1f,0xe7,0x5d,0xf1,0x21,0x68,0xad,0x85,0x53,0xdb,0x6b,0x1e,0xeb, +0x65,0x97,0x03,0x86,0x60,0xde,0xf3,0x6c,0x38,0x75,0xe0,0x4c,0x61,0xbb,0xbc, +0x62,0x17,0xa9,0xcd,0x79,0x3f,0x21,0x4e,0x96,0xcb,0x0e,0xdc,0x61,0x94,0x30, +0x18,0x10,0x6b,0xd0,0x1c,0x10,0x79,0x02,0x03,0x01,0x00,0x01,0xa3,0x16,0x30, +0x14,0x30,0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06, +0x01,0x01,0xff,0x02,0x01,0x01,0x31,0x77,0x30,0x75,0x02,0x01,0x01,0x30,0x1a, +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08, +0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05, +0x00,0x04,0x40,0x81,0xa6,0x70,0xb3,0xef,0x59,0xd1,0x66,0xd1,0x9b,0xc0,0x9a, +0xb6,0x9a,0x5e,0x6d,0x6f,0x6d,0x0d,0x59,0xa9,0xaa,0x6e,0xe9,0x2c,0xa0,0x1e, +0xee,0xc2,0x60,0xbc,0x59,0xbe,0x3f,0x63,0x06,0x8d,0xc9,0x11,0x1d,0x23,0x64, +0x92,0xef,0x2e,0xfc,0x57,0x29,0xa4,0xaf,0xe0,0xee,0x93,0x19,0x39,0x51,0xe4, +0x44,0xb8,0x0b,0x28,0xf4,0xa8,0x0d }; static void test_verify_message_signature(void) { @@ -460,11 +488,17 @@ static void test_verify_message_signature(void) CRYPT_VERIFY_MESSAGE_PARA para = { 0 }; PCCERT_CONTEXT cert; DWORD cbDecoded; + BYTE decoded[sizeof(msgData)]; SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(NULL, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* Is cbDecoded set when invalid parameters are passed? */ + cbDecoded = 0xdeadbeef; + ret = CryptVerifyMessageSignature(NULL, 0, NULL, 0, NULL, &cbDecoded, + NULL); + ok(cbDecoded == 0, "expected 0, got %08x\n", cbDecoded); SetLastError(0xdeadbeef); ret = CryptVerifyMessageSignature(&para, 0, NULL, 0, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, @@ -542,6 +576,35 @@ static void test_verify_message_signature(void) ret = CryptVerifyMessageSignature(&para, 0, signedWithCertWithPubKeyContent, sizeof(signedWithCertWithPubKeyContent), NULL, 0, NULL); ok(!ret, "Expected failure\n"); + /* Apparently, an output pcbDecoded parameter is expected. */ + ret = CryptVerifyMessageSignature(&para, 0, + signedWithCertWithValidPubKeyContent, + sizeof(signedWithCertWithValidPubKeyContent), NULL, 0, NULL); + todo_wine + ok(!ret, "Expected failure\n"); + /* Finally, a message signed with a valid public key verifies successfully + */ + cbDecoded = 0xdeadbeef; + ret = CryptVerifyMessageSignature(&para, 0, + signedWithCertWithValidPubKeyContent, + sizeof(signedWithCertWithValidPubKeyContent), NULL, &cbDecoded, NULL); + ok(ret, "CryptVerifyMessageSignature failed: %08x\n", GetLastError()); + ok(cbDecoded == sizeof(msgData), "expected 4, got %d\n", cbDecoded); + cbDecoded = 0; + ret = CryptVerifyMessageSignature(&para, 0, + signedWithCertWithValidPubKeyContent, + sizeof(signedWithCertWithValidPubKeyContent), NULL, &cbDecoded, NULL); + /* Setting cbDecoded to 0 succeeds when a NULL buffer is provided */ + ok(ret, "CryptVerifyMessageSignature failed: %08x\n", GetLastError()); + ok(cbDecoded == sizeof(msgData), "expected 4, got %d\n", cbDecoded); + cbDecoded = 0; + ret = CryptVerifyMessageSignature(&para, 0, + signedWithCertWithValidPubKeyContent, + sizeof(signedWithCertWithValidPubKeyContent), decoded, &cbDecoded, NULL); + /* When a non-NULL buffer is provided, cbDecoded must not be too small */ + ok(!ret && GetLastError() == ERROR_MORE_DATA, + "expected ERROR_MORE_DATA, got %d (%08x)\n", GetLastError(), + GetLastError()); } static const BYTE detachedHashBlob[] = {

1 0

Andrew Eikum : oleaut32: Implement ITypeInfo2::GetFuncDesc.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 6868fe86437b2cb8aa269732a86a6b942509f32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6868fe86437b2cb8aa269732a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 20 14:59:25 2010 -0500 oleaut32: Implement ITypeInfo2::GetFuncDesc. --- dlls/oleaut32/tests/typelib.c | 189 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib2.c | 122 ++++++++++++++++++++++++++- 2 files changed, 307 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6868fe86437b2cb8aa269…

1 0

Andrew Eikum : oleaut32: Implement decoding for complex typedescs.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: b85cb1b865c6004f672c483133b7bbc349cd85d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85cb1b865c6004f672c48313… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 20 14:59:33 2010 -0500 oleaut32: Implement decoding for complex typedescs. --- dlls/oleaut32/tests/typelib.c | 99 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib2.c | 56 ++++++++++++++++++++++- 2 files changed, 151 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a201550..e801160 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1380,12 +1380,68 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo2_GetFuncDesc(ti2, 4, &pfuncdesc); + ok(hres == S_OK, "got %08x\n", hres); + + ok(pfuncdesc->memid == 0x60010004, "got %x\n", pfuncdesc->memid); + ok(pfuncdesc->lprgscode == NULL, "got %p\n", pfuncdesc->lprgscode); + ok(pfuncdesc->lprgelemdescParam != NULL, "got %p\n", pfuncdesc->lprgelemdescParam); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got 0x%x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); + ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); + ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); + todo_wine ok(pfuncdesc->oVft == 28 || + broken(pfuncdesc->oVft == 40) /* xp64 */, + "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); + ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); + ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); + + edesc = pfuncdesc->lprgelemdescParam; + ok(edesc->tdesc.vt == VT_PTR, "got: %d\n", edesc->tdesc.vt); + ok(edesc->paramdesc.wParamFlags == PARAMFLAG_FIN, "got: 0x%x\n", edesc->paramdesc.wParamFlags); + ok(edesc->paramdesc.pparamdescex == NULL, "got: %p\n", edesc->paramdesc.pparamdescex); + ok(U(edesc->tdesc).lptdesc != NULL, "got: %p\n", U(edesc->tdesc).lptdesc); + ok(U(edesc->tdesc).lptdesc->vt == VT_BSTR, "got: %d\n", U(edesc->tdesc).lptdesc->vt); + + ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + U(elemdesc[0].tdesc).lptdesc = &typedesc2; typedesc2.vt = VT_PTR; U(typedesc2).lptdesc = &typedesc1; hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo2_GetFuncDesc(ti2, 4, &pfuncdesc); + ok(hres == S_OK, "got %08x\n", hres); + + ok(pfuncdesc->memid == 0x60010007, "got %x\n", pfuncdesc->memid); + ok(pfuncdesc->lprgscode == NULL, "got %p\n", pfuncdesc->lprgscode); + ok(pfuncdesc->lprgelemdescParam != NULL, "got %p\n", pfuncdesc->lprgelemdescParam); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got 0x%x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); + ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); + ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); + todo_wine ok(pfuncdesc->oVft == 28 || + broken(pfuncdesc->oVft == 40) /* xp64 */, + "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); + ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); + ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); + + edesc = pfuncdesc->lprgelemdescParam; + ok(edesc->tdesc.vt == VT_PTR, "got: %d\n", edesc->tdesc.vt); + ok(edesc->paramdesc.wParamFlags == PARAMFLAG_FIN, "got: 0x%x\n", edesc->paramdesc.wParamFlags); + ok(edesc->paramdesc.pparamdescex == NULL, "got: %p\n", edesc->paramdesc.pparamdescex); + ok(U(edesc->tdesc).lptdesc != NULL, "got: %p\n", U(edesc->tdesc).lptdesc); + ok(U(edesc->tdesc).lptdesc->vt == VT_PTR, "got: %d\n", U(edesc->tdesc).lptdesc->vt); + ok(U(edesc->tdesc).lptdesc->lptdesc != NULL, "got: %p\n", U(edesc->tdesc).lptdesc->lptdesc); + ok(U(edesc->tdesc).lptdesc->lptdesc->vt == VT_BSTR, "got: %d\n", U(edesc->tdesc).lptdesc->lptdesc->vt); + + ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + elemdesc[0].tdesc.vt = VT_INT; U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; @@ -1531,6 +1587,45 @@ static void test_CreateTypeLib(void) { ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + elemdesc[0].tdesc.vt = VT_USERDEFINED; + elemdesc[0].tdesc.hreftype = hreftype; + U(elemdesc[0]).paramdesc.pparamdescex = NULL; + U(elemdesc[0]).paramdesc.wParamFlags = 0; + + funcdesc.lprgelemdescParam = elemdesc; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 1; + funcdesc.elemdescFunc.tdesc.vt = VT_VOID; + + hres = ICreateTypeInfo_AddFuncDesc(createti, 5, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo2_GetFuncDesc(ti2, 5, &pfuncdesc); + ok(hres == S_OK, "got %08x\n", hres); + + ok(pfuncdesc->memid == 0x60010005, "got %x\n", pfuncdesc->memid); + ok(pfuncdesc->lprgscode == NULL, "got %p\n", pfuncdesc->lprgscode); + ok(pfuncdesc->lprgelemdescParam != NULL, "got %p\n", pfuncdesc->lprgelemdescParam); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got 0x%x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); + ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); + ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); + todo_wine ok(pfuncdesc->oVft == 32 || + broken(pfuncdesc->oVft == 44), /* xp64 */ + "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); + ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); + ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); + + edesc = pfuncdesc->lprgelemdescParam; + ok(edesc->paramdesc.pparamdescex == NULL, "got: %p\n", edesc->paramdesc.pparamdescex); + ok(edesc->paramdesc.wParamFlags == 0, "got: 0x%x\n", edesc->paramdesc.wParamFlags); + ok(edesc->tdesc.vt == VT_USERDEFINED, "got: %d\n", edesc->tdesc.vt); + ok(edesc->tdesc.hreftype == hreftype, "got: 0x%x\n", edesc->tdesc.hreftype); + + ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + hres = ITypeInfo_GetDocumentation(interface1, 0, &name, &docstring, &helpcontext, &helpfile); ok(hres == S_OK, "got %08x\n", hres); ok(name == NULL, "name != NULL\n"); @@ -1840,10 +1935,10 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); - ok(typeattr->cFuncs == 11, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cFuncs == 12, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); - ok(typeattr->cbSizeVft == 56 || broken(typeattr->cbSizeVft == 3 * sizeof(void *) + 44), /* xp64 */ + ok(typeattr->cbSizeVft == 60 || broken(typeattr->cbSizeVft == 3 * sizeof(void *) + 48), /* xp64 */ "cbSizeVft = %d\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); ok(typeattr->wTypeFlags == 0, "wTypeFlags = %d\n", typeattr->wTypeFlags); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 90cee43..eccc72b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1324,14 +1324,66 @@ static HRESULT ctl2_decode_typedesc( int encoded_tdesc, /* [I] The encoded type description. */ TYPEDESC *tdesc) /* [O] The decoded type description. */ { + int *typedata, i; + HRESULT hres; + if (encoded_tdesc & 0x80000000) { tdesc->vt = encoded_tdesc & VT_TYPEMASK; tdesc->u.lptdesc = NULL; return S_OK; } - FIXME("unable to decode typedesc: %08x\n", encoded_tdesc); - return E_NOTIMPL; + typedata = (void *)&This->typelib_segment_data[MSFT_SEG_TYPEDESC][encoded_tdesc]; + + tdesc->vt = typedata[0] & 0xFFFF; + + switch(tdesc->vt) { + case VT_PTR: + case VT_SAFEARRAY: + tdesc->u.lptdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TYPEDESC)); + if (!tdesc->u.lptdesc) + return E_OUTOFMEMORY; + + hres = ctl2_decode_typedesc(This, typedata[1], tdesc->u.lptdesc); + if (FAILED(hres)) { + HeapFree(GetProcessHeap(), 0, tdesc->u.lptdesc); + return hres; + } + + return S_OK; + + case VT_CARRAY: { + int arrayoffset, *arraydata, num_dims; + + arrayoffset = typedata[1]; + arraydata = (void *)&This->typelib_segment_data[MSFT_SEG_ARRAYDESC][arrayoffset]; + num_dims = arraydata[1] & 0xFFFF; + + tdesc->u.lpadesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(ARRAYDESC) + sizeof(SAFEARRAYBOUND) * (num_dims - 1)); + if (!tdesc->u.lpadesc) + return E_OUTOFMEMORY; + + hres = ctl2_decode_typedesc(This, arraydata[0], &tdesc->u.lpadesc->tdescElem); + if (FAILED(hres)) { + HeapFree(GetProcessHeap(), 0, tdesc->u.lpadesc); + return E_OUTOFMEMORY; + } + + for (i = 0; i < num_dims; ++i) { + tdesc->u.lpadesc->rgbounds[i].cElements = arraydata[2 + i * 2]; + tdesc->u.lpadesc->rgbounds[i].lLbound = arraydata[3 + i * 2]; + } + + return S_OK; + } + case VT_USERDEFINED: + tdesc->u.hreftype = typedata[1]; + return S_OK; + default: + FIXME("unable to decode typedesc (%08x): unknown VT: %d\n", encoded_tdesc, tdesc->vt); + return E_NOTIMPL; + } } /****************************************************************************

1 0

Andrew Eikum : oleaut32: Improve ITypeInfo::ReleaseTypeAttr.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 7fcea36a82444e317cd627ab24fb18f5a81a1868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcea36a82444e317cd627ab2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 20 14:59:01 2010 -0500 oleaut32: Improve ITypeInfo::ReleaseTypeAttr. --- dlls/oleaut32/typelib2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 71fd434..ef43cab 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3564,6 +3564,9 @@ static void WINAPI ITypeInfo2_fnReleaseTypeAttr( { TRACE("(%p,%p)\n", iface, pTypeAttr); + if (pTypeAttr->tdescAlias.vt != VT_USERDEFINED) + release_typedesc(pTypeAttr->tdescAlias.u.lptdesc); + HeapFree(GetProcessHeap(), 0, pTypeAttr); }

1 0

Marko Nikolic : appwiz.cpl: Removed sign comparison warning.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: bd6bc3dd048c477537eb3565afd23121fe428b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6bc3dd048c477537eb3565a… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Aug 20 18:04:55 2010 +0200 appwiz.cpl: Removed sign comparison warning. --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index ffd2b24..1b3370b 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -406,7 +406,7 @@ static void UpdateButtons(HWND hWnd) { APPINFO *iter; LVITEMW lvItem; - DWORD selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, + LRESULT selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, LVNI_FOCUSED | LVNI_SELECTED); BOOL enable_modify = FALSE;

1 0

Thomas Mullaly : urlmon/tests: Fixed bug where tests might succeed before the function is implemented.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 3775219a31bc662b046b02d97a6c3b5ebc9f9151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3775219a31bc662b046b02d97… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Aug 19 23:49:24 2010 -0400 urlmon/tests: Fixed bug where tests might succeed before the function is implemented. --- dlls/urlmon/tests/uri.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index fb105f7..994b6d4 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5364,14 +5364,16 @@ static void test_IUriBuilder_GetFragment(IUriBuilder *builder, const uri_builder "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", hr, (expected ? S_OK : S_FALSE), test_index); } - todo_wine { - ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", - expected, wine_dbgstr_w(received), test_index); - } - todo_wine { - ok(lstrlen(expected) == len, - "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", - lstrlen(expected), len, test_index); + if(SUCCEEDED(hr)) { + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } } } else { ok(hr == (expected ? S_OK : S_FALSE), @@ -5429,12 +5431,14 @@ static void test_IUriBuilder_GetFragment(IUriBuilder *builder, const uri_builder "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", hr, S_FALSE, test_index); } - todo_wine { - ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); - } - todo_wine { - ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", - len, test_index); + if(SUCCEEDED(hr)) { + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } } } SysFreeString(expected);

1 0

Alexandre Julliard : winetest: Include the build info also in the standard build.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 9188bd647bf979d0ec90436e1b270e21bf756324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9188bd647bf979d0ec90436e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 21 17:19:48 2010 +0200 winetest: Include the build info also in the standard build. --- .gitignore | 1 + programs/winetest/Makefile.in | 17 ++++++++++------- programs/winetest/dist.rc | 22 ---------------------- tools/make_makefiles | 1 + 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 4e0346f..16a436b 100644 --- a/.gitignore +++ b/.gitignore @@ -258,6 +258,7 @@ programs/winedbg/debug.yy.c programs/winedbg/winedbg.man programs/winetest/*_test.exe programs/winetest/*_test.rc +programs/winetest/build.nfo programs/winetest/build.rc programs/winhlp32/macro.lex.yy.c programs/wscript/ihost.h diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index ab11876..11f720d 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -24,13 +24,16 @@ EXTRA_OBJS = $(TESTRCS:.rc=.res) @MAKE_PROG_RULES@ -(a)ALL_WINETEST_DEPENDS@ - clean:: - $(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS) + $(RM) build.nfo winetest-dist.exe $(TESTBINS) $(TESTRCS) build.rc: dummy - build="STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) + build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) + +build.nfo: + -$(CC) -v 2>$@ + +build.res: build.nfo # Rules for building distributable executable @@ -38,8 +41,8 @@ build.rc: dummy dist: winetest-dist.exe$(DLLEXT) -winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) +winetest-dist.exe$(DLLEXT): winetest.exe$(DLLEXT) + cp winetest.exe$(DLLEXT) $@ -upx -9 -qqq $@ -dist.res: build.nfo +(a)ALL_WINETEST_DEPENDS@ diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc deleted file mode 100644 index 6e3ac6c..0000000 --- a/programs/winetest/dist.rc +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Resources for the binary we distribute to testers - * - * Copyright 2004 Ferenc Wagner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* @makedep: build.nfo */ -BUILD_INFO STRINGRES "build.nfo" diff --git a/tools/make_makefiles b/tools/make_makefiles index 83d7836..bc52c49 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -96,6 +96,7 @@ my @ignores = ( "include/stamp-h", "programs/winetest/*_test.exe", "programs/winetest/*_test.rc", + "programs/winetest/build.nfo", "programs/winetest/build.rc", "tools/makedep", );

1 0