[akhaldi] 61723: [DXGI] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in th...

Author: akhaldi
Date: Mon Jan 20 11:34:21 2014
New Revision: 61723

URL: http://svn.reactos.org/svn/reactos?rev=61723&view=rev
Log:
[DXGI]
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
* Improve the GUIDs situation.
CORE-7716

Added:
    trunk/reactos/dll/directx/wine/dxgi/guid.c   (with props)
Modified:
    trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt
    trunk/reactos/dll/directx/wine/dxgi/adapter.c
    trunk/reactos/dll/directx/wine/dxgi/device.c
    trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c
    trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h
    trunk/reactos/dll/directx/wine/dxgi/factory.c
    trunk/reactos/dll/directx/wine/dxgi/output.c
    trunk/reactos/dll/directx/wine/dxgi/surface.c
    trunk/reactos/dll/directx/wine/dxgi/swapchain.c
    trunk/reactos/dll/directx/wine/dxgi/utils.c
    trunk/reactos/dll/directx/wine/dxgi/version.rc

Modified: trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/CMak…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt	[iso-8859-1] Mon Jan 20 11:34:21
2014
@@ -13,6 +13,7 @@
     surface.c
     swapchain.c
     utils.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/dxgi.def)
 
 add_library(dxgi SHARED ${SOURCE} version.rc)

Modified: trunk/reactos/dll/directx/wine/dxgi/adapter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/adap…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/adapter.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/adapter.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -17,12 +17,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dxgi/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/devi…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/device.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/device.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -17,12 +17,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -17,13 +17,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
-#define DXGI_INIT_GUID
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 static CRITICAL_SECTION_DEBUG dxgi_cs_debug =
 {

Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h	[iso-8859-1] Mon Jan 20 11:34:21
2014
@@ -19,25 +19,29 @@
 #ifndef __WINE_DXGI_PRIVATE_H
 #define __WINE_DXGI_PRIVATE_H
 
+#include <wine/config.h>
+#include <wine/port.h>
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include "wine/debug.h"
+#define COBJMACROS
 
-#define COBJMACROS
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "objbase.h"
-#include "winnls.h"
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <objbase.h>
+#include <winnls.h>
 
-#include "dxgi.h"
-#ifdef DXGI_INIT_GUID
-#include "initguid.h"
-#endif
-#include "wine/wined3d.h"
+#include <wine/debug.h>
+#include <wine/wined3d.h>
 #include <wine/winedxgi.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 extern CRITICAL_SECTION dxgi_cs DECLSPEC_HIDDEN;
 

Modified: trunk/reactos/dll/directx/wine/dxgi/factory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/fact…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/factory.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/factory.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -17,12 +17,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface)
 {

Added: trunk/reactos/dll/directx/wine/dxgi/guid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/guid…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/guid.c	(added)
+++ trunk/reactos/dll/directx/wine/dxgi/guid.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -0,0 +1,17 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <objbase.h>
+#include <wine/wined3d.h>
+#include <initguid.h>
+#include <wine/winedxgi.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Propchange: trunk/reactos/dll/directx/wine/dxgi/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/directx/wine/dxgi/output.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/outp…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/output.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/output.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -16,12 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dxgi/surface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/surf…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/surface.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/surface.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -17,12 +17,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 /* Inner IUnknown methods */
 

Modified: trunk/reactos/dll/directx/wine/dxgi/swapchain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/swap…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/swapchain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/swapchain.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -17,12 +17,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface)
 {

Modified: trunk/reactos/dll/directx/wine/dxgi/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/util…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/utils.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/utils.c	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -17,12 +17,7 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "dxgi_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 #define WINE_DXGI_TO_STR(x) case x: return #x
 

Modified: trunk/reactos/dll/directx/wine/dxgi/version.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/vers…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxgi/version.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxgi/version.rc	[iso-8859-1] Mon Jan 20 11:34:21 2014
@@ -23,4 +23,4 @@
 #define WINE_PRODUCTVERSION 6,0,6000,16386
 #define WINE_PRODUCTVERSION_STR "6.0.6000.16386"
 
-#include "wine/wine_common_ver.rc"
+#include <wine/wine_common_ver.rc>