November 2013 - Wine-commits

Nikolay Sivov : shell32: Cache typeinfo instances.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: b6efcef7a7f005c752621fdce00f059e4af9a23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6efcef7a7f005c752621fdce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 16:12:33 2013 +0400 shell32: Cache typeinfo instances. --- dlls/shell32/shell32_main.c | 1 + dlls/shell32/shell32_main.h | 2 + dlls/shell32/shelldispatch.c | 192 +++++++++++++++++++++++++++--------------- 3 files changed, 126 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6efcef7a7f005c752621…

1 0

André Hentschel : Wine 1.6.1 freigegeben
by Jeremy Newman 18 Nov '13

18 Nov '13

Module: website Branch: master Commit: 660b67c7a3122b0a5570bae58f73c30a97faeed5 URL: http://source.winehq.org/git/website.git/?a=commit;h=660b67c7a3122b0a5570ba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 18 23:37:16 2013 +0100 Wine 1.6.1 freigegeben --- news/de/2013111501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2013111501.xml b/news/de/2013111501.xml new file mode 100644 index 0000000..6606e33 --- /dev/null +++ b/news/de/2013111501.xml @@ -0,0 +1,13 @@ +<news> +<date>15. November 2013</date> +<title>Wine 1.6.1 freigegeben</title> +<body> +<p> Die Wartungsversion 1.6.1 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.6.1">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +<p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Vincent Povirk : gdiplus: Allow excluding from infinite regions.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 1202e9af56521f7362e8e1183923ad8ec851949e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1202e9af56521f7362e8e1183… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 11:46:30 2013 -0500 gdiplus: Allow excluding from infinite regions. --- dlls/gdiplus/region.c | 8 +++--- dlls/gdiplus/tests/region.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 832ce69..4ba86eb 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -988,8 +988,8 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeIntersect: return get_region_hrgn(element->elementdata.combine.right, graphics, hrgn); case CombineModeXor: case CombineModeExclude: - FIXME("cannot exclude from an infinite region\n"); - /* fall-through */ + left = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + break; case CombineModeUnion: case CombineModeComplement: *hrgn = NULL; return Ok; @@ -1013,8 +1013,8 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap *hrgn = left; return Ok; case CombineModeXor: case CombineModeComplement: - FIXME("cannot exclude from an infinite region\n"); - /* fall-through */ + right = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + break; case CombineModeUnion: case CombineModeExclude: DeleteObject(left); *hrgn = NULL; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 66d950a..5632e4d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2082,6 +2082,56 @@ static void test_isvisiblerect(void) ReleaseDC(0, hdc); } +static void test_excludeinfinite(void) +{ + GpStatus status; + GpRegion *region; + UINT count=0xdeadbeef; + GpRectF scans[4]; + GpMatrix *identity; + static const RectF rect_exclude = {0.0, 0.0, 1.0, 1.0}; + + status = GdipCreateMatrix(&identity); + expect(Ok, status); + + status = GdipCreateRegion(&region); + expect(Ok, status); + + status = GdipCombineRegionRect(region, &rect_exclude, CombineModeExclude); + expect(Ok, status); + + status = GdipGetRegionScansCount(region, &count, identity); + expect(Ok, status); + expect(4, count); + + count = 4; + status = GdipGetRegionScans(region, scans, (INT*)&count, identity); + expect(Ok, status); + + expectf(-4194304.0, scans[0].X); + expectf(-4194304.0, scans[0].Y); + expectf(8388608.0, scans[0].Width); + expectf(4194304.0, scans[0].Height); + + expectf(-4194304.0, scans[1].X); + expectf(0.0, scans[1].Y); + expectf(4194304.0, scans[1].Width); + expectf(1.0, scans[1].Height); + + expectf(1.0, scans[2].X); + expectf(0.0, scans[2].Y); + expectf(4194303.0, scans[2].Width); + expectf(1.0, scans[2].Height); + + expectf(-4194304.0, scans[3].X); + expectf(1.0, scans[3].Y); + expectf(8388608.0, scans[3].Width); + expectf(4194303.0, scans[3].Height); + + GdipDeleteRegion(region); + GdipDeleteMatrix(identity); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2107,6 +2157,7 @@ START_TEST(region) test_getbounds(); test_isvisiblepoint(); test_isvisiblerect(); + test_excludeinfinite(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : explorer: Use StrRetToStrW to convert STRRET result.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: cd1abd68c3bd48267f96403e9ed937e1a11911db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1abd68c3bd48267f96403e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 14:50:51 2013 -0500 explorer: Use StrRetToStrW to convert STRRET result. --- programs/explorer/explorer.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 1df781c..d01a3c3 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -118,20 +118,13 @@ static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImag HICON icon; strret.uType=STRRET_WSTR; hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret); + if(SUCCEEDED(hres)) + hres = StrRetToStrW(&strret, pidl, &item->pszText); if(FAILED(hres)) { WINE_WARN("Could not get name for pidl\n"); return FALSE; } - switch(strret.uType) - { - case STRRET_WSTR: - item->pszText = strret.u.pOleStr; - break; - default: - WINE_FIXME("Unimplemented STRRET type:%u\n",strret.uType); - break; - } hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW, &reserved,(void**)&extract_icon); if(SUCCEEDED(hres))

