November 2009 - Wine-Commits

Francois Gouget : commdlg.dll16: The commdlg debug channel is unused. Remove it.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 54ada514501c392997f18926edb6d88af6fa09fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ada514501c392997f18926e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:54:47 2009 +0100 commdlg.dll16: The commdlg debug channel is unused. Remove it. --- dlls/commdlg.dll16/finddlg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/finddlg.c b/dlls/commdlg.dll16/finddlg.c index e243868..abd30d5 100644 --- a/dlls/commdlg.dll16/finddlg.c +++ b/dlls/commdlg.dll16/finddlg.c @@ -30,11 +30,9 @@ #include "wingdi.h" #include "winuser.h" #include "commdlg.h" -#include "wine/debug.h" #include "cderr.h" #include "cdlg16.h" -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); /***********************************************************************

1 0

Francois Gouget : widl: Add a trailing '\n' to an error_loc() call.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 61d0d121d04d66322d605d55324fd2e4c6e72dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d0d121d04d66322d605d553… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:55:48 2009 +0100 widl: Add a trailing '\n' to an error_loc() call. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index de44ab5..73b48a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1033,7 +1033,7 @@ m_bitfield: { $$ = NULL; } struct_declarator: any_declarator m_bitfield { $$ = $1; $$->bits = $2; if (!$$->bits && !$$->var->name) - error_loc("unnamed fields are not allowed"); + error_loc("unnamed fields are not allowed\n"); } ;

1 0

Alexandre Julliard : kernel32: Null-terminate the buffer also on error in GetPrivateProfileString16.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 935e06c5c37e12405364e2ba65af0eedf44d4f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935e06c5c37e12405364e2ba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 11:36:08 2009 +0100 kernel32: Null-terminate the buffer also on error in GetPrivateProfileString16. --- dlls/kernel32/file16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file16.c b/dlls/kernel32/file16.c index 30c7bdd..e4f703d 100644 --- a/dlls/kernel32/file16.c +++ b/dlls/kernel32/file16.c @@ -555,6 +555,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, ret = GetPrivateProfileSectionA( section, data, size, filename ); if (!ret) { + if (len) *buffer = 0; HeapFree( GetProcessHeap(), 0, data ); return 0; }

1 0

Anders Jonsson : mshtml: Update Swedish translation.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: b00b112fb6db2b3727b384afd5f9f939c4b29ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00b112fb6db2b3727b384afd… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Nov 15 20:45:06 2009 +0100 mshtml: Update Swedish translation. --- dlls/mshtml/Sv.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index e9ba10e..c5a2cc8 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -33,9 +33,9 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Wine Gecko Installationsprogram" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine kunde inte hitta paketet Gecko vilket kr�vs f�r att program med inb�ddad HTML " \ + "ska fungera korrekt. Wine kan h�mta och installera det automatiskt �t dig.\n\n" \ + "Obs: Du rekommenderas att anv�nda din distributions paket i st�llet. Se http://wiki.winehq.org/Gecko f�r mer information.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "F�rlopp", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Installera", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Rob Shearman : oleaut32: Fix memory leaks in LPSAFEARRAY and VT_CARRAY marshalling.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 8bd2d5395dbd11fa113f22b4d91f7a9ea9ebf3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd2d5395dbd11fa113f22b4d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 17:12:50 2009 +0000 oleaut32: Fix memory leaks in LPSAFEARRAY and VT_CARRAY marshalling. --- dlls/oleaut32/tmarshal.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index eae17e2..0e9d7eb 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -894,6 +894,8 @@ serialize_param( if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); } if (debugout) TRACE_(olerelay)("]"); + if (dealloc) + HeapFree(GetProcessHeap(), 0, *(void **)arg); return S_OK; } case VT_SAFEARRAY: { @@ -905,6 +907,11 @@ serialize_param( LPSAFEARRAY_UserMarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg); buf->curoff = size; } + if (dealloc) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + LPSAFEARRAY_UserFree(&flags, (LPSAFEARRAY *)arg); + } return S_OK; } default:

1 0

Rob Shearman : advapi32: EqualSid should set last error to ERROR_SUCCESS.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 1f3a14e7676c298f5c2de648da7af01a3bb8966e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3a14e7676c298f5c2de648d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 16:37:35 2009 +0000 advapi32: EqualSid should set last error to ERROR_SUCCESS. --- dlls/advapi32/security.c | 4 +++- dlls/advapi32/tests/security.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 7dd39a4..3e79a61 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1055,7 +1055,9 @@ IsValidSid( PSID pSid ) BOOL WINAPI EqualSid( PSID pSid1, PSID pSid2 ) { - return RtlEqualSid( pSid1, pSid2 ); + BOOL ret = RtlEqualSid( pSid1, pSid2 ); + SetLastError(ERROR_SUCCESS); + return ret; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index df4b2e1..2986ef5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3296,7 +3296,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "World and domain admins sids shouldn't have been equal\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3315,7 +3314,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(ret, "Same sids should have been equal\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError()); @@ -3324,7 +3322,6 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = EqualSid(sid1, sid2); ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", GetLastError());

