April 2014 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Removed invalid nsAString_InitDepend from HTMLTable_put_bgColor and fixed error handling.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: c49bb259505d2b1c52ce671bbb2fe4e82545777e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49bb259505d2b1c52ce671bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 12:40:08 2014 +0200 mshtml: Removed invalid nsAString_InitDepend from HTMLTable_put_bgColor and fixed error handling. --- dlls/mshtml/htmltable.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index d711ed7..08a0bf0 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -251,11 +251,11 @@ static HRESULT WINAPI HTMLTable_put_bgColor(IHTMLTable *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - nsAString_InitDepend(&val, V_BSTR(&v)); - variant_to_nscolor(&v, &val); + if(!variant_to_nscolor(&v, &val)) + return S_OK; + nsres = nsIDOMHTMLTableElement_SetBgColor(This->nstable, &val); nsAString_Finish(&val); - if (NS_FAILED(nsres)){ ERR("Set BgColor(%s) failed!\n", debugstr_variant(&v)); return E_FAIL;

1 0

Alexandre Julliard : gdi32/tests: Don' t fetch the bits into the DIB itself.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 47ed5655c5c0b9a1fcd3f5db807e6573dcd60378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ed5655c5c0b9a1fcd3f5db8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 28 14:36:43 2014 +0200 gdi32/tests: Don't fetch the bits into the DIB itself. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index aa2be70..39ca454 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -838,7 +838,7 @@ static void test_dibsections(void) } pbmi->bmiHeader.biClrUsed = 173; memset( pbmi->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); - GetDIBits( hdc, hdib, 0, 1, bits, pbmi, DIB_RGB_COLORS ); + GetDIBits( hdc, hdib, 0, 1, NULL, pbmi, DIB_RGB_COLORS ); ok( pbmi->bmiHeader.biClrUsed == 0, "wrong colors %u\n", pbmi->bmiHeader.biClrUsed ); for (i = 0; i < 256; i++) {

1 0

Alexandre Julliard : msvcp90: Fix the mbstowcs_s macro return value.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 91f2b04625682dd6cec46e9b9888a1164e6a94e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f2b04625682dd6cec46e9b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 28 15:34:01 2014 +0200 msvcp90: Fix the mbstowcs_s macro return value. --- dlls/msvcp90/msvcp90.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index f5e79f5..0d5e124 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -528,6 +528,6 @@ typedef struct { #if _MSVCP_VER < 80 #define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) #define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) -#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) )) +#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) ), 0) #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif

1 0

Piotr Caban : oleacc: Add AccessibleObjectFromWindow implementation.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 817222558d3e3dd09aba1f348f24eda22a32190b URL: http://source.winehq.org/git/wine.git/?a=commit;h=817222558d3e3dd09aba1f348… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 28 17:30:31 2014 +0200 oleacc: Add AccessibleObjectFromWindow implementation. --- dlls/oleacc/main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 5a7afd90..c1e2bf8 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -217,9 +217,24 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { - FIXME("%p %d %s %p\n", hwnd, dwObjectID, + TRACE("%p %d %s %p\n", hwnd, dwObjectID, debugstr_guid( riid ), ppvObject ); - return E_NOTIMPL; + + if(!ppvObject) + return E_INVALIDARG; + *ppvObject = NULL; + + if(IsWindow(hwnd)) { + LRESULT lres; + + lres = SendMessageW(hwnd, WM_GETOBJECT, 0xffffffff, dwObjectID); + if(FAILED(lres)) + return lres; + else if(lres) + return ObjectFromLresult(lres, riid, 0, ppvObject); + } + + return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,

1 0

Piotr Caban : oleacc: Add AccessibleObjectFromWindow tests.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 41f5b15523cf6705e3e71d15e28239755038974c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f5b15523cf6705e3e71d15e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 28 17:30:36 2014 +0200 oleacc: Add AccessibleObjectFromWindow tests. --- dlls/oleacc/tests/Makefile.in | 2 +- dlls/oleacc/tests/main.c | 70 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in index 374f15d..2b0157d 100644 --- a/dlls/oleacc/tests/Makefile.in +++ b/dlls/oleacc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oleacc.dll -IMPORTS = ole32 oleacc +IMPORTS = ole32 oleacc user32 C_SRCS = \ main.c diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index e3daefe..c5c50b8 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -211,6 +211,69 @@ static void test_LresultFromObject(const char *name) ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); } +static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg) { + case WM_GETOBJECT: + ok(wparam==0xffffffff || broken(wparam==0x8000), "wparam = %lx\n", wparam); + if(lparam == (DWORD)OBJID_CURSOR) + return E_UNEXPECTED; + if(lparam == (DWORD)OBJID_CLIENT) + return LresultFromObject(&IID_IUnknown, wparam, &Object); + + ok(0, "unexpected (%ld)\n", lparam); + return 0; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static BOOL register_window_class(void) +{ + WNDCLASSA cls; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = test_window_proc; + cls.lpszClassName = "oleacc_test"; + cls.hInstance = GetModuleHandleA(NULL); + + return RegisterClassA(&cls); +} + +static void unregister_window_class(void) +{ + UnregisterClassA("oleacc_test", NULL); +} + +static void test_AccessibleObjectFromWindow(void) +{ + IUnknown *unk; + HRESULT hr; + HWND hwnd; + + hr = AccessibleObjectFromWindow(NULL, OBJID_CURSOR, &IID_IUnknown, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = AccessibleObjectFromWindow(NULL, OBJID_CURSOR, &IID_IUnknown, (void**)&unk); + todo_wine ok(hr == S_OK, "got %x\n", hr); + if(hr == S_OK) IUnknown_Release(unk); + + hwnd = CreateWindowA("oleacc_test", "test", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + hr = AccessibleObjectFromWindow(hwnd, OBJID_CURSOR, &IID_IUnknown, (void**)&unk); + ok(hr == E_UNEXPECTED, "got %x\n", hr); + + ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); + hr = AccessibleObjectFromWindow(hwnd, OBJID_CLIENT, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got %x\n", hr); + ok(Object_ref == 2, "Object_ref = %d\n", Object_ref); + IUnknown_Release(unk); + + DestroyWindow(hwnd); +} + START_TEST(main) { int argc; @@ -233,8 +296,15 @@ START_TEST(main) return; } + if(!register_window_class()) { + skip("can't register test window class\n"); + return; + } + test_getroletext(); test_LresultFromObject(argv[0]); + test_AccessibleObjectFromWindow(); + unregister_window_class(); CoUninitialize(); }

1 0

Andrew Eikum : user32: Only update listbox horizontal scroll info if WS_HSCROLL is set.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: cb1242a8f286f00faece961616d613149166325a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1242a8f286f00faece96161… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 28 11:16:15 2014 -0500 user32: Only update listbox horizontal scroll info if WS_HSCROLL is set. --- dlls/user32/listbox.c | 20 +++++++++++--------- dlls/user32/tests/listbox.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index d17797b..4853c3f 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -265,17 +265,14 @@ static void LISTBOX_UpdateScroll( LB_DESCR *descr ) if (descr->style & WS_VSCROLL) SetScrollInfo( descr->self, SB_VERT, &info, TRUE ); - if (descr->horz_extent) + if (descr->style & WS_HSCROLL) { - info.nMin = 0; - info.nMax = descr->horz_extent - 1; info.nPos = descr->horz_pos; info.nPage = descr->width; - info.fMask = SIF_RANGE | SIF_POS | SIF_PAGE; + info.fMask = SIF_POS | SIF_PAGE; if (descr->style & LBS_DISABLENOSCROLL) info.fMask |= SIF_DISABLENOSCROLL; - if (descr->style & WS_HSCROLL) - SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); + SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); } } } @@ -1241,14 +1238,19 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) { if (descr->style & LBS_MULTICOLUMN) return LB_OKAY; - if (extent <= 0) extent = 1; if (extent == descr->horz_extent) return LB_OKAY; TRACE("[%p]: new horz extent = %d\n", descr->self, extent ); descr->horz_extent = extent; + if (descr->style & WS_HSCROLL) { + SCROLLINFO info; + info.cbSize = sizeof(info); + info.nMin = 0; + info.nMax = descr->horz_extent ? descr->horz_extent - 1 : 0; + info.fMask = SIF_RANGE; + SetScrollInfo( descr->self, SB_HORZ, &info, TRUE ); + } if (descr->horz_pos > extent - descr->width) LISTBOX_SetHorizontalPos( descr, extent - descr->width ); - else - LISTBOX_UpdateScroll( descr ); return LB_OKAY; } diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index ebcb5e9..d99a82c 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1621,6 +1621,8 @@ static void test_extents(void) { HWND listbox, parent; DWORD res; + SCROLLINFO sinfo; + BOOL br; parent = create_parent(); @@ -1629,11 +1631,25 @@ static void test_extents(void) res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); ok(res == 64, "Got wrong horizontal extent: %u\n", res); + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + DestroyWindow(listbox); @@ -1642,11 +1658,37 @@ static void test_extents(void) res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 100, "got wrong max: %u\n", sinfo.nMax); + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); ok(res == 64, "Got wrong horizontal extent: %u\n", res); + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 63, "got wrong max: %u\n", sinfo.nMax); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 0, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong horizontal extent: %u\n", res); + + sinfo.cbSize = sizeof(sinfo); + sinfo.fMask = SIF_RANGE; + br = GetScrollInfo(listbox, SB_HORZ, &sinfo); + ok(br == TRUE, "GetScrollInfo failed\n"); + ok(sinfo.nMin == 0, "got wrong min: %u\n", sinfo.nMin); + ok(sinfo.nMax == 0, "got wrong max: %u\n", sinfo.nMax); + DestroyWindow(listbox); DestroyWindow(parent);

