wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Austin Lund : comctl32/tests: Fix ImageList tests for different device color depths.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 23b00490c081f476f124e1857a07c4fc5f709ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b00490c081f476f124e1857… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Oct 15 12:35:18 2010 +1000 comctl32/tests: Fix ImageList tests for different device color depths. --- dlls/comctl32/tests/imagelist.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index c5ea95f..bbb7d85 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1209,6 +1209,7 @@ static void test_ImageList_DrawIndirect(void) int iImage = -1, iAlphaImage = -1, iTransparentImage = -1; UINT32 *bits = 0; UINT32 maskBits = 0x00000000, inverseMaskBits = 0xFFFFFFFF; + int bpp, broken_value; BITMAPINFO bitmapInfo = {{sizeof(BITMAPINFOHEADER), 2, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0}}; @@ -1217,6 +1218,7 @@ static void test_ImageList_DrawIndirect(void) ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); if (!hdcDst) return; + bpp = GetDeviceCaps(hdcDst, BITSPIXEL); hbmMask = CreateBitmap(2, 1, 1, 1, &maskBits); ok(hbmMask != 0, "CreateBitmap failed\n"); @@ -1265,19 +1267,22 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_NORMAL, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_TRANSPARENT, 0x00ABCDEF, __LINE__); todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, 0x00D4D9DD, __LINE__); - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, 0x00B4BDC4, __LINE__); + if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; + else broken_value = 0x00B4BDC4; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_MASK, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_IMAGE, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iImage, ILD_PRESERVEALPHA, 0x00ABCDEF, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0x00D3E5F7, __LINE__); - todo_wine - { - check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, 0x009DA8B1, __LINE__); - check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, 0x008C99A3, __LINE__); - } + if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; + else broken_value = 0x009DA8B1; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); + if (bpp == 16 || bpp == 24) broken_value = 0x00D4D9DD; + else broken_value = 0x008C99A3; + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0x00E8F1FA, broken_value, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0x00D3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0x00D3E5F7, __LINE__); todo_wine check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_PRESERVEALPHA, 0x005D6F81, __LINE__);

1 0

