March 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : winetest: Group all test scripts in a separate directory.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: tools Branch: master Commit: 0a46a5d8504726dde07a3d773d4f7b3cccd69a49 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a46a5d8504726dde07a3d77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 16:25:24 2011 +0100 winetest: Group all test scripts in a separate directory. --- winetest/tests/.htaccess | 8 ++++++++ winetest/tests/chunked | 17 +++++++++++++++++ winetest/tests/hello.html | 4 ++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess new file mode 100644 index 0000000..b3a256c --- /dev/null +++ b/winetest/tests/.htaccess @@ -0,0 +1,8 @@ +Order Allow,Deny +Allow From All + +<Files chunked> + Allow from All + Options ExecCGI + SetHandler cgi-script +</Files> diff --git a/winetest/tests/chunked b/winetest/tests/chunked new file mode 100755 index 0000000..713b172 --- /dev/null +++ b/winetest/tests/chunked @@ -0,0 +1,17 @@ +#!/usr/bin/perl +# +# Generate some data to test chunked transfers +# + +use CGI qw(:standard); + +$| = 1; + +print "Content-type: text/plain\n\n"; + +for (my $i = 0; $i < 10; $i++) +{ + print "Line $i\n"; + select(undef, undef, undef, 0.1); +} +print "Done\n"; diff --git a/winetest/tests/hello.html b/winetest/tests/hello.html new file mode 100644 index 0000000..bed858b --- /dev/null +++ b/winetest/tests/hello.html @@ -0,0 +1,4 @@ +<html><body> +<h1>Hello world!</h1> +This is a test page for the Wine regression test suite. +</body></html>

1 0

Jacek Caban : winetest: Added data.php for use in http tests.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: tools Branch: master Commit: a9dba0a918b483816f489189147b76d28787ea8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=a9dba0a918b483816f489189… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 12 19:21:54 2011 +0100 winetest: Added data.php for use in http tests. --- winetest/tests/.htaccess | 2 ++ winetest/tests/data.php | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index b3a256c..f6c2d00 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -1,6 +1,8 @@ Order Allow,Deny Allow From All +SetEnv no-gzip dont-vary + <Files chunked> Allow from All Options ExecCGI diff --git a/winetest/tests/data.php b/winetest/tests/data.php new file mode 100644 index 0000000..3c42734 --- /dev/null +++ b/winetest/tests/data.php @@ -0,0 +1,15 @@ +<?php +header("Cache-Control: no-store"); +?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Page for winetest tests purposes</title> +</head> +<body> +<?php +echo str_repeat("test ", 10000); +?> +</body> +</html>

1 0

Alexandre Julliard : announce: Remove tags/ prefix that newer gitweb doesn' t understand.
by Alexandre Julliard 13 Mar '11

13 Mar '11

Module: website Branch: master Commit: 078958a7b62912998f91e0dc6c6868f955f4bdbb URL: http://source.winehq.org/git/website.git/?a=commit;h=078958a7b62912998f91e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 13 20:08:31 2011 +0100 announce: Remove tags/ prefix that newer gitweb doesn't understand. --- include/plugins/announce.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index 8f6df00..29b6932 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -14,7 +14,7 @@ global $html, $config; $ver = PAGE_PARAMS; // build tag and announce URL -$tag = ($ver == "latest") ? "master" : "tags/wine-" . urlencode($ver); +$tag = ($ver == "latest") ? "master" : "wine-" . urlencode($ver); $announce = $config->git_tree . "/wine.git/" . $tag . ":ANNOUNCE"; // load announce

1 0