1 0

Vincent Povirk : windowscodecs: Implement IPropertyBag2_Write_Proxy.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 25264f0b11f3cb483dad644eb18f1c8257ef0543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25264f0b11f3cb483dad644eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 15 13:10:45 2013 -0600 windowscodecs: Implement IPropertyBag2_Write_Proxy. --- dlls/windowscodecs/proxy.c | 6 ++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 91fb6e6..9d1c5df 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -37,6 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IPropertyBag2_Write_Proxy(IPropertyBag2 *iface, + ULONG cProperties, PROPBAG2 *ppropbag, VARIANT *pvarValue) +{ + return IPropertyBag2_Write(iface, cProperties, ppropbag, pvarValue); +} + HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface, IWICBitmapSource *pISource, const WICRect *prc) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 9497aec..81a827e 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -4,7 +4,7 @@ @ stdcall -private DllUnregisterServer() @ stub IEnumString_Next_WIC_Proxy @ stub IEnumString_Reset_WIC_Proxy -@ stub IPropertyBag2_Write_Proxy +@ stdcall IPropertyBag2_Write_Proxy(ptr long ptr ptr) @ stdcall IWICBitmapClipper_Initialize_Proxy(ptr ptr ptr) IWICBitmapClipper_Initialize_Proxy_W @ stdcall IWICBitmapCodecInfo_DoesSupportAnimation_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportAnimation_Proxy_W @ stdcall IWICBitmapCodecInfo_DoesSupportLossless_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportLossless_Proxy_W

1 0

