October 2008 - Wine-commits

Lei Zhang : shlwapi: Close registry handles when destroying IQueryAssociations.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: c08ec04d41c101c3fbd4741e8338d29ecae3cbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08ec04d41c101c3fbd4741e8… Author: Lei Zhang <thestig(a)google.com> Date: Fri Oct 10 23:34:23 2008 -0700 shlwapi: Close registry handles when destroying IQueryAssociations. --- dlls/shlwapi/assoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 8ef6da2..0d8baa0 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -491,6 +491,8 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) if (!refCount) { TRACE("Destroying IQueryAssociations (%p)\n", This); + RegCloseKey(This->hkeySource); + RegCloseKey(This->hkeyProgID); HeapFree(GetProcessHeap(), 0, This); }

1 0

Michael Karcher : msxml3: Implementation of IXMLDOMNamedNodeMap:: removeNamedItem.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: dfc5a00cb041e2546fd63da22de1cd3335fdae9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc5a00cb041e2546fd63da22… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:57:48 2008 +0200 msxml3: Implementation of IXMLDOMNamedNodeMap::removeNamedItem. --- dlls/msxml3/nodemap.c | 36 +++++++++++++++++- dlls/msxml3/tests/domdoc.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index f41df2f..ae52a4d 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -283,8 +283,40 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( BSTR name, IXMLDOMNode** namedItem) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + xmlChar *element_name; + xmlAttrPtr attr, attr_copy; + xmlNodePtr node; + + TRACE("%p %s %p\n", This, debugstr_w(name), namedItem ); + + if ( !name) + return E_INVALIDARG; + + node = xmlNodePtr_from_domnode( This->node, 0 ); + if ( !node ) + return E_FAIL; + + element_name = xmlChar_from_wchar( name ); + attr = xmlHasNsProp( node, element_name, NULL ); + HeapFree( GetProcessHeap(), 0, element_name ); + + if ( !attr ) + { + if( namedItem ) + *namedItem = NULL; + return S_FALSE; + } + + if ( namedItem ) + { + attr_copy = xmlCopyProp( NULL, attr ); + attr_copy->doc = node->doc; + *namedItem = create_node( (xmlNodePtr) attr_copy ); + } + xmlRemoveProp( attr ); + + return S_OK; } static HRESULT WINAPI xmlnodemap_get_item( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 15a60e5..653475e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1985,6 +1985,91 @@ static void test_replaceChild(void) IXMLDOMDocument_Release( doc ); } +static void test_removeNamedItem(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *pr_node, *removed_node, *removed_node2; + IXMLDOMNodeList *root_list; + IXMLDOMNamedNodeMap * pr_attrs; + VARIANT_BOOL b; + BSTR str; + long len; + HRESULT r; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + r = IXMLDOMDocument_get_documentElement( doc, &element ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMElement_get_childNodes( element, &root_list ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNodeList_get_item( root_list, 1, &pr_node ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNode_get_attributes( pr_node, &pr_attrs ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + ok( r == S_OK, "ret %08x\n", r); + ok( len == 3, "length %ld\n", len); + + removed_node = (void*)0xdeadbeef; + r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, NULL, &removed_node); + ok ( r == E_INVALIDARG, "ret %08x\n", r); + ok ( removed_node == (void*)0xdeadbeef, "removed_node == %p\n", removed_node); + + removed_node = (void*)0xdeadbeef; + str = SysAllocString(szvr); + r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node); + ok ( r == S_OK, "ret %08x\n", r); + + removed_node2 = (void*)0xdeadbeef; + r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, &removed_node2); + ok ( r == S_FALSE, "ret %08x\n", r); + ok ( removed_node2 == NULL, "removed_node == %p\n", removed_node2 ); + + r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + ok( r == S_OK, "ret %08x\n", r); + ok( len == 2, "length %ld\n", len); + + r = IXMLDOMNamedNodeMap_setNamedItem( pr_attrs, removed_node, NULL); + ok ( r == S_OK, "ret %08x\n", r); + IXMLDOMNode_Release(removed_node); + + r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + ok( r == S_OK, "ret %08x\n", r); + ok( len == 3, "length %ld\n", len); + + r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL); + ok ( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNamedNodeMap_get_length( pr_attrs, &len ); + ok( r == S_OK, "ret %08x\n", r); + ok( len == 2, "length %ld\n", len); + + r = IXMLDOMNamedNodeMap_removeNamedItem( pr_attrs, str, NULL); + ok ( r == S_FALSE, "ret %08x\n", r); + + SysFreeString(str); + + IXMLDOMNamedNodeMap_Release( pr_attrs ); + IXMLDOMNode_Release( pr_node ); + IXMLDOMNodeList_Release( root_list ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); +} + static void test_XMLHTTP(void) { static const WCHAR wszBody[] = {'m','o','d','e','=','T','e','s','t',0}; @@ -3686,6 +3771,7 @@ START_TEST(domdoc) test_get_childNodes(); test_removeChild(); test_replaceChild(); + test_removeNamedItem(); test_XMLHTTP(); test_IXMLDOMDocument2(); test_XPath();

1 0

Lei Zhang : shlwapi: Fix AssocQueryStringW parameter checking.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: db08d6e8073a65b256bef7b5432fe280318d5c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db08d6e8073a65b256bef7b54… Author: Lei Zhang <thestig(a)google.com> Date: Fri Oct 10 22:21:25 2008 -0700 shlwapi: Fix AssocQueryStringW parameter checking. --- dlls/shlwapi/assoc.c | 34 ++++++++++++++++------------------ dlls/shlwapi/tests/assoc.c | 16 ++++++++-------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index e3c3830..23ece70 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -244,7 +244,7 @@ HRESULT WINAPI AssocQueryStringW(ASSOCF cfFlags, ASSOCSTR str, LPCWSTR pszAssoc, debugstr_w(pszExtra), pszOut, pcchOut); if (!pcchOut) - return E_INVALIDARG; + return E_UNEXPECTED; lpAssoc = IQueryAssociations_Constructor(); @@ -290,7 +290,7 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc, debugstr_a(pszExtra), pszOut, pcchOut); if (!pcchOut) - hRet = E_INVALIDARG; + hRet = E_UNEXPECTED; else if (SHLWAPI_ParamAToW(pszAssoc, szAssocW, MAX_PATH, &lpszAssocW) && SHLWAPI_ParamAToW(pszExtra, szExtraW, MAX_PATH, &lpszExtraW)) { @@ -520,7 +520,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( { static const WCHAR szProgID[] = {'P','r','o','g','I','D',0}; IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - HRESULT hr; + LONG ret; TRACE("(%p)->(%d,%s,%p,%p)\n", iface, cfFlags, @@ -533,23 +533,21 @@ static HRESULT WINAPI IQueryAssociations_fnInit( FIXME("unsupported flags: %x\n", cfFlags); if (pszAssoc != NULL) { - hr = RegOpenKeyExW(HKEY_CLASSES_ROOT, - pszAssoc, - 0, - KEY_READ, - &This->hkeySource); - if (FAILED(hr)) - return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, + pszAssoc, + 0, + KEY_READ, + &This->hkeySource); + if (ret != ERROR_SUCCESS) + return E_FAIL; /* if this is not a prog id */ if ((*pszAssoc == '.') || (*pszAssoc == '{')) { - hr = RegOpenKeyExW(This->hkeySource, - szProgID, - 0, - KEY_READ, - &This->hkeyProgID); - if (FAILED(hr)) - FIXME("Don't know what to return\n"); + RegOpenKeyExW(This->hkeySource, + szProgID, + 0, + KEY_READ, + &This->hkeyProgID); } else This->hkeyProgID = This->hkeySource; @@ -561,7 +559,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( return S_OK; } else - return E_FAIL; + return E_INVALIDARG; } /************************************************************************** diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 3fce90d..4d5c87c 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -38,31 +38,31 @@ static void test_getstring_bad(void) DWORD len; hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); - todo_wine expect_hr(E_INVALIDARG, hr); + expect_hr(E_INVALIDARG, hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); - todo_wine expect_hr(E_FAIL, hr); + expect_hr(E_FAIL, hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); - todo_wine expect_hr(E_FAIL, hr); + expect_hr(E_FAIL, hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); todo_wine expect_hr(0x80070002, hr); /* NOT FOUND */ hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); - todo_wine expect_hr(E_UNEXPECTED, hr); + expect_hr(E_UNEXPECTED, hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); - todo_wine expect_hr(E_INVALIDARG, hr); + expect_hr(E_INVALIDARG, hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, &len); - todo_wine expect_hr(E_FAIL, hr); + expect_hr(E_FAIL, hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); - todo_wine expect_hr(E_FAIL, hr); + expect_hr(E_FAIL, hr); hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); todo_wine expect_hr(0x80070002, hr); /* NOT FOUND */ hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); - todo_wine expect_hr(E_UNEXPECTED, hr); + expect_hr(E_UNEXPECTED, hr); } static void test_getstring_basic(void)

1 0

Lei Zhang : shlwapi: Handle ASSOCSTR_EXECUTABLE in IQueryAssociations_GetString.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 3684009b6e2cd8d4fc287e195b52581fc6857e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3684009b6e2cd8d4fc287e195… Author: Lei Zhang <thestig(a)google.com> Date: Fri Oct 10 23:34:04 2008 -0700 shlwapi: Handle ASSOCSTR_EXECUTABLE in IQueryAssociations_GetString. --- dlls/shlwapi/assoc.c | 141 +++++++++++++++++++++++++++++++++++++++++++- dlls/shlwapi/tests/assoc.c | 6 +- 2 files changed, 141 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 23ece70..8ef6da2 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -26,6 +27,7 @@ #include "objbase.h" #include "shlguid.h" #include "shlwapi.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -562,6 +564,30 @@ static HRESULT WINAPI IQueryAssociations_fnInit( return E_INVALIDARG; } +static HRESULT ASSOC_GetValue(HKEY hkey, WCHAR ** pszText) +{ + DWORD len; + LONG ret; + + assert(pszText); + ret = RegQueryValueExW(hkey, NULL, 0, NULL, NULL, &len); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + if (!len) + return E_FAIL; + *pszText = HeapAlloc(GetProcessHeap(), 0, len); + if (!*pszText) + return E_OUTOFMEMORY; + ret = RegQueryValueExW(hkey, NULL, 0, NULL, (LPBYTE)*pszText, + &len); + if (ret != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, *pszText); + return HRESULT_FROM_WIN32(ret); + } + return S_OK; +} + /************************************************************************** * IQueryAssociations_GetString {SHLWAPI} * @@ -588,10 +614,119 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( DWORD *pcchOut) { IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - - FIXME("(%p,0x%8x,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, str, + const ASSOCF cfUnimplemented = ~(0); + DWORD len; + HKEY hkeyCommand; + HKEY hkeyFile; + HKEY hkeyShell; + HKEY hkeyVerb; + HRESULT hr; + LONG ret; + WCHAR path[MAX_PATH]; + WCHAR * pszCommand; + WCHAR * pszEnd; + WCHAR * pszExtraFromReg; + WCHAR * pszFileType; + WCHAR * pszStart; + static const WCHAR commandW[] = { 'c','o','m','m','a','n','d',0 }; + static const WCHAR shellW[] = { 's','h','e','l','l',0 }; + + TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, str, debugstr_w(pszExtra), pszOut, pcchOut); - return E_NOTIMPL; + + if (cfFlags & cfUnimplemented) + FIXME("%08x: unimplemented flags!\n", cfFlags & cfUnimplemented); + + if (!pcchOut) + return E_UNEXPECTED; + + switch (str) + { + case ASSOCSTR_EXECUTABLE: + { + hr = ASSOC_GetValue(This->hkeySource, &pszFileType); + if (FAILED(hr)) + return hr; + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, + &hkeyFile); + HeapFree(GetProcessHeap(), 0, pszFileType); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + + ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); + RegCloseKey(hkeyFile); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + + if (!pszExtra) + { + hr = ASSOC_GetValue(hkeyShell, &pszExtraFromReg); + if (FAILED(hr)) + { + RegCloseKey(hkeyShell); + return hr; + } + } + + ret = RegOpenKeyExW(hkeyShell, pszExtra ? pszExtra : pszExtraFromReg, + 0, KEY_READ, &hkeyVerb); + HeapFree(GetProcessHeap(), 0, pszExtraFromReg); + RegCloseKey(hkeyShell); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + + ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); + RegCloseKey(hkeyVerb); + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + hr = ASSOC_GetValue(hkeyCommand, &pszCommand); + RegCloseKey(hkeyCommand); + if (FAILED(hr)) + return hr; + + /* cleanup pszCommand */ + if (pszCommand[0] == '"') + { + pszStart = pszCommand + 1; + pszEnd = strchrW(pszStart, '"'); + } + else + { + pszStart = pszCommand; + pszEnd = strchrW(pszStart, ' '); + } + if (pszEnd) + *pszEnd = 0; + + len = SearchPathW(NULL, pszStart, NULL, MAX_PATH, path, NULL); + HeapFree(GetProcessHeap(), 0, pszCommand); + if (!len) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + len++; + if (pszOut) + { + if (*pcchOut < len) + { + *pcchOut = len; + return E_POINTER; + } + *pcchOut = len; + lstrcpynW(pszOut, path, len); + return S_OK; + } + else + { + *pcchOut = len; + return S_FALSE; + } + break; + } + + default: + FIXME("assocstr %d unimplemented!\n", str); + return E_NOTIMPL; + } } /************************************************************************** diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 4d5c87c..bb1c4d6 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -45,7 +45,7 @@ static void test_getstring_bad(void) expect_hr(E_FAIL, hr); hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); - todo_wine expect_hr(0x80070002, hr); /* NOT FOUND */ + expect_hr(0x80070002, hr); /* NOT FOUND */ hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); expect_hr(E_UNEXPECTED, hr); @@ -73,7 +73,7 @@ static void test_getstring_basic(void) DWORD len, len2, slen; hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, &len); - todo_wine expect_hr(S_FALSE, hr); + expect_hr(S_FALSE, hr); if (hr != S_FALSE) { skip("failed to get initial len\n"); @@ -98,7 +98,7 @@ static void test_getstring_basic(void) hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, &len); - expect_hr(S_FALSE, hr); + todo_wine expect_hr(S_FALSE, hr); if (hr != S_FALSE) { HeapFree(GetProcessHeap(), 0, executableName);

1 0

Lei Zhang : shlwapi: Add some tests for AssocQueryStringW.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 0c568c2ae8c190c1c513e8adf603e273910fb681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c568c2ae8c190c1c513e8adf… Author: Lei Zhang <thestig(a)google.com> Date: Fri Oct 10 22:20:51 2008 -0700 shlwapi: Add some tests for AssocQueryStringW. --- dlls/shlwapi/tests/Makefile.in | 1 + dlls/shlwapi/tests/assoc.c | 134 ++++++++++++++++++++++++++++++++++++++++ include/shlwapi.h | 1 + 3 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index cba37b8..d626ed9 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = shlwapi.dll IMPORTS = shlwapi advapi32 ole32 oleaut32 kernel32 CTESTS = \ + assoc.c \ clist.c \ clsid.c \ generated.c \ diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c new file mode 100644 index 0000000..3fce90d --- /dev/null +++ b/dlls/shlwapi/tests/assoc.c @@ -0,0 +1,134 @@ +/* Unit test suite for SHLWAPI IQueryAssociations functions + * + * Copyright 2008 Google (Lei Zhang) + * + * 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 + */ + +#include <stdarg.h> + +#include "wine/test.h" +#include "shlwapi.h" + +#define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) +#define expect_hr(expected, got) ok ( expected == got, "Expected %08x, got %08x\n", expected, got) + +/* Every version of Windows with IE should have this association? */ +static const WCHAR dotHtml[] = { '.','h','t','m','l',0 }; +static const WCHAR badBad[] = { 'b','a','d','b','a','d',0 }; +static const WCHAR dotBad[] = { '.','b','a','d',0 }; +static const WCHAR open[] = { 'o','p','e','n',0 }; +static const WCHAR invalid[] = { 'i','n','v','a','l','i','d',0 }; + +static void test_getstring_bad(void) +{ + HRESULT hr; + DWORD len; + + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); + todo_wine expect_hr(E_INVALIDARG, hr); + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); + todo_wine expect_hr(E_FAIL, hr); + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); + todo_wine expect_hr(E_FAIL, hr); + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, + &len); + todo_wine expect_hr(0x80070002, hr); /* NOT FOUND */ + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); + todo_wine expect_hr(E_UNEXPECTED, hr); + + hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); + todo_wine expect_hr(E_INVALIDARG, hr); + hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, + &len); + todo_wine expect_hr(E_FAIL, hr); + hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, + &len); + todo_wine expect_hr(E_FAIL, hr); + hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, + &len); + todo_wine expect_hr(0x80070002, hr); /* NOT FOUND */ + hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, + NULL); + todo_wine expect_hr(E_UNEXPECTED, hr); +} + +static void test_getstring_basic(void) +{ + HRESULT hr; + WCHAR * friendlyName; + WCHAR * executableName; + DWORD len, len2, slen; + + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, &len); + todo_wine expect_hr(S_FALSE, hr); + if (hr != S_FALSE) + { + skip("failed to get initial len\n"); + return; + } + + executableName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + len * sizeof(WCHAR)); + if (!executableName) + { + skip("failed to allocate memory\n"); + return; + } + + len2 = len; + hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, + executableName, &len2); + expect_hr(S_OK, hr); + slen = lstrlenW(executableName) + 1; + expect(len, len2); + expect(len, slen); + + hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, + &len); + expect_hr(S_FALSE, hr); + if (hr != S_FALSE) + { + HeapFree(GetProcessHeap(), 0, executableName); + skip("failed to get initial len\n"); + return; + } + + friendlyName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + len * sizeof(WCHAR)); + if (!friendlyName) + { + HeapFree(GetProcessHeap(), 0, executableName); + skip("failed to allocate memory\n"); + return; + } + + len2 = len; + hr = AssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, + friendlyName, &len2); + expect_hr(S_OK, hr); + slen = lstrlenW(friendlyName) + 1; + expect(len, len2); + expect(len, slen); + + HeapFree(GetProcessHeap(), 0, executableName); + HeapFree(GetProcessHeap(), 0, friendlyName); +} + +START_TEST(assoc) +{ + test_getstring_bad(); + test_getstring_basic(); +} diff --git a/include/shlwapi.h b/include/shlwapi.h index e4100fc..d1669e6 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -193,6 +193,7 @@ enum ASSOCF_REMAPRUNDLL = 0x080, /* Get rundll args */ ASSOCF_NOFIXUPS = 0x100, /* Don't fixup errors */ ASSOCF_IGNOREBASECLASS = 0x200, /* Don't read baseclass */ + ASSOCF_INIT_IGNOREUNKNOWN = 0x400, /* Fail for unknown progid */ }; typedef DWORD ASSOCF;

1 0

Aric Stewart : shell32: Refine UNIXFS_path_to_pidl to return more detailed failures.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 91b4064062b7ebdbfccf23dbd05090fc23b723c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b4064062b7ebdbfccf23dbd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 10 11:11:53 2008 -0500 shell32: Refine UNIXFS_path_to_pidl to return more detailed failures. --- dlls/shell32/shfldr_unixfs.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 6672692..332dd45 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -557,13 +557,13 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, void *pIDL) { * ppidl [O] The corresponding ITEMIDLIST. Release with SHFree/ILFree * * RETURNS - * Success: TRUE - * Failure: FALSE, invalid params or out of memory + * Success: S_OK + * Failure: Error code, invalid params or out of memory * * NOTES * pUnixFolder also carries the information if the path is expected to be unix or dos. */ -static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPITEMIDLIST *ppidl) { +static HRESULT UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPITEMIDLIST *ppidl) { LPITEMIDLIST pidl; int cPidlLen, cPathLen; char *pSlash, *pNextSlash, szCompletePath[FILENAME_MAX], *pNextPathElement, *pszAPath; @@ -572,7 +572,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT TRACE("pUnixFolder=%p, path=%s, ppidl=%p\n", pUnixFolder, debugstr_w(path), ppidl); if (!ppidl || !path) - return FALSE; + return E_INVALIDARG; /* Build an absolute path and let pNextPathElement point to the interesting * relative sub-path. We need the absolute path to call 'stat', but the pidl @@ -582,7 +582,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT { /* Absolute dos path. Convert to unix */ if (!UNIXFS_get_unix_path(path, szCompletePath)) - return FALSE; + return E_FAIL; pNextPathElement = szCompletePath; } else if ((pUnixFolder->m_dwPathMode == PATHMODE_UNIX) && (path[0] == '/')) @@ -613,9 +613,9 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT /* Special case for the root folder. */ if (!strcmp(szCompletePath, "/")) { *ppidl = pidl = (LPITEMIDLIST)SHAlloc(sizeof(USHORT)); - if (!pidl) return FALSE; + if (!pidl) return E_FAIL; pidl->mkid.cb = 0; /* Terminate the ITEMIDLIST */ - return TRUE; + return S_OK; } /* Remove trailing slash, if present */ @@ -625,7 +625,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT if ((szCompletePath[0] != '/') || (pNextPathElement[0] != '/')) { ERR("szCompletePath: %s, pNextPathElment: %s\n", szCompletePath, pNextPathElement); - return FALSE; + return E_FAIL; } /* At this point, we have an absolute unix path in szCompletePath @@ -635,7 +635,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT /* Convert to CP_ACP and WCHAR */ if (!UNIXFS_shitemid_len_from_filename(pNextPathElement, &pszAPath, &pwszPath)) - return 0; + return E_FAIL; /* Compute the length of the complete ITEMIDLIST */ cPidlLen = 0; @@ -656,7 +656,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT SHFree(pwszPath); *ppidl = pidl = (LPITEMIDLIST)SHAlloc(cPidlLen); - if (!pidl) return FALSE; + if (!pidl) return E_FAIL; /* Concatenate the SHITEMIDs of the sub-directories. */ while (*pNextPathElement) { @@ -668,7 +668,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT if (!pNextPathElement) { SHFree(*ppidl); *ppidl = NULL; - return FALSE; + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } pidl = ILGetNext(pidl); } @@ -677,7 +677,7 @@ static BOOL UNIXFS_path_to_pidl(UnixFolder *pUnixFolder, const WCHAR *path, LPIT if ((char *)pidl-(char *)*ppidl+sizeof(USHORT) != cPidlLen) /* We've corrupted the heap :( */ ERR("Computed length of pidl incorrect. Please report.\n"); - return TRUE; + return S_OK; } /****************************************************************************** @@ -871,14 +871,14 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_ParseDisplayName(IShellFolder2* i ULONG* pdwAttributes) { UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface); - BOOL result; + HRESULT result; TRACE("(iface=%p, hwndOwner=%p, pbcReserved=%p, lpszDisplayName=%s, pchEaten=%p, ppidl=%p, " "pdwAttributes=%p) stub\n", iface, hwndOwner, pbcReserved, debugstr_w(lpszDisplayName), pchEaten, ppidl, pdwAttributes); result = UNIXFS_path_to_pidl(This, lpszDisplayName, ppidl); - if (result && pdwAttributes && *pdwAttributes) + if (SUCCEEDED(result) && pdwAttributes && *pdwAttributes) { IShellFolder *pParentSF; LPCITEMIDLIST pidlLast; @@ -896,8 +896,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_ParseDisplayName(IShellFolder2* i ILFree(pidlComplete); } - if (!result) TRACE("FAILED!\n"); - return result ? S_OK : E_FAIL; + if (FAILED(result)) TRACE("FAILED!\n"); + return result; } static IUnknown *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter); @@ -1775,7 +1775,7 @@ static HRESULT WINAPI UnixFolder_ISFHelper_AddFolder(ISFHelper* iface, HWND hwnd LPITEMIDLIST pidlRelative; /* Inform the shell */ - if (UNIXFS_path_to_pidl(This, pwszName, &pidlRelative)) { + if (SUCCEEDED(UNIXFS_path_to_pidl(This, pwszName, &pidlRelative))) { LPITEMIDLIST pidlAbsolute = ILCombine(This->m_pidlLocation, pidlRelative); if (ppidlOut) *ppidlOut = pidlRelative;

1 0

Andrey Turkin : riched20: Add spare area to ITextServicesImpl to work around broken apps.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 8d18cb8caf17f9d85ae01319e98a438332400a5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d18cb8caf17f9d85ae01319e… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Oct 10 01:14:39 2008 +0400 riched20: Add spare area to ITextServicesImpl to work around broken apps. --- dlls/riched20/txtsrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 95d6f7c..d4679f7 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -57,6 +57,7 @@ typedef struct ITextServicesImpl { ITextHost *pMyHost; LONG ref; CRITICAL_SECTION csTxtSrv; + char spare[256]; } ITextServicesImpl; static const ITextServicesVtbl textservices_Vtbl;

1 0

Dylan Smith : richedit: Moved optional message loop in tests to its own function.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 440db38ebaa314f5a6878b59268db48b58af49ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=440db38ebaa314f5a6878b592… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 10 16:37:13 2008 -0400 richedit: Moved optional message loop in tests to its own function. --- dlls/riched20/tests/editor.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a34eada..cb96269 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -57,6 +57,26 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS, ES_MULTILINE, parent); } +/* Keeps the window reponsive for the deley_time in seconds. + * This is useful for debugging a test to see what is happening. */ +void keep_responsive(time_t delay_time) +{ + MSG msg; + time_t end; + + /* The message pump uses PeekMessage() to empty the queue and then + * sleeps for 50ms before retrying the queue. */ + end = time(NULL) + delay_time; + while (time(NULL) < end) { + if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } else { + Sleep(50); + } + } +} + static void processPendingMessages(void) { MSG msg; @@ -5443,9 +5463,6 @@ static void test_EM_CHARFROMPOS(void) START_TEST( editor ) { - MSG msg; - time_t end; - /* Must explicitly LoadLibrary(). The test has no references to functions in * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); @@ -5494,19 +5511,9 @@ START_TEST( editor ) /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. - * - * The message pump uses PeekMessage() to empty the queue and then sleeps for - * 50ms before retrying the queue. */ - end = time(NULL) + 30; + */ if (getenv( "WINETEST_RICHED20" )) { - while (time(NULL) < end) { - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } else { - Sleep(50); - } - } + keep_responsive(30); } OleFlushClipboard();

1 0

Dylan Smith : richedit: Added test for word wrapping behaviour.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: e6b16cce77068a3f5a0589440ff4a10292634523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b16cce77068a3f5a0589440… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 10 16:37:19 2008 -0400 richedit: Added test for word wrapping behaviour. --- dlls/riched20/tests/editor.c | 77 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index cb96269..e035b63 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5461,6 +5461,82 @@ static void test_EM_CHARFROMPOS(void) DestroyWindow(hwnd); } +static void test_word_wrap(void) +{ + HWND hwnd; + POINTL point = {0, 60}; /* This point must be below the first line */ + const char *text = "Must be long enough to test line wrapping"; + DWORD dwCommonStyle = WS_VISIBLE|WS_POPUP|WS_VSCROLL|ES_MULTILINE; + int res, pos; + + /* Test the effect of WS_HSCROLL and ES_AUTOHSCROLL styles on wrapping + * when specified on window creation and set later. */ + hwnd = CreateWindow(RICHEDIT_CLASS, NULL, dwCommonStyle, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + + SetWindowLongW(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + DestroyWindow(hwnd); + + hwnd = CreateWindow(RICHEDIT_CLASS, NULL, dwCommonStyle|WS_HSCROLL, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + SetWindowLongW(hwnd, GWL_STYLE, dwCommonStyle); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + DestroyWindow(hwnd); + + hwnd = CreateWindow(RICHEDIT_CLASS, NULL, dwCommonStyle|ES_AUTOHSCROLL, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + SetWindowLongW(hwnd, GWL_STYLE, dwCommonStyle); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + DestroyWindow(hwnd); + + hwnd = CreateWindow(RICHEDIT_CLASS, NULL, + dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(res, "WM_SETTEXT failed.\n"); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + SetWindowLongW(hwnd, GWL_STYLE, dwCommonStyle); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + /* Test the effect of EM_SETTARGETDEVICE on word wrap. */ + res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 1); + todo_wine ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(!pos, "pos=%d indicating word wrap when none is expected.\n", pos); + + res = SendMessage(hwnd, EM_SETTARGETDEVICE, 0, 0); + todo_wine ok(res, "EM_SETTARGETDEVICE failed (returned %d).\n", res); + pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + DestroyWindow(hwnd); +} + START_TEST( editor ) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -5508,6 +5584,7 @@ START_TEST( editor ) test_word_movement(); test_EM_CHARFROMPOS(); test_SETPARAFORMAT(); + test_word_wrap(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Dylan Smith : richedit: Added DestroyWindow call to clean up the end of a test.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: b8fe02007776775f7fcf2965a39019661f1bcce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fe02007776775f7fcf2965a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Oct 10 16:37:03 2008 -0400 richedit: Added DestroyWindow call to clean up the end of a test. --- dlls/riched20/tests/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 54b100c..a34eada 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5164,6 +5164,7 @@ static void test_eventMask(void) ok(queriedEventMask == (eventMask & ~ENM_CHANGE), "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); + DestroyWindow(parent); } static int received_WM_NOTIFY = 0;

1 0