Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

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

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 19:11:16 2013 New Revision: 61329 URL: http://svn.reactos.org/svn/reactos?rev=61329&view=rev Log: [WINED3D] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/sampler.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -26,12 +26,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <stdio.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -17,12 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -//#include <stdio.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/buffer.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -21,9 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -18,14 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> - -//#include <stdio.h> -#ifdef HAVE_FLOAT_H -# include <float.h> -#endif #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -24,14 +24,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <stdio.h> -#ifdef HAVE_FLOAT_H -# include <float.h> -#endif - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -21,13 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -#include <stdio.h> - #include "wined3d_private.h" -//#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -24,9 +24,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -17,14 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> - -#include <stdio.h> -#ifdef HAVE_FLOAT_H -# include <float.h> -#endif #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -28,12 +28,6 @@ * Ie, to generate a proper GLSL source swizzle, we need to take the D3D write * mask for the destination parameter into account. */ - -#include <config.h> -#include <wine/port.h> - -//#include <limits.h> -#include <stdio.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -19,11 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -//#include <stdio.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -18,12 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> -//#include "winerror.h" -//#include "wine/debug.h" - -//#include <string.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/sampler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/sampler.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/sampler.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -21,13 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <stdio.h> -//#include <string.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -21,9 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -15,9 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -24,14 +24,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> - -//#include <stdio.h> -#ifdef HAVE_FLOAT_H -# include <float.h> -#endif #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/surface.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -26,8 +26,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -23,9 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/view.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/view.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -22,10 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include "initguid.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Sat Dec 21 19:11:16 2013 @@ -25,6 +25,9 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H +#include <config.h> +#include <wine/port.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -35,14 +38,18 @@ #define WINE_GLAPI #endif +#ifdef HAVE_FLOAT_H +# include <float.h> +#endif + #include <stdarg.h> +#include <stdio.h> #include <math.h> -//#include <limits.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS #include <windef.h> -//#include "winbase.h" +#include <winbase.h> #include <winreg.h> #include <wingdi.h> #include <winuser.h>

10 years, 9 months

[akhaldi] 61328: [DMUSIC] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main header....

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 18:59:44 2013 New Revision: 61328 URL: http://svn.reactos.org/svn/reactos?rev=61328&view=rev Log: [DMUSIC] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c trunk/reactos/dll/directx/wine/dmusic/clock.c trunk/reactos/dll/directx/wine/dmusic/collection.c trunk/reactos/dll/directx/wine/dmusic/dmusic.c trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h trunk/reactos/dll/directx/wine/dmusic/download.c trunk/reactos/dll/directx/wine/dmusic/instrument.c trunk/reactos/dll/directx/wine/dmusic/port.c trunk/reactos/dll/directx/wine/dmusic/regsvr.c Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/bu… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -20,10 +20,7 @@ */ #include "dmusic_private.h" -//#include "initguid.h" #include <dmksctrl.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface) { Modified: trunk/reactos/dll/directx/wine/dmusic/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/cl… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/clock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/clock.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -19,8 +19,6 @@ */ #include "dmusic_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) { Modified: trunk/reactos/dll/directx/wine/dmusic/collection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/co… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/collection.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/collection.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -20,7 +20,6 @@ #include "dmusic_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -19,11 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdio.h> - #include "dmusic_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) { Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -17,15 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - +#include "dmusic_private.h" #include <stdio.h> - -#include "dmusic_private.h" #include "rpcproxy.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static HINSTANCE instance; LONG DMUSIC_refCount = 0; Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic_private.h [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -22,20 +22,16 @@ #ifndef __WINE_DMUSIC_PRIVATE_H #define __WINE_DMUSIC_PRIVATE_H -//#include <stdarg.h> +#include <config.h> #define COBJMACROS #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -//#include "windef.h" -//#include "winbase.h" -//#include "winnt.h" -//#include "wingdi.h" -//#include "winuser.h" - #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); + #include <wine/list.h> #include <wine/unicode.h> #include <winreg.h> Modified: trunk/reactos/dll/directx/wine/dmusic/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/do… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/download.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/download.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -19,8 +19,6 @@ */ #include "dmusic_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface) { Modified: trunk/reactos/dll/directx/wine/dmusic/instrument.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/in… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/instrument.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/instrument.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -20,8 +20,6 @@ #include "dmusic_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); - static const GUID IID_IDirectMusicInstrumentPRIVATE = { 0xbcb20080, 0xa40c, 0x11d1, { 0x86, 0xbc, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef } }; /* IDirectMusicInstrument IUnknown part: */ Modified: trunk/reactos/dll/directx/wine/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -19,10 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dmusic_private.h" #include <assert.h> -#include "dmusic_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) { Modified: trunk/reactos/dll/directx/wine/dmusic/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/re… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/regsvr.c [iso-8859-1] Sat Dec 21 18:59:44 2013 @@ -19,9 +19,6 @@ */ #include "dmusic_private.h" -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); /* * Near the bottom of this file are the exported DllRegisterServer and