Jacek Caban : mshtml: Added IHTMLDocument3:: getElementsByName implementation.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: f3a2cb7bbd1ad25b078fdc9b4404dee0f0de33ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a2cb7bbd1ad25b078fdc9b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 16 15:50:15 2013 +0100 mshtml: Added IHTMLDocument3::getElementsByName implementation. --- dlls/mshtml/htmldoc3.c | 39 ++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index de5cdab..9637e99 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -536,8 +536,43 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST IHTMLElementCollection **ppelColl) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), ppelColl); - return E_NOTIMPL; + nsIDOMNodeList *node_list; + nsAString selector_str; + WCHAR *selector; + nsresult nsres; + + static const WCHAR formatW[] = {'*','[','i','d','=','%','s',']',',','*','[','n','a','m','e','=','%','s',']',0}; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), ppelColl); + + if(!This->doc_node || !This->doc_node->nsdoc) { + /* We should probably return an empty collection. */ + FIXME("No nsdoc\n"); + return E_NOTIMPL; + } + + selector = heap_alloc(2*SysStringLen(v)*sizeof(WCHAR) + sizeof(formatW)); + if(!selector) + return E_OUTOFMEMORY; + sprintfW(selector, formatW, v, v); + + /* + * NOTE: IE getElementsByName implementation differs from Gecko. It searches both name and id attributes. + * That's why we use CSS selector instead. We should also use name only when it applies to given element + * types and search should be case insensitive. Those are currently not supported properly. + */ + nsAString_InitDepend(&selector_str, selector); + nsres = nsIDOMNodeSelector_QuerySelectorAll(This->doc_node->nsnode_selector, &selector_str, &node_list); + nsAString_Finish(&selector_str); + heap_free(selector); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } + + *ppelColl = create_collection_from_nodelist(This->doc_node, node_list); + nsIDOMNodeList_Release(node_list); + return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cf72873..6e6b01a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -759,6 +759,18 @@ static IHTMLElement4 *_get_elem4_iface(unsigned line, IUnknown *unk) return elem; } +#define get_doc3_iface(u) _get_doc3_iface(__LINE__,u) +static IHTMLDocument3 *_get_doc3_iface(unsigned line, IHTMLDocument2 *doc) +{ + IHTMLDocument3 *doc3; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 interface: %08x\n", hres); + + return doc3; +} + #define get_node_iface(u) _get_node_iface(__LINE__,u) static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) { @@ -6737,6 +6749,54 @@ static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) } } +#define doc_get_elems_by_name(a,b) _doc_get_elems_by_name(__LINE__,a,b) +static IHTMLElementCollection *_doc_get_elems_by_name(unsigned line, IHTMLDocument2 *doc, const char *name) +{ + IHTMLDocument3 *doc3 = _get_doc3_iface(line, doc); + IHTMLElementCollection *col; + BSTR str = a2bstr(name); + HRESULT hres; + + hres = IHTMLDocument3_getElementsByName(doc3, str, &col); + ok_(__FILE__,line)(hres == S_OK, "getElementsByName failed: %08x\n", hres); + ok_(__FILE__,line)(col != NULL, "col = NULL\n"); + + IHTMLDocument3_Release(doc3); + SysFreeString(str); + return col; +} + +static void test_elem_names(IHTMLDocument2 *doc) +{ + IHTMLElementCollection *col; + IHTMLElement *body; + LONG len; + HRESULT hres; + + static const elem_type_t test1_types[] = {ET_INPUT, ET_A, ET_DIV}; + + body = doc_get_body(doc); + + test_elem_set_innerhtml((IUnknown*)body, + "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); + col = doc_get_elems_by_name(doc, "test"); + test_elem_collection((IUnknown*)col, test1_types, sizeof(test1_types)/sizeof(*test1_types)); + IHTMLElementCollection_Release(col); + + col = doc_get_elems_by_name(doc, "yyy"); + test_elem_collection((IUnknown*)col, NULL, 0); + IHTMLElementCollection_Release(col); + + /* case insensivity test */ + col = doc_get_elems_by_name(doc, "Xxx"); + hres = IHTMLElementCollection_get_length(col, &len); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + todo_wine ok(len == 1, "len = %d\n", len); + IHTMLElementCollection_Release(col); + + IHTMLElement_Release(body); +} + static void test_elems2(IHTMLDocument2 *doc) { IHTMLElement *elem, *elem2, *div; @@ -6825,6 +6885,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_attr(div); test_blocked(doc, div); + test_elem_names(doc); IHTMLElement_Release(div); }

1 0

Jacek Caban : msxml3: Return NULL instead of empty string in IXMLElement:: get_tagName.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: fe0f945769ca3e6204baa8089bdb205c75aa02ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0f945769ca3e6204baa8089… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 16 16:06:51 2013 +0100 msxml3: Return NULL instead of empty string in IXMLElement::get_tagName. --- dlls/msxml3/tests/xmldoc.c | 2 +- dlls/msxml3/xmlelem.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 7bf5062..701b1bb 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -893,7 +893,7 @@ static void test_xmlelem(void) hr = IXMLElement_get_tagName(element, &str); EXPECT_HR(hr, S_OK); - ok(lstrlenW(str) == 0, "Expected empty tag name\n"); + ok(!str, "Expected empty tag name, got %s\n", wine_dbgstr_w(str)); SysFreeString(str); parent = (IXMLElement *)0xdeadbeef; diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 679e159..a932397 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -189,8 +189,12 @@ static HRESULT WINAPI xmlelem_get_tagName(IXMLElement *iface, BSTR *p) if (!p) return E_INVALIDARG; - *p = bstr_from_xmlChar(This->node->name); - CharUpperBuffW(*p, SysStringLen(*p)); + if (*This->node->name) { + *p = bstr_from_xmlChar(This->node->name); + CharUpperBuffW(*p, SysStringLen(*p)); + }else { + *p = NULL; + } TRACE("returning %s\n", debugstr_w(*p));

