September 2017 - Wine-Commits

Hugh McMaster : reg/tests: Test registry export with a complex data structure.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 7d93b9d099fb96afc7a587ab85e314db06947db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d93b9d099fb96afc7a587ab8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:49 2017 +0000 reg/tests: Test registry export with a complex data structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 113 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a5812e3..36cb6ed 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -128,6 +128,48 @@ static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *sub lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); } +static LONG delete_tree(const HKEY key, const char *subkey) +{ + HKEY hkey; + LONG ret; + char *subkey_name = NULL; + DWORD max_subkey_len, subkey_len; + static const char empty[1]; + + ret = RegOpenKeyExA(key, subkey, 0, KEY_READ, &hkey); + if (ret) return ret; + + ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &max_subkey_len, + NULL, NULL, NULL, NULL, NULL, NULL); + if (ret) goto cleanup; + + max_subkey_len++; + + subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len); + if (!subkey_name) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + for (;;) + { + subkey_len = max_subkey_len; + ret = RegEnumKeyExA(hkey, 0, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (ret == ERROR_NO_MORE_ITEMS) break; + if (ret) goto cleanup; + ret = delete_tree(hkey, subkey_name); + if (ret) goto cleanup; + } + + ret = RegDeleteKeyA(hkey, empty); + +cleanup: + HeapFree(GetProcessHeap(), 0, subkey_name); + RegCloseKey(hkey); + return ret; +} + #define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size) @@ -4256,7 +4298,7 @@ static void test_export(void) { LONG err; DWORD r, os_version, major_version, minor_version, dword; - HKEY hkey; + HKEY hkey, subkey; const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -4268,6 +4310,32 @@ static void test_export(void) "\"DWORD\"=dword:00000100\r\n" "\"String\"=\"Your text here...\"\r\n\r\n"; + const char *complex_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n" + "\"Binary\"=hex:11,22,33,44\r\n" + "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\r\n" + "\"double\\\"quote\"=\"\\\"Hello, World!\\\"\"\r\n" + "\"single'quote\"=dword:00000008\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a\\Subkey2b]\r\n" + "@=\"Default value name\"\r\n" + "\"Multiple strings\"=hex(7):4c,00,69,00,6e,00,65,00,31,00,00,00,4c,00,69,00,6e,\\\r\n" + " 00,65,00,32,00,00,00,4c,00,69,00,6e,00,65,00,33,00,00,00,00,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a]\r\n" + "\"Backslash\"=\"Use \\\\\\\\ to escape a backslash\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a\\Subkey3b]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a\\Subkey3b\\Subkey3c]\r\n" + "\"String expansion\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,25,00,50,\\\r\n" + " 00,41,00,54,00,48,00,25,00,00,00\r\n" + "\"Zero data type\"=hex(0):56,61,6c,75,65,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4]\r\n" + "@=dword:12345678\r\n" + "\"43981\"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4345,10 +4413,49 @@ static void test_export(void) err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + /* Test registry export with a complex data structure */ + add_key(hkey, "Subkey1", &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + RegCloseKey(subkey); + + add_key(hkey, "Subkey2a", &subkey); + add_value(subkey, "double\"quote", REG_SZ, "\"Hello, World!\"", 16); + dword = 0x8; + add_value(subkey, "single'quote", REG_DWORD, &dword, sizeof(dword)); + RegCloseKey(subkey); + + add_key(hkey, "Subkey2a\\Subkey2b", &subkey); + add_value(subkey, NULL, REG_SZ, "Default value name", 19); + add_value(subkey, "Multiple strings", REG_MULTI_SZ, "Line1\0Line2\0Line3\0", 19); + RegCloseKey(subkey); + + add_key(hkey, "Subkey3a", &subkey); + add_value(subkey, "Backslash", REG_SZ, "Use \\\\ to escape a backslash", 29); + RegCloseKey(subkey); + + add_key(hkey, "Subkey3a\\Subkey3b\\Subkey3c", &subkey); + add_value(subkey, "String expansion", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14); + add_value(subkey, "Zero data type", REG_NONE, "Value", 6); + RegCloseKey(subkey); + + add_key(hkey, "Subkey4", &subkey); + dword = 0x12345678; + add_value(subkey, NULL, REG_DWORD, &dword, sizeof(dword)); + add_value(subkey, "43981", 0xabcd, "Value", 6); + RegCloseKey(subkey); + RegCloseKey(hkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", complex_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); } START_TEST(reg)

1 0

