Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[akhaldi] 61725: [QEDIT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 12:35:57 2014 New Revision: 61725 URL: http://svn.reactos.org/svn/reactos?rev=61725&view=rev Log: [QEDIT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/directx/wine/qedit/main.c trunk/reactos/dll/directx/wine/qedit/mediadet.c trunk/reactos/dll/directx/wine/qedit/qedit_private.h Modified: trunk/reactos/dll/directx/wine/qedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/mai… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/main.c [iso-8859-1] Mon Jan 20 12:35:57 2014 @@ -18,6 +18,7 @@ */ #include "qedit_private.h" + #include <rpcproxy.h> static HINSTANCE instance; Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] Mon Jan 20 12:35:57 2014 @@ -18,7 +18,9 @@ */ #include "qedit_private.h" + #include <assert.h> +#include <oleauto.h> typedef struct MediaDetImpl { IUnknown IUnknown_inner; Modified: trunk/reactos/dll/directx/wine/qedit/qedit_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/qedit_private.h [iso-8859-1] Mon Jan 20 12:35:57 2014 @@ -22,20 +22,16 @@ #include <stdarg.h> -#define COBJMACROS +#define WIN32_LEAN_AND_MEAN #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define COBJMACROS + #include <windef.h> #include <winbase.h> -//#include "wtypes.h" -//#include "wingdi.h" -//#include "winuser.h" - #include <objbase.h> -#include <oleauto.h> - #include <dshow.h> #define __WINE_DDRAW_H /* ROS HACK */ #include <qedit.h>

10 years, 8 months

[akhaldi] 61724: [MSDMO] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 12:34:50 2014 New Revision: 61724 URL: http://svn.reactos.org/svn/reactos?rev=61724&view=rev Log: [MSDMO] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. CORE-7716 Added: trunk/reactos/dll/directx/wine/msdmo/precomp.h (with props) Modified: trunk/reactos/dll/directx/wine/msdmo/dmoreg.c trunk/reactos/dll/directx/wine/msdmo/dmort.c trunk/reactos/dll/directx/wine/msdmo/rsrc.rc Modified: trunk/reactos/dll/directx/wine/msdmo/dmoreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/dmo… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/dmoreg.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/msdmo/dmoreg.c [iso-8859-1] Mon Jan 20 12:34:50 2014 @@ -17,24 +17,12 @@ * 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 <stdarg.h> - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" + #include <winuser.h> -//#include "winerror.h" #include <winreg.h> -#include <objbase.h> #include <wine/unicode.h> -#include <wine/debug.h> -//#include "initguid.h" #include <dmo.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msdmo); #define MSDMO_MAJOR_VERSION 6 Modified: trunk/reactos/dll/directx/wine/msdmo/dmort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/dmo… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/dmort.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/msdmo/dmort.c [iso-8859-1] Mon Jan 20 12:34:50 2014 @@ -16,22 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "precomp.h" -#define COBJMACROS -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> #include <mediaobj.h> #include <dmort.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msdmo); /*********************************************************************** * MoCreateMediaType (MSDMO.@) Added: trunk/reactos/dll/directx/wine/msdmo/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/pre… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/precomp.h (added) +++ trunk/reactos/dll/directx/wine/msdmo/precomp.h [iso-8859-1] Mon Jan 20 12:34:50 2014 @@ -0,0 +1,19 @@ +#ifndef _MSDMO_PCH_ +#define _MSDMO_PCH_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msdmo); + +#endif /* _MSDMO_PCH_ */ Propchange: trunk/reactos/dll/directx/wine/msdmo/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/msdmo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/msdmo/rsr… ============================================================================== --- trunk/reactos/dll/directx/wine/msdmo/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/msdmo/rsrc.rc [iso-8859-1] Mon Jan 20 12:34:50 2014 @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 6,5,1,900 #define WINE_PRODUCTVERSION_STR "6.5" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc>

10 years, 8 months

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

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:34:21 2014 New Revision: 61723 URL: http://svn.reactos.org/svn/reactos?rev=61723&view=rev Log: [DXGI] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/directx/wine/dxgi/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt trunk/reactos/dll/directx/wine/dxgi/adapter.c trunk/reactos/dll/directx/wine/dxgi/device.c trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h trunk/reactos/dll/directx/wine/dxgi/factory.c trunk/reactos/dll/directx/wine/dxgi/output.c trunk/reactos/dll/directx/wine/dxgi/surface.c trunk/reactos/dll/directx/wine/dxgi/swapchain.c trunk/reactos/dll/directx/wine/dxgi/utils.c trunk/reactos/dll/directx/wine/dxgi/version.rc Modified: trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/CMak… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/CMakeLists.txt [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -13,6 +13,7 @@ surface.c swapchain.c utils.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/dxgi.def) add_library(dxgi SHARED ${SOURCE} version.rc) Modified: trunk/reactos/dll/directx/wine/dxgi/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/adap… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/adapter.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -17,12 +17,7 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface) { Modified: trunk/reactos/dll/directx/wine/dxgi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/device.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -17,12 +17,7 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface) { Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/dxgi_main.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -17,13 +17,7 @@ * */ -#include "config.h" -#include "wine/port.h" - -#define DXGI_INIT_GUID #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); static CRITICAL_SECTION_DEBUG dxgi_cs_debug = { Modified: trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/dxgi… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/dxgi_private.h [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -19,25 +19,29 @@ #ifndef __WINE_DXGI_PRIVATE_H #define __WINE_DXGI_PRIVATE_H +#include <wine/config.h> +#include <wine/port.h> + +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include "wine/debug.h" +#define COBJMACROS -#define COBJMACROS -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "objbase.h" -#include "winnls.h" +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <objbase.h> +#include <winnls.h> -#include "dxgi.h" -#ifdef DXGI_INIT_GUID -#include "initguid.h" -#endif -#include "wine/wined3d.h" +#include <wine/debug.h> +#include <wine/wined3d.h> #include <wine/winedxgi.h> + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); extern CRITICAL_SECTION dxgi_cs DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dxgi/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/fact… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/factory.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -17,12 +17,7 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface) { Added: trunk/reactos/dll/directx/wine/dxgi/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/guid… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/guid.c (added) +++ trunk/reactos/dll/directx/wine/dxgi/guid.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -0,0 +1,17 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <wine/wined3d.h> +#include <initguid.h> +#include <wine/winedxgi.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/directx/wine/dxgi/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/dxgi/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/outp… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/output.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -16,12 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface) { Modified: trunk/reactos/dll/directx/wine/dxgi/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/surf… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/surface.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -17,12 +17,7 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); /* Inner IUnknown methods */ Modified: trunk/reactos/dll/directx/wine/dxgi/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/swap… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/swapchain.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -17,12 +17,7 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface) { Modified: trunk/reactos/dll/directx/wine/dxgi/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/util… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/utils.c [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -17,12 +17,7 @@ * */ -#include "config.h" -#include "wine/port.h" - #include "dxgi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dxgi); #define WINE_DXGI_TO_STR(x) case x: return #x Modified: trunk/reactos/dll/directx/wine/dxgi/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/vers… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/version.rc [iso-8859-1] Mon Jan 20 11:34:21 2014 @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 6,0,6000,16386 #define WINE_PRODUCTVERSION_STR "6.0.6000.16386" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc>

10 years, 8 months

[akhaldi] 61722: [DXDIAGN] * 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...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:32:43 2014 New Revision: 61722 URL: http://svn.reactos.org/svn/reactos?rev=61722&view=rev Log: [DXDIAGN] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/directx/wine/dxdiagn/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt trunk/reactos/dll/directx/wine/dxdiagn/container.c trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc trunk/reactos/dll/directx/wine/dxdiagn/provider.c trunk/reactos/dll/directx/wine/dxdiagn/resource.h Modified: trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/C… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -7,6 +7,7 @@ container.c dxdiag_main.c provider.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def) add_idl_headers(dxdiagn_idlheader fil_data.idl) Modified: trunk/reactos/dll/directx/wine/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/c… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/container.c [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -19,14 +19,7 @@ * */ -#include <config.h> - -#define COBJMACROS #include "dxdiag_private.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static inline IDxDiagContainerImpl *impl_from_IDxDiagContainer(IDxDiagContainer *iface) { Modified: trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/d… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -19,22 +19,9 @@ * */ -#define COBJMACROS +#include "dxdiag_private.h" -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <oleauto.h> -#include <oleidl.h> #include <rpcproxy.h> -#include <initguid.h> -#include "dxdiag_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); HINSTANCE dxdiagn_instance = 0; Modified: trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/d… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_private.h [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -21,20 +21,30 @@ #ifndef __WINE_DXDIAG_PRIVATE_H #define __WINE_DXDIAG_PRIVATE_H +#include <wine/config.h> + +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <wine/debug.h> +#include <wine/dxdiag.h> #include <wine/list.h> -#include <wine/dxdiag.h> +#include <wine/unicode.h> #include "resource.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); /* DXDiag Interfaces: */ typedef struct IDxDiagProviderImpl IDxDiagProviderImpl; Modified: trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/d… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.rc [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -15,6 +15,8 @@ * 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 <windef.h> #include "resource.h" Added: trunk/reactos/dll/directx/wine/dxdiagn/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/g… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/guid.c (added) +++ trunk/reactos/dll/directx/wine/dxdiagn/guid.c [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -0,0 +1,18 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <initguid.h> +#include <fil_data.h> +#include <wbemcli.h> +#include <wine/dxdiag.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/directx/wine/dxdiagn/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/p… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -20,29 +20,14 @@ * */ -#include <config.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "dxdiag_private.h" -#include <wine/unicode.h> + #include <winver.h> -#include <wingdi.h> -#include <objidl.h> #include <uuids.h> -#include <vfw.h> -#include <mmddk.h> #include <d3d9.h> -#include <strmif.h> -#include <initguid.h> #include <fil_data.h> #include <psapi.h> #include <wbemcli.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static const WCHAR szEmpty[] = {0}; Modified: trunk/reactos/dll/directx/wine/dxdiagn/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/r… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/resource.h [iso-8859-1] Mon Jan 20 11:32:43 2014 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> +#pragma once #define IDS_REGIONAL_SETTING 1 #define IDS_PAGE_FILE_FORMAT 2

10 years, 8 months

[akhaldi] 61721: [DSOUND] * 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 ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:30:39 2014 New Revision: 61721 URL: http://svn.reactos.org/svn/reactos?rev=61721&view=rev Log: [DSOUND] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/directx/wine/dsound/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt trunk/reactos/dll/directx/wine/dsound/buffer.c trunk/reactos/dll/directx/wine/dsound/capture.c trunk/reactos/dll/directx/wine/dsound/dsound.c trunk/reactos/dll/directx/wine/dsound/dsound_convert.c trunk/reactos/dll/directx/wine/dsound/dsound_main.c trunk/reactos/dll/directx/wine/dsound/dsound_private.h trunk/reactos/dll/directx/wine/dsound/duplex.c trunk/reactos/dll/directx/wine/dsound/mixer.c trunk/reactos/dll/directx/wine/dsound/primary.c trunk/reactos/dll/directx/wine/dsound/propset.c trunk/reactos/dll/directx/wine/dsound/sound3d.c Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -18,6 +18,7 @@ primary.c propset.c sound3d.c + guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dsound.def) Modified: trunk/reactos/dll/directx/wine/dsound/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/bu… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/buffer.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -19,26 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -#include <winternl.h> -#include <vfwmsgs.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" -//#include <dsconf.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); /******************************************************************************* * IDirectSoundNotify Modified: trunk/reactos/dll/directx/wine/dsound/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/ca… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/capture.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -25,26 +25,7 @@ * Make DirectSoundCaptureCreate and DirectSoundCaptureCreate8 behave differently */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -//#include "winbase.h" -//#include "winuser.h" -//#include "mmsystem.h" -#include <mmddk.h> -#include <winternl.h> -//#include "winnls.h" -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; Modified: trunk/reactos/dll/directx/wine/dsound/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -20,30 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -//#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -#include <winternl.h> -#include "mmddk.h" -//#include "wingdi.h" -//#include "mmreg.h" -//#include "ks.h" -//#include "ksmedia.h" -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); typedef struct IDirectSoundImpl { IUnknown IUnknown_inner; Modified: trunk/reactos/dll/directx/wine/dsound/dsound_convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound_convert.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound_convert.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -34,26 +34,7 @@ * Sound is LITTLE endian */ -#include <config.h> - -#include <stdarg.h> -#include <math.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <mmsystem.h> -#include <winternl.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); #ifdef WORDS_BIGENDIAN #define le16(x) RtlUshortByteSwap((x)) Modified: trunk/reactos/dll/directx/wine/dsound/dsound_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound_main.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -32,42 +32,10 @@ * Remove DS_HEL_FRAGS and use mixer fragment length for it */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <winnls.h> +#include "dsound_private.h" + #include <winreg.h> -//#include "mmsystem.h" -#include <winternl.h> -#include <mmddk.h> -#include <wine/debug.h> -#include <dsound.h> -#include <dsconf.h> -//#include "ks.h" #include <rpcproxy.h> -//#include "rpc.h" -//#include "rpcndr.h" -//#include "unknwn.h" -//#include "oleidl.h" -//#include "shobjidl.h" - -#include <initguid.h> -//#include "ksmedia.h" -//#include "propkey.h" -#include <devpkey.h> - -#include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); struct list DSOUND_renderers = LIST_INIT(DSOUND_renderers); CRITICAL_SECTION DSOUND_renderers_lock; Modified: trunk/reactos/dll/directx/wine/dsound/dsound_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound_private.h [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -19,16 +19,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <wine/config.h> + +#include <assert.h> +#include <math.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <wingdi.h> +#include <winternl.h> +#include <objbase.h> +#include <mmdeviceapi.h> +#include <audioclient.h> +#include <mmsystem.h> +#include <dsound.h> +#include <dsconf.h> +#include <vfwmsgs.h> +#include <devpkey.h> + +#include <wine/debug.h> +#include <wine/list.h> + +WINE_DEFAULT_DEBUG_CHANNEL(dsound); + /* Linux does not support better timing than 10ms */ #define DS_TIME_RES 2 /* Resolution of multimedia timer */ #define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */ - -#include "wingdi.h" -#include "mmdeviceapi.h" -#include "audioclient.h" -#include "mmsystem.h" - -#include "wine/list.h" extern int ds_hel_buflen DECLSPEC_HIDDEN; extern int ds_snd_queue_max DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dsound/duplex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/du… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/duplex.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/duplex.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -20,26 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#define COBJMACROS -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -//#include "mmddk.h" -#include <winternl.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); /***************************************************************************** * IDirectSoundFullDuplex implementation structure Added: trunk/reactos/dll/directx/wine/dsound/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/gu… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/guid.c (added) +++ trunk/reactos/dll/directx/wine/dsound/guid.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -0,0 +1,18 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <objbase.h> +#include <initguid.h> +#include <mmdeviceapi.h> +#include <audioclient.h> +#include <devpkey.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/directx/wine/dsound/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/dsound/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/mi… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/mixer.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -22,30 +22,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdarg.h> -#include <math.h> /* Insomnia - pow() function */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -#include <mmsystem.h> -//#include "wingdi.h" -//#include "mmreg.h" -#include <winternl.h> -#include <wine/debug.h> -#include <dsound.h> -//#include "ks.h" -//#include "ksmedia.h" #include "dsound_private.h" + #include "fir.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) { Modified: trunk/reactos/dll/directx/wine/dsound/primary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/pr… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/primary.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/primary.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -23,25 +23,7 @@ * it leaves dsound in unusable (not really open) state. */ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "mmsystem.h" -#include <winternl.h> -#include <mmddk.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); static DWORD DSOUND_fraglen(DirectSoundDevice *device) { Modified: trunk/reactos/dll/directx/wine/dsound/propset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/pr… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/propset.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/propset.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -19,35 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -#include <winternl.h> -#include <winnls.h> -#include <vfwmsgs.h> -#include <initguid.h> -//#include <mmddk.h> -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" -#include <dsconf.h> - -//#include "ksmedia.h" -//#include "propkey.h" -#include <devpkey.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dsound); static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 }; Modified: trunk/reactos/dll/directx/wine/dsound/sound3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/so… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/sound3d.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/sound3d.c [iso-8859-1] Mon Jan 20 11:30:39 2014 @@ -37,29 +37,10 @@ * Optimize WINMM and negotiate fragment size, decrease DS_HEL_MARGIN */ -#include <stdarg.h> -#include <math.h> /* Insomnia - pow() function */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <mmsystem.h> -#include <winternl.h> -//#include "mmddk.h" -#include <wine/debug.h> -#include <dsound.h> #include "dsound_private.h" /* default velocity of sound in the air */ #define DEFAULT_VELOCITY 340 - -WINE_DEFAULT_DEBUG_CHANNEL(dsound3d); /******************************************************************************* * Auxiliary functions

10 years, 8 months

[akhaldi] 61720: [DPLAYX] * 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 ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:28:30 2014 New Revision: 61720 URL: http://svn.reactos.org/svn/reactos?rev=61720&view=rev Log: [DPLAYX] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/dll/directx/wine/dplayx/dplay_global.h trunk/reactos/dll/directx/wine/dplayx/dplaysp.c trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h trunk/reactos/dll/directx/wine/dplayx/dplobby.c trunk/reactos/dll/directx/wine/dplayx/lobbysp.c trunk/reactos/dll/directx/wine/dplayx/lobbysp.h trunk/reactos/dll/directx/wine/dplayx/name_server.c trunk/reactos/dll/directx/wine/dplayx/name_server.h Modified: trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -17,23 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "objbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "dplay.h" -//#include "dplobby.h" -//#include "initguid.h" -#include "dplay_global.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); - +#include "dplayx_global.h" typedef struct { Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -17,31 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -//#include "winerror.h" -//#include "winbase.h" -//#include "winnt.h" -#include <winreg.h> -//#include "winnls.h" -#include <wine/unicode.h> -#include <wine/debug.h> - #include "dplayx_global.h" -#include "name_server.h" -//#include "dplayx_queue.h" -//#include "dplaysp.h" -//#include "dplay_global.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* FIXME: Should this be externed? */ extern HRESULT DPL_CreateCompoundAddress Modified: trunk/reactos/dll/directx/wine/dplayx/dplay_global.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay_global.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay_global.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -19,17 +19,6 @@ #ifndef __WINE_DPLAY_GLOBAL_INCLUDED #define __WINE_DPLAY_GLOBAL_INCLUDED -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -#include "dplaysp.h" -#include "lobbysp.h" -#include "dplayx_queue.h" - extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dplayx/dplaysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplaysp.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplaysp.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -18,20 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <string.h> -//#include "winerror.h" -#include <wine/debug.h> - -//#include "dplaysp.h" -//#include "dplay_global.h" -#include "name_server.h" -//#include "dplayx_messages.h" - -#include "dplayx_global.h" /* FIXME: For global hack */ +#include "dplayx_global.h" /* FIXME: Need to add interface locking inside procedures */ - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* Prototypes */ static BOOL DPSP_CreateIUnknown( LPVOID lpSP ); Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -29,24 +29,7 @@ * */ -//#include <stdarg.h> -//#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <wine/debug.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/unicode.h> - -//#include "wingdi.h" -//#include "winuser.h" - #include "dplayx_global.h" -//#include "dplayx_messages.h" /* For CreateMessageReceptionThread only */ - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* FIXME: Need to do all that fun other dll referencing type of stuff */ Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -19,15 +19,33 @@ #ifndef __WINE_DPLAYX_GLOBAL #define __WINE_DPLAYX_GLOBAL +#include <wine/config.h> + +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS -#include <stdarg.h> +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <windef.h> #include <winbase.h> -//#include "winuser.h" +#include <winreg.h> #include <dplay.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "dplaysp.h" +#include "lobbysp.h" +#include "dplayx_queue.h" +#include "dplay_global.h" +#include "dplayx_messages.h" +#include "name_server.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); BOOL DPLAYX_ConstructData(void) DECLSPEC_HIDDEN; BOOL DPLAYX_DestructData(void) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -57,20 +57,9 @@ * somehow. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <rpcproxy.h> -#include <wine/debug.h> #include "dplayx_global.h" -WINE_DEFAULT_DEBUG_CHANNEL(dplay); +#include <rpcproxy.h> static HINSTANCE instance; Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -20,21 +20,7 @@ * o Messaging interface required for both DirectPlay and DirectPlayLobby. */ -//#include <stdarg.h> -//#include <string.h> -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "winerror.h" - -//#include "dplayx_messages.h" -//#include "dplay_global.h" #include "dplayx_global.h" -#include "name_server.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct tagMSGTHREADINFO { Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -19,15 +19,6 @@ #ifndef __WINE_DPLAYX_MESSAGES__ #define __WINE_DPLAYX_MESSAGES__ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "dplay.h" -//#include "rpc.h" /* For GUID */ - -#include "dplay_global.h" - DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart, HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN; @@ -220,4 +211,4 @@ #include <poppack.h> -#endif +#endif /* __WINE_DPLAYX_MESSAGES__ */ Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -25,11 +25,6 @@ #ifndef __WINE_DPLAYX_QUEUE_H #define __WINE_DPLAYX_QUEUE_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" #define DPQ_INSERT(a,b,c) DPQ_INSERT_IN_TAIL(a,b,c) Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -16,25 +16,8 @@ * 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 <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <winreg.h> -#include <winnls.h> -#include <wine/debug.h> #include "dplayx_global.h" -#include "dplayx_messages.h" -//#include "dplayx_queue.h" -//#include "dplobby.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, Modified: trunk/reactos/dll/directx/wine/dplayx/lobbysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/lo… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/lobbysp.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/lobbysp.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "winerror.h" -#include <wine/debug.h> - -//#include "lobbysp.h" -#include "dplay_global.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); +#include "dplayx_global.h" /* Prototypes */ static BOOL DPLSP_CreateIUnknown( LPVOID lpSP ); Modified: trunk/reactos/dll/directx/wine/dplayx/lobbysp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/lo… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/lobbysp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/lobbysp.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -18,13 +18,6 @@ #ifndef __WINE_LOBBY_SP_H #define __WINE_LOBBY_SP_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -#include "dplobby.h" /* GUID for IDPLobbySP {5A4E5A20-2CED-11d0-A889-00A0C905433C} */ DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20, 0x2ced, 0x11d0, 0xa8, 0x89, 0x0, 0xa0, 0xc9, 0x5, 0x43, 0x3c); @@ -516,4 +509,4 @@ */ extern DWORD gdwDPlaySPRefCount DECLSPEC_HIDDEN; -#endif +#endif /* __WINE_LOBBY_SP_H */ Modified: trunk/reactos/dll/directx/wine/dplayx/name_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/na… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/name_server.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/name_server.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -19,27 +19,11 @@ /* NOTE: Methods with the NS_ prefix are name server methods */ -//#include <stdarg.h> -//#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" -#include <wine/unicode.h> -#include <wine/debug.h> +#include "dplayx_global.h" + #include <mmsystem.h> -//#include "dplayx_global.h" -#include "name_server.h" -//#include "dplaysp.h" -//#include "dplayx_messages.h" -//#include "dplayx_queue.h" - /* FIXME: Need to create a crit section, store and use it */ - -WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* NS specific structures */ struct NSCacheData Modified: trunk/reactos/dll/directx/wine/dplayx/name_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/na… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/name_server.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/name_server.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -18,15 +18,6 @@ #ifndef __WINE_DPLAYX_NAMESERVER #define __WINE_DPLAYX_NAMESERVER - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "dplay.h" -//#include "dplaysp.h" -#include "dplayx_messages.h" -//#include "dplay_global.h" void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) DECLSPEC_HIDDEN; void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr,

10 years, 8 months

[akhaldi] 61719: [DMUSIC] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:27:12 2014 New Revision: 61719 URL: http://svn.reactos.org/svn/reactos?rev=61719&view=rev Log: [DMUSIC] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.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/port.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] Mon Jan 20 11:27:12 2014 @@ -20,6 +20,7 @@ */ #include "dmusic_private.h" + #include <dmksctrl.h> static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *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] Mon Jan 20 11:27:12 2014 @@ -19,6 +19,8 @@ */ #include "dmusic_private.h" + +#include <dmusicf.h> WINE_DECLARE_DEBUG_CHANNEL(dmfile); 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] Mon Jan 20 11:27:12 2014 @@ -21,6 +21,8 @@ #include "dmusic_private.h" +#include <winreg.h> + static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) { return CONTAINING_RECORD(iface, IDirectMusic8Impl, 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] Mon Jan 20 11:27:12 2014 @@ -18,8 +18,9 @@ */ #include "dmusic_private.h" + #include <stdio.h> -#include "rpcproxy.h" +#include <rpcproxy.h> 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] Mon Jan 20 11:27:12 2014 @@ -24,22 +24,25 @@ #include <config.h> -#define COBJMACROS +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <dmusici.h> +#include <dmusics.h> + #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(dmusic); - #include <wine/list.h> #include <wine/unicode.h> -#include <winreg.h> -#include <objbase.h> - -#include <dmusici.h> -#include <dmusicf.h> -#include <dmusics.h> + +WINE_DEFAULT_DEBUG_CHANNEL(dmusic); /***************************************************************************** * Interfaces 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] Mon Jan 20 11:27:12 2014 @@ -20,6 +20,7 @@ */ #include "dmusic_private.h" + #include <assert.h> static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)

10 years, 8 months

[akhaldi] 61718: [DINPUT] * 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 ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:25:53 2014 New Revision: 61718 URL: http://svn.reactos.org/svn/reactos?rev=61718&view=rev Log: [DINPUT] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/directx/wine/dinput/config.c trunk/reactos/dll/directx/wine/dinput/device.c trunk/reactos/dll/directx/wine/dinput/device_private.h trunk/reactos/dll/directx/wine/dinput/dinput.rc trunk/reactos/dll/directx/wine/dinput/dinput_main.c trunk/reactos/dll/directx/wine/dinput/dinput_private.h trunk/reactos/dll/directx/wine/dinput/joystick.c trunk/reactos/dll/directx/wine/dinput/joystick_linux.c trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c trunk/reactos/dll/directx/wine/dinput/joystick_private.h trunk/reactos/dll/directx/wine/dinput/keyboard.c trunk/reactos/dll/directx/wine/dinput/mouse.c trunk/reactos/dll/directx/wine/dinput/resource.h Modified: trunk/reactos/dll/directx/wine/dinput/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/co… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/config.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/config.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -16,12 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - -//#include "wine/unicode.h" -//#include "objbase.h" #include "dinput_private.h" -//#include "device_private.h" + +#include <winuser.h> +#include <commctrl.h> #include "resource.h" Modified: trunk/reactos/dll/directx/wine/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -24,22 +24,8 @@ It also contains all the helper functions. */ -#include <config.h> - -//#include <stdarg.h> -//#include <string.h> -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "windef.h" -//#include "winbase.h" -#include <winreg.h> -#include <winuser.h> -//#include "winerror.h" -//#include "dinput.h" -#include "device_private.h" -//#include "dinput_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +#include "dinput_private.h" static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) { Modified: trunk/reactos/dll/directx/wine/dinput/device_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -19,14 +19,6 @@ #ifndef __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H #define __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "dinput.h" -//#include "wine/list.h" -#include "dinput_private.h" typedef struct { Modified: trunk/reactos/dll/directx/wine/dinput/dinput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput.rc [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -15,6 +15,9 @@ * 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 <winuser.h> +#include <commctrl.h> #include "resource.h" Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -30,33 +30,9 @@ * - Fallout : works great in X and DGA mode */ -#include <config.h> -//#include <assert.h> -//#include <stdarg.h> -//#include <string.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSUNION - -#include <wine/debug.h> -//#include "wine/unicode.h" -//#include "windef.h" -#include <winbase.h> -#include <winuser.h> -#include <winnls.h> -//#include "winerror.h" -#include <objbase.h> +#include "dinput_private.h" + #include <rpcproxy.h> -//#include "initguid.h" -//#include "dinput_private.h" -#include "device_private.h" -//#include "dinputd.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); static const IDirectInput7AVtbl ddi7avt; static const IDirectInput7WVtbl ddi7wvt; Modified: trunk/reactos/dll/directx/wine/dinput/dinput_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_private.h [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -19,17 +19,29 @@ #ifndef __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H #define __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H +#include <wine/config.h> + +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> +#define COBJMACROS +#define NONAMELESSUNION #include <windef.h> #include <winbase.h> +#include <winreg.h> +#include <winuser.h> #include <dinput.h> #include <dinputd.h> + +#include <wine/debug.h> #include <wine/list.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); /* Implementation specification */ typedef struct IDirectInputImpl IDirectInputImpl; @@ -82,4 +94,6 @@ #define DIMOUSE_MASK 0x82000000 #define DIGENRE_ANY 0xFF000000 +#include "device_private.h" + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ Modified: trunk/reactos/dll/directx/wine/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -26,11 +26,9 @@ * force feedback */ +#include "dinput_private.h" + #include "joystick_private.h" -#include <wine/debug.h> -#include <winreg.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); static inline JoystickGenericImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) { Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -25,24 +25,17 @@ * force feedback */ -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -//#include <time.h> +#include "dinput_private.h" + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -//#include <fcntl.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif -//#include <errno.h> #ifdef HAVE_LINUX_IOCTL_H # include <linux/ioctl.h> #endif @@ -53,19 +46,6 @@ #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> #endif - -#include <wine/debug.h> -//#include "wine/unicode.h" -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "dinput.h" - -//#include "dinput_private.h" -#include "device_private.h" -//#include "joystick_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); #ifdef HAVE_LINUX_22_JOYSTICK_API Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -20,14 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -//#include <assert.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -//#include <time.h> +#include "dinput_private.h" + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -50,20 +44,7 @@ # include <sys/poll.h> #endif -#include <wine/debug.h> -//#include "wine/unicode.h" -//#include "wine/list.h" -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "winreg.h" -//#include "dinput.h" - -//#include "dinput_private.h" #include "device_private.h" -//#include "joystick_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); #ifdef HAS_PROPER_HEADER Modified: trunk/reactos/dll/directx/wine/dinput/joystick_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_private.h [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -18,20 +18,6 @@ #ifndef __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H #define __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include "windef.h" -#include "winbase.h" -#include "dinput.h" -#include "wine/list.h" -#include "wine/unicode.h" -#include "dinput_private.h" -#include "device_private.h" /* Number of objects in the default data format */ #define MAX_PROPS 164 Modified: trunk/reactos/dll/directx/wine/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/ke… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -20,24 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winnls.h> -//#include "winerror.h" -//#include "dinput.h" - -//#include "dinput_private.h" -#include "device_private.h" -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#include "dinput_private.h" #define WINE_DINPUT_KEYBOARD_MAX_KEYS 256 Modified: trunk/reactos/dll/directx/wine/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/mo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -19,26 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" -#include <winuser.h> -//#include "winerror.h" -#include <winreg.h> -//#include "dinput.h" - -//#include "dinput_private.h" -#include "device_private.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#include "dinput_private.h" /* Wine mouse driver object instances */ #define WINE_MOUSE_X_AXIS_INSTANCE 0 Modified: trunk/reactos/dll/directx/wine/dinput/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/re… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/resource.h [iso-8859-1] Mon Jan 20 11:25:53 2014 @@ -16,11 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "shlobj.h" - -#include <windef.h> -#include <winuser.h> -#include <commctrl.h> +#pragma once #define IDD_CONFIGUREDEVICES 1

10 years, 8 months

[akhaldi] 61717: [DEVENUM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:22:40 2014 New Revision: 61717 URL: http://svn.reactos.org/svn/reactos?rev=61717&view=rev Log: [DEVENUM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 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/mediacatenum.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] Mon Jan 20 11:22:40 2014 @@ -24,7 +24,10 @@ */ #include "devenum_private.h" + #include <vfw.h> + +#include "resource.h" 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] Mon Jan 20 11:22:40 2014 @@ -18,10 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> + +#include "resource.h" + #pragma code_page(65001) - -#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] Mon Jan 20 11:22:40 2014 @@ -20,6 +20,7 @@ */ #include "devenum_private.h" + #include <rpcproxy.h> DECLSPEC_HIDDEN LONG dll_refs; 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] Mon Jan 20 11:22:40 2014 @@ -30,6 +30,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H +#define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -37,10 +38,8 @@ #include <winbase.h> #include <wingdi.h> #include <winreg.h> - -#define COBJMACROS - -#include <ole2.h> +#include <objbase.h> +#include <oleidl.h> #include <strmif.h> #include <uuids.h> @@ -50,8 +49,6 @@ #ifndef RC_INVOKED #include <wine/unicode.h> #endif - -#include "resource.h" /********************************************************************** * Dll lifetime tracking declaration for devenum.dll 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] Mon Jan 20 11:22:40 2014 @@ -23,7 +23,9 @@ */ #include "devenum_private.h" + #include <ocidl.h> +#include <oleauto.h> typedef struct {

10 years, 8 months

[akhaldi] 61716: [DDRAW] * Improve the GUIDs situation. * Improve the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 20 11:20:33 2014 New Revision: 61716 URL: http://svn.reactos.org/svn/reactos?rev=61716&view=rev Log: [DDRAW] * Improve the GUIDs situation. * Improve the main header. CORE-7716 Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/main.c 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] Mon Jan 20 11:20:33 2014 @@ -22,26 +22,27 @@ #include <config.h> #include <wine/port.h> +#include <assert.h> +#include <stdarg.h> + #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <assert.h> #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(ddraw); - +#include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> - -#include <initguid.h> #include <d3d.h> +#include <wine/debug.h> #include <wine/list.h> #include <wine/wined3d.h> + +WINE_DEFAULT_DEBUG_CHANNEL(ddraw); extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; extern DWORD force_refresh_rate DECLSPEC_HIDDEN; @@ -620,4 +621,4 @@ HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; -#endif +#endif /* __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H */ 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] Mon Jan 20 11:20:33 2014 @@ -25,10 +25,11 @@ */ #include "ddraw_private.h" + +#include <winreg.h> #include <rpcproxy.h> #include <wine/exception.h> -#include <winreg.h> static struct list global_ddraw_list = LIST_INIT(global_ddraw_list);

10 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
43
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 January 2014