1 0

Jacek Caban : msxml3: Compile tests with __WINESRC__ defined.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 66677e616f41cbebdcdfedeff1d064b6a11a8f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66677e616f41cbebdcdfedeff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 16 16:07:21 2013 +0100 msxml3: Compile tests with __WINESRC__ defined. --- dlls/msxml3/tests/Makefile.in | 1 - dlls/msxml3/tests/domdoc.c | 9 +++++---- dlls/msxml3/tests/saxreader.c | 10 ++++++---- dlls/msxml3/tests/schema.c | 1 + dlls/msxml3/tests/xmldoc.c | 8 ++++---- dlls/msxml3/tests/xmlview.c | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index 38d20f1..345d454 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msxml3.dll IMPORTS = oleaut32 ole32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ domdoc.c \ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8e17885..1621470 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -30,6 +30,7 @@ #include "windows.h" +#include "xmldom.h" #include "msxml2.h" #include "msxml2did.h" #include "ole2.h" @@ -1068,7 +1069,7 @@ static void node_to_string(IXMLDOMNode *node, char *buf) else { r = IXMLDOMNode_get_parentNode(node, &new_node); - wsprintf(buf, "%d", get_node_position(node)); + sprintf(buf, "%d", get_node_position(node)); buf += strlen(buf); } @@ -6039,7 +6040,7 @@ static void test_save(void) ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); CloseHandle(hfile); - DeleteFile("test.xml"); + DeleteFileA("test.xml"); /* save to path VT_BSTR | VT_BYREF */ filename = _bstr_("test.xml"); @@ -6060,7 +6061,7 @@ static void test_save(void) ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); CloseHandle(hfile); - DeleteFile("test.xml"); + DeleteFileA("test.xml"); } /* save to stream */ @@ -6679,7 +6680,7 @@ static void test_TransformWithLoadingLocalFile(void) IXMLDOMDocument_Release(doc); IXMLDOMDocument_Release(xsl); - DeleteFile(lpPathBuffer); + DeleteFileA(lpPathBuffer); free_bstrs(); } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index f3a6bbd..e1bcf5e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3497,15 +3497,17 @@ static void test_mxwriter_startendelement_batch(const struct writer_startendelem if (table->type & StartElement) { - hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), - _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), table->attr); + hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), table->uri ? strlen(table->uri) : 0, + _bstr_(table->local_name), table->local_name ? strlen(table->local_name) : 0, _bstr_(table->qname), + table->qname ? strlen(table->qname) : 0, table->attr); ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); } if (table->type & EndElement) { - hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), lstrlen(table->uri), - _bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname)); + hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), table->uri ? strlen(table->uri) : 0, + _bstr_(table->local_name), table->local_name ? strlen(table->local_name) : 0, _bstr_(table->qname), + table->qname ? strlen(table->qname) : 0); ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); } diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index fe6e6b6..ac3fead 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -27,6 +27,7 @@ #include "windows.h" #include "ole2.h" #include "msxml2.h" +#undef CLSID_DOMDocument #include "msxml2did.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 701b1bb..4130ea4 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -38,8 +38,8 @@ static void create_xml_file(LPCSTR filename) { DWORD dwNumberOfBytesWritten; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); static const char data[] = "<?xml version=\"1.0\" ?>\n" @@ -61,8 +61,8 @@ static void create_stream_on_file(IStream **stream, LPCSTR path) HRESULT hr; DWORD file_size, read; - hfile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hfile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); file_size = GetFileSize(hfile, NULL); diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index 82577bf..3e3bd29 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -242,9 +242,9 @@ static void test_Load(void) IBindCtx_Release(bctx); IMoniker_Release(mon); - while(!loaded && GetMessage(&msg, NULL, 0, 0)) { + while(!loaded && GetMessageA(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } hres = IHTMLDocument2_get_body(html_doc, &elem);

