September 2008 - Wine-Commits

Jacek Caban : jscript: Added expression statement implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: eb0bb55de28c5aa3183a3696d8e2823f0828de94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0bb55de28c5aa3183a3696d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:21:55 2008 +0200 jscript: Added expression statement implementation. --- dlls/jscript/dispex.c | 35 ++++++++++++++++++++ dlls/jscript/engine.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/engine.h | 19 ++++++++++- dlls/jscript/jscript.h | 1 + 4 files changed, 134 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 270e172..f279655 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -837,3 +837,38 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS return hres; } + +HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +{ + DISPPARAMS dp = {NULL,NULL,0,0}; + IDispatchEx *dispex; + DispatchEx *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + prop = get_prop(jsdisp, id); + if(prop) + hres = prop_get(jsdisp, prop, lcid, &dp, val, ei, caller); + else + hres = DISP_E_MEMBERNOTFOUND; + + IDispatchEx_Release(_IDispatchEx_(jsdisp)); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + ULONG err = 0; + + TRACE("uding IDispatch\n"); + return IDispatchEx_Invoke(dispex, id, &IID_NULL, lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); + } + + hres = IDispatchEx_InvokeEx(dispex, id, lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, caller); + IDispatchEx_Release(dispex); + + return hres; +} diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ef66c97..72f723d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -23,11 +23,69 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +#define EXPR_NOVAL 0x0001 +#define EXPR_NEWREF 0x0002 +#define EXPR_STRREF 0x0004 + static inline HRESULT stat_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { return stat->eval(ctx, stat, rt, ret); } +static inline HRESULT expr_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + return _expr->eval(ctx, _expr, flags, ei, ret); +} + +static void exprval_release(exprval_t *val) +{ + switch(val->type) { + case EXPRVAL_VARIANT: + VariantClear(&val->u.var); + return; + case EXPRVAL_IDREF: + if(val->u.idref.disp) + IDispatch_Release(val->u.idref.disp); + return; + case EXPRVAL_NAMEREF: + if(val->u.nameref.disp) + IDispatch_Release(val->u.nameref.disp); + SysFreeString(val->u.nameref.name); + } +} + +/* ECMA-262 3rd Edition 8.7.1 */ +static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, VARIANT *ret) +{ + V_VT(ret) = VT_EMPTY; + + switch(val->type) { + case EXPRVAL_VARIANT: + return VariantCopy(ret, &val->u.var); + case EXPRVAL_IDREF: + if(!val->u.idref.disp) { + FIXME("throw ReferenceError\n"); + return E_FAIL; + } + + return disp_propget(val->u.idref.disp, val->u.idref.id, ctx->lcid, ret, ei, NULL/*FIXME*/); + default: + ERR("type %d\n", val->type); + return E_FAIL; + } +} + +static HRESULT exprval_to_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, VARIANT *ret) +{ + if(val->type == EXPRVAL_VARIANT) { + *ret = val->u.var; + V_VT(&val->u.var) = VT_EMPTY; + return S_OK; + } + + return exprval_value(ctx, val, ei, ret); +} + HRESULT create_exec_ctx(exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -112,6 +170,7 @@ HRESULT var_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt return E_NOTIMPL; } +/* ECMA-262 3rd Edition 12.3 */ HRESULT empty_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { TRACE("\n"); @@ -120,10 +179,28 @@ HRESULT empty_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t * return S_OK; } -HRESULT expression_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.4 */ +HRESULT expression_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + expression_statement_t *stat = (expression_statement_t*)_stat; + exprval_t exprval; + VARIANT val; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, stat->expr, EXPR_NOVAL, &rt->ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + *ret = val; + TRACE("= %s\n", debugstr_variant(ret)); + return S_OK; } HRESULT if_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6e91178..c8dcfba 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -215,7 +215,24 @@ HRESULT switch_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT throw_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); HRESULT try_statement_eval(exec_ctx_t*,statement_t*,return_type_t*,VARIANT*); -typedef struct exprval_t exprval_t; +typedef struct { + enum { + EXPRVAL_VARIANT, + EXPRVAL_IDREF, + EXPRVAL_NAMEREF + } type; + union { + VARIANT var; + struct { + IDispatch *disp; + DISPID id; + } idref; + struct { + IDispatch *disp; + BSTR name; + } nameref; + } u; +} exprval_t; typedef HRESULT (*expression_eval_t)(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b676198..a8cfad2 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -87,6 +87,7 @@ struct DispatchEx { HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,DispatchEx*,DispatchEx**); HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); struct _script_ctx_t { LONG ref;

