wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Piotr Caban : urlmon: Added PARSE_ROOTDOCUMENT to CoInternetParseUrl.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 18069b2d0d276582343c618af65f4915c332cbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18069b2d0d276582343c618af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:48:09 2009 +0100 urlmon: Added PARSE_ROOTDOCUMENT to CoInternetParseUrl. --- dlls/urlmon/internet.c | 72 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/urlmon/tests/misc.c | 23 +++++++++++---- 2 files changed, 86 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index c72ac42..6a79e48 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -38,6 +38,9 @@ static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, if(ptr) len = ptr-url; + if(rsize) + *rsize = len; + if(len >= size) return E_POINTER; @@ -45,9 +48,6 @@ static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, memcpy(result, url, len*sizeof(WCHAR)); result[len] = 0; - if(rsize) - *rsize = len; - return S_OK; } @@ -200,6 +200,70 @@ static HRESULT parse_domain(LPCWSTR url, DWORD flags, LPWSTR result, return S_OK; } +static HRESULT parse_rootdocument(LPCWSTR url, DWORD flags, LPWSTR result, + DWORD size, DWORD *rsize) +{ + IInternetProtocolInfo *protocol_info; + PARSEDURLW url_info; + HRESULT hres; + + TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + + protocol_info = get_protocol_info(url); + + if(protocol_info) { + hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_ROOTDOCUMENT, + flags, result, size, rsize, 0); + IInternetProtocolInfo_Release(protocol_info); + if(SUCCEEDED(hres)) + return hres; + } + + url_info.cbSize = sizeof(url_info); + if(FAILED(ParseURLW(url, &url_info))) + return E_FAIL; + + switch(url_info.nScheme) { + case URL_SCHEME_FTP: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + if(url_info.cchSuffix<3 || *(url_info.pszSuffix)!='/' + || *(url_info.pszSuffix+1)!='/') + return E_FAIL; + + if(size < url_info.cchProtocol+3) { + size = 0; + hres = UrlGetPartW(url, result, &size, URL_PART_HOSTNAME, flags); + + if(rsize) + *rsize = size+url_info.cchProtocol+3; + + if(hres == E_POINTER) + return S_FALSE; + + return hres; + } + + size -= url_info.cchProtocol+3; + hres = UrlGetPartW(url, result+url_info.cchProtocol+3, + &size, URL_PART_HOSTNAME, flags); + + if(hres == E_POINTER) + return S_FALSE; + + if(FAILED(hres)) + return E_FAIL; + + if(rsize) + *rsize = size+url_info.cchProtocol+3; + + memcpy(result, url, (url_info.cchProtocol+3)*sizeof(WCHAR)); + return hres; + default: + return E_FAIL; + } +} + /************************************************************************** * CoInternetParseUrl (URLMON.@) */ @@ -224,6 +288,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD return parse_security_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_DOMAIN: return parse_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); + case PARSE_ROOTDOCUMENT: + return parse_rootdocument(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); default: FIXME("not supported action %d\n", ParseAction); } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index f6d5c87..f9c2de9 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -271,6 +271,8 @@ static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; static const WCHAR wszEmpty[] = {0}; static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR wszHttpWineHQ[] = {'h','t','t','p',':','/','/','w','w','w','.', + 'w','i','n','e','h','q','.','o','r','g',0}; struct parse_test { LPCWSTR url; @@ -281,15 +283,17 @@ struct parse_test { LPCWSTR schema; LPCWSTR domain; HRESULT domain_hres; + LPCWSTR rootdocument; + HRESULT rootdocument_hres; }; static const struct parse_test parse_tests[] = { - {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes, NULL, E_FAIL}, - {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty, NULL, E_FAIL}, - {url3, E_FAIL, url3, S_OK, path3, wszFile, wszEmpty, S_OK}, - {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK}, - {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK}, - {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL} + {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes, NULL, E_FAIL, NULL, E_FAIL}, + {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty, NULL, E_FAIL, NULL, E_FAIL}, + {url3, E_FAIL, url3, S_OK, path3, wszFile, wszEmpty, S_OK, NULL, E_FAIL}, + {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK, NULL, E_FAIL}, + {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK, wszHttpWineHQ, S_OK}, + {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL, NULL, E_FAIL}, }; static void test_CoInternetParseUrl(void) @@ -342,6 +346,13 @@ static void test_CoInternetParseUrl(void) ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres); if(parse_tests[i].domain) ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf)); + + memset(buf, 0xf0, sizeof(buf)); + hres = CoInternetParseUrl(parse_tests[i].url, PARSE_ROOTDOCUMENT, 0, buf, + sizeof(buf)/sizeof(WCHAR), &size, 0); + ok(hres == parse_tests[i].rootdocument_hres, "[%d] rootdocument failed: %08x\n", i, hres); + if(parse_tests[i].rootdocument) + ok(!lstrcmpW(parse_tests[i].rootdocument, buf), "[%d] wrong rootdocument, received %s\n", i, wine_dbgstr_w(buf)); } }

