April 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Use Tahoma instead of Arial for gdiplus font tests.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 4b9e1db09f43c3fee4f9743accc1782262944918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9e1db09f43c3fee4f9743ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 20 16:44:17 2012 +0900 gdiplus: Use Tahoma instead of Arial for gdiplus font tests. --- dlls/gdiplus/tests/font.c | 96 +++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 60 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 98c4114..f63819a 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -24,10 +24,9 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) -#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %f, got %f\n", expected, got) -static const WCHAR arial[] = {'A','r','i','a','l','\0'}; static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; @@ -50,12 +49,7 @@ static void test_createfont(void) expect (FontFamilyNotFound, stat); stat = GdipDeleteFont(font); expect (InvalidParameter, stat); - stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); expect (Ok, stat); stat = GdipCreateFont(fontfamily, 12, FontStyleRegular, UnitPoint, &font); expect (Ok, stat); @@ -67,7 +61,7 @@ static void test_createfont(void) expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); - ok (lstrcmpiW(arial, familyname) == 0, "Expected arial, got %s\n", + ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2); expect(Ok, stat); @@ -110,14 +104,9 @@ static void test_logfont(void) stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(NotTrueTypeFont, stat); - lstrcpyA(lfa.lfFaceName, "Arial"); + lstrcpyA(lfa.lfFaceName, "Tahoma"); stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); - if (stat == FileNotFound) - { - skip("Arial not installed.\n"); - return; - } expect(Ok, stat); stat = GdipGetLogFontA(font, graphics, &lfa2); expect(Ok, stat); @@ -146,7 +135,7 @@ static void test_logfont(void) lfa.lfItalic = lfa.lfUnderline = lfa.lfStrikeOut = TRUE; memset(&lfa2, 0xff, sizeof(LOGFONTA)); - lstrcpyA(lfa.lfFaceName, "Arial"); + lstrcpyA(lfa.lfFaceName, "Tahoma"); stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(Ok, stat); @@ -186,7 +175,7 @@ static void test_fontfamily (void) GpStatus stat; /* FontFamily cannot be NULL */ - stat = GdipCreateFontFamilyFromName (arial , NULL, NULL); + stat = GdipCreateFontFamilyFromName (Tahoma , NULL, NULL); expect (InvalidParameter, stat); /* FontFamily must be able to actually find the family. @@ -200,17 +189,12 @@ static void test_fontfamily (void) expect (FontFamilyNotFound, stat); if(stat == Ok) GdipDeleteFontFamily(family); - stat = GdipCreateFontFamilyFromName (arial, NULL, &family); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName (Tahoma, NULL, &family); expect (Ok, stat); stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL); expect (Ok, stat); - expect (0, lstrcmpiW(itsName, arial)); + expect (0, lstrcmpiW(itsName, Tahoma)); if (0) { @@ -226,7 +210,7 @@ static void test_fontfamily (void) GdipDeleteFontFamily(family); stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); expect(Ok, stat); - expect(0, lstrcmpiW(itsName, arial)); + expect(0, lstrcmpiW(itsName, Tahoma)); GdipDeleteFontFamily(clonedFontFamily); } @@ -237,28 +221,25 @@ static void test_fontfamily_properties (void) GpStatus stat; UINT16 result = 0; - stat = GdipCreateFontFamilyFromName(arial, NULL, &FontFamily); - if(stat == FontFamilyNotFound) - skip("Arial not installed\n"); - else - { - stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok (result == 2355, "Expected 2355, got %d\n", result); - result = 0; - stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 2048, "Expected 2048, got %d\n", result); - result = 0; - stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 1854, "Expected 1854, got %d\n", result); - result = 0; - stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); - expect(Ok, stat); - ok(result == 434, "Expected 434, got %d\n", result); - GdipDeleteFontFamily(FontFamily); - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &FontFamily); + expect(Ok, stat); + + stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok (result == 2472, "Expected 2472, got %d\n", result); + result = 0; + stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2048, "Expected 2048, got %d\n", result); + result = 0; + stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2049, "Expected 2049, got %d\n", result); + result = 0; + stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 423, "Expected 423, got %d\n", result); + GdipDeleteFontFamily(FontFamily); stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); if(stat == FontFamilyNotFound) @@ -363,12 +344,7 @@ static void test_heightgivendpi(void) GpFontFamily* fontfamily = NULL; REAL height; - stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily); - if(stat == FontFamilyNotFound) - { - skip("Arial not installed\n"); - return; - } + stat = GdipCreateFontFamilyFromName(Tahoma, NULL, &fontfamily); expect(Ok, stat); stat = GdipCreateFont(fontfamily, 30, FontStyleRegular, UnitPixel, &font); @@ -382,7 +358,7 @@ static void test_heightgivendpi(void) stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)34.497070, height); + expectf(36.210938, height); GdipDeleteFont(font); height = 12345; @@ -390,7 +366,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)34.497070, height); + expectf(36.210938, height); GdipDeleteFont(font); height = 12345; @@ -398,7 +374,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)45.996094, height); + expectf(48.281250, height); GdipDeleteFont(font); height = 12345; @@ -406,7 +382,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)3311.718750, height); + expectf(3476.250000, height); GdipDeleteFont(font); height = 12345; @@ -414,7 +390,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)11.039062, height); + expectf(11.587500, height); GdipDeleteFont(font); height = 12345; @@ -422,7 +398,7 @@ static void test_heightgivendpi(void) expect(Ok, stat); stat = GdipGetFontHeightGivenDPI(font, 96, &height); expect(Ok, stat); - expectf((REAL)130.382614, height); + expectf(136.860245, height); GdipDeleteFont(font); GdipDeleteFontFamily(fontfamily);

