June 2008 - Wine-commits - list.winehq.org

James Hawkins : msi: Rewrite the ProcessComponents test to only check the registry changes.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 073d55e73b4227b333f139d449d92039bab912c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073d55e73b4227b333f139d44… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jun 18 00:49:00 2008 -0500 msi: Rewrite the ProcessComponents test to only check the registry changes. --- dlls/msi/tests/install.c | 173 +++++++-------------------------------------- 1 files changed, 27 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=073d55e73b4227b333f13…

1 0

Huw Davies : gdi32: Initialize the handle table.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 82c7ff811e3b65752b01b5bf9c429dc2c6d281fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c7ff811e3b65752b01b5bf9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 9 13:39:16 2008 +0100 gdi32: Initialize the handle table. Fixes Valgrind warning: 'Conditional jump or move depends on uninitialised value(s)' in metafile test. --- dlls/gdi32/enhmetafile.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index b20f442..ef53910 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2301,6 +2301,8 @@ BOOL WINAPI EnumEnhMetaFile( ht = (HANDLETABLE*) &info[1]; ht->objectHandle[0] = hmf; + for(i = 1; i < emh->nHandles; i++) + ht->objectHandle[i] = NULL; if(hdc) {

1 0

Andrew Talbot : user32: Dangling pointer fix.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: aceb12265fd4043882ec010cd82def79feced9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aceb12265fd4043882ec010cd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jun 17 21:21:55 2008 +0100 user32: Dangling pointer fix. --- dlls/user32/dde_misc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 9061836..049deae 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -515,7 +515,6 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, ret = DMLERR_INVALIDPARAMETER; goto theError; } - HeapFree(GetProcessHeap(), 0, pInstance); /* finished - release heap space used as work store */ /* can't reinitialise if we have initialised nothing !! */ reference_inst = WDML_InstanceList; /* must first check if we have been given a valid instance to re-initialise !! how do we do that ? */ @@ -571,6 +570,9 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, reference_inst->CBFflags = pInstance->CBFflags; reference_inst->clientOnly = pInstance->clientOnly; reference_inst->monitorFlags = pInstance->monitorFlags; + + HeapFree(GetProcessHeap(), 0, pInstance); /* finished - release heap space used as work store */ + LeaveCriticalSection(&WDML_CritSect); }

1 0