1 0

Piotr Caban : urlmon: Added PARSE_DOMAIN to CoInternetParseUrl.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 3adfe170bfb9a31082d41c6b8fa796f3f33d388c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adfe170bfb9a31082d41c6b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:52 2009 +0100 urlmon: Added PARSE_DOMAIN to CoInternetParseUrl. --- dlls/urlmon/internet.c | 32 ++++++++++++++++++++++++++++++++ dlls/urlmon/tests/misc.c | 23 +++++++++++++++++------ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 8bde7b4..c72ac42 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -170,6 +170,36 @@ static HRESULT parse_security_domain(LPCWSTR url, DWORD flags, LPWSTR result, return E_FAIL; } +static HRESULT parse_domain(LPCWSTR url, DWORD flags, LPWSTR result, + DWORD size, DWORD *rsize) +{ + IInternetProtocolInfo *protocol_info; + HRESULT hres; + + TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + + protocol_info = get_protocol_info(url); + + if(protocol_info) { + hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_DOMAIN, + flags, result, size, rsize, 0); + IInternetProtocolInfo_Release(protocol_info); + if(SUCCEEDED(hres)) + return hres; + } + + hres = UrlGetPartW(url, result, &size, URL_PART_HOSTNAME, flags); + if(rsize) + *rsize = size; + + if(hres == E_POINTER) + return S_FALSE; + + if(FAILED(hres)) + return E_FAIL; + return S_OK; +} + /************************************************************************** * CoInternetParseUrl (URLMON.@) */ @@ -192,6 +222,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD return parse_schema(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_SECURITY_DOMAIN: return parse_security_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); + case PARSE_DOMAIN: + return parse_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); default: FIXME("not supported action %d\n", ParseAction); } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 5b59626..f6d5c87 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -270,6 +270,8 @@ static const WCHAR wszHttp[] = {'h','t','t','p',0}; static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; static const WCHAR wszEmpty[] = {0}; +static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + struct parse_test { LPCWSTR url; HRESULT secur_hres; @@ -277,15 +279,17 @@ struct parse_test { HRESULT path_hres; LPCWSTR path; LPCWSTR schema; + LPCWSTR domain; + HRESULT domain_hres; }; static const struct parse_test parse_tests[] = { - {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes}, - {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty}, - {url3, E_FAIL, url3, S_OK, path3, wszFile}, - {url4, E_FAIL, url4e, S_OK, path4, wszFile}, - {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp}, - {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout} + {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes, NULL, E_FAIL}, + {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty, NULL, E_FAIL}, + {url3, E_FAIL, url3, S_OK, path3, wszFile, wszEmpty, S_OK}, + {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK}, + {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK}, + {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL} }; static void test_CoInternetParseUrl(void) @@ -331,6 +335,13 @@ static void test_CoInternetParseUrl(void) ok(hres == S_OK, "[%d] schema failed: %08x\n", i, hres); ok(size == lstrlenW(parse_tests[i].schema), "[%d] wrong size\n", i); ok(!lstrcmpW(parse_tests[i].schema, buf), "[%d] wrong schema\n", i); + + memset(buf, 0xf0, sizeof(buf)); + hres = CoInternetParseUrl(parse_tests[i].url, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(WCHAR), &size, 0); + ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres); + if(parse_tests[i].domain) + ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf)); } }

