wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Austin English : version/tests: Remove win9x hacks.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 35a39e3cf6afa2ded91b96369597ff4d974c16bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a39e3cf6afa2ded91b96369… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 19:12:33 2011 -0800 version/tests: Remove win9x hacks. --- dlls/version/tests/info.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e4badbe..e689017 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -178,7 +178,6 @@ static void test_info_size(void) ok(retval == 0, "Expected 0, got %d\n", retval); ok(hdl == 0, "Expected 0, got %d\n", hdl); ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || - GetLastError() == ERROR_BAD_FORMAT || /* win9x */ GetLastError() == ERROR_SUCCESS, /* win2k */ "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); @@ -501,12 +500,10 @@ static void test_VerQueryValue(void) ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 got %x\n", len); + ok(len == 0, "expected 0 got %x\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; @@ -570,12 +567,10 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ok(!ret, "VerQueryValue(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 or 0xbeef, got %x\n", len); + ok(len == 0, "expected 0 or 0xbeef, got %x\n", len); } HeapFree(GetProcessHeap(), 0, ver);

1 0

Austin English : kernel32/tests: Remove win9x hacks.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 291949cbc48fb8217734aa7837004a6a08c34f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291949cbc48fb8217734aa783… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 01:38:49 2011 -0800 kernel32/tests: Remove win9x hacks. --- dlls/kernel32/tests/path.c | 35 ++++++----------------------------- 1 files changed, 6 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 741f47f..ba47910 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1564,8 +1564,7 @@ static void test_SearchPathA(void) SetLastError(0xdeadbeef); ret = pSearchPathA(pathA, fileA, NULL, sizeof(buffA)/sizeof(CHAR), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER || - broken(GetLastError() == ERROR_FILE_NOT_FOUND) /* win9x */, + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); } @@ -1581,16 +1580,6 @@ static void test_SearchPathW(void) return; } - /* SearchPathW is a stub on win9x and doesn't return sane error, - so quess if it's implemented indirectly */ - SetLastError(0xdeadbeef); - GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("SearchPathW not implemented\n"); - return; - } - if (0) { /* NULL filename, crashes on nt4 */ @@ -1609,7 +1598,7 @@ static void test_GetFullPathNameA(void) { char output[MAX_PATH], *filepart; DWORD ret; - int is_win9x, i; + int i; const struct { @@ -1617,31 +1606,20 @@ static void test_GetFullPathNameA(void) DWORD len; LPSTR buffer; LPSTR *lastpart; - int win9x_crash; } invalid_parameters[] = { - {NULL, 0, NULL, NULL, 1}, - {NULL, MAX_PATH, NULL, NULL, 1}, - {NULL, MAX_PATH, output, NULL, 1}, - {NULL, MAX_PATH, output, &filepart, 1}, + {NULL, 0, NULL, NULL}, + {NULL, MAX_PATH, NULL, NULL}, + {NULL, MAX_PATH, output, NULL}, + {NULL, MAX_PATH, output, &filepart}, {"", 0, NULL, NULL}, {"", MAX_PATH, NULL, NULL}, {"", MAX_PATH, output, NULL}, {"", MAX_PATH, output, &filepart}, }; - SetLastError(0xdeadbeef); - ret = GetFullPathNameW(NULL, 0, NULL, NULL); - is_win9x = !ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; - - if (is_win9x) - win_skip("Skipping some tests that cause GetFullPathNameA to crash on Win9x\n"); - for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) { - if (is_win9x && invalid_parameters[i].win9x_crash) - continue; - SetLastError(0xdeadbeef); strcpy(output, "deadbeef"); filepart = (char *)0xdeadbeef; @@ -1653,7 +1631,6 @@ static void test_GetFullPathNameA(void) ok(!strcmp(output, "deadbeef"), "[%d] Expected the output buffer to be unchanged, got \"%s\"\n", i, output); ok(filepart == (char *)0xdeadbeef, "[%d] Expected output file part pointer to be untouched, got %p\n", i, filepart); ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_BAD_PATHNAME || /* Win9x */ GetLastError() == ERROR_INVALID_NAME, /* Win7 */ "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n", i, GetLastError());

1 0

Austin English : gdi32/tests: Remove win9x hacks.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: c796ae653c4483949988119950ff1d60c4b68924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c796ae653c448394998811995… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 00:56:37 2011 -0800 gdi32/tests: Remove win9x hacks. --- dlls/gdi32/tests/bitmap.c | 300 +++++++++++++++----------------------------- 1 files changed, 102 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c796ae653c44839499881…

1 0

Dmitry Timoshkov : gdi32: Add a EnumFontFamilies test to see how it handles various font faces.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 1b041c92cb770d2bcb9ef00d93599d542cdc9002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b041c92cb770d2bcb9ef00d9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 14 17:55:03 2011 +0800 gdi32: Add a EnumFontFamilies test to see how it handles various font faces. --- dlls/gdi32/tests/font.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8bce92b..a9a8755 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3483,6 +3483,101 @@ static void test_AddFontMemResource(void) free_font(font); } +static INT CALLBACK enum_fonts_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lparam) +{ + LOGFONT *lf; + + if (type != TRUETYPE_FONTTYPE) return 1; + + ok(ntm->tmWeight == elf->lfWeight, "expected %d got %d\n", ntm->tmWeight, elf->lfWeight); + + lf = (LOGFONT *)lparam; + *lf = *elf; + return 0; +} + +static INT CALLBACK enum_all_fonts_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lparam) +{ + int ret; + LOGFONT *lf; + + if (type != TRUETYPE_FONTTYPE) return 1; + + lf = (LOGFONT *)lparam; + ret = strcmp(lf->lfFaceName, elf->lfFaceName); + if(ret == 0) + { + ok(ntm->tmWeight == elf->lfWeight, "expected %d got %d\n", ntm->tmWeight, elf->lfWeight); + *lf = *elf; + return 0; + } + return 1; +} + +static void test_EnumFonts(void) +{ + int ret; + LOGFONT lf; + HDC hdc; + + if (!is_truetype_font_installed("Arial")) + { + skip("Arial is not installed\n"); + return; + } + + /* Windows uses localized font face names, so Arial Bold won't be found */ + if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) + { + skip("User locale is not English, skipping the test\n"); + return; + } + + hdc = CreateCompatibleDC(0); + + ret = EnumFontFamilies(hdc, "Arial", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_NORMAL, "expected FW_NORMAL got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_NORMAL, "expected FW_NORMAL got %d\n", lf.lfWeight); + + ret = EnumFontFamilies(hdc, "Arial Bold", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial Bold is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_BOLD, "expected FW_BOLD got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial Bold"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Bold should not be enumerated\n"); + + ret = EnumFontFamilies(hdc, "Arial Bold Italic", enum_fonts_proc, (LPARAM)&lf); + ok(!ret, "font Arial Bold Italic is not enumerated\n"); + ret = strcmp(lf.lfFaceName, "Arial"); + ok(!ret, "expected Arial got %s\n", lf.lfFaceName); + ok(lf.lfWeight == FW_BOLD, "expected FW_BOLD got %d\n", lf.lfWeight); + + lstrcpy(lf.lfFaceName, "Arial Bold Italic"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Bold Italic should not be enumerated\n"); + + ret = EnumFontFamilies(hdc, "Arial Italic Bold", enum_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Italic Bold should not be enumerated\n"); + + lstrcpy(lf.lfFaceName, "Arial Italic Bold"); + ret = EnumFontFamilies(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); + ok(ret, "font Arial Italic Bold should not be enumerated\n"); + + DeleteDC(hdc); +} + START_TEST(font) { init(); @@ -3504,6 +3599,7 @@ START_TEST(font) test_orientation(); test_height_selection(); test_AddFontMemResource(); + test_EnumFonts(); /* On Windows Arial has a lot of default charset aliases such as Arial Cyr, * I'd like to avoid them in this test.

1 0

Dmitry Timoshkov : gdi32: EnumFontFamilies should also match against fully qualified face name.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 2aaf6c2c8cdde2e09ddfa745f1dab48cbf693769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaf6c2c8cdde2e09ddfa745f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 14 17:54:25 2011 +0800 gdi32: EnumFontFamilies should also match against fully qualified face name. --- dlls/gdi32/freetype.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 506c994..512e08b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4064,6 +4064,54 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, free_font(font); } +static BOOL family_matches(Family *family, const LOGFONTW *lf) +{ + struct list *face_elem_ptr; + + if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; + + LIST_FOR_EACH(face_elem_ptr, &family->faces) + { + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (strlenW(family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); + continue; + } + + strcpyW(full_family_name, family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; + } + + return FALSE; +} + +static BOOL face_matches(Face *face, const LOGFONTW *lf) +{ + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + + if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; + + if (strlenW(face->family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(face->family->FamilyName), debugstr_w(face->StyleName)); + return FALSE; + } + + strcpyW(full_family_name, face->family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + return !strcmpiW(lf->lfFaceName, full_family_name); +} + /************************************************************* * WineEngEnumFonts * @@ -4107,9 +4155,12 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(plf->lfFaceName, family->FamilyName)) { + if(family_matches(family, plf)) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (!face_matches(face, plf)) continue; + GetEnumStructs(face, &elf, &ntm, &type); for(i = 0; i < 32; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */

1 0

Nikolay Sivov : msxml3: Get rid of not longer used internal IXMLDOMNode vtable.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 4735c5193fdc759c89f0a74b895caab8a2042ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4735c5193fdc759c89f0a74b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 15:13:36 2011 +0300 msxml3: Get rid of not longer used internal IXMLDOMNode vtable. --- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/node.c | 59 ++++-------------------------------------- 2 files changed, 6 insertions(+), 54 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 59ad33b..ab7820f 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -234,7 +234,6 @@ extern void set_xpathmode(xmlDocPtr doc, BOOL xpath); typedef struct _xmlnode { DispatchEx dispex; - IXMLDOMNode IXMLDOMNode_iface; IXMLDOMNode *iface; xmlNodePtr node; } xmlnode; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 26b648c..a952ac0 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -128,11 +128,6 @@ xmlnode *get_node_obj(IXMLDOMNode *node) return SUCCEEDED(hres) ? obj : NULL; } -static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) -{ - return CONTAINING_RECORD(iface, xmlnode, IXMLDOMNode_iface); -} - HRESULT node_get_nodeName(xmlnode *This, BSTR *name) { if (!name) @@ -1098,48 +1093,6 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } -static const struct IXMLDOMNodeVtbl xmlnode_vtbl = -{ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL -}; - void destroy_xmlnode(xmlnode *This) { if(This->node) @@ -1151,7 +1104,6 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe if(node) xmldoc_add_ref( node->doc ); - This->IXMLDOMNode_iface.lpVtbl = &xmlnode_vtbl; This->node = node; This->iface = node_iface; @@ -1494,7 +1446,7 @@ static HRESULT WINAPI unknode_cloneNode( VARIANT_BOOL pbool, IXMLDOMNode** outNode) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_cloneNode( &This->node.IXMLDOMNode_iface, pbool, outNode ); + return node_clone(&This->node, pbool, outNode ); } static HRESULT WINAPI unknode_get_nodeTypeString( @@ -1521,7 +1473,7 @@ static HRESULT WINAPI unknode_put_text( BSTR p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_put_text( &This->node.IXMLDOMNode_iface, p ); + return node_put_text(&This->node, p); } static HRESULT WINAPI unknode_get_specified( @@ -1566,7 +1518,8 @@ static HRESULT WINAPI unknode_get_dataType( VARIANT* var1) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_dataType( &This->node.IXMLDOMNode_iface, var1 ); + TRACE("(%p)->(%p)\n", This, var1); + return return_null_var(var1); } static HRESULT WINAPI unknode_put_dataType( @@ -1642,7 +1595,7 @@ static HRESULT WINAPI unknode_get_prefix( BSTR* p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_prefix( &This->node.IXMLDOMNode_iface, p ); + return node_get_prefix(&This->node, p); } static HRESULT WINAPI unknode_get_baseName( @@ -1650,7 +1603,7 @@ static HRESULT WINAPI unknode_get_baseName( BSTR* p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_baseName( &This->node.IXMLDOMNode_iface, p ); + return node_get_base_name(&This->node, p); } static HRESULT WINAPI unknode_transformNodeToObject(

1 0

Nikolay Sivov : msxml3: Remove transformNode() forward.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: bf01d1b3d73d57f06364d0cec0151f7bc83aa721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf01d1b3d73d57f06364d0cec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 15:03:42 2011 +0300 msxml3: Remove transformNode() forward. --- dlls/msxml3/attribute.c | 5 ++- dlls/msxml3/cdata.c | 5 ++- dlls/msxml3/comment.c | 5 ++- dlls/msxml3/docfrag.c | 5 ++- dlls/msxml3/domdoc.c | 7 ++-- dlls/msxml3/element.c | 5 ++- dlls/msxml3/entityref.c | 5 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 67 +++++++++++++++++------------------------- dlls/msxml3/pi.c | 5 ++- dlls/msxml3/text.c | 5 ++- 11 files changed, 56 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf01d1b3d73d57f06364d…

1 0

Nikolay Sivov : msxml3: Remove selectSingleNode() forward.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: aac690d4fc425ff91a3a02857420fdc35c51966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac690d4fc425ff91a3a02857… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:44:20 2011 +0300 msxml3: Remove selectSingleNode() forward. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 7 ++++--- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 22 ++++++++-------------- dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a2775b3..332c256 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -498,7 +498,8 @@ static HRESULT WINAPI domattr_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domattr_get_parsed( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 7dc72a4..0a5f631 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -508,7 +508,8 @@ static HRESULT WINAPI domcdata_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domcdata_get_parsed( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 378379d..4724ba3 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -501,7 +501,8 @@ static HRESULT WINAPI domcomment_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domcomment_get_parsed( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index bf480d6..cf01296 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -505,7 +505,8 @@ static HRESULT WINAPI domfrag_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domfrag_get_parsed( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3463913..3c51e4f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1453,11 +1453,12 @@ static HRESULT WINAPI domdoc_selectNodes( static HRESULT WINAPI domdoc_selectSingleNode( IXMLDOMDocument3 *iface, - BSTR queryString, - IXMLDOMNode** resultNode ) + BSTR p, + IXMLDOMNode **outNode) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, queryString, resultNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index bbcc302..e009176 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -957,7 +957,8 @@ static HRESULT WINAPI domelem_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domelem_get_parsed( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 2c23c66..2e250bb 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -499,7 +499,8 @@ static HRESULT WINAPI entityref_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI entityref_get_parsed( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index fdf4575..f8241e2 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -269,6 +269,7 @@ extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); extern HRESULT node_get_text(const xmlnode*,BSTR*); extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**); +extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**); extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 6ea3250..e2f50b5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1046,24 +1046,18 @@ HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nod return hr; } -static HRESULT WINAPI xmlnode_selectSingleNode( - IXMLDOMNode *iface, - BSTR queryString, - IXMLDOMNode** resultNode) +HRESULT node_select_singlenode(const xmlnode *This, BSTR query, IXMLDOMNode **node) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); IXMLDOMNodeList *list; - HRESULT r; - - TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode ); + HRESULT hr; - r = IXMLDOMNode_selectNodes(This->iface, queryString, &list); - if(r == S_OK) + hr = node_select_nodes(This, query, &list); + if (hr == S_OK) { - r = IXMLDOMNodeList_nextNode(list, resultNode); + hr = IXMLDOMNodeList_nextNode(list, node); IXMLDOMNodeList_Release(list); } - return r; + return hr; } HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) @@ -1156,7 +1150,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, xmlnode_transformNode, NULL, - xmlnode_selectSingleNode + NULL }; void destroy_xmlnode(xmlnode *This) @@ -1634,7 +1628,7 @@ static HRESULT WINAPI unknode_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI unknode_get_parsed( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 27c41c1..72e0d81 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -516,7 +516,8 @@ static HRESULT WINAPI dom_pi_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI dom_pi_get_parsed( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index ca11387..cc0b829 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -586,7 +586,8 @@ static HRESULT WINAPI domtext_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domtext_get_parsed(

1 0

Nikolay Sivov : msxml3: Remove selectNodes() forward.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: 004944c81a288a3efdfba4ac774006ceddf1818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=004944c81a288a3efdfba4ac7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:42:24 2011 +0300 msxml3: Remove selectNodes() forward. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 7 ++++--- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 18 ++++++------------ dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 908c604..a2775b3 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -489,7 +489,8 @@ static HRESULT WINAPI domattr_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domattr_selectSingleNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 3a22247..7dc72a4 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -499,7 +499,8 @@ static HRESULT WINAPI domcdata_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domcdata_selectSingleNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 66d8000..378379d 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -492,7 +492,8 @@ static HRESULT WINAPI domcomment_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domcomment_selectSingleNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 70d6925..bf480d6 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -496,7 +496,8 @@ static HRESULT WINAPI domfrag_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domfrag_selectSingleNode( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f1b8919..3463913 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1442,11 +1442,12 @@ static HRESULT WINAPI domdoc_transformNode( static HRESULT WINAPI domdoc_selectNodes( IXMLDOMDocument3 *iface, - BSTR queryString, - IXMLDOMNodeList** resultList ) + BSTR p, + IXMLDOMNodeList **outList) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, queryString, resultList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index ec3b74c..bbcc302 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -948,7 +948,8 @@ static HRESULT WINAPI domelem_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domelem_selectSingleNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index f1f8306..2c23c66 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -490,7 +490,8 @@ static HRESULT WINAPI entityref_selectNodes( BSTR p, IXMLDOMNodeList** outList) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI entityref_selectSingleNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8f99981..fdf4575 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -268,6 +268,7 @@ extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); extern HRESULT node_get_text(const xmlnode*,BSTR*); +extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**); extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ac156a5..6ea3250 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1032,21 +1032,15 @@ static HRESULT WINAPI xmlnode_transformNode( #endif } -static HRESULT WINAPI xmlnode_selectNodes( - IXMLDOMNode *iface, - BSTR queryString, - IXMLDOMNodeList** resultList) +HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nodes) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlChar* str; HRESULT hr; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultList ); + if (!query || !nodes) return E_INVALIDARG; - if (!queryString || !resultList) return E_INVALIDARG; - - str = xmlChar_from_wchar(queryString); - hr = queryresult_create(This->node, str, resultList); + str = xmlChar_from_wchar(query); + hr = queryresult_create(This->node, str, nodes); heap_free(str); return hr; @@ -1161,7 +1155,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, xmlnode_transformNode, - xmlnode_selectNodes, + NULL, xmlnode_selectSingleNode }; @@ -1632,7 +1626,7 @@ static HRESULT WINAPI unknode_selectNodes( BSTR p, IXMLDOMNodeList** outList) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI unknode_selectSingleNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2427d8e..27c41c1 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -507,7 +507,8 @@ static HRESULT WINAPI dom_pi_selectNodes( BSTR p, IXMLDOMNodeList** outList) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI dom_pi_selectSingleNode( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 708ade0..ca11387 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -577,7 +577,8 @@ static HRESULT WINAPI domtext_selectNodes( BSTR p, IXMLDOMNodeList** outList) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_selectNodes( &This->node.IXMLDOMNode_iface, p, outList ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outList); + return node_select_nodes(&This->node, p, outList); } static HRESULT WINAPI domtext_selectSingleNode(

1 0

Alexandre Julliard : msxml3: Include the system libxml headers before the Windows headers.
by Alexandre Julliard 24 Feb '11

24 Feb '11

Module: wine Branch: master Commit: a1c8f6df847382336b1fc55f4e46d4cd5b58d1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c8f6df847382336b1fc55f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 24 13:11:53 2011 +0100 msxml3: Include the system libxml headers before the Windows headers. --- dlls/msxml3/attribute.c | 6 ++++++ dlls/msxml3/bsc.c | 5 +++++ dlls/msxml3/cdata.c | 5 +++++ dlls/msxml3/comment.c | 5 +++++ dlls/msxml3/dispex.c | 5 +++++ dlls/msxml3/docfrag.c | 5 +++++ dlls/msxml3/doctype.c | 5 +++++ dlls/msxml3/domdoc.c | 14 +++++++++----- dlls/msxml3/domimpl.c | 5 +++++ dlls/msxml3/element.c | 5 +++++ dlls/msxml3/entityref.c | 5 +++++ dlls/msxml3/factory.c | 5 +++++ dlls/msxml3/httprequest.c | 8 ++++++-- dlls/msxml3/main.c | 15 +++++++++++++++ dlls/msxml3/msxml_private.h | 27 --------------------------- dlls/msxml3/node.c | 31 +++++++++++++++++++++++++++---- dlls/msxml3/nodelist.c | 5 +++++ dlls/msxml3/nodemap.c | 5 +++++ dlls/msxml3/parseerror.c | 5 +++++ dlls/msxml3/pi.c | 5 +++++ dlls/msxml3/queryresult.c | 10 +++++++--- dlls/msxml3/saxreader.c | 10 +++++++--- dlls/msxml3/schema.c | 20 ++++++++++++-------- dlls/msxml3/stylesheet.c | 5 +++++ dlls/msxml3/text.c | 5 +++++ dlls/msxml3/xdr.c | 9 ++++++--- dlls/msxml3/xmldoc.c | 5 +++++ dlls/msxml3/xmlelem.c | 5 +++++ dlls/msxml3/xslpattern.h | 2 -- dlls/msxml3/xslpattern.l | 1 + dlls/msxml3/xslpattern.y | 1 + 31 files changed, 187 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1c8f6df847382336b1fc…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
68
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 February 2011