February 2016 - Wine-Commits

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_UnlockRect().
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 4394c3b8033ed0a28188ca0cd68d6a52c210d4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4394c3b8033ed0a28188ca0cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:33 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_UnlockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f3fcd4e..c4b986d 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -317,20 +317,16 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le static HRESULT WINAPI d3d8_texture_2d_UnlockRect(IDirect3DTexture8 *iface, UINT level) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface8_UnlockRect(&surface_impl->IDirect3DSurface8_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_LockRect().
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 5c1a6e358d20c5818d6575aaabc08f0f68a897d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1a6e358d20c5818d6575aaa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:32 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_2d_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f64604b..f3fcd4e 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -298,7 +298,6 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; HRESULT hr; @@ -306,13 +305,10 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface8_LockRect(&surface_impl->IDirect3DSurface8_iface, locked_rect, rect, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : libwine: Move the codepage tables to libwine_port.
by Alexandre Julliard Feb. 18, 2016

Feb. 18, 2016

Module: wine Branch: master Commit: 2087f38e8478ff8596a5a2038f8607aecfe2faa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2087f38e8478ff8596a5a2038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 14:33:10 2016 +0900 libwine: Move the codepage tables to libwine_port. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 73 +++++++++++++++++++++++++++++++++++++++++++ libs/{wine => port}/c_037.c | 0 libs/{wine => port}/c_10000.c | 0 libs/{wine => port}/c_10001.c | 0 libs/{wine => port}/c_10002.c | 0 libs/{wine => port}/c_10003.c | 0 libs/{wine => port}/c_10004.c | 0 libs/{wine => port}/c_10005.c | 0 libs/{wine => port}/c_10006.c | 0 libs/{wine => port}/c_10007.c | 0 libs/{wine => port}/c_10008.c | 0 libs/{wine => port}/c_10010.c | 0 libs/{wine => port}/c_10017.c | 0 libs/{wine => port}/c_10021.c | 0 libs/{wine => port}/c_10029.c | 0 libs/{wine => port}/c_1006.c | 0 libs/{wine => port}/c_10079.c | 0 libs/{wine => port}/c_10081.c | 0 libs/{wine => port}/c_10082.c | 0 libs/{wine => port}/c_1026.c | 0 libs/{wine => port}/c_1250.c | 0 libs/{wine => port}/c_1251.c | 0 libs/{wine => port}/c_1252.c | 0 libs/{wine => port}/c_1253.c | 0 libs/{wine => port}/c_1254.c | 0 libs/{wine => port}/c_1255.c | 0 libs/{wine => port}/c_1256.c | 0 libs/{wine => port}/c_1257.c | 0 libs/{wine => port}/c_1258.c | 0 libs/{wine => port}/c_1361.c | 0 libs/{wine => port}/c_20127.c | 0 libs/{wine => port}/c_20866.c | 0 libs/{wine => port}/c_20932.c | 0 libs/{wine => port}/c_21866.c | 0 libs/{wine => port}/c_28591.c | 0 libs/{wine => port}/c_28592.c | 0 libs/{wine => port}/c_28593.c | 0 libs/{wine => port}/c_28594.c | 0 libs/{wine => port}/c_28595.c | 0 libs/{wine => port}/c_28596.c | 0 libs/{wine => port}/c_28597.c | 0 libs/{wine => port}/c_28598.c | 0 libs/{wine => port}/c_28599.c | 0 libs/{wine => port}/c_28600.c | 0 libs/{wine => port}/c_28603.c | 0 libs/{wine => port}/c_28604.c | 0 libs/{wine => port}/c_28605.c | 0 libs/{wine => port}/c_28606.c | 0 libs/{wine => port}/c_424.c | 0 libs/{wine => port}/c_437.c | 0 libs/{wine => port}/c_500.c | 0 libs/{wine => port}/c_737.c | 0 libs/{wine => port}/c_775.c | 0 libs/{wine => port}/c_850.c | 0 libs/{wine => port}/c_852.c | 0 libs/{wine => port}/c_855.c | 0 libs/{wine => port}/c_856.c | 0 libs/{wine => port}/c_857.c | 0 libs/{wine => port}/c_860.c | 0 libs/{wine => port}/c_861.c | 0 libs/{wine => port}/c_862.c | 0 libs/{wine => port}/c_863.c | 0 libs/{wine => port}/c_864.c | 0 libs/{wine => port}/c_865.c | 0 libs/{wine => port}/c_866.c | 0 libs/{wine => port}/c_869.c | 0 libs/{wine => port}/c_874.c | 0 libs/{wine => port}/c_875.c | 0 libs/{wine => port}/c_878.c | 0 libs/{wine => port}/c_932.c | 0 libs/{wine => port}/c_936.c | 0 libs/{wine => port}/c_949.c | 0 libs/{wine => port}/c_950.c | 0 libs/{wine => port}/cptable.c | 4 +-- libs/wine/Makefile.in | 73 ------------------------------------------- libs/wine/port.c | 2 ++ tools/make_unicode | 4 +-- 77 files changed, 79 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2087f38e8478ff8596a5a…

1 0

Hugh McMaster : reg/tests: Add a test for /s with no separator character.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 5a2ddc8d25c5560f7bfc7fd0575a74033de784bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2ddc8d25c5560f7bfc7fd05… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:06 2016 +1100 reg/tests: Add a test for /s with no separator character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1958be0..a813de1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -355,6 +355,9 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi13 /t REG_MULTI_SZ /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Alexandre Julliard : wininet/tests: Remove todo from a succeeding test.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 61d1c95ea40835b208d5f9c6b246230a189326b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d1c95ea40835b208d5f9c6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 02:03:22 2016 +0900 wininet/tests: Remove todo from a succeeding test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 36710b7..82fd10b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -216,8 +216,7 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL i size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(res, "[2] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); - todo_wine_if (is_todo) - ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); sprintf(exbuf, "%u", excode);

1 0

Frédéric Delanoy : d3d8/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: cdf961a0f1b164bb5a1605dc3e3c6b6870d9fe24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf961a0f1b164bb5a1605dc3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 23:16:02 2016 +0100 d3d8/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 ++++------------ dlls/d3d8/tests/visual.c | 5 +---- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5dba46c..32e2f09 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2712,10 +2712,8 @@ static void test_wndproc(void) * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ hr = IDirect3DDevice8_TestCooperativeLevel(device); - if (hr == D3DERR_DEVICENOTRESET) + todo_wine_if (hr != D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); - else - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); expect_messages = focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or @@ -2736,9 +2734,7 @@ static void test_wndproc(void) ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device); /* Focus-follows-mouse WMs prematurely reactivate our window. */ - if (hr == D3DERR_DEVICENOTRESET) - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); - else + todo_wine_if (hr == D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); @@ -6313,9 +6309,7 @@ static void test_update_volumetexture(void) ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); - if (FAILED(hr)) - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); - else + todo_wine_if (FAILED(hr)) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture8_Release(src); @@ -7837,9 +7831,7 @@ static void test_swapchain_parameters(void) for (j = 0; j < bb_count; ++j) { hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - if (j) - todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); - else + todo_wine_if (j) ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); if (SUCCEEDED(hr)) IDirect3DSurface8_Release(backbuffer); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index db2e0db..856df5d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5829,10 +5829,7 @@ static void test_fog_interpolation(void) color = getPixelColor(device, 0, 240); ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 320, 240); - if (tests[i].todo) - todo_wine ok(color_match(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(color_match(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 639, 240);

1 0

Frédéric Delanoy : d3d9/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 77c05ebc4efd2d44082d40cc8bc5d196edd4cd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c05ebc4efd2d44082d40cc8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 23:16:01 2016 +0100 d3d9/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 10 ++-------- dlls/d3d9/tests/device.c | 24 +++++------------------- dlls/d3d9/tests/visual.c | 22 ++++------------------ 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 99ba823..b74ae47 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2869,12 +2869,9 @@ static void test_window_style(void) ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); style = GetWindowLongA(device_window, GWL_STYLE); - if (tests[i].style_flags & WS_VISIBLE) + todo_wine_if (!(tests[i].style_flags & WS_VISIBLE)) ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); - else - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", - device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); @@ -2890,12 +2887,9 @@ static void test_window_style(void) ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); style = GetWindowLongA(device_window, GWL_STYLE); - if (device_style & WS_VISIBLE) + todo_wine_if (!(device_style & WS_VISIBLE)) ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); - else - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", - device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5bf7121..f31a7cd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -668,11 +668,7 @@ static void test_fvf_decl_conversion(void) hr = IDirect3DDevice9_GetFVF(device, &fvf); ok(SUCCEEDED(hr), "Test %u: Failed to get FVF, hr %#x.\n", i, hr); - if (decl_to_fvf_tests[i].todo) - todo_wine ok(fvf == decl_to_fvf_tests[i].fvf, - "Test %u: Got unexpected FVF %#x, expected %#x.\n", - i, fvf, decl_to_fvf_tests[i].fvf); - else + todo_wine_if (decl_to_fvf_tests[i].todo) ok(fvf == decl_to_fvf_tests[i].fvf, "Test %u: Got unexpected FVF %#x, expected %#x.\n", i, fvf, decl_to_fvf_tests[i].fvf); @@ -3681,10 +3677,8 @@ static void test_wndproc(void) * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ hr = IDirect3DDevice9_TestCooperativeLevel(device); - if (hr == D3DERR_DEVICENOTRESET) + todo_wine_if (hr != D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); - else - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); expect_messages = tests[i].focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or @@ -4483,18 +4477,12 @@ static void test_window_style(void) style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].style; - if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) - todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", - expected_style, style, i); - else + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); expected_style = device_exstyle | tests[i].exstyle; - if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) - todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", - expected_style, style, i); - else + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); @@ -8873,9 +8861,7 @@ static void test_update_volumetexture(void) ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); - if (FAILED(hr)) - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); - else + todo_wine_if (FAILED(hr)) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8b56dbe..274777b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1450,15 +1450,11 @@ static void color_fill_test(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, NULL, 0xdeadbeef); - if (formats[i].flags & TODO_FILL_RETURN) - todo_wine ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); - else + todo_wine_if (formats[i].flags & TODO_FILL_RETURN) ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, &rect, 0xdeadbeef); - if (formats[i].flags & TODO_FILL_RETURN) - todo_wine ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); - else + todo_wine_if (formats[i].flags & TODO_FILL_RETURN) ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); if (SUCCEEDED(hr)) @@ -8472,14 +8468,7 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - if (tests[i].todo) - { - todo_wine ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", - i, color0, tests[i].color0); - todo_wine ok(color_match(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", - i, color1, tests[i].color1); - } - else + todo_wine_if (tests[i].todo) { ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); @@ -18123,10 +18112,7 @@ static void test_fog_interpolation(void) color = getPixelColor(device, 0, 240); ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 320, 240); - if (tests[i].todo) - todo_wine ok(color_match(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(color_match(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 639, 240);

1 0

Frédéric Delanoy : ddraw/tests: Use todo_wine_if () in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 3e5321409258d0043b897e7552eb4cd3e96d44f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5321409258d0043b897e755… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 15:34:31 2016 +0100 ddraw/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 10 +--------- dlls/ddraw/tests/ddraw1.c | 10 ++-------- dlls/ddraw/tests/ddraw2.c | 10 ++-------- dlls/ddraw/tests/ddraw4.c | 16 +++------------- dlls/ddraw/tests/ddraw7.c | 26 +++++--------------------- 5 files changed, 13 insertions(+), 59 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec4197a..06f16f3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3312,17 +3312,9 @@ static void FindDevice(void) hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - if (deviceGUIDs[i].todo) - { - todo_wine - ok(hr == D3D_OK, - "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); - } - else - { + todo_wine_if (deviceGUIDs[i].todo) ok(hr == D3D_OK, "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); - } } /* Curiously the color model criteria seem to be ignored. */ diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4090b26..1e1a2ff 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7240,18 +7240,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5c0bb52..75bdc84 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8394,18 +8394,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 950d458..a092787 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5201,11 +5201,7 @@ static void test_block_formats_creation(void) expect_hr = D3D_OK; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); - if (todo) - todo_wine ok(hr == expect_hr, - "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", - hr, formats[i].name, types[j].name, w, h, expect_hr); - else + todo_wine_if (todo) ok(hr == expect_hr, "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", hr, formats[i].name, types[j].name, w, h, expect_hr); @@ -9348,18 +9344,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface4_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface4_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 216ce38..d7589a8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4996,11 +4996,7 @@ static void test_block_formats_creation(void) expect_hr = D3D_OK; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); - if (todo) - todo_wine ok(hr == expect_hr, - "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", - hr, formats[i].name, types[j].name, w, h, expect_hr); - else + todo_wine_if (todo) ok(hr == expect_hr, "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", hr, formats[i].name, types[j].name, w, h, expect_hr); @@ -8862,10 +8858,7 @@ static void test_fog_interpolation(void) color = get_surface_color(rt, 0, 240); ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = get_surface_color(rt, 320, 240); - if (tests[i].todo) - todo_wine ok(compare_color(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(compare_color(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = get_surface_color(rt, 639, 240); @@ -9618,18 +9611,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface7_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); @@ -10737,10 +10724,7 @@ static void test_lockrect_invalid(void) locked_desc.dwSize = sizeof(locked_desc); hr = IDirectDrawSurface7_Lock(surface, rect, &locked_desc, DDLOCK_WAIT, NULL); - if (SUCCEEDED(resources[r].hr)) - todo_wine ok(hr == resources[r].hr, "Lock returned %#x for rect [%d, %d]->[%d, %d], type %s.\n", - hr, rect->left, rect->top, rect->right, rect->bottom, resources[r].name); - else + todo_wine_if (SUCCEEDED(resources[r].hr)) ok(hr == resources[r].hr, "Lock returned %#x for rect [%d, %d]->[%d, %d], type %s.\n", hr, rect->left, rect->top, rect->right, rect->bottom, resources[r].name); if (SUCCEEDED(hr))

1 0

Hugh McMaster : reg: Fail if the separator for REG_MULTI_SZ is not one character in length.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 8a902f37618e42ff6e1e6ec82173b10fd3fcfac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a902f37618e42ff6e1e6ec82… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:07 2016 +1100 reg: Fail if the separator for REG_MULTI_SZ is not one character in length. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bcd812a..7dc624a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -579,7 +579,7 @@ int wmain(int argc, WCHAR *argvW[]) { WCHAR *ptr = argvW[++i]; - if (!ptr) + if (!ptr || strlenW(ptr) != 1) { output_message(STRING_INVALID_CMDLINE); return 1;

1 0

Hugh McMaster : reg: Fail if /s is used without an accompanying argument.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 46bdc153f129a32bd88eefc484d27db3e89ac881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bdc153f129a32bd88eefc48… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 17 23:41:05 2016 +1100 reg: Fail if /s is used without an accompanying argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ef25fe5..bcd812a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -576,7 +576,16 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashTW)) type = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashSW)) - separator = argvW[++i][0]; + { + WCHAR *ptr = argvW[++i]; + + if (!ptr) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = ptr[0]; + } else if (!lstrcmpiW(argvW[i], slashDW)) { if (!(data = argvW[++i]))

1 0