Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 20 Jan '14

20 Jan '14

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

1 0

[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 20 Jan '14

20 Jan '14

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,

1 0

[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 20 Jan '14

20 Jan '14

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)

1 0

[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 20 Jan '14

20 Jan '14

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

1 0

[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 20 Jan '14

20 Jan '14

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 {

1 0

[akhaldi] 61716: [DDRAW] * Improve the GUIDs situation. * Improve the main header. CORE-7716
by akhaldi＠svn.reactos.org 20 Jan '14

20 Jan '14

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);

1 0

[akhaldi] 61715: [D3DXOF] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 20 Jan '14

20 Jan '14

Author: akhaldi Date: Mon Jan 20 11:18:23 2014 New Revision: 61715 URL: http://svn.reactos.org/svn/reactos?rev=61715&view=rev Log: [D3DXOF] * Move some inclusions to 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/d3dxof/d3dxof.c trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h trunk/reactos/dll/directx/wine/d3dxof/main.c trunk/reactos/dll/directx/wine/d3dxof/mszip.c trunk/reactos/dll/directx/wine/d3dxof/parsing.c Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] Mon Jan 20 11:18:23 2014 @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - -#define COBJMACROS - -#include "winbase.h" -#include "wingdi.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump); Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h [iso-8859-1] Mon Jan 20 11:18:23 2014 @@ -21,14 +21,21 @@ #ifndef __D3DXOF_PRIVATE_INCLUDED__ #define __D3DXOF_PRIVATE_INCLUDED__ -#include <stdarg.h> +#include <config.h> -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dxfile.h" +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <dxfile.h> + +#include <wine/debug.h> #define MAX_NAME_LEN 40 #define MAX_ARRAY_DIM 4 Modified: trunk/reactos/dll/directx/wine/d3dxof/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ma… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/main.c [iso-8859-1] Mon Jan 20 11:18:23 2014 @@ -18,25 +18,9 @@ * 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 "winuser.h" -#include "winreg.h" -#include "winerror.h" - -#include "ole2.h" -#include "rpcproxy.h" -#include "uuids.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include "wine/debug.h" + +#include <rpcproxy.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); Modified: trunk/reactos/dll/directx/wine/d3dxof/mszip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ms… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/mszip.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/mszip.c [iso-8859-1] Mon Jan 20 11:18:23 2014 @@ -23,12 +23,12 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" - -#include "wine/debug.h" +#include <windef.h> +#include <winbase.h> #include "mszip.h" + +#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); Modified: trunk/reactos/dll/directx/wine/d3dxof/parsing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/parsing.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/parsing.c [iso-8859-1] Mon Jan 20 11:18:23 2014 @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - -#define COBJMACROS - -#include "winbase.h" -#include "wingdi.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);

1 0

[akhaldi] 61714: [D3DX9_36] * Improve the GUIDs situation. * Improve the main header. CORE-7716
by akhaldi＠svn.reactos.org 20 Jan '14

20 Jan '14

Author: akhaldi Date: Mon Jan 20 11:15:56 2014 New Revision: 61714 URL: http://svn.reactos.org/svn/reactos?rev=61714&view=rev Log: [D3DX9_36] * Improve the GUIDs situation. * Improve the main header. CORE-7716 Added: trunk/reactos/dll/directx/wine/d3dx9_36/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h trunk/reactos/dll/directx/wine/d3dx9_36/surface.c Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Mon Jan 20 11:15:56 2014 @@ -21,6 +21,7 @@ util.c volume.c xfile.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def) 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] Mon Jan 20 11:15:56 2014 @@ -25,21 +25,19 @@ #include <config.h> #include <wine/port.h> +#include <stdarg.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> Added: trunk/reactos/dll/directx/wine/d3dx9_36/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/guid.c (added) +++ trunk/reactos/dll/directx/wine/d3dx9_36/guid.c [iso-8859-1] Mon Jan 20 11:15:56 2014 @@ -0,0 +1,15 @@ +/* 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 <initguid.h> +#include <d3dx9.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/directx/wine/d3dx9_36/guid.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Mon Jan 20 11:15:56 2014 @@ -21,6 +21,8 @@ #include "d3dx9_36_private.h" #include <ole2.h> + +#include <initguid.h> #include <wincodec.h> /* Wine-specific WIC GUIDs */

1 0

[jimtabor] 61713: [User32] - Sync port MDI with wine. - Add patch from wine bug 9435. - Commented out wine code.
by jimtabor＠svn.reactos.org 20 Jan '14

20 Jan '14

Author: jimtabor Date: Mon Jan 20 06:42:39 2014 New Revision: 61713 URL: http://svn.reactos.org/svn/reactos?rev=61713&view=rev Log: [User32] - Sync port MDI with wine. - Add patch from wine bug 9435. - Commented out wine code. Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Mon Jan 20 06:42:39 2014 @@ -123,6 +123,7 @@ UINT nTotalCreated; UINT mdiFlags; UINT sbRecalc; /* SB_xxx flags for scrollbar fixup */ + DWORD initialStyle; /* Style when window was created */ // See http://bugs.winehq.org/show_bug.cgi?id=9435 HBITMAP hBmpClose; /* ReactOS modification */ } MDICLIENTINFO; @@ -914,12 +915,18 @@ (LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D ); /* The system menu is replaced by the child icon */ - hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM); +/* hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM); if (!hIcon) hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); if (!hIcon) hIcon = LoadIconW(NULL, IDI_APPLICATION); +*/ //// End + hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0); + if (!hIcon) + hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0); + if (!hIcon) + hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); if (hIcon) { HDC hMemDC; @@ -1140,7 +1147,8 @@ ci->nTotalCreated = 0; ci->frameTitle = NULL; ci->mdiFlags = 0; - ci->hFrameMenu = GetMenu(cs->hwndParent); + ci->initialStyle = cs->style; + ci->hFrameMenu = GetMenu(cs->hwndParent); if (!ci->hBmpClose) ci->hBmpClose = CreateMDIMenuBitmap(); @@ -1231,8 +1239,11 @@ case WM_MDINEXT: /* lParam != 0 means previous window */ { - HWND next = MDI_GetWindow( ci, (HWND)wParam, !lParam, 0 ); + HWND hwnd = wParam ? WIN_GetFullHandle((HWND)wParam) : ci->hwndActiveChild; + HWND next = MDI_GetWindow( ci, hwnd, !lParam, 0 ); MDI_SwitchActiveChild( ci, next, TRUE ); + if(!lParam) + SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); break; } @@ -1431,7 +1442,7 @@ case SC_NEXTWINDOW: case SC_PREVWINDOW: case SC_RESTORE: - return SendMessageW( ci->hwndActiveChild, WM_SYSCOMMAND, + return SendMessageW( ci->hwndChildMaximized, WM_SYSCOMMAND, wParam, lParam); } } @@ -1563,7 +1574,7 @@ return 0; case WM_MENUCHAR: - return 0x00010000; /* MDI children don't have menu bars */ + return MAKELRESULT( 0, MNC_CLOSE ); /* MDI children don't have menu bars */ case WM_CLOSE: SendMessageW( client, WM_MDIDESTROY, (WPARAM)hwnd, 0 ); @@ -1593,10 +1604,10 @@ return SendMessageW( GetParent(client), message, wParam, lParam); break; case SC_NEXTWINDOW: - SendMessageW( client, WM_MDINEXT, 0, 0); + SendMessageW( client, WM_MDINEXT, (WPARAM)ci->hwndActiveChild, 0); return 0; case SC_PREVWINDOW: - SendMessageW( client, WM_MDINEXT, 0, 1); + SendMessageW( client, WM_MDINEXT, (WPARAM)ci->hwndActiveChild, 1); return 0; } break; @@ -1604,7 +1615,7 @@ case WM_SHOWWINDOW: #ifndef __REACTOS__ case WM_SETVISIBLE: -#endif +#endif //// Commented out r57663 /*if (ci->hwndChildMaximized) ci->mdiFlags &= ~MDIF_NEEDUPDATE; else*/ MDI_PostUpdate(client, ci, SB_BOTH+1); break; @@ -1802,8 +1813,10 @@ SCROLLINFO info; RECT childRect, clientRect; HWND *list; + MDICLIENTINFO *ci; WINDOWINFO WindowInfo; + ci = get_client_info(hwnd); GetClientRect( hwnd, &clientRect ); SetRectEmpty( &childRect ); @@ -1821,6 +1834,7 @@ return; } + ERR("CalcChildScroll 1\n"); if ((list = WIN_ListChildren( hwnd ))) { int i; @@ -1831,6 +1845,7 @@ { HeapFree( GetProcessHeap(), 0, list ); ShowScrollBar( hwnd, SB_BOTH, FALSE ); + ERR("CalcChildScroll 2\n"); return; } if (style & WS_VISIBLE) @@ -1839,13 +1854,15 @@ GetWindowRect( list[i], &rect ); OffsetRect(&rect, -WindowInfo.rcClient.left, -WindowInfo.rcClient.top); + //WIN_GetRectangles( list[i], COORDS_PARENT, &rect, NULL ); + ERR("CalcChildScroll L\n"); UnionRect( &childRect, &rect, &childRect ); } } HeapFree( GetProcessHeap(), 0, list ); } UnionRect( &childRect, &clientRect, &childRect ); - + ERR("CalcChildScroll 3\n"); /* set common info values */ info.cbSize = sizeof(info); info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE; @@ -1864,15 +1881,30 @@ info.nMax = childRect.right; info.nPos = 0; info.nPage = 1 + clientRect.right - clientRect.left; - SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); - if (scroll == SB_HORZ) break; + //info.nMax = childRect.right - clientRect.right; + //info.nPos = clientRect.left - childRect.left; + if (ci->initialStyle & WS_HSCROLL) + SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); + if (scroll == SB_HORZ) + { + ERR("CalcChildScroll H\n"); + break; + } + else + { + ERR("CalcChildScroll B\n"); + } /* fall through */ case SB_VERT: info.nMin = childRect.top; info.nMax = childRect.bottom; info.nPos = 0; info.nPage = 1 + clientRect.bottom - clientRect.top; - SetScrollInfo(hwnd, SB_VERT, &info, TRUE); + //info.nMax = childRect.bottom - clientRect.bottom; + //info.nPos = clientRect.top - childRect.top; + ERR("CalcChildScroll V\n"); + if (ci->initialStyle & WS_VSCROLL) + SetScrollInfo(hwnd, SB_VERT, &info, TRUE); break; } }

1 0

[cwittich] 61712: [explorer_new] use strsafe functions
by cwittich＠svn.reactos.org 19 Jan '14

19 Jan '14

Author: cwittich Date: Sun Jan 19 19:49:12 2014 New Revision: 61712 URL: http://svn.reactos.org/svn/reactos?rev=61712&view=rev Log: [explorer_new] use strsafe functions Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Sun Jan 19 19:49:12 2014 @@ -220,12 +220,14 @@ DWORD dwType, dwSize; BOOL Ret = FALSE; - _tcscpy(szBuffer, + StringCbCopy(szBuffer, sizeof(szBuffer), TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")); - _tcscat(szBuffer, - _T("\\")); - _tcscat(szBuffer, - lpSubKey); + if (FAILED(StringCbCat(szBuffer, sizeof(szBuffer), + _T("\\")))) + return FALSE; + if (FAILED(StringCbCat(szBuffer, sizeof(szBuffer), + lpSubKey))) + return FALSE; dwSize = sizeof(szBuffer); if (RegOpenKeyEx(hKey, Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Sun Jan 19 19:49:12 2014 @@ -22,6 +22,7 @@ #include <shlwapi.h> #include <shlguid_undoc.h> #include <uxtheme.h> +#include <strsafe.h> #include "tmschema.h" #include "resource.h" Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sun Jan 19 19:49:12 2014 @@ -99,8 +99,13 @@ BOOL LaunchCPanel(HWND hwnd, LPCTSTR applet) { TCHAR szParams[MAX_PATH]; - _tcscpy(szParams, TEXT("shell32.dll,Control_RunDLL ")); - _tcscat(szParams, applet); + + StringCbCopy(szParams, sizeof(szParams), + TEXT("shell32.dll,Control_RunDLL ")); + if (FAILED(StringCbCat(szParams, sizeof(szParams), + applet))) + return FALSE; + return (ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), szParams, NULL, SW_SHOWDEFAULT) > (HINSTANCE)32); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs