wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Matteo Bruni : d3dx9/tests: Mark a test todo_wine when DXTn textures aren' t supported by the GL driver.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 9295ee0c0b47f4b67e7268041008e1d12eff72c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9295ee0c0b47f4b67e7268041… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:09 2014 +0100 d3dx9/tests: Mark a test todo_wine when DXTn textures aren't supported by the GL driver. --- dlls/d3dx9_36/tests/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 1a85d15..16cb0e5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1637,7 +1637,10 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); - ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (has_2d_dxt3) + ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + else + todo_wine ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { levelcount = IDirect3DVolumeTexture9_GetLevelCount(volume_texture);

1 0

Matteo Bruni : d3dx9/tests: Skip a test if DXTn texture formats are not supported.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: d6a919af89d5154e8892f0bcddf961a86fdcc43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a919af89d5154e8892f0bcd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:08 2014 +0100 d3dx9/tests: Skip a test if DXTn texture formats are not supported. --- dlls/d3dx9_36/tests/texture.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index aea09d5..1a85d15 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -341,15 +341,22 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(format == expected, "Returned format %u, expected %u\n", format, expected); /* Block-based texture formats and size < block size. */ - format = D3DFMT_DXT1; - width = 2; height = 2; - mipmaps = 1; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == 4, "Returned width %d, expected %d\n", width, 4); - ok(height == 4, "Returned height %d, expected %d\n", height, 4); - ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); - ok(format == D3DFMT_DXT1, "Returned format %u, expected %u\n", format, D3DFMT_DXT1); + if (has_2d_dxt5) + { + format = D3DFMT_DXT5; + width = 2; height = 2; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 4, "Returned width %d, expected %d\n", width, 4); + ok(height == 4, "Returned height %d, expected %d\n", height, 4); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + } + else + { + skip("D3DFMT_DXT5 textures are not supported, skipping a test.\n"); + } IDirect3D9_Release(d3d); }

1 0

Matteo Bruni : d3dx9/tests: Skip some volume tests if loading the texture fails.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: d96d0af83d9be0cf27dcf45536fdcd5939ae04a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96d0af83d9be0cf27dcf4553… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:07 2014 +0100 d3dx9/tests: Skip some volume tests if loading the texture fails. --- dlls/d3dx9_36/tests/volume.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index ee83bca..860a20b 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -73,7 +73,7 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) &volume_texture, NULL); if (FAILED(hr)) { - skip("Failed to create volume texture\n"); + skip("Failed to create volume texture.\n"); return; } @@ -84,6 +84,11 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (FAILED(hr)) + { + win_skip("D3DXLoadVolumeFromMemory failed with error %#x, skipping some tests.\n", hr); + return; + } IDirect3DVolume9_LockBox(volume, &locked_box, &dst_box, D3DLOCK_READONLY); for (i = 0; i < 16; i++) check_pixel_4bpp(&locked_box, i % 4, 0, i / 4, pixels[i]);

1 0

Matteo Bruni : d3dx9: Fix a WARN.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: db4bf1e1d47bdb42349f766d7ca492bfa20aaee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4bf1e1d47bdb42349f766d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:06 2014 +0100 d3dx9: Fix a WARN. --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 13f4524..260dfa5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5340,7 +5340,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s (ID3DInclude *)include, flags, (ID3DBlob **)compilation_errors, pool); if (FAILED(hr)) { - WARN("Failed to initialize shader reflection\n"); + WARN("Failed to create effect object.\n"); HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Jactry Zeng : riched20/tests: Fix a SysAllocString leak.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: fa2c5092434379ef3e0c5ea2b014acea42043925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2c5092434379ef3e0c5ea2b… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Mar 13 20:49:18 2014 +0800 riched20/tests: Fix a SysAllocString leak. --- dlls/riched20/tests/richole.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 3781e68..5bfb999 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -190,7 +190,7 @@ static void test_ITextDocument_Open(void) int tomNumSingle = sizeof(tomConstantsSingle)/sizeof(tomConstantsSingle[0]); int tomNumMulti = sizeof(tomConstantsMulti)/sizeof(tomConstantsMulti[0]); int i; - VariantInit(&testfile); + V_VT(&testfile) = VT_BSTR; V_BSTR(&testfile) = SysAllocString(filename); @@ -378,6 +378,8 @@ static void test_ITextDocument_Open(void) todo_wine ok(result == 0, "ITextDocument_Open: Test UTF-16 set wrong text: Result: %s\n", wine_dbgstr_w(bufUnicode)); release_interfaces(&w, &reOle, &txtDoc, &txtSel); DeleteFileW(filename); + + VariantClear(&testfile); } START_TEST(richole)

