April 2017 - Wine-Commits - list.winehq.org

Huw Davies : user32/tests: Fix tests for minimium icon spacing when not in DPI scaling mode.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: e352b29d12a72e9a616d71b7a504e939c307f1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e352b29d12a72e9a616d71b7a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:53 2017 +0100 user32/tests: Fix tests for minimium icon spacing when not in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 055060e..96b1581 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -884,7 +884,7 @@ static void test_SPI_SETKEYBOARDSPEED( void ) /* 10 */ static BOOL dotest_spi_iconhorizontalspacing( INT curr_val) { BOOL rc; - INT spacing, regval; + INT spacing, regval, min_val = MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ); ICONMETRICSA im; rc=SystemParametersInfoA( SPI_ICONHORIZONTALSPACING, curr_val, 0, @@ -892,7 +892,7 @@ static BOOL dotest_spi_iconhorizontalspacing( INT curr_val) if (!test_error_msg(rc,"SPI_ICONHORIZONTALSPACING")) return FALSE; ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_ICONHORIZONTALSPACING, 0 ); - if( curr_val < 32) curr_val = 32; + curr_val = max( curr_val, min_val ); /* The registry keys depend on the Windows version and the values too * let's test (works on win95,ME,NT4,2k,XP) */ @@ -1053,7 +1053,7 @@ static void test_SPI_SETKEYBOARDDELAY( void ) /* 23 */ static BOOL dotest_spi_iconverticalspacing( INT curr_val) { BOOL rc; - INT spacing, regval; + INT spacing, regval, min_val = MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ); ICONMETRICSA im; rc=SystemParametersInfoA( SPI_ICONVERTICALSPACING, curr_val, 0, @@ -1061,7 +1061,7 @@ static BOOL dotest_spi_iconverticalspacing( INT curr_val) if (!test_error_msg(rc,"SPI_ICONVERTICALSPACING")) return FALSE; ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_ICONVERTICALSPACING, 0 ); - if( curr_val < 32) curr_val = 32; + curr_val = max( curr_val, min_val ); /* The registry keys depend on the Windows version and the values too * let's test (works on win95,ME,NT4,2k,XP) */

1 0

Hugh McMaster : reg/tests: Add a few more import tests.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 4bee2b4f4198ba03016721fe81d223bee1c2c72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bee2b4f4198ba03016721fe8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:12:07 2017 +0000 reg/tests: Add a few more import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9799815..0771391 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1233,12 +1233,14 @@ static void test_import(void) "\"Wine33a\"=dword:\n" "\"Wine33b\"=dword:hello\n" "\"Wine33c\"=dword:123456789\n" - "\"Wine33d\"=dword:012345678\n\n", &r); + "\"Wine33d\"=dword:012345678\n" + "\"Wine33e\"=dword:000000001\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine33a"); todo_wine verify_reg_nonexist(hkey, "Wine33b"); todo_wine verify_reg_nonexist(hkey, "Wine33c"); todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1273,6 +1275,14 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine37a\"=\"foo\"bar\"\n" + "\"Wine37b\"=\"foo\"\"bar\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine37a"); + todo_wine verify_reg_nonexist(hkey, "Wine37b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1655,12 +1665,14 @@ static void test_import(void) "\"Wine33a\"=dword:\n" "\"Wine33b\"=dword:hello\n" "\"Wine33c\"=dword:123456789\n" - "\"Wine33d\"=dword:012345678\n\n", &r); + "\"Wine33d\"=dword:012345678\n" + "\"Wine33e\"=dword:000000001\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine33a"); todo_wine verify_reg_nonexist(hkey, "Wine33b"); todo_wine verify_reg_nonexist(hkey, "Wine33c"); todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1695,6 +1707,14 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine37a\"=\"foo\"bar\"\n" + "\"Wine37b\"=\"foo\"\"bar\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine37a"); + todo_wine verify_reg_nonexist(hkey, "Wine37b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n"

1 0

Henri Verbeet : wined3d: Invalidate sub-levels in wined3d_texture_add_dirty_region().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 6a307598b19813bd5a65982eb2e8d4df43e08207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a307598b19813bd5a65982eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:36 2017 +0200 wined3d: Invalidate sub-levels in wined3d_texture_add_dirty_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 17 ++++++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d97f467..88667b4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5518,7 +5518,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6fe7c8b..65bc8fc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17618,7 +17618,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6997378..3219305 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1639,8 +1639,8 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) { + unsigned int sub_resource_idx, i; struct wined3d_context *context; - unsigned int sub_resource_idx; TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); @@ -1649,19 +1649,22 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, WARN("Invalid layer %u specified.\n", layer); return WINED3DERR_INVALIDCALL; } - sub_resource_idx = layer * texture->level_count; if (dirty_region) FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); context = context_acquire(texture->resource.device, NULL, 0); - if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + sub_resource_idx = layer * texture->level_count; + for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) { - ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); - context_release(context); - return E_OUTOFMEMORY; + if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + { + ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); + context_release(context); + return E_OUTOFMEMORY; + } + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); } - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); context_release(context); return WINED3D_OK;

1 0

Alistair Leslie-Hughes : odbccp32: Look in LOCAL_MACHINE for the driver.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 3b5a8707e6c1c8ea94df59372aac7bc34c47925d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5a8707e6c1c8ea94df59372… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 10 04:30:36 2017 +0000 odbccp32: Look in LOCAL_MACHINE for the driver. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 666d8c0..f28d464 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -260,7 +260,7 @@ static HMODULE load_config_driver(const WCHAR *driver) DWORD size = 0, type; HKEY hkey; - if ((ret = RegOpenKeyW(HKEY_CURRENT_USER, odbcini, &hkey)) == ERROR_SUCCESS) + if ((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) { HKEY hkeydriver;

1 0

Owen Rudge : wsdapi: Add stub implementation of IWSDiscoveryPublisher.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: ab326fe56f91d8ce8fd42cea174b213743b41cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab326fe56f91d8ce8fd42cea1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Apr 6 22:19:39 2017 +0100 wsdapi: Add stub implementation of IWSDiscoveryPublisher. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/discovery.c | 295 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 2 +- 3 files changed, 297 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab326fe56f91d8ce8fd42…

1 0

Józef Kucia : wined3d: Use register mask for SV_IsFrontFace pixel shader inputs.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: f8e05f5f0559e1216f0cc1210fe2252b55a38e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e05f5f0559e1216f0cc1210… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:37 2017 +0200 wined3d: Use register mask for SV_IsFrontFace pixel shader inputs. 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/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c8a970f..1130b20 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6440,9 +6440,8 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w } else if (input->sysval_semantic == WINED3D_SV_IS_FRONT_FACE) { - shader_addline(buffer, "ps_in[%u] = vec4(" - "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", - input->register_idx); + shader_addline(buffer, "ps_in[%u]%s = uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u);\n", + input->register_idx, reg_mask); } else if (input->sysval_semantic == WINED3D_SV_RENDER_TARGET_ARRAY_INDEX && !semantic_idx) {

1 0

Hugh McMaster : reg/tests: Add tests for importing DWORD values.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 47f506a1e1b50d56e4892912c1a89ef4a2cb584f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f506a1e1b50d56e4892912c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 10 09:50:02 2017 +0000 reg/tests: Add tests for importing DWORD values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 90d4a46..9799815 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1220,6 +1220,59 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine32a\"=dword:1\n" + "\"Wine32b\"=dword:4444\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1; + todo_wine verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); + dword = 0x4444; + todo_wine verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=dword:\n" + "\"Wine33b\"=dword:hello\n" + "\"Wine33c\"=dword:123456789\n" + "\"Wine33d\"=dword:012345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine34a\"=dword:12345678abc\n" + "\"Wine34b\"=dword:12345678 abc\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine34a"); + todo_wine verify_reg_nonexist(hkey, "Wine34b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine35a\"=dword:0x123\n" + "\"Wine35b\"=dword:123 456\n" + "\"Wine35c\"=dword:1234 5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine35a"); + todo_wine verify_reg_nonexist(hkey, "Wine35b"); + todo_wine verify_reg_nonexist(hkey, "Wine35c"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine36a\"=dword:1234;5678\n" + "\"Wine36b\"=dword:1234 ;5678\n" + "\"Wine36c\"=dword:1234#5678\n" + "\"Wine36d\"=dword:1234 #5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1234; + todo_wine verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine36c"); + todo_wine verify_reg_nonexist(hkey, "Wine36d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1589,6 +1642,59 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine32a\"=dword:1\n" + "\"Wine32b\"=dword:4444\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1; + todo_wine verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); + dword = 0x4444; + todo_wine verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=dword:\n" + "\"Wine33b\"=dword:hello\n" + "\"Wine33c\"=dword:123456789\n" + "\"Wine33d\"=dword:012345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine34a\"=dword:12345678abc\n" + "\"Wine34b\"=dword:12345678 abc\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine34a"); + todo_wine verify_reg_nonexist(hkey, "Wine34b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine35a\"=dword:0x123\n" + "\"Wine35b\"=dword:123 456\n" + "\"Wine35c\"=dword:1234 5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine35a"); + todo_wine verify_reg_nonexist(hkey, "Wine35b"); + todo_wine verify_reg_nonexist(hkey, "Wine35c"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine36a\"=dword:1234;5678\n" + "\"Wine36b\"=dword:1234 ;5678\n" + "\"Wine36c\"=dword:1234#5678\n" + "\"Wine36d\"=dword:1234 #5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1234; + todo_wine verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine36c"); + todo_wine verify_reg_nonexist(hkey, "Wine36d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n" @@ -1822,6 +1928,15 @@ static void test_import_with_whitespace(void) todo_wine verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); todo_wine verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=dword: 00000008\n" + "\"Wine9b\"=dword:\t\t00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x00000008; + todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); @@ -1941,6 +2056,15 @@ static void test_import_with_whitespace(void) todo_wine verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); todo_wine verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=dword: 00000008\n" + "\"Wine9b\"=dword:\t\t00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x00000008; + todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err);

1 0

Stefan Dösinger : comctl32/tests: Extend PGM_SETCHILD tests.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 310eb883b7d4f8629b99f1414141777399abd087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=310eb883b7d4f8629b99f1414… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:02:03 2017 +0200 comctl32/tests: Extend PGM_SETCHILD tests. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 9a0bb08..e7ce748 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -27,9 +27,10 @@ #define NUM_MSG_SEQUENCES 1 #define PAGER_SEQ_INDEX 0 -static HWND parent_wnd, child1_wnd; +static HWND parent_wnd, child1_wnd, child2_wnd; #define CHILD1_ID 1 +#define CHILD2_ID 2 static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -42,10 +43,28 @@ static const struct message set_child_seq[] = { { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, { WM_WINDOWPOSCHANGED, sent }, { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD1_ID }, - { WM_NCCALCSIZE, sent|wparam|id, TRUE, 0, CHILD1_ID }, + { WM_NCCALCSIZE, sent|wparam|id|optional, TRUE, 0, CHILD1_ID }, { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD1_ID }, { WM_WINDOWPOSCHANGED, sent|id, 0, 0, CHILD1_ID }, - { WM_SIZE, sent|id|defwinproc, 0, 0, CHILD1_ID }, + { WM_SIZE, sent|id|defwinproc|optional, 0, 0, CHILD1_ID }, + { 0 } +}; + +/* This differs from the above message list only in the child window that is + * expected to receive the child messages. No message is sent to the old child. + * Also child 2 is hidden while child 1 is visible. The pager does not make the + * hidden child visible. */ +static const struct message switch_child_seq[] = { + { PGM_SETCHILD, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD2_ID }, + { WM_NCCALCSIZE, sent|wparam|id, TRUE, 0, CHILD2_ID }, + { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD2_ID }, + { WM_WINDOWPOSCHANGED, sent|id, 0, 0, CHILD2_ID }, + { WM_SIZE, sent|id|defwinproc, 0, 0, CHILD2_ID }, { 0 } }; @@ -201,6 +220,8 @@ static LRESULT WINAPI child_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM if (hwnd == child1_wnd) msg.id = CHILD1_ID; + else if (hwnd == child2_wnd) + msg.id = CHILD2_ID; else msg.id = 0; @@ -246,6 +267,8 @@ static void test_pager(void) child1_wnd = CreateWindowA( "Pager test child class", "button", WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 300, 300, pager, 0, GetModuleHandleA(0), 0 ); + child2_wnd = CreateWindowA("Pager test child class", "button", WS_CHILD | WS_BORDER, 0, 0, 300, 300, + pager, 0, GetModuleHandleA(0), 0); flush_sequences( sequences, NUM_MSG_SEQUENCES ); SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd ); @@ -254,6 +277,21 @@ static void test_pager(void) ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top ); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child2_wnd); + ok_sequence(sequences, PAGER_SEQ_INDEX, switch_child_seq, "switch to invisible child", TRUE); + GetWindowRect(pager, &rect); + ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, + "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); + todo_wine ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "switch to visible child", TRUE); + GetWindowRect(pager, &rect); + ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, + "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); + flush_sequences( sequences, NUM_MSG_SEQUENCES ); SendMessageA( pager, PGM_SETPOS, 0, 10 ); ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_seq, "set pos", TRUE);

1 0

Stefan Dösinger : comctl32/tests: Test messages sent to the pager child.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: b73bf3bac393a63141abd5026243c277e7c682db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73bf3bac393a63141abd5026… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:02:02 2017 +0200 comctl32/tests: Test messages sent to the pager child. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 75 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 372b227..9a0bb08 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -27,7 +27,9 @@ #define NUM_MSG_SEQUENCES 1 #define PAGER_SEQ_INDEX 0 -static HWND parent_wnd; +static HWND parent_wnd, child1_wnd; + +#define CHILD1_ID 1 static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -39,6 +41,11 @@ static const struct message set_child_seq[] = { { WM_NCCALCSIZE, sent|wparam, TRUE }, { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, { WM_WINDOWPOSCHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD1_ID }, + { WM_NCCALCSIZE, sent|wparam|id, TRUE, 0, CHILD1_ID }, + { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD1_ID }, + { WM_WINDOWPOSCHANGED, sent|id, 0, 0, CHILD1_ID }, + { WM_SIZE, sent|id|defwinproc, 0, 0, CHILD1_ID }, { 0 } }; @@ -49,7 +56,20 @@ static const struct message set_pos_seq[] = { { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|optional }, + /* The WM_SIZE handler sends WM_WINDOWPOSCHANGING, WM_CHILDACTIVATE + * and WM_WINDOWPOSCHANGED (which sends WM_MOVE) to the child. + * Another WM_WINDOWPOSCHANGING is sent afterwards. + * + * The 2nd WM_WINDOWPOSCHANGING is unconditional, but the comparison + * function is too simple to roll back an accepted message, so we have + * to mark the 2nd message optional. */ { WM_SIZE, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD1_ID }, /* Actually optional. */ + { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD1_ID }, /* Actually optional. */ + { WM_WINDOWPOSCHANGED, sent|id|optional, TRUE, 0, CHILD1_ID}, + { WM_MOVE, sent|id|optional|defwinproc, 0, 0, CHILD1_ID }, + { WM_WINDOWPOSCHANGING, sent|id|optional, 0, 0, CHILD1_ID }, /* Actually not optional. */ + { WM_CHILDACTIVATE, sent|id|optional, 0, 0, CHILD1_ID }, /* Actually not optional. */ { 0 } }; @@ -166,9 +186,53 @@ static HWND create_pager_control( DWORD style ) return hwnd; } +static LRESULT WINAPI child_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg; + static LONG defwndproc_counter; + LRESULT ret; + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + + if (hwnd == child1_wnd) + msg.id = CHILD1_ID; + else + msg.id = 0; + + add_message(sequences, PAGER_SEQ_INDEX, &msg); + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static BOOL register_child_wnd_class(void) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = child_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "Pager test child class"; + return RegisterClassA(&cls); +} + static void test_pager(void) { - HWND pager, child; + HWND pager; RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); @@ -177,11 +241,14 @@ static void test_pager(void) win_skip( "Pager control not supported\n" ); return; } - child = CreateWindowA( "BUTTON", "button", WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 300, 300, + + register_child_wnd_class(); + + child1_wnd = CreateWindowA( "Pager test child class", "button", WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 300, 300, pager, 0, GetModuleHandleA(0), 0 ); flush_sequences( sequences, NUM_MSG_SEQUENCES ); - SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child ); + SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd ); ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "set child", TRUE); GetWindowRect( pager, &rect ); ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100,

1 0

Paul Gofman : d3dx9/tests: Add tests for effect state manager.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: de8e03c48613d85856bf323e0f55fed370092cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e03c48613d85856bf323e0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 10 20:45:42 2017 +0200 d3dx9/tests: Add tests for effect state manager. 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 | 376 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 376 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de8e03c48613d85856bf3…

1 0