1 0

André Hentschel : winedbg: Print all available information about branch targets in ARM disassembler.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 6795bab565aec542a83e02090466a2843104167c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6795bab565aec542a83e02090… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 22 19:03:36 2012 +0200 winedbg: Print all available information about branch targets in ARM disassembler. --- programs/winedbg/be_arm.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 92d4094..7da28b6 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -99,7 +99,17 @@ static UINT db_get_inst(void* addr, int size) return result; } -static UINT arm_disasm_branch(UINT inst) +static void db_printsym(unsigned int addr) +{ + ADDRESS64 a; + + a.Mode = AddrModeFlat; + a.Offset = addr; + + print_address(&a, TRUE); +} + +static UINT arm_disasm_branch(UINT inst, ADDRESS64 *addr) { short link = (inst >> 24) & 0x01; int offset = (inst << 2) & 0x03ffffff; @@ -107,17 +117,18 @@ static UINT arm_disasm_branch(UINT inst) if (offset & 0x02000000) offset |= 0xfc000000; offset += 8; - dbg_printf("\n\tb%s%s\t#%d", link ? "l" : "", get_cond(inst), offset); + dbg_printf("\n\tb%s%s\t", link ? "l" : "", get_cond(inst)); + db_printsym(addr->Offset + offset); return 0; } -static UINT arm_disasm_branchreg(UINT inst) +static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); return 0; } -static UINT arm_disasm_dataprocessing(UINT inst) +static UINT arm_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) { short condcodes = (inst >> 20) & 0x01; short opcode = (inst >> 21) & 0x0f; @@ -163,7 +174,7 @@ static UINT arm_disasm_dataprocessing(UINT inst) return 0; } -static UINT arm_disasm_singletrans(UINT inst) +static UINT arm_disasm_singletrans(UINT inst, ADDRESS64 *addr) { short load = (inst >> 20) & 0x01; short writeback = (inst >> 21) & 0x01; @@ -205,7 +216,7 @@ static UINT arm_disasm_singletrans(UINT inst) return 0; } -static UINT arm_disasm_halfwordtrans(UINT inst) +static UINT arm_disasm_halfwordtrans(UINT inst, ADDRESS64 *addr) { short halfword = (inst >> 5) & 0x01; short sign = (inst >> 6) & 0x01; @@ -238,7 +249,7 @@ static UINT arm_disasm_halfwordtrans(UINT inst) return 0; } -static UINT arm_disasm_blocktrans(UINT inst) +static UINT arm_disasm_blocktrans(UINT inst, ADDRESS64 *addr) { short load = (inst >> 20) & 0x01; short writeback = (inst >> 21) & 0x01; @@ -265,14 +276,14 @@ static UINT arm_disasm_blocktrans(UINT inst) return 0; } -static UINT arm_disasm_swi(UINT inst) +static UINT arm_disasm_swi(UINT inst, ADDRESS64 *addr) { UINT comment = inst & 0x00ffffff; dbg_printf("\n\tswi%s\t#%d", get_cond(inst), comment); return 0; } -static UINT arm_disasm_coproctrans(UINT inst) +static UINT arm_disasm_coproctrans(UINT inst, ADDRESS64 *addr) { WORD CRm = inst & 0x0f; WORD CP = (inst >> 5) & 0x07; @@ -286,7 +297,7 @@ static UINT arm_disasm_coproctrans(UINT inst) return 0; } -static UINT arm_disasm_coprocdataop(UINT inst) +static UINT arm_disasm_coprocdataop(UINT inst, ADDRESS64 *addr) { WORD CRm = inst & 0x0f; WORD CP = (inst >> 5) & 0x07; @@ -300,7 +311,7 @@ static UINT arm_disasm_coprocdataop(UINT inst) return 0; } -static UINT arm_disasm_coprocdatatrans(UINT inst) +static UINT arm_disasm_coprocdatatrans(UINT inst, ADDRESS64 *addr) { WORD CPnum = (inst >> 8) & 0x0f; WORD CRd = (inst >> 12) & 0x0f; @@ -393,14 +404,16 @@ static WORD thumb_disasm_longbl(WORD inst, ADDRESS64 *addr) if (!((inst2 & 0xf800) == 0xf800)) return inst; offset += (inst2 & 0x07ff) << 1; - dbg_printf("\n\tbl\t%08x", offset); + dbg_printf("\n\tbl\t"); + db_printsym(addr->Offset + offset); return 0; } static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) { WORD offset = inst & 0x00ff; - dbg_printf("\n\tb%s\t%04x", tbl_cond[(inst >> 8) & 0x0f], offset); + dbg_printf("\n\tb%s\t", tbl_cond[(inst >> 8) & 0x0f]); + db_printsym(addr->Offset + offset); return 0; } @@ -491,7 +504,7 @@ struct inst_arm { UINT mask; UINT pattern; - UINT (*func)(UINT); + UINT (*func)(UINT, ADDRESS64*); }; static const struct inst_arm tbl_arm[] = { @@ -581,7 +594,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } else { - if (!a_ptr->func(inst)) + if (!a_ptr->func(inst, addr)) addr->Offset += size; return; }

