wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Jacek Caban : mshtml: Fixed size check in res protocol ParseUrl( PARSE_SECURITY_URL) call.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: e175bee277a2aac054405ad4ef6ddab8f159da8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e175bee277a2aac054405ad4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:09:38 2011 +0100 mshtml: Fixed size check in res protocol ParseUrl(PARSE_SECURITY_URL) call. --- dlls/mshtml/protocol.c | 2 +- dlls/mshtml/tests/protocol.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 79bcf2d..58f4dee 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -864,7 +864,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; if(pcchResult) *pcchResult = size; - if(size >= cchResult) + if(size > cchResult) return S_FALSE; memcpy(pwzResult, wszFile, sizeof(wszFile)); diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 9e6fe1a..599f43e 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -326,7 +326,7 @@ static void test_res_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres); if(SUCCEEDED(hres)) { WCHAR buf[128]; - DWORD size; + DWORD size, expected_size; int i; for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { @@ -342,12 +342,20 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); res_sec_url_cmp(buf, size, mshtml_dllW); + ok(size == lstrlenW(buf)+1, "size = %d\n", size); + expected_size = size; + + hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, + expected_size, &size, 0); + ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + res_sec_url_cmp(buf, size, mshtml_dllW); + ok(size == expected_size, "size = %d\n", size); size = 0; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); - ok(size, "size=0\n"); + ok(size == expected_size, "size = %d\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0);

1 0

Jacek Caban : mshtml: Return size in about protocols handler's ParseUrl( PARSE_SECURITY_URL) call.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 340fbb71f381af6279096ae39b68427696551bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=340fbb71f381af6279096ae39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:09:24 2011 +0100 mshtml: Return size in about protocols handler's ParseUrl(PARSE_SECURITY_URL) call. --- dlls/mshtml/protocol.c | 9 +++++---- dlls/mshtml/tests/protocol.c | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index f0325bf..79bcf2d 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -404,16 +404,17 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { - TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, + TRACE("%p)->(%s %d %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); if(ParseAction == PARSE_SECURITY_URL) { - unsigned int len = strlenW(pwzUrl); + unsigned int len = strlenW(pwzUrl)+1; - if(len >= cchResult) + *pcchResult = len; + if(len > cchResult) return S_FALSE; - memcpy(pwzResult, pwzUrl, (len+1)*sizeof(WCHAR)); + memcpy(pwzResult, pwzUrl, len*sizeof(WCHAR)); return S_OK; } diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 1369ff7..9e6fe1a 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -656,14 +656,17 @@ static void test_about_protocol(void) ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); ok(!lstrcmpW(about_blank_url, buf), "buf != blank_url\n"); + size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); + ok(size == 12, "size = %d\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_test_url, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); ok(!lstrcmpW(about_test_url, buf), "buf != test_url\n"); + ok(size == 11, "size = %d\n", size); size = 0xdeadbeef; buf[0] = '?';

1 0

Jacek Caban : urlmon: Don't hardcode zone numbers.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 4ac397b6e345ca4d5afc347f6c2c12c359215538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac397b6e345ca4d5afc347f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:09:06 2011 +0100 urlmon: Don't hardcode zone numbers. --- dlls/urlmon/sec_mgr.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e3be8fe..2aca1a9 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -150,7 +150,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) DWORD size=0; HRESULT hres; - *zone = -1; + *zone = URLZONE_INVALID; hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0); if(hres != S_OK) { @@ -193,11 +193,11 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) case DRIVE_FIXED: case DRIVE_CDROM: case DRIVE_RAMDISK: - *zone = 0; + *zone = URLZONE_LOCAL_MACHINE; hres = S_OK; break; case DRIVE_REMOTE: - *zone = 3; + *zone = URLZONE_INTERNET; hres = S_OK; break; default: @@ -206,7 +206,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) } } - if(*zone == -1) { + if(*zone == URLZONE_INVALID) { WARN("domains are not yet implemented\n"); hres = get_zone_from_reg(schema, zone); } @@ -495,7 +495,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac } if(!pwszUrl) { - *pdwZone = -1; + *pdwZone = URLZONE_INVALID; return E_INVALIDARG; }

1 0

