On 15 September 2013 14:25, Akihiro Sagawa sagawa.aki@gmail.com wrote:
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 83cdaf9..9f9e12a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1308,7 +1308,7 @@ static void test_reset(void) D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &volume_texture); ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); hr = IDirect3DDevice8_Reset(device1, &d3dpp);
ok(hr == D3DERR_DEVICELOST, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL);
ok(hr == D3DERR_DEVICELOST, "Reset returned %#x, expected %#x.\n", hr, D3DERR_DEVICELOST);
I think Alexandre has an opinion on when this kind of patch is appropriate and when it isn't. Regardless, purely for the parts that touch Direct3D, I'd say that if you're changing these messages anyway, you may as well change them to something along the lines of "Got unexpected hr %#x.\n", since the expected value isn't that useful anyway.