10 years, 9 months

[akhaldi] 61327: [DEVENUM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Extract the resource IDs into resource.h and include it...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 18:21:51 2013 New Revision: 61327 URL: http://svn.reactos.org/svn/reactos?rev=61327&view=rev Log: [DEVENUM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Extract the resource IDs into resource.h and include it in both the main header and the resource file. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Added: trunk/reactos/dll/directx/wine/devenum/resource.h (with props) Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c trunk/reactos/dll/directx/wine/devenum/devenum.rc trunk/reactos/dll/directx/wine/devenum/devenum_main.c trunk/reactos/dll/directx/wine/devenum/devenum_private.h trunk/reactos/dll/directx/wine/devenum/factory.c trunk/reactos/dll/directx/wine/devenum/mediacatenum.c trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -23,17 +23,8 @@ * - Also creates the special registry keys created at run-time */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include "devenum_private.h" #include <vfw.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" -//#include "mmddk.h" - -WINE_DEFAULT_DEBUG_CHANNEL(devenum); extern HINSTANCE DEVENUM_hInstance; Modified: trunk/reactos/dll/directx/wine/devenum/devenum.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum.rc [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -20,10 +20,8 @@ #pragma code_page(65001) -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" -#include "devenum_private.h" +#include <windef.h> +#include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -21,9 +21,6 @@ #include "devenum_private.h" #include <rpcproxy.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum); DECLSPEC_HIDDEN LONG dll_refs; DECLSPEC_HIDDEN HINSTANCE DEVENUM_hInstance; Modified: trunk/reactos/dll/directx/wine/devenum/devenum_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_private.h [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -30,23 +30,28 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include <windef.h> #include <winbase.h> #include <wingdi.h> -//#include "winuser.h" #include <winreg.h> -//#include "winerror.h" #define COBJMACROS #include <ole2.h> #include <strmif.h> -//#include "olectl.h" #include <uuids.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(devenum); #ifndef RC_INVOKED #include <wine/unicode.h> #endif + +#include "resource.h" /********************************************************************** * Dll lifetime tracking declaration for devenum.dll @@ -89,13 +94,3 @@ extern const WCHAR clsid_keyname[6]; extern const WCHAR wszInstanceKeyName[]; #define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR)) - -/********************************************************************** - * Resource IDs - */ -#define IDS_DEVENUM_DSDEFAULT 7 -#define IDS_DEVENUM_DS 8 -#define IDS_DEVENUM_WODEFAULT 9 -#define IDS_DEVENUM_MIDEFAULT 10 -#define IDS_DEVENUM_KSDEFAULT 11 -#define IDS_DEVENUM_KS 12 Modified: trunk/reactos/dll/directx/wine/devenum/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/f… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/factory.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -20,10 +20,6 @@ */ #include "devenum_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum); /********************************************************************** * DEVENUM_IClassFactory_QueryInterface (also IUnknown) Modified: trunk/reactos/dll/directx/wine/devenum/mediacatenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/m… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -23,12 +23,7 @@ */ #include "devenum_private.h" -//#include "oleauto.h" #include <ocidl.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum); typedef struct { Modified: trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/p… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -21,11 +21,8 @@ * - Implements IParseDisplayName interface which creates a moniker * from a string in a special format */ + #include "devenum_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(devenum); static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv) Added: trunk/reactos/dll/directx/wine/devenum/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/r… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/resource.h (added) +++ trunk/reactos/dll/directx/wine/devenum/resource.h [iso-8859-1] Sat Dec 21 18:21:51 2013 @@ -0,0 +1,8 @@ +#pragma once + +#define IDS_DEVENUM_DSDEFAULT 7 +#define IDS_DEVENUM_DS 8 +#define IDS_DEVENUM_WODEFAULT 9 +#define IDS_DEVENUM_MIDEFAULT 10 +#define IDS_DEVENUM_KSDEFAULT 11 +#define IDS_DEVENUM_KS 12 Propchange: trunk/reactos/dll/directx/wine/devenum/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 9 months

[akhaldi] 61326: [DDRAW] * 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 t...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 17:31:51 2013 New Revision: 61326 URL: http://svn.reactos.org/svn/reactos?rev=61326&view=rev Log: [DDRAW] * 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/ddraw/clipper.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/light.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/material.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c Modified: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/clipper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/clipper.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -19,12 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) { Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -21,12 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static struct wined3d_display_mode original_mode; static const struct ddraw *exclusive_ddraw; Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -19,6 +19,9 @@ #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H +#include <config.h> +#include <wine/port.h> + #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -26,17 +29,17 @@ #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(ddraw); #include <winbase.h> #include <wingdi.h> #include <winuser.h> +#include <initguid.h> #include <d3d.h> -//#include "ddraw.h" -#ifdef DDRAW_INIT_GUID -#include <initguid.h> -#endif + #include <wine/list.h> #include <wine/wined3d.h> Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/device.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -27,12 +27,8 @@ * */ -#include <config.h> -#include <wine/port.h> - #include "ddraw_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DECLARE_DEBUG_CHANNEL(winediag); /* The device ID */ Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/executebuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/executebuffer.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -20,12 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /***************************************************************************** * _dump_executedata Modified: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/light.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/light.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -19,12 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /***************************************************************************** * light_update Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/main.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -24,17 +24,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#define DDRAW_INIT_GUID #include "ddraw_private.h" #include <rpcproxy.h> #include <wine/exception.h> #include <winreg.h> - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static struct list global_ddraw_list = LIST_INIT(global_ddraw_list); Modified: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/material.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/material.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -19,12 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static void dump_material(const D3DMATERIAL *mat) { Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/palette.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -16,12 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /***************************************************************************** * IDirectDrawPalette::QueryInterface Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/surface.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -21,12 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/utils.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -21,12 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static void DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf); Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -19,12 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static inline struct d3d_vertex_buffer *impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface) { Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/viewport.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/viewport.c [iso-8859-1] Sat Dec 21 17:31:51 2013 @@ -19,12 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "ddraw_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /***************************************************************************** * Helper functions

10 years, 9 months

[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...

by akhaldi＠svn.reactos.org

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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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/… ============================================================================== --- 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) {

10 years, 9 months

[akhaldi] 61324: [D3DCOMPILER_43] * Move some inclusions to the main header. * Remove inclusions that already exist in the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 16:44:34 2013 New Revision: 61324 URL: http://svn.reactos.org/svn/reactos?rev=61324&view=rev Log: [D3DCOMPILER_43] * Move some inclusions to the main header. * Remove inclusions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" #include "d3dcompiler_private.h" Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -75,10 +75,6 @@ /* Line 268 of yacc.c */ #line 22 "asmshader.y" - -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" #include "d3dcompiler_private.h" Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "d3dcompiler_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -20,12 +20,8 @@ * */ -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "d3dcompiler_private.h" #include "d3d9types.h" -#include "d3dcompiler_private.h" WINE_DEFAULT_DEBUG_CHANNEL(bytecodewriter); Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -17,13 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#include "config.h" -#include "wine/port.h" -#include "wine/debug.h" +#include "d3dcompiler_private.h" #include "wine/unicode.h" - -#include "d3dcompiler_private.h" #include "wine/wpp.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -19,13 +19,6 @@ * */ -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - #include "d3dcompiler_private.h" BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -22,16 +22,21 @@ #ifndef __WINE_D3DCOMPILER_PRIVATE_H #define __WINE_D3DCOMPILER_PRIVATE_H -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/rbtree.h" +#include <config.h> +#include <wine/port.h> + +#include <stdio.h> + +#include <wine/debug.h> +#include <wine/list.h> +#include <wine/rbtree.h> #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "objbase.h" - -#include "d3dcompiler.h" +#include <windef.h> +#include <winbase.h> +#include <objbase.h> + +#include <d3dcompiler.h> #include <assert.h> Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -75,11 +75,6 @@ /* Line 268 of yacc.c */ #line 21 "hlsl.y" - -#include "config.h" -#include "wine/debug.h" - -#include <stdio.h> #include "d3dcompiler_private.h" Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "config.h" -#include "wine/port.h" #include "d3dcompiler_private.h" Modified: trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c [iso-8859-1] Sat Dec 21 16:44:34 2013 @@ -20,11 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ - -#include "config.h" -#include "wine/port.h" - -#include <stdio.h> #include "d3dcompiler_private.h"

10 years, 9 months

[akhaldi] 61323: [D3D9] * 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...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 15:33:19 2013 New Revision: 61323 URL: http://svn.reactos.org/svn/reactos?rev=61323&view=rev Log: [D3D9] * 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/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/shader.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/buffer.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_vertexbuffer *impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -21,11 +21,7 @@ * */ -#include <config.h> -#include <initguid.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static int D3DPERF_event_level = 0; Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -23,6 +23,8 @@ #ifndef __WINE_D3D9_PRIVATE_H #define __WINE_D3D9_PRIVATE_H +#include <config.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H @@ -36,10 +38,11 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> -//#include "winuser.h" + #include <wine/debug.h> -//#include "wine/unicode.h" - +WINE_DEFAULT_DEBUG_CHANNEL(d3d9); + +#include <initguid.h> #include <d3d9.h> #include <wine/wined3d.h> Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -20,10 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {} Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/directx.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -19,10 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9 *impl_from_IDirect3D9Ex(IDirect3D9Ex *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/query.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -20,10 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/shader.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -17,10 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_vertexshader *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/stateblock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/stateblock.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -20,10 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_stateblock *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/surface.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -19,10 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_surface *impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/swapchain.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -20,10 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_swapchain *impl_from_IDirect3DSwapChain9(IDirect3DSwapChain9 *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/texture.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface) { Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -19,10 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static const struct { Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/volume.c [iso-8859-1] Sat Dec 21 15:33:19 2013 @@ -19,10 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> #include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline struct d3d9_volume *impl_from_IDirect3DVolume9(IDirect3DVolume9 *iface) {

10 years, 9 months

[akhaldi] 61322: [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 exi...

by akhaldi＠svn.reactos.org

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/buff… ============================================================================== --- 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/devi… ============================================================================== --- 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/dire… ============================================================================== --- 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/shad… ============================================================================== --- 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/surf… ============================================================================== --- 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/swap… ============================================================================== --- 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/text… ============================================================================== --- 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/vert… ============================================================================== --- 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/volu… ============================================================================== --- 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) {

10 years, 9 months

[akhaldi] 61321: [USBEHCI] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 14:59:21 2013 New Revision: 61321 URL: http://svn.reactos.org/svn/reactos?rev=61321&view=rev Log: [USBEHCI] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/drivers/usb/usbehci/usbehci.cpp trunk/reactos/drivers/usb/usbehci/usbehci.h Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Dec 21 14:59:21 2013 @@ -9,6 +9,9 @@ */ #include "usbehci.h" + +#define NDEBUG +#include <debug.h> typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext); Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sat Dec 21 14:59:21 2013 @@ -9,6 +9,9 @@ */ #include "usbehci.h" + +#define NDEBUG +#include <debug.h> class CUSBQueue : public IEHCIQueue { Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sat Dec 21 14:59:21 2013 @@ -9,6 +9,9 @@ */ #include "usbehci.h" + +#define NDEBUG +#include <debug.h> class CUSBRequest : public IEHCIRequest { Modified: trunk/reactos/drivers/usb/usbehci/usbehci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.cpp [iso-8859-1] Sat Dec 21 14:59:21 2013 @@ -9,6 +9,9 @@ */ #include "usbehci.h" + +#define NDEBUG +#include <debug.h> extern "C" Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Sat Dec 21 14:59:21 2013 @@ -4,8 +4,6 @@ #define INITGUID #include <ntddk.h> -#define NDEBUG -#include <debug.h> #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h>

10 years, 9 months

[akhaldi] 61320: [USBEHCI] * Move hardware.h inclusion to the main header. * Define INITGUID in the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 21 14:19:14 2013 New Revision: 61320 URL: http://svn.reactos.org/svn/reactos?rev=61320&view=rev Log: [USBEHCI] * Move hardware.h inclusion to the main header. * Define INITGUID in the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/drivers/usb/usbehci/usbehci.h Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -8,9 +8,7 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define INITGUID #include "usbehci.h" -#include "hardware.h" typedef VOID __stdcall HD_INIT_CALLBACK(IN PVOID CallBackContext); Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -9,7 +9,6 @@ */ #include "usbehci.h" -#include "hardware.h" class CUSBQueue : public IEHCIQueue { Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -8,10 +8,7 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define INITGUID - #include "usbehci.h" -#include "hardware.h" class CUSBRequest : public IEHCIRequest { Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Sat Dec 21 14:19:14 2013 @@ -1,5 +1,7 @@ #ifndef USBEHCI_H__ #define USBEHCI_H__ + +#define INITGUID #include <ntddk.h> #define NDEBUG @@ -31,6 +33,7 @@ #include <dmusicks.h> #include <kcom.h> +#include "hardware.h" #include "interfaces.h" //

10 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013