November 2009 - Wine-commits

Anders Jonsson : mshtml: Update Swedish translation.
by Alexandre Julliard 16 Nov '09

16 Nov '09

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

Andrew Eikum : mshtml: Add stub implementation of IHTMLWindow4.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 334f2ce07433c6c15ba3ccd7d89897b399a9e89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=334f2ce07433c6c15ba3ccd7d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:12:54 2009 -0600 mshtml: Add stub implementation of IHTMLWindow4. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlwindow.c | 91 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + 3 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 980b13b..382ab25 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -144,6 +144,7 @@ static REFIID tid_ids[] = { &IID_IHTMLUniqueName, &IID_IHTMLWindow2, &IID_IHTMLWindow3, + &IID_IHTMLWindow4, &IID_IOmNavigator }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9f3b3e7..a3a8f04 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -126,6 +126,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = HTMLWINDOW3(This); + }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { + TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); + *ppv = HTMLWINDOW4(This); }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -1354,6 +1357,92 @@ static const IHTMLWindow3Vtbl HTMLWindow3Vtbl = { HTMLWindow3_showModelessDialog }; +#define HTMLWINDOW4_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow4, iface) + +static HRESULT WINAPI HTMLWindow4_QueryInterface(IHTMLWindow4 *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); +} + +static ULONG WINAPI HTMLWindow4_AddRef(IHTMLWindow4 *iface) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static ULONG WINAPI HTMLWindow4_Release(IHTMLWindow4 *iface) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IHTMLWindow2_Release(HTMLWINDOW2(This)); +} + +static HRESULT WINAPI HTMLWindow4_GetTypeInfoCount(IHTMLWindow4 *iface, UINT *pctinfo) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); +} + +static HRESULT WINAPI HTMLWindow4_GetTypeInfo(IHTMLWindow4 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLWindow4_GetIDsOfNames(IHTMLWindow4 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLWindow4_Invoke(IHTMLWindow4 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLWindow4_createPopup(IHTMLWindow4 *iface, VARIANT *varArgIn, + IDispatch **ppPopup) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, varArgIn, ppPopup); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow4_get_frameElement(IHTMLWindow4 *iface, IHTMLFrameBase **p) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLWINDOW4_THIS + +static const IHTMLWindow4Vtbl HTMLWindow4Vtbl = { + HTMLWindow4_QueryInterface, + HTMLWindow4_AddRef, + HTMLWindow4_Release, + HTMLWindow4_GetTypeInfoCount, + HTMLWindow4_GetTypeInfo, + HTMLWindow4_GetIDsOfNames, + HTMLWindow4_Invoke, + HTMLWindow4_createPopup, + HTMLWindow4_get_frameElement +}; + #define DISPEX_THIS(iface) DEFINE_THIS(HTMLWindow, IDispatchEx, iface) static HRESULT WINAPI WindowDispEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -1601,6 +1690,7 @@ static const IDispatchExVtbl WindowDispExVtbl = { static const tid_t HTMLWindow_iface_tids[] = { IHTMLWindow2_tid, IHTMLWindow3_tid, + IHTMLWindow4_tid, 0 }; @@ -1633,6 +1723,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; window->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; + window->lpHTMLWindow4Vtbl = &HTMLWindow4Vtbl; window->lpIDispatchExVtbl = &WindowDispExVtbl; window->ref = 1; window->doc_obj = doc_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 43601ae..cc04106 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -120,6 +120,7 @@ typedef enum { IHTMLUniqueName_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, + IHTMLWindow4_tid, IOmNavigator_tid, LAST_tid } tid_t; @@ -215,6 +216,7 @@ struct HTMLWindow { DispatchEx dispex; const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; const IHTMLWindow3Vtbl *lpHTMLWindow3Vtbl; + const IHTMLWindow4Vtbl *lpHTMLWindow4Vtbl; const IDispatchExVtbl *lpIDispatchExVtbl; LONG ref; @@ -514,6 +516,7 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) +#define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) #define HTMLDOC3(x) ((IHTMLDocument3*) &(x)->lpHTMLDocument3Vtbl)

1 0

Andrew Eikum : mshtml: Implement IHTMLWindow4::get_frameElement.
by Alexandre Julliard 16 Nov '09

16 Nov '09

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

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

16 Nov '09

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

Andrew Eikum : mshtml: Implement IHTMLWindow2::item.
by Alexandre Julliard 16 Nov '09

16 Nov '09

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

