ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wincodecs: Fix scaler return pixel format for uninitialized case. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2018-11-09 14:26:46 +03:00 committed by Alexandre Julliard
parent 5976988b1e
commit 85d6be3e9e
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/windowscodecs/scaler.c
View File

@ -130,7 +130,10 @@ static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface,
return E_INVALIDARG; return E_INVALIDARG;
if (!This->source) if (!This->source)
return WINCODEC_ERR_WRONGSTATE; {
memcpy(pPixelFormat, &GUID_WICPixelFormatDontCare, sizeof(*pPixelFormat));
return S_OK;
}
return IWICBitmapSource_GetPixelFormat(This->source, pPixelFormat); return IWICBitmapSource_GetPixelFormat(This->source, pPixelFormat);
} }

19
dlls/windowscodecs/tests/bitmap.c
View File

@ -1082,6 +1082,7 @@ static void test_WICCreateBitmapFromSectionEx(void)
static void test_bitmap_scaler(void) static void test_bitmap_scaler(void)
{ {
WICPixelFormatGUID pixel_format;
IWICBitmapScaler *scaler; IWICBitmapScaler *scaler;
IWICBitmap *bitmap; IWICBitmap *bitmap;
UINT width, height; UINT width, height;
@ -1112,6 +1113,15 @@ static void test_bitmap_scaler(void)
hr = IWICBitmapScaler_GetSize(scaler, &width, NULL); hr = IWICBitmapScaler_GetSize(scaler, &width, NULL);
ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr);
hr = IWICBitmapScaler_GetPixelFormat(scaler, NULL);
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
memset(&pixel_format, 0, sizeof(pixel_format));
hr = IWICBitmapScaler_GetPixelFormat(scaler, &pixel_format);
ok(hr == S_OK, "Failed to get pixel format, hr %#x.\n", hr);
ok(IsEqualGUID(&pixel_format, &GUID_WICPixelFormatDontCare), "Unexpected pixel format %s.\n",
wine_dbgstr_guid(&pixel_format));
width = 123; width = 123;
height = 321; height = 321;
hr = IWICBitmapScaler_GetSize(scaler, &width, &height); hr = IWICBitmapScaler_GetSize(scaler, &width, &height);
@ -1170,6 +1180,15 @@ static void test_bitmap_scaler(void)
hr = IWICBitmapScaler_GetSize(scaler, NULL, NULL); hr = IWICBitmapScaler_GetSize(scaler, NULL, NULL);
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
hr = IWICBitmapScaler_GetPixelFormat(scaler, NULL);
ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
memset(&pixel_format, 0, sizeof(pixel_format));
hr = IWICBitmapScaler_GetPixelFormat(scaler, &pixel_format);
ok(hr == S_OK, "Failed to get pixel format, hr %#x.\n", hr);
ok(IsEqualGUID(&pixel_format, &GUID_WICPixelFormat24bppBGR), "Unexpected pixel format %s.\n",
wine_dbgstr_guid(&pixel_format));
IWICBitmapScaler_Release(scaler); IWICBitmapScaler_Release(scaler);
IWICBitmap_Release(bitmap); IWICBitmap_Release(bitmap);