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

Michael Stefaniuc : user32/tests: Use SetRect instead of open coding it.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 4ee81394878f5917f9484a4ce0952aa07f866c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee81394878f5917f9484a4ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 18 10:12:23 2016 +0200 user32/tests: Use SetRect instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 11 ++--------- dlls/user32/tests/sysparams.c | 5 +---- dlls/user32/tests/uitools.c | 3 +-- dlls/user32/tests/win.c | 6 +++--- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 6ff7225..c9e31f7 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -574,11 +574,7 @@ static HWND create_child_editcontrol (DWORD style, DWORD exstyle) HWND editWnd; RECT rect; BOOL b; - - rect.left = 0; - rect.top = 0; - rect.right = 300; - rect.bottom = 300; + SetRect(&rect, 0, 0, 300, 300); b = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); ok(b, "AdjustWindowRect failed\n"); @@ -1468,10 +1464,7 @@ static void test_margins(void) the rectangle must not change */ SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); - old_rect.left = 1; - old_rect.right = 99; - old_rect.top = 1; - old_rect.bottom = 99; + SetRect(&old_rect, 1, 1, 99, 99); SendMessageA(hwEdit, EM_SETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index cffc815..075a0c7 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1835,10 +1835,7 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ * Changing the work area by just one pixel should make this occurrence * reasonably unlikely. */ - curr_val.left = old_area.left; - curr_val.top = old_area.top; - curr_val.right = old_area.right-1; - curr_val.bottom = old_area.bottom-1; + SetRect(&curr_val, old_area.left, old_area.top, old_area.right - 1, old_area.bottom - 1); rc=SystemParametersInfoA( SPI_SETWORKAREA, 0, &curr_val, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); if (!test_error_msg(rc,"SPI_SETWORKAREA")) return; diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 5f10b00..e1ddf2b 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -49,8 +49,7 @@ static void test_FillRect(void) /* select black brush */ old_brush = SelectObject(hdcmem, GetStockObject(BLACK_BRUSH)); - r.left = r.top = 0; - r.right = r.bottom = 5; + SetRect(&r, 0, 0, 5, 5); FillRect(hdcmem, &r, 0); SelectObject(hdcmem, old_brush); /* bitmap filled with last selected brush */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dd5f967..673b9b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7578,7 +7578,7 @@ static void test_winregion(void) ok( ret == ERROR, "Expected ERROR, got %d\n", ret); ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); ret = pGetWindowRgnBox(hwnd, &r); ok( ret == SIMPLEREGION, "Expected SIMPLEREGION, got %d\n", ret); ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, @@ -7589,10 +7589,10 @@ static void test_winregion(void) hrgn = CreateRectRgn(2, 3, 10, 15); ret = pMirrorRgn( hwnd, hrgn ); ok( ret == TRUE, "MirrorRgn failed %u\n", ret ); - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); GetWindowRect( hwnd, &r ); width = r.right - r.left; - r.left = r.top = r.right = r.bottom = 0; + SetRectEmpty(&r); ret = GetRgnBox( hrgn, &r ); ok( ret == SIMPLEREGION, "GetRgnBox failed %u\n", ret ); ok( r.left == width - 10 && r.top == 3 && r.right == width - 2 && r.bottom == 15,

1 0

Piotr Caban : riched20/tests: Add negative indentation display test.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: d11c758faf187e9ae52872526a7474ebd4a9795d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11c758faf187e9ae52872526… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 18 15:14:33 2016 +0200 riched20/tests: Add negative indentation display test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c6444ff..5f4cc05 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -601,6 +601,7 @@ static void test_EM_POSFROMCHAR(void) POINTL pt; LOCALESIGNATURE sig; BOOL rtl; + PARAFORMAT2 fmt; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -727,6 +728,18 @@ static void test_EM_POSFROMCHAR(void) SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, -1); ok(pt.x == 1, "pt.x = %d\n", pt.x); + /* test negative indentation */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, + (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); + SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); + todo_wine ok(pt.x == 1, "pt.x = %d\n", pt.x); + + fmt.cbSize = sizeof(fmt); + SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); + ok(fmt.dxStartIndent == -400, "got %d\n", fmt.dxStartIndent); + ok(fmt.dxOffset == 200, "got %d\n", fmt.dxOffset); + ok(fmt.wAlignment == PFA_LEFT, "got %d\n", fmt.wAlignment); + DestroyWindow(hwndRichEdit); }

1 0