Piotr Caban : jscript: Added more safety options flags handling to create_activex_object.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: f793d2cf049b38d81addc3fdc91cf6dcb3e8f776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f793d2cf049b38d81addc3fdc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 14 23:55:38 2010 +0200 jscript: Added more safety options flags handling to create_activex_object. --- dlls/jscript/activex.c | 49 ++++++++++++++++++--------------- dlls/jscript/tests/activex.c | 62 +++++++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 46 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index b532bd4..07a9dcc 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -58,7 +58,7 @@ static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) { - IInternetHostSecurityManager *secmgr; + IInternetHostSecurityManager *secmgr = NULL; IObjectWithSite *obj_site; struct CONFIRMSAFETY cs; IClassFactoryEx *cfex; @@ -76,15 +76,17 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) TRACE("GUID %s\n", debugstr_guid(&guid)); - secmgr = get_sec_mgr(ctx); - if(!secmgr) - return NULL; + if(ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) { + secmgr = get_sec_mgr(ctx); + if(!secmgr) + return NULL; - policy = 0; - hres = IInternetHostSecurityManager_ProcessUrlAction(secmgr, URLACTION_ACTIVEX_RUN, (BYTE*)&policy, sizeof(policy), - (BYTE*)&guid, sizeof(GUID), 0, 0); - if(FAILED(hres) || policy != URLPOLICY_ALLOW) - return NULL; + policy = 0; + hres = IInternetHostSecurityManager_ProcessUrlAction(secmgr, URLACTION_ACTIVEX_RUN, + (BYTE*)&policy, sizeof(policy), (BYTE*)&guid, sizeof(GUID), 0, 0); + if(FAILED(hres) || policy != URLPOLICY_ALLOW) + return NULL; + } hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); if(FAILED(hres)) @@ -100,19 +102,21 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) if(FAILED(hres)) return NULL; - cs.clsid = guid; - cs.pUnk = obj; - cs.dwFlags = 0; - hres = IInternetHostSecurityManager_QueryCustomPolicy(secmgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, &bpolicy, &policy_size, - (BYTE*)&cs, sizeof(cs), 0); - if(SUCCEEDED(hres)) { - policy = policy_size >= sizeof(DWORD) ? *(DWORD*)bpolicy : URLPOLICY_DISALLOW; - CoTaskMemFree(bpolicy); - } + if(secmgr) { + cs.clsid = guid; + cs.pUnk = obj; + cs.dwFlags = 0; + hres = IInternetHostSecurityManager_QueryCustomPolicy(secmgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &bpolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + if(SUCCEEDED(hres)) { + policy = policy_size >= sizeof(DWORD) ? *(DWORD*)bpolicy : URLPOLICY_DISALLOW; + CoTaskMemFree(bpolicy); + } - if(FAILED(hres) || policy != URLPOLICY_ALLOW) { - IUnknown_Release(obj); - return NULL; + if(FAILED(hres) || policy != URLPOLICY_ALLOW) { + IUnknown_Release(obj); + return NULL; + } } hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); @@ -150,7 +154,8 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return E_NOTIMPL; } - if(ctx->safeopt != (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER)) { + if(ctx->safeopt != (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER) + && ctx->safeopt != INTERFACE_USES_DISPEX) { FIXME("Unsupported safeopt %x\n", ctx->safeopt); return E_NOTIMPL; } diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index faf73d3..c6080b0 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -188,8 +188,8 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { CHECK_EXPECT(QI_IObjectWithSite); *ppv = object_with_site; - }else { - return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IObjectSafety, riid)) { + ok(0, "Unexpected IID_IObjectSafety query\n"); } return *ppv ? S_OK : E_NOINTERFACE; @@ -662,10 +662,10 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { static IActiveScriptSite ActiveScriptSite = { &ActiveScriptSiteVtbl }; -static void set_safety_options(IUnknown *unk) +static void set_safety_options(IUnknown *unk, BOOL use_sec_mgr) { IObjectSafety *safety; - DWORD supported, enabled; + DWORD supported, enabled, options_all, options_set; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IObjectSafety, (void**)&safety); @@ -673,18 +673,20 @@ static void set_safety_options(IUnknown *unk) if(FAILED(hres)) return; - hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, - INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER, - INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); + options_all = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER; + if(use_sec_mgr) + options_set = options_all; + else + options_set = INTERFACE_USES_DISPEX; + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, options_all, options_set); ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); supported = enabled = 0xdeadbeef; hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); - ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), - "supported=%x\n", supported); - ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), - "enabled=%x\n", enabled); + ok(supported == options_all, "supported=%x, expected %x\n", supported, options_all); + ok(enabled == options_set, "enabled=%x, expected %x\n", enabled, options_set); IObjectSafety_Release(safety); } @@ -701,7 +703,7 @@ static void _parse_script_a(unsigned line, IActiveScriptParse *parser, const cha ok_(__FILE__,line)(hres == S_OK, "ParseScriptText failed: %08x\n", hres); } -static IActiveScriptParse *create_script(BOOL skip_tests) +static IActiveScriptParse *create_script(BOOL skip_tests, BOOL use_sec_mgr) { IActiveScriptParse *parser; IActiveScript *script; @@ -725,7 +727,7 @@ static IActiveScriptParse *create_script(BOOL skip_tests) return NULL; if(!skip_tests) - set_safety_options((IUnknown*)script); + set_safety_options((IUnknown*)script, use_sec_mgr); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); @@ -804,7 +806,7 @@ static void test_ActiveXObject(void) IActiveScriptParse *parser; IDispatchEx *proc; - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); SET_EXPECT(Host_QS_SecMgr); SET_EXPECT(ProcessUrlAction); @@ -849,7 +851,7 @@ static void test_ActiveXObject(void) IDispatchEx_Release(proc); IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); proc = parse_procedure_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); SET_EXPECT(Host_QS_SecMgr); @@ -871,7 +873,7 @@ static void test_ActiveXObject(void) IDispatchEx_Release(proc); IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QS_SecMgr_hres = E_NOINTERFACE; SET_EXPECT(Host_QS_SecMgr); @@ -880,7 +882,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); ProcessUrlAction_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -891,7 +893,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); ProcessUrlAction_policy = URLPOLICY_DISALLOW; SET_EXPECT(Host_QS_SecMgr); @@ -902,7 +904,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); CreateInstance_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -915,7 +917,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QueryCustomPolicy_hres = E_FAIL; SET_EXPECT(Host_QS_SecMgr); @@ -930,7 +932,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QueryCustomPolicy_psize = 6; SET_EXPECT(Host_QS_SecMgr); @@ -949,7 +951,7 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, TRUE); QueryCustomPolicy_policy = URLPOLICY_DISALLOW; SET_EXPECT(Host_QS_SecMgr); @@ -985,7 +987,19 @@ static void test_ActiveXObject(void) IUnknown_Release(parser); - parser = create_script(FALSE); + parser = create_script(FALSE, FALSE); + + SET_EXPECT(CreateInstance); + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(reportSuccess); + parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(reportSuccess); + + IUnknown_Release(parser); + + parser = create_script(FALSE, TRUE); object_with_site = &ObjectWithSite; SET_EXPECT(Host_QS_SecMgr); @@ -1071,7 +1085,7 @@ static BOOL check_jscript(void) BSTR str; HRESULT hres; - parser = create_script(TRUE); + parser = create_script(TRUE, TRUE); if(!parser) return FALSE;

1 0

Juan Lang : crypt32: Trace time value in addition to address of time value.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 63a05db41cbd19127f9353f5008fcf9f922c0ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a05db41cbd19127f9353f50… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 14 14:42:38 2010 -0700 crypt32: Trace time value in addition to address of time value. --- dlls/crypt32/chain.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b41412b..a813b64 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2149,6 +2149,13 @@ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, return ret; } +static LPCSTR debugstr_filetime(LPFILETIME pTime) +{ + if (!pTime) + return "(nil)"; + return wine_dbg_sprintf("%p (%s)", pTime, filetime_to_str(pTime)); +} + static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, PCERT_SIMPLE_CHAIN *ppChain) @@ -2156,7 +2163,7 @@ static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, BOOL ret = FALSE; PCERT_SIMPLE_CHAIN chain; - TRACE("(%p, %p, %p, %p)\n", engine, world, cert, pTime); + TRACE("(%p, %p, %p, %s)\n", engine, world, cert, debugstr_filetime(pTime)); chain = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN)); if (chain) @@ -2377,7 +2384,8 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; PCertificateChain alternate; - TRACE("(%p, %p, %p, %p)\n", hChainEngine, pTime, hAdditionalStore, chain); + TRACE("(%p, %s, %p, %p)\n", hChainEngine, debugstr_filetime(pTime), + hAdditionalStore, chain); /* Always start with the last "lower quality" chain to ensure a consistent * order of alternate creation: @@ -2803,8 +2811,9 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, BOOL ret; PCertificateChain chain = NULL; - TRACE("(%p, %p, %p, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, - pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); + TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, + debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags, + pvReserved, ppChainContext); if (ppChainContext) *ppChainContext = NULL;

1 0

Juan Lang : crypt32: Use A functions for debug string that' s only used as an ASCII string.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: b6cd08f4367bba9d7d63b5317f7ea441bfad3589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cd08f4367bba9d7d63b5317… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 8 11:14:06 2010 -0700 crypt32: Use A functions for debug string that's only used as an ASCII string. --- dlls/crypt32/chain.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 056838b..b41412b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1662,18 +1662,18 @@ static void dump_extension(const CERT_EXTENSION *ext) dump_netscape_cert_type(ext); } -static LPCWSTR filetime_to_str(const FILETIME *time) +static LPCSTR filetime_to_str(const FILETIME *time) { - static WCHAR date[80]; - WCHAR dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ + static char date[80]; + char dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ SYSTEMTIME sysTime; if (!time) return NULL; - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, + GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, sizeof(dateFmt) / sizeof(dateFmt[0])); FileTimeToSystemTime(time, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, + GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, sizeof(date) / sizeof(date[0])); return date; } @@ -1705,8 +1705,8 @@ static void dump_element(PCCERT_CONTEXT cert) CryptMemFree(name); } TRACE_(chain)("valid from %s to %s\n", - debugstr_w(filetime_to_str(&cert->pCertInfo->NotBefore)), - debugstr_w(filetime_to_str(&cert->pCertInfo->NotAfter))); + filetime_to_str(&cert->pCertInfo->NotBefore), + filetime_to_str(&cert->pCertInfo->NotAfter)); TRACE_(chain)("%d extensions\n", cert->pCertInfo->cExtension); for (i = 0; i < cert->pCertInfo->cExtension; i++) dump_extension(&cert->pCertInfo->rgExtension[i]); @@ -1893,7 +1893,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_BASIC_CONSTRAINTS2_INFO constraints = { FALSE, FALSE, 0 }; TRACE_(chain)("checking chain with %d elements for time %s\n", - chain->cElement, debugstr_w(filetime_to_str(time))); + chain->cElement, filetime_to_str(time)); for (i = chain->cElement - 1; i >= 0; i--) { BOOL isRoot;

1 0

Juan Lang : wintrust: Get time to verify from cryptographic message when present.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 68fceb5e5b4c345dd6d7f77d2d250f1e8a779007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fceb5e5b4c345dd6d7f77d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 14 14:21:21 2010 -0700 wintrust: Get time to verify from cryptographic message when present. --- dlls/wintrust/softpub.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 9fa0d05..fc1bc13 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -24,6 +24,7 @@ #include "wintrust.h" #include "mssip.h" #include "softpub.h" +#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); @@ -469,6 +470,98 @@ static CMSG_SIGNER_INFO *WINTRUST_GetSigner(CRYPT_PROVIDER_DATA *data, return signerInfo; } +static BOOL WINTRUST_GetTimeFromCounterSigner( + const CMSG_CMS_SIGNER_INFO *counterSignerInfo, FILETIME *time) +{ + DWORD i; + BOOL foundTimeStamp = FALSE; + + for (i = 0; !foundTimeStamp && i < counterSignerInfo->AuthAttrs.cAttr; i++) + { + if (!strcmp(counterSignerInfo->AuthAttrs.rgAttr[i].pszObjId, + szOID_RSA_signingTime)) + { + const CRYPT_ATTRIBUTE *attr = + &counterSignerInfo->AuthAttrs.rgAttr[i]; + DWORD j; + + for (j = 0; !foundTimeStamp && j < attr->cValue; j++) + { + static const DWORD encoding = X509_ASN_ENCODING | + PKCS_7_ASN_ENCODING; + DWORD size = sizeof(FILETIME); + + foundTimeStamp = CryptDecodeObjectEx(encoding, + X509_CHOICE_OF_TIME, + attr->rgValue[j].pbData, attr->rgValue[j].cbData, 0, NULL, + time, &size); + } + } + } + return foundTimeStamp; +} + +static LPCSTR filetime_to_str(const FILETIME *time) +{ + static char date[80]; + char dateFmt[80]; /* sufficient for all versions of LOCALE_SSHORTDATE */ + SYSTEMTIME sysTime; + + if (!time) return NULL; + + GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, + sizeof(dateFmt) / sizeof(dateFmt[0])); + FileTimeToSystemTime(time, &sysTime); + GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, + sizeof(date) / sizeof(date[0])); + return date; +} + +static FILETIME WINTRUST_GetTimeFromSigner(const CRYPT_PROVIDER_DATA *data, + const CMSG_SIGNER_INFO *signerInfo) +{ + DWORD i; + FILETIME time; + BOOL foundTimeStamp = FALSE; + + for (i = 0; !foundTimeStamp && i < signerInfo->UnauthAttrs.cAttr; i++) + { + if (!strcmp(signerInfo->UnauthAttrs.rgAttr[i].pszObjId, + szOID_RSA_counterSign)) + { + const CRYPT_ATTRIBUTE *attr = &signerInfo->UnauthAttrs.rgAttr[i]; + DWORD j; + + for (j = 0; j < attr->cValue; j++) + { + static const DWORD encoding = X509_ASN_ENCODING | + PKCS_7_ASN_ENCODING; + CMSG_CMS_SIGNER_INFO *counterSignerInfo; + DWORD size; + BOOL ret = CryptDecodeObjectEx(encoding, CMS_SIGNER_INFO, + attr->rgValue[j].pbData, attr->rgValue[j].cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, &counterSignerInfo, &size); + if (ret) + { + /* FIXME: need to verify countersigner signature too */ + foundTimeStamp = WINTRUST_GetTimeFromCounterSigner( + counterSignerInfo, &time); + LocalFree(counterSignerInfo); + } + } + } + } + if (!foundTimeStamp) + { + TRACE("returning system time %s\n", + filetime_to_str(&data->sftSystemTime)); + time = data->sftSystemTime; + } + else + TRACE("returning time from message %s\n", filetime_to_str(&time)); + return time; +} + static DWORD WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { DWORD err; @@ -479,7 +572,7 @@ static DWORD WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; sgnr.psSigner = signerInfo; - sgnr.sftVerifyAsOf = data->sftSystemTime; + sgnr.sftVerifyAsOf = WINTRUST_GetTimeFromSigner(data, signerInfo); if (!data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr)) err = GetLastError(); else

