Author: cwittich
Date: Mon Apr 5 11:44:43 2010
New Revision: 46730
URL:
http://svn.reactos.org/svn/reactos?rev=46730&view=rev
Log:
[quartz]
sync quartz to wine 1.1.42
Modified:
trunk/reactos/dll/directx/quartz/avidec.c
trunk/reactos/dll/directx/quartz/avisplit.c
Modified: trunk/reactos/dll/directx/quartz/avidec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/avidec.…
==============================================================================
--- trunk/reactos/dll/directx/quartz/avidec.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/avidec.c [iso-8859-1] Mon Apr 5 11:44:43 2010
@@ -203,7 +203,7 @@
bmi = &format2->bmiHeader;
else
goto failed;
- TRACE("Fourcc: %s\n", debugstr_an((char *)&pmt->subtype.Data1,
4));
+ TRACE("Fourcc: %s\n", debugstr_an((const char
*)&pmt->subtype.Data1, 4));
This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi,
NULL, ICMODE_DECOMPRESS);
if (This->hvid)
Modified: trunk/reactos/dll/directx/quartz/avisplit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/avispli…
==============================================================================
--- trunk/reactos/dll/directx/quartz/avisplit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/avisplit.c [iso-8859-1] Mon Apr 5 11:44:43 2010
@@ -692,7 +692,7 @@
amt.formattype = FORMAT_WaveFormatEx;
break;
default:
- FIXME("fccType %.4s not handled yet\n", (char
*)&pStrHdr->fccType);
+ FIXME("fccType %.4s not handled yet\n", (const char
*)&pStrHdr->fccType);
amt.formattype = FORMAT_None;
}
amt.majortype = MEDIATYPE_Video;
@@ -793,7 +793,7 @@
TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType);
TRACE("bIndexType: %hd\n", pIndex->bIndexType);
TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse);
- TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId);
+ TRACE("dwChunkId: %.4s\n", (const char
*)&pIndex->dwChunkId);
if (pIndex->dwReserved[0])
TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]);
if (pIndex->dwReserved[2])