1 0

Piotr Caban : kernel32/tests: Fix IdnToNameprepUnicode tests.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 18f7f637b01e5b0ea0a27ce398aefbf851cf1304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f7f637b01e5b0ea0a27ce39… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 16 16:31:13 2013 +0100 kernel32/tests: Fix IdnToNameprepUnicode tests. --- dlls/kernel32/tests/locale.c | 55 ++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 60dea78..62e9f01 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3107,6 +3107,7 @@ static void test_IdnToNameprepUnicode(void) DWORD in_len; const WCHAR in[64]; DWORD ret; + DWORD broken_ret; const WCHAR out[64]; DWORD flags; DWORD err; @@ -3114,77 +3115,77 @@ static void test_IdnToNameprepUnicode(void) } test_data[] = { { 5, {'t','e','s','t',0}, - 5, {'t','e','s','t',0}, + 5, 5, {'t','e','s','t',0}, 0, 0xdeadbeef }, { 3, {'a',0xe111,'b'}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 4, {'t',0,'e',0}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 1, {'T',0}, - 1, {'T',0}, + 1, 1, {'T',0}, 0, 0xdeadbeef }, { 1, {0}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 6, {' ','-','/','[',']',0}, - 6, {' ','-','/','[',']',0}, + 6, 6, {' ','-','/','[',']',0}, 0, 0xdeadbeef }, { 3, {'a','-','a'}, - 3, {'a','-','a'}, + 3, 3, {'a','-','a'}, IDN_USE_STD3_ASCII_RULES, 0xdeadbeef }, { 3, {'a','a','-'}, - 0, {0}, + 0, 0, {0}, IDN_USE_STD3_ASCII_RULES, ERROR_INVALID_NAME }, { /* FoldString is not working as expected when MAP_FOLDCZONE is specified (composition+compatibility) */ 10, {'T',0xdf,0x130,0x143,0x37a,0x6a,0x30c,' ',0xaa,0}, - 12, {'t','s','s','i',0x307,0x144,' ',0x3b9,0x1f0,' ','a',0}, + 12, 12, {'t','s','s','i',0x307,0x144,' ',0x3b9,0x1f0,' ','a',0}, 0, 0xdeadbeef, TRUE }, { 11, {'t',0xad,0x34f,0x1806,0x180b,0x180c,0x180d,0x200b,0x200c,0x200d,0}, - 2, {'t',0}, + 2, 0, {'t',0}, 0, 0xdeadbeef }, { /* Another example of incorrectly working FoldString (composition) */ 2, {0x3b0, 0}, - 2, {0x3b0, 0}, + 2, 2, {0x3b0, 0}, 0, 0xdeadbeef, TRUE }, { 2, {0x221, 0}, - 0, {0}, + 0, 2, {0}, 0, ERROR_NO_UNICODE_TRANSLATION }, { 2, {0x221, 0}, - 2, {0x221, 0}, + 2, 2, {0x221, 0}, IDN_ALLOW_UNASSIGNED, 0xdeadbeef }, { 5, {'a','.','.','a',0}, - 0, {0}, + 0, 0, {0}, 0, ERROR_INVALID_NAME }, { 3, {'a','.',0}, - 3, {'a','.',0}, + 3, 3, {'a','.',0}, 0, 0xdeadbeef }, }; @@ -3253,15 +3254,23 @@ static void test_IdnToNameprepUnicode(void) ret = pIdnToNameprepUnicode(test_data[i].flags, test_data[i].in, test_data[i].in_len, buf, sizeof(buf)/sizeof(WCHAR)); err = GetLastError(); - if(!test_data[i].todo) { - ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); - ok(err == test_data[i].err, "%d) err = %d\n", i, err); - ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), - "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); - }else { - todo_wine ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), - "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + + if (!test_data[i].todo) + { + ok(ret == test_data[i].ret || + broken(ret == test_data[i].broken_ret), "%d) ret = %d\n", i, ret); } + else + { + todo_wine ok(ret == test_data[i].ret || + broken(ret == test_data[i].broken_ret), "%d) ret = %d\n", i, ret); + } + if(ret != test_data[i].ret) + continue; + + ok(err == test_data[i].err, "%d) err = %d\n", i, err); + ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); } }