Piotr Caban : riched20: Don' t allow negative margins in ME_WrapTextParagraph.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 3dbd46716299883761be9c4c4173a5f0402b2f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbd46716299883761be9c4c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 18 15:14:39 2016 +0200 riched20: Don't allow negative margins in ME_WrapTextParagraph. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/wrap.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5f4cc05..ae9c0a5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -732,7 +732,7 @@ static void test_EM_POSFROMCHAR(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"{\\rtf1\\pard\\fi-200\\li-200\\f1 TestSomeText\\par}"); SendMessageA(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, 0); - todo_wine ok(pt.x == 1, "pt.x = %d\n", pt.x); + ok(pt.x == 1, "pt.x = %d\n", pt.x); fmt.cbSize = sizeof(fmt); SendMessageA(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 49a62ce..b488bf1 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -879,6 +879,11 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, pFmt->dxOffset); wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); + + if (wc.nFirstMargin < 0) + wc.nFirstMargin = 0; + if (wc.nLeftMargin < 0) + wc.nLeftMargin = 0; } if (c->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE)

1 0

Stefan Dösinger : wined3d: Get rid of WINED3D_BUFFER_FLUSH.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: d3f8efe5465f2217aaac075845d342e85cba18fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f8efe5465f2217aaac07584… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 17 19:07:54 2016 +0200 wined3d: Get rid of WINED3D_BUFFER_FLUSH. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bf2e58d..ce4d9d7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -32,10 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ -#define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ -#define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ -#define WINED3D_BUFFER_SYNC 0x20 /* There has been at least one synchronized map since the last preload. */ -#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ +#define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ +#define WINED3D_BUFFER_SYNC 0x10 /* There has been at least one synchronized map since the last preload. */ +#define WINED3D_BUFFER_APPLESYNC 0x20 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -176,8 +175,6 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine { GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); - This->flags |= WINED3D_BUFFER_FLUSH; - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)"); This->flags |= WINED3D_BUFFER_APPLESYNC; @@ -709,7 +706,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined GL_EXTCALL(glFlushMappedBufferRange(This->buffer_type_hint, start, len)); checkGLcall("glFlushMappedBufferRange"); } - else if (This->flags & WINED3D_BUFFER_FLUSH) + else if (This->flags & WINED3D_BUFFER_APPLESYNC) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, start, len)); checkGLcall("glFlushMappedBufferRangeAPPLE"); @@ -1093,7 +1090,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) checkGLcall("glFlushMappedBufferRange"); } } - else if (buffer->flags & WINED3D_BUFFER_FLUSH) + else if (buffer->flags & WINED3D_BUFFER_APPLESYNC) { for (i = 0; i < buffer->modified_areas; ++i) {

1 0

Alistair Leslie-Hughes : d3d11: Support NULL views in d3d10_device_ClearDepthStencilView().
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 75ef613e82afdc4a11b0318efe5769b4865a9792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ef613e82afdc4a11b0318ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 17 19:07:55 2016 +0200 d3d11: Support NULL views in d3d10_device_ClearDepthStencilView(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 12 ++++++++++++ dlls/d3d11/device.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6978c26..ea9845c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -22,6 +22,8 @@ #include "wine/test.h" #include <limits.h> +static BOOL d3d11_available; + struct vec2 { float x, y; @@ -478,6 +480,8 @@ static void test_feature_level(void) return; } + d3d11_available = TRUE; + /* Device was created by D3D10CreateDevice. */ feature_level = ID3D11Device_GetFeatureLevel(device11); ok(feature_level == D3D_FEATURE_LEVEL_10_0, "Got unexpected feature level %#x.\n", feature_level); @@ -6222,6 +6226,14 @@ static void test_clear_depth_stencil_view(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0); check_texture_color(depth_texture, 0x00000000, 0); + if (d3d11_available) + { + ID3D10Device_ClearDepthStencilView(device, NULL, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0xff); + check_texture_color(depth_texture, 0x00000000, 0); + } + else + win_skip("D3D11 is not available, skipping test.\n"); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0xff); todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9144438..4a83882 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3463,6 +3463,9 @@ static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 * TRACE("iface %p, depth_stencil_view %p, flags %#x, depth %.8e, stencil %u.\n", iface, depth_stencil_view, flags, depth, stencil); + if (!view) + return; + wined3d_flags = wined3d_clear_flags_from_d3d11_clear_flags(flags); wined3d_mutex_lock();

1 0

Alistair Leslie-Hughes : d3d11: Support NULL views in d3d10_device_ClearRenderTargetView().
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 232834a572b3f3d23926c7266e719c3b31ac91b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232834a572b3f3d23926c7266… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 17 19:07:56 2016 +0200 d3d11: Support NULL views in d3d10_device_ClearRenderTargetView(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 9 +++++++++ dlls/d3d11/device.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ea9845c..106e4cc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6079,6 +6079,7 @@ static void test_clear_render_target_view(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; struct d3d10core_test_context test_context; ID3D10Texture2D *texture, *srgb_texture; @@ -6123,6 +6124,14 @@ static void test_clear_render_target_view(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); + if (d3d11_available) + { + ID3D10Device_ClearRenderTargetView(device, NULL, green); + check_texture_color(texture, expected_color, 1); + } + else + win_skip("D3D11 is not available, skipping test.\n"); + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4a83882..fd88ac1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3445,6 +3445,9 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 * TRACE("iface %p, render_target_view %p, color_rgba %s.\n", iface, render_target_view, debug_float4(color_rgba)); + if (!view) + return; + wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, WINED3DCLEAR_TARGET, &color, 0.0f, 0)))