1 0

Piotr Caban : shlwapi: Added special case for URL_PART_HOSTNAME in UrlGetPart.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 8de69a174aaf1b6337d5a854f3859d8425b9ea33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de69a174aaf1b6337d5a854f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:36 2009 +0100 shlwapi: Added special case for URL_PART_HOSTNAME in UrlGetPart. --- dlls/shlwapi/tests/url.c | 11 +++++++++++ dlls/shlwapi/url.c | 42 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index da051a1..ab3d0b6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -552,6 +552,17 @@ static void test_UrlGetPart(void) test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org"); test_url_part(http_url, URL_PART_PASSWORD, 0, "pass 123"); + + dwSize = sizeof(szPart); + res = UrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==S_FALSE, "returned %08x\n", res); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = UrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==S_FALSE, "returned %08x\n", res); + ok(szPart[0] == '\0', "szPart[0] = %c\n", szPart[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 198f17f..f8a5162 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2004,7 +2004,7 @@ HRESULT WINAPI UrlGetPartA(LPCSTR pszIn, LPSTR pszOut, LPDWORD pcchOut, len = INTERNET_MAX_URL_LENGTH; ret = UrlGetPartW(in, out, &len, dwPart, dwFlags); - if (ret != S_OK) { + if (FAILED(ret)) { HeapFree(GetProcessHeap(), 0, in); return ret; } @@ -2015,10 +2015,10 @@ HRESULT WINAPI UrlGetPartA(LPCSTR pszIn, LPSTR pszOut, LPDWORD pcchOut, HeapFree(GetProcessHeap(), 0, in); return E_POINTER; } - WideCharToMultiByte(0, 0, out, len+1, pszOut, *pcchOut, 0, 0); - *pcchOut = len2; + len2 = WideCharToMultiByte(0, 0, out, len+1, pszOut, *pcchOut, 0, 0); + *pcchOut = len2-1; HeapFree(GetProcessHeap(), 0, in); - return S_OK; + return ret; } /************************************************************************* @@ -2031,12 +2031,18 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, { WINE_PARSE_URL pl; HRESULT ret; - DWORD size, schsize; + DWORD scheme, size, schsize; LPCWSTR addr, schaddr; TRACE("(%s %p %p(%d) %08x %08x)\n", debugstr_w(pszIn), pszOut, pcchOut, *pcchOut, dwPart, dwFlags); + addr = strchrW(pszIn, ':'); + if(!addr) + return E_FAIL; + + scheme = get_scheme_code(pszIn, addr-pszIn); + ret = URL_ParseUrl(pszIn, &pl); if (ret == S_OK) { schaddr = pl.pScheme; @@ -2050,6 +2056,26 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, break; case URL_PART_HOSTNAME: + switch(scheme) { + case URL_SCHEME_FTP: + case URL_SCHEME_HTTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_TELNET: + case URL_SCHEME_FILE: + case URL_SCHEME_HTTPS: + break; + default: + return E_FAIL; + } + + if(scheme==URL_SCHEME_FILE && (!pl.szHostName || + (pl.szHostName==1 && *(pl.pHostName+1)==':'))) { + if(pcchOut) + *pszOut = '\0'; + *pcchOut = 0; + return S_FALSE; + } + if (!pl.szHostName) return E_INVALIDARG; addr = pl.pHostName; size = pl.szHostName; @@ -2101,7 +2127,13 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, *pcchOut = size; } TRACE("len=%d %s\n", *pcchOut, debugstr_w(pszOut)); + }else if(dwPart==URL_PART_HOSTNAME && scheme==URL_SCHEME_FILE) { + if(*pcchOut) + *pszOut = '\0'; + *pcchOut = 0; + return S_FALSE; } + return ret; }

