September 2010 - Wine-commits

Jörg Höhle : winmm: GetDeviceID only considers a single name per entry.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 6b271b6d3c4b8b155613d8b1456754dec953bcdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b271b6d3c4b8b155613d8b14… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 1 21:03:43 2010 +0200 winmm: GetDeviceID only considers a single name per entry. --- dlls/winmm/mci.c | 4 ---- dlls/winmm/tests/mci.c | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b7799c8..6724d7f 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -127,10 +127,6 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) ret = wmd->wDeviceID; break; } - if (wmd->lpstrDeviceType && strcmpiW(wmd->lpstrDeviceType, lpstrName) == 0) { - ret = wmd->wDeviceID; - break; - } } LeaveCriticalSection(&WINMM_cs); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 8adc46b..e951fbf 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -565,7 +565,7 @@ static void test_recordWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("waveaudio"); - todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); test_notification(hwnd, "open new", MCI_NOTIFY_SUCCESSFUL); test_notification(hwnd, "open new no #2", 0); @@ -724,6 +724,15 @@ static void test_playWAVE(HWND hwnd) return; } + err = mciGetDeviceID("mysound"); + ok(err==1,"mciGetDeviceID mysound returned %u, expected 1\n", err); + + err = mciGetDeviceID("tempfile.wav"); + ok(err==0,"mciGetDeviceID tempfile.wav returned %u, expected 0\n", err); + + err = mciGetDeviceID("waveaudio"); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString("status mysound length", buf, sizeof(buf), NULL); ok(!err,"mci status length returned %s\n", dbg_mcierr(err)); todo_wine ok(!strcmp(buf,"2000"), "mci status length gave %s, expected 2000, some tests will fail.\n", buf); @@ -852,10 +861,10 @@ static void test_asyncWAVE(HWND hwnd) /* Only the alias is looked up. */ err = mciGetDeviceID("tempfile.wav"); - ok(err==0,"mciGetDeviceID element returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID tempfile.wav returned %u, expected 0\n", err); err = mciGetDeviceID("waveaudio"); - todo_wine ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + ok(err==0,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); err = mciSendString("status mysound mode", buf, sizeof(buf), hwnd); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); @@ -1095,6 +1104,9 @@ static void test_AutoOpenWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"tempfile.wav"), "sysinfo name 1 open: %s\n", buf); test_notification(hwnd, "sysinfo name notify\n", MCI_NOTIFY_SUCCESSFUL); + err = mciGetDeviceID("tempfile.wav"); + ok(err==1,"mciGetDeviceID tempfile.wav returned %u, expected 1\n", err); + /* Save the full pathname to the file. */ err = mciSendString("info tempfile.wav file", path, sizeof(path), NULL); ok(!err,"mci info tempfile.wav file returned %s\n", dbg_mcierr(err));

1 0

