[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

svn path=/trunk/; revision=61723

diff --git a/reactos/dll/directx/wine/dxgi/CMakeLists.txt b/reactos/dll/directx/wine/dxgi/CMakeLists.txt
index 10ce18f..bcf2b38 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/CMakeLists.txt
+++ b/reactos/dll/directx/wine/dxgi/CMakeLists.txt
@@ -13,6 +13,7 @@ list(APPEND SOURCE
     surface.c
     swapchain.c
     utils.c
     surface.c
     swapchain.c
     utils.c

+    guid.c

     ${CMAKE_CURRENT_BINARY_DIR}/dxgi.def)
 
 add_library(dxgi SHARED ${SOURCE} version.rc)
     ${CMAKE_CURRENT_BINARY_DIR}/dxgi.def)
 
 add_library(dxgi SHARED ${SOURCE} version.rc)

diff --git a/reactos/dll/directx/wine/dxgi/adapter.c b/reactos/dll/directx/wine/dxgi/adapter.c
index 87d886b..6195c30 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/adapter.c
+++ b/reactos/dll/directx/wine/dxgi/adapter.c
@@ -17,13 +17,8 @@
  *
  */
 
  *
  */
 

-#include "config.h"
-#include "wine/port.h"
-

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface);
 static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface);

diff --git a/reactos/dll/directx/wine/dxgi/device.c b/reactos/dll/directx/wine/dxgi/device.c
index e98a2c0..e775272 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/device.c
+++ b/reactos/dll/directx/wine/dxgi/device.c
@@ -17,13 +17,8 @@
  *
  */
 
  *
  */
 

-#include "config.h"
-#include "wine/port.h"
-

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_device, IWineDXGIDevice_iface);
 static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_device, IWineDXGIDevice_iface);

diff --git a/reactos/dll/directx/wine/dxgi/dxgi_main.c b/reactos/dll/directx/wine/dxgi/dxgi_main.c
index e9ed482..e20be15 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/dxgi_main.c
+++ b/reactos/dll/directx/wine/dxgi/dxgi_main.c
@@ -17,14 +17,8 @@
  *
  */
 
  *
  */
 

-#include "config.h"
-#include "wine/port.h"
-
-#define DXGI_INIT_GUID

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 static CRITICAL_SECTION_DEBUG dxgi_cs_debug =
 {
     0, 0, &dxgi_cs,
 static CRITICAL_SECTION_DEBUG dxgi_cs_debug =
 {
     0, 0, &dxgi_cs,

diff --git a/reactos/dll/directx/wine/dxgi/dxgi_private.h b/reactos/dll/directx/wine/dxgi/dxgi_private.h
index 565e448..1921e9a 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/dxgi_private.h
+++ b/reactos/dll/directx/wine/dxgi/dxgi_private.h
@@ -19,26 +19,30 @@
 #ifndef __WINE_DXGI_PRIVATE_H
 #define __WINE_DXGI_PRIVATE_H
 
 #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
 
 #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 "dxgi.h"
-#ifdef DXGI_INIT_GUID
-#include "initguid.h"
-#endif
-#include "wine/wined3d.h"
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <objbase.h>
+#include <winnls.h>
+
+#include <wine/debug.h>
+#include <wine/wined3d.h>

 #include <wine/winedxgi.h>
 
 #include <wine/winedxgi.h>
 

+WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
+

 extern CRITICAL_SECTION dxgi_cs DECLSPEC_HIDDEN;
 
 /* Layered device */
 extern CRITICAL_SECTION dxgi_cs DECLSPEC_HIDDEN;
 
 /* Layered device */

diff --git a/reactos/dll/directx/wine/dxgi/factory.c b/reactos/dll/directx/wine/dxgi/factory.c
index 72927c5..5570566 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/factory.c
+++ b/reactos/dll/directx/wine/dxgi/factory.c
@@ -17,13 +17,8 @@
  *
  */
 
  *
  */
 

-#include "config.h"
-#include "wine/port.h"
-

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface);
 static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface);

diff --git a/reactos/dll/directx/wine/dxgi/guid.c b/reactos/dll/directx/wine/dxgi/guid.c
new file mode 100644 (file)
index 0000000..c971ac4
--- /dev/null
+++ b/reactos/dll/directx/wine/dxgi/guid.c
@@ -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 */

diff --git a/reactos/dll/directx/wine/dxgi/output.c b/reactos/dll/directx/wine/dxgi/output.c
index 4cdd06b..1a9f9e4 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/output.c
+++ b/reactos/dll/directx/wine/dxgi/output.c
@@ -16,13 +16,8 @@
  * 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/port.h"
-

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface);
 static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface);

diff --git a/reactos/dll/directx/wine/dxgi/surface.c b/reactos/dll/directx/wine/dxgi/surface.c
index f7fa931..bd12cc6 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/surface.c
+++ b/reactos/dll/directx/wine/dxgi/surface.c
@@ -17,13 +17,8 @@
  *
  */
 
  *
  */
 

-#include "config.h"
-#include "wine/port.h"
-

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 /* Inner IUnknown methods */
 
 static inline struct dxgi_surface *impl_from_IUnknown(IUnknown *iface)
 /* Inner IUnknown methods */
 
 static inline struct dxgi_surface *impl_from_IUnknown(IUnknown *iface)

diff --git a/reactos/dll/directx/wine/dxgi/swapchain.c b/reactos/dll/directx/wine/dxgi/swapchain.c
index 0c27007..5b8ec22 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/swapchain.c
+++ b/reactos/dll/directx/wine/dxgi/swapchain.c
@@ -17,13 +17,8 @@
  *
  */
 
  *
  */
 

-#include "config.h"
-#include "wine/port.h"
-

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_swapchain, IDXGISwapChain_iface);
 static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface)
 {
     return CONTAINING_RECORD(iface, struct dxgi_swapchain, IDXGISwapChain_iface);

diff --git a/reactos/dll/directx/wine/dxgi/utils.c b/reactos/dll/directx/wine/dxgi/utils.c
index 979c972..de8e482 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/utils.c
+++ b/reactos/dll/directx/wine/dxgi/utils.c
@@ -17,13 +17,8 @@
  *
  */
 
  *
  */
 

-#include "config.h"
-#include "wine/port.h"
-

 #include "dxgi_private.h"
 
 #include "dxgi_private.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
-

 #define WINE_DXGI_TO_STR(x) case x: return #x
 
 const char *debug_dxgi_format(DXGI_FORMAT format)
 #define WINE_DXGI_TO_STR(x) case x: return #x
 
 const char *debug_dxgi_format(DXGI_FORMAT format)

diff --git a/reactos/dll/directx/wine/dxgi/version.rc b/reactos/dll/directx/wine/dxgi/version.rc
index bd51eb8..9887a14 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/version.rc
+++ b/reactos/dll/directx/wine/dxgi/version.rc
@@ -23,4 +23,4 @@
 #define WINE_PRODUCTVERSION 6,0,6000,16386
 #define WINE_PRODUCTVERSION_STR "6.0.6000.16386"
 
 #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>