[MSDMO]

* Create a main header and move some inclusions to it.
* Set the default debugging channel globally through the main header.
CORE-7716

svn path=/trunk/; revision=61724

diff --git a/reactos/dll/directx/wine/msdmo/dmoreg.c b/reactos/dll/directx/wine/msdmo/dmoreg.c
index 967acd0..48968b3 100644 (file)
--- a/reactos/dll/directx/wine/msdmo/dmoreg.c
+++ b/reactos/dll/directx/wine/msdmo/dmoreg.c
@@ -17,25 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "precomp.h"
 
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
 #include <winuser.h>
-//#include "winerror.h"
 #include <winreg.h>
-#include <objbase.h>
 #include <wine/unicode.h>
-#include <wine/debug.h>
-//#include "initguid.h"
 #include <dmo.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(msdmo);
-
 #define MSDMO_MAJOR_VERSION 6
 
 static const WCHAR szDMORootKey[] = 

diff --git a/reactos/dll/directx/wine/msdmo/dmort.c b/reactos/dll/directx/wine/msdmo/dmort.c
index 9102781..de77f70 100644 (file)
--- a/reactos/dll/directx/wine/msdmo/dmort.c
+++ b/reactos/dll/directx/wine/msdmo/dmort.c
@@ -16,23 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "precomp.h"
 
-#define COBJMACROS
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
 #include <mediaobj.h>
 #include <dmort.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msdmo);
-
 /***********************************************************************
  *        MoCreateMediaType    (MSDMO.@)
  *

diff --git a/reactos/dll/directx/wine/msdmo/precomp.h b/reactos/dll/directx/wine/msdmo/precomp.h
new file mode 100644 (file)
index 0000000..d952772
--- /dev/null
+++ b/reactos/dll/directx/wine/msdmo/precomp.h
@@ -0,0 +1,19 @@
+#ifndef _MSDMO_PCH_
+#define _MSDMO_PCH_
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(msdmo);
+
+#endif /* _MSDMO_PCH_ */

diff --git a/reactos/dll/directx/wine/msdmo/rsrc.rc b/reactos/dll/directx/wine/msdmo/rsrc.rc
index d87fbad..a87d9a5 100644 (file)
--- a/reactos/dll/directx/wine/msdmo/rsrc.rc
+++ b/reactos/dll/directx/wine/msdmo/rsrc.rc
@@ -23,4 +23,4 @@
 #define WINE_PRODUCTVERSION 6,5,1,900
 #define WINE_PRODUCTVERSION_STR "6.5"
 
-#include "wine/wine_common_ver.rc"
+#include <wine/wine_common_ver.rc>