September 2012 - Wine-commits

Jacek Caban : mshtml: Added function overriding tests.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 4d469b55a5850a9aad05003f6770338754924150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d469b55a5850a9aad05003f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:19 2012 +0200 mshtml: Added function overriding tests. --- dlls/mshtml/tests/jstest.html | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index d9d6da5..224e19a 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -103,15 +103,34 @@ function test_getter_call() { var e = document.getElementById("divid"); - e.myfunc = function(x) { this.myfinc_called = x; }; + e.myfunc = function(x) { this.myfunc_called = x; }; e.myfunc("test"); - ok(e.myfinc_called === "test", "e.myfinc_called = " + e.myfinc_called); + ok(e.myfunc_called === "test", "e.myfunc_called = " + e.myfunc_called); e.onmousedown = function(x) { this.onmousedown_called = x; }; e.onmousedown("test"); ok(e.onmousedown_called === "test", "e.onmousedown_called = " + e.onmousedown_called); } +function test_override_functions() { + function override_func() { return "test"; } + + ok(typeof(window.showModalDialog) === "object", "typeof(window.showModalDialog) = " + typeof(window.showModalDialog)); + window.showModalDialog = override_func; + ok(window.showModalDialog === override_func, "window.showModalDialog != override_func"); + ok(typeof(window.showModalDialog) === "function", "typeof(window.showModalDialog) = " + typeof(window.showModalDialog)); + + document.body.innerHTML = '<div id="divid"></div>'; + var div = document.getElementById("divid"); + ok(typeof(div.addBehavior) === "object", "typeof(div.addBehavior) = " + typeof(div.addBehavior)); + div.addBehavior = override_func; + ok(div.addBehavior === override_func, "div.addBehavior != override_func"); + ok(typeof(div.addBehavior) === "function", "typeof(div.addBehavior) = " + typeof(div.addBehavior)); + + var tmp = div.addBehavior(); + ok(tmp === "test", "div.addBehavior() = " + tmp); +} + var globalVar = false; function runTest() { @@ -128,6 +147,7 @@ function runTest() { test_document_name_as_index(); test_remove_style_attribute(); test_getter_call(); + test_override_functions(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml: Use custom VT_BSTR to VT_BOOL conversion in InvokeEx implementation.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 514e65c1e9cd7f56f4b3f91cd2c96c2fb3ac5967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=514e65c1e9cd7f56f4b3f91cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:33 2012 +0200 mshtml: Use custom VT_BSTR to VT_BOOL conversion in InvokeEx implementation. --- dlls/mshtml/dispex.c | 10 +++++++ dlls/mshtml/tests/jstest.html | 29 ++++++++++++++++++++- dlls/mshtml/tests/script.c | 57 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index cc22ce4..7ce53b2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -927,6 +927,16 @@ static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvi } } + switch(vt) { + case VT_BOOL: + if(V_VT(src) == VT_BSTR) { + V_VT(dst) = VT_BOOL; + V_BOOL(dst) = V_BSTR(src) && *V_BSTR(src) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; + } + break; + } + return VariantChangeType(dst, src, 0, vt); } diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 224e19a..70478e4 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -98,6 +98,24 @@ function test_clone_node() { ok(cloned.style.filter === "alpha(opacity=50)", "cloned.style.filter = " + cloned.style.filter); } +function test_setAttribute() { + var input; + + document.body.innerHTML = '<input id="inputid"></input>'; + input = document.getElementById("inputid"); + ok(input.checked === false, "input.checked = " + input.checked); + + input.setAttribute("checked", "test"); + ok(input.checked === true, "input.checked = " + input.checked); + + input.setAttribute("checked", 0); + ok(input.checked === false, "input.checked = " + input.checked); + + input.setAttribute("checked", ""); + ok(input.checked === false, "input.checked = " + input.checked); + +} + function test_getter_call() { document.body.innerHTML = '<div id="divid"></div>'; @@ -133,7 +151,7 @@ function test_override_functions() { var globalVar = false; -function runTest() { +function runTests() { obj = new Object(); ok(obj === window.obj, "obj !== window.obj"); @@ -147,11 +165,20 @@ function runTest() { test_document_name_as_index(); test_remove_style_attribute(); test_getter_call(); + test_setAttribute(); test_override_functions(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r); ok(globalVar === true, "globalVar = " + globalVar); +} + +function runTest() { + try { + runTests(); + }catch(e) { + ok(false, "got exception"); + } external.reportSuccess(); } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 59d03dd..0fa6eba 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2028,6 +2028,62 @@ static void test_arg_conv(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } +#define test_elem_disabled(a,b) _test_elem_disabled(__LINE__,a,b) +static void _test_elem_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL exb) +{ + IHTMLElement3 *elem3; + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement3, (void**)&elem3); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLElement3 iface: %08x\n", hres); + + hres = IHTMLElement3_get_disabled(elem3, &b); + ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(b == exb, "disabled = %x, expected %x\n", b, exb); + + IHTMLElement3_Release(elem3); +} + +static void test_default_arg_conv(IHTMLWindow2 *window) +{ + IHTMLDocument2 *doc; + IDispatchEx *dispex; + IHTMLElement *elem; + VARIANT v; + HRESULT hres; + + hres = IHTMLWindow2_get_document(window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + hres = IHTMLDocument2_get_body(doc, &elem); + IHTMLDocument2_Release(doc); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + test_elem_disabled(elem, VARIANT_FALSE); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("test"); + hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&v)); + + test_elem_disabled(elem, VARIANT_TRUE); + + V_VT(&v) = VT_I4; + V_BSTR(&v) = 0; + hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + test_elem_disabled(elem, VARIANT_FALSE); + + IHTMLElement_Release(elem); + IDispatchEx_Release(dispex); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -2198,6 +2254,7 @@ static void test_script_run(void) test_nextdispid(dispex); test_arg_conv(window); + test_default_arg_conv(window); IHTMLWindow2_Release(window); tmp = a2bstr("test");

1 0

Jacek Caban : mshtml: Added IHTMLDocument::get_charset implementation.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: efb08f261d88061f0ccc7b959f7986d4d06044c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb08f261d88061f0ccc7b959… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 14:10:50 2012 +0200 mshtml: Added IHTMLDocument::get_charset implementation. --- dlls/mshtml/htmldoc.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ff917d9..322751a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -729,8 +729,19 @@ static HRESULT WINAPI HTMLDocument_put_charset(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_charset(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString charset_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_FAIL; + } + + nsAString_Init(&charset_str, NULL); + nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str); + return return_nsstr(nsres, &charset_str, p); } static HRESULT WINAPI HTMLDocument_put_defaultCharset(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 149aa5e..c988ac6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4745,6 +4745,7 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElement2 *elem2; IHTMLElement *elem; IHTMLStyle *style; + BSTR str; LONG l; HRESULT hres; IHTMLElementCollection *collection; @@ -4819,6 +4820,12 @@ static void test_defaults(IHTMLDocument2 *doc) test_ifaces((IUnknown*)style, style_iids); IHTMLStyle_Release(style); + str = NULL; + hres = IHTMLDocument2_get_charset(doc, &str); + ok(hres == S_OK, "get_charset failed: %08x\n", hres); + ok(str && *str, "charset is empty"); /* FIXME: better tests */ + SysFreeString(str); + test_window(doc); test_compatmode(doc); test_location(doc);

1 0

Ken Thomases : winex11: Avoid a redundant TRACE.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 58441052231184f7278adcbffa129f4d9c8ef97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58441052231184f7278adcbff… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sat Sep 22 15:44:42 2012 -0500 winex11: Avoid a redundant TRACE. --- dlls/winex11.drv/event.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 4e4b816..514f0d4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1209,14 +1209,17 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat } TRACE( "not restoring to max win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } - else if (style & (WS_MINIMIZE | WS_MAXIMIZE)) + else { - TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); - release_win_data( data ); - SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); - return; + if (style & (WS_MINIMIZE | WS_MAXIMIZE)) + { + TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); + release_win_data( data ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + return; + } + TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } - TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); } else if (!data->iconic && data->wm_state == IconicState) {

1 0

Francois Gouget : Use the CP_ACP and NULL macros instead of numeric literals when converting strings between ANSI and Unicode .
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 709a0b764d448c08ff416a1e076a621b61da3fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709a0b764d448c08ff416a1e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 13:04:26 2012 +0200 Use the CP_ACP and NULL macros instead of numeric literals when converting strings between ANSI and Unicode. --- dlls/ntdll/tests/reg.c | 2 +- dlls/riched20/style.c | 8 ++++---- dlls/shell32/shellstring.c | 6 +++--- dlls/shlwapi/istream.c | 2 +- dlls/shlwapi/reg.c | 2 +- dlls/shlwapi/string.c | 4 ++-- dlls/shlwapi/tests/path.c | 4 ++-- dlls/shlwapi/tests/string.c | 14 +++++++------- dlls/shlwapi/tests/url.c | 8 ++++---- dlls/shlwapi/thread.c | 2 +- dlls/shlwapi/url.c | 26 +++++++++++++------------- dlls/wintrust/tests/crypt.c | 8 ++++---- dlls/wintrust/tests/softpub.c | 2 +- 13 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=709a0b764d448c08ff416…

1 0

Francois Gouget : kernel32: Add line wrapping support to FormatMessage().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 49cf27ab2aa73b1247efb59b325255f4d038e248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cf27ab2aa73b1247efb59b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:38:13 2012 +0200 kernel32: Add line wrapping support to FormatMessage(). --- dlls/kernel32/format_msg.c | 65 +++++++++++++++++++++----- dlls/kernel32/tests/format_msg.c | 96 +++++++++++++++++++------------------- 2 files changed, 101 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49cf27ab2aa73b1247efb…

1 0

Francois Gouget : d3dcompiler_43: Make compare_hlsl_types_rb() static.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 919db661e51ec51ce693fcf597bf2faaa328d2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=919db661e51ec51ce693fcf59… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:42:08 2012 +0200 d3dcompiler_43: Make compare_hlsl_types_rb() static. --- dlls/d3dcompiler_43/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index cc35ce9..d50a9be 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1671,7 +1671,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig return &assign->node; } -int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) +static int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) { const char *name = (const char *)key; const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry);

1 0

Francois Gouget : mshtml: Make navigate_uri() static.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 7af53b5f485ddca8c4d37e35f0eee445c9866c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af53b5f485ddca8c4d37e35f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:42:13 2012 +0200 mshtml: Make navigate_uri() static. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3b618e2..fea8b4c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2245,7 +2245,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne return hres; } -HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri) +static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri) { nsWineURI *nsuri; HRESULT hres;

1 0

Francois Gouget : wininet: Make URLCacheContainers_{Create, Delete}All() static.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 51c90eba233540c6c0018f30d6790bab0e092755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c90eba233540c6c0018f30d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:42:21 2012 +0200 wininet: Make URLCacheContainers_{Create,Delete}All() static. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 87789fe..89be901 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -542,7 +542,7 @@ static void URLCacheContainer_DeleteContainer(URLCACHECONTAINER * pContainer) heap_free(pContainer); } -void URLCacheContainers_CreateDefaults(void) +static void URLCacheContainers_CreateDefaults(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; static const WCHAR UrlPrefix[] = {0}; @@ -601,7 +601,7 @@ void URLCacheContainers_CreateDefaults(void) } } -void URLCacheContainers_DeleteAll(void) +static void URLCacheContainers_DeleteAll(void) { while(!list_empty(&UrlContainers)) URLCacheContainer_DeleteContainer(

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCleanMesh.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: fcb9c5fadbf0b070bee1b300623c2c9e8f88780e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb9c5fadbf0b070bee1b3006… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:45:44 2012 +0200 d3dx9_36: Add stub for D3DXCleanMesh. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 5c880a4..4278ae1 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -8,7 +8,7 @@ @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr ptr) @ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr ptr) -@ stub D3DXCleanMesh(ptr ptr ptr ptr ptr) +@ stdcall D3DXCleanMesh(long ptr ptr ptr ptr ptr) @ stdcall D3DXColorAdjustContrast(ptr ptr float) @ stdcall D3DXColorAdjustSaturation(ptr ptr float) @ stdcall D3DXCompileShader(ptr long ptr ptr str str long ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 35365eb..de4049a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3818,6 +3818,14 @@ cleanup: return hr; } +HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE clean_type, LPD3DXMESH mesh_in, const DWORD *adjacency_in, + LPD3DXMESH *mesh_out, DWORD *adjacency_out, LPD3DXBUFFER *errors_and_warnings) +{ + FIXME("(%u, %p, %p, %p, %p, %p)\n", clean_type, mesh_in, adjacency_in, mesh_out, adjacency_out, errors_and_warnings); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc_hier) { HRESULT hr;

1 0