1 0

André Hentschel : dbghelp: Implement arm_get_addr.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: a4c1b34146239a9d65852ecc3a5769b5aa6456d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c1b34146239a9d65852ecc3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 14 22:10:45 2010 +0200 dbghelp: Implement arm_get_addr. --- dlls/dbghelp/cpu_arm.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 0bd8aad..fd0b781 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -32,15 +32,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); static unsigned arm_get_addr(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr ca, ADDRESS64* addr) { - switch (ca) + addr->Mode = AddrModeFlat; + addr->Segment = 0; /* don't need segment */ + switch (ca) { - case cpu_addr_pc: - case cpu_addr_stack: - case cpu_addr_frame: - default: - FIXME("not done for ARM\n"); +#ifdef __arm__ + case cpu_addr_pc: addr->Offset = ctx->Pc; return TRUE; + case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE; + case cpu_addr_frame: addr->Offset = ctx->Fp; return TRUE; +#endif + default: addr->Mode = -1; + return FALSE; } - return FALSE; } static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context)

1 0

Adam Martinson : msxml3: Prevent a memory leak if domdoc creation fails.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 403201b87fca7e6d3acbc94a8a164d2bf6c2dbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403201b87fca7e6d3acbc94a8… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Oct 14 10:24:40 2010 -0500 msxml3: Prevent a memory leak if domdoc creation fails. --- dlls/msxml3/domdoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 9d3f61f..781261e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2873,6 +2873,8 @@ HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj) hr = DOMDocument_create_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); if(FAILED(hr)) { + free_properties(properties_from_xmlDocPtr(xmldoc)); + heap_free(xmldoc->_private); xmlFreeDoc(xmldoc); return hr; }

