avifil32: Fix EditStreamSetInfo wine checks
Alexandre Goujon
ale.goujon at gmail.com
Sun Aug 15 04:55:24 CDT 2010
---
dlls/avifil32/api.c | 7 +++--
dlls/avifil32/editstream.c | 5 ---
dlls/avifil32/tests/api.c | 62 ++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 8ef75d3..c11fad2 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -2150,9 +2150,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
TRACE("(%p,%p,%d)\n", pstream, asi, size);
- if (pstream == NULL)
- return AVIERR_BADHANDLE;
- if ((DWORD)size < sizeof(AVISTREAMINFOA))
+ if (size != sizeof(AVISTREAMINFOA))
return AVIERR_BADSIZE;
memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName));
@@ -2173,6 +2171,9 @@ HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
TRACE("(%p,%p,%d)\n", pstream, asi, size);
+ if (size != sizeof(AVISTREAMINFOW))
+ return AVIERR_BADSIZE;
+
hr = IAVIStream_QueryInterface(pstream, &IID_IAVIEditStream,(LPVOID*)&pEdit);
if (SUCCEEDED(hr) && pEdit != NULL) {
hr = IAVIEditStream_SetInfo(pEdit, asi, size);
diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c
index f19f3ac..2e826e2 100644
--- a/dlls/avifil32/editstream.c
+++ b/dlls/avifil32/editstream.c
@@ -775,13 +775,8 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface,
TRACE("(%p,%p,%d)\n",iface,asi,size);
/* check parameters */
- if (asi == NULL)
- return AVIERR_BADPARAM;
if (size != sizeof(AVISTREAMINFOW))
return AVIERR_BADSIZE;
- if (asi->dwScale == 0 || asi->dwRate == 0 || (LONG)asi->dwQuality < -1 ||
- asi->dwQuality > ICQUALITY_HIGH)
- return AVIERR_ERROR;
This->sInfo.wLanguage = asi->wLanguage;
This->sInfo.wPriority = asi->wPriority;
diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c
index fe295bf..96e8c3e 100644
--- a/dlls/avifil32/tests/api.c
+++ b/dlls/avifil32/tests/api.c
@@ -171,6 +171,63 @@ static DWORD data[] =
/* ########################### */
+static void test_EditStreamSetInfo(void)
+{
+ PAVISTREAM stream = NULL;
+ HRESULT hres;
+ AVISTREAMINFO info, backup;
+
+ hres = CreateEditableStream(&stream, NULL);
+ ok(hres == AVIERR_OK, "got 0x%08X, expected AVIERR_OK\n", hres);
+
+ hres = AVIStreamInfo(stream, &info, sizeof(AVISTREAMINFO) );
+ ok( hres == 0, "got 0x%08X, expected 0\n", hres);
+ backup = info;
+
+
+ /*
+ The following test crashes so there is no NULL check for the first parameter
+ hres = EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) );
+ */
+
+ hres = EditStreamSetInfo(stream, NULL, 0);
+ ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres);
+
+ hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO)-1 );
+ ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres);
+
+ hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO)+1 );
+ ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres);
+
+ /*
+ The following test crashes so :
+ the size is checked
+ if the size is correct, there is not NULL check for the second argument
+ hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) );
+ */
+
+ info.dwScale = 0;
+ hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) );
+ ok( hres == 0, "got 0x%08X, expected 0\n", hres);
+
+ info = backup;
+ info.dwRate = 0;
+ hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) );
+ ok( hres == 0, "got 0x%08X, expected 0\n", hres);
+
+ info = backup;
+ info.dwQuality = -2;
+ hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) );
+ ok( hres == 0, "got 0x%08X, expected 0\n", hres);
+
+ info = backup;
+ info.dwQuality = ICQUALITY_HIGH + 1;
+ hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) );
+ ok( hres == 0, "got 0x%08X, expected 0\n", hres);
+
+ AVIStreamRelease(stream);
+}
+
static void test_AVISaveOptions(void)
{
AVICOMPRESSOPTIONS options[2];
@@ -194,11 +251,11 @@ static void test_AVISaveOptions(void)
SetLastError(0xdeadbeef);
hres = EditStreamSetNameA(streams[0], winetest0);
- todo_wine ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres);
+ ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres);
SetLastError(0xdeadbeef);
hres = EditStreamSetNameA(streams[1], winetest1);
- todo_wine ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres);
+ ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres);
if (winetest_interactive) {
SetLastError(0xdeadbeef);
@@ -451,6 +508,7 @@ START_TEST(api)
{
AVIFileInit();
+ test_EditStreamSetInfo();
test_AVISaveOptions();
test_default_data();
test_amh_corruption();
--
1.7.0.4
More information about the wine-patches
mailing list