Alexander Scott-Johns : wininet: Partially implement FreeUrlCacheSpaceW.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: fa19e1bdb30087a3e7dbcc2690890c6b6fc74116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa19e1bdb30087a3e7dbcc269… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Mar 2 18:35:27 2011 +0000 wininet: Partially implement FreeUrlCacheSpaceW. --- dlls/wininet/urlcache.c | 99 ++++++++++++++++++++++++++++++++++++++++++----- include/wininet.h | 10 +++++ 2 files changed, 99 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index babf9f7..0c88372 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -48,10 +48,12 @@ #include "wininet.h" #include "winineti.h" #include "winerror.h" -#include "internet.h" #include "winreg.h" #include "shlwapi.h" #include "shlobj.h" +#include "shellapi.h" + +#include "internet.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -1460,28 +1462,105 @@ static BOOL URLCache_EnumHashTableEntries(LPCURLCACHE_HEADER pHeader, const HASH } /*********************************************************************** - * FreeUrlCacheSpaceA (WININET.@) + * URLCache_DeleteCacheDirectory (Internal) + * + * Erase a directory containing an URL cache. + * + * RETURNS + * TRUE success, FALSE failure/aborted. * */ -BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) +static BOOL URLCache_DeleteCacheDirectory(LPCWSTR lpszPath) { - FIXME("stub!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD path_len; + WCHAR path[MAX_PATH + 1]; + SHFILEOPSTRUCTW shfos; + int ret; + + path_len = strlenW(lpszPath); + if (path_len >= MAX_PATH) + return FALSE; + strcpyW(path, lpszPath); + path[path_len + 1] = 0; /* double-NUL-terminate path */ + + shfos.hwnd = NULL; + shfos.wFunc = FO_DELETE; + shfos.pFrom = path; + shfos.pTo = NULL; + shfos.fFlags = 0; + shfos.fAnyOperationsAborted = FALSE; + ret = SHFileOperationW(&shfos); + if (ret) + ERR("SHFileOperationW on %s returned %i\n", debugstr_w(path), ret); + return !(ret || shfos.fAnyOperationsAborted); } - /*********************************************************************** +/*********************************************************************** * FreeUrlCacheSpaceW (WININET.@) * + * Frees up some cache. + * + * PARAMETERS + * lpszCachePath [I] Which volume to free up from, or NULL if you don't care. + * dwSize [I] How much space to free up. + * dwSizeType [I] How to interpret dwSize. + * + * RETURNS + * TRUE success. FALSE failure. + * + * IMPLEMENTATION + * This implementation just retrieves the path of the cache directory, and + * deletes its contents from the filesystem. The correct approach would + * probably be to implement and use {FindFirst,FindNext,Delete}UrlCacheGroup(). */ -BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR lpszCachePath, DWORD dwSize, DWORD dwFilter) +BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR lpszCachePath, DWORD dwSize, DWORD dwSizeType) { - FIXME("stub!\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + URLCACHECONTAINER * pContainer; + + if (lpszCachePath != NULL || dwSize != 100 || dwSizeType != FCS_PERCENT_CACHE_SPACE) + { + FIXME("(%s, %x, %x): partial stub!\n", debugstr_w(lpszCachePath), dwSize, dwSizeType); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) + { + /* The URL cache has prefix L"" (unlike Cookies and History) */ + if (pContainer->cache_prefix[0] == 0) + { + BOOL ret_del; + DWORD ret_open; + WaitForSingleObject(pContainer->hMutex, INFINITE); + + /* unlock, delete, recreate and lock cache */ + URLCacheContainer_CloseIndex(pContainer); + ret_del = URLCache_DeleteCacheDirectory(pContainer->path); + ret_open = URLCacheContainer_OpenIndex(pContainer); + + ReleaseMutex(pContainer->hMutex); + return ret_del && (ret_open == ERROR_SUCCESS); + } + } return FALSE; } /*********************************************************************** + * FreeUrlCacheSpaceA (WININET.@) + * + * See FreeUrlCacheSpaceW. + */ +BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwSizeType) +{ + BOOL ret = FALSE; + LPWSTR path = heap_strdupAtoW(lpszCachePath); + if (lpszCachePath == NULL || path != NULL) + ret = FreeUrlCacheSpaceW(path, dwSize, dwSizeType); + heap_free(path); + return ret; +} + +/*********************************************************************** * GetUrlCacheEntryInfoExA (WININET.@) * */ diff --git a/include/wininet.h b/include/wininet.h index 0cf453e..ce09821 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1660,6 +1660,16 @@ BOOLAPI DeleteUrlCacheEntryA(LPCSTR); BOOLAPI DeleteUrlCacheEntryW(LPCWSTR); #define DeleteUrlCacheEntry WINELIB_NAME_AW(DeleteUrlCacheEntry) +/* FCS_ flags and FreeUrlCacheSpace are no longer documented */ +#define FCS_PERCENT_CACHE_SPACE 0 /* guessed value */ +#define FCS_PERCENT_DISK_SPACE 1 /* guessed value */ +#define FCS_ABSOLUTE_SIZE 2 /* guessed value */ + +BOOLAPI FreeUrlCacheSpaceA(LPCSTR ,DWORD ,DWORD); +BOOLAPI FreeUrlCacheSpaceW(LPCWSTR ,DWORD ,DWORD); +#define FreeUrlCacheSpace WINELIB_NAME_AW(FreeUrlCacheSpace) + + INTERNETAPI DWORD WINAPI InternetDialA(HWND ,LPSTR ,DWORD ,DWORD_PTR* ,DWORD); INTERNETAPI DWORD WINAPI InternetDialW(HWND ,LPWSTR ,DWORD ,DWORD_PTR* ,DWORD); #define InternetDial WINELIB_NAME_AW(InternetDial)