1 0

André Hentschel : Add WWN 368
by Jeremy Newman 27 Apr '14

27 Apr '14

Module: website Branch: master Commit: d2118b287a56764d380849a0e7a136297835562c URL: http://source.winehq.org/git/website.git/?a=commit;h=d2118b287a56764d380849… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 26 16:46:21 2014 +0200 Add WWN 368 --- news/de/2014042501.xml | 11 + news/en/2014042501.xml | 11 + wwn/en/wn20140425_368.xml | 715 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 737 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d2118b287a56764d38…

1 0

Stefan Dösinger : ddraw/tests: Add a test for mipmap palettes.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: e2bf5163ecf2f56f58993bac7f8ca1abc0db0324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bf5163ecf2f56f58993bac7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 14:36:10 2014 +0200 ddraw/tests: Add a test for mipmap palettes. --- dlls/ddraw/tests/ddraw1.c | 98 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 102 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 98 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 420 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2bf5163ecf2f56f58993…

1 0

Vincent Povirk : appwiz.cpl: Don' t use SEE_MASK_NO_CONSOLE to run installers.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 71d5e6f4a69147544b15494de0875705e3aebb46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d5e6f4a69147544b15494de… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 22 12:52:10 2014 -0500 appwiz.cpl: Don't use SEE_MASK_NO_CONSOLE to run installers. --- dlls/appwiz.cpl/appwiz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 1e092b1..cd76f51 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -477,7 +477,7 @@ static void InstallProgram(HWND hWnd) sei.cbSize = sizeof(sei); sei.lpVerb = openW; sei.nShow = SW_SHOWDEFAULT; - sei.fMask = SEE_MASK_NO_CONSOLE; + sei.fMask = 0; sei.lpFile = ofn.lpstrFile; ShellExecuteExW(&sei);

1 0

Nikolay Sivov : crypt32/tests: Fix some leaks (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: fc8bf3c3b632cad603f980b05c04d8384c0d65ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8bf3c3b632cad603f980b05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 12:34:06 2014 +0400 crypt32/tests: Fix some leaks (Valgrind). --- dlls/crypt32/tests/cert.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 9c95629..66f13db 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -797,7 +797,7 @@ static void testLinkCert(void) ok(link->pCertInfo == context->pCertInfo, "unexpected pCertInfo\n"); CertFreeCertificateContext(link); - + CertFreeCertificateContext(context); CertCloseStore(store, 0); } @@ -2343,6 +2343,7 @@ static void testCreateSelfSignCert(void) "Expected NTE_NO_KEY, got %08x\n", GetLastError()); ret = CryptGenKey(csp, AT_KEYEXCHANGE, 0, &key); ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); + CryptDestroyKey(key); memset(&info,0,sizeof(info)); info.dwProvType = PROV_RSA_FULL;

1 0