1 0

Piotr Caban : shlwapi: Allow ' ' in hostname and password in UrlGetPart.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 1e0827f645d1a1d986a1aa4b77f9be794daee32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0827f645d1a1d986a1aa4b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:17 2009 +0100 shlwapi: Allow ' ' in hostname and password in UrlGetPart. --- dlls/shlwapi/tests/url.c | 8 ++++++++ dlls/shlwapi/url.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0138c35..da051a1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -519,6 +519,9 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const static void test_UrlGetPart(void) { + const char* file_url = "file://h o s t/c:/windows/file"; + const char* http_url = "http://user:pass 123(a)www.wine hq.org"; + CHAR szPart[INTERNET_MAX_URL_LENGTH]; DWORD dwSize; HRESULT res; @@ -544,6 +547,11 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + + test_url_part(file_url, URL_PART_HOSTNAME, 0, "h o s t"); + + test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org"); + test_url_part(http_url, URL_PART_PASSWORD, 0, "pass 123"); } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2b7a8cd..198f17f 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1856,7 +1856,8 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) (*start == '_') || (*start == '+') || (*start == '-') || - (*start == '.')) { + (*start == '.') || + (*start == ' ')) { start++; (*size)++; } else if (*start == '%') { @@ -1886,7 +1887,8 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) while (cont) { if (isalnumW(*start) || (*start == '-') || - (*start == '.') ) { + (*start == '.') || + (*start == ' ') ) { start++; (*size)++; }

1 0

Piotr Caban : mshtml: Added IElementBehavior{Site, Factory} to idl file.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: c23b0b0b4860440e206aba9c39a143707ff74ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23b0b0b4860440e206aba9c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:00 2009 +0100 mshtml: Added IElementBehavior{Site,Factory} to idl file. --- include/mshtml.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 5b390ee..4a182f2 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15085,4 +15085,45 @@ interface IHTMLEditServices : IUnknown [in] SELECTION_TYPE eType); } +/***************************************************************************** + * IElementBehaviorSite interface + */ +[ + odl, + uuid(3050F427-98B5-11CF-BB82-00AA00BDCE0B) +] +interface IElementBehaviorSite : IUnknown { + HRESULT GetElement([out, retval] IHTMLElement **ppElement); + HRESULT RegisterNotification([in] long lEvent); +} + +/***************************************************************************** + * IElementBehavior interface + */ +[ + odl, + uuid(3050F425-98B5-11CF-BB82-00AA00BDCE0B) +] +interface IElementBehavior : IUnknown { + HRESULT Init([in] IElementBehaviorSite *pBehaviorSite); + HRESULT Notify([in] long lEvent, [in, out] VARIANT *pVar); + HRESULT Detach(); +} + +/***************************************************************************** + * IElementBehaviorFactory interface + */ +[ + odl, + uuid(3050f429-98b5-11cf-bb82-00aa00bdce0b) +] +interface IElementBehaviorFactory : IUnknown +{ + HRESULT FindBehavior( + [in] BSTR bstrBehavior, + [in] BSTR bstrBehaviorUrl, + [in] IElementBehaviorSite *pSite, + [out] IElementBehavior **ppBehavior); +} + } /* library MSHTML */

1 0

