November 2011 - Wine-commits

Nikolay Sivov : msxml3: Properly handle qualified names in getAttributeNode ().
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: f87aee778da3109b6065f1bdd2fb2636ce17f95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87aee778da3109b6065f1bdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 14 13:48:36 2011 +0300 msxml3: Properly handle qualified names in getAttributeNode(). --- dlls/msxml3/element.c | 53 ++++++++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 82 ++++++++++++++++++++++++++++++++------------ 2 files changed, 97 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0863a16..57fef4c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1171,40 +1171,61 @@ static HRESULT WINAPI domelem_getAttributeNode( BSTR p, IXMLDOMAttribute** attributeNode ) { domelem *This = impl_from_IXMLDOMElement( iface ); - xmlChar *xml_name; + xmlChar *local, *prefix, *nameA; + HRESULT hr = S_FALSE; xmlNodePtr element; xmlAttrPtr attr; - IUnknown *unk; - HRESULT hr = S_FALSE; TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), attributeNode); - if(!attributeNode) + element = get_element( This ); + if (!element) return E_FAIL; + + if (attributeNode) *attributeNode = NULL; + + nameA = xmlchar_from_wchar(p); + if (!xmlValidateNameValue(nameA)) + { + heap_free(nameA); return E_FAIL; + } + + if (!attributeNode) + { + heap_free(nameA); + return S_FALSE; + } *attributeNode = NULL; - element = get_element( This ); - if ( !element ) - return E_FAIL; + local = xmlSplitQName2(nameA, &prefix); - xml_name = xmlchar_from_wchar(p); + if (local) + { + /* try to get namespace for supplied qualified name */ + xmlNsPtr ns = xmlSearchNs(element->doc, element, prefix); + xmlFree(prefix); - if(!xmlValidateNameValue(xml_name)) + attr = xmlHasNsProp(element, local, ns ? ns->href : NULL); + xmlFree(local); + } + else { - heap_free(xml_name); - return E_FAIL; + attr = xmlHasProp(element, nameA); + /* attribute has attached namespace and we requested non-qualified + name - it's a failure case */ + if (attr && attr->ns) attr = NULL; } - attr = xmlHasProp(element, xml_name); - if(attr) { - unk = create_attribute((xmlNodePtr)attr); + heap_free(nameA); + + if (attr) + { + IUnknown *unk = create_attribute((xmlNodePtr)attr); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } - heap_free(xml_name); - return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dfad107..eb1270d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1393,9 +1393,9 @@ static const CHAR szNonUnicodeXML[] = "<?xml version='1.0' encoding='Windows-1252'?>\n" "<open></open>\n"; -static const CHAR szExampleXML[] = +static const char szExampleXML[] = "<?xml version='1.0' encoding='utf-8'?>\n" -"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" +"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' a=\"attr a\" foo:b=\"attr b\" >\n" " <elem>\n" " <a>A1 field</a>\n" " <b>B1 field</b>\n" @@ -1752,10 +1752,10 @@ static const char default_ns_doc[] = { " d=\"d attr\" />" }; -static const WCHAR szNonExistentFile[] = { +static const WCHAR nonexistent_fileW[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; -static const WCHAR szNonExistentAttribute[] = { +static const WCHAR nonexistent_attrW[] = { 'n','o','n','E','x','i','s','i','t','i','n','g','A','t','t','r','i','b','u','t','e',0 }; static const WCHAR szDocument[] = { @@ -2066,7 +2066,7 @@ if (0) /* try to load a document from a nonexistent file */ b = VARIANT_TRUE; - str = SysAllocString( szNonExistentFile ); + str = SysAllocString( nonexistent_fileW ); VariantInit(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = str; @@ -2776,7 +2776,7 @@ static void test_domnode( void ) ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n"); SysFreeString( str ); - str = SysAllocString( szNonExistentFile ); + str = SysAllocString( nonexistent_fileW ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); @@ -2784,22 +2784,6 @@ static void test_domnode( void ) ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); - r = IXMLDOMElement_getAttributeNode( element, str, NULL); - ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); - - attr = (IXMLDOMAttribute*)0xdeadbeef; - r = IXMLDOMElement_getAttributeNode( element, str, &attr); - ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); - ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - SysFreeString( str ); - - attr = (IXMLDOMAttribute*)0xdeadbeef; - str = SysAllocString( szNonExistentAttribute ); - r = IXMLDOMElement_getAttributeNode( element, str, &attr); - ok( r == S_FALSE, "getAttributeNode ret %08x\n", r ); - ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - SysFreeString( str ); - str = SysAllocString( szdl ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; @@ -10662,6 +10646,59 @@ static void test_parseerror(void) IXMLDOMDocument_Release(doc); } +static void test_getAttributeNode(void) +{ + IXMLDOMAttribute *attr; + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + str = SysAllocString(nonexistent_fileW); + hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); + EXPECT_HR(hr, E_FAIL); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + hr = IXMLDOMElement_getAttributeNode(elem, str, &attr); + EXPECT_HR(hr, E_FAIL); + ok(attr == NULL, "got %p\n", attr); + SysFreeString(str); + + str = SysAllocString(nonexistent_attrW); + hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); + EXPECT_HR(hr, S_FALSE); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + hr = IXMLDOMElement_getAttributeNode(elem, str, &attr); + EXPECT_HR(hr, S_FALSE); + ok(attr == NULL, "got %p\n", attr); + SysFreeString(str); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("foo:b"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("b"), &attr); + EXPECT_HR(hr, S_FALSE); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("a"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -10735,6 +10772,7 @@ START_TEST(domdoc) test_load(); test_dispex(); test_parseerror(); + test_getAttributeNode(); test_xsltemplate();

1 0

Hans Leidekker : ws2_32: Fix handling of NULL and empty hostname in getaddrinfo/GetAddrInfoW.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 75be2284e13d327d93a9665eb32cd901cbed7234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75be2284e13d327d93a9665eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 15 11:38:20 2011 +0100 ws2_32: Fix handling of NULL and empty hostname in getaddrinfo/GetAddrInfoW. --- dlls/ws2_32/socket.c | 56 +++++++++++++++++---------- dlls/ws2_32/tests/sock.c | 95 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 116 insertions(+), 35 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 00a15b6..fe645c1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4785,6 +4785,22 @@ static int convert_eai_u2w(int unixret) { return unixret; } +static char *get_hostname(void) +{ + char *ret; + DWORD size = 0; + + GetComputerNameExA( ComputerNamePhysicalDnsHostname, NULL, &size ); + if (GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!GetComputerNameExA( ComputerNamePhysicalDnsHostname, ret, &size )) + { + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } + return ret; +} + /*********************************************************************** * getaddrinfo (WS2_32.@) */ @@ -4794,17 +4810,19 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - CHAR *node = NULL, *serv = NULL; + char *hostname = NULL; + const char *node; - if (nodename) - if (!(node = strdup_lower(nodename))) return WSA_NOT_ENOUGH_MEMORY; + if (!nodename && !servname) return WSAHOST_NOT_FOUND; - if (servname) { - if (!(serv = strdup_lower(servname))) { - HeapFree(GetProcessHeap(), 0, node); - return WSA_NOT_ENOUGH_MEMORY; - } - } + if (!nodename) + node = "localhost"; + else if (!nodename[0]) + node = hostname = get_hostname(); + else + node = nodename; + + if (!node) return WSA_NOT_ENOUGH_MEMORY; if (hints) { punixhints = &unixhints; @@ -4826,12 +4844,10 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr } /* getaddrinfo(3) is thread safe, no need to wrap in CS */ - result = getaddrinfo(nodename, servname, punixhints, &unixaires); + result = getaddrinfo(node, servname, punixhints, &unixaires); TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); - - HeapFree(GetProcessHeap(), 0, node); - HeapFree(GetProcessHeap(), 0, serv); + HeapFree(GetProcessHeap(), 0, hostname); if (!result) { struct addrinfo *xuai = unixaires; @@ -4991,15 +5007,15 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { int ret, len; - char *nodenameA, *servnameA = NULL; + char *nodenameA = NULL, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; - if (!nodename) return WSAHOST_NOT_FOUND; - - len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); - if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; - WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL); - + if (nodename) + { + len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); + if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; + WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL); + } if (servname) { len = WideCharToMultiByte(CP_ACP, 0, servname, -1, NULL, 0, NULL, NULL); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 237bc86..7b5dde8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -59,9 +59,11 @@ k.keepaliveinterval = interval; /* Function pointers */ -static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW) = 0; -static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *) = 0; -static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG) = 0; +static void (WINAPI *pfreeaddrinfo)(struct addrinfo *); +static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct addrinfo **); +static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); +static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); +static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); /**************** Structs and typedefs ***************/ @@ -1002,6 +1004,8 @@ static void Init (void) WSADATA data; HMODULE hws2_32 = GetModuleHandle("ws2_32.dll"); + pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); + pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); @@ -4153,7 +4157,6 @@ static void test_GetAddrInfoW(void) static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR zero[] = {'0',0}; - int ret; ADDRINFOW *result, hint; @@ -4162,7 +4165,6 @@ static void test_GetAddrInfoW(void) win_skip("GetAddrInfoW and/or FreeAddrInfoW not present\n"); return; } - memset(&hint, 0, sizeof(ADDRINFOW)); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); @@ -4170,44 +4172,107 @@ static void test_GetAddrInfoW(void) result = NULL; ret = pGetAddrInfoW(empty, NULL, NULL, &result); - todo_wine - { ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - } pFreeAddrInfoW(result); result = NULL; ret = pGetAddrInfoW(NULL, zero, NULL, &result); - todo_wine - { ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - } pFreeAddrInfoW(result); result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); - todo_wine - { ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); - } pFreeAddrInfoW(result); + result = NULL; ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + result = NULL; + ret = pGetAddrInfoW(localhost, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoW(result); + + result = NULL; + ret = pGetAddrInfoW(localhost, zero, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(localhost, port, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + result = NULL; ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); } +static void test_getaddrinfo(void) +{ + int ret; + ADDRINFOA *result, hint; + + if (!pgetaddrinfo || !pfreeaddrinfo) + { + win_skip("getaddrinfo and/or freeaddrinfo not present\n"); + return; + } + memset(&hint, 0, sizeof(ADDRINFOA)); + + ret = pgetaddrinfo(NULL, NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + + result = NULL; + ret = pgetaddrinfo("", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo(NULL, "0", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("", "0", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "0", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "80", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; + ret = pgetaddrinfo("localhost", "80", &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); +} + static void test_ConnectEx(void) { SOCKET listener = INVALID_SOCKET; @@ -5153,7 +5218,7 @@ START_TEST( sock ) test_ipv6only(); test_GetAddrInfoW(); - + test_getaddrinfo(); test_AcceptEx(); test_ConnectEx();

1 0

Hans Leidekker : winhttp: Implement WinHttpDetectAutoProxyConfigUrl.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 96f2e7139cb14b1711c0dc22fea1f9eb47802df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f2e7139cb14b1711c0dc22f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 15 09:11:05 2011 +0100 winhttp: Implement WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/session.c | 107 ++++++++++++++++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 39 +++++++++++++++ include/winhttp.h | 3 + 3 files changed, 146 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b7cc31b..c187079 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1113,15 +1113,116 @@ BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, LPVOID buffer, DWO return ret; } +static char *get_computer_name( COMPUTER_NAME_FORMAT format ) +{ + char *ret; + DWORD size = 0; + + GetComputerNameExA( format, NULL, &size ); + if (GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = heap_alloc( size ))) return NULL; + if (!GetComputerNameExA( format, ret, &size )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +static BOOL is_domain_suffix( const char *domain, const char *suffix ) +{ + int len_domain = strlen( domain ), len_suffix = strlen( suffix ); + + if (len_suffix > len_domain) return FALSE; + if (!strcasecmp( domain + len_domain - len_suffix, suffix )) return TRUE; + return FALSE; +} + +static WCHAR *build_wpad_url( const struct addrinfo *ai ) +{ + static const WCHAR fmtW[] = + {'h','t','t','p',':','/','/','%','u','.','%','u','.','%','u','.','%','u', + '/','w','p','a','d','.','d','a','t',0}; + struct sockaddr_in *addr; + WCHAR *ret; + + while (ai && ai->ai_family != AF_INET) ai = ai->ai_next; + if (!ai) return NULL; + + if (!(ret = GlobalAlloc( 0, sizeof(fmtW) + 12 * sizeof(WCHAR) ))) return NULL; + addr = (struct sockaddr_in *)ai->ai_addr; + sprintfW( ret, fmtW, + (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 24 & 0xff), + (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 16 & 0xff), + (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 8 & 0xff), + (unsigned int)(ntohl( addr->sin_addr.s_addr ) & 0xff) ); + return ret; +} + /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) { - FIXME("0x%08x, %p\n", flags, url); + BOOL ret = FALSE; - set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); - return FALSE; + TRACE("0x%08x, %p\n", flags, url); + + if (!flags || !url) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) FIXME("discovery via DHCP not supported\n"); + if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A) + { +#ifdef HAVE_GETADDRINFO + char *fqdn, *domain, *p; + + if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return FALSE; + if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) + { + heap_free( fqdn ); + return FALSE; + } + p = fqdn; + while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) + { + struct addrinfo *ai; + char *name; + int res; + + if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) + { + heap_free( fqdn ); + heap_free( domain ); + return FALSE; + } + strcpy( name, "wpad" ); + strcat( name, p ); + res = getaddrinfo( name, NULL, NULL, &ai ); + heap_free( name ); + if (!res) + { + *url = build_wpad_url( ai ); + freeaddrinfo( ai ); + if (*url) + { + TRACE("returning %s\n", debugstr_w(*url)); + ret = TRUE; + break; + } + } + p++; + } + heap_free( domain ); + heap_free( fqdn ); +#else + FIXME("getaddrinfo not found at build time\n"); +#endif + } + if (!ret) set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED ); + return ret; } static const WCHAR Connections[] = { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index acf88dc..f481a82 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2518,6 +2518,44 @@ static void test_IWinHttpRequest(void) CoUninitialize(); } +static void test_WinHttpDetectAutoProxyConfigUrl(void) +{ + BOOL ret; + WCHAR *url; + DWORD error; + + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + url = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + url = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); + error = GetLastError(); + if (!ret) + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + else + { + trace("%s\n", wine_dbgstr_w(url)); + GlobalFree( url ); + } +} + START_TEST (winhttp) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -2540,6 +2578,7 @@ START_TEST (winhttp) test_resolve_timeout(); test_credentials(); test_IWinHttpRequest(); + test_WinHttpDetectAutoProxyConfigUrl(); si.event = CreateEvent(NULL, 0, 0, NULL); si.port = 7532; diff --git a/include/winhttp.h b/include/winhttp.h index 68bec0a..36f8b9d 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -503,6 +503,9 @@ typedef struct typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); +#define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001 +#define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002 + typedef struct { DWORD dwFlags;

1 0

Hans Leidekker : winhttp: Accept a missing buffer when parsing a decoded URL.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: dcf1a81d8cf5ac324c1a743cc54dafcec5a5e874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf1a81d8cf5ac324c1a743cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 15 09:11:27 2011 +0100 winhttp: Accept a missing buffer when parsing a decoded URL. --- dlls/winhttp/tests/url.c | 21 ++++++++++++++++++--- dlls/winhttp/url.c | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index e753351..7de31f2 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -67,8 +67,8 @@ static const WCHAR url11[] = '@','w','w','w','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3','/','s','i','t','e','/','a','b','o','u','t','?','q','u','e','r','y',0}; static const WCHAR url12[] = {'h','t','t','p',':','/','/','e','x','a','m','p','l','e','.','n','e','t','/','p','a','t','h','?','v','a','r','1','=','e','x','a','m','p','l','e','@','e','x','a','m','p','l','e','.','c','o','m','&','v','a','r','2','=','x','&','v','a','r','3','=','y', 0}; - - +static const WCHAR url13[] = + {'h','t','t','p','s',':','/','/','t','o','o','l','s','.','g','o','o','g','l','e','.','c','o','m','/','s','e','r','v','i','c','e','/','u','p','d','a','t','e','2','?','w','=','3',':','B','x','D','H','o','W','y','8','e','z','M',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -570,7 +570,6 @@ static void WinHttpCrackUrl_test( void ) reset_url_components( &uc ); ret = WinHttpCrackUrl( url12, 0, 0, &uc); - ok( ret, "WinHttpCrackUrl failed\n" ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url12,"unexpected scheme\n" ); @@ -584,6 +583,22 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwUrlPathLength == 5, "unexpected path length\n" ); ok( uc.lpszExtraInfo == url12 + 23, "unexpected extra info\n" ); ok( uc.dwExtraInfoLength == 39, "unexpected extra info length\n" ); + + uc.lpszScheme = scheme; + uc.dwSchemeLength = 20; + uc.lpszHostName = host; + uc.dwHostNameLength = 20; + uc.lpszUserName = NULL; + uc.dwUserNameLength = 0; + uc.lpszPassword = NULL; + uc.dwPasswordLength = 0; + uc.lpszUrlPath = path; + uc.dwUrlPathLength = 40; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; + uc.nPort = 0; + ret = WinHttpCrackUrl( url13, 0, ICU_DECODE, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index a662855..3938801 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -38,7 +38,7 @@ static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, { if (!*str) { - if (len && (flags & ICU_DECODE)) + if (len && *str_len && (flags & ICU_DECODE)) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE;

1 0

Jacek Caban : ieframe: Store ShellBrowser in DocHost instead of creating it on every QueryService call .
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: c05558a245bb50169b5169195ca573fec70f0588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05558a245bb50169b5169195… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:28:15 2011 +0100 ieframe: Store ShellBrowser in DocHost instead of creating it on every QueryService call. --- dlls/ieframe/client.c | 19 ++++++++++--------- dlls/ieframe/ieframe.h | 17 ++++++++++++++++- dlls/ieframe/shellbrowser.c | 32 ++++++++++++++++---------------- dlls/ieframe/webbrowser.c | 1 - 4 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index 970e28d..d74a303 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -672,18 +672,17 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE } if(IsEqualGUID(&IID_IShellBrowser, guidService)) { - IShellBrowser *sb; - HRESULT hres; - TRACE("(%p)->(IID_IShellBrowser %s %p)\n", This, debugstr_guid(riid), ppv); - hres = ShellBrowser_Create(&sb); - if(FAILED(hres)) - return hres; + if(!This->browser_service) { + HRESULT hres; - hres = IShellBrowser_QueryInterface(sb, riid, ppv); - IShellBrowser_Release(sb); - return hres; + hres = create_browser_service(This, &This->browser_service); + if(FAILED(hres)) + return hres; + } + + return IShellBrowser_QueryInterface(&This->browser_service->IShellBrowser_iface, riid, ppv); } FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); @@ -710,6 +709,8 @@ void DocHost_ClientSite_Init(DocHost *This) void DocHost_ClientSite_Release(DocHost *This) { + if(This->browser_service) + detach_browser_service(This->browser_service); if(This->view) IOleDocumentView_Release(This->view); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 89f69fa..d81e166 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -35,6 +35,8 @@ #include "exdisp.h" #include "hlink.h" #include "htiframe.h" +#include "shdeprecated.h" +#include "docobjectservice.h" #include "wine/unicode.h" #include "wine/list.h" @@ -71,6 +73,16 @@ typedef struct _task_header_t { task_destr_t destr; } task_header_t; +typedef struct { + IShellBrowser IShellBrowser_iface; + IBrowserService IBrowserService_iface; + IDocObjectService IDocObjectService_iface; + + LONG ref; + + DocHost *doc_host; +} ShellBrowser; + typedef struct _IDocHostContainerVtbl { ULONG (*addref)(DocHost*); @@ -123,6 +135,8 @@ struct DocHost { DWORD prop_notif_cookie; BOOL is_prop_notif; + ShellBrowser *browser_service; + ConnectionPointContainer cps; }; @@ -213,7 +227,8 @@ void release_dochost_client(DocHost*) DECLSPEC_HIDDEN; void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*) DECLSPEC_HIDDEN; BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT ShellBrowser_Create(IShellBrowser**) DECLSPEC_HIDDEN; +HRESULT create_browser_service(DocHost*,ShellBrowser**) DECLSPEC_HIDDEN; +void detach_browser_service(ShellBrowser*) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index c3ff6c8..be15613 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -18,23 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "ieframe.h" +#include <assert.h> -#include "shdeprecated.h" -#include "docobjectservice.h" +#include "ieframe.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ieframe); -typedef struct { - IShellBrowser IShellBrowser_iface; - IBrowserService IBrowserService_iface; - IDocObjectService IDocObjectService_iface; - - LONG ref; -} ShellBrowser; - static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) { return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface); @@ -77,16 +68,18 @@ static ULONG WINAPI ShellBrowser_AddRef( return ref; } -static ULONG WINAPI ShellBrowser_Release( - IShellBrowser* iface) +static ULONG WINAPI ShellBrowser_Release(IShellBrowser* iface) { ShellBrowser *This = impl_from_IShellBrowser(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + assert(!This->doc_host); heap_free(This); + } + return ref; } @@ -759,7 +752,7 @@ static const IDocObjectServiceVtbl DocObjectServiceVtbl = { DocObjectService_IsErrorUrl }; -HRESULT ShellBrowser_Create(IShellBrowser **ppv) +HRESULT create_browser_service(DocHost *doc_host, ShellBrowser **ret) { ShellBrowser *sb; @@ -772,7 +765,14 @@ HRESULT ShellBrowser_Create(IShellBrowser **ppv) sb->IDocObjectService_iface.lpVtbl = &DocObjectServiceVtbl; sb->ref = 1; + sb->doc_host = doc_host; - *ppv = &sb->IShellBrowser_iface; + *ret = sb; return S_OK; } + +void detach_browser_service(ShellBrowser *sb) +{ + sb->doc_host = NULL; + IShellBrowser_Release(&sb->IShellBrowser_iface); +} diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index d1004df..706600d 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -23,7 +23,6 @@ #include "exdispid.h" #include "mshtml.h" -#include "shdeprecated.h" #include "wine/debug.h"

1 0

Jacek Caban : ieframe: Added IDocObjectService:: FireBeforeNavigate2 implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 4816929cfeb0018d7a3247237ea286f1d10df2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4816929cfeb0018d7a3247237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:28:32 2011 +0100 ieframe: Added IDocObjectService::FireBeforeNavigate2 implementation. --- dlls/ieframe/shellbrowser.c | 68 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index be15613..a81fa16 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -21,6 +21,7 @@ #include <assert.h> #include "ieframe.h" +#include "exdispid.h" #include "wine/debug.h" @@ -646,10 +647,73 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( BOOL *pfCancel) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), + VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; + VARIANTARG params[7]; + DISPPARAMS dp = {params, NULL, 7, 0}; + VARIANT_BOOL cancel = VARIANT_FALSE; + SAFEARRAY *post_data; + + TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, debugstr_w(lpszHeaders), fPlayNavSound, pfCancel); - return E_NOTIMPL; + + if(cbPostData) { + post_data = SafeArrayCreateVector(VT_UI1, 0, cbPostData); + memcpy(post_data->pvData, pPostData, cbPostData); + if(!post_data) + return E_OUTOFMEMORY; + }else { + post_data = NULL; + } + + V_VT(params) = VT_BOOL|VT_BYREF; + V_BOOLREF(params) = &cancel; + + V_VT(params+1) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+1) = &var_headers; + V_VT(&var_headers) = VT_BSTR; + V_BSTR(&var_headers) = lpszHeaders ? SysAllocString(lpszHeaders) : NULL; + + V_VT(params+2) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+2) = &var_post_data2; + V_VT(&var_post_data2) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(&var_post_data2) = &var_post_data; + + if(post_data) { + V_VT(&var_post_data) = VT_UI1|VT_ARRAY; + V_ARRAY(&var_post_data) = post_data; + }else { + V_VT(&var_post_data) = VT_EMPTY; + } + + V_VT(params+3) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+3) = &var_frame_name; + V_VT(&var_frame_name) = VT_BSTR; + V_BSTR(&var_frame_name) = NULL; + + V_VT(params+4) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+4) = &var_flags; + V_VT(&var_flags) = VT_I4; + V_I4(&var_flags) = 0; + + V_VT(params+5) = (VT_BYREF|VT_VARIANT); + V_VARIANTREF(params+5) = &var_url; + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = SysAllocString(lpszUrl); + + V_VT(params+6) = (VT_DISPATCH); + V_DISPATCH(params+6) = This->doc_host->disp; + + TRACE(">>>\n"); + call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); + TRACE("<<<\n"); + + SysFreeString(V_BSTR(&var_url)); + SysFreeString(V_BSTR(&var_headers)); + SafeArrayDestroy(post_data); + + *pfCancel = !!cancel; + return S_OK; } static HRESULT WINAPI DocObjectService_FireNavigateComplete2(

1 0

Jacek Caban : ieframe: Added IDocObjectService:: FireNavigateComplete2 implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 60dc3d628025ee5e70c7f0b7775413683ff1160a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60dc3d628025ee5e70c7f0b77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:28:47 2011 +0100 ieframe: Added IDocObjectService::FireNavigateComplete2 implementation. --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 2 +- dlls/ieframe/shellbrowser.c | 40 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index d81e166..4c32e52 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -237,6 +237,7 @@ void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; +HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; HRESULT dochost_object_available(DocHost*,IUnknown*) DECLSPEC_HIDDEN; void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index ab009aa..6c0ce41 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -110,7 +110,7 @@ static void set_status_text(BindStatusCallback *This, LPCWSTR str) IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); } -static HRESULT set_dochost_url(DocHost *This, const WCHAR *url) +HRESULT set_dochost_url(DocHost *This, const WCHAR *url) { WCHAR *new_url; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index a81fa16..79ee378 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -722,8 +722,44 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %p %x\n", This, pHTMLWindow2, dwFlags); - return E_NOTIMPL; + IHTMLPrivateWindow *priv_window; + VARIANTARG params[2]; + DISPPARAMS dp = {params, NULL, 2, 0}; + VARIANT url_var; + BSTR url; + HRESULT hres; + + TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + + hres = IHTMLWindow2_QueryInterface(pHTMLWindow2, &IID_IHTMLPrivateWindow, (void**)&priv_window); + if(FAILED(hres)) + return hres; + + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &url); + IHTMLPrivateWindow_Release(priv_window); + if(FAILED(hres)) + return hres; + + TRACE("got URL %s\n", debugstr_w(url)); + set_dochost_url(This->doc_host, url); + + V_VT(params) = (VT_BYREF|VT_VARIANT); + V_BYREF(params) = &url; + + V_VT(params+1) = VT_DISPATCH; + V_DISPATCH(params+1) = This->doc_host->disp; + + V_VT(&url_var) = VT_BSTR; + V_BSTR(&url_var) = url; + + TRACE(">>>\n"); + call_sink(This->doc_host->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dp); + TRACE("<<<\n"); + + SysFreeString(url); + + This->doc_host->busy = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DocObjectService_FireDownloadBegin(

1 0

Jacek Caban : ieframe: Improved debug traces in IShellBrowser:: QueryInterface.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 3548504c8d6f4f78610fe79512d44d2c20066907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3548504c8d6f4f78610fe7951… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:29:00 2011 +0100 ieframe: Improved debug traces in IShellBrowser::QueryInterface. --- dlls/ieframe/shellbrowser.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 79ee378..65e1cea 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -32,30 +32,33 @@ static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface); } -static HRESULT WINAPI ShellBrowser_QueryInterface( - IShellBrowser* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI ShellBrowser_QueryInterface(IShellBrowser* iface, REFIID riid, void **ppv) { ShellBrowser *This = impl_from_IShellBrowser(iface); - *ppvObject = NULL; - - if(IsEqualGUID(&IID_IShellBrowser, riid) || IsEqualGUID(&IID_IOleWindow, riid) - || IsEqualGUID(&IID_IUnknown, riid)) - *ppvObject = &This->IShellBrowser_iface; - else if(IsEqualGUID(&IID_IBrowserService, riid)) - *ppvObject = &This->IBrowserService_iface; - else if(IsEqualGUID(&IID_IDocObjectService, riid)) - *ppvObject = &This->IDocObjectService_iface; - - if(*ppvObject) { - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - IUnknown_AddRef((IUnknown*)*ppvObject); - return S_OK; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IShellBrowser_iface; + }else if(IsEqualGUID(&IID_IOleWindow, riid)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = &This->IShellBrowser_iface; + }else if(IsEqualGUID(&IID_IShellBrowser, riid)) { + TRACE("(%p)->(IID_IShellBrowser %p)\n", This, ppv); + *ppv = &This->IShellBrowser_iface; + }else if(IsEqualGUID(&IID_IBrowserService, riid)) { + TRACE("(%p)->(IID_IBrowserService %p)\n", This, ppv); + *ppv = &This->IBrowserService_iface; + }else if(IsEqualGUID(&IID_IDocObjectService, riid)) { + TRACE("(%p)->(IID_IDocObjectService %p)\n", This, ppv); + *ppv = &This->IDocObjectService_iface; + }else { + FIXME("%p %s %p\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; } - FIXME("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI ShellBrowser_AddRef(

1 0

Jacek Caban : mshtml: Split IHTMLPrivateWindow:: SuperNavigate implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 8ba6514962be951121e1d1cb37334b830ca63ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba6514962be951121e1d1cb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:29:43 2011 +0100 mshtml: Split IHTMLPrivateWindow::SuperNavigate implementation. --- dlls/mshtml/binding.h | 3 +- dlls/mshtml/htmlwindow.c | 169 ++------------------------------------------- dlls/mshtml/navigate.c | 162 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 171 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ba6514962be951121e1d…

1 0

Jacek Caban : mshtml: Properly handle navigation in containers supporting IWebBrowserApp.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: f86abedb40417c358f6ba85f51f6d6544c90bd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86abedb40417c358f6ba85f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:29:59 2011 +0100 mshtml: Properly handle navigation in containers supporting IWebBrowserApp. --- dlls/ieframe/dochost.c | 7 ++++--- dlls/ieframe/shellbrowser.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 3 +++ dlls/mshtml/navigate.c | 20 ++++++++++++++++++++ dlls/mshtml/oleobj.c | 16 +++++++++++++++- 6 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 5f60056..9c07cc8 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -192,12 +192,13 @@ void set_doc_state(DocHost *This, READYSTATE doc_state) static void update_ready_state(DocHost *This, READYSTATE ready_state) { - if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING) + if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING && !This->browser_service /* FIXME */) notif_complete(This, DISPID_NAVIGATECOMPLETE2); if(ready_state == READYSTATE_COMPLETE && This->doc_state < READYSTATE_COMPLETE) { set_doc_state(This, READYSTATE_COMPLETE); - notif_complete(This, DISPID_DOCUMENTCOMPLETE); + if(!This->browser_service) /* FIXME: Not fully correct */ + notif_complete(This, DISPID_DOCUMENTCOMPLETE); }else { set_doc_state(This, ready_state); } @@ -844,7 +845,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D if(ready_state == READYSTATE_COMPLETE && !This->doc_navigate) advise_prop_notif(This, FALSE); - push_ready_state_task(This, ready_state); + update_ready_state(This, ready_state); break; } default: diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 65e1cea..00ba786 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -787,8 +787,42 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %p %x\n", This, pHTMLWindow, dwFlags); - return E_NOTIMPL; + IHTMLPrivateWindow *priv_window; + VARIANTARG params[2]; + DISPPARAMS dp = {params, NULL, 2, 0}; + VARIANT url_var; + BSTR url; + HRESULT hres; + + TRACE("%p %p %x\n", This, pHTMLWindow, dwFlags); + + hres = IHTMLWindow2_QueryInterface(pHTMLWindow, &IID_IHTMLPrivateWindow, (void**)&priv_window); + if(FAILED(hres)) + return hres; + + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &url); + IHTMLPrivateWindow_Release(priv_window); + if(FAILED(hres)) + return hres; + + TRACE("got URL %s\n", debugstr_w(url)); + + V_VT(params) = (VT_BYREF|VT_VARIANT); + V_BYREF(params) = &url; + + V_VT(params+1) = VT_DISPATCH; + V_DISPATCH(params+1) = This->doc_host->disp; + + V_VT(&url_var) = VT_BSTR; + V_BSTR(&url_var) = url; + + TRACE(">>>\n"); + call_sink(This->doc_host->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dp); + TRACE("<<<\n"); + + SysFreeString(url); + This->doc_host->busy = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DocObjectService_UpdateDesktopComponent( diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 90ba6ad..0915977 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -463,6 +463,7 @@ struct HTMLDocumentObj { BOOL ui_active; BOOL window_active; BOOL hostui_setup; + BOOL is_webbrowser; BOOL container_locked; BOOL focus; INT download_state; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 0220849..ba98d41 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -265,6 +265,9 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); call_explorer_69(doc); + if(doc->is_webbrowser && doc->usermode != EDITMODE) + IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->IHTMLWindow2_iface, 0); + /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8f1b334..ea1c650 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1944,6 +1944,26 @@ HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base } } + if(window->doc_obj->is_webbrowser && window->doc_obj && window == window->doc_obj->basedoc.window) { + BOOL cancel = FALSE; + IUri *uri; + + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, url, 0x40, + NULL, NULL, 0, NULL, TRUE, &cancel); + if(SUCCEEDED(hres) && cancel) { + TRACE("Navigation canceled\n"); + return S_OK; + } + + hres = CreateUri(url, 0, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = super_navigate(window, uri, NULL, NULL, 0); + IUri_Release(uri); + return hres; + } + if(window->doc_obj && window == window->doc_obj->basedoc.window) { BOOL cancel; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fa2694e..e5c0235 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -125,6 +125,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); + This->doc_obj->is_webbrowser = FALSE; if(!pClientSite) return S_OK; @@ -212,14 +213,27 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(SUCCEEDED(hres)) { IDocObjectService *doc_object_service; IBrowserService *browser_service; + IWebBrowser2 *wb; hres = IServiceProvider_QueryService(sp, &IID_IShellBrowser, &IID_IBrowserService, (void**)&browser_service); if(SUCCEEDED(hres)) { hres = IBrowserService_QueryInterface(browser_service, &IID_IDocObjectService, (void**)&doc_object_service); - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { This->doc_obj->doc_object_service = doc_object_service; + + /* + * Some embedding routines, esp. in regards to use of IDocObjectService, differ if + * embedder supports IWebBrowserApp. + */ + hres = IServiceProvider_QueryService(sp, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); + if(SUCCEEDED(hres)) { + This->doc_obj->is_webbrowser = TRUE; + IWebBrowser2_Release(wb); + } + } + IBrowserService_Release(browser_service); }

1 0