Jörg Höhle : winmm: Implement MCIERR_DUPLICATE_ALIAS and MCIERR_DEVICE_OPEN.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 294d0c9501c68e6b07a9cce5ed51d5ac5d53ca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=294d0c9501c68e6b07a9cce5e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 1 20:57:24 2010 +0200 winmm: Implement MCIERR_DUPLICATE_ALIAS and MCIERR_DEVICE_OPEN. --- dlls/winmm/mci.c | 8 ++++++-- dlls/winmm/tests/mci.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 6724d7f..c7e8165 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -898,14 +898,18 @@ static DWORD MCI_FinishOpen(LPWINE_MCIDRIVER wmd, LPMCI_OPEN_PARMSW lpParms, { LPCWSTR alias = NULL; /* Open always defines an alias for further reference */ - if (dwParam & MCI_OPEN_ALIAS) /* open ... alias */ + if (dwParam & MCI_OPEN_ALIAS) { /* open ... alias */ alias = lpParms->lpstrAlias; - else { + if (MCI_GetDriverFromString(alias)) + return MCIERR_DUPLICATE_ALIAS; + } else { if ((dwParam & MCI_OPEN_ELEMENT) /* open file.wav */ && !(dwParam & MCI_OPEN_ELEMENT_ID)) alias = lpParms->lpstrElementName; else if (dwParam & MCI_OPEN_TYPE ) /* open cdaudio */ alias = wmd->lpstrDeviceType; + if (alias && MCI_GetDriverFromString(alias)) + return MCIERR_DEVICE_OPEN; } if (alias) { wmd->lpstrAlias = HeapAlloc(GetProcessHeap(), 0, (strlenW(alias)+1) * sizeof(WCHAR)); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index e951fbf..f47d4f6 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -525,6 +525,11 @@ static void test_openCloseWAVE(HWND hwnd) err = mciGetDeviceID("waveaudio"); ok(err==1,"mciGetDeviceID waveaudio returned %u, expected 0\n", err); + err = mciSendString("open no-such-file.wav alias waveaudio", buf, sizeof(buf), NULL); + ok(err==MCIERR_DUPLICATE_ALIAS, "mci open alias waveaudio returned %s\n", dbg_mcierr(err)); + /* If it were not already in use, open avivideo alias waveaudio would succeed, + * making for funny test cases. */ + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0); /* from MSDN */ ok(!err,"mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_WAIT, 0) returned %s\n", dbg_mcierr(err)); @@ -1124,10 +1129,12 @@ static void test_AutoOpenWAVE(HWND hwnd) ok(!err,"mci status tempfile.wav mode returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"playing"), "mci auto-open status mode, got: %s\n", buf); - if (0) { /* FIXME: wait until this no more confuses Wine */ err = mciSendString("open tempfile.wav", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_DEVICE_OPEN, "mci open from auto-open returned %s\n", dbg_mcierr(err)); - } + ok(err==MCIERR_DEVICE_OPEN, "mci open from auto-open returned %s\n", dbg_mcierr(err)); + + err = mciSendString("open foo.wav alias tempfile.wav", buf, sizeof(buf), NULL); + ok(err==MCIERR_DUPLICATE_ALIAS, "mci open re-using alias returned %s\n", dbg_mcierr(err)); + /* w2k/xp and Wine differ. While the device is busy playing, it is * regularly open and accessible via the filename: subsequent * commands must not cause auto-open each. In Wine, a subsequent

1 0

Henri Verbeet : wined3d: Do not preload buffers while under the GL lock in process_vertices_strided ().
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 5a7091b8f7de60878e01fbdf4643ea67b9dc0e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7091b8f7de60878e01fbdf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:01 2010 +0200 wined3d: Do not preload buffers while under the GL lock in process_vertices_strided(). --- dlls/wined3d/device.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 01e3e90..517e873 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3760,6 +3760,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( } /* Context activation is done by the caller. */ +/* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags, @@ -3784,9 +3785,6 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn return WINED3DERR_INVALIDCALL; } - /* We might access VBOs from this code, so hold the lock */ - ENTER_GL(); - if (!dest->resource.allocatedMemory) buffer_get_sysmem(dest, gl_info); @@ -4089,22 +4087,27 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn } } - if(dest_conv) { + if (dest_conv) + { + ENTER_GL(); + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->buffer_object)); checkGLcall("glBindBufferARB(GL_ARRAY_BUFFER_ARB)"); GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, dwDestIndex * get_flexible_vertex_size(DestFVF), dwCount * get_flexible_vertex_size(DestFVF), dest_conv_addr)); checkGLcall("glBufferSubDataARB(GL_ARRAY_BUFFER_ARB)"); + + LEAVE_GL(); + HeapFree(GetProcessHeap(), 0, dest_conv_addr); } - LEAVE_GL(); - return WINED3D_OK; } #undef copy_and_next +/* Do not call while under the GL lock. */ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags, DWORD DestFVF)

1 0

