September 2010 - Wine-Commits

André Hentschel : winedbg: Fix typo in German translation.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: 7bf924f67218cdf18a73ca9bc3113ddd38dc7190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf924f67218cdf18a73ca9bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 8 21:55:26 2010 +0200 winedbg: Fix typo in German translation. --- programs/winedbg/rsrc_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc index 360f156..a02ea68 100644 --- a/programs/winedbg/rsrc_De.rc +++ b/programs/winedbg/rsrc_De.rc @@ -51,7 +51,7 @@ END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "Wine Programm absturz" + IDS_AUTO_CAPTION "Wine Programm Absturz" IDS_INVALID_PARAMS "Interne Fehler - ungültige Parameter empfangen" IDS_UNIDENTIFIED "(unbekannt)" END

1 0

Aric Stewart : usp10: Attempt to shape with non TMPF_TRUETYPE fonts.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: e8816357416a8d3c6bc3d539b869e2e5c29656b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8816357416a8d3c6bc3d539b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 8 13:30:46 2010 -0500 usp10: Attempt to shape with non TMPF_TRUETYPE fonts. Just do not do the parts that are known to require ttf tables. --- dlls/usp10/usp10.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 29ec1e8..ad3d728 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1254,7 +1254,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, pwLogClust[i] = idx; } - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) + if (!psa->fNoGlyphIndex) { WCHAR *rChars = heap_alloc(sizeof(WCHAR) * cChars); if (!rChars) return E_OUTOFMEMORY; @@ -1276,8 +1276,12 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, } rChars[i] = chInput; } - SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); - SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); + + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) + { + SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); + SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); + } heap_free(rChars); } else

1 0

Jacek Caban : shdocvw: Fixed tests on IE <6.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: 92c7e1ae44c3e08a4568c99e9738a8dd2d99f4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c7e1ae44c3e08a4568c99e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 20:54:52 2010 +0200 shdocvw: Fixed tests on IE <6. --- dlls/shdocvw/tests/webbrowser.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 15fc1ec..85f71b7 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -67,12 +67,6 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) -#define CHECK_CALLED_BROKEN(func) \ - do { \ - ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ - }while(0) - #define CLEAR_CALLED(func) \ expect_ ## func = called_ ## func = FALSE @@ -1828,13 +1822,13 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_TRUE)); - ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_FALSE)); - ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_get_Resizable(wb, &b); ok(hres == E_NOTIMPL, "get_Resizable failed: %08x\n", hres); @@ -2213,12 +2207,12 @@ static void test_Navigate2(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CHECK_CALLED(Invoke_AMBIENT_PALETTE); CHECK_CALLED(GetOptionKeyPath); - CHECK_CALLED_BROKEN(GetOverridesKeyPath); + CHECK_CALLED(GetOverridesKeyPath); todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED_BROKEN(Invoke_SETSECURELOCKICON); - todo_wine CHECK_CALLED_BROKEN(Invoke_FILEDOWNLOAD); + todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); + todo_wine CHECK_CALLED(Invoke_FILEDOWNLOAD); todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); CHECK_CALLED(EnableModeless_TRUE); @@ -2482,9 +2476,10 @@ static void test_WebBrowser(BOOL do_download) hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoCreateInterface failed: %08x\n", hres); - if(FAILED(hres)) + if(FAILED(hres)) { + win_skip("Could not create WebBrowser, probably too old IE\n"); return; + } is_downloading = FALSE; is_first_load = TRUE; @@ -2492,6 +2487,14 @@ static void test_WebBrowser(BOOL do_download) hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); + hres = IWebBrowser2_put_Resizable(wb, VARIANT_TRUE); + if(hres == E_NOTIMPL) { + win_skip("put_Resizable returned E_NOTIMPL, assuming IE <6\n"); + IWebBrowser_Release(wb); + IUnknown_Release(unk); + return; + } + test_QueryInterface(unk); test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo(unk);

1 0

Wolfram Sang : hhctrl: Add check for no filename.
by Alexandre Julliard Sept. 9, 2010

Sept. 9, 2010

Module: wine Branch: master Commit: 9e1d9ef972f65e292e7b00e1da9293271bc60486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d9ef972f65e292e7b00e1d… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Sep 8 16:23:47 2010 +0200 hhctrl: Add check for no filename. --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 9ab66de..2101e05 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -295,6 +295,9 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) ptr += strlen("mapid")+1; space = strchr(ptr, ' '); + /* command line ends without number */ + if (!space) + return 0; memcpy(idtxt, ptr, space-ptr); idtxt[space-ptr] = '\0'; mapid = atoi(idtxt); @@ -315,6 +318,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) len = endq - szCmdLine; else len = strlen(szCmdLine); + + /* no filename given */ + if (!len) + return 0; + buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1; filename = heap_alloc(buflen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen);

1 0