Vincent Povirk : ole32: Rename SmallBlockChainStream. ownerPropertyIndex to ownerDirEntry.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 93db14e79ae3db0f44824736552ea7a23b40b89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db14e79ae3db0f448247365… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:36:07 2009 -0600 ole32: Rename SmallBlockChainStream.ownerPropertyIndex to ownerDirEntry. --- dlls/ole32/storage32.c | 20 ++++++++++---------- dlls/ole32/storage32.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0701c5a..2ac8127 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3375,7 +3375,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( /* * Destroy the small block chain. */ - propertyIndex = (*ppsbChain)->ownerPropertyIndex; + propertyIndex = (*ppsbChain)->ownerDirEntry; SmallBlockChainStream_SetSize(*ppsbChain, size); SmallBlockChainStream_Destroy(*ppsbChain); *ppsbChain = 0; @@ -4657,7 +4657,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) SmallBlockChainStream* SmallBlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex) + ULONG dirEntry) { SmallBlockChainStream* newStream; @@ -4665,7 +4665,7 @@ SmallBlockChainStream* SmallBlockChainStream_Construct( newStream->parentStorage = parentStorage; newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder; - newStream->ownerPropertyIndex = propertyIndex; + newStream->ownerDirEntry = dirEntry; return newStream; } @@ -4690,11 +4690,11 @@ static ULONG SmallBlockChainStream_GetHeadOfChain( if (This->headOfStreamPlaceHolder != NULL) return *(This->headOfStreamPlaceHolder); - if (This->ownerPropertyIndex) + if (This->ownerDirEntry) { readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty); if (readSuccessful) @@ -5178,13 +5178,13 @@ static BOOL SmallBlockChainStream_Shrink( DirEntry chainProp; StorageImpl_ReadDirEntry(This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp); chainProp.startingBlock = BLOCK_END_OF_CHAIN; StorageImpl_WriteDirEntry(This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp); /* @@ -5255,12 +5255,12 @@ static BOOL SmallBlockChainStream_Enlarge( { DirEntry chainProp; - StorageImpl_ReadDirEntry(This->parentStorage, This->ownerPropertyIndex, + StorageImpl_ReadDirEntry(This->parentStorage, This->ownerDirEntry, &chainProp); chainProp.startingBlock = blockIndex; - StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex, + StorageImpl_WriteDirEntry(This->parentStorage, This->ownerDirEntry, &chainProp); } } @@ -5385,7 +5385,7 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty); return chainProperty.size; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 41dd9bd..07d4048 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -476,7 +476,7 @@ BOOL BlockChainStream_SetSize( struct SmallBlockChainStream { StorageImpl* parentStorage; - ULONG ownerPropertyIndex; + ULONG ownerDirEntry; ULONG* headOfStreamPlaceHolder; }; @@ -486,7 +486,7 @@ struct SmallBlockChainStream SmallBlockChainStream* SmallBlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex); + ULONG dirEntry); void SmallBlockChainStream_Destroy( SmallBlockChainStream* This);

1 0

Vincent Povirk : ole32: Rename rootPropertyName to rootEntryName.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 390e2711f649191fbd3353b2a96838136b260f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=390e2711f649191fbd3353b2a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:37:58 2009 -0600 ole32: Rename rootPropertyName to rootEntryName. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2ac8127..9682a1e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -65,7 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}; -static const char rootPropertyName[] = "Root Entry"; +static const char rootEntryName[] = "Root Entry"; /**************************************************************************** * Storage32InternalImpl definitions. @@ -2266,7 +2266,7 @@ static HRESULT StorageImpl_Construct( * Initialize the property chain */ memset(&rootProp, 0, sizeof(rootProp)); - MultiByteToWideChar( CP_ACP, 0, rootPropertyName, -1, rootProp.name, + MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootProp.name, sizeof(rootProp.name)/sizeof(WCHAR) ); rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); rootProp.stgType = STGTY_ROOT;

1 0

Vincent Povirk : ole32: Rename deleteSt*Property to deleteSt*Contents.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 14647d7ca9cea8493284db0fc7395f87104cc85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=14647d7ca9cea8493284db0fc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:46:04 2009 -0600 ole32: Rename deleteSt*Property to deleteSt*Contents. We now only delete the node contents in these functions. --- dlls/ole32/storage32.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9682a1e..c5bdd62 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -159,15 +159,15 @@ typedef struct /*********************************************************************** * Forward declaration of internal functions used by the method DestroyElement */ -static HRESULT deleteStorageProperty( +static HRESULT deleteStorageContents( StorageBaseImpl *parentStorage, - ULONG foundPropertyIndexToDelete, - DirEntry propertyToDelete); + ULONG indexToDelete, + DirEntry entryDataToDelete); -static HRESULT deleteStreamProperty( +static HRESULT deleteStreamContents( StorageBaseImpl *parentStorage, - ULONG foundPropertyIndexToDelete, - DirEntry propertyToDelete); + ULONG indexToDelete, + DirEntry entryDataToDelete); static HRESULT removeFromTree( StorageImpl *This, @@ -1746,14 +1746,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if ( propertyToDelete.stgType == STGTY_STORAGE ) { - hr = deleteStorageProperty( + hr = deleteStorageContents( This, foundPropertyIndexToDelete, propertyToDelete); } else if ( propertyToDelete.stgType == STGTY_STREAM ) { - hr = deleteStreamProperty( + hr = deleteStreamContents( This, foundPropertyIndexToDelete, propertyToDelete); @@ -1839,13 +1839,13 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) * * Internal Method * - * Perform the deletion of a complete storage node + * Delete the contents of a storage entry. * */ -static HRESULT deleteStorageProperty( +static HRESULT deleteStorageContents( StorageBaseImpl *parentStorage, - ULONG indexOfPropertyToDelete, - DirEntry propertyToDelete) + ULONG indexToDelete, + DirEntry entryDataToDelete) { IEnumSTATSTG *elements = 0; IStorage *childStorage = 0; @@ -1858,7 +1858,7 @@ static HRESULT deleteStorageProperty( */ hr = StorageBaseImpl_OpenStorage( (IStorage*)parentStorage, - propertyToDelete.name, + entryDataToDelete.name, 0, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, @@ -1906,13 +1906,13 @@ static HRESULT deleteStorageProperty( * * Internal Method * - * Perform the deletion of a stream node + * Perform the deletion of a stream's data * */ -static HRESULT deleteStreamProperty( +static HRESULT deleteStreamContents( StorageBaseImpl *parentStorage, - ULONG indexOfPropertyToDelete, - DirEntry propertyToDelete) + ULONG indexToDelete, + DirEntry entryDataToDelete) { IStream *pis; HRESULT hr; @@ -1922,7 +1922,7 @@ static HRESULT deleteStreamProperty( size.u.LowPart = 0; hr = StorageBaseImpl_OpenStream((IStorage*)parentStorage, - propertyToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis); + entryDataToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis); if (hr!=S_OK) {

1 0

Vincent Povirk : ole32: Rename property variables in insertIntoTree.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: a9ad3fed29cfadfd13787ad6ad4f02e7ccf461f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ad3fed29cfadfd13787ad6a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:51:17 2009 -0600 ole32: Rename property variables in insertIntoTree. --- dlls/ole32/storage32.c | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c5bdd62..0cc5413 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -190,7 +190,7 @@ static HRESULT destroyDirEntry( static HRESULT insertIntoTree( StorageImpl *This, ULONG parentStorageIndex, - ULONG newPropertyIndex); + ULONG newEntryIndex); static LONG propertyNameCmp( const OLECHAR *newProperty, @@ -1253,53 +1253,53 @@ static LONG propertyNameCmp( static HRESULT insertIntoTree( StorageImpl *This, ULONG parentStorageIndex, - ULONG newPropertyIndex) + ULONG newEntryIndex) { - DirEntry currentProperty; - DirEntry newProperty; + DirEntry currentEntry; + DirEntry newEntry; /* * Read the inserted property */ StorageImpl_ReadDirEntry(This, - newPropertyIndex, - &newProperty); + newEntryIndex, + &newEntry); /* * Read the root property */ StorageImpl_ReadDirEntry(This, parentStorageIndex, - &currentProperty); + &currentEntry); - if (currentProperty.dirRootEntry != DIRENTRY_NULL) + if (currentEntry.dirRootEntry != DIRENTRY_NULL) { /* * The root storage contains some element, therefore, start the research * for the appropriate location. */ BOOL found = 0; - ULONG current, next, previous, currentPropertyId; + ULONG current, next, previous, currentEntryId; /* * Keep the DirEntry sequence number of the storage first property */ - currentPropertyId = currentProperty.dirRootEntry; + currentEntryId = currentEntry.dirRootEntry; /* * Read */ StorageImpl_ReadDirEntry(This, - currentProperty.dirRootEntry, - &currentProperty); + currentEntry.dirRootEntry, + &currentEntry); - previous = currentProperty.leftChild; - next = currentProperty.rightChild; - current = currentPropertyId; + previous = currentEntry.leftChild; + next = currentEntry.rightChild; + current = currentEntryId; while (found == 0) { - LONG diff = propertyNameCmp( newProperty.name, currentProperty.name); + LONG diff = propertyNameCmp( newEntry.name, currentEntry.name); if (diff < 0) { @@ -1307,15 +1307,15 @@ static HRESULT insertIntoTree( { StorageImpl_ReadDirEntry(This, previous, - &currentProperty); + &currentEntry); current = previous; } else { - currentProperty.leftChild = newPropertyIndex; + currentEntry.leftChild = newEntryIndex; StorageImpl_WriteDirEntry(This, current, - &currentProperty); + &currentEntry); found = 1; } } @@ -1325,15 +1325,15 @@ static HRESULT insertIntoTree( { StorageImpl_ReadDirEntry(This, next, - &currentProperty); + &currentEntry); current = next; } else { - currentProperty.rightChild = newPropertyIndex; + currentEntry.rightChild = newEntryIndex; StorageImpl_WriteDirEntry(This, current, - &currentProperty); + &currentEntry); found = 1; } } @@ -1346,8 +1346,8 @@ static HRESULT insertIntoTree( return STG_E_FILEALREADYEXISTS; } - previous = currentProperty.leftChild; - next = currentProperty.rightChild; + previous = currentEntry.leftChild; + next = currentEntry.rightChild; } } else @@ -1355,10 +1355,10 @@ static HRESULT insertIntoTree( /* * The root storage is empty, link the new property to its dir property */ - currentProperty.dirRootEntry = newPropertyIndex; + currentEntry.dirRootEntry = newEntryIndex; StorageImpl_WriteDirEntry(This, parentStorageIndex, - &currentProperty); + &currentEntry); } return S_OK;

1 0

Vincent Povirk : ole32: Rename propertyNameCmp to entryNameCmp.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 42e8dfa2cb9417efbc0bee611ea09a0de9dccf77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e8dfa2cb9417efbc0bee611… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:55:49 2009 -0600 ole32: Rename propertyNameCmp to entryNameCmp. --- dlls/ole32/storage32.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0cc5413..9040a97 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -192,9 +192,9 @@ static HRESULT insertIntoTree( ULONG parentStorageIndex, ULONG newEntryIndex); -static LONG propertyNameCmp( - const OLECHAR *newProperty, - const OLECHAR *currentProperty); +static LONG entryNameCmp( + const OLECHAR *name1, + const OLECHAR *name2); static ULONG findElement( StorageImpl *storage, @@ -1223,22 +1223,22 @@ static HRESULT destroyDirEntry( * Case insensitive comparison of DirEntry.name by first considering * their size. * - * Returns <0 when newProperty < currentProperty - * >0 when newProperty > currentProperty - * 0 when newProperty == currentProperty + * Returns <0 when name1 < name2 + * >0 when name1 > name2 + * 0 when name1 == name2 */ -static LONG propertyNameCmp( - const OLECHAR *newProperty, - const OLECHAR *currentProperty) +static LONG entryNameCmp( + const OLECHAR *name1, + const OLECHAR *name2) { - LONG diff = lstrlenW(newProperty) - lstrlenW(currentProperty); + LONG diff = lstrlenW(name1) - lstrlenW(name2); if (diff == 0) { /* * We compare the string themselves only when they are of the same length */ - diff = lstrcmpiW( newProperty, currentProperty); + diff = lstrcmpiW( name1, name2); } return diff; @@ -1299,7 +1299,7 @@ static HRESULT insertIntoTree( while (found == 0) { - LONG diff = propertyNameCmp( newEntry.name, currentEntry.name); + LONG diff = entryNameCmp( newEntry.name, currentEntry.name); if (diff < 0) { @@ -1386,7 +1386,7 @@ static ULONG findElement(StorageImpl *storage, ULONG storageEntry, StorageImpl_ReadDirEntry(storage, currentEntry, data); - cmp = propertyNameCmp(name, data->name); + cmp = entryNameCmp(name, data->name); if (cmp == 0) /* found it */ @@ -1432,7 +1432,7 @@ static HRESULT findTreeParent(StorageImpl *storage, ULONG storageEntry, StorageImpl_ReadDirEntry(storage, childEntry, &childData); - cmp = propertyNameCmp(childName, childData.name); + cmp = entryNameCmp(childName, childData.name); if (cmp == 0) /* found it */

1 0