Henri Verbeet : wined3d: Do not mark invalid blend matrices dirty.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: e998fffc8f19b860102341b50847367f6d98e15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e998fffc8f19b860102341b50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:02 2010 +0200 wined3d: Do not mark invalid blend matrices dirty. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 517e873..5116961 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2431,7 +2431,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTransform(IWineD3DDevice *iface, W /* Handled by the state manager */ } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TRANSFORM(d3dts)); + if (d3dts < WINED3DTS_WORLDMATRIX(This->adapter->gl_info.limits.blends)) + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TRANSFORM(d3dts)); + return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Add a handler for WINED3DRS_SRGBWRITEENABLE to the atifs fragment pipe.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: fa3a72c63a4435e015baa706cc7150a8224c2997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3a72c63a4435e015baa706c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:03 2010 +0200 wined3d: Add a handler for WINED3DRS_SRGBWRITEENABLE to the atifs fragment pipe. --- dlls/wined3d/ati_fragment_shader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 993ece0..5aaac3b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -912,6 +912,12 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl } } +static void atifs_srgbwriteenable(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + if (stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) + WARN("sRGB writes are not supported by this fragment pipe.\n"); +} + static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_atifs }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, @@ -921,6 +927,7 @@ static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), atifs_srgbwriteenable }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), set_tex_op_atifs }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG1), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG2), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), NULL }, WINED3D_GL_EXT_NONE },

1 0

Henri Verbeet : ddraw: Handle D3DRENDERSTATE_TEXTUREHANDLE and D3DRENDERSTATE_TEXTUREMAPBLEND in d3d7 .
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 83ff5b504185910ebf277e142c8d1392024583f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ff5b504185910ebf277e142… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 2 19:25:04 2010 +0200 ddraw: Handle D3DRENDERSTATE_TEXTUREHANDLE and D3DRENDERSTATE_TEXTUREMAPBLEND in d3d7. --- dlls/ddraw/device.c | 12 ++++++++++++ dlls/ddraw/tests/d3d.c | 30 ++++++++++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e632151..9632bd5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2492,6 +2492,12 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; + case D3DRENDERSTATE_TEXTUREHANDLE: + case D3DRENDERSTATE_TEXTUREMAPBLEND: + WARN("Render state %#x is invalid in d3d7.\n", RenderStateType); + hr = DDERR_INVALIDPARAMS; + break; + default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) @@ -2802,6 +2808,12 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; + case D3DRENDERSTATE_TEXTUREHANDLE: + case D3DRENDERSTATE_TEXTUREMAPBLEND: + WARN("Render state %#x is invalid in d3d7.\n", RenderStateType); + hr = DDERR_INVALIDPARAMS; + break; + default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 53ef04b..2f0f3c4 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1818,28 +1818,18 @@ out: static void D3D7_OldRenderStateTest(void) { - HRESULT rc; + HRESULT hr; DWORD val; - /* Test reaction to some deprecated states in D3D7. - - * IDirect3DDevice7 in Wine currently relays such states to wined3d where they are do-nothing and return 0, instead - * of INVALIDPARAMS. Unless an app is found which cares this is probably ok. What this test shows is that these states - * need not to be handled in D3D7. - */ - todo_wine { - rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, 0); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %08x\n", rc); - - rc = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, &val); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %08x\n", rc); - - rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %08x\n", rc); - - rc = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, &val); - ok(rc == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %08x\n", rc); - } + /* Test reaction to some deprecated states in D3D7. */ + hr = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, 0); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREHANDLE, &val); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_SetRenderState returned %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(lpD3DDevice, D3DRENDERSTATE_TEXTUREMAPBLEND, &val); + ok(hr == DDERR_INVALIDPARAMS, "IDirect3DDevice7_GetRenderState returned %#x.\n", hr); } #define IS_VALUE_NEAR(a, b) ( ((a) == (b)) || ((a) == (b) - 1) || ((a) == (b) + 1) )

1 0