1 0

Andrew Eikum : mshtml: Implement IHTMLWindow4::get_frameElement.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 0eaae2745cbbb1dcbf4e3c181c4b902a472692c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaae2745cbbb1dcbf4e3c181… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:13:04 2009 -0600 mshtml: Implement IHTMLWindow4::get_frameElement. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a3a8f04..425c470 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1425,8 +1425,15 @@ static HRESULT WINAPI HTMLWindow4_createPopup(IHTMLWindow4 *iface, VARIANT *varA static HRESULT WINAPI HTMLWindow4_get_frameElement(IHTMLWindow4 *iface, IHTMLFrameBase **p) { HTMLWindow *This = HTMLWINDOW4_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(This->frame_element) { + *p = HTMLFRAMEBASE(This->frame_element); + IHTMLFrameBase_AddRef(*p); + }else + *p = NULL; + + return S_OK; } #undef HTMLWINDOW4_THIS

1 0

Rob Shearman : advapi32: Add tests for EqualSid.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 3498a8817902842d05837422cc376670572e35ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3498a8817902842d05837422c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 16:37:05 2009 +0000 advapi32: Add tests for EqualSid. --- dlls/advapi32/tests/security.c | 69 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b71d64f..df4b2e1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1228,10 +1228,18 @@ static void test_token_attr(void) ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); /* groups */ + SetLastError(0xdeadbeef); ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation(TokenGroups) %s with error %d\n", + ret ? "succeeded" : "failed", GetLastError()); Groups = HeapAlloc(GetProcessHeap(), 0, Size); + SetLastError(0xdeadbeef); ret = GetTokenInformation(Token, TokenGroups, Groups, Size, &Size); ok(ret, "GetTokenInformation(TokenGroups) failed with error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "GetTokenInformation shouldn't have set last error to %d\n", + GetLastError()); trace("TokenGroups:\n"); for (i = 0; i < Groups->GroupCount; i++) { @@ -3266,6 +3274,66 @@ todo_wine { CloseHandle(process_token); } +static void test_EqualSid(void) +{ + PSID sid1, sid2; + BOOL ret; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + + SetLastError(0xdeadbeef); + ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid1); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, + "AllocateAndInitializeSid shouldn't have set last error to %d\n", + GetLastError()); + + ret = AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, + 0, 0, 0, 0, 0, 0, 0, &sid2); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(!ret, "World and domain admins sids shouldn't have been equal\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + + SetLastError(0xdeadbeef); + sid2 = FreeSid(sid2); + ok(!sid2, "FreeSid should have returned NULL instead of %p\n", sid2); + ok(GetLastError() == 0xdeadbeef, + "FreeSid shouldn't have set last error to %d\n", + GetLastError()); + + ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid2); + ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(ret, "Same sids should have been equal\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + + ((SID *)sid2)->Revision = 2; + SetLastError(0xdeadbeef); + ret = EqualSid(sid1, sid2); + ok(!ret, "EqualSid with invalid sid should have returned FALSE\n"); + todo_wine + ok(GetLastError() == ERROR_SUCCESS, + "EqualSid should have set last error to ERROR_SUCCESS instead of %d\n", + GetLastError()); + ((SID *)sid2)->Revision = SID_REVISION; + + FreeSid(sid1); + FreeSid(sid2); +} + START_TEST(security) { init(); @@ -3297,4 +3365,5 @@ START_TEST(security) test_GetSecurityInfo(); test_GetSidSubAuthority(); test_CheckTokenMembership(); + test_EqualSid(); }

1 0

Andrew Eikum : mshtml: Implement IHTMLWindow2::item.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 733dfb64294234970bd956ca9fec563d2183f20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=733dfb64294234970bd956ca9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:13:10 2009 -0600 mshtml: Implement IHTMLWindow2::item. --- dlls/mshtml/htmlwindow.c | 115 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 20 ++++---- 2 files changed, 123 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c893a6d..41c5cbe 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -235,11 +235,122 @@ static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMembe pVarResult, pExcepInfo, puArgErr); } +static HRESULT get_frame_by_index(nsIDOMWindowCollection *nsFrames, PRUint32 index, HTMLWindow **ret) +{ + PRUint32 length; + nsIDOMWindow *nsWindow; + nsresult nsres; + + nsres = nsIDOMWindowCollection_GetLength(nsFrames, &length); + if(NS_FAILED(nsres)) { + FIXME("nsIDOMWindowCollection_GetLength failed: 0x%08x\n", nsres); + return E_FAIL; + } + + if(index >= length) + return DISP_E_MEMBERNOTFOUND; + + nsres = nsIDOMWindowCollection_Item(nsFrames, index, &nsWindow); + if(NS_FAILED(nsres)) { + FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); + return E_FAIL; + } + + *ret = nswindow_to_window(nsWindow); + + nsIDOMWindow_Release(nsWindow); + + return S_OK; +} + static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); - return E_NOTIMPL; + nsIDOMWindowCollection *nsFrames; + HTMLWindow *window; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, pvarIndex, pvarResult); + + nsres = nsIDOMWindow_GetFrames(This->nswindow, &nsFrames); + if(NS_FAILED(nsres)) { + FIXME("nsIDOMWindow_GetFrames failed: 0x%08x\n", nsres); + return E_FAIL; + } + + if(V_VT(pvarIndex) == VT_I4) { + int index = V_I4(pvarIndex); + TRACE("Getting index %d\n", index); + if(index < 0) { + hres = DISP_E_MEMBERNOTFOUND; + goto cleanup; + } + hres = get_frame_by_index(nsFrames, index, &window); + if(FAILED(hres)) + goto cleanup; + }else if(V_VT(pvarIndex) == VT_UINT) { + unsigned int index = V_UINT(pvarIndex); + TRACE("Getting index %u\n", index); + hres = get_frame_by_index(nsFrames, index, &window); + if(FAILED(hres)) + goto cleanup; + }else if(V_VT(pvarIndex) == VT_BSTR) { + BSTR str = V_BSTR(pvarIndex); + PRUint32 length, i; + + TRACE("Getting name %s\n", wine_dbgstr_w(str)); + + nsres = nsIDOMWindowCollection_GetLength(nsFrames, &length); + + window = NULL; + for(i = 0; i < length && !window; ++i) { + HTMLWindow *cur_window; + nsIDOMWindow *nsWindow; + BSTR id; + + nsres = nsIDOMWindowCollection_Item(nsFrames, i, &nsWindow); + if(NS_FAILED(nsres)) { + FIXME("nsIDOMWindowCollection_Item failed: 0x%08x\n", nsres); + hres = E_FAIL; + goto cleanup; + } + + cur_window = nswindow_to_window(nsWindow); + + nsIDOMWindow_Release(nsWindow); + + hres = IHTMLElement_get_id(HTMLELEM(&cur_window->frame_element->element), &id); + if(FAILED(hres)) { + FIXME("IHTMLElement_get_id failed: 0x%08x\n", hres); + goto cleanup; + } + + if(!strcmpW(id, str)) + window = cur_window; + + SysFreeString(id); + } + + if(!window) { + hres = DISP_E_MEMBERNOTFOUND; + goto cleanup; + } + }else { + hres = E_INVALIDARG; + goto cleanup; + } + + IHTMLWindow2_AddRef(HTMLWINDOW2(window)); + V_VT(pvarResult) = VT_DISPATCH; + V_DISPATCH(pvarResult) = (IDispatch*)window; + + hres = S_OK; + +cleanup: + nsIDOMWindowCollection_Release(nsFrames); + + return hres; } static HRESULT WINAPI HTMLWindow2_get_length(IHTMLWindow2 *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6cbf2e8..a75f9e1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5611,7 +5611,7 @@ static void test_frameset(IHTMLDocument2 *doc) V_VT(&index_var) = VT_I4; V_I4(&index_var) = 0; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - todo_wine ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); @@ -5621,7 +5621,7 @@ static void test_frameset(IHTMLDocument2 *doc) /* test second frame */ V_I4(&index_var) = 1; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - todo_wine ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); @@ -5631,7 +5631,7 @@ static void test_frameset(IHTMLDocument2 *doc) /* fail on third frame */ V_I4(&index_var) = 2; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - todo_wine ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLFramesCollection2_item should have" + ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLFramesCollection2_item should have" "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08x\n", hres); VariantClear(&result_var); @@ -5639,7 +5639,7 @@ static void test_frameset(IHTMLDocument2 *doc) V_VT(&index_var) = VT_BSTR; V_BSTR(&index_var) = a2bstr("fr1"); hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - todo_wine ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); @@ -5651,7 +5651,7 @@ static void test_frameset(IHTMLDocument2 *doc) V_VT(&index_var) = VT_BOOL; V_BOOL(&index_var) = VARIANT_TRUE; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - todo_wine ok(hres == E_INVALIDARG, "IHTMLFramesCollection2_item should have" + ok(hres == E_INVALIDARG, "IHTMLFramesCollection2_item should have" "failed with E_INVALIDARG, instead: 0x%08x\n", hres); VariantClear(&result_var); @@ -5668,7 +5668,7 @@ static void test_frameset(IHTMLDocument2 *doc) V_VT(&index_var) = VT_I4; V_I4(&index_var) = 0; hres = IHTMLWindow2_item(window, &index_var, &result_var); - todo_wine ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); @@ -5678,7 +5678,7 @@ static void test_frameset(IHTMLDocument2 *doc) /* test second frame */ V_I4(&index_var) = 1; hres = IHTMLWindow2_item(window, &index_var, &result_var); - todo_wine ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); @@ -5688,7 +5688,7 @@ static void test_frameset(IHTMLDocument2 *doc) /* fail on third frame */ V_I4(&index_var) = 2; hres = IHTMLWindow2_item(window, &index_var, &result_var); - todo_wine ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLWindow2_item should have" + ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLWindow2_item should have" "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08x\n", hres); VariantClear(&result_var); @@ -5696,7 +5696,7 @@ static void test_frameset(IHTMLDocument2 *doc) V_VT(&index_var) = VT_BSTR; V_BSTR(&index_var) = a2bstr("fr2"); hres = IHTMLWindow2_item(window, &index_var, &result_var); - todo_wine ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); @@ -5708,7 +5708,7 @@ static void test_frameset(IHTMLDocument2 *doc) V_VT(&index_var) = VT_BOOL; V_BOOL(&index_var) = VARIANT_TRUE; hres = IHTMLWindow2_item(window, &index_var, &result_var); - todo_wine ok(hres == E_INVALIDARG, "IHTMLWindow2_item should have" + ok(hres == E_INVALIDARG, "IHTMLWindow2_item should have" "failed with E_INVALIDARG, instead: 0x%08x\n", hres); VariantClear(&result_var); }

