windowscodecs/tests: Fix the spelling of a couple of variable names.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2020-05-16 12:18:08 +02:00 committed by Alexandre Julliard
parent 45a63e5b3c
commit fe2435c93f
2 changed files with 10 additions and 10 deletions

View File

@ -234,16 +234,16 @@ static void test_dds_decoder_initialize(void)
static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder)
{ {
HRESULT hr; HRESULT hr;
IWICPalette *pallette = NULL; IWICPalette *palette = NULL;
IWICMetadataQueryReader *metadata_reader = NULL; IWICMetadataQueryReader *metadata_reader = NULL;
IWICBitmapSource *preview = NULL, *thumnail = NULL; IWICBitmapSource *preview = NULL, *thumnail = NULL;
IWICColorContext *color_context = NULL; IWICColorContext *color_context = NULL;
UINT count; UINT count;
hr = IWICImagingFactory_CreatePalette(factory, &pallette); hr = IWICImagingFactory_CreatePalette(factory, &palette);
ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr); ok (hr == S_OK, "CreatePalette failed, hr=%x\n", hr);
if (hr == S_OK) { if (hr == S_OK) {
hr = IWICBitmapDecoder_CopyPalette(decoder, pallette); hr = IWICBitmapDecoder_CopyPalette(decoder, palette);
ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr);
hr = IWICBitmapDecoder_CopyPalette(decoder, NULL); hr = IWICBitmapDecoder_CopyPalette(decoder, NULL);
ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Expected hr=WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr);
@ -269,7 +269,7 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder)
hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL); hr = IWICBitmapDecoder_GetThumbnail(decoder, NULL);
ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); ok (hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "Expected hr=WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr);
if (pallette) IWICPalette_Release(pallette); if (palette) IWICPalette_Release(palette);
if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader); if (metadata_reader) IWICMetadataQueryReader_Release(metadata_reader);
if (preview) IWICBitmapSource_Release(preview); if (preview) IWICBitmapSource_Release(preview);
if (color_context) IWICColorContext_Release(color_context); if (color_context) IWICColorContext_Release(color_context);

View File

@ -402,7 +402,7 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma
return hr; return hr;
} }
static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channels, BOOL *trasparency) static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channels, BOOL *transparency)
{ {
HRESULT hr; HRESULT hr;
IWICComponentInfo *info; IWICComponentInfo *info;
@ -415,7 +415,7 @@ static HRESULT get_pixelformat_info(const GUID *format, UINT *bpp, UINT *channel
hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo2, (void **)&formatinfo); hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo2, (void **)&formatinfo);
if (hr == S_OK) if (hr == S_OK)
{ {
hr = IWICPixelFormatInfo2_SupportsTransparency(formatinfo, trasparency); hr = IWICPixelFormatInfo2_SupportsTransparency(formatinfo, transparency);
ok(hr == S_OK, "SupportsTransparency error %#x\n", hr); ok(hr == S_OK, "SupportsTransparency error %#x\n", hr);
IWICPixelFormatInfo2_Release(formatinfo); IWICPixelFormatInfo2_Release(formatinfo);
} }
@ -1093,7 +1093,7 @@ static void test_color_formats(void)
IWICBitmapFrameDecode *frame; IWICBitmapFrameDecode *frame;
GUID format; GUID format;
UINT count, i, bpp, channels, ret; UINT count, i, bpp, channels, ret;
BOOL trasparency; BOOL transparency;
struct IFD_entry *tag, *tag_photo = NULL, *tag_bps = NULL, *tag_samples = NULL, *tag_colormap = NULL; struct IFD_entry *tag, *tag_photo = NULL, *tag_bps = NULL, *tag_samples = NULL, *tag_colormap = NULL;
struct IFD_entry *tag_width = NULL, *tag_height = NULL, *tag_extra_samples = NULL; struct IFD_entry *tag_width = NULL, *tag_height = NULL, *tag_extra_samples = NULL;
short *bps; short *bps;
@ -1236,12 +1236,12 @@ static void test_color_formats(void)
i, td[i].photometric, td[i].samples, td[i].extra_samples, td[i].bps, i, td[i].photometric, td[i].samples, td[i].extra_samples, td[i].bps,
wine_dbgstr_guid(td[i].data->format), wine_dbgstr_guid(&format)); wine_dbgstr_guid(td[i].data->format), wine_dbgstr_guid(&format));
trasparency = (td[i].photometric == 2 && td[i].samples == 4); /* for XP */ transparency = (td[i].photometric == 2 && td[i].samples == 4); /* for XP */
hr = get_pixelformat_info(&format, &bpp, &channels, &trasparency); hr = get_pixelformat_info(&format, &bpp, &channels, &transparency);
ok(hr == S_OK, "%u: get_pixelformat_bpp error %#x\n", i, hr); ok(hr == S_OK, "%u: get_pixelformat_bpp error %#x\n", i, hr);
ok(bpp == td[i].data->bpp, "%u: expected %u, got %u\n", i, td[i].data->bpp, bpp); ok(bpp == td[i].data->bpp, "%u: expected %u, got %u\n", i, td[i].data->bpp, bpp);
ok(channels == td[i].samples, "%u: expected %u, got %u\n", i, td[i].samples, channels); ok(channels == td[i].samples, "%u: expected %u, got %u\n", i, td[i].samples, channels);
ok(trasparency == (td[i].photometric == 2 && td[i].samples == 4), "%u: got %u\n", i, trasparency); ok(transparency == (td[i].photometric == 2 && td[i].samples == 4), "%u: got %u\n", i, transparency);
memset(pixels, 0, sizeof(pixels)); memset(pixels, 0, sizeof(pixels));
hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, width_bytes(td[i].data->width, bpp), sizeof(pixels), pixels); hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, width_bytes(td[i].data->width, bpp), sizeof(pixels), pixels);