January 2008 - Wine-Commits

Jacek Caban : shdocvw: Call StatusTextChange in set_status_text.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 84eed025f076e3da58075eb7cfd6a4c37131c107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84eed025f076e3da58075eb7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 16:26:47 2008 +0100 shdocvw: Call StatusTextChange in set_status_text. --- dlls/shdocvw/navigate.c | 13 +++++++++++-- dlls/shdocvw/tests/webbrowser.c | 6 ++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 71c3ea5..ad9fc0b 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -94,10 +94,19 @@ static void dump_BINDINFO(BINDINFO *bi) static void set_status_text(BindStatusCallback *This, LPCWSTR str) { - if(!This->doc_host || !This->doc_host->frame) + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + if(!This->doc_host) return; - IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = str ? SysAllocString(str) : NULL; + call_sink(This->doc_host->cps.wbe2, DISPID_STATUSTEXTCHANGE, &dispparams); + VariantClear(&arg); + + if(This->doc_host->frame) + IOleInPlaceFrame_SetStatusText(This->doc_host->frame, str); } #define BINDSC_THIS(iface) DEFINE_THIS(BindStatusCallback, BindStatusCallback, iface) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 0929f03..80c09f2 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -513,7 +513,9 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe ok(pDispParams->rgvarg != NULL, "rgvarg == NULL\n"); ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs); - /* TODO: Check args */ + ok(V_VT(pDispParams->rgvarg) == VT_BSTR, "V_VT(pDispParams->rgvarg)=%d, expected VT_BSTR\n", + V_VT(pDispParams->rgvarg)); + /* TODO: Check text */ break; case DISPID_PROPERTYCHANGE: @@ -1878,7 +1880,7 @@ static void test_Navigate2(IUnknown *unk) todo_wine CHECK_CALLED(Invoke_DOWNLOADBEGIN); todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CHECK_CALLED(EnableModeless_FALSE); - todo_wine CHECK_CALLED(Invoke_STATUSTEXTCHANGE); + CHECK_CALLED(Invoke_STATUSTEXTCHANGE); CHECK_CALLED(SetStatusText); CHECK_CALLED(GetHostInfo); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL);

1 0