1 0

Jacek Caban : jscript: Added DeleteMemberByName implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 68326a391de3f22f13048f6c973398340825800f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68326a391de3f22f13048f6c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:21:14 2008 +0200 jscript: Added DeleteMemberByName implementation. --- dlls/jscript/dispex.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 206a963..0d8bbe1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -575,8 +575,26 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); - return E_NOTIMPL; + dispex_prop_t *prop; + HRESULT hres; + + TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + + if(grfdex & ~(fdexNameCaseSensitive|fdexNameEnsure|fdexNameImplicit)) + FIXME("Unsupported grfdex %x\n", grfdex); + + hres = find_prop_name(This, bstrName, &prop); + if(FAILED(hres)) + return hres; + if(!prop) { + TRACE("not found\n"); + return S_OK; + } + + heap_free(prop->name); + prop->name = NULL; + prop->type = PROP_DELETED; + return S_OK; } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id)

1 0

Jacek Caban : jscript: Added GetNextDispID implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 11d9a49b0a58cef37badf9e65fb8b3b0197a1317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d9a49b0a58cef37badf9e65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:20:52 2008 +0200 jscript: Added GetNextDispID implementation. --- dlls/jscript/dispex.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 439a766..206a963 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -62,6 +62,21 @@ static inline dispex_prop_t *get_prop(DispatchEx *This, DISPID id) return This->props+id; } +static DWORD get_flags(DispatchEx *This, dispex_prop_t *prop) +{ + if(prop->type == PROP_PROTREF) { + dispex_prop_t *parent = get_prop(This->prototype, prop->u.ref); + if(!parent) { + prop->type = PROP_DELETED; + return 0; + } + + return get_flags(This->prototype, parent); + } + + return prop->flags; +} + static const builtin_prop_t *find_builtin_prop(DispatchEx *This, const WCHAR *name) { int min = 0, max, i, r; @@ -347,6 +362,30 @@ static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, LCID lcid, DISPPA return S_OK; } +static HRESULT fill_protrefs(DispatchEx *This) +{ + dispex_prop_t *iter, *prop; + HRESULT hres; + + if(!This->prototype) + return S_OK; + + fill_protrefs(This->prototype); + + for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { + hres = find_prop_name(This, iter->name, &prop); + if(FAILED(hres)) + return hres; + if(!prop) { + prop = alloc_protref(This, iter->name, iter - This->prototype->props); + if(!prop) + return E_OUTOFMEMORY; + } + } + + return S_OK; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -564,8 +603,33 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - return E_NOTIMPL; + dispex_prop_t *iter; + HRESULT hres; + + TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + + if(id == DISPID_STARTENUM) { + hres = fill_protrefs(This); + if(FAILED(hres)) + return hres; + } + + iter = get_prop(This, id+1); + if(!iter) { + *pid = DISPID_STARTENUM; + return S_FALSE; + } + + while(iter < This->props + This->prop_cnt) { + if(iter->name && (get_flags(This, iter) & PROPF_ENUM)) { + *pid = prop_to_id(This, iter); + return S_OK; + } + iter++; + } + + *pid = DISPID_STARTENUM; + return S_FALSE; } static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk)

1 0