1 0

Andrew Eikum : mshtml: Implement IHTMLWindow2::get_frames and add tests.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: ac226b20f078694a8c18a77bb99dc5209e95f762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac226b20f078694a8c18a77bb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:13:07 2009 -0600 mshtml: Implement IHTMLWindow2::get_frames and add tests. --- dlls/mshtml/htmlwindow.c | 8 ++- dlls/mshtml/tests/dom.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 425c470..c893a6d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -271,8 +271,12 @@ static HRESULT WINAPI HTMLWindow2_get_length(IHTMLWindow2 *iface, LONG *p) static HRESULT WINAPI HTMLWindow2_get_frames(IHTMLWindow2 *iface, IHTMLFramesCollection2 **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + FIXME("(%p)->(%p): semi-stub\n", This, p); + + /* FIXME: Should return a separate Window object */ + *p = (IHTMLFramesCollection2*)HTMLWINDOW2(This); + HTMLWindow2_AddRef(iface); + return S_OK; } static HRESULT WINAPI HTMLWindow2_put_defaultStatus(IHTMLWindow2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2559fdc..6cbf2e8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -58,6 +58,10 @@ static const char cond_comment_str[] = "<html><head><title>test</title></head><body>" "" "</body></html>"; +static const char frameset_str[] = + "<html><head><title>frameset test</title></head><frameset rows=\"28, *\">" + "<frame src=\"about:blank\" id=\"fr1\"><frame src=\"about:blank\" id=\"fr2\">" + "</frameset></html>"; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0}; static WCHAR texteditW[] = {'t','e','x','t','e','d','i','t',0}; @@ -5548,6 +5552,167 @@ static void test_cond_comment(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); } +static void test_frame(IDispatch *disp, const char *exp_id) +{ + IHTMLWindow4 *frame; + IHTMLFrameBase *frame_elem; + IHTMLElement *html_elem; + BSTR bstr; + HRESULT hres; + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow4, (void**)&frame); + ok(hres == S_OK, "Could not get IHTMLWindow4 interface: 0x%08x\n", hres); + if(FAILED(hres)) + return; + + hres = IHTMLWindow4_get_frameElement(frame, &frame_elem); + ok(hres == S_OK, "IHTMLWindow4_get_frameElement failed: 0x%08x\n", hres); + IHTMLWindow4_Release(frame); + if(FAILED(hres)) + return; + + hres = IHTMLFrameBase_QueryInterface(frame_elem, &IID_IHTMLElement, (void**)&html_elem); + ok(hres == S_OK, "Could not get IHTMLElement interface: 0x%08x\n", hres); + IHTMLFrameBase_Release(frame_elem); + if(FAILED(hres)) + return; + + hres = IHTMLElement_get_id(html_elem, &bstr); + ok(hres == S_OK, "IHTMLElement_get_id failed: 0x%08x\n", hres); + ok(!strcmp_wa(bstr, exp_id), "Expected ID: \"%s\", found ID: %s\n", exp_id, wine_dbgstr_w(bstr)); + IHTMLElement_Release(html_elem); + SysFreeString(bstr); +} + +static void test_frameset(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + IHTMLFramesCollection2 *frames; + LONG length; + VARIANT index_var, result_var; + HRESULT hres; + + window = get_doc_window(doc); + + /* test using IHTMLFramesCollection object */ + + hres = IHTMLWindow2_get_frames(window, &frames); + ok(hres == S_OK, "IHTMLWindow2_get_frames failed: 0x%08x\n", hres); + IHTMLWindow2_Release(window); + if(FAILED(hres)) + return; + + /* test result length */ + hres = IHTMLFramesCollection2_get_length(frames, &length); + ok(hres == S_OK, "IHTMLFramesCollection2_get_length failed: 0x%08x\n", hres); + ok(length == 2, "IHTMLFramesCollection2_get_length should have been 2, was: %d\n", length); + + /* test first frame */ + V_VT(&index_var) = VT_I4; + V_I4(&index_var) = 0; + hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); + todo_wine ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); + } + VariantClear(&result_var); + + /* test second frame */ + V_I4(&index_var) = 1; + hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); + todo_wine ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); + } + VariantClear(&result_var); + + /* fail on third frame */ + V_I4(&index_var) = 2; + hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); + todo_wine ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLFramesCollection2_item should have" + "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08x\n", hres); + VariantClear(&result_var); + + /* string argument (element id lookup) */ + V_VT(&index_var) = VT_BSTR; + V_BSTR(&index_var) = a2bstr("fr1"); + hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); + todo_wine ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); + } + VariantClear(&result_var); + VariantClear(&index_var); + + /* invalid argument */ + V_VT(&index_var) = VT_BOOL; + V_BOOL(&index_var) = VARIANT_TRUE; + hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); + todo_wine ok(hres == E_INVALIDARG, "IHTMLFramesCollection2_item should have" + "failed with E_INVALIDARG, instead: 0x%08x\n", hres); + VariantClear(&result_var); + + IHTMLFramesCollection2_Release(frames); + + /* test using IHTMLWindow2 inheritance */ + + /* test result length */ + hres = IHTMLWindow2_get_length(window, &length); + ok(hres == S_OK, "IHTMLWindow2_get_length failed: 0x%08x\n", hres); + ok(length == 2, "IHTMLWindow2_get_length should have been 2, was: %d\n", length); + + /* test first frame */ + V_VT(&index_var) = VT_I4; + V_I4(&index_var) = 0; + hres = IHTMLWindow2_item(window, &index_var, &result_var); + todo_wine ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); + } + VariantClear(&result_var); + + /* test second frame */ + V_I4(&index_var) = 1; + hres = IHTMLWindow2_item(window, &index_var, &result_var); + todo_wine ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); + } + VariantClear(&result_var); + + /* fail on third frame */ + V_I4(&index_var) = 2; + hres = IHTMLWindow2_item(window, &index_var, &result_var); + todo_wine ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLWindow2_item should have" + "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08x\n", hres); + VariantClear(&result_var); + + /* string argument (element id lookup) */ + V_VT(&index_var) = VT_BSTR; + V_BSTR(&index_var) = a2bstr("fr2"); + hres = IHTMLWindow2_item(window, &index_var, &result_var); + todo_wine ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x", V_VT(&result_var)); + test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); + } + VariantClear(&result_var); + VariantClear(&index_var); + + /* invalid argument */ + V_VT(&index_var) = VT_BOOL; + V_BOOL(&index_var) = VARIANT_TRUE; + hres = IHTMLWindow2_item(window, &index_var, &result_var); + todo_wine ok(hres == E_INVALIDARG, "IHTMLWindow2_item should have" + "failed with E_INVALIDARG, instead: 0x%08x\n", hres); + VariantClear(&result_var); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -5738,6 +5903,7 @@ START_TEST(dom) run_domtest(doc_blank, test_defaults); run_domtest(indent_test_str, test_indent); run_domtest(cond_comment_str, test_cond_comment); + run_domtest(frameset_str, test_frameset); CoUninitialize(); gecko_installer_workaround(FALSE);

1 0