Jacek Caban : shdocvw: Call WindowSetResizable in put_Resizable.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 6f3ffa51f8670fd5a3ea9f9793b3a6dacae0a98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3ffa51f8670fd5a3ea9f979… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 16:26:36 2008 +0100 shdocvw: Call WindowSetResizable in put_Resizable. --- dlls/shdocvw/tests/webbrowser.c | 4 ++-- dlls/shdocvw/webbrowser.c | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 102f7d9..0929f03 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1562,12 +1562,12 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_TRUE)); ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); - todo_wine CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_FALSE)); ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); - todo_wine CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_get_Resizable(wb, &b); ok(hres == E_NOTIMPL, "get_Resizable failed: %08x\n", hres); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index b72523b..55f1620 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -864,10 +864,18 @@ static HRESULT WINAPI WebBrowser_get_Resizable(IWebBrowser2 *iface, VARIANT_BOOL static HRESULT WINAPI WebBrowser_put_Resizable(IWebBrowser2 *iface, VARIANT_BOOL Value) { WebBrowser *This = WEBBROWSER_THIS(iface); + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; TRACE("(%p)->(%x)\n", This, Value); - /* It's InternetExplorer object's method. We have nothing to do here. */ + /* In opposition to InternetExplorer, all we should do here is + * inform the embedder about the resizable change. */ + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = Value; + call_sink(This->doc_host.cps.wbe2, DISPID_WINDOWSETRESIZABLE, &dispparams); + return S_OK; }

1 0

Jacek Caban : shdocvw: Call OnFullScreen in put_FullScreen.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 7b268a5583741129b8c4c78a728203f66545e563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b268a5583741129b8c4c78a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 16:26:23 2008 +0100 shdocvw: Call OnFullScreen in put_FullScreen. --- dlls/shdocvw/tests/webbrowser.c | 6 +++--- dlls/shdocvw/webbrowser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index a73abfa..102f7d9 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1532,7 +1532,7 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_ONFULLSCREEN); hres = IWebBrowser2_put_FullScreen(wb, (exvb = VARIANT_TRUE)); ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); - todo_wine CHECK_CALLED(Invoke_ONFULLSCREEN); + CHECK_CALLED(Invoke_ONFULLSCREEN); hres = IWebBrowser2_get_FullScreen(wb, &b); ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); @@ -1541,7 +1541,7 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_ONFULLSCREEN); hres = IWebBrowser2_put_FullScreen(wb, (exvb = 100)); ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); - todo_wine CHECK_CALLED(Invoke_ONFULLSCREEN); + CHECK_CALLED(Invoke_ONFULLSCREEN); hres = IWebBrowser2_get_FullScreen(wb, &b); ok(hres == S_OK, "get_FullScreen failed: %08x\n", hres); @@ -1550,7 +1550,7 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_ONFULLSCREEN); hres = IWebBrowser2_put_FullScreen(wb, (exvb = VARIANT_FALSE)); ok(hres == S_OK, "put_FullScreen failed: %08x\n", hres); - todo_wine CHECK_CALLED(Invoke_ONFULLSCREEN); + CHECK_CALLED(Invoke_ONFULLSCREEN); /* Resizable */ diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index e2b79ae..b72523b 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -667,10 +667,20 @@ static HRESULT WINAPI WebBrowser_get_FullScreen(IWebBrowser2 *iface, VARIANT_BOO static HRESULT WINAPI WebBrowser_put_FullScreen(IWebBrowser2 *iface, VARIANT_BOOL bFullScreen) { WebBrowser *This = WEBBROWSER_THIS(iface); + VARIANTARG arg; + DISPPARAMS dispparams = {&arg, NULL, 1, 0}; + + /* In opposition to InternetExplorer, all we should do here is + * inform the embedder about the fullscreen change. */ TRACE("(%p)->(%x)\n", This, bFullScreen); This->full_screen = bFullScreen ? VARIANT_TRUE : VARIANT_FALSE; + + V_VT(&arg) = VT_BOOL; + V_BOOL(&arg) = bFullScreen; + call_sink(This->doc_host.cps.wbe2, DISPID_ONFULLSCREEN, &dispparams); + return S_OK; }

1 0

Jacek Caban : shdocvw: Added DWebBrowserEvents2 test.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 8daca1b5e9a0af66c2757358308d40dc9e94db67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daca1b5e9a0af66c27573583… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 16:26:08 2008 +0100 shdocvw: Added DWebBrowserEvents2 test. --- dlls/shdocvw/tests/webbrowser.c | 401 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 372 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8daca1b5e9a0af66c2757…

1 0

Andrey Esin : shell32: Update Russian translation.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: d6b81def64b56cef129ae37738b2f385a2dc8001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b81def64b56cef129ae3773… Author: Andrey Esin <andrey(a)esin.name> Date: Mon Jan 14 11:52:18 2008 +0300 shell32: Update Russian translation. --- dlls/shell32/shell32_Ru.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 411c510..d03b5d0 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -76,7 +76,7 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "&��" FCIDM_SHVIEW_OPEN MENUITEM "&��", FCIDM_SHVIEW_EXPLORE MENUITEM "&��", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR @@ -165,13 +165,13 @@ STRINGTABLE DISCARDABLE IDS_DELETEITEM_CAPTION "�� " IDS_DELETEFOLDER_CAPTION "�� " IDS_DELETEITEM_TEXT "�� '%1'?" - IDS_DELETEMULTIPLE_TEXT "�� (%1?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_DELETEMULTIPLE_TEXT "�� (%1)?" + IDS_OVERWRITEFILE_TEXT "�� '%1'.\n\n�� ?" IDS_OVERWRITEFILE_CAPTION "�� " - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "�� '%1'.\n\n"\ + "�� , �� \n"\ + "��, �� . �� \n"\ + "��?" /* message box strings */ IDS_RESTART_TITLE "��"

1 0

Andrey Esin : wineboot: Russian translation.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: a6c53b7c6c8318fac83698d7f91e00be4c66fca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c53b7c6c8318fac83698d7f… Author: Andrey Esin <andrey(a)esin.name> Date: Sun Jan 13 12:18:28 2008 +0300 wineboot: Russian translation. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_Ru.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 5207f25..e7e8fbd 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -33,3 +33,4 @@ #include "wineboot_Ko.rc" #include "wineboot_No.rc" #include "wineboot_Sv.rc" +#include "wineboot_Ru.rc" diff --git a/programs/wineboot/wineboot_Ru.rc b/programs/wineboot/wineboot_Ru.rc new file mode 100644 index 0000000..cb1a9d3 --- /dev/null +++ b/programs/wineboot/wineboot_Ru.rc @@ -0,0 +1,35 @@ +/* + * WineBoot resources + * + * Copyright (C) 2008 Andrey Esin <andrey(a)esin.name> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "��",IDCANCEL,129,49,50,15 + PUSHBUTTON "�� ",IDOK,51,49,71,15 + LTEXT "�� , �� .", + IDC_STATIC,7,7,172,19 + LTEXT "�� , �� .", + IDC_STATIC,7,28,172,15 +END

1 0

Pablo Spallanzani : wined3d: Fix texture coordinate calculation in surface_blt_to_drawable.
by Alexandre Julliard Jan. 15, 2008

Jan. 15, 2008

Module: wine Branch: master Commit: 91afa09ac01f0011e937bb666139068c4553b416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91afa09ac01f0011e937bb666… Author: Pablo Spallanzani <pspallanz(a)gmail.com> Date: Sat Jan 12 15:57:08 2008 -0200 wined3d: Fix texture coordinate calculation in surface_blt_to_drawable. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c9da469..a6a040b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3540,7 +3540,7 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW } struct coords { - int x, y, z; + GLfloat x, y, z; }; static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { @@ -3599,22 +3599,22 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); checkGLcall("glTexParameteri"); - coords[0].x = rect.left / This->pow2Width; + coords[0].x = (float)rect.left / This->pow2Width; coords[0].z = 0; - coords[1].x = rect.left / This->pow2Width; + coords[1].x = (float)rect.left / This->pow2Width; coords[1].z = 0; - coords[2].x = rect.right / This->pow2Width; + coords[2].x = (float)rect.right / This->pow2Width; coords[2].z = 0; - coords[3].x = rect.right / This->pow2Width; + coords[3].x = (float)rect.right / This->pow2Width; coords[3].z = 0; - coords[0].y = rect.top / This->pow2Height; - coords[1].y = rect.bottom / This->pow2Height; - coords[2].y = rect.bottom / This->pow2Height; - coords[3].y = rect.top / This->pow2Height; + coords[0].y = (float)rect.top / This->pow2Height; + coords[1].y = (float)rect.bottom / This->pow2Height; + coords[2].y = (float)rect.bottom / This->pow2Height; + coords[3].y = (float)rect.top / This->pow2Height; } else { /* Must be a cube map */ glEnable(GL_TEXTURE_CUBE_MAP_ARB); @@ -3676,16 +3676,16 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT } glBegin(GL_QUADS); - glTexCoord3iv((GLint *) &coords[0]); + glTexCoord3fv(&coords[0].x); glVertex2i(rect.left, device->render_offscreen ? rect.bottom : rect.top); - glTexCoord3iv((GLint *) &coords[1]); - glVertex2i(0, device->render_offscreen ? rect.top : rect.bottom); + glTexCoord3fv(&coords[1].x); + glVertex2i(rect.left, device->render_offscreen ? rect.top : rect.bottom); - glTexCoord3iv((GLint *) &coords[2]); + glTexCoord3fv(&coords[2].x); glVertex2i(rect.right, device->render_offscreen ? rect.top : rect.bottom); - glTexCoord3iv((GLint *) &coords[3]); + glTexCoord3fv(&coords[3].x); glVertex2i(rect.right, device->render_offscreen ? rect.bottom : rect.top); glEnd(); checkGLcall("glEnd");