1 0

Nikolay Sivov : d3d11/tests: Add a IDXGISurface1 GetDC() test.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: fda63a754ab2d414928053e35c3721c991acffc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda63a754ab2d414928053e35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 17 19:07:57 2016 +0200 d3d11/tests: Add a IDXGISurface1 GetDC() test. 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/d3d11/tests/d3d11.c | 111 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dff29fb..713c9cf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -51,6 +51,12 @@ struct vec4 float x, y, z, w; }; +struct device_desc +{ + const D3D_FEATURE_LEVEL *feature_level; + UINT flags; +}; + struct swapchain_desc { BOOL windowed; @@ -242,18 +248,21 @@ static void check_texture_float_(unsigned int line, ID3D11Texture2D *texture, "Got unexpected value %.8e at (%u, %u).\n", value, x, y); } -static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) +static ID3D11Device *create_device(const struct device_desc *desc) { static const D3D_FEATURE_LEVEL default_feature_level[] = { D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0, }; + const D3D_FEATURE_LEVEL *feature_level; + UINT flags = desc ? desc->flags : 0; unsigned int feature_level_count; ID3D11Device *device; - if (feature_level) + if (desc && desc->feature_level) { + feature_level = desc->feature_level; feature_level_count = 1; } else @@ -262,13 +271,13 @@ static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) feature_level_count = sizeof(default_feature_level) / sizeof(default_feature_level[0]); } - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; - if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) return device; @@ -365,12 +374,15 @@ struct d3d11_test_context static BOOL init_test_context_(unsigned int line, struct d3d11_test_context *context, const D3D_FEATURE_LEVEL *feature_level) { + struct device_desc device_desc; D3D11_VIEWPORT vp; HRESULT hr; memset(context, 0, sizeof(*context)); - if (!(context->device = create_device(feature_level))) + device_desc.feature_level = feature_level; + device_desc.flags = 0; + if (!(context->device = create_device(&device_desc))) { skip_(__FILE__, line)("Failed to create device.\n"); return FALSE; @@ -733,7 +745,11 @@ static void test_device_interfaces(void) for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) { - if (!(device = create_device(&d3d11_feature_levels[i]))) + struct device_desc device_desc; + + device_desc.feature_level = &d3d11_feature_levels[i]; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) { skip("Failed to create device for feature level %#x.\n", d3d11_feature_levels[i]); continue; @@ -2353,8 +2369,11 @@ static void test_create_shader(void) { D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; BOOL todo = feature_level <= D3D_FEATURE_LEVEL_9_3; + struct device_desc device_desc; - if (!(device = create_device(&feature_level))) + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) { skip("Failed to create device for feature level %#x.\n", feature_level); continue; @@ -6475,6 +6494,81 @@ float4 main(const ps_in v) : SV_TARGET release_test_context(&test_context); } +static void test_getdc(void) +{ + struct device_desc device_desc; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IDXGISurface1 *surface1; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + HDC dc; + + device_desc.feature_level = NULL; + device_desc.flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device.\n"); + return; + } + + /* Without D3D11_RESOURCE_MISC_GDI_COMPATIBLE. */ + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D11Texture2D_Release(texture); + + desc.MiscFlags = D3D11_RESOURCE_MISC_GDI_COMPATIBLE; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + + /* One more time. */ + dc = (HDC)0xdeadbeef; + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(dc == (HDC)0xdeadbeef, "Got unexpected dc %p.\n", dc); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -6513,4 +6607,5 @@ START_TEST(d3d11) test_clear_depth_stencil_view(); test_draw_depth_only(); test_cb_relative_addressing(); + test_getdc(); }

1 0

Nikolay Sivov : dwrite/tests: Test for lineGap metric.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 0d77aaccf1198376db630c464a21f99b3a3da9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d77aaccf1198376db630c464… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 18 06:47:13 2016 +0300 dwrite/tests: Test for lineGap metric. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 5d8a4ca..dc9f64e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -205,6 +205,23 @@ typedef struct { ULONG maxmemType1; } TT_POST; +typedef struct { + ULONG version; + SHORT ascender; + SHORT descender; + SHORT linegap; + USHORT advanceWidthMax; + SHORT minLeftSideBearing; + SHORT minRightSideBearing; + SHORT xMaxExtent; + SHORT caretSlopeRise; + SHORT caretSlopeRun; + SHORT caretOffset; + SHORT reserved[4]; + SHORT metricDataFormat; + USHORT numberOfHMetrics; +} TT_HHEA; + #include "poppack.h" static IDWriteFactory *create_factory(void) @@ -1534,10 +1551,11 @@ todo_wine static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS1 *metrics) { - void *os2_context, *head_context, *post_context; + void *os2_context, *head_context, *post_context, *hhea_context; const TT_OS2_V2 *tt_os2; const TT_HEAD *tt_head; const TT_POST *tt_post; + const TT_HHEA *tt_hhea; UINT32 size; BOOL exists; HRESULT hr; @@ -1548,6 +1566,8 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HHEA_TAG, (const void**)&tt_hhea, &size, &hhea_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_POST_TAG, (const void**)&tt_post, &size, &post_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1564,6 +1584,7 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); metrics->descent = descent < 0 ? -descent : 0; + metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); metrics->hasTypographicMetrics = TRUE; } else { @@ -1571,6 +1592,15 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET /* Some fonts have usWinDescent value stored as signed short, which could be wrongly interpreted as large unsigned value. */ metrics->descent = abs((SHORT)GET_BE_WORD(tt_os2->usWinDescent)); + + if (tt_hhea) { + SHORT descender = (SHORT)GET_BE_WORD(tt_hhea->descender); + INT32 linegap; + + linegap = GET_BE_WORD(tt_hhea->ascender) + abs(descender) + GET_BE_WORD(tt_hhea->linegap) - + metrics->ascent - metrics->descent; + metrics->lineGap = linegap > 0 ? linegap : 0; + } } metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); @@ -1606,6 +1636,8 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET IDWriteFontFace_ReleaseFontTable(fontface, os2_context); if (tt_head) IDWriteFontFace_ReleaseFontTable(fontface, head_context); + if (tt_hhea) + IDWriteFontFace_ReleaseFontTable(fontface, hhea_context); if (tt_post) IDWriteFontFace_ReleaseFontTable(fontface, post_context); } @@ -1619,6 +1651,8 @@ static void check_font_metrics(const WCHAR *nameW, BOOL has_metrics1, const DWRI expected->ascent); ok(got->descent == expected->descent, "font %s: descent %u, expected %u\n", wine_dbgstr_w(nameW), got->descent, expected->descent); + ok(got->lineGap == expected->lineGap, "font %s: lineGap %d, expected %d\n", wine_dbgstr_w(nameW), got->lineGap, + expected->lineGap); ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, "

1 0

Nikolay Sivov : dwrite/tests: Use existing macro to define font table tags.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 886875f01e2f1e610cbc49b5617d9aaa71022976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=886875f01e2f1e610cbc49b56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 18 06:47:14 2016 +0300 dwrite/tests: Use existing macro to define font table tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dc9f64e..8ddc0d2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -32,18 +32,14 @@ #include "wine/test.h" -#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - -#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') -#define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') -#define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') -#define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') -#define MS_0S2_TAG MS_MAKE_TAG('O','S','/','2') -#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') -#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') -#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +#define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') +#define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') +#define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') +#define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') +#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') +#define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') +#define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x)

1 0

Jean-Christophe Cardot : winhlp32: Fix some images not shown in certain 16-bit help files.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 91f89b4f96674024b3436423ddb188e838d1ca54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f89b4f96674024b3436423d… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Fri Apr 15 12:08:03 2016 +0200 winhlp32: Fix some images not shown in certain 16-bit help files. Subfiles with bitmap images are usually prefixed with '|', but sometimes not. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 10484a9..2748e5c 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -507,6 +507,18 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY WINE_TRACE("looking for file '%s'\n", name); ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), name, comp_FindSubFile); + if (!ptr) + { /* Subfiles with bitmap images are usually prefixed with '|', but sometimes not. + Unfortunately, there is no consensus among different pieces of unofficial + documentation. So remove leading '|' and try again. */ + CHAR c = *name++; + if (c == '|') + { + WINE_TRACE("not found. try '%s'\n", name); + ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), + name, comp_FindSubFile); + } + } if (!ptr) return FALSE; *subbuf = hlpfile->file_buffer + GET_UINT(ptr, strlen(name)+1); if (*subbuf >= hlpfile->file_buffer + hlpfile->file_buffer_size)

1 0