1 0

Nikolay Sivov : scrrun: Implement BuildPath method.
by Alexandre Julliard 18 Nov '13

18 Nov '13

Module: wine Branch: master Commit: 70bb23a9acc6abb73005dc221c65c9c682a2d868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bb23a9acc6abb73005dc221… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 17 11:49:53 2013 +0400 scrrun: Implement BuildPath method. --- dlls/scrrun/filesystem.c | 57 ++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 89 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2750108..ee89b76 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1073,11 +1073,62 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * } static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, - BSTR Name, BSTR *pbstrResult) + BSTR Name, BSTR *Result) { - FIXME("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), pbstrResult); + BSTR ret; - return E_NOTIMPL; + TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + ret[path_len] = 0; + strcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + static const WCHAR bsW[] = {'\\',0}; + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + strcpyW(ret, Path); + if (Path[path_len-1] != ':') + strcatW(ret, bsW); + strcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + strcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6016049..630de1b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -651,6 +651,94 @@ static void test_CopyFolder(void) SysFreeString(bsrc); } +static BSTR bstr_from_str(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +struct buildpath_test +{ + const char *path; + const char *name; + const char *result; +}; + +static struct buildpath_test buildpath_data[] = +{ + { "C:\\path", "..\\name.tmp", "C:\\path\\..\\name.tmp" }, + { "C:\\path", "\\name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path", "name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path\\", "name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path", "\\\\name.tmp", "C:\\path\\\\name.tmp" }, + { "C:\\path\\", "\\name.tmp", "C:\\path\\name.tmp" }, + { "C:\\path\\", "\\\\name.tmp", "C:\\path\\\\name.tmp" }, + { "C:\\path\\\\", "\\\\name.tmp", "C:\\path\\\\\\name.tmp" }, + { "C:\\\\", "\\name.tmp", "C:\\\\name.tmp" }, + { "C:", "name.tmp", "C:name.tmp" }, + { "C:", "\\\\name.tmp", "C:\\\\name.tmp" }, + { NULL } +}; + +static void test_BuildPath(void) +{ + struct buildpath_test *ptr = buildpath_data; + BSTR ret, path; + HRESULT hr; + int i = 0; + + hr = IFileSystem3_BuildPath(fs3, NULL, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = (BSTR)0xdeadbeef; + hr = IFileSystem3_BuildPath(fs3, NULL, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*ret == 0, "got %p\n", ret); + SysFreeString(ret); + + ret = (BSTR)0xdeadbeef; + path = bstr_from_str("path"); + hr = IFileSystem3_BuildPath(fs3, path, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(ret, path), "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(path); + + ret = (BSTR)0xdeadbeef; + path = bstr_from_str("path"); + hr = IFileSystem3_BuildPath(fs3, NULL, path, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(ret, path), "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(path); + + while (ptr->path) + { + BSTR name, result; + + ret = NULL; + path = bstr_from_str(ptr->path); + name = bstr_from_str(ptr->name); + result = bstr_from_str(ptr->result); + hr = IFileSystem3_BuildPath(fs3, path, name, &ret); + ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); + if (hr == S_OK) + { + ok(!lstrcmpW(ret, result), "%d: got wrong path %s, expected %s\n", i, wine_dbgstr_w(ret), + wine_dbgstr_w(result)); + SysFreeString(ret); + } + SysFreeString(path); + SysFreeString(name); + SysFreeString(result); + + i++; + ptr++; + } +} + START_TEST(filesystem) { HRESULT hr; @@ -674,6 +762,7 @@ START_TEST(filesystem) test_GetAbsolutePathName(); test_GetFile(); test_CopyFolder(); + test_BuildPath(); IFileSystem3_Release(fs3);

1 0