Skip to content

W
wine-cw
Commit c79cd999 authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard
Browse files
Options

windowscodecs/tests: Avoid "misleading indentation" warnings.

Signed-off-by: 's avatarFabian Maurer <dark.shadow4@web.de> Signed-off-by: 's avatarEsme Povirk <esme@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 95bfc0fc
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
dlls/windowscodecs/tests/bitmap.c
View file @ c79cd999
...@@ -867,7 +867,7 @@ static void test_CreateBitmapFromHBITMAP(void) ...@@ -867,7 +867,7 @@ static void test_CreateBitmapFromHBITMAP(void)
ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr);
IWICBitmap_GetPixelFormat(bitmap, &format); IWICBitmap_GetPixelFormat(bitmap, &format);
todo_wine todo_wine
ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed),
"unexpected pixel format %s\n", wine_dbgstr_guid(&format)); "unexpected pixel format %s\n", wine_dbgstr_guid(&format));
...@@ -887,7 +887,7 @@ todo_wine ...@@ -887,7 +887,7 @@ todo_wine
hr = IWICPalette_GetColorCount(palette, &count); hr = IWICPalette_GetColorCount(palette, &count);
ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(hr == S_OK, "GetColorCount error %#x\n", hr);
todo_wine todo_wine
ok(count == 16, "expected 16, got %u\n", count); ok(count == 16, "expected 16, got %u\n", count);
IWICPalette_Release(palette); IWICPalette_Release(palette);
......
dlls/windowscodecs/tests/converter.c
View file @ c79cd999
...@@ -1223,7 +1223,7 @@ static void test_set_frame_palette(IWICBitmapFrameEncode *frameencode) ...@@ -1223,7 +1223,7 @@ static void test_set_frame_palette(IWICBitmapFrameEncode *frameencode)
ok(hr == S_OK, "CreatePalette failed, hr=%x\n", hr); ok(hr == S_OK, "CreatePalette failed, hr=%x\n", hr);
hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette);
todo_wine todo_wine
ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr=%x\n", hr); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr=%x\n", hr);
hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedHalftone256, FALSE); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedHalftone256, FALSE);
......
dlls/windowscodecs/tests/icoformat.c
View file @ c79cd999
...@@ -164,7 +164,7 @@ static void test_ico_data_(void *data, DWORD data_size, HRESULT init_hr, int tod ...@@ -164,7 +164,7 @@ static void test_ico_data_(void *data, DWORD data_size, HRESULT init_hr, int tod
{ {
hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream,
WICDecodeMetadataCacheOnDemand); WICDecodeMetadataCacheOnDemand);
todo_wine_if(todo) todo_wine_if(todo)
ok_(__FILE__, line)(hr == init_hr, "Initialize failed, hr=%x\n", hr); ok_(__FILE__, line)(hr == init_hr, "Initialize failed, hr=%x\n", hr);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
......
dlls/windowscodecs/tests/info.c
View file @ c79cd999
...@@ -177,7 +177,7 @@ static void test_decoder_info(void) ...@@ -177,7 +177,7 @@ static void test_decoder_info(void)
len = 0; len = 0;
hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len);
ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr);
todo_wine_if(test->todo) todo_wine_if(test->todo)
ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len);
hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL);
...@@ -186,7 +186,7 @@ static void test_decoder_info(void) ...@@ -186,7 +186,7 @@ static void test_decoder_info(void)
len = 0; len = 0;
hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len);
ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr);
todo_wine_if(test->todo) todo_wine_if(test->todo)
ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len);
value[0] = 0; value[0] = 0;
...@@ -198,7 +198,7 @@ static void test_decoder_info(void) ...@@ -198,7 +198,7 @@ static void test_decoder_info(void)
} }
hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len);
ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr);
todo_wine_if(test->todo) todo_wine_if(test->todo)
ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len);
hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len);
...@@ -250,7 +250,7 @@ static void test_decoder_info(void) ...@@ -250,7 +250,7 @@ static void test_decoder_info(void)
hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len);
ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr);
todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
ok(len == lstrlenW(extensionsW) + 1, "%u: GetFileExtensions returned wrong len %i\n", i, len); ok(len == lstrlenW(extensionsW) + 1, "%u: GetFileExtensions returned wrong len %i\n", i, len);
hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL);
...@@ -258,27 +258,27 @@ static void test_decoder_info(void) ...@@ -258,27 +258,27 @@ static void test_decoder_info(void)
hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len);
ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr);
todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len);
value[0] = 0; value[0] = 0;
hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len);
ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr);
todo_wine_if(test->todo) todo_wine_if(test->todo)
ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value));
todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len);
hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len);
ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%x\n", hr); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%x\n", hr);
todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len);
hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len);
ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr);
todo_wine_if(test->todo) todo_wine_if(test->todo)
ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value));
todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder))
ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len);
IWICBitmapDecoderInfo_Release(decoder_info); IWICBitmapDecoderInfo_Release(decoder_info);
...@@ -559,7 +559,7 @@ static void test_reader_info(void) ...@@ -559,7 +559,7 @@ static void test_reader_info(void)
IWICComponentInfo_Release(info); IWICComponentInfo_Release(info);
hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMPStructMetadataReader, &info); hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMPStructMetadataReader, &info);
todo_wine todo_wine
ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr);
if (FAILED(hr)) if (FAILED(hr))
......
dlls/windowscodecs/tests/pngformat.c
View file @ c79cd999
...@@ -824,7 +824,7 @@ todo_wine_if(td[i].todo_load) ...@@ -824,7 +824,7 @@ todo_wine_if(td[i].todo_load)
hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
todo_wine_if(td[i].todo) todo_wine_if(td[i].todo)
ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS),
"PLTE+tRNS: expected %s, got %s (type %d, bpp %d)\n", "PLTE+tRNS: expected %s, got %s (type %d, bpp %d)\n",
wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth);
...@@ -907,7 +907,7 @@ todo_wine_if(td[i].todo_load) ...@@ -907,7 +907,7 @@ todo_wine_if(td[i].todo_load)
hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
todo_wine_if(td[i].todo) todo_wine_if(td[i].todo)
ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS),
"tRNS: expected %s, got %s (type %d, bpp %d)\n", "tRNS: expected %s, got %s (type %d, bpp %d)\n",
wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth);
......
dlls/windowscodecs/tests/stream.c
View file @ c79cd999
...@@ -32,7 +32,7 @@ static void _check_cur_pos(IStream *stream, ULONGLONG expected_pos, BOOL todo, u ...@@ -32,7 +32,7 @@ static void _check_cur_pos(IStream *stream, ULONGLONG expected_pos, BOOL todo, u
offset.QuadPart = 0; offset.QuadPart = 0;
hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &pos); hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &pos);
ok_(__FILE__, line)(hr == S_OK, "Failed to get current position, hr %#x.\n", hr); ok_(__FILE__, line)(hr == S_OK, "Failed to get current position, hr %#x.\n", hr);
todo_wine_if(todo) todo_wine_if(todo)
ok_(__FILE__, line)(pos.QuadPart == expected_pos, "Unexpected stream position %s.\n", ok_(__FILE__, line)(pos.QuadPart == expected_pos, "Unexpected stream position %s.\n",
wine_dbgstr_longlong(pos.QuadPart)); wine_dbgstr_longlong(pos.QuadPart));
} }
......
dlls/windowscodecs/tests/tiffformat.c
View file @ c79cd999
...@@ -551,7 +551,7 @@ static void test_QueryCapability(void) ...@@ -551,7 +551,7 @@ static void test_QueryCapability(void)
/* CreateDecoderFromStream fails if seeked past the start */ /* CreateDecoderFromStream fails if seeked past the start */
hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder);
todo_wine todo_wine
ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment