[ros-diffs] [akhaldi] 61726: [QUARTZ] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Jan 20 12:37:33 2014
New Revision: 61726

URL: http://svn.reactos.org/svn/reactos?rev=61726&view=rev
Log:
[QUARTZ]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/directx/wine/quartz/memallocator.c
    trunk/reactos/dll/directx/wine/quartz/parser.h
    trunk/reactos/dll/directx/wine/quartz/pin.h
    trunk/reactos/dll/directx/wine/quartz/quartz_private.h

Modified: trunk/reactos/dll/directx/wine/quartz/memallocator.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mem...
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/memallocator.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/memallocator.c	[iso-8859-1] Mon Jan 20 12:37:33 2014
@@ -19,6 +19,8 @@
  */

#include "quartz_private.h"
+
+#include <wine/list.h>

typedef struct StdMediaSample2
 {

Modified: trunk/reactos/dll/directx/wine/quartz/parser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/par...
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/parser.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/parser.h	[iso-8859-1] Mon Jan 20 12:37:33 2014
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#pragma once

typedef struct ParserImpl ParserImpl;

Modified: trunk/reactos/dll/directx/wine/quartz/pin.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pin...
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/pin.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/pin.h	[iso-8859-1] Mon Jan 20 12:37:33 2014
@@ -17,6 +17,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#pragma once

/* This function will process incoming samples to the pin.
  * Any return value valid in IMemInputPin::Receive is allowed here

Modified: trunk/reactos/dll/directx/wine/quartz/quartz_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qua...
==============================================================================
--- 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] Mon Jan 20 12:37:33 2014
@@ -20,34 +20,29 @@
 #ifndef __QUARTZ_PRIVATE_INCLUDED__
 #define __QUARTZ_PRIVATE_INCLUDED__

-#include <config.h>
+#include <wine/config.h>

+#include <stdarg.h>
+#include <assert.h>
+
+#define WIN32_LEAN_AND_MEAN
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

-#include <stdarg.h>
-#include <assert.h>
-
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define COBJMACROS
-
 #include <windef.h>
 #include <winbase.h>
-#include <wtypes.h>
-#include <wingdi.h>
-#include <winuser.h>
 #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>