wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Huw Davies : user32/tests: On Win 8 and later, moving a window off-screen doesn't crop its update region.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 5942625a003f5f01a31b05561ca91d9f2fc1b486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5942625a003f5f01a31b05561… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 5 10:45:12 2016 +0100 user32/tests: On Win 8 and later, moving a window off-screen doesn't crop its update region. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d4ca828..72614eb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6644,7 +6644,7 @@ static const struct message WmSetParentStyle[] = { static void test_paint_messages(void) { BOOL ret; - RECT rect; + RECT rect, rect2; POINT pt; MSG msg; HWND hparent, hchild; @@ -7184,15 +7184,21 @@ static void test_paint_messages(void) SetRectRgn( hrgn, 10, 10, 40, 40 ); check_update_rgn( hchild, hrgn ); MoveWindow( hparent, -20, -20, 200, 200, FALSE ); - SetRectRgn( hrgn, 20, 20, 100, 100 ); + GetUpdateRect( hparent, &rect2, FALSE ); + if (!EqualRect( &rect2, &rect )) /* Win 8 and later don't crop update to screen */ + { + rect.left += 20; + rect.top += 20; + } + SetRectRgn( hrgn, rect.left, rect.top, rect.right, rect.bottom ); check_update_rgn( hparent, hrgn ); - SetRectRgn( hrgn, 30, 30, 40, 40 ); + SetRectRgn( hrgn, rect.left + 10, rect.top + 10, 40, 40 ); check_update_rgn( hchild, hrgn ); /* invalidated region is cropped by the parent rects */ SetRect( &rect, 0, 0, 50, 50 ); RedrawWindow( hchild, &rect, 0, RDW_INVALIDATE | RDW_ERASE ); - SetRectRgn( hrgn, 30, 30, 50, 50 ); + SetRectRgn( hrgn, rect2.left + 10, rect2.top + 10, 50, 50 ); check_update_rgn( hchild, hrgn ); DestroyWindow( hparent );

1 0

Huw Davies : user32/tests: ValidateRect(NULL, &rect) on >= Win 8 no longer invalidates all windows.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 1c70de2a340640a85eda21ce7987f36ec43bb435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c70de2a340640a85eda21ce7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 5 10:45:11 2016 +0100 user32/tests: ValidateRect(NULL, &rect) on >= Win 8 no longer invalidates all windows. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ebd1c45..d4ca828 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6709,7 +6709,8 @@ static void test_paint_messages(void) */ trace("testing ValidateRect(0, NULL)\n"); SetRectEmpty( &rect ); - if (ValidateRect(0, &rect)) /* not supported on Win9x */ + if (ValidateRect(0, &rect) && /* not supported on Win9x */ + GetUpdateRect(hwnd, NULL, FALSE)) /* or >= Win 8 */ { check_update_rgn( hwnd, hrgn ); ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE );

1 0

Henri Verbeet : d3drm/tests: Fix some reference leaks.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: f41db1a1637b4b5aff9bcf0dd75ae45305690177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41db1a1637b4b5aff9bcf0dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 12:50:15 2016 +0200 d3drm/tests: Fix some reference leaks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0d92823..85af6d2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6273,6 +6273,7 @@ static void test_viewport_clear1(void) IDirect3DRMDevice_Release(device1); IDirect3DRM_Release(d3drm1); IDirectDrawClipper_Release(clipper); + IDirectDraw_Release(ddraw); DestroyWindow(window); } @@ -6518,10 +6519,9 @@ static void test_viewport_clear2(void) ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); IDirectDrawSurface_Release(surface); + IDirect3DRMViewport2_Release(viewport2); IDirect3DRMDevice3_Release(device3); IDirect3DDevice2_Release(d3d_device2); - IDirect3D2_Release(d3d2); - IDirectDraw2_Release(ddraw2); cleanup: IDirect3DRMFrame3_Release(camera3); @@ -6529,6 +6529,9 @@ cleanup: IDirect3DRM3_Release(d3drm3); IDirect3DRM_Release(d3drm1); IDirectDrawClipper_Release(clipper); + IDirect3D2_Release(d3d2); + IDirectDraw2_Release(ddraw2); + IDirectDraw_Release(ddraw1); DestroyWindow(window); }

1 0

Jacek Caban : msctf: Added IID_ITfThreadFocusSink support to AdviseSink.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 63859e382f499828ef9d96d3d06bc2c3f7e52b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63859e382f499828ef9d96d3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 13:57:54 2016 +0200 msctf: Added IID_ITfThreadFocusSink support to AdviseSink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 528414f..aa838da 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -615,6 +615,12 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, if (IsEqualIID(riid, &IID_ITfThreadMgrEventSink)) return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + if (IsEqualIID(riid, &IID_ITfThreadFocusSink)) + { + WARN("semi-stub for ITfThreadFocusSink: sink won't be used.\n"); + return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + } + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; }

1 0

Sebastian Lackner : jscript: Fix definition of JSSTR_MAX_LENGTH.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: d36ae568c186a9eee944ddf191b2c42088f0d59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36ae568c186a9eee944ddf19… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 5 16:55:57 2016 +0200 jscript: Fix definition of JSSTR_MAX_LENGTH. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 48fa2be..a14acc3 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -39,7 +39,7 @@ struct _jsstr_t { }; #define JSSTR_LENGTH_SHIFT 4 -#define JSSTR_MAX_LENGTH (1 << (32-JSSTR_LENGTH_SHIFT)) +#define JSSTR_MAX_LENGTH ((1 << (32-JSSTR_LENGTH_SHIFT))-1) #define JSSTR_FLAGS_MASK ((1 << JSSTR_LENGTH_SHIFT)-1) #define JSSTR_FLAG_LBIT 1