Piotr Caban : oleaut32: Fix SysReAllocStringLen implementation.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 7e3fd4e3c67fef7d70f4372bfd56414a945b61da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3fd4e3c67fef7d70f4372bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:46:42 2009 +0100 oleaut32: Fix SysReAllocStringLen implementation. --- dlls/oleaut32/oleaut.c | 3 ++- dlls/oleaut32/tests/vartype.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 72b70e2..89e1ab9 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -294,6 +294,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) return 0; if (*old!=NULL) { + BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); *old = (BSTR)(ptr+1); @@ -302,7 +303,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) * when 'in' is NULL! * Some Microsoft program needs it. */ - if (str) memmove(*old, str, newbytelen); + if (str && old_copy!=str) memmove(*old, str, newbytelen); (*old)[len] = 0; } else { /* diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index a61c777..0c23a11 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5440,6 +5440,20 @@ static void test_SysReAllocStringLen(void) } } } + + /* Some Windows applications use the same pointer for pbstr and psz */ + str = SysAllocStringLen(szTest, 4); + ok(str != NULL, "Expected non-NULL\n"); + if(str) + { + int changed; + + changed = SysReAllocStringLen(&str, str, 1000000); + ok(SysStringLen(str)==1000000, "Incorrect string length\n"); + ok(!memcmp(szTest, str, 4*sizeof(WCHAR)), "Incorrect string returned\n"); + + SysFreeString(str); + } } static void test_BstrCopy(void)

1 0