1 0

Jeremy Newman : updated language templates to use the new list plugin for easier updates
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: a919b58b1e0821a1d1dac91bc9d9e9853aa343e1 URL: http://source.winehq.org/git/website.git/?a=commit;h=a919b58b1e0821a1d1dac9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:35:54 2010 -0500 updated language templates to use the new list plugin for easier updates --- templates/de/lang.template | 30 +++--------------------------- templates/en/lang.template | 31 +++---------------------------- templates/he/lang.template | 30 +++--------------------------- 3 files changed, 9 insertions(+), 82 deletions(-) diff --git a/templates/de/lang.template b/templates/de/lang.template index 08dff17..c8877b2 100644 --- a/templates/de/lang.template +++ b/templates/de/lang.template @@ -1,37 +1,13 @@   -<h1 class="title">{$langChange}</h1> -  +<h1 class="title">{$langChange}</h1> + <p><b>Aktuelle Sprache: </b> {$langCur}</p> <ul style="list-style: none; margin-left: 20px; padding: 0;"> - - <li style="background-image: url('{$root}/images/lang/en.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/en" title="English">English</a> <small>(Englisch)</small> - </li></a> - - <li style="background-image: url('{$root}/images/lang/de.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/de" title="Deutsch">Deutsch</a> - </li></a> - - <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/es" title="Español">Español</a> <small>(Spanisch)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/fr" title="Français">Français</a> <small>(Französisch)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/pl.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/pl" title="Polski">Polski</a> <small>(Polnisch)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/pt" title="Português">Português</a> <small>(Portugiesisch)</small> - </li> - + </ul> diff --git a/templates/en/lang.template b/templates/en/lang.template index 267df33..2c3bc8f 100644 --- a/templates/en/lang.template +++ b/templates/en/lang.template @@ -1,37 +1,12 @@   -<h1 class="title">{$langChange}</h1> -  +<h1 class="title">{$langChange}</h1> + <p><b>Current Langage: </b> {$langCur}</p> <ul style="list-style: none; margin-left: 20px; padding: 0;"> - - <li style="background-image: url('{$root}/images/lang/en.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/en" title="English">English</a> - </li></a> - - <li style="background-image: url('{$root}/images/lang/de.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/de" title="Deutsch">Deutsch</a> <small>(German)</small> - </li></a> - - <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/es" title="Español">Español</a> <small>(Spanish)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/fr" title="Français">Français</a> <small>(French)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/pl.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/pl" title="Polski">Polski</a> <small>(Polish)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/pt" title="Português">Português</a> <small>(Portuguese)</small> - </li> - + </ul> - diff --git a/templates/he/lang.template b/templates/he/lang.template index 144435c..c4fe8fa 100644 --- a/templates/he/lang.template +++ b/templates/he/lang.template @@ -1,37 +1,13 @@   -<h1 class="title">{$langChange}</h1> -  +<h1 class="title">{$langChange}</h1> + <p><b>השפה הנוכחית: </b> {$langCur}</p> <ul style="list-style: none; margin-left: 20px; padding: 0;"> - - <li style="background-image: url('{$root}/images/lang/en.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/en" title="English">אנגלית</a> - </li></a> - - <li style="background-image: url('{$root}/images/lang/de.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/de" title="Deutsch">Deutsch</a> <small>(גרמנית)</small> - </li></a> - - <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/es" title="Español">Español</a> <small>(ספרדית)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/fr" title="Français">Français</a> <small>(צרפתית)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/pl.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/pl" title="Polski">Polski</a> <small>(פולנית)</small> - </li> - - <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/pt" title="Português">Português</a> <small>(פורטוגזית)</small> - </li> - + </ul>