1 0

André Hentschel : winevdm: Remove unneeded shadow variable.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 6fcb3b698e3fdd7b717fa6e512a41454de9f490c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fcb3b698e3fdd7b717fa6e51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 22 19:04:57 2012 +0200 winevdm: Remove unneeded shadow variable. --- programs/winevdm/winevdm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index b143cb8..d297551 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -452,7 +452,6 @@ static char *build_command_line( char **argv ) *p++='"'; if (has_quote) { int bcount; - char* a; bcount=0; a=*arg;

1 0

André Hentschel : ws2_32: Remove unneeded shadow variable.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: c5089d18b75bdf93af7c7af322a3165857f0b83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5089d18b75bdf93af7c7af32… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 22 19:05:05 2012 +0200 ws2_32: Remove unneeded shadow variable. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fd384a5..21e084b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2759,7 +2759,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, static const int MAX_IRDA_DEVICES = 10; char buf[sizeof(struct irda_device_list) + (MAX_IRDA_DEVICES - 1) * sizeof(struct irda_device_info)]; - int fd, res; + int res; socklen_t len = sizeof(buf); if ( (fd = get_sock_fd( s, 0, NULL )) == -1)

1 0

Nikolay Sivov : msxml3: Switch parser encoding manually when it won' t be able to detect it (UTF-16 case).
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 221f9efe27fe786d4c2ee9c8d76ea9d8a75fc279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221f9efe27fe786d4c2ee9c8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 21 12:32:15 2012 +0400 msxml3: Switch parser encoding manually when it won't be able to detect it (UTF-16 case). --- dlls/msxml3/saxreader.c | 30 ++++++++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 22 ++++++++++++++++------ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a5b7a32..913eeaf 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2144,7 +2144,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz HRESULT hr; hr = SAXLocator_create(This, &locator, vbInterface); - if(FAILED(hr)) + if (FAILED(hr)) return hr; if (size >= 4) @@ -2163,22 +2163,44 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz } } + /* if libxml2 detection failed try to guess */ + if (encoding == XML_CHAR_ENCODING_NONE) + { + const WCHAR *ptr = (WCHAR*)buffer; + /* xml declaration with possibly specfied encoding will be still handled by parser */ + if ((size >= 2) && *ptr == '<' && ptr[1] != '?') + { + enc_name = (xmlChar*)xmlGetCharEncodingName(XML_CHAR_ENCODING_UTF16LE); + encoding = XML_CHAR_ENCODING_UTF16LE; + } + } + else if (encoding == XML_CHAR_ENCODING_UTF8) + enc_name = (xmlChar*)xmlGetCharEncodingName(encoding); + else + enc_name = NULL; + locator->pParserCtxt = xmlCreateMemoryParserCtxt(buffer, size); - if(!locator->pParserCtxt) + if (!locator->pParserCtxt) { ISAXLocator_Release(&locator->ISAXLocator_iface); return E_FAIL; } - if (encoding == XML_CHAR_ENCODING_UTF8) + if (enc_name) + { locator->pParserCtxt->encoding = xmlStrdup(enc_name); + if (encoding == XML_CHAR_ENCODING_UTF16LE) { + TRACE("switching to %s\n", enc_name); + xmlSwitchEncoding(locator->pParserCtxt, encoding); + } + } xmlFree(locator->pParserCtxt->sax); locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator; This->isParsing = TRUE; - if(xmlParseDocument(locator->pParserCtxt)==-1 && locator->ret==S_OK) + if(xmlParseDocument(locator->pParserCtxt) == -1 && locator->ret == S_OK) hr = E_FAIL; else hr = locator->ret; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 00a3553..5db2d11 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2317,18 +2317,20 @@ static const struct enc_test_entry_t encoding_test_data[] = { { 0 } }; -static void test_encoding(void) +static void test_saxreader_encoding(void) { const struct enc_test_entry_t *entry = encoding_test_data; static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; static const CHAR testXmlA[] = "test.xml"; - ISAXXMLReader *reader; - DWORD written; - HANDLE file; - HRESULT hr; while (entry->guid) { + ISAXXMLReader *reader; + VARIANT input; + DWORD written; + HANDLE file; + HRESULT hr; + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); if (hr != S_OK) { @@ -2349,8 +2351,16 @@ static void test_encoding(void) ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); DeleteFileA(testXmlA); + + /* try BSTR input with no BOM or '<?xml' instruction */ + V_VT(&input) = VT_BSTR; + V_BSTR(&input) = _bstr_("<element></element>"); + hr = ISAXXMLReader_parse(reader, input); + EXPECT_HR(hr, S_OK); + ISAXXMLReader_Release(reader); + free_bstrs(); entry++; } } @@ -4474,7 +4484,7 @@ START_TEST(saxreader) test_saxreader(); test_saxreader_properties(); test_saxreader_features(); - test_encoding(); + test_saxreader_encoding(); test_dispex(); /* MXXMLWriter tests */

1 0

Nikolay Sivov : msxml3: Implement push/pop operations for contexts.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 43241140aaa1bf0f7cee277488e599ae721d4d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43241140aaa1bf0f7cee27748… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 22 23:30:22 2012 +0400 msxml3: Implement push/pop operations for contexts. --- dlls/msxml3/mxnamespace.c | 46 +++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index f21c758..f7d4eb6 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -184,11 +184,22 @@ static struct nscontext* alloc_ns_context(void) ctxt->count = 0; ctxt->max_alloc = DEFAULT_PREFIX_ALLOC_COUNT; ctxt->ns = heap_alloc(ctxt->max_alloc*sizeof(*ctxt->ns)); + if (!ctxt->ns) + { + heap_free(ctxt); + return NULL; + } /* first allocated prefix is always 'xml' */ ctxt->ns[0].prefix = SysAllocString(xmlW); ctxt->ns[0].uri = SysAllocString(xmluriW); ctxt->count++; + if (!ctxt->ns[0].prefix || !ctxt->ns[0].uri) + { + heap_free(ctxt->ns); + heap_free(ctxt); + return NULL; + } return ctxt; } @@ -521,8 +532,16 @@ static HRESULT WINAPI vbnamespacemanager_reset(IVBMXNamespaceManager *iface) static HRESULT WINAPI vbnamespacemanager_pushContext(IVBMXNamespaceManager *iface) { namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + struct nscontext *ctxt; + + TRACE("(%p)\n", This); + + ctxt = alloc_ns_context(); + if (!ctxt) return E_OUTOFMEMORY; + + list_add_head(&This->ctxts, &ctxt->entry); + + return S_OK; } static HRESULT WINAPI vbnamespacemanager_pushNodeContext(IVBMXNamespaceManager *iface, @@ -536,8 +555,20 @@ static HRESULT WINAPI vbnamespacemanager_pushNodeContext(IVBMXNamespaceManager * static HRESULT WINAPI vbnamespacemanager_popContext(IVBMXNamespaceManager *iface) { namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + const struct list *next; + struct nscontext *ctxt; + + TRACE("(%p)\n", This); + + next = list_next(&This->ctxts, list_head(&This->ctxts)); + if (!next) return E_FAIL; + + ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); + list_remove(list_head(&This->ctxts)); + + free_ns_context(ctxt); + + return S_OK; } static HRESULT WINAPI vbnamespacemanager_declarePrefix(IVBMXNamespaceManager *iface, @@ -605,6 +636,7 @@ static const tid_t namespacemanager_iface_tids[] = { IVBMXNamespaceManager_tid, 0 }; + static dispex_static_data_t namespacemanager_dispex = { NULL, IVBMXNamespaceManager_tid, @@ -630,6 +662,12 @@ HRESULT MXNamespaceManager_create(IUnknown *outer, void **obj) list_init(&This->ctxts); ctxt = alloc_ns_context(); + if (!ctxt) + { + heap_free(This); + return E_OUTOFMEMORY; + } + list_add_head(&This->ctxts, &ctxt->entry); This->override = VARIANT_TRUE; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 258cca3..ccc2c64 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10716,6 +10716,95 @@ todo_wine { IMXNamespaceManager_Release(nsmgr); + /* push/pop tests */ + hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXNamespaceManager, (void**)&nsmgr); + EXPECT_HR(hr, S_OK); + + /* pop with empty stack */ + hr = IMXNamespaceManager_popContext(nsmgr); + EXPECT_HR(hr, E_FAIL); + + hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns1"), _bstr_("ns1 uri")); + EXPECT_HR(hr, S_OK); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + + hr = IMXNamespaceManager_pushContext(nsmgr); + EXPECT_HR(hr, S_OK); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); +todo_wine + EXPECT_HR(hr, S_OK); + if (hr == S_OK) { + ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + } + + hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns2"), _bstr_("ns2 uri")); + EXPECT_HR(hr, S_OK); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + + hr = IMXNamespaceManager_pushContext(nsmgr); + EXPECT_HR(hr, S_OK); + hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns3"), _bstr_("ns3 uri")); + EXPECT_HR(hr, S_OK); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); +todo_wine + EXPECT_HR(hr, S_OK); + if (hr == S_OK) { + ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + } + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); +todo_wine + EXPECT_HR(hr, S_OK); + if (hr == S_OK) { + ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + } + + hr = IMXNamespaceManager_popContext(nsmgr); + EXPECT_HR(hr, S_OK); + + hr = IMXNamespaceManager_popContext(nsmgr); + EXPECT_HR(hr, S_OK); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); + EXPECT_HR(hr, E_FAIL); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + + IMXNamespaceManager_Release(nsmgr); + free_bstrs(); }

1 0

Nikolay Sivov : msxml3: getPrefix() should check all pushed contexts as well.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: fd423937928b4d6cd9bb6ee195957840e6966648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd423937928b4d6cd9bb6ee19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 22 23:37:47 2012 +0400 msxml3: getPrefix() should check all pushed contexts as well. --- dlls/msxml3/mxnamespace.c | 25 +++++++++++++------------ dlls/msxml3/tests/domdoc.c | 9 --------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index f7d4eb6..7ec3f6e 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -144,16 +144,20 @@ static HRESULT get_declared_prefix_idx(const struct nscontext *ctxt, LONG index, } /* returned stored pointer, caller needs to copy it */ -static HRESULT get_declared_prefix_uri(const struct nscontext *ctxt, const WCHAR *uri, BSTR *prefix) +static HRESULT get_declared_prefix_uri(const struct list *ctxts, const WCHAR *uri, BSTR *prefix) { - int i; + struct nscontext *ctxt; - for (i = 0; i < ctxt->count; i++) - if (!strcmpW(ctxt->ns[i].uri, uri)) - { - *prefix = ctxt->ns[i].prefix; - return S_OK; - } + LIST_FOR_EACH_ENTRY(ctxt, ctxts, struct nscontext, entry) + { + int i; + for (i = 0; i < ctxt->count; i++) + if (!strcmpW(ctxt->ns[i].uri, uri)) + { + *prefix = ctxt->ns[i].prefix; + return S_OK; + } + } *prefix = NULL; return E_FAIL; @@ -321,7 +325,6 @@ static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len) { namespacemanager *This = impl_from_IMXNamespaceManager( iface ); - struct nscontext *ctxt; HRESULT hr; BSTR prfx; @@ -329,9 +332,7 @@ static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, if (!uri || !*uri || !prefix_len) return E_INVALIDARG; - ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); - - hr = get_declared_prefix_uri(ctxt, uri, &prfx); + hr = get_declared_prefix_uri(&This->ctxts, uri, &prfx); if (hr == S_OK) { /* TODO: figure out what index argument is for */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ccc2c64..d50a22e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10741,12 +10741,9 @@ todo_wine { len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) { ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); - } hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns2"), _bstr_("ns2 uri")); EXPECT_HR(hr, S_OK); @@ -10766,22 +10763,16 @@ todo_wine len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) { ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); - } len = 100; buffW[0] = 0x1; hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); -todo_wine EXPECT_HR(hr, S_OK); - if (hr == S_OK) { ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); ok(len == 3, "got %d\n", len); - } hr = IMXNamespaceManager_popContext(nsmgr); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : msxml3: Added getValueFromName() for IMXAttributes.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 9a509594f934474de7e686736ddfa8cc03297659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a509594f934474de7e686736… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 23 00:00:24 2012 +0400 msxml3: Added getValueFromName() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 21 ++++++++++++++++----- dlls/msxml3/tests/saxreader.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 603517e..2378de4 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1934,13 +1934,24 @@ static HRESULT WINAPI SAXAttributes_getValue(ISAXAttributes *iface, int index, c return S_OK; } -static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, const WCHAR * pUri, - int nUri, const WCHAR * pLocalName, int nLocalName, const WCHAR ** pValue, int * nValue) +static HRESULT WINAPI SAXAttributes_getValueFromName(ISAXAttributes *iface, const WCHAR *uri, + int uri_len, const WCHAR *name, int name_len, const WCHAR **value, int *value_len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%s:%d %s:%d %p %p): stub\n", This, debugstr_wn(pUri, nUri), nUri, - debugstr_wn(pLocalName, nLocalName), nLocalName, pValue, nValue); - return E_NOTIMPL; + HRESULT hr; + int index; + + TRACE("(%p)->(%s:%d %s:%d %p %p)\n", This, debugstr_wn(uri, uri_len), uri_len, + debugstr_wn(name, name_len), name_len, value, value_len); + + if (!uri || !name || !value || !value_len) + return (This->class_version == MSXML_DEFAULT || This->class_version == MSXML3) ? E_POINTER : E_INVALIDARG; + + hr = ISAXAttributes_getIndexFromName(iface, uri, uri_len, name, name_len, &index); + if (hr == S_OK) + hr = ISAXAttributes_getValue(iface, index, value, value_len); + + return hr; } static HRESULT WINAPI SAXAttributes_getValueFromQName(ISAXAttributes *iface, const WCHAR *qname, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5db2d11..340bdd0 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4193,6 +4193,15 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), 0, &value, NULL); EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromName(saxattr, NULL, 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, &value, NULL); + EXPECT_HR(hr, E_INVALIDARG); } else { @@ -4211,10 +4220,41 @@ static void test_mxattr_addAttribute(void) hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), NULL, &len); EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, NULL, 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, NULL, 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, _bstr_(table->local), 0, &value, NULL); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), 0, _bstr_(table->local), 0, NULL, &len); + EXPECT_HR(hr, E_POINTER); + + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), strlen(table->uri), _bstr_(table->local), + strlen(table->local), NULL, NULL); + EXPECT_HR(hr, E_POINTER); } hr = ISAXAttributes_getValueFromQName(saxattr, _bstr_(table->qname), strlen(table->qname), &value, &len); EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->value); + ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + + if (table->uri) { + hr = ISAXAttributes_getValueFromName(saxattr, _bstr_(table->uri), strlen(table->uri), + _bstr_(table->local), strlen(table->local), &value, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(_bstr_(table->value), value), "%d: got %s, expected %s\n", i, wine_dbgstr_w(value), + table->value); + ok(lstrlenW(value) == len, "%d: got wrong value length %d\n", i, len); + } } len = -1;