Piotr Caban : mshtml: Added IObjectWithSite stubs.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 17bec80f71f04115cfa80d8785aa516cab132df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bec80f71f04115cfa80d878… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:46:24 2009 +0100 mshtml: Added IObjectWithSite stubs. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/oleobj.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57d4fc6..84f6cc8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1748,6 +1748,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IMarshal, riid)) { TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { + TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); + *ppv = OBJSITE(This); }else { return FALSE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index afd0bff..98abec2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -323,6 +323,7 @@ struct HTMLDocument { const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; + const IObjectWithSiteVtbl *lpObjectWithSiteVtbl; IUnknown *unk_impl; IDispatchEx *dispex; @@ -577,6 +578,7 @@ struct HTMLDocumentNode { #define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) #define PERSISTHIST(x) ((IPersistHistory*) &(x)->lpPersistHistoryVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) +#define OBJSITE(x) ((IObjectWithSite*) &(x)->lpObjectWithSiteVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 872d766..3dec3dc 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -732,6 +732,54 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +/********************************************************** + * IObjectWithSite implementation + */ + +#define OBJSITE_THIS(iface) DEFINE_THIS(HTMLDocument, ObjectWithSite, iface) + +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject); +} + +static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *pUnkSite) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUnkSite); + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite* iface, REFIID riid, PVOID *ppvSite) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppvSite); + return E_NOTIMPL; +} + +#undef OBJSITE_THIS + +static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { + ObjectWithSite_QueryInterface, + ObjectWithSite_AddRef, + ObjectWithSite_Release, + ObjectWithSite_SetSite, + ObjectWithSite_GetSite +}; + void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) { IOleContainer *container; @@ -753,4 +801,5 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->lpOleObjectVtbl = &OleObjectVtbl; This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; + This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; }

1 0

Piotr Caban : mshtml: Added ViewObjectEx stub implementation.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: bffa74a1c3b540056775aefc42a7ebe153107b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffa74a1c3b540056775aefc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:45:34 2009 +0100 mshtml: Added ViewObjectEx stub implementation. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 7 ++-- dlls/mshtml/view.c | 73 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eb1c782..57d4fc6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1697,6 +1697,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2, %p)\n", This, ppv); *ppv = VIEWOBJ2(This); + }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { + TRACE("(%p)->(IID_IViewObjectEx, %p)\n", This, ppv); + *ppv = VIEWOBJEX(This); }else if(IsEqualGUID(&IID_IOleWindow, riid)) { TRACE("(%p)->(IID_IOleWindow, %p)\n", This, ppv); *ppv = OLEWIN(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4fb4c89..afd0bff 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -314,7 +314,7 @@ struct HTMLDocument { const IOleDocumentVtbl *lpOleDocumentVtbl; const IOleDocumentViewVtbl *lpOleDocumentViewVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; - const IViewObject2Vtbl *lpViewObject2Vtbl; + const IViewObjectExVtbl *lpViewObjectExVtbl; const IOleInPlaceObjectWindowlessVtbl *lpOleInPlaceObjectWindowlessVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; @@ -564,8 +564,9 @@ struct HTMLDocumentNode { #define DOCVIEW(x) ((IOleDocumentView*) &(x)->lpOleDocumentViewVtbl) #define OLEWIN(x) ((IOleWindow*) &(x)->lpOleInPlaceActiveObjectVtbl) #define ACTOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) -#define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObject2Vtbl) -#define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObject2Vtbl) +#define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectExVtbl) +#define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectExVtbl) +#define VIEWOBJEX(x) ((IViewObjectEx*) &(x)->lpViewObjectExVtbl) #define INPLACEOBJ(x) ((IOleInPlaceObject*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define INPLACEWIN(x) ((IOleInPlaceObjectWindowless*) &(x)->lpOleInPlaceObjectWindowlessVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 271a167..f4c62a0 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -751,27 +751,27 @@ static const IOleDocumentViewVtbl OleDocumentViewVtbl = { * IViewObject implementation */ -#define VIEWOBJ_THIS(iface) DEFINE_THIS(HTMLDocument, ViewObject2, iface) +#define VIEWOBJ_THIS(iface) DEFINE_THIS(HTMLDocument, ViewObjectEx, iface) -static HRESULT WINAPI ViewObject_QueryInterface(IViewObject2 *iface, REFIID riid, void **ppvObject) +static HRESULT WINAPI ViewObject_QueryInterface(IViewObjectEx *iface, REFIID riid, void **ppvObject) { HTMLDocument *This = VIEWOBJ_THIS(iface); return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject); } -static ULONG WINAPI ViewObject_AddRef(IViewObject2 *iface) +static ULONG WINAPI ViewObject_AddRef(IViewObjectEx *iface) { HTMLDocument *This = VIEWOBJ_THIS(iface); return IHTMLDocument2_AddRef(HTMLDOC(This)); } -static ULONG WINAPI ViewObject_Release(IViewObject2 *iface) +static ULONG WINAPI ViewObject_Release(IViewObjectEx *iface) { HTMLDocument *This = VIEWOBJ_THIS(iface); return IHTMLDocument2_Release(HTMLDOC(This)); } -static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, +static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue), ULONG_PTR dwContinue) { @@ -781,7 +781,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, L return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, +static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet) { HTMLDocument *This = VIEWOBJ_THIS(iface); @@ -789,7 +789,7 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwDrawAs return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, +static HRESULT WINAPI ViewObject_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) { HTMLDocument *This = VIEWOBJ_THIS(iface); @@ -797,28 +797,28 @@ static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Unfreeze(IViewObject2 *iface, DWORD dwFreeze) +static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) { HTMLDocument *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%d)\n", This, dwFreeze); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) +static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { HTMLDocument *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, pAdvSink); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetAdvise(IViewObject2 *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) +static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { HTMLDocument *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%p %p %p)\n", This, pAspects, pAdvf, ppAdvSink); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, +static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE* ptd, LPSIZEL lpsizel) { HTMLDocument *This = VIEWOBJ_THIS(iface); @@ -826,9 +826,49 @@ static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwDrawAspe return E_NOTIMPL; } +static HRESULT WINAPI ViewObject_GetRect(IViewObjectEx *iface, DWORD dwAspect, LPRECTL pRect) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p)\n", This, dwAspect, pRect); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, pdwStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx* iface, DWORD dwAspect, + LPCRECT pRectBounds, POINT ptlLoc, LONG lCloseHint, DWORD *pHitResult) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p (%d %d) %d %p)\n", This, dwAspect, pRectBounds, ptlLoc.x, + ptlLoc.y, lCloseHint, pHitResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx *iface, DWORD dwAspect, + LPCRECT pRectBounds, LPCRECT pRectLoc, LONG lCloseHint, DWORD *pHitResult) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectLoc, lCloseHint, pHitResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetNaturalExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, + DVTARGETDEVICE *ptd, HDC hicTargetDev, DVEXTENTINFO *pExtentInfo, LPSIZEL pSizel) +{ + HTMLDocument *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %d %p %p %p %p\n", This, dwAspect,lindex, ptd, + hicTargetDev, pExtentInfo, pSizel); + return E_NOTIMPL; +} + #undef VIEWOBJ_THIS -static const IViewObject2Vtbl ViewObjectVtbl = { +static const IViewObjectExVtbl ViewObjectVtbl = { ViewObject_QueryInterface, ViewObject_AddRef, ViewObject_Release, @@ -838,11 +878,16 @@ static const IViewObject2Vtbl ViewObjectVtbl = { ViewObject_Unfreeze, ViewObject_SetAdvise, ViewObject_GetAdvise, - ViewObject_GetExtent + ViewObject_GetExtent, + ViewObject_GetRect, + ViewObject_GetViewStatus, + ViewObject_QueryHitPoint, + ViewObject_QueryHitRect, + ViewObject_GetNaturalExtent }; void HTMLDocument_View_Init(HTMLDocument *This) { This->lpOleDocumentViewVtbl = &OleDocumentViewVtbl; - This->lpViewObject2Vtbl = &ViewObjectVtbl; + This->lpViewObjectExVtbl = &ViewObjectVtbl; }