1 0

Sebastian Lackner : jscript: Simplify jsstr_release implementation.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 736983632316d2b0dc426add0789e150792f0ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736983632316d2b0dc426add0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 5 16:47:02 2016 +0200 jscript: Simplify jsstr_release implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsstr.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 2ad03f1..48fa2be 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -106,12 +106,8 @@ void jsstr_free(jsstr_t*) DECLSPEC_HIDDEN; static inline void jsstr_release(jsstr_t *str) { - if(!--str->ref) { - if(jsstr_is_inline(str)) - heap_free(str); - else - jsstr_free(str); - } + if(!--str->ref) + jsstr_free(str); } static inline jsstr_t *jsstr_addref(jsstr_t *str)

1 0

Nikolay Sivov : d2d1/tests: A DC target test for switching from one HDC to another.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 35bab5ce643773226393c8164737b078669f5861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bab5ce643773226393c8164… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 15:02:01 2016 +0300 d2d1/tests: A DC target test for switching from one HDC to another. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in index 28b741f..91ede78 100644 --- a/dlls/d2d1/tests/Makefile.in +++ b/dlls/d2d1/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d2d1.dll -IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 +IMPORTS = d2d1 d3d10_1 dwrite dxguid uuid user32 advapi32 ole32 gdi32 C_SRCS = \ d2d1.c diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7f9632f..dbbe7d0 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2626,6 +2626,26 @@ todo_wine DestroyWindow(window); } +static void create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) +{ + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; + HBITMAP hbm; + + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = -height; + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + hbm = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(hbm != NULL, "Failed to create a dib section.\n"); + + DeleteObject(SelectObject(hdc, hbm)); +} + static void test_dc_target(void) { static const D2D1_PIXEL_FORMAT invalid_formats[] = @@ -2641,7 +2661,11 @@ static void test_dc_target(void) D2D1_COLOR_F color; D2D1_SIZE_F size; unsigned int i; + HDC hdc, hdc2; + COLORREF clr; HRESULT hr; + RECT rect; + D2D_RECT_F r; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -2687,6 +2711,76 @@ if (SUCCEEDED(hr)) ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); ID2D1DCRenderTarget_Release(rt); + + /* BindDC() */ + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc, 16, 16); + + SetRect(&rect, 0, 0, 32, 32); + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect); + ok(hr == S_OK, "BindDC() returned %#x.\n", hr); + + /* target size comes from specified dimensions, not from selected bitmap size */ + size = ID2D1DCRenderTarget_GetSize(rt); + ok(size.width == 32.0f, "got width %.08e.\n", size.width); + ok(size.height == 32.0f, "got height %.08e.\n", size.height); + + /* clear one HDC to red, switch to another one, partially fill it and test contents */ + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc, 0, 0); + ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + + hdc2 = CreateCompatibleDC(NULL); + ok(hdc2 != NULL, "Failed to create an HDC.\n"); + + create_target_dibsection(hdc2, 16, 16); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc2, &rect); + ok(hr == S_OK, "BindDC() returned %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); + ok(clr == 0, "Got color %#x\n", clr); + + set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); + hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + r.left = r.top = 0.0f; + r.bottom = 16.0f; + r.right = 8.0f; + ID2D1DCRenderTarget_FillRectangle(rt, &r, (ID2D1Brush*)brush); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + ID2D1SolidColorBrush_Release(brush); + + clr = GetPixel(hdc2, 0, 0); + ok(clr == RGB(0, 255, 0), "Got color %#x\n", clr); + + clr = GetPixel(hdc2, 10, 0); + ok(clr == 0, "Got color %#x\n", clr); + + DeleteDC(hdc); + DeleteDC(hdc2); + ID2D1DCRenderTarget_Release(rt); } ID2D1Factory_Release(factory); }

1 0

Jacek Caban : dbghelp: Removed no longer needed wine_rb_destroy call.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: b15cccd2dc206aab25db6f1b9a28334b0fe09945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15cccd2dc206aab25db6f1b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 2 22:08:39 2016 +0200 dbghelp: Removed no longer needed wine_rb_destroy call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 55f123a..9df02df 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -679,7 +679,6 @@ BOOL module_remove(struct process* pcs, struct module* module) } hash_table_destroy(&module->ht_symbols); hash_table_destroy(&module->ht_types); - wine_rb_destroy(&module->sources_offsets_tree, NULL, NULL); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); pool_destroy(&module->pool);

1 0

Michael Stefaniuc : mshtml: Avoid using the COM method implementations directly.
by Alexandre Julliard 06 Sep '16

06 Sep '16

Module: wine Branch: master Commit: 0793d01d1c6e29eeaa1e9b2cccce04b4c8547308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0793d01d1c6e29eeaa1e9b2cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 2 13:36:19 2016 +0200 mshtml: Avoid using the COM method implementations directly. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2b79226..407de0c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -524,7 +524,7 @@ static HRESULT WINAPI HTMLWindow2_get_frames(IHTMLWindow2 *iface, IHTMLFramesCol /* FIXME: Should return a separate Window object */ *p = (IHTMLFramesCollection2*)&This->IHTMLWindow2_iface; - HTMLWindow2_AddRef(iface); + IHTMLWindow2_AddRef(iface); return S_OK; }

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 06 Sep '16

06 Sep '16

Module: website Branch: master Commit: 9fdd33e64f8ee2d52ae38cdc2c1e5e8927030f41 URL: http://source.winehq.org/git/website.git/?a=commit;h=9fdd33e64f8ee2d52ae38c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 6 10:39:09 2016 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2016