1 0

Nikolay Sivov : msxml3: Added getName() for IMXAttributes.
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 521467fd08254f8def11305b9b7a3264b02513a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521467fd08254f8def11305b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 23 00:08:54 2012 +0400 msxml3: Added getName() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 2378de4..e4224ed 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1818,13 +1818,31 @@ static HRESULT WINAPI SAXAttributes_getQName(ISAXAttributes *iface, int index, c return S_OK; } -static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int nIndex, const WCHAR **pUri, int *pUriLength, - const WCHAR ** pLocalName, int * pLocalNameSize, const WCHAR ** pQName, int * pQNameLength) +static HRESULT WINAPI SAXAttributes_getName(ISAXAttributes *iface, int index, const WCHAR **uri, int *uri_len, + const WCHAR **local, int *local_len, const WCHAR **qname, int *qname_len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p %p %p %p %p): stub\n", This, nIndex, pUri, pUriLength, pLocalName, pLocalNameSize, - pQName, pQNameLength); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p %p %p %p %p)\n", This, index, uri, uri_len, local, local_len, qname, qname_len); + + if (index >= This->length || index < 0) + return E_INVALIDARG; + + if (!uri || !uri_len || !local || !local_len || !qname || !qname_len) + return E_POINTER; + + *uri_len = SysStringLen(This->attr[index].uri); + *uri = This->attr[index].uri; + + *local_len = SysStringLen(This->attr[index].local); + *local = This->attr[index].local; + + *qname_len = SysStringLen(This->attr[index].qname); + *qname = This->attr[index].qname; + + TRACE("(%s, %s, %s)\n", debugstr_w(*uri), debugstr_w(*local), debugstr_w(*qname)); + + return S_OK; } static HRESULT WINAPI SAXAttributes_getIndexFromName(ISAXAttributes *iface, const WCHAR *uri, int uri_len,

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetRenderTarget ().
by Alexandre Julliard 23 Apr '12

23 Apr '12

Module: wine Branch: master Commit: 17b83cd2549f45501b6f6165811c580dfd6504c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b83cd2549f45501b6f61658… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 22 22:47:40 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetRenderTarget(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0a0e35d..e10c83c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1139,6 +1139,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderTarget(IDirect3DDevice8 *ifa { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); struct wined3d_surface *wined3d_surface; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, render_target %p.\n", iface, ppRenderTarget); @@ -1151,7 +1152,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderTarget(IDirect3DDevice8 *ifa hr = wined3d_device_get_render_target(This->wined3d_device, 0, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface) { - *ppRenderTarget = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppRenderTarget = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*ppRenderTarget); wined3d_surface_decref(wined3d_surface); }

1 0