Nikolay Sivov : dwrite: Use single per-process local file loader.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 43c16a25ebfd2917af6fff24a29e91039b46f3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c16a25ebfd2917af6fff24a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 25 00:08:40 2017 +0300 dwrite: Use single per-process local file loader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 126 +++++++++++++++++++++++++------------------ dlls/dwrite/main.c | 31 +++-------- dlls/dwrite/tests/font.c | 40 +++++++++++++- 4 files changed, 122 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43c16a25ebfd2917af6ff…

1 0

Nikolay Sivov : propsys: Fix negative numeric source handling in PropVariantToBoolean().
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 3b18054f258bd05f3f5f0094c3fce54a04c4cc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b18054f258bd05f3f5f0094c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 24 12:00:08 2017 +0300 propsys: Fix negative numeric source handling in PropVariantToBoolean(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 2 +- dlls/propsys/tests/propsys.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index bdf9226..3e3b502 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -282,7 +282,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) break; } - hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); *ret = !!res; return hr; } diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index ce1ee71..327c606 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -956,7 +956,6 @@ static void test_PropVariantToBoolean(void) propvar.u.lVal = -67; val = FALSE; hr = PropVariantToBoolean(&propvar, &val); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(val == TRUE, "Unexpected value %d\n", val); @@ -986,7 +985,6 @@ todo_wine propvar.u.pwszVal = str_n7; val = FALSE; hr = PropVariantToBoolean(&propvar, &val); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(val == TRUE, "Unexpected value %d\n", val); @@ -1092,7 +1090,6 @@ todo_wine propvar.vt = VT_LPSTR; propvar.u.pszVal = (char *)"-1"; hr = PropVariantToBoolean(&propvar, &val); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(val == TRUE, "Unexpected value %d\n", val); }

1 0

Hugh McMaster : regedit/tests: Test registry export with a simple data structure.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: b3032b425e9fa2d4e07be394f535612327d0859e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3032b425e9fa2d4e07be394f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:58:21 2017 +0000 regedit/tests: Test registry export with a simple data structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d64a590..4b29183 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -188,6 +188,16 @@ static void delete_key_(unsigned line, const HKEY hkey, const char *path) } } +#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) +static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, + const void *data, size_t size) +{ + LONG lr; + + lr = RegSetValueExA(hkey, name, 0, type, (const BYTE *)data, size); + lok(lr == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", lr); +} + #define KEY_BASE "Software\\Wine\\regedit_test" static void test_basic_import(void) @@ -3320,11 +3330,18 @@ static void test_export(void) { LONG lr; HKEY hkey; + DWORD dword; const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + const char *simple_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -3337,6 +3354,17 @@ static void test_export(void) lr = DeleteFileA("file.reg"); ok(lr, "DeleteFile failed: %u\n", GetLastError()); + /* Test registry export with a simple data structure */ + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", simple_test), "compare_export() failed\n"); + + lr = DeleteFileA("file.reg"); + ok(lr, "DeleteFile failed: %u\n", GetLastError()); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Test registry export with a simple data structure.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: ae313198a0f752c711b30bdc536ebc3213e08bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae313198a0f752c711b30bdc5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:48 2017 +0000 reg/tests: Test registry export with a simple data structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c069154..a5812e3 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4255,10 +4255,18 @@ error: static void test_export(void) { LONG err; - DWORD r, os_version, major_version, minor_version; + DWORD r, os_version, major_version, minor_version, dword; HKEY hkey; - const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + + const char *empty_key_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + + const char *simple_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4325,6 +4333,20 @@ static void test_export(void) err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + /* Test registry export with a simple data structure */ + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + RegCloseKey(hkey); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); }

1 0

Henri Verbeet : d2d1: Unify the outline and fill pixel shaders.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: f55960576d1f82670f40de85317dcd192eede587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55960576d1f82670f40de853… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:37:00 2017 +0200 d2d1: Unify the outline and fill pixel shaders. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 13 +- dlls/d2d1/d2d1_private.h | 12 +- dlls/d2d1/render_target.c | 631 ++++++++++++++++++++++------------------------ 3 files changed, 316 insertions(+), 340 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55960576d1f82670f40d…

1 0

