September 2017 - Wine-commits

Nikolay Sivov : dwrite: Use 8bpp bitmaps in grayscale mode.
by Alexandre Julliard 05 Sep '17

05 Sep '17

Module: wine Branch: master Commit: c4917bdbdfd93668d3c73268e81f5df74646ba1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4917bdbdfd93668d3c73268e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 5 13:35:29 2017 +0300 dwrite: Use 8bpp bitmaps in grayscale mode. Problem analyzed by Kimmo Myllyvirta. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 37 +++++++----- dlls/dwrite/freetype.c | 6 +- dlls/dwrite/tests/font.c | 134 ++++++++++++++++++++++++++++++++++++++----- 4 files changed, 148 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4917bdbdfd93668d3c73…

1 0

Nikolay Sivov : d2d1: Use 8bpp text bitmaps for grayscale mode.
by Alexandre Julliard 05 Sep '17

05 Sep '17

Module: wine Branch: master Commit: 38d314ba927a56d4e3c242d19c5898cd5bbf9bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d314ba927a56d4e3c242d19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 5 13:35:30 2017 +0300 d2d1: Use 8bpp text bitmaps for grayscale mode. 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/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f37565d..02f926f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1141,7 +1141,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED || antialias_mode == DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE) texture_type = DWRITE_TEXTURE_ALIASED_1x1; else texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1;

1 0

Hugh McMaster : reg/tests: Delete the test registry key before starting each test.
by Alexandre Julliard 05 Sep '17

05 Sep '17

Module: wine Branch: master Commit: e3395d50a7394e61466ef46e4433e8464c58180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3395d50a7394e61466ef46e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Sep 5 12:26:44 2017 +0000 reg/tests: Delete the test registry key before starting each test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ab65c38..8d103df 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -507,6 +507,9 @@ static void test_delete(void) DWORD r; const DWORD deadbeef = 0xdeadbeef; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg delete", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -564,6 +567,9 @@ static void test_query(void) const DWORD dword1 = 0x123; const DWORD dword2 = 0xabc; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg query", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -800,6 +806,9 @@ static void test_import(void) LONG err; BYTE hex[8]; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg import", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -2314,6 +2323,9 @@ static void test_unicode_import(void) char buffer[24]; BYTE hex[8]; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -3800,6 +3812,9 @@ static void test_import_with_whitespace(void) DWORD r, dword; LONG err; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -3947,6 +3962,9 @@ static void test_unicode_import_with_whitespace(void) DWORD r, dword; LONG err; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0

Alexandre Julliard : Wine release 2.16
by Alexandre Julliard 01 Sep '17

01 Sep '17

Module: website Branch: master Commit: ef322bc1186f175e0119d403658cfecf0fd4ad32 URL: http://source.winehq.org/git/website.git/?a=commit;h=ef322bc1186f175e0119d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 19:23:30 2017 +0200 Wine release 2.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017090101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017090101.xml b/news/en/2017090101.xml new file mode 100644 index 0000000..2c18f86 --- /dev/null +++ b/news/en/2017090101.xml @@ -0,0 +1,17 @@ +<news> +<date>September 1, 2017</date> +<title>Wine 2.16 Released</title> +<body> + The Wine development release 2.16 is now available. + <a href="{$root}/announce/2.16">What's new</a> in this release: +<ul> + <li>Support for pasting metafiles in RichEdit.</li> + <li>Better support for grayscale PNG images.</li> + <li>Support for safety features in library loading.</li> + <li>Better handling of transforms in GdiPlus.</li> + <li>Rendering improvements in DirectWrite.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Paul Gofman : d3dx9/tests: Add test for effect with unsupported shader.
by Alexandre Julliard 01 Sep '17

01 Sep '17

