mfplat/tests: Use correct integral type.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-03-04 10:55:44 +03:00 committed by Alexandre Julliard
parent b3073dc14a
commit de243ad218
1 changed files with 16 additions and 11 deletions

View File

@ -1154,8 +1154,9 @@ static void test_media_type(void)
IMFMediaType *mediatype, *mediatype2; IMFMediaType *mediatype, *mediatype2;
IMFVideoMediaType *video_type; IMFVideoMediaType *video_type;
IUnknown *unk, *unk2; IUnknown *unk, *unk2;
DWORD count, flags;
BOOL compressed; BOOL compressed;
DWORD flags;
UINT count;
HRESULT hr; HRESULT hr;
GUID guid; GUID guid;
@ -1956,10 +1957,11 @@ static void test_MFCreateMFByteStreamOnStream(void)
IMFByteStream *bytestream2; IMFByteStream *bytestream2;
IStream *stream; IStream *stream;
IMFAttributes *attributes = NULL; IMFAttributes *attributes = NULL;
DWORD caps, written, count; DWORD caps, written;
IUnknown *unknown; IUnknown *unknown;
ULONG ref, size; ULONG ref, size;
HRESULT hr; HRESULT hr;
UINT count;
if(!pMFCreateMFByteStreamOnStream) if(!pMFCreateMFByteStreamOnStream)
{ {
@ -2061,10 +2063,11 @@ static void test_file_stream(void)
IMFAttributes *attributes = NULL; IMFAttributes *attributes = NULL;
MF_ATTRIBUTE_TYPE item_type; MF_ATTRIBUTE_TYPE item_type;
WCHAR pathW[MAX_PATH]; WCHAR pathW[MAX_PATH];
DWORD caps, count;
WCHAR *filename; WCHAR *filename;
HRESULT hr; HRESULT hr;
WCHAR *str; WCHAR *str;
DWORD caps;
UINT count;
BOOL eos; BOOL eos;
filename = load_resource(L"test.mp4"); filename = load_resource(L"test.mp4");
@ -4234,6 +4237,7 @@ image_size_tests[] =
static void test_MFCalculateImageSize(void) static void test_MFCalculateImageSize(void)
{ {
DWORD plane_size;
unsigned int i; unsigned int i;
UINT32 size; UINT32 size;
HRESULT hr; HRESULT hr;
@ -4258,11 +4262,11 @@ static void test_MFCalculateImageSize(void)
if (pMFGetPlaneSize) if (pMFGetPlaneSize)
{ {
unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; unsigned int expected = ptr->plane_size ? ptr->plane_size : ptr->size;
hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &plane_size);
ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr);
ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); ok(plane_size == expected, "%u: unexpected plane size %u, expected %u.\n", i, plane_size, expected);
} }
} }
} }
@ -4270,7 +4274,7 @@ static void test_MFCalculateImageSize(void)
static void test_MFGetPlaneSize(void) static void test_MFGetPlaneSize(void)
{ {
unsigned int i; unsigned int i;
UINT32 size; DWORD size;
HRESULT hr; HRESULT hr;
if (!pMFGetPlaneSize) if (!pMFGetPlaneSize)
@ -5685,12 +5689,13 @@ static void test_MFCreate2DMediaBuffer(void)
{ 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 },
{ 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, { 4, 1, D3DFMT_A8R8G8B8, 16, 64 },
}; };
unsigned int max_length, length, length2; DWORD max_length, length, length2;
BYTE *buffer_start, *data, *data2; BYTE *buffer_start, *data, *data2;
int i, j, k, pitch, pitch2, stride; LONG pitch, pitch2, stride;
IMF2DBuffer2 *_2dbuffer2; IMF2DBuffer2 *_2dbuffer2;
IMF2DBuffer *_2dbuffer; IMF2DBuffer *_2dbuffer;
IMFMediaBuffer *buffer; IMFMediaBuffer *buffer;
int i, j, k;
HRESULT hr; HRESULT hr;
BOOL ret; BOOL ret;
@ -5986,7 +5991,7 @@ static void test_MFCreateMediaBufferFromMediaType(void)
{ 2, 0, 0, 4, 16, 52 }, { 2, 0, 0, 4, 16, 52 },
}; };
IMFMediaBuffer *buffer; IMFMediaBuffer *buffer;
UINT32 length; DWORD length;
HRESULT hr; HRESULT hr;
IMFMediaType *media_type; IMFMediaType *media_type;
unsigned int i; unsigned int i;
@ -7094,11 +7099,11 @@ static void test_sample_allocator_sysmem(void)
IMFVideoSampleAllocatorCallback *allocator_cb; IMFVideoSampleAllocatorCallback *allocator_cb;
IMFVideoSampleAllocatorEx *allocatorex; IMFVideoSampleAllocatorEx *allocatorex;
IMFVideoSampleAllocator *allocator; IMFVideoSampleAllocator *allocator;
unsigned int buffer_count;
IMFSample *sample, *sample2; IMFSample *sample, *sample2;
IMFAttributes *attributes; IMFAttributes *attributes;
IMFMediaBuffer *buffer; IMFMediaBuffer *buffer;
LONG refcount, count; LONG refcount, count;
DWORD buffer_count;
IUnknown *unk; IUnknown *unk;
HRESULT hr; HRESULT hr;