From: Connor McAdams cmcadams@codeweavers.com
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/d3dx9_36/surface.c | 15 +++++-- dlls/d3dx9_36/tests/surface.c | 76 +++++++++++++++++------------------ 2 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 060aa76bd76..e6ee986dace 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -648,6 +648,11 @@ static const enum d3dx_pixel_format_id png_save_pixel_formats[] = D3DX_PIXEL_FORMAT_R16G16B16A16_UNORM };
+static const enum d3dx_pixel_format_id jpg_save_pixel_formats[] = +{ + D3DX_PIXEL_FORMAT_B8G8R8_UNORM, +}; + static enum d3dx_pixel_format_id d3dx_get_closest_d3dx_pixel_format_id(const enum d3dx_pixel_format_id *format_ids, uint32_t format_ids_size, enum d3dx_pixel_format_id format_id) { @@ -758,6 +763,11 @@ static HRESULT d3dx_save_pixels_to_memory(struct d3dx_pixels *src_pixels, const dst_format); break;
+ case D3DXIFF_JPG: + dst_format = d3dx_get_closest_d3dx_pixel_format_id(jpg_save_pixel_formats, ARRAY_SIZE(jpg_save_pixel_formats), + dst_format); + break; + default: assert(0 && "Unexpected file format."); return E_FAIL; @@ -827,6 +837,7 @@ static HRESULT d3dx_save_pixels_to_memory(struct d3dx_pixels *src_pixels, const }
case D3DXIFF_PNG: + case D3DXIFF_JPG: if (src_fmt_desc == dst_fmt_desc) dst_pixels = *src_pixels; else @@ -3268,12 +3279,10 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE case D3DXIFF_DIB: container_format = &GUID_ContainerFormatBmp; break; - case D3DXIFF_JPG: - container_format = &GUID_ContainerFormatJpeg; - break; case D3DXIFF_DDS: case D3DXIFF_TGA: case D3DXIFF_PNG: + case D3DXIFF_JPG: return save_surface_to_memory(dst_buffer, src_surface, src_palette, src_rect, file_format); case D3DXIFF_HDR: case D3DXIFF_PFM: diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 0abac129502..7a92d01ec50 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -3867,7 +3867,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) { { D3DFMT_P8, test_palette, 0x00, { { D3D_OK, D3DFMT_P8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -3878,7 +3878,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A8P8, test_palette, 0x00, { { D3D_OK, D3DFMT_P8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -3980,7 +3980,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) */ { D3DFMT_A8B8G8R8, NULL, 0x00, { { D3D_OK, D3DFMT_A8B8G8R8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -3991,7 +3991,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_X8B8G8R8, NULL, 0x00, { { D3D_OK, D3DFMT_X8B8G8R8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4024,7 +4024,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A1R5G5B5, NULL, 0x00, { { D3D_OK, D3DFMT_A1R5G5B5, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4035,7 +4035,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_R3G3B2, NULL, 0x00, { { D3D_OK, D3DFMT_P8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4046,7 +4046,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A8R3G3B2, NULL, 0x00, { { D3D_OK, D3DFMT_A8R3G3B2, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4057,7 +4057,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A4R4G4B4, NULL, 0x00, { { D3D_OK, D3DFMT_A4R4G4B4, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4068,7 +4068,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_X4R4G4B4, NULL, 0x00, { { D3D_OK, D3DFMT_X4R4G4B4, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4079,7 +4079,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A2R10G10B10, NULL, 0x00, { { D3D_OK, D3DFMT_A2R10G10B10, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4090,7 +4090,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A2B10G10R10, NULL, 0x00, { { D3D_OK, D3DFMT_A2B10G10R10, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4112,7 +4112,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_G16R16, NULL, 0x00, { { D3D_OK, D3DFMT_G16R16, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4123,7 +4123,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A8, NULL, 0x00, { { D3D_OK, D3DFMT_A8R3G3B2, .todo_hr = TRUE }, - { D3DERR_INVALIDCALL, .todo_hr = TRUE }, + { D3DERR_INVALIDCALL }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3DERR_INVALIDCALL, .todo_hr = TRUE }, @@ -4134,7 +4134,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A8L8, NULL, 0x00, { { D3D_OK, D3DFMT_A8L8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4145,7 +4145,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A4L4, NULL, 0x00, { { D3D_OK, D3DFMT_A4R4G4B4, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4162,7 +4162,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) */ { D3DFMT_L8, NULL, 0x00, { { D3D_OK, D3DFMT_P8, .todo_format = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_format = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4173,7 +4173,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_L16, NULL, 0x00, { { D3D_OK, D3DFMT_L16, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4184,7 +4184,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT1, NULL, 0x00, { { D3D_OK, D3DFMT_A8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4195,7 +4195,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT2, NULL, 0x00, { { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4206,7 +4206,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT2, NULL, 0xff, { { D3D_OK, D3DFMT_A8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4217,7 +4217,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT3, NULL, 0x00, { { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4228,7 +4228,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT3, NULL, 0xff, { { D3D_OK, D3DFMT_A8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4239,7 +4239,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT4, NULL, 0x00, { { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4250,7 +4250,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT4, NULL, 0xff, { { D3D_OK, D3DFMT_A8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4261,7 +4261,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT5, NULL, 0x00, { { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4272,7 +4272,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_DXT5, NULL, 0xff, { { D3D_OK, D3DFMT_A8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4283,7 +4283,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_R16F, NULL, 0x00, { { D3D_OK, D3DFMT_G16R16, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4294,7 +4294,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_G16R16F, NULL, 0x00, { { D3D_OK, D3DFMT_G16R16, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4305,7 +4305,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A16B16G16R16F, NULL, 0x00, { { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4316,7 +4316,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_R32F, NULL, 0x00, { { D3D_OK, D3DFMT_G16R16, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4327,7 +4327,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_G32R32F, NULL, 0x00, { { D3D_OK, D3DFMT_G16R16, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4338,7 +4338,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A32B32G32R32F, NULL, 0x00, { { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, - { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, + { D3D_OK, D3DFMT_X8R8G8B8 }, { D3D_OK, D3DFMT_A8R8G8B8 }, { D3D_OK, D3DFMT_A16B16G16R16 }, { D3D_OK, D3DFMT_X8R8G8B8, .todo_hr = TRUE }, @@ -4349,7 +4349,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_Q8W8V8U8, NULL, 0x00, { { D3DERR_INVALIDCALL, .todo_hr = TRUE }, - { D3DERR_INVALIDCALL, .todo_hr = TRUE }, + { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL, .todo_hr = TRUE }, @@ -4360,7 +4360,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_V8U8, NULL, 0x00, { { D3DERR_INVALIDCALL, .todo_hr = TRUE }, - { D3DERR_INVALIDCALL, .todo_hr = TRUE }, + { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL, .todo_hr = TRUE }, @@ -4371,7 +4371,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_V16U16, NULL, 0x00, { { D3DERR_INVALIDCALL, .todo_hr = TRUE }, - { D3DERR_INVALIDCALL, .todo_hr = TRUE }, + { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL, .todo_hr = TRUE }, @@ -4382,7 +4382,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_X8L8V8U8, NULL, 0x00, { { D3DERR_INVALIDCALL, .todo_hr = TRUE }, - { D3DERR_INVALIDCALL, .todo_hr = TRUE }, + { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL, .todo_hr = TRUE }, @@ -4393,7 +4393,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_A2W10V10U10, NULL, 0x00, { { D3DERR_INVALIDCALL, .todo_hr = TRUE }, - { D3DERR_INVALIDCALL, .todo_hr = TRUE }, + { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL, .todo_hr = TRUE }, @@ -4404,7 +4404,7 @@ static void test_save_surface_iffs(IDirect3DDevice9 *device) }, { D3DFMT_Q16W16V16U16, NULL, 0x00, { { D3DERR_INVALIDCALL, .todo_hr = TRUE }, - { D3DERR_INVALIDCALL, .todo_hr = TRUE }, + { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL }, { D3DERR_INVALIDCALL, .todo_hr = TRUE },