Module: wine Branch: master Commit: c3677ecfc8ec919fcf6f0a70cb4fc866c376e9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3677ecfc8ec919fcf6f0a70c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 21:56:57 2017 +0300 d3dx9/tests: Add test for effect with unsupported shader. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 185 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9658d2d..66abd0a 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6981,6 +6981,190 @@ static void test_effect_skip_constants(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +#if 0 +vertexshader vs_arr[2] = +{ + asm + { + vs_3_0 + def c0, 1, 1, 1, 1 + dcl_position o0 + mov o0, c0 + }, + + asm + { + vs_3_sw + def c256, 1, 1, 1, 1 + dcl_position o0 + mov o0, c256 + }, +}; + +int i; + +technique tech0 +{ + pass p0 + { + VertexShader = vs_arr[1]; + } +} +technique tech1 +{ + pass p0 + { + VertexShader = vs_arr[i]; + } +} +#endif +static const DWORD test_effect_unsupported_shader_blob[] = +{ + 0xfeff0901, 0x000000ac, 0x00000000, 0x00000010, 0x00000004, 0x00000020, 0x00000000, 0x00000002, + 0x00000001, 0x00000002, 0x00000007, 0x615f7376, 0x00007272, 0x00000002, 0x00000000, 0x0000004c, + 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000069, 0x00000003, + 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00003070, 0x00000006, + 0x68636574, 0x00000030, 0x00000004, 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, + 0x00000003, 0x00003070, 0x00000006, 0x68636574, 0x00000031, 0x00000002, 0x00000002, 0x00000006, + 0x00000005, 0x00000004, 0x00000018, 0x00000000, 0x00000000, 0x0000002c, 0x00000048, 0x00000000, + 0x00000000, 0x00000074, 0x00000000, 0x00000001, 0x0000006c, 0x00000000, 0x00000001, 0x00000092, + 0x00000000, 0x00000058, 0x00000054, 0x000000a0, 0x00000000, 0x00000001, 0x00000098, 0x00000000, + 0x00000001, 0x00000092, 0x00000000, 0x00000084, 0x00000080, 0x00000002, 0x00000002, 0x00000001, + 0x00000038, 0xfffe0300, 0x05000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x0200001f, 0x80000000, 0xe00f0000, 0x02000001, 0xe00f0000, 0xa0e40000, 0x0000ffff, 0x00000002, + 0x00000038, 0xfffe03ff, 0x05000051, 0xa00f0100, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x0200001f, 0x80000000, 0xe00f0000, 0x02000001, 0xe00f0000, 0xa0e40100, 0x0000ffff, 0x00000001, + 0x00000000, 0xffffffff, 0x00000000, 0x00000002, 0x000000e4, 0x00000008, 0x615f7376, 0x00007272, + 0x46580200, 0x0023fffe, 0x42415443, 0x0000001c, 0x00000057, 0x46580200, 0x00000001, 0x0000001c, + 0x00000100, 0x00000054, 0x00000030, 0x00000002, 0x00000001, 0x00000034, 0x00000044, 0xabab0069, + 0x00020000, 0x00010001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320, + 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x0002fffe, 0x54494c43, 0x00000000, + 0x000cfffe, 0x434c5846, 0x00000001, 0x10000001, 0x00000001, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000000, 0x00000000, + 0xffffffff, 0x00000000, 0x00000001, 0x0000000a, 0x615f7376, 0x315b7272, 0x0000005d, +}; + +#define TEST_EFFECT_UNSUPPORTED_SHADER_BYTECODE_VS_3_0_POS 81 +#define TEST_EFFECT_UNSUPPORTED_SHADER_BYTECODE_VS_3_0_LEN 14 + +static void test_effect_unsupported_shader(void) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DVertexShader9 *vshader; + unsigned int passes_count; + IDirect3DDevice9 *device; + UINT byte_code_size; + ID3DXEffect *effect; + IDirect3D9 *d3d; + void *byte_code; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(window); + return; + } + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr)) { + skip("Failed to create IDirect3DDevice9 object, hr %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = D3DXCreateEffectEx(device, test_effect_unsupported_shader_blob, sizeof(test_effect_unsupported_shader_blob), + NULL, NULL, NULL, 0, NULL, &effect, NULL); + todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); + if (FAILED(hr)) + { + skip("Failed to create effect, skipping test.\n"); + goto cleanup; + } + + hr = effect->lpVtbl->ValidateTechnique(effect, "missing_technique"); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + effect->lpVtbl->SetInt(effect, "i", 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); + ok(hr == E_FAIL, "Got result %#x.\n", hr); + effect->lpVtbl->SetInt(effect, "i", 0); + hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->SetTechnique(effect, "tech0"); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->SetTechnique(effect, "tech1"); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + ok(!!vshader, "Got NULL vshader.\n"); + hr = IDirect3DVertexShader9_GetFunction(vshader, NULL, &byte_code_size); + ok(hr == D3D_OK, "Got result %x.\n", hr); + byte_code = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, byte_code_size); + hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); + ok(hr == D3D_OK, "Got result %x.\n", hr); + ok(byte_code_size == TEST_EFFECT_UNSUPPORTED_SHADER_BYTECODE_VS_3_0_LEN * sizeof(DWORD), + "Got unexpected byte code size %u.\n", byte_code_size); + ok(!memcmp(byte_code, + &test_effect_unsupported_shader_blob[TEST_EFFECT_UNSUPPORTED_SHADER_BYTECODE_VS_3_0_POS], + byte_code_size), "Incorrect shader selected.\n"); + HeapFree(GetProcessHeap(), 0, byte_code); + IDirect3DVertexShader9_Release(vshader); + + effect->lpVtbl->SetInt(effect, "i", 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %x.\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + effect->lpVtbl->Release(effect); +cleanup: + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(effect) { HWND wnd; @@ -7033,6 +7217,7 @@ START_TEST(effect) test_effect_large_address_aware_flag(device); test_effect_get_pass_desc(device); test_effect_skip_constants(device); + test_effect_unsupported_shader(); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Paul Gofman : d3dx9: Do not fail effect creation if a shader cannot be created.
by Alexandre Julliard 01 Sep '17

01 Sep '17

Module: wine Branch: master Commit: 6c7c511a277d1413bab0d805756f7bf2782a0150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7c511a277d1413bab0d8057… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 31 21:56:58 2017 +0300 d3dx9: Do not fail effect creation if a shader cannot be created. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 4 ++-- dlls/d3dx9_36/tests/effect.c | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 864f0e5..2cd0c22 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5938,7 +5938,7 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o (IDirect3DVertexShader9 **)param->data))) { WARN("Failed to create vertex shader.\n"); - return hr; + return D3D_OK; } break; case D3DXPT_PIXELSHADER: @@ -5946,7 +5946,7 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o (IDirect3DPixelShader9 **)param->data))) { WARN("Failed to create pixel shader.\n"); - return hr; + return D3D_OK; } break; default: diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 66abd0a..bb26fe4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7087,17 +7087,13 @@ static void test_effect_unsupported_shader(void) hr = D3DXCreateEffectEx(device, test_effect_unsupported_shader_blob, sizeof(test_effect_unsupported_shader_blob), NULL, NULL, NULL, 0, NULL, &effect, NULL); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); - if (FAILED(hr)) - { - skip("Failed to create effect, skipping test.\n"); - goto cleanup; - } hr = effect->lpVtbl->ValidateTechnique(effect, "missing_technique"); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech0"); + todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); @@ -7105,6 +7101,7 @@ static void test_effect_unsupported_shader(void) effect->lpVtbl->SetInt(effect, "i", 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); + todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); effect->lpVtbl->SetInt(effect, "i", 0); hr = effect->lpVtbl->ValidateTechnique(effect, "tech1"); @@ -7158,7 +7155,7 @@ static void test_effect_unsupported_shader(void) ok(!vshader, "Got non NULL vshader.\n"); effect->lpVtbl->Release(effect); -cleanup: + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Vincent Povirk : gdiplus: Account for gdi transform in brush_fill_pixels.
by Alexandre Julliard 01 Sep '17