Hans Leidekker : dnsapi: Remove the critical section around res_query.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 18cd143086ef040f9322b0b9b017cb47a0a6946f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18cd143086ef040f9322b0b9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 19:26:43 2010 +0200 dnsapi: Remove the critical section around res_query. --- dlls/dnsapi/query.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 6014465..8de33e6 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -52,19 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); #ifdef HAVE_RESOLV -static CRITICAL_SECTION resolver_cs; -static CRITICAL_SECTION_DEBUG resolver_cs_debug = -{ - 0, 0, &resolver_cs, - { &resolver_cs_debug.ProcessLocksList, - &resolver_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": resolver_cs") } -}; -static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; - -#define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) -#define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) - /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* call once per thread on systems that have per-thread _res */ static void initialise_resolver( void ) @@ -552,8 +539,7 @@ exit: return status; } -/* The resolver lock must be held and res_init() must have been - * called before calling these three functions. +/* res_init() must have been called before calling these three functions. */ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { @@ -704,16 +690,11 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser if (!name || !result) return ERROR_INVALID_PARAMETER; - LOCK_RESOLVER(); - initialise_resolver(); _res.options |= dns_map_options( options ); if (servers && (ret = dns_set_serverlist( servers ))) - { - UNLOCK_RESOLVER(); return ret; - } ret = dns_do_query( name, type, options, result ); @@ -724,8 +705,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser ret = dns_do_query_netbios( name, result ); } - UNLOCK_RESOLVER(); - #endif return ret; } @@ -822,12 +801,8 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigDnsServerList: { #ifdef HAVE_RESOLV - LOCK_RESOLVER(); - initialise_resolver(); ret = dns_get_serverlist( buffer, len ); - - UNLOCK_RESOLVER(); break; #else WARN( "compiled without resolver support\n" );

1 0

Matteo Bruni : d3dx9: Fix D3DXAssembleShader tests.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: d82255575b8be0fc8068a5572f9077a965103f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82255575b8be0fc8068a5572… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri Sep 3 15:25:23 2010 +0200 d3dx9: Fix D3DXAssembleShader tests. --- dlls/d3dx9_36/tests/asm.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 19907aa..4d319ed 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -115,6 +115,7 @@ static void assembleshader_test(void) { "#include \"incl4.vsh\"\n" }; const char testincl4_ok[] = { + "#define REGISTER r0\n" "vs.1.1\n" }; const char testincl4_wrong[] = { @@ -208,9 +209,9 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader)); + shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); if(SUCCEEDED(shader_vsh_res)) { - create_file("incl.vsh", testincl, sizeof(testincl)); + create_file("incl.vsh", testincl, sizeof(testincl) - 1); /* D3DXAssembleShaderFromFile + #include test */ shader = NULL; @@ -238,11 +239,11 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - create_file("shader3.vsh", testshader3, sizeof(testshader3)); - create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong)); + create_file("shader3.vsh", testshader3, sizeof(testshader3) - 1); + create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong) - 1); if(CreateDirectoryA("include", NULL)) { - create_file("include/incl3.vsh", testincl3, sizeof(testincl3)); - create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok)); + create_file("include/incl3.vsh", testincl3, sizeof(testincl3) - 1); + create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1); /* path search #include test */ shader = NULL;

1 0