1 0

Nikolay Sivov : msxml3: Respect stylesheet output mode when dumping resulting document.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 02af74400ff2b4762e589e5f3f4d14fe20a461c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02af74400ff2b4762e589e5f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 13 15:31:41 2014 +0400 msxml3: Respect stylesheet output mode when dumping resulting document. --- dlls/msxml3/main.c | 2 ++ dlls/msxml3/node.c | 31 +++++++++---------------------- dlls/msxml3/tests/domdoc.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 1381904..5967ac0 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -173,6 +173,7 @@ DECL_FUNCPTR(xsltFreeTransformContext); DECL_FUNCPTR(xsltNewTransformContext); DECL_FUNCPTR(xsltParseStylesheetDoc); DECL_FUNCPTR(xsltQuoteUserParams); +DECL_FUNCPTR(xsltSaveResultTo); # undef DECL_FUNCPTR #endif @@ -197,6 +198,7 @@ static void init_libxslt(void) LOAD_FUNCPTR(xsltNewTransformContext, 1); LOAD_FUNCPTR(xsltParseStylesheetDoc, 1); LOAD_FUNCPTR(xsltQuoteUserParams, 1); + LOAD_FUNCPTR(xsltSaveResultTo, 1); #undef LOAD_FUNCPTR if (pxsltInit) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index aee38e0..e3016a5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -67,6 +67,7 @@ MAKE_FUNCPTR(xsltFreeTransformContext); MAKE_FUNCPTR(xsltNewTransformContext); MAKE_FUNCPTR(xsltParseStylesheetDoc); MAKE_FUNCPTR(xsltQuoteUserParams); +MAKE_FUNCPTR(xsltSaveResultTo); # undef MAKE_FUNCPTR #endif @@ -1058,30 +1059,16 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, { const xmlChar *content; - if(result->type == XML_HTML_DOCUMENT_NODE) + xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); + if (output) { - xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); - if (output) - { + if(result->type == XML_HTML_DOCUMENT_NODE) htmldoc_dumpcontent(output, result->doc); - content = get_output_buffer_content(output); - *p = bstr_from_xmlChar(content); - xmlOutputBufferClose(output); - } - } - else - { - xmlBufferPtr buf = xmlBufferCreate(); - if (buf) - { - int size = xmlNodeDump(buf, NULL, (xmlNodePtr)result, 0, 0); - if(size > 0) - { - content = xmlBufferContent(buf); - *p = bstr_from_xmlChar(content); - } - xmlBufferFree(buf); - } + else + pxsltSaveResultTo(output, result->doc, xsltSS); + content = get_output_buffer_content(output); + *p = bstr_from_xmlChar(content); + xmlOutputBufferClose(output); } xmlFreeDoc(result); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b5e7441..79805cc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11659,6 +11659,32 @@ static const char xsltext_xsl[] = "</xsl:template>" "</xsl:stylesheet>"; +static const char omitxmldecl_xsl[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"xml\" omit-xml-declaration=\"yes\"/>" +"<xsl:template match=\"/\">" +" <xsl:for-each select=\"/a/item\">" +" <xsl:element name=\"node\">" +" <xsl:value-of select=\"@name\"/>" +" </xsl:element>" +" </xsl:for-each>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static const char omitxmldecl_doc[] = +"<?xml version=\"1.0\"?>" +"<a>" +" <item name=\"item1\"/>" +" <item name=\"item2\"/>" +"</a>"; + +static const char omitxmldecl_result[] = +"<node>item1</node><node>item2</node>"; + +static const char omitxmldecl_result2[] = +"<node>item1</node><node>item2</node>\n"; + static void test_xsltext(void) { IXMLDOMDocument *doc, *doc2; @@ -11680,6 +11706,19 @@ static void test_xsltext(void) ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret)); SysFreeString(ret); + /* omit-xml-declaration */ + hr = IXMLDOMDocument_loadXML(doc, _bstr_(omitxmldecl_xsl), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_loadXML(doc2, _bstr_(omitxmldecl_doc), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + /* Old enough libxslt places extra '\n' at the end of the output. */ + ok(!lstrcmpW(ret, _bstr_(omitxmldecl_result)) || + !lstrcmpW(ret, _bstr_(omitxmldecl_result2)), "transform result %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + IXMLDOMDocument_Release(doc2); IXMLDOMDocument_Release(doc); free_bstrs();