01 Sep '17

Module: wine Branch: master Commit: 0914f626af73b6fb10826178d6736a873113fc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0914f626af73b6fb10826178d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 31 14:14:04 2017 -0500 gdiplus: Account for gdi transform in brush_fill_pixels. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7aa1dac..e19fefc 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1169,8 +1169,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, /* Transform the points to a co-ordinate space where X is the point's * position in the gradient, 0.0 being the start point and 1.0 the * end point. */ - stat = GdipTransformPoints(graphics, CoordinateSpaceWorld, - CoordinateSpaceDevice, draw_points, 3); + stat = gdip_transform_points(graphics, CoordinateSpaceWorld, + WineCoordinateSpaceGdiDevice, draw_points, 3); if (stat == Ok) { @@ -1230,8 +1230,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, draw_points[2].Y = fill_area->Y+1; /* Transform the points to the co-ordinate space of the bitmap. */ - stat = GdipTransformPoints(graphics, CoordinateSpaceWorld, - CoordinateSpaceDevice, draw_points, 3); + stat = gdip_transform_points(graphics, CoordinateSpaceWorld, + WineCoordinateSpaceGdiDevice, draw_points, 3); if (stat == Ok) { @@ -1361,7 +1361,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, if (stat != Ok) return stat; - stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &world_to_device); if (stat == Ok) {

1 0

Vincent Povirk : gdiplus: Use SOFTWARE_GdipDrawPath with alpha hdc's.
by Alexandre Julliard 01 Sep '17

01 Sep '17

Module: wine Branch: master Commit: be952527f2c95c85532fd4a7e28e3ab5689235ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=be952527f2c95c85532fd4a7e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 31 14:14:05 2017 -0500 gdiplus: Use SOFTWARE_GdipDrawPath with alpha hdc's. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e19fefc..a7da283 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3859,7 +3859,7 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if (graphics->image && graphics->image->type == ImageTypeMetafile) retval = METAFILE_DrawPath((GpMetafile*)graphics->image, pen, path); - else if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) + else if (!graphics->hdc || graphics->alpha_hdc || !brush_can_fill_path(pen->brush, FALSE)) retval = SOFTWARE_GdipDrawPath(graphics, pen, path); else retval = GDI32_GdipDrawPath(graphics, pen, path);

1 0

Vincent Povirk : gdiplus: Account for gdi32 transform in GdipDrawImage.
by Alexandre Julliard 01 Sep '17

01 Sep '17

Module: wine Branch: master Commit: 93e8507aeada4eef8550aad44e6d38c877e52ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e8507aeada4eef8550aad44… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 31 14:14:06 2017 -0500 gdiplus: Account for gdi32 transform in GdipDrawImage. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a7da283..3ac9952 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -284,43 +284,23 @@ static void restore_dc(GpGraphics *graphics, INT state) RestoreDC(graphics->hdc, state); } -/* This helper applies all the changes that the points listed in ptf need in - * order to be drawn on the device context. In the end, this should include at - * least: - * -scaling by page unit - * -applying world transformation - * -converting from float to int - * Native gdiplus uses gdi32 to do all this (via SetMapMode, SetViewportExtEx, - * SetWindowExtEx, SetWorldTransform, etc.) but we cannot because we are using - * gdi to draw, and these functions would irreparably mess with line widths. - */ -static void transform_and_round_points(GpGraphics *graphics, POINT *pti, - GpPointF *ptf, INT count) +static void round_points(POINT *pti, GpPointF *ptf, INT count) { - REAL scale_x, scale_y; - GpMatrix matrix; int i; - scale_x = units_to_pixels(1.0, graphics->unit, graphics->xres); - scale_y = units_to_pixels(1.0, graphics->unit, graphics->yres); - - /* apply page scale */ - if(graphics->unit != UnitDisplay) - { - scale_x *= graphics->scale; - scale_y *= graphics->scale; - } - - matrix = graphics->worldtrans; - GdipScaleMatrix(&matrix, scale_x, scale_y, MatrixOrderAppend); - GdipTransformMatrixPoints(&matrix, ptf, count); - for(i = 0; i < count; i++){ pti[i].x = gdip_round(ptf[i].X); pti[i].y = gdip_round(ptf[i].Y); } } +static void transform_and_round_points(GpGraphics *graphics, POINT *pti, + GpPointF *ptf, INT count) +{ + gdip_transform_points(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, count); + round_points(pti, ptf, count); +} + static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { @@ -2943,7 +2923,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image ptf[3].Y = ptf[2].Y + ptf[1].Y - ptf[0].Y; if (!srcwidth || !srcheight || (ptf[3].X == ptf[0].X && ptf[3].Y == ptf[0].Y)) return Ok; - transform_and_round_points(graphics, pti, ptf, 4); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 4); + round_points(pti, ptf, 4); TRACE("%s %s %s %s\n", wine_dbgstr_point(&pti[0]), wine_dbgstr_point(&pti[1]), wine_dbgstr_point(&pti[2]), wine_dbgstr_point(&pti[3])); @@ -3005,7 +2986,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (dst_area.bottom < pti[i].y) dst_area.bottom = pti[i].y; } - stat = get_graphics_bounds(graphics, &graphics_bounds); + stat = get_graphics_device_bounds(graphics, &graphics_bounds); if (stat != Ok) return stat; if (graphics_bounds.X > dst_area.left) dst_area.left = floorf(graphics_bounds.X); @@ -3121,10 +3102,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_stride = src_stride; } + gdi_transform_acquire(graphics); + stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride, lockeddata.PixelFormat); + gdi_transform_release(graphics); + heap_free(src_data); heap_free(dst_dyn_data); @@ -3208,6 +3193,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image DeleteObject(hrgn); } + gdi_transform_acquire(graphics); + if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { gdi_alpha_blend(graphics, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, @@ -3219,6 +3206,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image hdc, srcx, srcy, srcwidth, srcheight, SRCCOPY); } + gdi_transform_release(graphics); + RestoreDC(graphics->hdc, save_state); if (temp_hdc)