Alistair Leslie-Hughes : mshtml: Implemented IHTMLStyle_put_borderBottomColor.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 56e80e18a60a1660093626cfeaf0784790ba2a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e80e18a60a1660093626cfe… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 5 02:47:10 2011 +1100 mshtml: Implemented IHTMLStyle_put_borderBottomColor. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 45efd95..d2c79c8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1577,8 +1577,10 @@ static HRESULT WINAPI HTMLStyle_get_borderRightColor(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_put_borderBottomColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_BOTTOM_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_borderBottomColor(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b5babed..062507e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5479,6 +5479,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_borderRightColor(style, vDefault); ok(hres == S_OK, "putborderRightColorr: %08x\n", hres); + /* borderBottomColor */ + hres = IHTMLStyle_get_borderBottomColor(style, &vDefault); + ok(hres == S_OK, "get_borderBottomColor: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("cyan"); + hres = IHTMLStyle_put_borderBottomColor(style, v); + ok(hres == S_OK, "put_borderBottomColor: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderBottomColor(style, &v); + ok(hres == S_OK, "get_borderBottomColor: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "cyan"), "expected cyan = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderBottomColor(style, vDefault); + ok(hres == S_OK, "put_borderBottomColor: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Peter Urbanec : setupapi: Fix comparison issue on 64-bit systems.
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: de83ea61bbc72976326130c70f85e25f0633752a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de83ea61bbc72976326130c70… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Tue Feb 8 15:58:43 2011 +1100 setupapi: Fix comparison issue on 64-bit systems. --- dlls/setupapi/setupcab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 77f2b59..f4c6600 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -412,7 +412,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE("(fdint == %d, pfdin == ^%p)\n", fdint, pfdin); - if (pfdin && pfdin->pv && (*((void **) pfdin->pv) == (void *)SC_HSC_W_MAGIC)) + if (pfdin && pfdin->pv && (((PSC_HSC_W) pfdin->pv)->magic == SC_HSC_W_MAGIC)) phsc = pfdin->pv; else { ERR("pv %p is not an SC_HSC_W.\n", (pfdin) ? pfdin->pv : NULL);

1 0

Austin English : cryptui/tests: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: ed778bc8e154f1debeec395cf2d37b599f45ca4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed778bc8e154f1debeec395cf… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 18:27:16 2011 -0800 cryptui/tests: Remove a dead assignment (LLVM/Clang). --- dlls/cryptui/tests/cryptui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 996df0e..09b246c 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -344,7 +344,7 @@ static void test_crypt_ui_wiz_import(void) /* Brings up UI. Cancelling yields ret = 1. */ if (0) { - ret = pCryptUIWizImport(0, 0, NULL, NULL, NULL); + pCryptUIWizImport(0, 0, NULL, NULL, NULL); } SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, NULL, NULL);

1 0

Austin English : qmgr/tests: Make sure return values are used (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: 69fd8d52715bdd6095b266ff6d2b35e630859dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=69fd8d52715bdd6095b266ff6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:45 2011 -0800 qmgr/tests: Make sure return values are used (LLVM/Clang). --- dlls/qmgr/tests/qmgr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index 6dc9c1c..092d009 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -208,6 +208,7 @@ static void test_globalness(void) BOOL found = FALSE; hres = IEnumBackgroundCopyJobs_GetCount(enumJobs, &n); + ok(hres == S_OK, "GetCount failed: %08x\n", hres); for (i = 0; i < n && !found; ++i) { LPWSTR name; @@ -219,6 +220,7 @@ static void test_globalness(void) IBackgroundCopyJob_Release(job); } hres = IEnumBackgroundCopyJobs_Release(enumJobs); + ok(hres == S_OK, "Release failed: %08x\n", hres); ok(found, "Adding a job in another process failed\n"); }

1 0

Austin English : hlink/tests: Don't check results in disabled tests (LLVM/ Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: f41a70133a42879c1c3edd01033f11e7d89effee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41a70133a42879c1c3edd010… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:57:39 2011 -0800 hlink/tests: Don't check results in disabled tests (LLVM/Clang). --- dlls/hlink/tests/hlink.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index bb44080..d151aa5 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1105,9 +1105,9 @@ static void test_HlinkGetSetMonikerReference(void) CoTaskMemFree(found_loc); /* invalid HLINKSETF flags */ - hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two); /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ - if (0) ok(hres == 12, "IHlink_SetMonikerReference should've failed with 0x%08x, failed with 0x%08x\n", 12, hres); + if (0) + IHlink_SetMonikerReference(hlink, 12, dummy2, two); hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &found_trgt, &found_loc); ok(hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); @@ -1260,12 +1260,12 @@ static void test_HlinkGetSetStringReference(void) CoTaskMemFree(fnd_tgt); CoTaskMemFree(fnd_loc); - hres = IHlink_SetStringReference(link, 4, NULL, NULL); - /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ - if (0) ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres); - - hres = IHlink_SetStringReference(link, -4, NULL, NULL); - if (0) ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres); + if (0) + { + /* Windows returns garbage; on 32-bit it returns the flags probably because the compiler happened to store them in %eax at some point */ + IHlink_SetStringReference(link, 4, NULL, NULL); + IHlink_SetStringReference(link, -4, NULL, NULL); + } IHlink_Release(link); } @@ -1730,12 +1730,12 @@ static void test_HlinkClone(void) hres = HlinkClone(hl, &IID_IHlink, NULL, 0, NULL); ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); - if(0){ /* crash on Windows XP */ - hres = HlinkClone(hl, NULL, NULL, 0, NULL); - ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + if (0) + { + /* crash on Windows XP */ + HlinkClone(hl, NULL, NULL, 0, NULL); - hres = HlinkClone(hl, NULL, NULL, 0, (void**)&cloned); - ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + HlinkClone(hl, NULL, NULL, 0, (void**)&cloned); } hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned);

1 0

Austin English : msxml3/tests: Remove unneeded assignment (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: fd2c5bb32e4487eb054d692d7e25f99c7bfce04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2c5bb32e4487eb054d692d7… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:12 2011 -0800 msxml3/tests: Remove unneeded assignment (LLVM/Clang). --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 527b46d..34cc322 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -883,7 +883,7 @@ static void test_domdoc( void ) if (0) { /* crashes on native */ - r = IXMLDOMDocument_loadXML( doc, (BSTR)0x1, NULL ); + IXMLDOMDocument_loadXML( doc, (BSTR)0x1, NULL ); } /* try some stupid things */

1 0

Austin English : mshtml/tests: Make sure return value is used (LLVM/Clang).
by Alexandre Julliard 08 Feb '11

08 Feb '11

Module: wine Branch: master Commit: e45057341252ae2d3115d7e9b21c476286b1dce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45057341252ae2d3115d7e9b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 7 14:58:03 2011 -0800 mshtml/tests: Make sure return value is used (LLVM/Clang). --- dlls/mshtml/tests/activex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index bf3e2e9..241342b 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1281,6 +1281,7 @@ static void test_object_elem(IHTMLDocument2 *doc) CHECK_CALLED(Invoke_SECURITYCTX); hres = IHTMLObjectElement_QueryInterface(objelem, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); test_elem_dispex(dispex); IDispatchEx_Release(dispex);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
68
Older →

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 February 2011