1 0

Piotr Caban : msvcrt: Improve toupper_l implementation.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 28cc0b8bc15e78a66fe2ea6692cd08ba843aa8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cc0b8bc15e78a66fe2ea669… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 13 14:13:02 2014 +0100 msvcrt: Improve toupper_l implementation. --- dlls/msvcrt/ctype.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index c486f8e..8b9d14c 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -339,37 +339,42 @@ int CDECL MSVCRT___iscsymf(int c) int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + unsigned char str[2], *p = str; + WCHAR wide, upper; if(!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; - if(c < 256) - return locinfo->pcumap[(unsigned char)c]; + if((unsigned)c < 256) + return locinfo->pcumap[c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) - { - WCHAR wide, upper; - char str[2], *p = str; *p++ = (c>>8) & 255; - *p++ = c & 255; - - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, str, 2, &wide, 1)) - return c; + else { + *MSVCRT__errno() = MSVCRT_EILSEQ; + str[1] = 0; + } + *p++ = c & 255; - upper = toupperW(wide); - if(upper == wide) - return c; + if(!MultiByteToWideChar(locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) + return c; - WideCharToMultiByte(locinfo->lc_codepage, 0, - &upper, 1, str, 2, NULL, NULL); + upper = toupperW(wide); + if(upper == wide) + return str[0] + (str[1]<<8); + switch(WideCharToMultiByte(locinfo->lc_codepage, 0, + &upper, 1, (char*)str, 2, NULL, NULL)) { + case 0: + return c; + case 1: + return str[0]; + default: return str[0] + (str[1]<<8); } - - return c; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Improve tolower tests.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 13f6194bb15fe87c9c385b066b099f8416317fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f6194bb15fe87c9c385b066… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 13 14:12:53 2014 +0100 msvcrt: Improve tolower tests. --- dlls/msvcrt/tests/string.c | 54 ++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 71b6815..7d820e1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2419,29 +2419,59 @@ static void test_wctomb(void) static void test_tolower(void) { - int ret; + char ch, lch; + int ret, len; + /* test C locale when locale was never changed */ ret = p_tolower(0x41); ok(ret == 0x61, "ret = %x\n", ret); ret = p_tolower(0xF4); ok(ret == 0xF4, "ret = %x\n", ret); + errno = 0xdeadbeef; ret = p_tolower((char)0xF4); - ok(ret==0xF4/*Vista+*/ || ret==(char)0xF4, "ret = %x\n", ret); + todo_wine ok(ret == (char)0xF4, "ret = %x\n", ret); + todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); - /* is it using different locale (CP_ACP) for negative values?? */ - /* current implementation matches msvcr90 behaviour */ + errno = 0xdeadbeef; ret = p_tolower((char)0xD0); - todo_wine ok(ret==0xF0/*Vista+*/ || ret==(char)0xD0, "ret = %x\n", ret); - - ret = p_tolower(0xD0); - ok(ret == 0xD0, "ret = %x\n", ret); + todo_wine ok(ret == (char)0xD0, "ret = %x\n", ret); + todo_wine ok(errno == 0xdeadbeef, "errno = %d\n", errno); + /* test C locale after setting locale */ if(!setlocale(LC_ALL, "us")) { win_skip("skipping tolower tests that depends on locale\n"); return; } + setlocale(LC_ALL, "C"); + + ch = 0xF4; + errno = 0xdeadbeef; + ret = p_tolower(ch); + len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(len) + ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); + else + ok(ret == ch, "ret = %x\n", ret); + if(!len || ret==(unsigned char)lch) + ok(errno == EILSEQ, "errno = %d\n", errno); + + ch = 0xD0; + errno = 0xdeadbeef; + ret = p_tolower(ch); + len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(len) + ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); + else + ok(ret == ch, "ret = %x\n", ret); + if(!len || ret==(unsigned char)lch) + ok(errno == EILSEQ, "errno = %d\n", errno); + + ret = p_tolower(0xD0); + ok(ret == 0xD0, "ret = %x\n", ret); + + ok(setlocale(LC_ALL, "us") != NULL, "setlocale failed\n"); ret = p_tolower((char)0xD0); ok(ret == 0xF0, "ret = %x\n", ret); @@ -2696,15 +2726,12 @@ START_TEST(string) ok(pmemcmp(mem+5,xilstring, nLen) == 0, "Got result %s\n",mem+5); - /* Test _swab function */ + /* run tolower tests first */ + test_tolower(); test_swab(); - - /* Test ismbblead*/ test_mbcp(); - /* test _mbsspn */ test_mbsspn(); test_mbsspnp(); - /* test _strdup */ test_strdup(); test_strcpy_s(); test_memcpy_s(); @@ -2736,7 +2763,6 @@ START_TEST(string) test__mbslwr_s(); test_wctob(); test_wctomb(); - test_tolower(); test__atodbl(); test__stricmp(); test__wcstoi64();