1 0

Vincent Povirk : gdiplus: Send paths to gdi32 in device coordinates.
by Alexandre Julliard 01 Sep '17

01 Sep '17

Module: wine Branch: master Commit: e127101122e08e0f5bab196dc4f0349f9a281235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e127101122e08e0f5bab196dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 31 14:14:07 2017 -0500 gdiplus: Send paths to gdi32 in device coordinates. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 59 ++++++++++++++++++++++++++++++++++++++----------- dlls/gdiplus/region.c | 4 ++++ 2 files changed, 50 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3ac9952..f4dc3e6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -249,6 +249,14 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) width *= units_to_pixels(pen->width, pen->unit == UnitWorld ? graphics->unit : pen->unit, graphics->xres); width *= graphics->scale; + + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 1.0; + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceDevice, pt, 2); + width *= sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + + (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); } if(pen->dash == DashStyleCustom){ @@ -1573,7 +1581,10 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[3].X = x2 - dbig; ptf[2].X = x2 + dsmall; - transform_and_round_points(graphics, pt, ptf, 4); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + + round_points(pt, ptf, 3); + Polygon(graphics->hdc, pt, 4); break; @@ -1595,7 +1606,10 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[2].X = x2; ptf[2].Y = y2; - transform_and_round_points(graphics, pt, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + + round_points(pt, ptf, 3); + Polygon(graphics->hdc, pt, 3); break; @@ -1607,7 +1621,10 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[1].X = x2 + dx; ptf[1].Y = y2 + dy; - transform_and_round_points(graphics, pt, ptf, 2); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + + round_points(pt, ptf, 3); + Ellipse(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); break; @@ -1627,7 +1644,10 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[2].X = x2 + dx; ptf[2].Y = y2 + dy; - transform_and_round_points(graphics, pt, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + + round_points(pt, ptf, 3); + Polygon(graphics->hdc, pt, 3); break; @@ -1647,7 +1667,10 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[3].X = x2 + dx; ptf[3].Y = y2 + dy; - transform_and_round_points(graphics, pt, ptf, 4); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + + round_points(pt, ptf, 3); + Pie(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y, pt[2].x, pt[2].y, pt[3].x, pt[3].y); @@ -1673,7 +1696,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s GdipTranslateMatrix(&matrix, x2, y2, MatrixOrderAppend); GdipTransformMatrixPoints(&matrix, custptf, count); - transform_and_round_points(graphics, custpt, custptf, count); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + + round_points(pt, ptf, 3); for(i = 0; i < count; i++) tp[i] = convert_path_point_type(custom->pathdata.Types[i]); @@ -1896,7 +1921,9 @@ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * } } - transform_and_round_points(graphics, pti, ptcopy, count); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptcopy, count); + + round_points(pti, ptcopy, count); for(i = 0; i < count; i++){ tp[i] = convert_path_point_type(types[i]); @@ -3433,9 +3460,13 @@ static GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *pat if (hrgn) ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + gdi_transform_acquire(graphics); + retval = draw_poly(graphics, pen, path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, TRUE); + gdi_transform_release(graphics); + end: restore_dc(graphics, save_state); DeleteObject(hrgn); @@ -4114,17 +4145,19 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath if (hrgn) ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + gdi_transform_acquire(graphics); + BeginPath(graphics->hdc); retval = draw_poly(graphics, NULL, path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, FALSE); - if(retval != Ok) - goto end; - - EndPath(graphics->hdc); - brush_fill_path(graphics, brush); + if(retval == Ok) + { + EndPath(graphics->hdc); + brush_fill_path(graphics, brush); + } - retval = Ok; + gdi_transform_release(graphics); end: RestoreDC(graphics->hdc, save_state); diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 015b677..8a2ca6b 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1059,6 +1059,8 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); + gdi_transform_acquire(graphics); + stat = trace_path(graphics, path); if (stat == Ok) { @@ -1066,6 +1068,8 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) stat = *hrgn ? Ok : OutOfMemory; } + gdi_transform_release(graphics); + RestoreDC(graphics->hdc, save_state); if (new_hdc) {

1 0