[QUARTZ]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61726

diff --git a/reactos/dll/directx/wine/quartz/memallocator.c b/reactos/dll/directx/wine/quartz/memallocator.c
index 9b235ad..d2a0f38 100644 (file)
--- a/reactos/dll/directx/wine/quartz/memallocator.c
+++ b/reactos/dll/directx/wine/quartz/memallocator.c
@@ -20,6 +20,8 @@
 
 #include "quartz_private.h"
 
+#include <wine/list.h>
+
 typedef struct StdMediaSample2
 {
     IMediaSample2 IMediaSample2_iface;

diff --git a/reactos/dll/directx/wine/quartz/parser.h b/reactos/dll/directx/wine/quartz/parser.h
index 996415a..9fe1235 100644 (file)
--- a/reactos/dll/directx/wine/quartz/parser.h
+++ b/reactos/dll/directx/wine/quartz/parser.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma once
+
 typedef struct ParserImpl ParserImpl;
 
 typedef HRESULT (*PFN_PROCESS_SAMPLE) (LPVOID iface, IMediaSample * pSample, DWORD_PTR cookie);

diff --git a/reactos/dll/directx/wine/quartz/pin.h b/reactos/dll/directx/wine/quartz/pin.h
index 428fa6f..84046bc 100644 (file)
--- a/reactos/dll/directx/wine/quartz/pin.h
+++ b/reactos/dll/directx/wine/quartz/pin.h
@@ -18,6 +18,8 @@
  * 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
  *

diff --git a/reactos/dll/directx/wine/quartz/quartz_private.h b/reactos/dll/directx/wine/quartz/quartz_private.h
index 10657c1..10cc56a 100644 (file)
--- a/reactos/dll/directx/wine/quartz/quartz_private.h
+++ b/reactos/dll/directx/wine/quartz/quartz_private.h
@@ -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>