1 0

Alexander Scott-Johns : inetcpl.cpl: Add ability to delete Temporary Internet Files.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: f9ef35ea6ae9e24085876c6f2d3c77f80266ef3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ef35ea6ae9e24085876c6f2… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Mar 2 18:38:15 2011 +0000 inetcpl.cpl: Add ability to delete Temporary Internet Files. --- dlls/inetcpl.cpl/Makefile.in | 2 +- dlls/inetcpl.cpl/cpl_De.rc | 5 ++ dlls/inetcpl.cpl/cpl_En.rc | 27 ++++++++++++ dlls/inetcpl.cpl/cpl_Fr.rc | 5 ++ dlls/inetcpl.cpl/cpl_He.rc | 5 ++ dlls/inetcpl.cpl/cpl_It.rc | 5 ++ dlls/inetcpl.cpl/cpl_Ja.rc | 5 ++ dlls/inetcpl.cpl/cpl_Ko.rc | 5 ++ dlls/inetcpl.cpl/cpl_Lt.rc | 5 ++ dlls/inetcpl.cpl/cpl_Nl.rc | 5 ++ dlls/inetcpl.cpl/cpl_Pl.rc | 5 ++ dlls/inetcpl.cpl/cpl_Pt.rc | 7 +++- dlls/inetcpl.cpl/cpl_Ru.rc | 5 ++ dlls/inetcpl.cpl/cpl_Sr.rc | 10 +++++ dlls/inetcpl.cpl/cpl_Sv.rc | 5 ++ dlls/inetcpl.cpl/cpl_Uk.rc | 5 ++ dlls/inetcpl.cpl/general.c | 91 ++++++++++++++++++++++++++++++++++++++++- dlls/inetcpl.cpl/inetcpl.h | 9 ++++ 18 files changed, 201 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9ef35ea6ae9e24085876…

1 0

Alistair Leslie-Hughes : msxml3: Ignore XML property ResolveExternals.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: e030b3ce56a520a37f95b19c14c65362ec127ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e030b3ce56a520a37f95b19c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 11 11:32:32 2011 +1100 msxml3: Ignore XML property ResolveExternals. --- dlls/msxml3/domdoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d27ed02..c397fad 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -73,6 +73,7 @@ static const WCHAR PropertyProhibitDTDW[] = {'P','r','o','h','i','b','i','t','D' static const WCHAR PropertyNewParserW[] = {'N','e','w','P','a','r','s','e','r',0}; static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; +static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; /* Anything that passes the test_get_ownerDocument() * tests can go here (data shared between all instances). @@ -2952,7 +2953,8 @@ static HRESULT WINAPI domdoc_setProperty( return hr; } else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0 || - lstrcmpiW(p, PropertyNewParserW) == 0) + lstrcmpiW(p, PropertyNewParserW) == 0 || + lstrcmpiW(p, PropertyResolveExternalsW) == 0) { /* Ignore */ FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&var));

1 0