Jerome Leclanche : winedbg: Escape args in a WINE_FIXME.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: fffa4881f6f330dcce915ac013d286a6f5c7ef6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffa4881f6f330dcce915ac01… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Thu Sep 2 20:32:05 2010 +0100 winedbg: Escape args in a WINE_FIXME. --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c0c12dd..5434624 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -778,7 +778,7 @@ void dbg_run_debuggee(const char* args) { if (args) { - WINE_FIXME("Re-running current program with %s as args is broken\n", args); + WINE_FIXME("Re-running current program with %s as args is broken\n", wine_dbgstr_a(args)); return; } else

1 0

Nikolay Sivov : msxml3: Fix invalid parameter handling for IXMLDOMElement:: getElementsByTagName().
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: c9b8f5d2ae59345d1c55fce5956b8648c346d296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b8f5d2ae59345d1c55fce59… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 2 22:49:56 2010 +0400 msxml3: Fix invalid parameter handling for IXMLDOMElement::getElementsByTagName(). --- dlls/msxml3/domdoc.c | 9 ++----- dlls/msxml3/element.c | 51 +++++++++++++++++++++++++------------------ dlls/msxml3/tests/domdoc.c | 35 ++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 27 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 9a50366..98045a0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1049,9 +1049,8 @@ static HRESULT WINAPI domdoc_get_documentElement( IXMLDOMElement** DOMElement ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - xmlDocPtr xmldoc = NULL; - xmlNodePtr root = NULL; IXMLDOMNode *element_node; + xmlNodePtr root; HRESULT hr; TRACE("(%p)->(%p)\n", This, DOMElement); @@ -1061,16 +1060,14 @@ static HRESULT WINAPI domdoc_get_documentElement( *DOMElement = NULL; - xmldoc = get_doc( This ); - - root = xmlDocGetRootElement( xmldoc ); + root = xmlDocGetRootElement( get_doc(This) ); if ( !root ) return S_FALSE; element_node = create_node( root ); if(!element_node) return S_FALSE; - hr = IXMLDOMNode_QueryInterface(element_node, &IID_IXMLDOMElement, (LPVOID*)DOMElement); + hr = IXMLDOMNode_QueryInterface(element_node, &IID_IXMLDOMElement, (void**)DOMElement); IXMLDOMNode_Release(element_node); return hr; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4c4101e..4c557ef 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -669,38 +669,47 @@ static HRESULT WINAPI domelem_removeAttributeNode( static HRESULT WINAPI domelem_getElementsByTagName( IXMLDOMElement *iface, - BSTR bstrName, IXMLDOMNodeList** resultList) + BSTR tagName, IXMLDOMNodeList** resultList) { - static const WCHAR xpathformat[] = - { '.','/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 }; domelem *This = impl_from_IXMLDOMElement( iface ); - LPWSTR szPattern; xmlNodePtr element; HRESULT hr; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrName), resultList); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(tagName), resultList); - if (bstrName[0] == '*' && bstrName[1] == 0) + if (!tagName || !resultList) return E_INVALIDARG; + if (!(element = get_element(This))) return E_FAIL; + + if (tagName[0] == '*' && tagName[1] == 0) { - szPattern = heap_alloc(sizeof(WCHAR)*5); - szPattern[0] = '.'; - szPattern[1] = szPattern[2] = '/'; - szPattern[3] = '*'; - szPattern[4] = 0; + static const WCHAR formatallW[] = {'/','/','*',0}; + hr = queryresult_create(element, formatallW, resultList); } else { - szPattern = heap_alloc(sizeof(WCHAR)*(21+lstrlenW(bstrName)+1)); - wsprintfW(szPattern, xpathformat, bstrName); - } - TRACE("%s\n", debugstr_w(szPattern)); + static const WCHAR xpathformat[] = + { '/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'' }; + static const WCHAR closeW[] = { '\'',']',0 }; - element = get_element(This); - if (!element) - hr = E_FAIL; - else - hr = queryresult_create(element, szPattern, resultList); - heap_free(szPattern); + LPWSTR pattern; + WCHAR *ptr; + INT length; + + length = lstrlenW(tagName); + + /* without two WCHARs from format specifier */ + ptr = pattern = heap_alloc(sizeof(xpathformat) + length*sizeof(WCHAR) + sizeof(closeW)); + + memcpy(ptr, xpathformat, sizeof(xpathformat)); + ptr += sizeof(xpathformat)/sizeof(WCHAR); + memcpy(ptr, tagName, length*sizeof(WCHAR)); + ptr += length; + memcpy(ptr, closeW, sizeof(closeW)); + + TRACE("%s\n", debugstr_w(pattern)); + hr = queryresult_create(element, pattern, resultList); + heap_free(pattern); + } return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7a7f4cd..a9c5c3c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2271,6 +2271,7 @@ static void test_getElementsByTagName(void) { IXMLDOMNodeList *node_list; IXMLDOMDocument *doc; + IXMLDOMElement *elem; WCHAR buff[100]; VARIANT_BOOL b; HRESULT r; @@ -2346,6 +2347,40 @@ static void test_getElementsByTagName(void) IXMLDOMNodeList_Release( node_list ); SysFreeString( str ); + /* test for element */ + r = IXMLDOMDocument_get_documentElement(doc, &elem); + ok( r == S_OK, "ret %08x\n", r ); + + str = SysAllocString( szstar ); + + /* null arguments cases */ + r = IXMLDOMElement_getElementsByTagName(elem, NULL, &node_list); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + r = IXMLDOMElement_getElementsByTagName(elem, str, NULL); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMElement_getElementsByTagName(elem, str, &node_list); + ok( r == S_OK, "ret %08x\n", r ); + r = IXMLDOMNodeList_get_length( node_list, &len ); + ok( r == S_OK, "ret %08x\n", r ); + todo_wine ok( len == 5, "len %d\n", len ); + + IXMLDOMNodeList_Release( node_list ); + SysFreeString( str ); + + /* broken query BSTR */ + memcpy(&buff[2], szstar, sizeof(szstar)); + /* just a big length */ + *(DWORD*)buff = 0xf0f0; + r = IXMLDOMElement_getElementsByTagName(elem, &buff[2], &node_list); + ok( r == S_OK, "ret %08x\n", r ); + r = IXMLDOMNodeList_get_length( node_list, &len ); + ok( r == S_OK, "ret %08x\n", r ); + todo_wine ok( len == 5, "len %d\n", len ); + IXMLDOMNodeList_Release( node_list ); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release( doc ); }

1 0

Nikolay Sivov : msxml3: Implement IXMLDOMNamedNodeMap::getQualifiedItem().
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 0330332aefb4f9a89c6ec2d4054f9421b5800591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0330332aefb4f9a89c6ec2d40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 3 12:13:29 2010 +0400 msxml3: Implement IXMLDOMNamedNodeMap::getQualifiedItem(). --- dlls/msxml3/nodemap.c | 83 ++++++++++++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 66 ++++++++++++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 3f2ee47..791a771 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -127,13 +127,8 @@ static HRESULT WINAPI xmlnodemap_GetTypeInfo( ITypeInfo** ppTInfo ) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - HRESULT hr; - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hr = get_typeinfo(IXMLDOMNamedNodeMap_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMNamedNodeMap_tid, ppTInfo); } static HRESULT WINAPI xmlnodemap_GetIDsOfNames( @@ -203,32 +198,8 @@ static HRESULT WINAPI xmlnodemap_getNamedItem( IXMLDOMNode** namedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlChar *element_name; - xmlAttrPtr attr; - xmlNodePtr node; - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); - - if ( !namedItem ) - return E_INVALIDARG; - - node = xmlNodePtr_from_domnode( This->node, 0 ); - if ( !node ) - return E_FAIL; - - element_name = xmlChar_from_wchar( name ); - attr = xmlHasNsProp( node, element_name, NULL ); - heap_free( element_name ); - - if ( !attr ) - { - *namedItem = NULL; - return S_FALSE; - } - - *namedItem = create_node( (xmlNodePtr) attr ); - - return S_OK; + return IXMLDOMNamedNodeMap_getQualifiedItem(iface, name, NULL, namedItem); } static HRESULT WINAPI xmlnodemap_setNamedItem( @@ -237,7 +208,6 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( IXMLDOMNode** namedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - xmlnode *ThisNew = NULL; xmlNodePtr nodeNew; IXMLDOMNode *pAttr = NULL; xmlNodePtr node; @@ -254,10 +224,10 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( return E_FAIL; /* Must be an Attribute */ - IUnknown_QueryInterface(newItem, &IID_IXMLDOMNode, (LPVOID*)&pAttr); + IUnknown_QueryInterface(newItem, &IID_IXMLDOMNode, (void**)&pAttr); if(pAttr) { - ThisNew = impl_from_IXMLDOMNode( pAttr ); + xmlnode *ThisNew = impl_from_IXMLDOMNode( pAttr ); if(ThisNew->node->type != XML_ATTRIBUTE_NODE) { @@ -387,7 +357,7 @@ static HRESULT WINAPI xmlnodemap_get_length( curr = first; attrCount = 1; - while (curr->next != NULL) { + while (curr->next) { attrCount++; curr = curr->next; } @@ -403,8 +373,47 @@ static HRESULT WINAPI xmlnodemap_getQualifiedItem( IXMLDOMNode** qualifiedItem) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); - return E_NOTIMPL; + xmlAttrPtr attr; + xmlNodePtr node; + xmlChar *href; + xmlChar *name; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(baseName), debugstr_w(namespaceURI), qualifiedItem); + + if (!baseName || !qualifiedItem) return E_INVALIDARG; + + node = xmlNodePtr_from_domnode(This->node, XML_ELEMENT_NODE); + if ( !node ) + return E_FAIL; + + if (namespaceURI && *namespaceURI) + { + href = xmlChar_from_wchar(namespaceURI); + if (!href) return E_OUTOFMEMORY; + } + else + href = NULL; + + name = xmlChar_from_wchar(baseName); + if (!name) + { + heap_free(href); + return E_OUTOFMEMORY; + } + + attr = xmlHasNsProp(node, name, href); + if (!attr) + { + *qualifiedItem = NULL; + return S_FALSE; + } + + *qualifiedItem = create_node((xmlNodePtr)attr); + + heap_free(name); + heap_free(href); + + return S_OK; } static HRESULT WINAPI xmlnodemap_removeQualifiedItem( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a9c5c3c..a1d27bb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1321,7 +1321,7 @@ static void test_domnode( void ) type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( element, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "got %08x\n", r); ok( type == NODE_ELEMENT, "node not an element\n"); str = NULL; @@ -5796,6 +5796,69 @@ static void test_splitText(void) free_bstrs(); } +static void test_getQualifiedItem(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *pr_node, *node; + IXMLDOMNodeList *root_list; + IXMLDOMNamedNodeMap *map; + VARIANT_BOOL b; + BSTR str; + LONG len; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + ok( hr == S_OK, "ret 0x%08x\n", hr); + if( hr != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( hr == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + hr = IXMLDOMDocument_get_documentElement(doc, &element); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMElement_get_childNodes(element, &root_list); + ok( hr == S_OK, "ret %08x\n", hr); + + hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNodeList_Release(root_list); + + hr = IXMLDOMNode_get_attributes(pr_node, &map); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(pr_node); + + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok( hr == S_OK, "ret %08x\n", hr); + ok( len == 3, "length %d\n", len); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, &node); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + ok( node == (void*)0xdeadbeef, "got %p\n", node); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, &node); + ok( hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(node); + + IXMLDOMNamedNodeMap_Release( map ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -5846,6 +5909,7 @@ START_TEST(domdoc) test_put_nodeValue(); test_document_IObjectSafety(); test_splitText(); + test_getQualifiedItem(); CoUninitialize(); }

1 0

Alexandre Goujon : msxml3/tests: Be more verbose when get_text fails.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 8aa6ed97c826feaebb6550ee1909317129a5e119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa6ed97c826feaebb6550ee1… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Thu Sep 2 14:21:30 2010 +0200 msxml3/tests: Be more verbose when get_text fails. --- dlls/msxml3/tests/domdoc.c | 82 ++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8aa6ed97c826feaebb655…

1 0