[akhaldi] 61336: [QUARTZ] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in ...
22 Dec
2013
22 Dec
'13
5:03 p.m.
Author: akhaldi
Date: Sun Dec 22 17:03:20 2013
New Revision: 61336
URL: http://svn.reactos.org/svn/reactos?rev=61336&view=rev
Log:
[QUARTZ]
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716
Modified:
trunk/reactos/dll/directx/wine/quartz/acmwrapper.c
trunk/reactos/dll/directx/wine/quartz/avidec.c
trunk/reactos/dll/directx/wine/quartz/avisplit.c
trunk/reactos/dll/directx/wine/quartz/dsoundrender.c
trunk/reactos/dll/directx/wine/quartz/enumfilters.c
trunk/reactos/dll/directx/wine/quartz/enummedia.c
trunk/reactos/dll/directx/wine/quartz/enummoniker.c
trunk/reactos/dll/directx/wine/quartz/enumregfilters.c
trunk/reactos/dll/directx/wine/quartz/filesource.c
trunk/reactos/dll/directx/wine/quartz/filtergraph.c
trunk/reactos/dll/directx/wine/quartz/filtermapper.c
trunk/reactos/dll/directx/wine/quartz/main.c
trunk/reactos/dll/directx/wine/quartz/memallocator.c
trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
trunk/reactos/dll/directx/wine/quartz/nullrenderer.c
trunk/reactos/dll/directx/wine/quartz/parser.c
trunk/reactos/dll/directx/wine/quartz/pin.c
trunk/reactos/dll/directx/wine/quartz/quartz_private.h
trunk/reactos/dll/directx/wine/quartz/regsvr.c
trunk/reactos/dll/directx/wine/quartz/systemclock.c
trunk/reactos/dll/directx/wine/quartz/videorenderer.c
trunk/reactos/dll/directx/wine/quartz/vmr9.c
trunk/reactos/dll/directx/wine/quartz/waveparser.c
Modified: trunk/reactos/dll/directx/wine/quartz/acmwrapper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ac…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/acmwrapper.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -18,26 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-#include <mmreg.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dshow.h"
-//#include "strmif.h"
-//#include "vfwmsgs.h"
-#include <msacm.h>
-
-#include <assert.h>
-
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct ACMWrapperImpl
{
Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/avidec.c [iso-8859-1] Sun Dec 22 17:03:20 2013
@@ -18,27 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-//#include "amvideo.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dshow.h"
-//#include "strmif.h"
-//#include "vfwmsgs.h"
-#include <vfw.h>
-#include <dvdmedia.h>
-
-#include <assert.h>
-
-//#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct AVIDecImpl
{
Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -30,29 +30,12 @@
*/
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-#include <vfw.h>
-#include <aviriff.h>
-//#include "vfwmsgs.h"
-//#include "amvideo.h"
-
-//#include <wine/unicode.h>
-#include <wine/debug.h>
-
-//#include <math.h>
-#include <assert.h>
-
-#include "parser.h"
#define TWOCCFromFOURCC(fcc) HIWORD(fcc)
/* four character codes used in AVI files */
#define ckidINFO mmioFOURCC('I','N','F','O')
#define ckidREC mmioFOURCC('R','E','C',' ')
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct StreamData
{
Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -18,25 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-//#include "vfwmsgs.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dshow.h"
-//#include "evcode.h"
-//#include "strmif.h"
-//#include "dsound.h"
-//#include "amaudio.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
/* NOTE: buffer can still be filled completely,
* but we start waiting until only this amount is buffered
Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -19,10 +19,6 @@
*/
#include "quartz_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct IEnumFiltersImpl
{
Modified: trunk/reactos/dll/directx/wine/quartz/enummedia.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/enummedia.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/enummedia.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -20,10 +20,6 @@
#include "quartz_private.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
-
void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt)
{
if (!pmt)
Modified: trunk/reactos/dll/directx/wine/quartz/enummoniker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/enummoniker.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/enummoniker.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -18,13 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define COBJMACROS
-
#include "quartz_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct EnumMonikerImpl
{
Modified: trunk/reactos/dll/directx/wine/quartz/enumregfilters.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/enumregfilters.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/enumregfilters.c [iso-8859-1] Sun Dec 22
17:03:20 2013
@@ -19,12 +19,6 @@
*/
#include "quartz_private.h"
-
-#include <wine/unicode.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct IEnumRegFiltersImpl
{
Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -18,22 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
#include "quartz_private.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include "pin.h"
-//#include "uuids.h"
-//#include "vfwmsgs.h"
-//#include "winbase.h"
-//#include "winreg.h"
#include <shlwapi.h>
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
static const WCHAR wszOutputPinName[] = {
'O','u','t','p','u','t',0 };
Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -18,28 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "shlwapi.h"
-#include "dshow.h"
-#include <wine/debug.h>
#include "quartz_private.h"
-#include "ole2.h"
-#include "olectl.h"
-#include <strmif.h>
-#include "vfwmsgs.h"
-#include "evcode.h"
-#include <wine/unicode.h>
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct {
HWND hWnd; /* Target window */
Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -19,27 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winreg.h"
-//#include "winerror.h"
-
#include "quartz_private.h"
-//#include "ole2.h"
-//#include "olectl.h"
-//#include "strmif.h"
-#include <wine/unicode.h>
-//#include "uuids.h"
#include <initguid.h>
#include <fil_data.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0]))
@@ -401,24 +384,24 @@
rrf.dwVersion = prf2->dwVersion;
rrf.dwMerit = prf2->dwMerit;
- rrf.dwPins = prf2->cPins2;
+ rrf.dwPins = prf2->u.s2.cPins2;
rrf.dwUnused = 0;
add_data(&mainStore, (LPBYTE)&rrf, sizeof(rrf));
- for (i = 0; i < prf2->cPins2; i++)
+ for (i = 0; i < prf2->u.s2.cPins2; i++)
{
size += sizeof(struct REG_RFP);
- if (prf2->rgPins2[i].clsPinCategory)
+ if (prf2->u.s2.rgPins2[i].clsPinCategory)
size += sizeof(DWORD);
- size += prf2->rgPins2[i].nMediaTypes * sizeof(struct REG_TYPE);
- size += prf2->rgPins2[i].nMediums * sizeof(DWORD);
- }
-
- for (i = 0; i < prf2->cPins2; i++)
+ size += prf2->u.s2.rgPins2[i].nMediaTypes * sizeof(struct REG_TYPE);
+ size += prf2->u.s2.rgPins2[i].nMediums * sizeof(DWORD);
+ }
+
+ for (i = 0; i < prf2->u.s2.cPins2; i++)
{
struct REG_RFP rrfp;
- REGFILTERPINS2 rgPin2 = prf2->rgPins2[i];
+ REGFILTERPINS2 rgPin2 = prf2->u.s2.rgPins2[i];
unsigned int j;
rrfp.signature[0] = '0';
@@ -520,9 +503,9 @@
prf2->dwVersion = prrf->dwVersion;
prf2->dwMerit = prrf->dwMerit;
- prf2->cPins2 = prrf->dwPins;
+ prf2->u.s2.cPins2 = prrf->dwPins;
rgPins2 = CoTaskMemAlloc(prrf->dwPins * sizeof(*rgPins2));
- prf2->rgPins2 = rgPins2;
+ prf2->u.s2.rgPins2 = rgPins2;
pCurrent += sizeof(struct REG_RF);
for (i = 0; i < prrf->dwPins; i++)
@@ -604,21 +587,21 @@
static void FM2_DeleteRegFilter(REGFILTER2 * prf2)
{
UINT i;
- for (i = 0; i < prf2->cPins2; i++)
+ for (i = 0; i < prf2->u.s2.cPins2; i++)
{
UINT j;
- if (prf2->rgPins2[i].clsPinCategory)
- CoTaskMemFree((LPVOID)prf2->rgPins2[i].clsPinCategory);
-
- for (j = 0; j < prf2->rgPins2[i].nMediaTypes; j++)
+ if (prf2->u.s2.rgPins2[i].clsPinCategory)
+ CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].clsPinCategory);
+
+ for (j = 0; j < prf2->u.s2.rgPins2[i].nMediaTypes; j++)
{
- CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType[j].clsMajorType);
- CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType[j].clsMinorType);
+ CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType[j].clsMajorType);
+ CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType[j].clsMinorType);
}
- CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMediaType);
- CoTaskMemFree((LPVOID)prf2->rgPins2[i].lpMedium);
- }
- CoTaskMemFree((LPVOID)prf2->rgPins2);
+ CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMediaType);
+ CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].lpMedium);
+ }
+ CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2);
}
static HRESULT WINAPI FilterMapper3_RegisterFilter(
@@ -663,24 +646,24 @@
/* REGFILTER2 structure is converted from version 1 to 2. Tested on Win2k. */
regfilter2.dwVersion = 2;
regfilter2.dwMerit = prf2->dwMerit;
- regfilter2.cPins2 = prf2->cPins;
- pregfp2 = CoTaskMemAlloc(prf2->cPins * sizeof(REGFILTERPINS2));
- regfilter2.rgPins2 = pregfp2;
- for (i = 0; i < prf2->cPins; i++)
+ regfilter2.u.s2.cPins2 = prf2->u.s1.cPins;
+ pregfp2 = CoTaskMemAlloc(prf2->u.s1.cPins * sizeof(REGFILTERPINS2));
+ regfilter2.u.s2.rgPins2 = pregfp2;
+ for (i = 0; i < prf2->u.s1.cPins; i++)
{
flags = 0;
- if (prf2->rgPins[i].bRendered)
+ if (prf2->u.s1.rgPins[i].bRendered)
flags |= REG_PINFLAG_B_RENDERER;
- if (prf2->rgPins[i].bOutput)
+ if (prf2->u.s1.rgPins[i].bOutput)
flags |= REG_PINFLAG_B_OUTPUT;
- if (prf2->rgPins[i].bZero)
+ if (prf2->u.s1.rgPins[i].bZero)
flags |= REG_PINFLAG_B_ZERO;
- if (prf2->rgPins[i].bMany)
+ if (prf2->u.s1.rgPins[i].bMany)
flags |= REG_PINFLAG_B_MANY;
pregfp2[i].dwFlags = flags;
pregfp2[i].cInstances = 1;
- pregfp2[i].nMediaTypes = prf2->rgPins[i].nMediaTypes;
- pregfp2[i].lpMediaType = prf2->rgPins[i].lpMediaType;
+ pregfp2[i].nMediaTypes = prf2->u.s1.rgPins[i].nMediaTypes;
+ pregfp2[i].lpMediaType = prf2->u.s1.rgPins[i].lpMediaType;
pregfp2[i].nMediums = 0;
pregfp2[i].lpMedium = NULL;
pregfp2[i].clsPinCategory = NULL;
@@ -1022,9 +1005,9 @@
/* determine whether filter meets requirements */
if (SUCCEEDED(hrSub) && (rf2.dwMerit >= dwMerit))
{
- for (i = 0; (i < rf2.cPins2) && (!bInputMatch ||
!bOutputMatch); i++)
+ for (i = 0; (i < rf2.u.s2.cPins2) && (!bInputMatch ||
!bOutputMatch); i++)
{
- const REGFILTERPINS2 * rfp2 = rf2.rgPins2 + i;
+ const REGFILTERPINS2 * rfp2 = rf2.u.s2.rgPins2 + i;
bInputMatch = bInputMatch || (!(rfp2->dwFlags &
REG_PINFLAG_B_OUTPUT) &&
(!bRender || (rfp2->dwFlags &
REG_PINFLAG_B_RENDERER)) &&
Modified: trunk/reactos/dll/directx/wine/quartz/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ma…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/main.c [iso-8859-1] Sun Dec 22 17:03:20 2013
@@ -17,13 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-#include <wine/debug.h>
-
#include "quartz_private.h"
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *)
DECLSPEC_HIDDEN;
extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/directx/wine/quartz/memallocator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/me…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/memallocator.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/memallocator.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -18,18 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <assert.h>
-//#include <limits.h>
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "vfwmsgs.h"
-
#include "quartz_private.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct StdMediaSample2
{
Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -21,24 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <assert.h>
-//#include <math.h>
-
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-#include <mmreg.h>
-//#include "mmsystem.h"
-
-//#include "winternl.h"
-
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
-#include "parser.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
#define SEQUENCE_HEADER_CODE 0xB3
#define PACK_START_CODE 0xBA
Modified: trunk/reactos/dll/directx/wine/quartz/nullrenderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/nu…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/nullrenderer.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/nullrenderer.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -19,27 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-//#include "vfwmsgs.h"
-//#include "amvideo.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dshow.h"
-//#include "evcode.h"
-//#include "strmif.h"
-//#include "ddraw.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct NullRendererImpl
{
Modified: trunk/reactos/dll/directx/wine/quartz/parser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Sun Dec 22 17:03:20 2013
@@ -20,20 +20,6 @@
*/
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "vfwmsgs.h"
-//#include "amvideo.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-//#include <math.h>
-#include <assert.h>
-
-#include "parser.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
static const WCHAR wcsInputPinName[] =
{'i','n','p','u','t','
','p','i','n',0};
static const IMediaSeekingVtbl Parser_Seeking_Vtbl;
Modified: trunk/reactos/dll/directx/wine/quartz/pin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Sun Dec 22 17:03:20 2013
@@ -19,15 +19,6 @@
*/
#include "quartz_private.h"
-#include "pin.h"
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "uuids.h"
-//#include "vfwmsgs.h"
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
static const IPinVtbl PullPin_Vtbl;
Modified: trunk/reactos/dll/directx/wine/quartz/quartz_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qu…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/quartz_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/quartz_private.h [iso-8859-1] Sun Dec 22
17:03:20 2013
@@ -20,11 +20,17 @@
#ifndef __QUARTZ_PRIVATE_INCLUDED__
#define __QUARTZ_PRIVATE_INCLUDED__
+#include <config.h>
+
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
+#include <assert.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#define COBJMACROS
@@ -36,8 +42,19 @@
#include <objbase.h>
#include <oleauto.h>
#include <dshow.h>
+#include <dvdmedia.h>
+#include <vfw.h>
+#include <aviriff.h>
+
#include <wine/strmbase.h>
#include <wine/list.h>
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+
+#include "pin.h"
+#include "parser.h"
#define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000)
#define SEC_FROM_MEDIATIME(time) ((time) / 10000000)
Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Sun Dec 22 17:03:20 2013
@@ -18,32 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#define COBJMACROS
-#include <stdarg.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winreg.h>
-//#include "winerror.h"
-
-//#include "ole2.h"
-#include "objbase.h"
-#include <uuids.h>
-#include <strmif.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+#include "quartz_private.h"
/*
* Near the bottom of this file are the exported DllRegisterServer and
Modified: trunk/reactos/dll/directx/wine/quartz/systemclock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/sy…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -19,12 +19,6 @@
*/
#include "quartz_private.h"
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-//#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct SystemClockAdviseEntry SystemClockAdviseEntry;
struct SystemClockAdviseEntry {
Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/videorenderer.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -18,29 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-//#include "vfwmsgs.h"
-//#include "amvideo.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dshow.h"
-//#include "evcode.h"
-//#include "strmif.h"
-//#include "ddraw.h"
-#include <dvdmedia.h>
-
-//#include <assert.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
typedef struct VideoRendererImpl
{
Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Sun Dec 22 17:03:20 2013
@@ -20,30 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
#include "quartz_private.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "amvideo.h"
-#include "windef.h"
-#include "winbase.h"
-#include "dshow.h"
-#include "evcode.h"
-#include "strmif.h"
-#include "ddraw.h"
-#include "dvdmedia.h"
-#include "d3d9.h"
-#include "vmr9.h"
-#include "pin.h"
-
-#include "wine/unicode.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+#include <d3d9.h>
+#include <vmr9.h>
typedef struct
{
Modified: trunk/reactos/dll/directx/wine/quartz/waveparser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/wa…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] Sun Dec 22 17:03:20
2013
@@ -19,22 +19,6 @@
*/
#include "quartz_private.h"
-#include "pin.h"
-
-//#include "uuids.h"
-#include <aviriff.h>
-//#include "vfwmsgs.h"
-//#include "mmsystem.h"
-
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
-//#include <math.h>
-//#include <assert.h>
-
-#include "parser.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
static const WCHAR wcsOutputPinName[] =
{'o','u','t','p','u','t','
','p','i','n',0};
3980
days inactive
3980
days old
0 comments
1 participants
participants (1)
-
akhaldi＠svn.reactos.org