Nikolay Sivov : msxml3: Fix reference counting behaviour for named map.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 68cc66d8000bb7b0acd13986b54a95155b434790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68cc66d8000bb7b0acd13986b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 21:56:51 2011 +0300 msxml3: Fix reference counting behaviour for named map. --- dlls/msxml3/element.c | 6 ++-- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/nodemap.c | 46 ++++++++++-------------------------------- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 8d81f67..4c3a9b3 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -314,13 +314,13 @@ static HRESULT WINAPI domelem_get_nextSibling( static HRESULT WINAPI domelem_get_attributes( IXMLDOMElement *iface, - IXMLDOMNamedNodeMap** attributeMap) + IXMLDOMNamedNodeMap** map) { domelem *This = impl_from_IXMLDOMElement( iface ); - TRACE("(%p)->(%p)\n", This, attributeMap); + TRACE("(%p)->(%p)\n", This, map); - *attributeMap = create_nodemap((IXMLDOMNode*)&This->IXMLDOMElement_iface); + *map = create_nodemap(This->node.node); return S_OK; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 72de7ba..4e3b35b 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -186,7 +186,7 @@ extern IUnknown *create_pi( xmlNodePtr pi ); extern IUnknown *create_comment( xmlNodePtr comment ); extern IUnknown *create_cdata( xmlNodePtr text ); extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); -extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); +extern IXMLDOMNamedNodeMap *create_nodemap( const xmlNodePtr ); extern IUnknown *create_doc_Implementation(void); extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 660eab6..20475ca 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -48,7 +48,8 @@ typedef struct _xmlnodemap IXMLDOMNamedNodeMap IXMLDOMNamedNodeMap_iface; ISupportErrorInfo ISupportErrorInfo_iface; LONG ref; - IXMLDOMNode *node; + + xmlNodePtr node; LONG iterator; } xmlnodemap; @@ -109,7 +110,7 @@ static ULONG WINAPI xmlnodemap_Release( TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { - IXMLDOMNode_Release( This->node ); + xmldoc_release( This->node->doc ); heap_free( This ); } @@ -217,7 +218,6 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlNodePtr nodeNew; - xmlNodePtr node; xmlnode *ThisNew; TRACE("(%p)->(%p %p)\n", This, newItem, namedItem ); @@ -227,10 +227,6 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( if(namedItem) *namedItem = NULL; - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - /* Must be an Attribute */ ThisNew = get_node_obj( newItem ); if(!ThisNew) return E_FAIL; @@ -242,7 +238,7 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( if(xmldoc_remove_orphan(ThisNew->node->doc, ThisNew->node) != S_OK) WARN("%p is not an orphan of %p\n", ThisNew->node, ThisNew->node->doc); - nodeNew = xmlAddChild(node, ThisNew->node); + nodeNew = xmlAddChild(This->node, ThisNew->node); if(namedItem) *namedItem = create_node( nodeNew ); @@ -265,7 +261,6 @@ static HRESULT WINAPI xmlnodemap_get_item( IXMLDOMNode** listItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlNodePtr node; xmlAttrPtr curr; LONG attrIndex; @@ -276,8 +271,7 @@ static HRESULT WINAPI xmlnodemap_get_item( if (index < 0) return S_FALSE; - node = xmlNodePtr_from_domnode( This->node, 0 ); - curr = node->properties; + curr = This->node->properties; for (attrIndex = 0; attrIndex < index; attrIndex++) { if (curr->next == NULL) @@ -295,7 +289,6 @@ static HRESULT WINAPI xmlnodemap_get_length( IXMLDOMNamedNodeMap *iface, LONG *listLength) { - xmlNodePtr node; xmlAttrPtr first; xmlAttrPtr curr; LONG attrCount; @@ -307,11 +300,7 @@ static HRESULT WINAPI xmlnodemap_get_length( if( !listLength ) return E_INVALIDARG; - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - - first = node->properties; + first = This->node->properties; if (first == NULL) { *listLength = 0; return S_OK; @@ -336,7 +325,6 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlAttrPtr attr; - xmlNodePtr node; xmlChar *href; xmlChar *name; @@ -344,10 +332,6 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( if (!baseName || !qualifiedItem) return E_INVALIDARG; - node = xmlNodePtr_from_domnode(This->node, XML_ELEMENT_NODE); - if ( !node ) - return E_FAIL; - if (namespaceURI && *namespaceURI) { href = xmlChar_from_wchar(namespaceURI); @@ -363,7 +347,7 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( return E_OUTOFMEMORY; } - attr = xmlHasNsProp(node, name, href); + attr = xmlHasNsProp(This->node, name, href); heap_free(name); heap_free(href); @@ -387,7 +371,6 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlAttrPtr attr; - xmlNodePtr node; xmlChar *name; xmlChar *href; @@ -395,10 +378,6 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( if (!baseName) return E_INVALIDARG; - node = xmlNodePtr_from_domnode( This->node, XML_ELEMENT_NODE ); - if ( !node ) - return E_FAIL; - if (namespaceURI && *namespaceURI) { href = xmlChar_from_wchar(namespaceURI); @@ -414,7 +393,7 @@ static HRESULT WINAPI xmlnodemap_removeQualifiedItem( return E_OUTOFMEMORY; } - attr = xmlHasNsProp( node, name, href ); + attr = xmlHasNsProp( This->node, name, href ); heap_free(name); heap_free(href); @@ -445,7 +424,6 @@ static HRESULT WINAPI xmlnodemap_nextNode( IXMLDOMNode** nextItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlNodePtr node; xmlAttrPtr curr; LONG attrIndex; @@ -453,8 +431,7 @@ static HRESULT WINAPI xmlnodemap_nextNode( *nextItem = NULL; - node = xmlNodePtr_from_domnode( This->node, 0 ); - curr = node->properties; + curr = This->node->properties; for (attrIndex = 0; attrIndex < This->iterator; attrIndex++) { if (curr->next == NULL) @@ -551,7 +528,7 @@ static const struct ISupportErrorInfoVtbl support_error_vtbl = support_error_InterfaceSupportsErrorInfo }; -IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ) +IXMLDOMNamedNodeMap *create_nodemap( const xmlNodePtr node ) { xmlnodemap *nodemap; @@ -565,8 +542,7 @@ IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ) nodemap->ref = 1; nodemap->iterator = 0; - IXMLDOMNode_AddRef( node ); - /* Since we AddRef a node here, we don't need to call xmldoc_add_ref() */ + xmldoc_add_ref(node->doc); return &nodemap->IXMLDOMNamedNodeMap_iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 42fd22a..370c56e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8329,6 +8329,7 @@ static void test_get_nodeTypeString(void) ok(!lstrcmpW(str, _bstr_(entry->string)), "got string %s, expected %s. node type %d\n", wine_dbgstr_w(str), entry->string, entry->type); SysFreeString(str); + IXMLDOMNode_Release(node); entry++; } @@ -8358,14 +8359,15 @@ static void test_get_attributes(void) const get_attributes_t *entry = get_attributes; IXMLDOMNamedNodeMap *map; IXMLDOMDocument *doc; - IXMLDOMNode *node; + IXMLDOMNode *node, *node2; VARIANT_BOOL b; HRESULT hr; BSTR str; + LONG length; doc = create_document(&IID_IXMLDOMDocument); - str = SysAllocString( szComplete3 ); + str = SysAllocString( szComplete4 ); hr = IXMLDOMDocument_loadXML(doc, str, &b); SysFreeString(str); @@ -8403,6 +8405,43 @@ static void test_get_attributes(void) IXMLDOMNode_Release(node); + /* last child is element */ + EXPECT_REF(doc, 1); + hr = IXMLDOMDocument_get_lastChild(doc, &node); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(doc, 1); + + EXPECT_REF(node, 1); + hr = IXMLDOMNode_get_attributes(node, &map); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(node, 1); + EXPECT_REF(doc, 1); + + EXPECT_REF(map, 1); + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(node, 1); + EXPECT_REF(node2, 1); + EXPECT_REF(map, 1); + EXPECT_REF(doc, 1); + IXMLDOMNode_Release(node2); + + /* release node before map release, map still works */ + IXMLDOMNode_Release(node); + + length = 0; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + ok(hr == S_OK, "got %08x\n", hr); + ok(length == 1, "got %d\n", length); + + node2 = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2); + ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(node2, 1); + IXMLDOMNode_Release(node2); + + IXMLDOMNamedNodeMap_Release(map); + while (entry->type) { VARIANT var; @@ -8423,6 +8462,8 @@ static void test_get_attributes(void) hr, entry->hr, entry->type); ok(map == NULL, "got %p\n", map); + IXMLDOMNode_Release(node); + entry++; }

1 0

Nikolay Sivov : msxml3: Move string conversion helper to header.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: fb96151b0e202a9194f9360972f69d2c7d0a482a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb96151b0e202a9194f936097… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 22:15:09 2011 +0300 msxml3: Move string conversion helper to header. --- dlls/msxml3/domdoc.c | 7 ++-- dlls/msxml3/element.c | 12 +++--- dlls/msxml3/msxml_private.h | 85 ++++++++++++++++++++++++------------------- dlls/msxml3/node.c | 8 ++-- dlls/msxml3/nodemap.c | 20 ++-------- dlls/msxml3/schema.c | 6 ++-- dlls/msxml3/xmlelem.c | 10 +++--- 7 files changed, 73 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb96151b0e202a9194f93…

1 0

Piotr Caban : include: Added IBrowserService interface definition.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 457368897f25cef6d50e2e548643e352d63cbd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=457368897f25cef6d50e2e548… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 11 11:13:39 2011 +0100 include: Added IBrowserService interface definition. --- include/shdeprecated.idl | 245 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 245 insertions(+), 0 deletions(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 304b087..c78e461 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -19,6 +19,251 @@ */ import "objidl.idl"; +import "ocidl.idl"; +import "shobjidl.idl"; + +cpp_quote("#define TLOG_BACK -1") +cpp_quote("#define TLOG_FORE 1") + +cpp_quote("#define TLMENUF_INCLUDECURRENT 0x00000001") +cpp_quote("#define TLMENUF_CHECKCURRENT (TLMENUF_INCLUDECURRENT | 0x00000002)") +cpp_quote("#define TLMENUF_BACK 0x00000010") +cpp_quote("#define TLMENUF_FORE 0x00000020") +cpp_quote("#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT)") + +[ + hidden, + local, + object, + uuid(F46EDB3B-BC2F-11d0-9412-00AA00A3EBD3) +] +interface ITravelEntry : IUnknown +{ + HRESULT Invoke( + [in] IUnknown *punk); + + HRESULT Update( + [in] IUnknown *punk, + [in] BOOL fIsLocalAnchor); + + HRESULT GetPidl( + [out] LPITEMIDLIST *ppidl); +}; + +[ + hidden, + local, + object, + uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8) +] +interface ITravelLog : IUnknown +{ + HRESULT AddEntry( + [in] IUnknown *punk, + [in] BOOL fIsLocalAnchor); + + HRESULT UpdateEntry( + [in] IUnknown *punk, + [in] BOOL fIsLocalAnchor); + + HRESULT UpdateExternal( + [in] IUnknown *punk, + [in] IUnknown *punkHLBrowseContext); + + HRESULT Travel( + [in] IUnknown *punk, + [in] int iOffset); + + HRESULT GetTravelEntry( + [in] IUnknown *punk, + [in] int iOffset, + [optional, out] ITravelEntry **ppte); + + HRESULT FindTravelEntry( + [in] IUnknown *punk, + [in] LPCITEMIDLIST pidl, + [out] ITravelEntry **ppte); + + HRESULT GetToolTipText( + [in] IUnknown *punk, + [in] int iOffset, + [in] int idsTemplate, + [out, size_is(cchText)] LPWSTR pwzText, + [in] DWORD cchText); + + HRESULT InsertMenuEntries( + [in] IUnknown *punk, + [in] HMENU hmenu, + [in] int nPos, + [in] int idFirst, + [in] int idLast, + [in] DWORD dwFlags); + + HRESULT Clone( + [out] ITravelLog **pptl); + + DWORD CountEntries( + [in] IUnknown *punk); + + HRESULT Revert(); +}; + +typedef enum tagBNSTATE +{ + BNS_NORMAL = 0, + BNS_BEGIN_NAVIGATE = 1, + BNS_NAVIGATE = 2 + +} BNSTATE; + +enum { + SBSC_HIDE = 0, + SBSC_SHOW = 1, + SBSC_TOGGLE = 2, + SBSC_QUERY = 3 +}; + +cpp_quote("#define BSF_REGISTERASDROPTARGET 0x00000001") +cpp_quote("#define BSF_THEATERMODE 0x00000002") +cpp_quote("#define BSF_NOLOCALFILEWARNING 0x00000010") +cpp_quote("#define BSF_UISETBYAUTOMATION 0x00000100") +cpp_quote("#define BSF_RESIZABLE 0x00000200") +cpp_quote("#define BSF_CANMAXIMIZE 0x00000400") +cpp_quote("#define BSF_TOPBROWSER 0x00000800") +cpp_quote("#define BSF_NAVNOHISTORY 0x00001000") +cpp_quote("#define BSF_HTMLNAVCANCELED 0x00002000") +cpp_quote("#define BSF_DONTSHOWNAVCANCELPAGE 0x00004000") +cpp_quote("#define BSF_SETNAVIGATABLECODEPAGE 0x00008000") +cpp_quote("#define BSF_DELEGATEDNAVIGATION 0x00010000") +cpp_quote("#define BSF_TRUSTEDFORACTIVEX 0x00020000") + +cpp_quote("#define HLNF_CALLERUNTRUSTED 0x00200000") +cpp_quote("#define HLNF_TRUSTEDFORACTIVEX 0x00400000") +cpp_quote("#define HLNF_DISABLEWINDOWRESTRICTIONS 0x00800000") +cpp_quote("#define HLNF_TRUSTFIRSTDOWNLOAD 0x01000000") +cpp_quote("#define HLNF_UNTRUSTEDFORDOWNLOAD 0x02000000") +cpp_quote("#define SHHLNF_NOAUTOSELECT 0x04000000") +cpp_quote("#define SHHLNF_WRITENOHISTORY 0x08000000") +cpp_quote("#define HLNF_EXTERNALNAVIGATE 0x10000000") +cpp_quote("#define HLNF_ALLOW_AUTONAVIGATE 0x20000000") +cpp_quote("#define HLNF_NEWWINDOWSMANAGED 0x80000000") + +[ + local, + object, + uuid(02ba3b52-0547-11d1-b833-00c04fc9b31f) +] +interface IBrowserService : IUnknown +{ + HRESULT GetParentSite( + [out] IOleInPlaceSite **ppipsite); + + HRESULT SetTitle( + [in] IShellView *psv, + [in] LPCWSTR pszName); + + HRESULT GetTitle( + [in] IShellView *psv, + [out, size_is(cchName)] LPWSTR pszName, + [in] DWORD cchName); + + HRESULT GetOleObject( + [out] IOleObject **ppobjv); + + HRESULT GetTravelLog( + [out, optional] ITravelLog **pptl); + + HRESULT ShowControlWindow( + [in] UINT id, + [in] BOOL fShow); + + HRESULT IsControlWindowShown( + [in] UINT id, + [out] BOOL *pfShown); + + HRESULT IEGetDisplayName( + [in] PCIDLIST_ABSOLUTE pidl, + [out] LPWSTR pwszName, + [in] UINT uFlags); + + HRESULT IEParseDisplayName( + [in] UINT uiCP, + [in] LPCWSTR pwszPath, + [out] PIDLIST_ABSOLUTE *ppidlOut); + + HRESULT DisplayParseError( + [in] HRESULT hres, + [in] LPCWSTR pwszPath); + + HRESULT NavigateToPidl( + [in] PCIDLIST_ABSOLUTE pidl, + [in] DWORD grfHLNF); + + HRESULT SetNavigateState( + [in] BNSTATE bnstate); + + HRESULT GetNavigateState( + [out] BNSTATE *pbnstate); + + HRESULT NotifyRedirect( + [in] IShellView *psv, + [in] PCIDLIST_ABSOLUTE pidl, + [out] BOOL *pfDidBrowse); + + HRESULT UpdateWindowList(); + + HRESULT UpdateBackForwardState(); + + HRESULT SetFlags( + [in] DWORD dwFlags, + [in] DWORD dwFlagMask); + + HRESULT GetFlags( + [out] DWORD *pdwFlags); + + HRESULT CanNavigateNow(); + + HRESULT GetPidl( + [out] PIDLIST_ABSOLUTE *ppidl); + + HRESULT SetReferrer( + [in] PCIDLIST_ABSOLUTE pidl); + + DWORD GetBrowserIndex(); + + HRESULT GetBrowserByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunk); + + HRESULT GetHistoryObject( + [out] IOleObject **ppole, + [out] IStream **pstm, + [out] IBindCtx **ppbc); + + HRESULT SetHistoryObject( + [in] IOleObject *pole, + [in] BOOL fIsLocalAnchor); + + HRESULT CacheOLEServer( + [in] IOleObject *pole); + + HRESULT GetSetCodePage( + [in] VARIANT *pvarIn, + [out] VARIANT *pvarOut); + + HRESULT OnHttpEquiv( + [in] IShellView *psv, + [in] BOOL fDone, + [in] VARIANT *pvarargIn, + [out] VARIANT *pvarargOut); + + HRESULT GetPalette( + [out] HPALETTE *hpal); + + HRESULT RegisterWindow( + [in] BOOL fForceRegister, + [in] int swc); +} [ object,

1 0

Piotr Caban : include: Added IDocObjectService interface definition.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 3660bf72a75ba614c0eddd1ec520ce98513de32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3660bf72a75ba614c0eddd1ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 11 11:13:58 2011 +0100 include: Added IDocObjectService interface definition. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/docobjectservice.idl | 67 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 0a6a589..84bddc8 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,7 @@ include/devicetopology.h include/dimm.h include/dispex.h include/docobj.h +include/docobjectservice.h include/downloadmgr.h include/dxgi.h include/dxgitype.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 8df7334..d4ad2ae 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -62,6 +62,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "mlang.h" #include "mshtml.h" #include "mshtmhst.h" +#include "docobjectservice.h" #include "richole.h" #include "downloadmgr.h" #include "objsel.h" diff --git a/include/Makefile.in b/include/Makefile.in index e5c2b53..e677f38 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -30,6 +30,7 @@ PUBLIC_IDL_H_SRCS = \ dimm.idl \ dispex.idl \ docobj.idl \ + docobjectservice.idl \ downloadmgr.idl \ dxgi.idl \ dxgitype.idl \ diff --git a/include/docobjectservice.idl b/include/docobjectservice.idl new file mode 100644 index 0000000..7478551 --- /dev/null +++ b/include/docobjectservice.idl @@ -0,0 +1,67 @@ +/* + * Copyright 2011 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "mshtml.idl"; + +[ + local, + object, + uuid(3050f801-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocObjectService : IUnknown +{ + HRESULT FireBeforeNavigate2( + [in] IDispatch *pDispatch, + [in] LPCWSTR lpszUrl, + [in] DWORD dwFlags, + [in] LPCWSTR lpszFrameName, + [in] BYTE *pPostData, + [in] DWORD cbPostData, + [in] LPCWSTR lpszHeaders, + [in] BOOL fPlayNavSound, + [out] BOOL *pfCancel); + + HRESULT FireNavigateComplete2( + [in] IHTMLWindow2 *pHTMLWindow2, + [in] DWORD dwFlags); + + HRESULT FireDownloadBegin(void); + + HRESULT FireDownloadComplete(void); + + HRESULT FireDocumentComplete( + [in] IHTMLWindow2 *pHTMLWindow, + [in] DWORD dwFlags); + + HRESULT UpdateDesktopComponent( + [in] IHTMLWindow2 *pHTMLWindow); + + HRESULT GetPendingUrl( + [out] BSTR *pbstrPendingUrl); + + HRESULT ActiveElementChanged( + [in] IHTMLElement *pHTMLElement); + + HRESULT GetUrlSearchComponent( + [out] BSTR *pbstrSearch); + + HRESULT IsErrorUrl( + [in] LPCWSTR lpszUrl, + [out] BOOL *pfIsError); +};

1 0