1 0

Zachary Goldberg : WWN 339
by Jeremy Newman Jan. 14, 2008

Jan. 14, 2008

Module: website Branch: master Commit: 7035a4e3bbc25762177e5b749eb1a2f55cc72732 URL: http://source.winehq.org/git/website.git/?a=commit;h=7035a4e3bbc25762177e5b… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Jan 14 15:36:12 2008 -0500 WWN 339 --- news/2008011401.xml | 7 + wwn/wn20080114_339.xml | 1081 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1088 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7035a4e3bbc2576217…

1 0

Marcus Meissner : server: Enumerate process in reverse.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 3bf54c29500b9ca66e79c4877c87498e356b2975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf54c29500b9ca66e79c4877… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 13 21:55:29 2008 +0100 server: Enumerate process in reverse. --- dlls/kernel32/tests/toolhelp.c | 7 ++++++- server/process.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 3ae7540..3249379 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -106,6 +106,7 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) MODULEENTRY32 me; unsigned found = 0; int num = 0; + int childpos = -1; hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); ok(hSnapshot != NULL, "Cannot create snapshot\n"); @@ -117,7 +118,7 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) do { if (pe.th32ProcessID == curr_pid) found++; - if (pe.th32ProcessID == sub_pcs_pid) found++; + if (pe.th32ProcessID == sub_pcs_pid) { childpos = num; found++; } trace("PID=%x %s\n", pe.th32ProcessID, pe.szExeFile); num++; } while (pProcess32Next( hSnapshot, &pe )); @@ -139,6 +140,10 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) ok(found == 2, "couldn't find self and/or sub-process in process list\n"); ok(!num, "mismatch in counting\n"); + /* one broken program does Process32First() and does not expect anything + * interesting to be there, especially not the just forked off child */ + ok (childpos !=0, "child is not expected to be at position 0.\n"); + te.dwSize = sizeof(te); ok(!pThread32First( hSnapshot, &te ), "shouldn't return a thread\n"); diff --git a/server/process.c b/server/process.c index 2236d83..35740fe 100644 --- a/server/process.c +++ b/server/process.c @@ -344,7 +344,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->start_time = current_time; process->end_time = 0; - list_add_head( &process_list, &process->entry ); + list_add_tail( &process_list, &process->entry ); if (!(process->id = process->group_id = alloc_ptid( process ))) {

1 0

Alistair Leslie-Hughes : msxml3: Corrected getAttribute to return current value and assign output var.
by Alexandre Julliard Jan. 14, 2008

Jan. 14, 2008

Module: wine Branch: master Commit: 83300893a2372b01c70b9034b28deda5f783602c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83300893a2372b01c70b9034b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 14 21:13:01 2008 +1100 msxml3: Corrected getAttribute to return current value and assign output var. --- dlls/msxml3/element.c | 9 +++++++-- dlls/msxml3/tests/domdoc.c | 11 +++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index e7f03d6..814a987 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -459,15 +459,20 @@ static HRESULT WINAPI domelem_getAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; xmlChar *xml_name, *xml_value; - HRESULT hr = E_FAIL; + HRESULT hr = S_FALSE; TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), value); + if(!value || !name) + return E_INVALIDARG; + element = get_element( This ); if ( !element ) return E_FAIL; - VariantInit(value); + V_BSTR(value) = NULL; + V_VT(value) = VT_NULL; + xml_name = xmlChar_from_wchar( name ); xml_value = xmlGetNsProp(element, xml_name, NULL); HeapFree(GetProcessHeap(), 0, xml_name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dcd2168..75adc64 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -697,8 +697,8 @@ static void test_domnode( void ) V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); - ok( r == E_FAIL, "getAttribute ret %08x\n", r ); - ok( V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); + ok( r == S_FALSE, "getAttribute ret %08x\n", r ); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); VariantClear(&var); SysFreeString( str ); @@ -710,6 +710,13 @@ static void test_domnode( void ) ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); ok( !lstrcmpW(V_BSTR(&var), szstr1), "wrong attr value\n"); VariantClear( &var ); + + r = IXMLDOMElement_getAttribute( element, NULL, &var ); + ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r ); + + r = IXMLDOMElement_getAttribute( element, str, NULL ); + ok( r == E_INVALIDARG, "getAttribute ret %08x\n", r ); + SysFreeString( str ); r = IXMLDOMElement_get_attributes( element, &map );

1 0