[D3DXOF]

* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61715

diff --git a/reactos/dll/directx/wine/d3dxof/d3dxof.c b/reactos/dll/directx/wine/d3dxof/d3dxof.c
index f726170..0cab827 100644 (file)
--- a/reactos/dll/directx/wine/d3dxof/d3dxof.c
+++ b/reactos/dll/directx/wine/d3dxof/d3dxof.c
@@ -18,18 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "config.h"
-#include "wine/debug.h"
-
-#define COBJMACROS
-
-#include "winbase.h"
-#include "wingdi.h"
-

 #include "d3dxof_private.h"
 #include "d3dxof_private.h"

-#include "dxfile.h"
-
-#include <stdio.h>

 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump);
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump);

diff --git a/reactos/dll/directx/wine/d3dxof/d3dxof_private.h b/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
index cf33ed2..efe990a 100644 (file)
--- a/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
+++ b/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
@@ -21,14 +21,21 @@
 #ifndef __D3DXOF_PRIVATE_INCLUDED__
 #define __D3DXOF_PRIVATE_INCLUDED__
 
 #ifndef __D3DXOF_PRIVATE_INCLUDED__
 #define __D3DXOF_PRIVATE_INCLUDED__
 

-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dxfile.h"
+#include <config.h>
+
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <dxfile.h>
+
+#include <wine/debug.h>

 
 #define MAX_NAME_LEN 40
 #define MAX_ARRAY_DIM 4
 
 #define MAX_NAME_LEN 40
 #define MAX_ARRAY_DIM 4

diff --git a/reactos/dll/directx/wine/d3dxof/main.c b/reactos/dll/directx/wine/d3dxof/main.c
index 48ee22b..103c771 100644 (file)
--- a/reactos/dll/directx/wine/d3dxof/main.c
+++ b/reactos/dll/directx/wine/d3dxof/main.c
@@ -18,25 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include <stdarg.h>
-#include <string.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "winerror.h"
-
-#include "ole2.h"
-#include "rpcproxy.h"
-#include "uuids.h"
-

 #include "d3dxof_private.h"
 #include "d3dxof_private.h"

-#include "dxfile.h"

 
 

-#include "wine/debug.h"
+#include <rpcproxy.h>

 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 

diff --git a/reactos/dll/directx/wine/d3dxof/mszip.c b/reactos/dll/directx/wine/d3dxof/mszip.c
index 1796616..a16e6af 100644 (file)
--- a/reactos/dll/directx/wine/d3dxof/mszip.c
+++ b/reactos/dll/directx/wine/d3dxof/mszip.c
@@ -23,13 +23,13 @@
 
 #include <stdarg.h>
 
 
 #include <stdarg.h>
 

-#include "windef.h"
-#include "winbase.h"
-
-#include "wine/debug.h"
+#include <windef.h>
+#include <winbase.h>

 
 #include "mszip.h"
 
 
 #include "mszip.h"
 

+#include <wine/debug.h>
+

 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 
 THOSE_ZIP_CONSTS;
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 
 THOSE_ZIP_CONSTS;

diff --git a/reactos/dll/directx/wine/d3dxof/parsing.c b/reactos/dll/directx/wine/d3dxof/parsing.c
index fa992ce..224c83d 100644 (file)
--- a/reactos/dll/directx/wine/d3dxof/parsing.c
+++ b/reactos/dll/directx/wine/d3dxof/parsing.c
@@ -18,18 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "config.h"
-#include "wine/debug.h"
-
-#define COBJMACROS
-
-#include "winbase.h"
-#include "wingdi.h"
-

 #include "d3dxof_private.h"
 #include "d3dxof_private.h"

-#include "dxfile.h"
-
-#include <stdio.h>

 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);