1 0

Piotr Caban : msvcrt: Improve tolower_l implementation.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 6a63e0e6bc5bcb7ee07e2d92b4b501865b0d2077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a63e0e6bc5bcb7ee07e2d92b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 13 14:12:41 2014 +0100 msvcrt: Improve tolower_l implementation. --- dlls/msvcrt/ctype.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index ca8b5fd..c486f8e 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -394,37 +394,42 @@ int CDECL MSVCRT__toupper(int c) int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + unsigned char str[2], *p = str; + WCHAR wide, lower; if(!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; - if(c < 256) - return locinfo->pclmap[(unsigned char)c]; + if((unsigned)c < 256) + return locinfo->pclmap[c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) - { - WCHAR wide, upper; - char str[2], *p = str; *p++ = (c>>8) & 255; - *p++ = c & 255; - - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, str, 2, &wide, 1)) - return c; + else { + *MSVCRT__errno() = MSVCRT_EILSEQ; + str[1] = 0; + } + *p++ = c & 255; - upper = tolowerW(wide); - if(upper == wide) - return c; + if(!MultiByteToWideChar(locinfo->lc_codepage, + MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) + return c; - WideCharToMultiByte(locinfo->lc_codepage, 0, - &upper, 1, str, 2, NULL, NULL); + lower = tolowerW(wide); + if(lower == wide) + return str[0] + (str[1]<<8); + switch(WideCharToMultiByte(locinfo->lc_codepage, 0, + &lower, 1, (char*)str, 2, NULL, NULL)) { + case 0: + return c; + case 1: + return str[0]; + default: return str[0] + (str[1]<<8); } - - return c; } /*********************************************************************

1 0

Jacek Caban : mshtml: Added support for target attribute in submit function implementation.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 992fa4802091c943d10be5fca22852442e48e241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992fa4802091c943d10be5fca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:47:14 2014 +0100 mshtml: Added support for target attribute in submit function implementation. --- dlls/mshtml/htmlanchor.c | 95 +++++++++++++++++++++++++++--------------- dlls/mshtml/htmlform.c | 22 ++++++++-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 81 insertions(+), 37 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index f177ff2..a9187a4 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -70,51 +70,81 @@ static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *targ return hres; } +HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_str, BOOL *use_new_window) +{ + HTMLOuterWindow *top_window, *ret_window; + const PRUnichar *target; + HRESULT hres; + + static const WCHAR _parentW[] = {'_','p','a','r','e','n','t',0}; + static const WCHAR _selfW[] = {'_','s','e','l','f',0}; + static const WCHAR _topW[] = {'_','t','o','p',0}; + + *use_new_window = FALSE; + + nsAString_GetData(target_str, &target); + TRACE("%s\n", debugstr_w(target)); + + if(!*target || !strcmpiW(target, _selfW)) { + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + return window; + } + + if(!strcmpiW(target, _topW)) { + get_top_window(window, &top_window); + IHTMLWindow2_AddRef(&top_window->base.IHTMLWindow2_iface); + return top_window; + } + + if(!strcmpiW(target, _parentW)) { + if(!window->parent) { + WARN("Window has no parent\n"); + return NULL; + } + + IHTMLWindow2_AddRef(&window->parent->base.IHTMLWindow2_iface); + return window->parent; + } + + get_top_window(window, &top_window); + + hres = get_frame_by_name(top_window, target, TRUE, &ret_window); + if(FAILED(hres) || !ret_window) { + *use_new_window = TRUE; + return NULL; + } + + IHTMLWindow2_AddRef(&ret_window->base.IHTMLWindow2_iface); + return ret_window; +} + static HRESULT navigate_anchor(HTMLAnchorElement *This) { nsAString href_str, target_str; - HTMLOuterWindow *window = NULL; + HTMLOuterWindow *window; + BOOL use_new_window; nsresult nsres; HRESULT hres = E_FAIL; - static const WCHAR _parentW[] = {'_','p','a','r','e','n','t',0}; - static const WCHAR _selfW[] = {'_','s','e','l','f',0}; - static const WCHAR _topW[] = {'_','t','o','p',0}; nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); - if(NS_SUCCEEDED(nsres)) { + if(NS_FAILED(nsres)) + return E_FAIL; + + window = get_target_window(This->element.node.doc->basedoc.window, &target_str, &use_new_window); + if(!window && use_new_window) { const PRUnichar *target; nsAString_GetData(&target_str, &target); - TRACE("target %s\n", debugstr_w(target)); - if(*target && strcmpiW(target, _selfW)) { - if(!strcmpiW(target, _topW)) { - TRACE("target _top\n"); - get_top_window(This->element.node.doc->basedoc.window, &window); - }else if(!strcmpiW(target, _parentW)) { - window = This->element.node.doc->basedoc.window; - if(!window->parent) { - WARN("Window has no parent\n"); - nsAString_Finish(&target_str); - return S_OK; - } - window = window->parent; - }else { - HTMLOuterWindow *top_window; - - get_top_window(This->element.node.doc->basedoc.window, &top_window); - - hres = get_frame_by_name(top_window, target, TRUE, &window); - if(FAILED(hres) || !window) { - hres = navigate_anchor_window(This, target); - nsAString_Finish(&target_str); - return hres; - } - } - } + hres = navigate_anchor_window(This, target); + nsAString_Finish(&target_str); + return hres; } + nsAString_Finish(&target_str); + if(!window) + return S_OK; nsAString_Init(&href_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); @@ -123,8 +153,6 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&href_str, &href); if(*href) { - if(!window) - window = This->element.node.doc->basedoc.window; hres = navigate_url(window, href, window->uri_nofrag, BINDING_NAVIGATED); }else { TRACE("empty href\n"); @@ -132,6 +160,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) } } nsAString_Finish(&href_str); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); return hres; } diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 65db2b2..5b9982c 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -362,9 +362,9 @@ static HRESULT WINAPI HTMLFormElement_get_onreset(IHTMLFormElement *iface, VARIA static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - HTMLOuterWindow *window = NULL; + HTMLOuterWindow *window = NULL, *this_window = NULL; nsIInputStream *post_stream; - nsAString action_uri_str; + nsAString action_uri_str, target_str; IUri *uri; nsresult nsres; HRESULT hres; @@ -374,19 +374,32 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) if(This->element.node.doc) { HTMLDocumentNode *doc = This->element.node.doc; if(doc->window && doc->window->base.outer_window) - window = doc->window->base.outer_window; + this_window = doc->window->base.outer_window; } - if(!window) { + if(!this_window) { TRACE("No outer window\n"); return S_OK; } + nsAString_Init(&target_str, NULL); + nsres = nsIDOMHTMLFormElement_GetTarget(This->nsform, &target_str); + if(NS_SUCCEEDED(nsres)) { + BOOL use_new_window; + window = get_target_window(this_window, &target_str, &use_new_window); + if(use_new_window) + FIXME("submit to new window is not supported\n"); + } + nsAString_Finish(&target_str); + if(!window) + return S_OK; + /* * FIXME: We currently don't use our submit implementation for sub-windows because * load_nsuri can't support post data. We should fix it. */ if(!window->doc_obj || window->doc_obj->basedoc.window != window) { nsres = nsIDOMHTMLFormElement_Submit(This->nsform); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(NS_FAILED(nsres)) { ERR("Submit failed: %08x\n", nsres); return E_FAIL; @@ -414,6 +427,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) IUri_Release(uri); } + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(post_stream) nsIInputStream_Release(post_stream); return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5907ec1..882f859 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -943,6 +943,7 @@ HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT get_frame_by_name(HTMLOuterWindow*,const WCHAR*,BOOL,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT get_doc_elem_by_id(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; +HTMLOuterWindow *get_target_window(HTMLOuterWindow*,nsAString*,BOOL*) DECLSPEC_HIDDEN; HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014