[akhaldi] 61715: [D3DXOF] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Jan 20 11:18:23 2014
New Revision: 61715

URL: http://svn.reactos.org/svn/reactos?rev=61715&view=rev
Log:
[D3DXOF]
* Move some inclusions to the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
    trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
    trunk/reactos/dll/directx/wine/d3dxof/main.c
    trunk/reactos/dll/directx/wine/d3dxof/mszip.c
    trunk/reactos/dll/directx/wine/d3dxof/parsing.c

Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] Mon Jan 20 11:18:23 2014
@@ -18,18 +18,7 @@
  * 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 "dxfile.h"
-
-#include <stdio.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump);

Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h	[iso-8859-1] Mon Jan 20
11:18:23 2014
@@ -21,14 +21,21 @@
 #ifndef __D3DXOF_PRIVATE_INCLUDED__
 #define __D3DXOF_PRIVATE_INCLUDED__
 
-#include <stdarg.h>
+#include <config.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dxfile.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

Modified: trunk/reactos/dll/directx/wine/d3dxof/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ma…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/main.c	[iso-8859-1] Mon Jan 20 11:18:23 2014
@@ -18,25 +18,9 @@
  * 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 "dxfile.h"
-
-#include "wine/debug.h"
+
+#include <rpcproxy.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 

Modified: trunk/reactos/dll/directx/wine/d3dxof/mszip.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ms…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/mszip.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/mszip.c	[iso-8859-1] Mon Jan 20 11:18:23 2014
@@ -23,12 +23,12 @@
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-
-#include "wine/debug.h"
+#include <windef.h>
+#include <winbase.h>
 
 #include "mszip.h"
+
+#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
 

Modified: trunk/reactos/dll/directx/wine/d3dxof/parsing.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/pa…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/parsing.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/parsing.c	[iso-8859-1] Mon Jan 20 11:18:23 2014
@@ -18,18 +18,7 @@
  * 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 "dxfile.h"
-
-#include <stdio.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);