Juan Lang : crypt32: Implement CryptVerifyDetachedMessageSignature.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: cb5385e326fda459892eff0ee3e1bd30d2a0889c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5385e326fda459892eff0ee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:47:37 2008 -0700 crypt32: Implement CryptVerifyDetachedMessageSignature. --- dlls/crypt32/message.c | 130 +++++++++++++++++++++++++++++++----------- dlls/crypt32/tests/message.c | 10 --- 2 files changed, 97 insertions(+), 43 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index ee7c5ba..2eb210c 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -60,39 +60,6 @@ LONG WINAPI CryptGetMessageSignerCount(DWORD dwMsgEncodingType, return count; } -BOOL WINAPI CryptVerifyDetachedMessageSignature( - PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, - const BYTE *pbDetachedSignBlob, DWORD cbDetachedSignBlob, DWORD cToBeSigned, - const BYTE *rgpbToBeSigned[], DWORD rgcbToBeSigned[], - PCCERT_CONTEXT *ppSignerCert) -{ - FIXME("(%p, %d, %p, %d, %d, %p, %p, %p): stub\n", pVerifyPara, dwSignerIndex, - pbDetachedSignBlob, cbDetachedSignBlob, cToBeSigned, rgpbToBeSigned, - rgcbToBeSigned, ppSignerCert); - return FALSE; -} - -static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const void *src, - DWORD len) -{ - BOOL ret = TRUE; - - if (!pvData) - *pcbData = len; - else if (*pcbData < len) - { - *pcbData = len; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } - else - { - *pcbData = len; - memcpy(pvData, src, len); - } - return ret; -} - static CERT_INFO *CRYPT_GetSignerCertInfoFromMsg(HCRYPTMSG msg, DWORD dwSignerIndex) { @@ -136,6 +103,103 @@ static inline PCCERT_CONTEXT CRYPT_GetSignerCertificate(HCRYPTMSG msg, pVerifyPara->dwMsgAndCertEncodingType, certInfo, store); } +BOOL WINAPI CryptVerifyDetachedMessageSignature( + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbDetachedSignBlob, DWORD cbDetachedSignBlob, DWORD cToBeSigned, + const BYTE *rgpbToBeSigned[], DWORD rgcbToBeSigned[], + PCCERT_CONTEXT *ppSignerCert) +{ + BOOL ret = FALSE; + HCRYPTMSG msg; + + TRACE("(%p, %d, %p, %d, %d, %p, %p, %p)\n", pVerifyPara, dwSignerIndex, + pbDetachedSignBlob, cbDetachedSignBlob, cToBeSigned, rgpbToBeSigned, + rgcbToBeSigned, ppSignerCert); + + if (ppSignerCert) + *ppSignerCert = NULL; + if (!pVerifyPara || + pVerifyPara->cbSize != sizeof(CRYPT_VERIFY_MESSAGE_PARA) || + GET_CMSG_ENCODING_TYPE(pVerifyPara->dwMsgAndCertEncodingType) != + PKCS_7_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + + msg = CryptMsgOpenToDecode(pVerifyPara->dwMsgAndCertEncodingType, + CMSG_DETACHED_FLAG, 0, pVerifyPara->hCryptProv, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, pbDetachedSignBlob, cbDetachedSignBlob, TRUE); + if (ret) + { + DWORD i; + + for (i = 0; ret && i < cToBeSigned; i++) + ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i], + i == cToBeSigned - 1 ? TRUE : FALSE); + } + if (ret) + { + CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, + dwSignerIndex); + + ret = FALSE; + if (certInfo) + { + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MSG, + pVerifyPara->dwMsgAndCertEncodingType, + pVerifyPara->hCryptProv, 0, msg); + + if (store) + { + PCCERT_CONTEXT cert = CRYPT_GetSignerCertificate( + msg, pVerifyPara, certInfo, store); + + if (cert) + { + ret = CryptMsgControl(msg, 0, + CMSG_CTRL_VERIFY_SIGNATURE, cert->pCertInfo); + if (ret && ppSignerCert) + *ppSignerCert = cert; + else + CertFreeCertificateContext(cert); + } + else + SetLastError(CRYPT_E_NOT_FOUND); + CertCloseStore(store, 0); + } + CryptMemFree(certInfo); + } + } + CryptMsgClose(msg); + } + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const void *src, + DWORD len) +{ + BOOL ret = TRUE; + + if (!pvData) + *pcbData = len; + else if (*pcbData < len) + { + *pcbData = len; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbData = len; + memcpy(pvData, src, len); + } + return ret; +} + BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index a6dde76..28f9a4e 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -335,34 +335,29 @@ static void test_verify_detached_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(NULL, 0, NULL, 0, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, NULL, 0, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); para.cbSize = sizeof(para); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, NULL, 0, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); para.dwMsgAndCertEncodingType = X509_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, NULL, 0, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); para.dwMsgAndCertEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, NULL, 0, 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* None of these messages contains a cert in the message itself, so the @@ -377,13 +372,11 @@ static void test_verify_detached_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, signedContent, sizeof(signedContent), 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -391,14 +384,12 @@ static void test_verify_detached_message_signature(void) cbContent = sizeof(msgData); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 1, &pContent, &cbContent, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); /* Passing the correct callback results in success */ para.pfnGetSignerCertificate = msg_get_signer_callback; ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 1, &pContent, &cbContent, NULL); - todo_wine ok(ret, "CryptVerifyDetachedMessageSignature failed: %08x\n", GetLastError()); /* Not passing the correct data to be signed results in the signature not @@ -407,7 +398,6 @@ static void test_verify_detached_message_signature(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageSignature(&para, 0, detachedSignedContent, sizeof(detachedSignedContent), 0, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, "expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); }

1 0

Jacek Caban : jscript: Added InvokeEx implementation.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 61734cd94517f05a179e9ec639e6e8d363eb91cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=61734cd94517f05a179e9ec63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 9 01:20:26 2008 +0200 jscript: Added InvokeEx implementation. --- dlls/jscript/dispex.c | 284 ++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/jscript.h | 3 + dlls/jscript/jscript_main.c | 2 + dlls/jscript/jsutils.c | 22 ++++ 4 files changed, 309 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61734cd94517f05a179e9…

1 0

Juan Lang : crypt32: Simplify CryptVerifyMessageSignature.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 8c0e089d682f41c0c8b2d3d8dd26bb8297b45dd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0e089d682f41c0c8b2d3d8d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:58:25 2008 -0700 crypt32: Simplify CryptVerifyMessageSignature. --- dlls/crypt32/message.c | 48 +++++++----------------------------------------- 1 files changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 2eb210c..7551cce 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -80,6 +80,8 @@ static CERT_INFO *CRYPT_GetSignerCertInfoFromMsg(HCRYPTMSG msg, } } } + else + SetLastError(CRYPT_E_UNEXPECTED_MSG_TYPE); return certInfo; } @@ -179,34 +181,11 @@ BOOL WINAPI CryptVerifyDetachedMessageSignature( return ret; } -static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const void *src, - DWORD len) -{ - BOOL ret = TRUE; - - if (!pvData) - *pcbData = len; - else if (*pcbData < len) - { - *pcbData = len; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } - else - { - *pcbData = len; - memcpy(pvData, src, len); - } - return ret; -} - BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) { BOOL ret = FALSE; - DWORD size; - CRYPT_CONTENT_INFO *contentInfo; HCRYPTMSG msg; TRACE("(%p, %d, %p, %d, %p, %p, %p)\n", @@ -226,26 +205,14 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, return FALSE; } - if (!CryptDecodeObjectEx(pVerifyPara->dwMsgAndCertEncodingType, - PKCS_CONTENT_INFO, pbSignedBlob, cbSignedBlob, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (LPBYTE)&contentInfo, &size)) - return FALSE; - if (strcmp(contentInfo->pszObjId, szOID_RSA_signedData)) - { - LocalFree(contentInfo); - SetLastError(CRYPT_E_UNEXPECTED_MSG_TYPE); - return FALSE; - } - msg = CryptMsgOpenToDecode(pVerifyPara->dwMsgAndCertEncodingType, 0, - CMSG_SIGNED, pVerifyPara->hCryptProv, NULL, NULL); + msg = CryptMsgOpenToDecode(pVerifyPara->dwMsgAndCertEncodingType, 0, 0, + pVerifyPara->hCryptProv, NULL, NULL); if (msg) { - ret = CryptMsgUpdate(msg, contentInfo->Content.pbData, - contentInfo->Content.cbData, TRUE); + ret = CryptMsgUpdate(msg, pbSignedBlob, cbSignedBlob, TRUE); if (ret && pcbDecoded) - ret = CRYPT_CopyParam(pbDecoded, pcbDecoded, - contentInfo->Content.pbData, contentInfo->Content.cbData); + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbDecoded, + pcbDecoded); if (ret) { CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, @@ -279,7 +246,6 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, } CryptMsgClose(msg); } - LocalFree(contentInfo); TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Add tests for CryptVerifyDetachedMessageSignature.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 9e6b32139ddd995a979faab6d7d7a144bd8639fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6b32139ddd995a979faab6d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:46:47 2008 -0700 crypt32: Add tests for CryptVerifyDetachedMessageSignature. --- dlls/crypt32/tests/message.c | 169 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 147 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e6b32139ddd995a979fa…

1 0

Juan Lang : crypt32: Add stub for CryptVerifyDetachedMessageSignature.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 814451a4201ad4a99c53ade86a05bac48e21b74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=814451a4201ad4a99c53ade86… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:46:24 2008 -0700 crypt32: Add stub for CryptVerifyDetachedMessageSignature. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/message.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 8beff93..c820612 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -186,7 +186,7 @@ @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr) @ stdcall CryptVerifyDetachedMessageHash(ptr ptr long long ptr ptr ptr ptr) -@ stub CryptVerifyDetachedMessageSignature +@ stdcall CryptVerifyDetachedMessageSignature(ptr long ptr long long ptr ptr ptr) @ stdcall CryptVerifyMessageHash(ptr ptr long ptr ptr ptr ptr) @ stdcall CryptVerifyMessageSignature(ptr long ptr long ptr ptr ptr) @ stub CryptVerifyMessageSignatureWithKey diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index b419866..ee7c5ba 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -60,6 +60,18 @@ LONG WINAPI CryptGetMessageSignerCount(DWORD dwMsgEncodingType, return count; } +BOOL WINAPI CryptVerifyDetachedMessageSignature( + PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, DWORD dwSignerIndex, + const BYTE *pbDetachedSignBlob, DWORD cbDetachedSignBlob, DWORD cToBeSigned, + const BYTE *rgpbToBeSigned[], DWORD rgcbToBeSigned[], + PCCERT_CONTEXT *ppSignerCert) +{ + FIXME("(%p, %d, %p, %d, %d, %p, %p, %p): stub\n", pVerifyPara, dwSignerIndex, + pbDetachedSignBlob, cbDetachedSignBlob, cToBeSigned, rgpbToBeSigned, + rgcbToBeSigned, ppSignerCert); + return FALSE; +} + static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const void *src, DWORD len) {

1 0

Juan Lang : crypt32: Don' t crash when asked to verify a signature before the content has been finalized .
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: b7d26dc9f55e0f5bb1211d2c8f9ce0fea898221b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d26dc9f55e0f5bb1211d2c8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:45:40 2008 -0700 crypt32: Don't crash when asked to verify a signature before the content has been finalized. --- dlls/crypt32/msg.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 54c5bb0..8312ff9 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2554,6 +2554,11 @@ static BOOL CDecodeSignedMsg_VerifySignature(CDecodeMsg *msg, PCERT_INFO info) BOOL ret = FALSE; DWORD i; + if (!msg->u.signed_data.signerHandles) + { + SetLastError(NTE_BAD_SIGNATURE); + return FALSE; + } for (i = 0; !ret && i < msg->u.signed_data.info->cSignerInfo; i++) { PCMSG_CMS_SIGNER_INFO signerInfo = @@ -2596,6 +2601,8 @@ static BOOL CDecodeSignedMsg_VerifySignatureEx(CDecodeMsg *msg, SetLastError(ERROR_INVALID_PARAMETER); else if (para->dwSignerIndex >= msg->u.signed_data.info->cSignerInfo) SetLastError(CRYPT_E_SIGNER_NOT_FOUND); + else if (!msg->u.signed_data.signerHandles) + SetLastError(NTE_BAD_SIGNATURE); else { switch (para->dwSignerType)

1 0

Juan Lang : crypt32: Test verifying the signature of a detached signed message.
by Alexandre Julliard Sept. 9, 2008

Sept. 9, 2008

Module: wine Branch: master Commit: 32466b3a83bb88ba4b91a3af23dce5e9a5a8fa93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32466b3a83bb88ba4b91a3af2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:46:04 2008 -0700 crypt32: Test verifying the signature of a detached signed message. --- dlls/crypt32/tests/msg.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 2783815..b03f5a4 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2841,6 +2841,37 @@ static void test_msg_control(void) ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); CryptMsgClose(msg); + + /* Test verifying signature of a detached signed message */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, 0, 0, + NULL, NULL); + ret = CryptMsgUpdate(msg, detachedSignedContent, + sizeof(detachedSignedContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + /* Can't verify the sig without having updated the data */ + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + "expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + /* Now that the signature's been checked, can't do the final update */ + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, + "expected NTE_BAD_HASH_STATE, got %08x\n", GetLastError()); + CryptMsgClose(msg); + /* Updating with the detached portion of the message and the data of the + * the message allows the sig to be verified. + */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, 0, 0, + NULL, NULL); + ret = CryptMsgUpdate(msg, detachedSignedContent, + sizeof(detachedSignedContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); + ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); + CryptMsgClose(msg); } /* win9x has much less parameter checks and will crash on many tests

1 0