June 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Remove "view_type" from " wined3d_shader_resource_view_desc".
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 424532c5bd78b9861ea8aa653e6bae8015dfc778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424532c5bd78b9861ea8aa653… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 7 13:24:36 2016 +0200 wined3d: Remove "view_type" from "wined3d_shader_resource_view_desc". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 20 +++++++------------- include/wine/wined3d.h | 21 +++++++-------------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 2b1be6a..7bec5b9 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1674,18 +1674,16 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); + wined3d_desc->flags = 0; switch (desc->ViewDimension) { case D3D11_SRV_DIMENSION_BUFFER: - wined3d_desc->view_type = WINED3D_VTYPE_BUFFER; wined3d_desc->u.buffer.start_idx = desc->u.Buffer.u1.FirstElement; wined3d_desc->u.buffer.count = desc->u.Buffer.u2.NumElements; - wined3d_desc->u.buffer.flags = 0; break; case D3D11_SRV_DIMENSION_TEXTURE1D: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_1D; wined3d_desc->u.texture.level_idx = desc->u.Texture1D.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture1D.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1693,7 +1691,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE1DARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_1D_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = desc->u.Texture1DArray.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture1DArray.MipLevels; wined3d_desc->u.texture.layer_idx = desc->u.Texture1DArray.FirstArraySlice; @@ -1701,7 +1699,6 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2D: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D; wined3d_desc->u.texture.level_idx = desc->u.Texture2D.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture2D.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1709,7 +1706,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2DARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = desc->u.Texture2DArray.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture2DArray.MipLevels; wined3d_desc->u.texture.layer_idx = desc->u.Texture2DArray.FirstArraySlice; @@ -1717,7 +1714,6 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2DMS: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D; wined3d_desc->u.texture.level_idx = 0; wined3d_desc->u.texture.level_count = 1; wined3d_desc->u.texture.layer_idx = 0; @@ -1725,7 +1721,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = 0; wined3d_desc->u.texture.level_count = 1; wined3d_desc->u.texture.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; @@ -1733,7 +1729,6 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE3D: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_3D; wined3d_desc->u.texture.level_idx = desc->u.Texture3D.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture3D.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1741,7 +1736,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURECUBE: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_CUBE; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_CUBE; wined3d_desc->u.texture.level_idx = desc->u.TextureCube.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.TextureCube.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1749,7 +1744,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURECUBEARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_CUBE_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_CUBE | WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = desc->u.TextureCubeArray.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.TextureCubeArray.MipLevels; wined3d_desc->u.texture.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; @@ -1757,10 +1752,9 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_BUFFEREX: - wined3d_desc->view_type = WINED3D_VTYPE_BUFFER; + wined3d_desc->flags = desc->u.BufferEx.Flags; wined3d_desc->u.buffer.start_idx = desc->u.BufferEx.FirstElement; wined3d_desc->u.buffer.count = desc->u.BufferEx.NumElements; - wined3d_desc->u.buffer.flags = desc->u.BufferEx.Flags; break; default: diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3ca9eeb..5ca03d7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -665,18 +665,6 @@ enum wined3d_resource_type WINED3D_RTYPE_TEXTURE_3D = 3, }; -enum wined3d_view_type -{ - WINED3D_VTYPE_BUFFER = 1, - WINED3D_VTYPE_TEXTURE_1D = 2, - WINED3D_VTYPE_TEXTURE_1D_ARRAY = 3, - WINED3D_VTYPE_TEXTURE_2D = 4, - WINED3D_VTYPE_TEXTURE_2D_ARRAY = 5, - WINED3D_VTYPE_TEXTURE_3D = 6, - WINED3D_VTYPE_TEXTURE_CUBE = 7, - WINED3D_VTYPE_TEXTURE_CUBE_ARRAY = 8, -}; - enum wined3d_pool { WINED3D_POOL_DEFAULT = 0, @@ -1495,6 +1483,12 @@ enum wined3d_display_rotation #define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff #define WINED3D_OUTPUT_SLOT_UNUSED 0xfffffffe +#define WINED3D_VIEW_BUFFER_RAW 0x00000001 +#define WINED3D_VIEW_BUFFER_APPEND 0x00000002 +#define WINED3D_VIEW_BUFFER_COUNTER 0x00000004 +#define WINED3D_VIEW_TEXTURE_CUBE 0x00000008 +#define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 + struct wined3d_display_mode { UINT width; @@ -1957,14 +1951,13 @@ struct wined3d_shader_desc struct wined3d_shader_resource_view_desc { enum wined3d_format_id format_id; - enum wined3d_view_type view_type; + unsigned int flags; union { struct { unsigned int start_idx; unsigned int count; - unsigned int flags; } buffer; struct {

1 0

Józef Kucia : wined3d: Create texture views for shader resource views.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: e86693f95676c5358dba0f5c446c0c88bab42244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86693f95676c5358dba0f5c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 7 13:24:39 2016 +0200 wined3d: Create texture views for shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 +-- dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 164 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 7 ++ 4 files changed, 168 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e86693f95676c5358dba0…

1 0

Zhenbo Li : winegstreamer: Remove a condition which is always true.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 0c0c86a8c7c93e7edbca8a7840c945f4159c3059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0c86a8c7c93e7edbca8a784… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jun 7 20:12:22 2016 +0800 winegstreamer: Remove a condition which is always true. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 92804e3..1de9b41 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1962,8 +1962,9 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, props.cbAlign = 1; props.cbPrefix = 0; - if (SUCCEEDED(hr) && IPin_QueryAccept(iface, pmt) != S_OK) + if (IPin_QueryAccept(iface, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; + if (SUCCEEDED(hr)) { IPin_QueryDirection(pReceivePin, &pindirReceive); if (pindirReceive != PINDIR_OUTPUT) {

1 0

Henri Verbeet : usp10/tests: Add an itemisation test for Persian numerals and punctuation.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: fd5860d2f2e6dfd90d6febf998770236bc8a7cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5860d2f2e6dfd90d6febf99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 20:05:25 2016 +0200 usp10/tests: Add an itemisation test for Persian numerals and punctuation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d0c698f..cf05ed8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -568,6 +568,26 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, static const itemTest t561[] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; static const itemTest t562[] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + /* Persian numerals and punctuation. */ + static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c, /* ۱۲٬۳۴۵٬ */ + 0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0}; /* ۶۷۸٫۹۰ */ + static const itemTest t571[] = {{{0,1,0,1,1,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,1,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,1,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,1,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t572[] = {{{0,0,0,1,1,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,1,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,1,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,1,0},11,0,0,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t573[] = {{{0,0,0,0,1,0}, 0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,1,0}, 3,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,1,0}, 7,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,1,0},11,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t574[] = {{{0,0,1,0,1,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,1,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,1,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,1,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -649,6 +669,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); test_items_ok(test47,26,NULL,NULL,1,t471,FALSE,0); test_items_ok(test56,6,NULL,NULL,1,t561,FALSE,0); + test_items_ok(test57,13,NULL,NULL,7,t571,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -712,6 +733,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test54,7,&Control,&State,2,t541,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t551,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t572,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -767,6 +789,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -823,6 +846,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0); State.uBidiLevel = 0; Control.fMergeNeutralItems = FALSE; @@ -888,6 +912,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test54,7,&Control,&State,2,t542,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t552,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t562,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t573,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,

1 0

Michael Stefaniuc : shell32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 33f145acc39c90988c4573d77ff7fe88b92e074d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f145acc39c90988c4573d77… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:46:50 2016 +0200 shell32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/appbar.c | 5 ++--- dlls/shell32/tests/ebrowser.c | 12 ++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index ca72f3f..dbac4e6 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -196,9 +196,8 @@ static void register_testwindow_class(void) #define test_window_rects(a, b) \ ok(!IntersectRect(&rc, &windows[a].allocated_rect, &windows[b].allocated_rect), \ - "rectangles intersect (%i,%i,%i,%i)/(%i,%i,%i,%i)\n", \ - windows[a].allocated_rect.left, windows[a].allocated_rect.top, windows[a].allocated_rect.right, windows[a].allocated_rect.bottom, \ - windows[b].allocated_rect.left, windows[b].allocated_rect.top, windows[b].allocated_rect.right, windows[b].allocated_rect.bottom) + "rectangles intersect %s / %s\n", wine_dbgstr_rect(&windows[a].allocated_rect), \ + wine_dbgstr_rect(&windows[b].allocated_rect)) static void test_setpos(void) { diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 57f52c9..56d20dc 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -818,8 +818,7 @@ static void test_initialization(void) ok(hr == S_OK, "Got 0x%08x\n", hr); GetClientRect(eb_hwnd, &eb_rc); - ok(EqualRect(&eb_rc, &exp_rc), "Got client rect (%d, %d)-(%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc), "Got client rect %s\n", wine_dbgstr_rect(&eb_rc)); GetWindowRect(eb_hwnd, &eb_rc); ok(eb_rc.right - eb_rc.left == 50, "Got window width %d\n", eb_rc.right - eb_rc.left); @@ -1142,8 +1141,7 @@ static void test_basics(void) GetClientRect(eb_hwnd, &eb_rc); MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); - ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect %s\n", wine_dbgstr_rect(&eb_rc)); /* Try resizing with invalid hdwp */ rc.bottom = 25; @@ -1152,16 +1150,14 @@ static void test_basics(void) ok(hr == E_FAIL, "Got 0x%08x\n", hr); GetClientRect(eb_hwnd, &eb_rc); MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); - ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect %s\n", wine_dbgstr_rect(&eb_rc)); hdwp = NULL; hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); ok(hr == S_OK, "Got 0x%08x\n", hr); GetClientRect(eb_hwnd, &eb_rc); MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); - ok(EqualRect(&eb_rc, &exp_rc2), "Got rect (%d, %d) - (%d, %d)\n", - eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + ok(EqualRect(&eb_rc, &exp_rc2), "Got rect %s\n", wine_dbgstr_rect(&eb_rc)); IShellBrowser_Release(psb); }

1 0

Michael Stefaniuc : include: Make wine_dbgstr_rect() available for tests too.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 636340ce34e1ef7996eb48c8717b3bdb39dcdc8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=636340ce34e1ef7996eb48c87… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:45:40 2016 +0200 include: Make wine_dbgstr_rect() available for tests too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 0d81a24..f33ab9a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -66,6 +66,7 @@ extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); extern const char *wine_dbgstr_guid( const GUID *guid ); +extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -529,6 +530,17 @@ const char *wine_dbgstr_guid( const GUID *guid ) return res; } +const char *wine_dbgstr_rect( const RECT *rect ) +{ + char *res; + + if (!rect) return "(null)"; + res = get_temp_buffer( 60 ); + sprintf( res, "(%d,%d)-(%d,%d)", rect->left, rect->top, rect->right, rect->bottom ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Andreas Maier : msi/tests: Delete TestService after testing.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 62eb31d8521fe6533b54e57210c8dc75a44cd4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62eb31d8521fe6533b54e5721… Author: Andreas Maier <andy1.m(a)gmx.de> Date: Mon Jun 6 23:35:16 2016 +0200 msi/tests: Delete TestService after testing. Signed-off-by: Andreas Maier <andy1.m(a)gmx.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 243e61b..fe7f9a2 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5427,6 +5427,30 @@ static void test_start_stop_services(void) DeleteFileA(msifile); } +static void delete_TestService(void) +{ + BOOL ret; + SC_HANDLE manager, service; + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) + return; + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService doesn't exist\n"); + + if (service) + { + ret = DeleteService( service ); + ok( ret, "failed to delete service %u\n", GetLastError() ); + + CloseServiceHandle(service); + } + CloseServiceHandle(manager); + +} + static void test_delete_services(void) { UINT r; @@ -5492,6 +5516,7 @@ static void test_delete_services(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: + delete_TestService(); delete_test_files(); DeleteFileA(msifile); } @@ -5500,7 +5525,9 @@ static void test_install_services(void) { UINT r; SC_HANDLE manager, service; - BOOL ret; + LONG res; + HKEY hKey; + DWORD err_control, err_controlsize, err_controltype; if (is_process_limited()) { @@ -5550,20 +5577,8 @@ static void test_install_services(void) ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); - ok(manager != NULL, "can't open service manager\n"); - if (!manager) goto error; - - service = OpenServiceA(manager, "TestService", GENERIC_ALL); - ok(service != NULL, "TestService doesn't exist\n"); - - ret = DeleteService( service ); - ok( ret, "failed to delete service %u\n", GetLastError() ); - - CloseServiceHandle(service); - CloseServiceHandle(manager); - error: + delete_TestService(); delete_test_files(); DeleteFileA(msifile); }

1 0

Vincent Povirk : gdiplus: Return visible clip bounds in world coordinates.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: be5b27069058821e442be0f7466ecb80aa0a8dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5b27069058821e442be0f74… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 16:00:50 2016 -0500 gdiplus: Return visible clip bounds in world coordinates. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 ++++++++ dlls/gdiplus/tests/graphics.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index dac52ef..8353809 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4297,6 +4297,7 @@ GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics *graphics, GpRectF *rect { GpRegion *clip_rgn; GpStatus stat; + GpMatrix device_to_world; TRACE("(%p, %p)\n", graphics, rect); @@ -4313,6 +4314,13 @@ GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics *graphics, GpRectF *rect if((stat = get_visible_clip_region(graphics, clip_rgn)) != Ok) goto cleanup; + /* transform to world coordinates */ + if((stat = get_graphics_transform(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &device_to_world)) != Ok) + goto cleanup; + + if((stat = GdipTransformRegion(clip_rgn, &device_to_world)) != Ok) + goto cleanup; + /* get bounds of the region */ stat = GdipGetRegionBounds(clip_rgn, graphics, rect); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 3ee3363..cf5652b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2313,6 +2313,29 @@ static void test_GdipGetVisibleClipBounds_window(void) recti.X, recti.Y, recti.Width, recti.Height, exp.X, exp.Y, exp.Width, exp.Height); + /* window bounds with transform applied */ + status = GdipResetClip(graphics); + expect(Ok, status); + + status = GdipScaleWorldTransform(graphics, 0.5, 0.5, MatrixOrderPrepend); + expect(Ok, status); + + exp.X = window.X * 2.0; + exp.Y = window.Y * 2.0; + exp.Width = window.Width * 2.0; + exp.Height = window.Height * 2.0; + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + ok(rectf.X == exp.X && + rectf.Y == exp.Y && + rectf.Width == exp.Width && + rectf.Height == exp.Height, + "Expected clip bounds (%0.f, %0.f, %0.f, %0.f) to be " + "twice the window size (%0.f, %0.f, %0.f, %0.f)\n", + rectf.X, rectf.Y, rectf.Width, rectf.Height, + exp.X, exp.Y, exp.Width, exp.Height); + GdipDeleteGraphics(graphics); EndPaint(hwnd, &ps); }

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontFace3:: GetRecommendedRenderingMode().
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 69caad4469800b37684a4c825a9a04f623bffd75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69caad4469800b37684a4c825… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 6 20:31:30 2016 +0300 dwrite: Implement IDWriteFontFace3::GetRecommendedRenderingMode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 58 +++++++++++++++++++++++++++--- dlls/dwrite/tests/font.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 142 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69caad4469800b37684a4…

1 0

Michael Stefaniuc : dxgi/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 389c86c8c1c27a7ddb3eb1e551640515be1c0230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389c86c8c1c27a7ddb3eb1e55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:49:25 2016 +0200 dxgi/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 5808b64..3c43895 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -649,11 +649,9 @@ static void test_get_containing_output(void) wine_dbgstr_w(output_desc.DeviceName), wine_dbgstr_w(output_desc2.DeviceName)); ok(!memcmp(&output_desc.DesktopCoordinates, &output_desc2.DesktopCoordinates, sizeof(output_desc.DesktopCoordinates)), - "Got unexpected desktop coordinates {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, - output_desc.DesktopCoordinates.right, output_desc.DesktopCoordinates.bottom, - output_desc2.DesktopCoordinates.left, output_desc2.DesktopCoordinates.top, - output_desc2.DesktopCoordinates.right, output_desc2.DesktopCoordinates.bottom); + "Got unexpected desktop coordinates %s, expected %s.\n", + wine_dbgstr_rect(&output_desc.DesktopCoordinates), + wine_dbgstr_rect(&output_desc2.DesktopCoordinates)); refcount = IDXGIOutput_Release(output2); ok(!refcount, "IDXGIOuput has %u references left.\n", refcount); @@ -932,9 +930,8 @@ static void test_swapchain_resize(void) ret = GetClientRect(window, &r); ok(ret, "Failed to get client rect.\n"); - ok(EqualRect(&r, &client_rect), "Got unexpected rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - r.left, r.top, r.right, r.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", + wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); @@ -997,9 +994,8 @@ static void test_swapchain_resize(void) ret = GetClientRect(window, &r); ok(ret, "Failed to get client rect.\n"); - ok(EqualRect(&r, &client_rect), "Got unexpected rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - r.left, r.top, r.right, r.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", + wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); @@ -1068,9 +1064,8 @@ static void test_swapchain_resize(void) ret = GetClientRect(window, &r); ok(ret, "Failed to get client rect.\n"); - ok(EqualRect(&r, &client_rect), "Got unexpected rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - r.left, r.top, r.right, r.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", + wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); @@ -1493,11 +1488,9 @@ static void test_output_desc(void) ok(!lstrcmpW(desc.DeviceName, monitor_info.szDevice), "Got unexpected device name %s, expected %s.\n", wine_dbgstr_w(desc.DeviceName), wine_dbgstr_w(monitor_info.szDevice)); ok(!memcmp(&desc.DesktopCoordinates, &monitor_info.rcMonitor, sizeof(desc.DesktopCoordinates)), - "Got unexpected desktop coordinates {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - desc.DesktopCoordinates.left, desc.DesktopCoordinates.top, - desc.DesktopCoordinates.right, desc.DesktopCoordinates.bottom, - monitor_info.rcMonitor.left, monitor_info.rcMonitor.top, - monitor_info.rcMonitor.right, monitor_info.rcMonitor.bottom); + "Got unexpected desktop coordinates %s, expected %s.\n", + wine_dbgstr_rect(&desc.DesktopCoordinates), + wine_dbgstr_rect(&monitor_info.rcMonitor)); IDXGIOutput_Release(output); refcount = get_refcount((IUnknown *)adapter);

1 0