Matteo Bruni : d3dx9: Fix D3DXCompileShaderFromFileW.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: d6ead897e23322c10e0f4497fe83c53bdf1a5e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ead897e23322c10e0f4497f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 8 16:07:07 2010 +0200 d3dx9: Fix D3DXCompileShaderFromFileW. --- dlls/d3dx9_36/shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1ddcde7..a3648c2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -423,7 +423,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, LPD3DXCONSTANTTABLE* constant_table) { void *buffer; - DWORD len; + DWORD len, filename_len; HRESULT hr; struct D3DXIncludeImpl includefromfile; char *filename_a; @@ -437,13 +437,14 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, include = (LPD3DXINCLUDE)&includefromfile; } - filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + filename_a = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(char)); if (!filename_a) { UnmapViewOfFile(buffer); return E_OUTOFMEMORY; } - WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); hr = D3DCompile(buffer, len, filename_a, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0,

1 0

Hans Leidekker : msi/tests: Fix some test failures on 64-bit.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 4a5b2abcf40591954bdd94088931f5b639540bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5b2abcf40591954bdd94088… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:26 2010 +0200 msi/tests: Fix some test failures on 64-bit. --- dlls/msi/tests/package.c | 149 +++++++++++++++++++++++++--------------------- 1 files changed, 80 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5b2abcf40591954bdd9…

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_childNode implementations.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: c8b15e90bd2eb17c99885a148a15dae8f2e3e946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b15e90bd2eb17c99885a148… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 15:12:02 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_childNode implementations. --- dlls/msxml3/attribute.c | 5 ++++- dlls/msxml3/cdata.c | 5 ++++- dlls/msxml3/comment.c | 5 ++++- dlls/msxml3/docfrag.c | 5 ++++- dlls/msxml3/domdoc.c | 5 ++++- dlls/msxml3/element.c | 5 ++++- dlls/msxml3/entityref.c | 5 ++++- dlls/msxml3/msxml_private.h | 2 ++ dlls/msxml3/node.c | 27 ++++++++++++++++----------- dlls/msxml3/pi.c | 5 ++++- dlls/msxml3/text.c | 5 ++++- 11 files changed, 54 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index aa0f2d0..9a0394d 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -238,7 +238,10 @@ static HRESULT WINAPI domattr_get_childNodes( IXMLDOMNodeList** outList) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domattr_get_firstChild( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 56c2695..902fe26 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -249,7 +249,10 @@ static HRESULT WINAPI domcdata_get_childNodes( IXMLDOMNodeList** outList) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domcdata_get_firstChild( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3a30d6c..8763864 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -242,7 +242,10 @@ static HRESULT WINAPI domcomment_get_childNodes( IXMLDOMNodeList** outList) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domcomment_get_firstChild( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 5bc8e4b..ed8b6c5 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -244,7 +244,10 @@ static HRESULT WINAPI domfrag_get_childNodes( IXMLDOMNodeList** outList) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domfrag_get_firstChild( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f2a7ad6..f7400f4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -752,7 +752,10 @@ static HRESULT WINAPI domdoc_get_childNodes( IXMLDOMNodeList** childList ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), childList ); + + TRACE("(%p)->(%p)\n", This, childList); + + return node_get_child_nodes(&This->node, childList); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 3d6228d..c7c8d45 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -253,7 +253,10 @@ static HRESULT WINAPI domelem_get_childNodes( IXMLDOMNodeList** outList) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domelem_get_firstChild( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 9fb9ab3..3b8ae53 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -240,7 +240,10 @@ static HRESULT WINAPI entityref_get_childNodes( IXMLDOMNodeList** outList) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI entityref_get_firstChild( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index f54e9ae..8964818 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -163,6 +163,8 @@ extern HRESULT node_get_nodeName(xmlnode*,BSTR*); extern HRESULT node_get_content(xmlnode*,VARIANT*); extern HRESULT node_put_value(xmlnode*,VARIANT*); extern HRESULT node_get_parent(xmlnode*,IXMLDOMNode**); +extern HRESULT node_get_child_nodes(xmlnode*,IXMLDOMNodeList**); + extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7bcbe12..aa494c4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -293,24 +293,26 @@ static HRESULT WINAPI xmlnode_get_parentNode( return E_NOTIMPL; } -static HRESULT WINAPI xmlnode_get_childNodes( - IXMLDOMNode *iface, - IXMLDOMNodeList** childList) +HRESULT node_get_child_nodes(xmlnode *This, IXMLDOMNodeList **ret) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - - TRACE("(%p)->(%p)\n", This, childList ); - - if ( !childList ) + if(!ret) return E_INVALIDARG; - *childList = create_children_nodelist(This->node); - if (*childList == NULL) + *ret = create_children_nodelist(This->node); + if(!*ret) return E_OUTOFMEMORY; return S_OK; } +static HRESULT WINAPI xmlnode_get_childNodes( + IXMLDOMNode *iface, + IXMLDOMNodeList** childList) +{ + ERR("Should not be called\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI xmlnode_get_firstChild( IXMLDOMNode *iface, IXMLDOMNode** firstChild) @@ -1825,7 +1827,10 @@ static HRESULT WINAPI unknode_get_childNodes( IXMLDOMNodeList** outList) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI unknode_get_firstChild( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 95f3327..20e6bd6 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -255,7 +255,10 @@ static HRESULT WINAPI dom_pi_get_childNodes( IXMLDOMNodeList** outList) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI dom_pi_get_firstChild( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 48801d6..5891814 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -255,7 +255,10 @@ static HRESULT WINAPI domtext_get_childNodes( IXMLDOMNodeList** outList) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_childNodes( IXMLDOMNode_from_impl(&This->node), outList ); + + TRACE("(%p)->(%p)\n", This, outList); + + return node_get_child_nodes(&This->node, outList); } static HRESULT WINAPI domtext_get_firstChild(

1 0

Jacek Caban : msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[ first|last]Node implementations.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 4f210e21a5b112c3f733bb5c084cdb4a116574ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f210e21a5b112c3f733bb5c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 15:12:14 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_[first|last]Node implementations. --- dlls/msxml3/attribute.c | 10 +++++++- dlls/msxml3/cdata.c | 10 +++++++- dlls/msxml3/comment.c | 10 +++++++- dlls/msxml3/docfrag.c | 10 +++++++- dlls/msxml3/domdoc.c | 10 +++++++- dlls/msxml3/element.c | 10 +++++++- dlls/msxml3/entityref.c | 10 +++++++- dlls/msxml3/msxml_private.h | 10 +++++++++ dlls/msxml3/node.c | 46 ++++++++++++++++++++---------------------- dlls/msxml3/pi.c | 10 +++++++- dlls/msxml3/text.c | 10 +++++++- 11 files changed, 104 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f210e21a5b112c3f733b…

1 0