Henri Verbeet : d2d1/tests: Add some bitmap brush tests for skew transformations and transformed geometry.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 49019368c23dba877d7949e7f998566703aaf5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=49019368c23dba877d7949e7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:36:58 2017 +0200 d2d1/tests: Add some bitmap brush tests for skew transformations and transformed geometry. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 95c8146..2cb15e6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -173,6 +173,19 @@ static void rotate_matrix(D2D1_MATRIX_3X2_F *matrix, float theta) matrix->_22 = -sin_theta * tmp_12 + cos_theta * matrix->_22; } +static void skew_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + float tmp_11, tmp_12; + + tmp_11 = matrix->_11; + tmp_12 = matrix->_12; + + matrix->_11 += y * matrix->_21; + matrix->_12 += y * matrix->_22; + matrix->_21 += x * tmp_11; + matrix->_22 += x * tmp_12; +} + static void scale_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) { matrix->_11 *= x; @@ -1428,6 +1441,8 @@ static void test_color_brush(void) static void test_bitmap_brush(void) { D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; + ID2D1TransformedGeometry *transformed_geometry; + ID2D1RectangleGeometry *rectangle_geometry; D2D1_MATRIX_3X2_F matrix, tmp_matrix; D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1Bitmap *bitmap, *tmp_bitmap; @@ -1438,6 +1453,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget *rt; ID3D10Device1 *device; IDXGISurface *surface; + ID2D1Factory *factory; D2D1_COLOR_F color; D2D1_SIZE_U size; unsigned int i; @@ -1599,6 +1615,55 @@ static void test_bitmap_brush(void) match = compare_surface(surface, "b4b775afecdae2d26642001f4faff73663bb8b31"); ok(match, "Surface does not match.\n"); + ID2D1Bitmap_Release(bitmap); + bitmap_desc.dpiX = 96.0f / 20.0f; + bitmap_desc.dpiY = 96.0f / 60.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + ID2D1BitmapBrush_SetBitmap(brush, bitmap); + + ID2D1RenderTarget_BeginDraw(rt); + + ID2D1RenderTarget_Clear(rt, &color); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 120.0f); + skew_matrix(&matrix, 0.125f, 2.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_matrix_identity(&matrix); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + set_rect(&dst_rect, 0.0f, 0.0f, 80.0f, 240.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + ID2D1RenderTarget_GetFactory(rt, &factory); + + set_rect(&dst_rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &dst_rect, &rectangle_geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 240.0f, 720.0f); + scale_matrix(&matrix, 40.0f, 120.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)rectangle_geometry, + &matrix, &transformed_geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_Release(rectangle_geometry); + + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 600.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry, (ID2D1Brush *)brush, NULL); + ID2D1TransformedGeometry_Release(transformed_geometry); + + ID2D1Factory_Release(factory); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "cf7b90ba7b139fdfbe9347e1907d635cfb4ed197"); + ok(match, "Surface does not match.\n"); + ID2D1BitmapBrush_Release(brush); refcount = ID2D1Bitmap_Release(bitmap); ok(!refcount, "Bitmap has %u references left.\n", refcount);

1 0

Henri Verbeet : d2d1: Unify the various brush pixel shaders.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 2fafd92d88d3fd5fe5c151600b6cb3d56cbd648f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fafd92d88d3fd5fe5c151600… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:36:59 2017 +0200 d2d1: Unify the various brush pixel shaders. Branches inside shaders aren't free, but in the long term avoiding switching between shaders is probably worth it for D2D. As an added benefit, this makes bitmap brushes and opacity brushes work with bezier geometry. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 217 +++++--------- dlls/d2d1/d2d1_private.h | 25 +- dlls/d2d1/render_target.c | 722 ++++++++++++++++++++-------------------------- 3 files changed, 413 insertions(+), 551 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fafd92d88d3fd5fe5c15…

1 0

Henri Verbeet : d2d1/tests: Introduce get_surface_readback().
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 2a770ae7415be0c97e51bd8736bd53db979c85fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a770ae7415be0c97e51bd873… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:36:57 2017 +0200 d2d1/tests: Introduce get_surface_readback(). As in the Direct3D tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 136 ++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 74 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 13d4bc8..95c8146 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,6 +26,13 @@ #include "dwrite.h" #include "wincodec.h" +struct resource_readback +{ + ID3D10Resource *resource; + D3D10_MAPPED_TEXTURE2D map_desc; + unsigned int width, height; +}; + struct figure { unsigned int *spans; @@ -209,6 +216,51 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa ID2D1GeometrySink_AddBezier(sink, &b); } +static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) +{ + D3D10_TEXTURE2D_DESC texture_desc; + DXGI_SURFACE_DESC surface_desc; + ID3D10Resource *src_resource; + ID3D10Device *device; + HRESULT hr; + + hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&device); + ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&src_resource); + ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr); + + hr = IDXGISurface_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + texture_desc.Width = surface_desc.Width; + texture_desc.Height = surface_desc.Height; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = surface_desc.Format; + texture_desc.SampleDesc = surface_desc.SampleDesc; + texture_desc.Usage = D3D10_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D10Texture2D **)&rb->resource); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + rb->width = texture_desc.Width; + rb->height = texture_desc.Height; + + ID3D10Device_CopyResource(device, rb->resource, src_resource); + ID3D10Resource_Release(src_resource); + ID3D10Device_Release(device); + + hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &rb->map_desc); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); +} + +static void release_resource_readback(struct resource_readback *rb) +{ + ID3D10Texture2D_Unmap((ID3D10Texture2D *)rb->resource, 0); + ID3D10Resource_Release(rb->resource); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -292,45 +344,13 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, static BOOL compare_surface(IDXGISurface *surface, const char *ref_sha1) { - D3D10_MAPPED_TEXTURE2D mapped_texture; - D3D10_TEXTURE2D_DESC texture_desc; - DXGI_SURFACE_DESC surface_desc; - ID3D10Resource *src_resource; - ID3D10Texture2D *texture; - ID3D10Device *device; - HRESULT hr; + struct resource_readback rb; BOOL ret; - hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&src_resource); - ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr); - - hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - texture_desc.Width = surface_desc.Width; - texture_desc.Height = surface_desc.Height; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = surface_desc.Format; - texture_desc.SampleDesc = surface_desc.SampleDesc; - texture_desc.Usage = D3D10_USAGE_STAGING; - texture_desc.BindFlags = 0; - texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; - texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - - ID3D10Device_CopyResource(device, (ID3D10Resource *)texture, src_resource); - hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ, 0, &mapped_texture); - ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); - ret = compare_sha1(mapped_texture.pData, mapped_texture.RowPitch, 4, - texture_desc.Width, texture_desc.Height, ref_sha1); - ID3D10Texture2D_Unmap(texture, 0); - - ID3D10Texture2D_Release(texture); - ID3D10Resource_Release(src_resource); - ID3D10Device_Release(device); + get_surface_readback(surface, &rb); + ret = compare_sha1(rb.map_desc.pData, rb.map_desc.RowPitch, 4, + rb.width, rb.height, ref_sha1); + release_resource_readback(&rb); return ret; } @@ -496,45 +516,17 @@ static void read_figure(struct figure *figure, BYTE *data, unsigned int pitch, static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y, unsigned int w, unsigned int h, DWORD prev, unsigned int max_diff, const char *ref) { - D3D10_MAPPED_TEXTURE2D mapped_texture; - D3D10_TEXTURE2D_DESC texture_desc; struct figure ref_figure, figure; - DXGI_SURFACE_DESC surface_desc; unsigned int i, j, span, diff; - ID3D10Resource *src_resource; - ID3D10Texture2D *texture; - ID3D10Device *device; - HRESULT hr; + struct resource_readback rb; - hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&src_resource); - ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr); - - hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - texture_desc.Width = surface_desc.Width; - texture_desc.Height = surface_desc.Height; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = surface_desc.Format; - texture_desc.SampleDesc = surface_desc.SampleDesc; - texture_desc.Usage = D3D10_USAGE_STAGING; - texture_desc.BindFlags = 0; - texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; - texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - - ID3D10Device_CopyResource(device, (ID3D10Resource *)texture, src_resource); - hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ, 0, &mapped_texture); - ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + get_surface_readback(surface, &rb); figure.span_count = 0; figure.spans_size = 64; figure.spans = HeapAlloc(GetProcessHeap(), 0, figure.spans_size * sizeof(*figure.spans)); - read_figure(&figure, mapped_texture.pData, mapped_texture.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); deserialize_figure(&ref_figure, (BYTE *)ref); span = w * h; @@ -572,17 +564,13 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y if (diff > max_diff) { trace("diff %u > max_diff %u.\n", diff, max_diff); - read_figure(&figure, mapped_texture.pData, mapped_texture.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); serialize_figure(&figure); } HeapFree(GetProcessHeap(), 0, ref_figure.spans); HeapFree(GetProcessHeap(), 0, figure.spans); - ID3D10Texture2D_Unmap(texture, 0); - - ID3D10Texture2D_Release(texture); - ID3D10Resource_Release(src_resource); - ID3D10Device_Release(device); + release_resource_readback(&rb); return diff <= max_diff; }

1 0

Fabian Maurer : evr: Add EnhancedVideoRenderer coclass.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 44cb0afb2571984bda8ca1fa084a50c1fc04ac71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44cb0afb2571984bda8ca1fa0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Sep 20 14:03:38 2017 +0200 evr: Add EnhancedVideoRenderer coclass. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/evr/Makefile.in | 5 +- dlls/evr/evr.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/evr_classes.idl | 28 ++++++ dlls/evr/evr_private.h | 28 ++++++ dlls/evr/main.c | 4 +- 7 files changed, 300 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44cb0afb2571984bda8ca…

1 0