1 0

Jeremy Newman : adding template for rows in language plugin
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 6dc90b6412e3f02eb8b2ab0ebb0f682c3524296f URL: http://source.winehq.org/git/website.git/?a=commit;h=6dc90b6412e3f02eb8b2ab… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:35:40 2010 -0500 adding template for rows in language plugin --- templates/en/global/lang_row.template | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/templates/en/global/lang_row.template b/templates/en/global/lang_row.template new file mode 100644 index 0000000..cb6c776 --- /dev/null +++ b/templates/en/global/lang_row.template @@ -0,0 +1,3 @@ + <li style="background-image: url('{$root}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/{$lang}">{$langFull}</a> · {$langHelp} + </li>

1 0

Jeremy Newman : language plugin now has a list command
by Jeremy Newman 15 Oct '10

15 Oct '10

Module: website Branch: master Commit: 35b9f6c2b556df42cb935f0d63a6126dbe87bcaa URL: http://source.winehq.org/git/website.git/?a=commit;h=35b9f6c2b556df42cb935f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 15 09:35:12 2010 -0500 language plugin now has a list command --- include/plugins/language.php | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/include/plugins/language.php b/include/plugins/language.php index a785430..c4e19bd 100644 --- a/include/plugins/language.php +++ b/include/plugins/language.php @@ -6,14 +6,32 @@ by Jeremy Newman <jnewman(a)codeweavers.com> */ -global $html, $config; +global $html, $config, $data; -// if specified, switch to lang -if (defined('PAGE_PARAMS') and in_array(PAGE_PARAMS, $config->languages)) +switch ($this->params['cmd']) { - setcookie("lang", PAGE_PARAMS, time()+60*60*24*365, "{$config->base_root}/"); - $html->redirect($config->base_url); - exit(); + // list languages + case "list": + foreach ($config->languages as $lang) + { + $row = array( + 'lang' => $lang, + 'langFull' => $data->languages[$lang]['name'], + 'langHelp' => $data->languages[$lang]['change'] + ); + echo $html->template('local', 'global/lang_row', $row, 1); + } + break; + + // set the language based on the URL + default: + // if specified, switch to lang + if (defined('PAGE_PARAMS') and in_array(PAGE_PARAMS, $config->languages)) + { + setcookie("lang", PAGE_PARAMS, time()+60*60*24*365, "{$config->base_root}/"); + $html->redirect($config->base_url); + exit(); + } } ?>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010