Author: akhaldi Date: Sat Dec 21 15:04:43 2013 New Revision: 61322
URL: http://svn.reactos.org/svn/reactos?rev=61322&view=rev Log: [D3D8] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove useless inclusions and definitions that already exist in the main header. CORE-7716
Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c
Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buffe... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/buffer.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline struct d3d8_vertexbuffer *impl_from_IDirect3DVertexBuffer8(IDirect3DVertexBuffer8 *iface) {
Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8_... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -19,12 +19,7 @@ * */
-#include <config.h> -#include <initguid.h> #include "d3d8_private.h" -//#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
HRESULT WINAPI D3D8GetSWInfo(void) { FIXME("(void): stub\n");
Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8_... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -23,6 +23,8 @@ #ifndef __WINE_D3D8_PRIVATE_H #define __WINE_D3D8_PRIVATE_H
+#include <config.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -36,7 +38,11 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(d3d8); + +#include <initguid.h> #include <d3d8.h> #include <wine/wined3d.h>
Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devic... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -19,22 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> - -//#include <math.h> -//#include <stdarg.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" -//#include "wine/debug.h" - #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {}
Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/direc... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/directx.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -20,22 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> - -//#include <stdarg.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "wine/debug.h" -//#include "wine/unicode.h" - #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline struct d3d8 *impl_from_IDirect3D8(IDirect3D8 *iface) {
Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shade... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/shader.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -17,10 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static void STDMETHODCALLTYPE d3d8_vertexshader_wined3d_object_destroyed(void *parent) {
Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surfa... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/surface.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline struct d3d8_surface *impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) {
Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swapc... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/swapchain.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline struct d3d8_swapchain *impl_from_IDirect3DSwapChain8(IDirect3DSwapChain8 *iface) {
Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/textu... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/texture.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline struct d3d8_texture *impl_from_IDirect3DTexture8(IDirect3DTexture8 *iface) {
Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/verte... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -21,10 +21,7 @@ /* IDirect3DVertexDeclaration8 is internal to our implementation. * It's not visible in the API. */
-#include <config.h> #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static const char *debug_d3dvsdt_type(D3DVSDT_TYPE d3dvsdt_type) {
Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volum... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/volume.c [iso-8859-1] Sat Dec 21 15:04:43 2013 @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> #include "d3d8_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline struct d3d8_volume *impl_from_IDirect3DVolume8(IDirect3DVolume8 *iface) {