Zebediah Figura : quartz/filesource: Correctly initialize the default media type.
Alexandre Julliard
julliard at winehq.org
Fri Feb 22 15:22:10 CST 2019
Module: wine
Branch: master
Commit: a67ad095280b882f0293277003eacc2003567f0e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67ad095280b882f0293277003eacc2003567f0e
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Feb 21 18:42:57 2019 -0600
quartz/filesource: Correctly initialize the default media type.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/filesource.c | 4 ++--
dlls/quartz/tests/filesource.c | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index ab8d645..44794df 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -623,8 +623,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi
This->pmt->cbFormat = 0;
This->pmt->pbFormat = NULL;
This->pmt->pUnk = NULL;
- This->pmt->lSampleSize = 0;
- This->pmt->formattype = FORMAT_None;
+ This->pmt->lSampleSize = 1;
+ This->pmt->formattype = GUID_NULL;
hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL);
if (FAILED(hr))
{
diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c
index 845e74d..2e287f7 100644
--- a/dlls/quartz/tests/filesource.c
+++ b/dlls/quartz/tests/filesource.c
@@ -237,11 +237,9 @@ static void test_file_source_filter(void)
ok(file_mt.bFixedSizeSamples == TRUE, "Got fixed size %d.\n", file_mt.bFixedSizeSamples);
ok(file_mt.bTemporalCompression == FALSE, "Got temporal compression %d.\n",
file_mt.bTemporalCompression);
-todo_wine {
ok(file_mt.lSampleSize == 1, "Got sample size %u.\n", file_mt.lSampleSize);
ok(IsEqualGUID(&file_mt.formattype, &GUID_NULL), "Got format type %s.\n",
wine_dbgstr_guid(&file_mt.formattype));
-}
ok(!file_mt.pUnk, "Got pUnk %p.\n", file_mt.pUnk);
ok(!file_mt.cbFormat, "Got format size %#x.\n", file_mt.cbFormat);
ok(!file_mt.pbFormat, "Got format %p.\n", file_mt.pbFormat);
More information about the wine-cvs
mailing list