February 2011 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLWindow2::focus implementation.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: ca835d0a368feaf7ee93ccbcf4765d77a34d232c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca835d0a368feaf7ee93ccbcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 6 22:15:57 2011 +0100 mshtml: Added IHTMLWindow2::focus implementation. --- dlls/mshtml/htmlwindow.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3cbffea..d0d378f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1074,8 +1074,12 @@ static HRESULT WINAPI HTMLWindow2_get_Option(IHTMLWindow2 *iface, IHTMLOptionEle static HRESULT WINAPI HTMLWindow2_focus(IHTMLWindow2 *iface) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + if(This->doc_obj) + SetFocus(This->doc_obj->hwnd); + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_closed(IHTMLWindow2 *iface, VARIANT_BOOL *p)

1 0

Yaron Shahrabani : po: Hebrew update.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

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/tests: Show that a failing call to MsiGetSourcePath( SOURCEDIR) sets the SOURCEDIR property.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

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

Hans Leidekker : msi: Split up resolve_folder.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

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

Austin English : ddraw: Fix unused variable warnings (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 46f0538ae0f08222290c175bd7a53536c062d8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f0538ae0f08222290c175bd… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 5 21:03:34 2011 -0800 ddraw: Fix unused variable warnings (LLVM/Clang). --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 1b312b5..8d43cca 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1294,7 +1294,6 @@ static void Direct3D1Test(void) memset(desc.lpData, 0, 128); instr = desc.lpData; - idx = 0; instr->bOpcode = D3DOP_TRIANGLE; instr->bSize = sizeof(D3DOP_TRIANGLE); @@ -3684,6 +3683,7 @@ static void BackBuffer3DCreateSurfaceTest(void) memset(&ddcaps, 0, sizeof(ddcaps)); ddcaps.dwSize = sizeof(DDCAPS); hr = IDirectDraw_GetCaps(DirectDraw1, &ddcaps, NULL); + ok(SUCCEEDED(hr), "DirectDraw_GetCaps failed: 0x%08x\n", hr); if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { skip("DDraw reported no VIDEOMEMORY cap. Broken video driver? Skipping surface caps tests.\n");

1 0

Jacek Caban : mshtml: Added focus events tests.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

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

Austin English : d3dx9_36/tests: Remove unused variable assignments (LLVM/ Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

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

Nikolay Sivov : urlmon/uri: Remove dead assignment and useless initializer (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 8fb709e4ad856b9a31f777d53d464373ffdbd42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb709e4ad856b9a31f777d53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 5 15:59:51 2011 +0300 urlmon/uri: Remove dead assignment and useless initializer (LLVM/Clang). --- dlls/urlmon/uri.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e7b3078..a425212 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1017,7 +1017,6 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { if(!already_passed_elision && address->elision) { for(i = 0; i < address->elision_size; i+=2) number[cur_component++] = 0; - already_passed_elision = TRUE; } if(address->ipv4) { @@ -3443,7 +3442,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { INT len; uri->canon_uri = NULL; - len = uri->canon_size = uri->canon_len = 0; + uri->canon_size = uri->canon_len = 0; TRACE("(%p %p %x): beginning to canonicalize URI %s.\n", data, uri, flags, debugstr_w(data->uri));

1 0

Austin English : winspool.drv: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

Module: wine Branch: master Commit: 60c11fe037b57796f977ff152bc420766d29de1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c11fe037b57796f977ff152… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 23:08:04 2011 -0800 winspool.drv: Make sure to use return values (LLVM/Clang). --- dlls/winspool.drv/tests/info.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 1c7e917..da4fc38 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -372,6 +372,7 @@ static void test_AddMonitor(void) mi2a.pEnvironment = entry->env; SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); + ok(res, "AddMonitor error %d\n", GetLastError()); /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_PRIVILEGE_NOT_HELD */ } @@ -1937,6 +1938,7 @@ static void test_SetDefaultPrinter(void) org_value[0] = '\0'; SetLastError(MAGIC_DEAD); res = GetProfileStringA("windows", "device", NULL, org_value, size); + ok(res, "GetProfileString error %d\n", GetLastError()); /* first part: with the default Printer */ SetLastError(MAGIC_DEAD); @@ -2011,11 +2013,13 @@ static void test_SetDefaultPrinter(void) /* restore the original value */ res = pSetDefaultPrinterA(default_printer); /* the nice way */ + ok(res, "SetDefaultPrinter error %d\n", GetLastError()); WriteProfileStringA("windows", "device", org_value); /* the old way */ buffer[0] = '\0'; SetLastError(MAGIC_DEAD); res = GetProfileStringA("windows", "device", NULL, buffer, size); + ok(res, "GetProfileString error %d\n", GetLastError()); ok(!lstrcmpA(org_value, buffer), "'%s' (expected '%s')\n", buffer, org_value); } @@ -2305,6 +2309,7 @@ static void test_GetPrinter(void) { DWORD double_needed; ret = pGetPrinterW(hprn, level, NULL, 0, &double_needed); + ok(!ret, "level %d: GetPrinter error %d\n", level, GetLastError()); ok(double_needed == needed, "level %d: GetPrinterA returned different size %d than GetPrinterW (%d)\n", level, needed, double_needed); } @@ -2313,6 +2318,7 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); filled = -1; ret = GetPrinter(hprn, level, buf, needed, &filled); + ok(ret, "level %d: GetPrinter error %d\n", level, GetLastError()); ok(needed == filled, "needed %d != filled %d\n", needed, filled); if (level == 2) @@ -2540,6 +2546,7 @@ static void test_GetPrinterDriver(void) { DWORD double_needed; ret = pGetPrinterDriverW(hprn, NULL, level, NULL, 0, &double_needed); + ok(!ret, "level %d: GetPrinterDriver error %d\n", level, GetLastError()); ok(double_needed == needed, "GetPrinterDriverA returned different size %d than GetPrinterDriverW (%d)\n", needed, double_needed); }

1 0

Vincent Povirk : gdiplus: Allow adding rectangles with negative sizes to paths.
by Alexandre Julliard Feb. 7, 2011

Feb. 7, 2011

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