1 0

Stefan Dösinger : wined3d: Fix VBO buffer usage.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 8eeb513b1a0e7a4f7963612f0305850499c9ec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eeb513b1a0e7a4f7963612f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 28 11:38:29 2009 +0100 wined3d: Fix VBO buffer usage. --- dlls/wined3d/buffer.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f6e89dd..ff1ebd7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -79,22 +79,17 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) } /* Don't use static, because dx apps tend to update the buffer - * quite often even if they specify 0 usage. Because we always keep the local copy - * we never read from the vbo and can create a write only opengl buffer. - */ - switch(This->resource.usage & (WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC)) + * quite often even if they specify 0 usage. + */ + if(This->resource.usage & WINED3DUSAGE_DYNAMIC) + { + TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); + gl_usage = GL_DYNAMIC_DRAW_ARB; + } + else { - case WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC: - case WINED3DUSAGE_DYNAMIC: - TRACE("Gl usage = GL_STREAM_DRAW\n"); - gl_usage = GL_STREAM_DRAW_ARB; - break; - - case WINED3DUSAGE_WRITEONLY: - default: - TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; - break; + TRACE("Gl usage = GL_STREAM_DRAW\n"); + gl_usage = GL_STREAM_DRAW_ARB; } /* Reserve memory for the buffer. The amount of data won't change

1 0

Stefan Dösinger : wined3d: Don' t render single buffered swapchains to a FBO.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 718e55b9a6b495c9bd802fbee96926bb8f86a8a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718e55b9a6b495c9bd802fbee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 15 20:16:19 2009 +0100 wined3d: Don't render single buffered swapchains to a FBO. --- dlls/wined3d/device.c | 9 +++++++-- dlls/wined3d/swapchain.c | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e97fb7..9d603d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6527,8 +6527,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE RECT client_rect; GetClientRect(swapchain->win_handle, &client_rect); - if(swapchain->presentParms.BackBufferWidth != client_rect.right || - swapchain->presentParms.BackBufferHeight != client_rect.bottom) + if(!swapchain->presentParms.BackBufferCount) + { + TRACE("Single buffered rendering\n"); + swapchain->render_to_fbo = FALSE; + } + else if(swapchain->presentParms.BackBufferWidth != client_rect.right || + swapchain->presentParms.BackBufferHeight != client_rect.bottom ) { TRACE("Rendering to FBO. Backbuffer %ux%u, window %ux%u\n", swapchain->presentParms.BackBufferWidth, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7e6c71e..d2c7ef2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -739,6 +739,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface swapchain->presentParms = *present_parameters; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && present_parameters->BackBufferCount && (present_parameters->BackBufferWidth != client_rect.right || present_parameters->BackBufferHeight != client_rect.bottom)) {

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 December 2009