Lei Zhang : comctl32: Don't rearrange icons / update scroll bar when destroying a listview.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 59e3490cad4faa9d6d426ef4b01e576f50497e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e3490cad4faa9d6d426ef4b… Author: Lei Zhang <thestig(a)google.com> Date: Tue Jun 17 18:07:38 2008 -0700 comctl32: Don't rearrange icons / update scroll bar when destroying a listview. --- dlls/comctl32/listview.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ab9cefe..ce909fe 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4457,7 +4457,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr) +static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) { NMLISTVIEW nmlv; HDPA hdpaSubItems = NULL; @@ -4501,8 +4501,11 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr) infoPtr->nItemCount --; } - LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); - LISTVIEW_UpdateScroll(infoPtr); + if (!destroy) + { + LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); + LISTVIEW_UpdateScroll(infoPtr); + } LISTVIEW_InvalidateList(infoPtr); return TRUE; @@ -8729,7 +8732,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) TRACE("()\n"); /* delete all items */ - LISTVIEW_DeleteAllItems(infoPtr); + LISTVIEW_DeleteAllItems(infoPtr, TRUE); /* destroy data structure */ DPA_Destroy(infoPtr->hdpaItems); @@ -9510,7 +9513,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return (LRESULT)LISTVIEW_CreateDragImage(infoPtr, (INT)wParam, (LPPOINT)lParam); case LVM_DELETEALLITEMS: - return LISTVIEW_DeleteAllItems(infoPtr); + return LISTVIEW_DeleteAllItems(infoPtr, FALSE); case LVM_DELETECOLUMN: return LISTVIEW_DeleteColumn(infoPtr, (INT)wParam);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::put_color implementation.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 57c49cbb0d57c5b43442fa2cb308a2ee3b1a8cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c49cbb0d57c5b43442fa2cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:12:43 2008 +0200 mshtml: Added IHTMLStyle::put_color implementation. --- dlls/mshtml/htmlstyle.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 32f6462..8bceb26 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -420,7 +420,18 @@ static HRESULT WINAPI HTMLStyle_get_font(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_color(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + switch(V_VT(&v)) { + case VT_BSTR: + TRACE("%s\n", debugstr_w(V_BSTR(&v))); + return set_style_attr(This, attrColor, V_BSTR(&v), 0); + + default: + FIXME("unsupported vt=%d\n", V_VT(&v)); + } + return E_NOTIMPL; }

1 0

Jacek Caban : mshtml: Added IHTMLStyle::put_background implementation.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: b53307188fe8609864dc68b6977cc08e41e03092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53307188fe8609864dc68b69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:12:26 2008 +0200 mshtml: Added IHTMLStyle::put_background implementation. --- dlls/mshtml/htmlstyle.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 859193f..32f6462 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -43,6 +43,8 @@ typedef struct { #define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl) +static const WCHAR attrBackground[] = + {'b','a','c','k','g','r','o','u','n','d',0}; static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrBackgroundImage[] = @@ -435,8 +437,10 @@ static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_background(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrBackground, v, 0); } static HRESULT WINAPI HTMLStyle_get_background(IHTMLStyle *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Change backslashes to shashes in URLs passed to IHTMLStyle:: put_backgroundImage.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: ea7666a053a1aa34c511ec47c12c246f82fb8f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7666a053a1aa34c511ec47c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:11:52 2008 +0200 mshtml: Change backslashes to shashes in URLs passed to IHTMLStyle::put_backgroundImage. --- dlls/mshtml/htmlstyle.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a9dc179..859193f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -116,7 +116,27 @@ static LPWSTR fix_px_value(LPCWSTR val) return NULL; } +static LPWSTR fix_url_value(LPCWSTR val) +{ + WCHAR *ret, *ptr; + + static const WCHAR urlW[] = {'u','r','l','('}; + + if(strncmpW(val, urlW, sizeof(urlW)/sizeof(WCHAR)) || !strchrW(val, '\\')) + return NULL; + + ret = heap_strdupW(val); + + for(ptr = ret; *ptr; ptr++) { + if(*ptr == '\\') + *ptr = '/'; + } + + return ret; +} + #define ATTR_FIX_PX 1 +#define ATTR_FIX_URL 2 static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value, DWORD flags) { @@ -130,6 +150,8 @@ static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value, DWOR if(flags & ATTR_FIX_PX) val = fix_px_value(value); + if(flags & ATTR_FIX_URL) + val = fix_url_value(value); nsAString_Init(&str_name, name); nsAString_Init(&str_value, val ? val : value); @@ -460,7 +482,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundImage(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return set_style_attr(This, attrBackgroundImage, v, 0); + return set_style_attr(This, attrBackgroundImage, v, ATTR_FIX_URL); } static HRESULT WINAPI HTMLStyle_get_backgroundImage(IHTMLStyle *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added more IDispatchEx tests.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: cc021a86075f9cd9c3312714290edcfc9f219920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc021a86075f9cd9c33127142… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:11:30 2008 +0200 mshtml: Added more IDispatchEx tests. --- dlls/mshtml/tests/script.c | 85 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 01a410e..8b4ddbf 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -31,6 +31,7 @@ #include "activscp.h" #include "activdbg.h" #include "objsafe.h" +#include "mshtmdid.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -79,6 +80,7 @@ DEFINE_EXPECT(SetScriptState_CONNECTED); DEFINE_EXPECT(SetScriptState_DISCONNECTED); DEFINE_EXPECT(AddNamedItem); DEFINE_EXPECT(ParseScriptText); +DEFINE_EXPECT(GetScriptDispatch); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" @@ -86,6 +88,7 @@ static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; static IHTMLDocument2 *notif_doc; +static IDispatchEx *window_dispex; static BOOL doc_complete; static const char *debugstr_w(LPCWSTR str) @@ -435,8 +438,79 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, DWORD dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { + IDispatchEx *document; + VARIANT var; + DISPPARAMS dp; + EXCEPINFO ei; + DISPID id, named_arg = DISPID_PROPERTYPUT; + BSTR tmp; + HRESULT hres; + + static const WCHAR documentW[] = {'d','o','c','u','m','e','n','t',0}; + static const WCHAR testW[] = {'t','e','s','t',0}; + CHECK_EXPECT(ParseScriptText); - return E_NOTIMPL; + + SET_EXPECT(GetScriptDispatch); + + tmp = SysAllocString(documentW); + hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); + SysFreeString(tmp); + ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); + ok(id == DISPID_IHTMLWINDOW2_DOCUMENT, "id=%x\n", id); + + todo_wine CHECK_CALLED(GetScriptDispatch); + + VariantInit(&var); + memset(&dp, 0, sizeof(dp)); + memset(&ei, 0, sizeof(ei)); + + hres = IDispatchEx_InvokeEx(window_dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); + ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(&var) == NULL\n"); + + hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDispatchEx, (void**)&document); + VariantClear(&var); + ok(hres == S_OK, "Could not get DispatchEx: %08x\n", hres); + + tmp = SysAllocString(testW); + hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive, &id); + SysFreeString(tmp); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(document) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + + id = 0; + tmp = SysAllocString(testW); + hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive|fdexNameEnsure, &id); + SysFreeString(tmp); + ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); + ok(id, "id == 0\n"); + + dp.cArgs = 1; + dp.rgvarg = &var; + dp.cNamedArgs = 1; + dp.rgdispidNamedArgs = &named_arg; + V_VT(&var) = VT_I4; + V_I4(&var) = 100; + + hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + tmp = SysAllocString(testW); + hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive, &id); + SysFreeString(tmp); + ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); + + VariantInit(&var); + memset(&dp, 0, sizeof(dp)); + memset(&ei, 0, sizeof(ei)); + hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&var) == VT_I4, "V_VT(var)=%d\n", V_VT(&var)); + ok(V_I4(&var) == 100, "V_I4(&var) == NULL\n"); + + IDispatchEx_Release(document); + return S_OK; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -572,7 +646,6 @@ static HRESULT WINAPI ActiveScript_Close(IActiveScript *iface) static HRESULT WINAPI ActiveScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstrName, DWORD dwFlags) { - IDispatchEx *dispex; IDispatch *disp; IUnknown *unk = NULL, *unk2; HRESULT hres; @@ -600,10 +673,8 @@ static HRESULT WINAPI ActiveScript_AddNamedItem(IActiveScript *iface, if(SUCCEEDED(hres)) IUnknown_Release(unk2); - hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); + hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&window_dispex); ok(hres == S_OK, "Could not get IDispatchEx interface: %08x\n", hres); - if(SUCCEEDED(hres)) - IDispatchEx_Release(dispex); IUnknown_Release(unk); return S_OK; @@ -619,7 +690,7 @@ static HRESULT WINAPI ActiveScript_AddTypeLib(IActiveScript *iface, REFGUID rgui static HRESULT WINAPI ActiveScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR pstrItemName, IDispatch **ppdisp) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(GetScriptDispatch); return E_NOTIMPL; } @@ -770,6 +841,8 @@ static void test_simple_script(void) if(site) IActiveScriptSite_Release(site); + if(window_dispex) + IDispatchEx_Release(window_dispex); SET_EXPECT(SetScriptState_DISCONNECTED); SET_EXPECT(Close);

1 0

Jacek Caban : mshtml: Added missing tids to HTMLCommentElement.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 210d6a0abbfca8d4937d1db9f5d436392b26beb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=210d6a0abbfca8d4937d1db9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:11:03 2008 +0200 mshtml: Added missing tids to HTMLCommentElement. --- dlls/mshtml/htmlcomment.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index b006dbb..5e7fa1e 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -176,6 +176,10 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = { }; static const tid_t HTMLCommentElement_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, IHTMLCommentElement_tid, 0 };

1 0

Jacek Caban : mshtml: Use heap_alloc_zero in HTMLElementCollection_Create.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: da4608227fa33701931b0663c95749ced03a586b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da4608227fa33701931b0663c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 00:10:47 2008 +0200 mshtml: Use heap_alloc_zero in HTMLElementCollection_Create. --- dlls/mshtml/htmlelem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 67a9611..4ad3c73 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1832,7 +1832,7 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node) static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len) { - HTMLElementCollection *ret = heap_alloc(sizeof(HTMLElementCollection)); + HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); ret->lpHTMLElementCollectionVtbl = &HTMLElementCollectionVtbl; ret->ref = 1;

1 0