[akhaldi] 61325: [D3DX9_36] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...
Author: akhaldi Date: Sat Dec 21 16:50:22 2013 New Revision: 61325
URL: http://svn.reactos.org/svn/reactos?rev=61325&view=rev Log: [D3DX9_36] * 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. CORE-7716
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/core.c trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h trunk/reactos/dll/directx/wine/d3dx9_36/effect.c trunk/reactos/dll/directx/wine/d3dx9_36/font.c trunk/reactos/dll/directx/wine/d3dx9_36/line.c trunk/reactos/dll/directx/wine/d3dx9_36/math.c trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c trunk/reactos/dll/directx/wine/d3dx9_36/render.c trunk/reactos/dll/directx/wine/d3dx9_36/shader.c trunk/reactos/dll/directx/wine/d3dx9_36/skin.c trunk/reactos/dll/directx/wine/d3dx9_36/sprite.c trunk/reactos/dll/directx/wine/d3dx9_36/surface.c trunk/reactos/dll/directx/wine/d3dx9_36/texture.c trunk/reactos/dll/directx/wine/d3dx9_36/util.c trunk/reactos/dll/directx/wine/d3dx9_36/volume.c trunk/reactos/dll/directx/wine/d3dx9_36/xfile.c
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/core.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/c... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/core.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/core.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,18 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -#define COBJMACROS -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -#include <wine/debug.h> -//#include "wine/unicode.h" - #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
struct ID3DXBufferImpl {
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/d... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_main.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -20,22 +20,7 @@ * */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" -#include <initguid.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" - -#include <d3dx9.h> +#include "d3dx9_36_private.h"
/*********************************************************************** * DllMain.
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/d... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -22,19 +22,31 @@ #ifndef __WINE_D3DX9_36_PRIVATE_H #define __WINE_D3DX9_36_PRIVATE_H
+#include <config.h> +#include <wine/port.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H
#include <stdarg.h>
+#include <initguid.h> + #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winnls.h> #include <winuser.h> #include <d3dx9.h> + +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/effect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/e... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/effect.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/effect.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,21 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" -#define NONAMELESSUNION -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "windef.h" -#include "wingdi.h" #include "d3dx9_36_private.h"
/* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f #define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
enum STATE_CLASS {
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/f... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/font.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,14 +17,7 @@ * */
-#include <config.h> -//#include "wine/port.h" - -#include <wine/debug.h> -#include <wine/unicode.h> #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
struct d3dx_font {
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/l... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/line.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/line.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,10 +17,7 @@ * */
-#include "wine/debug.h" #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
typedef struct ID3DXLineImpl { ID3DXLine ID3DXLine_iface;
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/m... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/math.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -22,18 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define NONAMELESSUNION - -#include <config.h> -#include "wine/port.h" - -//#include "windef.h" -//#include "wingdi.h" #include "d3dx9_36_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
#ifdef _MSC_VER #define copysignf(x, y) ((x) < 0.0f ? -fabsf(y) : fabsf(y))
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/m... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -24,36 +24,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -#include <wine/port.h> - -#define COBJMACROS -#define NONAMELESSUNION -#include <stdarg.h> +#include "d3dx9_36_private.h" + #include <assert.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <d3dx9.h> + #undef MAKE_DDHRESULT #include "dxfile.h" #include "rmxfguid.h" #include "rmxftmpl.h" -#include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" -#include "d3dx9_36_private.h"
#define fmax(a, b) ((a) > (b) ? (a) : (b)) - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
typedef struct ID3DXMeshImpl {
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/render.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/r... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/render.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/render.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,10 +17,7 @@ * */
-#include "wine/debug.h" #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
struct device_state {
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/s... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/shader.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -18,19 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> -//#include "wine/port.h" -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <wine/debug.h> -//#include "wine/unicode.h" -//#include "windef.h" -//#include "wingdi.h" -//#include "d3dx9.h" +#include "d3dx9_36_private.h" #include "d3dcompiler.h" -#include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
/* This function is not declared in the SDK headers yet */ HRESULT WINAPI D3DAssemble(LPCVOID data, SIZE_T datasize, LPCSTR filename,
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/skin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/s... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/skin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/skin.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "wine/debug.h" #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
struct bone {
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/sprite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/s... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/sprite.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/sprite.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,10 +17,7 @@ * */
-#include <wine/debug.h> #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
/* the combination of all possible D3DXSPRITE flags */ #define D3DXSPRITE_FLAGLIMIT 511
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/s... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/surface.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -18,16 +18,10 @@ * */
-#include <wine/debug.h> -//#include "wine/unicode.h" #include "d3dx9_36_private.h"
-#include <initguid.h> #include <ole2.h> #include <wincodec.h> - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -
/* Wine-specific WIC GUIDs */ DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22);
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/t... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/texture.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -19,10 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <wine/debug.h> #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
/* Returns TRUE if num is a power of 2, FALSE if not, or if 0 */ static BOOL is_pow2(UINT num)
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/u... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/util.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,10 +17,7 @@ * */
-#include <wine/debug.h> #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
static void la_from_rgba(const struct vec4 *rgba, struct vec4 *la) {
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/v... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/volume.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "wine/debug.h" #include "d3dx9_36_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
HRESULT WINAPI D3DXLoadVolumeFromFileA(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
Modified: trunk/reactos/dll/directx/wine/d3dx9_36/xfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/x... ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/xfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/xfile.c [iso-8859-1] Sat Dec 21 16:50:22 2013 @@ -17,14 +17,11 @@ * */
-#include "wine/debug.h" - -#include "d3dx9.h" +#include "d3dx9_36_private.h" + #include "d3dx9xof.h" #undef MAKE_DDHRESULT #include "dxfile.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
static HRESULT error_dxfile_to_d3dxfile(HRESULT error) {
-
akhaldi＠svn.reactos.org