February 2011 - Wine-commits

Jacek Caban : mshtml: Added focus events tests.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 7e38d6864e786885f2953b9d6f9f50c4d99e0ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e38d6864e786885f2953b9d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 6 22:16:14 2011 +0100 mshtml: Added focus events tests. --- dlls/mshtml/tests/events.c | 82 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4be0212..07476bc 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -70,6 +70,7 @@ DEFINE_EXPECT(iframe_onreadystatechange_interactive); DEFINE_EXPECT(iframe_onreadystatechange_complete); DEFINE_EXPECT(iframedoc_onreadystatechange); DEFINE_EXPECT(img_onload); +DEFINE_EXPECT(input_onfocus); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -100,6 +101,9 @@ static const char readystate_doc_str[] = static const char img_doc_str[] = "<html><body><img id=\"imgid\"></img></body></html>"; +static const char input_doc_str[] = + "<html><body><input id=\"inputid\"></input></body></html>"; + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -906,6 +910,17 @@ static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD EVENT_HANDLER_FUNC_OBJ(img_onload); +static HRESULT WINAPI input_onfocus(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(input_onfocus); + test_event_args(&DIID_DispHTMLInputElement, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(input_onfocus); + static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1143,9 +1158,17 @@ static IDispatchEx div_onclick_disp = { &div_onclick_dispVtbl }; static void pump_msgs(BOOL *b) { MSG msg; - while(!*b && GetMessage(&msg, NULL, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + + if(b) { + while(!*b && GetMessageW(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + }else { + while(!b && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } } } @@ -1436,6 +1459,58 @@ static void test_imgload(IHTMLDocument2 *doc) IHTMLImgElement_Release(img); } +static void test_focus(IHTMLDocument2 *doc) +{ + IHTMLElement2 *elem2; + IHTMLElement *elem; + VARIANT v; + HRESULT hres; + + elem = get_elem_id(doc, "inputid"); + elem2 = get_elem2_iface((IUnknown*)elem); + IHTMLElement_Release(elem); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement2_get_onfocus(elem2, &v); + ok(hres == S_OK, "get_onfocus failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "V_VT(onfocus) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&input_onfocus_obj; + hres = IHTMLElement2_put_onfocus(elem2, v); + ok(hres == S_OK, "put_onfocus failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement2_get_onfocus(elem2, &v); + ok(hres == S_OK, "get_onfocus failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onfocus) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&input_onfocus_obj, "V_DISPATCH(onfocus) != onfocusFunc\n"); + VariantClear(&v); + + if(!winetest_interactive) + ShowWindow(container_hwnd, SW_SHOW); + + SetFocus(NULL); + ok(!IsChild(container_hwnd, GetFocus()), "focus belongs to document window\n"); + + hres = IHTMLWindow2_focus(window); + ok(hres == S_OK, "focus failed: %08x\n", hres); + + ok(IsChild(container_hwnd, GetFocus()), "focus does not belong to document window\n"); + pump_msgs(NULL); + + SET_EXPECT(input_onfocus); + hres = IHTMLElement2_focus(elem2); + pump_msgs(NULL); + CHECK_CALLED(input_onfocus); + ok(hres == S_OK, "focus failed: %08x\n", hres); + + if(!winetest_interactive) + ShowWindow(container_hwnd, SW_HIDE); + + IHTMLElement2_Release(elem2); +} + static void test_timeout(IHTMLDocument2 *doc) { IHTMLWindow3 *win3; @@ -2076,6 +2151,7 @@ START_TEST(events) run_test(click_doc_str, test_onclick); run_test(readystate_doc_str, test_onreadystatechange); run_test(img_doc_str, test_imgload); + run_test(input_doc_str, test_focus); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Jacek Caban : mshtml: Use case insensitive comparison in parse_classid.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: eb799366f5b3be1b300c26edd6c821bbeffb7661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb799366f5b3be1b300c26edd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 6 22:30:27 2011 +0100 mshtml: Use case insensitive comparison in parse_classid. --- dlls/mshtml/npplugin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 01111a2..042478b 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -154,7 +154,7 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) static const PRUnichar clsidW[] = {'c','l','s','i','d',':'}; - if(strncmpW(classid, clsidW, sizeof(clsidW)/sizeof(WCHAR))) + if(strncmpiW(classid, clsidW, sizeof(clsidW)/sizeof(WCHAR))) return FALSE; ptr = classid + sizeof(clsidW)/sizeof(WCHAR);

1 0

Yaron Shahrabani : po: Hebrew update.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: ecdb2415935379b28c6c89285ee60f56cffca9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdb2415935379b28c6c89285… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sun Feb 6 17:00:25 2011 +0200 po: Hebrew update. --- po/he.po | 200 +++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 119 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecdb2415935379b28c6c8…

1 0

Hans Leidekker : msi: Split up resolve_folder.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: b96e5d21c6b59413813dca1d1385ffe24b4a6f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96e5d21c6b59413813dca1d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 7 09:40:13 2011 +0100 msi: Split up resolve_folder. --- dlls/msi/action.c | 24 +++++----- dlls/msi/custom.c | 3 +- dlls/msi/files.c | 4 +- dlls/msi/format.c | 7 ++- dlls/msi/helpers.c | 125 +++++++++++++++++++++++++++++----------------------- dlls/msi/install.c | 16 +++--- dlls/msi/msipriv.h | 4 +- 7 files changed, 98 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b96e5d21c6b59413813dc…

1 0

Hans Leidekker : msi/tests: Show that a failing call to MsiGetSourcePath( SOURCEDIR) sets the SOURCEDIR property.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: b2b4005fe44f4ee76e96bda2b3ab45b7a129f3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b4005fe44f4ee76e96bda2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 7 09:40:33 2011 +0100 msi/tests: Show that a failing call to MsiGetSourcePath(SOURCEDIR) sets the SOURCEDIR property. --- dlls/msi/tests/package.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 706e925..cc7be1e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11939,6 +11939,23 @@ static void test_sourcedir(void) ok(!lstrcmpA(path, ""), "Expected \"\", got \"%s\"\n", path); ok(size == 0, "Expected 0, got %d\n", size); + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetSourcePath(hpkg, "SOURCEDIR", path, &size); + ok(r == ERROR_DIRECTORY, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(path, "kiwi"), "Expected \"kiwi\", got \"%s\"\n", path); + ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + + /* SOURCEDIR after calling MsiGetSourcePath */ + size = MAX_PATH; + lstrcpyA(path, "kiwi"); + r = MsiGetProperty(hpkg, "SOURCEDIR", path, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine { + ok(!lstrcmpA(path, cwd), "Expected \"%s\", got \"%s\"\n", cwd, path); + ok(size == lstrlenA(cwd), "Expected %d, got %d\n", lstrlenA(cwd), size); + } + r = MsiDoAction(hpkg, "ResolveSource"); ok(r == ERROR_SUCCESS, "file cost failed\n");

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle put_borderRightColor.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 26380e1720db6c759fe1e236d77295e88ad5d0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26380e1720db6c759fe1e236d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 7 13:38:19 2011 +1100 mshtml: Implement IHTMLStyle put_borderRightColor. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3a976cd..45efd95 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1559,8 +1559,10 @@ static HRESULT WINAPI HTMLStyle_get_borderTopColor(IHTMLStyle *iface, VARIANT *p static HRESULT WINAPI HTMLStyle_put_borderRightColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_borderRightColor(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9cc25a3..b5babed 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5461,6 +5461,24 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_borderTopColor(style, vDefault); ok(hres == S_OK, "put_borderTopColor: %08x\n", hres); + /* borderRightColor */ + hres = IHTMLStyle_get_borderRightColor(style, &vDefault); + ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("blue"); + hres = IHTMLStyle_put_borderRightColor(style, v); + ok(hres == S_OK, "put_borderRightColor: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderRightColor(style, &v); + ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "blue"), "expected blue = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderRightColor(style, vDefault); + ok(hres == S_OK, "putborderRightColorr: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Vincent Povirk : gdiplus: Allow adding rectangles with negative sizes to paths.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: cd3855f384cc2e9f8095274f1f69b504043cb414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3855f384cc2e9f8095274f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 5 14:11:50 2011 -0600 gdiplus: Allow adding rectangles with negative sizes to paths. --- dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/tests/graphicspath.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 983ead9..c9d67b1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1507,7 +1507,7 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x, y, width, height); - if(!path || width < 0.0 || height < 0.0) + if(!path) return InvalidParameter; /* make a backup copy of path data */ diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 2343e9c..9a42153 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1106,6 +1106,34 @@ static void test_isvisible(void) ReleaseDC(0, hdc); } +static void test_empty_rect(void) +{ + GpPath *path; + GpStatus status; + BOOL result; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + + status = GdipAddPathRectangle(path, 0.0, 0.0, -5.0, 5.0); + expect(Ok, status); + + status = GdipIsVisiblePathPoint(path, -2.0, 2.0, NULL, &result); + expect(Ok, status); + expect(FALSE, status); + + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, -5.0); + expect(Ok, status); + + status = GdipAddPathRectangle(path, 0.0, 0.0, 0.0, 5.0); + expect(Ok, status); + + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, 0.0); + expect(Ok, status); + + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1135,6 +1163,7 @@ START_TEST(graphicspath) test_addpie(); test_flatten(); test_isvisible(); + test_empty_rect(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Fix error path in GdipAddPathRectangle.
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 4fd76b09958397477cea1c5c279f53bcd129752f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd76b09958397477cea1c5c2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 5 14:22:11 2011 -0600 gdiplus: Fix error path in GdipAddPathRectangle. --- dlls/gdiplus/graphicspath.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index c9d67b1..5a68147 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1536,9 +1536,10 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, fail: /* reverting */ - GdipDeletePath(path); - GdipClonePath(backup, &path); - GdipDeletePath(backup); + GdipFree(path->pathdata.Points); + GdipFree(path->pathdata.Types); + memcpy(path, backup, sizeof(*path)); + GdipFree(backup); return retstat; } @@ -1581,9 +1582,10 @@ GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath *path, GDIPCONST GpRectF *rects fail: /* reverting */ - GdipDeletePath(path); - GdipClonePath(backup, &path); - GdipDeletePath(backup); + GdipFree(path->pathdata.Points); + GdipFree(path->pathdata.Types); + memcpy(path, backup, sizeof(*path)); + GdipFree(backup); return retstat; }

1 0

Austin English : avifil32/tests: Remove useless variable assignments (LLVM/ Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: 0d258b47371d9ca0b8dfd9c7d7222c4236e642f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d258b47371d9ca0b8dfd9c7d… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 5 20:56:17 2011 -0800 avifil32/tests: Remove useless variable assignments (LLVM/Clang). --- dlls/avifil32/tests/api.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 14ad4b4..4b87806 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -232,11 +232,7 @@ static void test_EditStreamSetInfo(void) hres = CreateEditableStream(&stream, NULL); ok(hres == AVIERR_OK, "got 0x%08X, expected AVIERR_OK\n", hres); - - if(0) /* Crashing - first parameter not checked */ - hres = EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); - - /* Size parameter is somehow checked (notice the crash with size=-1 below) */ + /* Size parameter is somehow checked (notice the crash with size=-1 below) */ hres = EditStreamSetInfo(stream, NULL, 0); ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); @@ -244,11 +240,14 @@ static void test_EditStreamSetInfo(void) ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); if(0) - { /* Crashing - second parameter not checked */ - hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); + { + /* Crashing - first parameter not checked */ + EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); + + /* Crashing - second parameter not checked */ + EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); - hres = EditStreamSetInfo(stream, NULL, -1); - ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); + EditStreamSetInfo(stream, NULL, -1); } hres = AVIStreamInfo(stream, &info, sizeof(AVISTREAMINFO) );

1 0

Austin English : d3dx9_36/tests: Remove unused variable assignments (LLVM/ Clang).
by Alexandre Julliard 07 Feb '11

07 Feb '11

Module: wine Branch: master Commit: f9facad2353cf3761a2fea9a25d3e8e4d5527457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9facad2353cf3761a2fea9a2… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 5 20:58:47 2011 -0800 d3dx9_36/tests: Remove unused variable assignments (LLVM/Clang). --- dlls/d3dx9_36/tests/mesh.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 6ba7224..5e875bd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1434,7 +1434,6 @@ static BOOL compute_sphere(struct mesh *mesh, FLOAT radius, UINT slices, UINT st vertex = 0; face = 0; - stack = 0; mesh->vertices[vertex].normal.x = 0.0f; mesh->vertices[vertex].normal.y = 0.0f; @@ -1663,7 +1662,6 @@ static BOOL compute_cylinder(struct mesh *mesh, FLOAT radius1, FLOAT radius2, FL vertex = 0; face = 0; - stack = 0; delta_radius = radius1 - radius2; radius = radius1;

1 0