Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[akhaldi] 61605: [RPCSS] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Remove one time winsvc.h inclusion from the main hea...
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:47:43 2014 New Revision: 61605 URL: http://svn.reactos.org/svn/reactos?rev=61605&view=rev Log: [RPCSS] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Remove one time winsvc.h inclusion from the main header and put them back where it belongs. CORE-7716 Modified: trunk/reactos/base/services/rpcss/epmp.c trunk/reactos/base/services/rpcss/irotp.c trunk/reactos/base/services/rpcss/rpcss.h trunk/reactos/base/services/rpcss/rpcss_main.c trunk/reactos/base/services/rpcss/service_main.c Modified: trunk/reactos/base/services/rpcss/epmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/epmp.c… ============================================================================== --- trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/epmp.c [iso-8859-1] Mon Jan 13 12:47:43 2014 @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <epm_s.h> +#include "rpcss.h" #include <wine/debug.h> -#include <wine/list.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/irotp.… ============================================================================== --- trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/irotp.c [iso-8859-1] Mon Jan 13 12:47:43 2014 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <irot_s.h> -#include <wine/list.h> +#include "rpcss.h" + #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(rpcss); Modified: trunk/reactos/base/services/rpcss/rpcss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.h [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.h [iso-8859-1] Mon Jan 13 12:47:43 2014 @@ -22,9 +22,20 @@ #define __WINE_RPCSS_H #include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include <windef.h> #include <winbase.h> -#include <winsvc.h> +#include <irot_s.h> +#include <epm_s.h> + +#include <wine/list.h> #endif /* __WINE_RPCSS_H */ Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Mon Jan 13 12:47:43 2014 @@ -43,11 +43,7 @@ * role of rpcss.exe in wine. */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "rpcss.h" -#include <irot_s.h> -#include <epm_s.h> #include <wine/debug.h> Modified: trunk/reactos/base/services/rpcss/service_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/servic… ============================================================================== --- trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] Mon Jan 13 12:47:43 2014 @@ -8,6 +8,8 @@ */ #include "rpcss.h" + +#include <winsvc.h> #define NDEBUG #include <debug.h>

1 0

[akhaldi] 61604: [EVENTLOG] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:46:06 2014 New Revision: 61604 URL: http://svn.reactos.org/svn/reactos?rev=61604&view=rev Log: [EVENTLOG] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Mon Jan 13 12:46:06 2014 @@ -10,6 +10,9 @@ /* INCLUDES *****************************************************************/ #include "eventlog.h" + +#include <stdio.h> +#include <netevent.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Mon Jan 13 12:46:06 2014 @@ -9,18 +9,14 @@ #ifndef __EVENTLOG_H__ #define __EVENTLOG_H__ +#include <stdarg.h> + #define WIN32_NO_STATUS - -#include <stdio.h> #include <windef.h> #include <winbase.h> -#include <netevent.h> -#include <lpctypes.h> -#include <lpcfuncs.h> -#include <rtlfuncs.h> -#include <obfuncs.h> -#include <iofuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/obfuncs.h> #include <eventlogrpc_s.h> typedef struct _IO_ERROR_LPC Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Jan 13 12:46:06 2014 @@ -10,6 +10,8 @@ /* INCLUDES *****************************************************************/ #include "eventlog.h" + +#include <ndk/iofuncs.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] Mon Jan 13 12:46:06 2014 @@ -10,6 +10,8 @@ /* INCLUDES *****************************************************************/ #include "eventlog.h" + +#include <ndk/lpcfuncs.h> #define NDEBUG #include <debug.h>

1 0

[akhaldi] 61603: [AUDIOSRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:45:14 2014 New Revision: 61603 URL: http://svn.reactos.org/svn/reactos?rev=61603&view=rev Log: [AUDIOSRV] * Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716 Modified: trunk/reactos/base/services/audiosrv/audiosrv.h trunk/reactos/base/services/audiosrv/debug.c trunk/reactos/base/services/audiosrv/pnp.c trunk/reactos/base/services/audiosrv/pnp_list_lock.c Modified: trunk/reactos/base/services/audiosrv/audiosrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.h [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.h [iso-8859-1] Mon Jan 13 12:45:14 2014 @@ -7,16 +7,10 @@ */ #include <stdarg.h> + #include <windef.h> #include <winbase.h> -#include <winreg.h> -#include <winuser.h> -#include <mmsystem.h> -#include <assert.h> -#include <setupapi.h> -#include <ksmedia.h> -#include <stdio.h> -#include <stdlib.h> +#include <malloc.h> #include <dbt.h> #include <audiosrv/audiosrv.h> Modified: trunk/reactos/base/services/audiosrv/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/deb… ============================================================================== --- trunk/reactos/base/services/audiosrv/debug.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/debug.c [iso-8859-1] Mon Jan 13 12:45:14 2014 @@ -1,6 +1,8 @@ /* Service debugging (simply logs to a file) */ #include "audiosrv.h" + +#include <stdio.h> void logmsg(char* string, ...) { Modified: trunk/reactos/base/services/audiosrv/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] Mon Jan 13 12:45:14 2014 @@ -8,8 +8,13 @@ #include "audiosrv.h" +#include <winreg.h> +#include <winuser.h> +#include <mmsystem.h> +#include <setupapi.h> +#include <ksmedia.h> + static HDEVNOTIFY device_notification_handle = NULL; - /* Finds all devices within the KSCATEGORY_AUDIO category and puts them Modified: trunk/reactos/base/services/audiosrv/pnp_list_lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp_list_lock.c [iso-8859-1] (original) +++ trunk/reactos/base/services/audiosrv/pnp_list_lock.c [iso-8859-1] Mon Jan 13 12:45:14 2014 @@ -7,6 +7,8 @@ */ #include "audiosrv.h" + +#include <assert.h> static HANDLE audio_device_list_lock = NULL;

1 0

[akhaldi] 61602: [WINHLP32] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:43:38 2014 New Revision: 61602 URL: http://svn.reactos.org/svn/reactos?rev=61602&view=rev Log: [WINHLP32] * 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/resource file. CORE-7716 Modified: trunk/reactos/base/applications/winhlp32/callback.c trunk/reactos/base/applications/winhlp32/hlpfile.c trunk/reactos/base/applications/winhlp32/lang/Bg.rc trunk/reactos/base/applications/winhlp32/lang/Cs.rc trunk/reactos/base/applications/winhlp32/lang/Da.rc trunk/reactos/base/applications/winhlp32/lang/De.rc trunk/reactos/base/applications/winhlp32/lang/En.rc trunk/reactos/base/applications/winhlp32/lang/Es.rc trunk/reactos/base/applications/winhlp32/lang/Fi.rc trunk/reactos/base/applications/winhlp32/lang/Fr.rc trunk/reactos/base/applications/winhlp32/lang/He.rc trunk/reactos/base/applications/winhlp32/lang/Hu.rc trunk/reactos/base/applications/winhlp32/lang/It.rc trunk/reactos/base/applications/winhlp32/lang/Ja.rc trunk/reactos/base/applications/winhlp32/lang/Ko.rc trunk/reactos/base/applications/winhlp32/lang/Lt.rc trunk/reactos/base/applications/winhlp32/lang/Nl.rc trunk/reactos/base/applications/winhlp32/lang/No.rc trunk/reactos/base/applications/winhlp32/lang/Pl.rc trunk/reactos/base/applications/winhlp32/lang/Pt.rc trunk/reactos/base/applications/winhlp32/lang/Rm.rc trunk/reactos/base/applications/winhlp32/lang/Ro.rc trunk/reactos/base/applications/winhlp32/lang/Ru.rc trunk/reactos/base/applications/winhlp32/lang/Si.rc trunk/reactos/base/applications/winhlp32/lang/Sk.rc trunk/reactos/base/applications/winhlp32/lang/Sq.rc trunk/reactos/base/applications/winhlp32/lang/Sr.rc trunk/reactos/base/applications/winhlp32/lang/Sv.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/applications/winhlp32/lang/Uk.rc trunk/reactos/base/applications/winhlp32/lang/Zh.rc trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/macro.h trunk/reactos/base/applications/winhlp32/macro.lex.yy.c trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp.h Modified: trunk/reactos/base/applications/winhlp32/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/callback.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/callback.c [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <windef.h> -#include <wingdi.h> -#include <winuser.h> -#include <wine/debug.h> - #include "winhelp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhelp); static WORD CALLBACK WHD_GetFSError(void) { Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -20,18 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -#include <stdio.h> -//#include <string.h> -#include <windef.h> -//#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <wine/debug.h> - #include "winhelp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhelp); static inline unsigned short GET_USHORT(const BYTE* buffer, unsigned i) { Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Bg.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Cs.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Da.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/De.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/winhlp32/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/En.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" /* Menu */ Modified: trunk/reactos/base/applications/winhlp32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Es.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/winhlp32/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Fi.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Fr.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/winhlp32/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/He.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Hu.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/It.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ja.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ko.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Lt.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Nl.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/No.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/base/applications/winhlp32/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Pl.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Pt.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -24,8 +24,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Rm.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/winhlp32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ru.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Si.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sk.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sq.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,8 +19,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" /* Menu */ Modified: trunk/reactos/base/applications/winhlp32/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sr.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Sv.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -21,8 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/winhlp32/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Uk.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -22,8 +22,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Zh.rc [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -20,8 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "winhelp_res.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -19,18 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <commdlg.h> +#include "winhelp.h" + #include <shellapi.h> -#include <wine/debug.h> - -#include "winhelp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhelp); /**************************************************/ /* Macro table */ Modified: trunk/reactos/base/applications/winhlp32/macro.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.h [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -18,11 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -//#include <stdarg.h> - -//#include "windef.h" -#include <winbase.h> struct lexret { LPCSTR proto; Modified: trunk/reactos/base/applications/winhlp32/macro.lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.lex.yy.c [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -502,20 +502,10 @@ #define YY_NO_INPUT 1 #line 26 "macro.lex.l" -#include "config.h" -#include <assert.h> -#include <stdarg.h> +#include <config.h> #define YY_NO_UNISTD_H -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "winhelp.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhelp); struct lex_data { LPCSTR macroptr; Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -22,29 +22,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include <stdio.h> -//#include <string.h> -//#include <stdarg.h> -//#include <stdlib.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -#include <winuser.h> -#include <commdlg.h> #include "winhelp.h" -//#include "winhelp_res.h" -//#include "shellapi.h" + #include <richedit.h> #include <commctrl.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(winhelp); WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}, NULL}; Modified: trunk/reactos/base/applications/winhlp32/winhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] Mon Jan 13 12:43:38 2014 @@ -32,12 +32,29 @@ #ifndef RC_INVOKED -//#include <stdarg.h> +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <commdlg.h> #include "hlpfile.h" -//#include "windef.h" -//#include "winbase.h" #include "macro.h" + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(winhelp); + #include "winhelp_res.h" typedef struct tagHelpButton

1 0

[akhaldi] 61601: [TASKMGR] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:43:06 2014 New Revision: 61601 URL: http://svn.reactos.org/svn/reactos?rev=61601&view=rev Log: [TASKMGR] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/base/applications/taskmgr/dbgchnl.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/precomp.h trunk/reactos/base/applications/taskmgr/proclist.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/dbgchnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/dbgchnl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/dbgchnl.c [iso-8859-1] Mon Jan 13 12:43:06 2014 @@ -21,6 +21,8 @@ */ #include "precomp.h" + +#include <stdio.h> /* TODO: * - the dialog box could be non modal Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] Mon Jan 13 12:43:06 2014 @@ -21,6 +21,8 @@ */ #include "precomp.h" + +#include <math.h> WNDPROC OldGraphCtrlWndProc; Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Mon Jan 13 12:43:06 2014 @@ -21,6 +21,12 @@ */ #include "precomp.h" + +#define WIN32_LEAN_AND_MEAN +#include <aclapi.h> + +#define NTOS_MODE_USER +#include <ndk/exfuncs.h> CRITICAL_SECTION PerfDataCriticalSection; PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ Modified: trunk/reactos/base/applications/taskmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/precomp.h [iso-8859-1] Mon Jan 13 12:43:06 2014 @@ -5,37 +5,29 @@ #error Task-Manager uses NDK functions, so it can only be compiled with Unicode support enabled! #endif -#include <math.h> #include <stdlib.h> -#include <stdio.h> +#include <stdarg.h> #define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN #include <windef.h> #include <winbase.h> -#define NTOS_MODE_USER -#include <ndk/exfuncs.h> -#include <aclapi.h> +#include <wingdi.h> +#include <winuser.h> +#include <winreg.h> #include <commctrl.h> #include <shellapi.h> #include "column.h" #include "taskmgr.h" #include "perfdata.h" -#include "perfpage.h" -#include "about.h" #include "procpage.h" -#include "proclist.h" -#include "affinity.h" #include "applpage.h" #include "dbgchnl.h" -#include "debug.h" #include "endproc.h" #include "graph.h" #include "graphctl.h" #include "optnmenu.h" -#include "priority.h" #include "run.h" #include "trayicon.h" Modified: trunk/reactos/base/applications/taskmgr/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/proclist.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/proclist.c [iso-8859-1] Mon Jan 13 12:43:06 2014 @@ -21,7 +21,6 @@ */ #include "precomp.h" - INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Mon Jan 13 12:43:06 2014 @@ -23,6 +23,8 @@ #include "precomp.h" +#include "proclist.h" + #define CMP(x1, x2)\ (x1 < x2 ? -1 : (x1 > x2 ? 1 : 0)) Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Mon Jan 13 12:43:06 2014 @@ -23,6 +23,12 @@ #include "precomp.h" +#include "perfpage.h" +#include "about.h" +#include "affinity.h" +#include "debug.h" +#include "priority.h" + #define STATUS_WINDOW 2001 /* Global Variables: */

1 0

[akhaldi] 61600: [SNDVOL32] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:42:34 2014 New Revision: 61600 URL: http://svn.reactos.org/svn/reactos?rev=61600&view=rev Log: [SNDVOL32] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/base/applications/sndvol32/dialog.c trunk/reactos/base/applications/sndvol32/misc.c trunk/reactos/base/applications/sndvol32/mixer.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/applications/sndvol32/sndvol32.h Modified: trunk/reactos/base/applications/sndvol32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/dialog.c [iso-8859-1] Mon Jan 13 12:42:34 2014 @@ -6,6 +6,8 @@ */ #include "sndvol32.h" + +#include <wingdi.h> #define XLEFT (30) #define XTOP (20) Modified: trunk/reactos/base/applications/sndvol32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/misc.c [iso-8859-1] Mon Jan 13 12:42:34 2014 @@ -25,6 +25,8 @@ #include "sndvol32.h" +#include <winreg.h> + static INT LengthOfStrResource(IN HINSTANCE hInst, IN UINT uID) Modified: trunk/reactos/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] Mon Jan 13 12:42:34 2014 @@ -22,6 +22,7 @@ * FILE: subsys/system/sndvol32/mixer.c * PROGRAMMERS: Thomas Weidenmueller <w3seek(a)reactos.com> */ + #include "sndvol32.h" #define NO_MIXER_SELECTED ((UINT)(~0)) Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Mon Jan 13 12:42:34 2014 @@ -22,7 +22,10 @@ * FILE: subsys/system/sndvol32/sndvol32.c * PROGRAMMERS: Thomas Weidenmueller <w3seek(a)reactos.com> */ + #include "sndvol32.h" + +#include <shellapi.h> HINSTANCE hAppInstance; ATOM MainWindowClass; Modified: trunk/reactos/base/applications/sndvol32/sndvol32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.h [iso-8859-1] Mon Jan 13 12:42:34 2014 @@ -2,14 +2,12 @@ #define __SNDVOL32_H #include <stdarg.h> + #include <windef.h> #include <winbase.h> -#include <winreg.h> -#include <wingdi.h> #include <winuser.h> #include <mmsystem.h> #include <commctrl.h> -#include <shellapi.h> #include <tchar.h> #include <assert.h>

1 0

[akhaldi] 61599: [SNDREC32] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:41:57 2014 New Revision: 61599 URL: http://svn.reactos.org/svn/reactos?rev=61599&view=rev Log: [SNDREC32] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp trunk/reactos/base/applications/sndrec32/stdafx.h Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Mon Jan 13 12:41:57 2014 @@ -6,6 +6,10 @@ */ #include "stdafx.h" + +#include <commctrl.h> +#include <commdlg.h> + #include "sndrec32.h" #ifndef _UNICODE Modified: trunk/reactos/base/applications/sndrec32/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/stdafx.h [iso-8859-1] Mon Jan 13 12:41:57 2014 @@ -8,12 +8,11 @@ #define _sntprintf_s _snprintf_s #endif -#define WIN32_NO_STATUS #include <stdlib.h> #include <tchar.h> + +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winuser.h> -#include <commctrl.h> -#include <commdlg.h>

1 0

[akhaldi] 61598: [SHUTDOWN] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
by akhaldi＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: akhaldi Date: Mon Jan 13 12:41:18 2014 New Revision: 61598 URL: http://svn.reactos.org/svn/reactos?rev=61598&view=rev Log: [SHUTDOWN] * Remove one time inclusions from the main header and put them back where they belong. CORE-7716 Modified: trunk/reactos/base/applications/shutdown/misc.c trunk/reactos/base/applications/shutdown/precomp.h trunk/reactos/base/applications/shutdown/shutdown.c Modified: trunk/reactos/base/applications/shutdown/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/misc.c [iso-8859-1] Mon Jan 13 12:41:18 2014 @@ -7,6 +7,8 @@ */ #include "precomp.h" + +#include <stdio.h> const DWORD defaultReason = SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER; Modified: trunk/reactos/base/applications/shutdown/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/precomp.h [iso-8859-1] Mon Jan 13 12:41:18 2014 @@ -2,16 +2,13 @@ #define __SHUTDOWN_PRECOMP_H /* INCLUDES ******************************************************************/ + #include <stdarg.h> + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <winuser.h> -#include <stdio.h> -#include <stdlib.h> -#include <tchar.h> -#include <powrprof.h> -// #include <reason.h> // Shutdown codes #include "resource.h" @@ -60,4 +57,4 @@ /* gui.c */ BOOL ShutdownGuiMain(struct CommandLineOptions opts); -#endif +#endif /* __SHUTDOWN_PRECOMP_H */ Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] Mon Jan 13 12:41:18 2014 @@ -6,6 +6,10 @@ */ #include "precomp.h" + +#include <stdlib.h> +#include <tchar.h> +#include <powrprof.h> /* * This takes strings from a resource stringtable

1 0

[cwittich] 61597: [usetup] fix german text layout
by cwittich＠svn.reactos.org 13 Jan '14

13 Jan '14

Author: cwittich Date: Mon Jan 13 09:06:35 2014 New Revision: 61597 URL: http://svn.reactos.org/svn/reactos?rev=61597&view=rev Log: [usetup] fix german text layout Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon Jan 13 09:06:35 2014 @@ -1346,8 +1346,8 @@ }, { //ERROR_WARN_PARTITION, - "Setup hat mindestens eine Festplatte mit einer inkompatiblen Partitionstabelle\n" - "gefunden, die nicht richtig verwendet werden kann!\n" + "Setup hat mindestens eine Festplatte mit einer inkompatiblen\n" + "Partitionstabelle gefunden, die nicht richtig verwendet werden kann!\n" "\n" "Partitionen zu erstellen/lschen kann die Partitionstabelle zerstren.\n" "\n"

1 0

[tkreuzer] 61596: [FREELDR/CMLIB] Update Copyright year and fix GCC build
by tkreuzer＠svn.reactos.org 12 Jan '14

12 Jan '14

Author: tkreuzer Date: Sun Jan 12 21:55:20 2014 New Revision: 61596 URL: http://svn.reactos.org/svn/reactos?rev=61596&view=rev Log: [FREELDR/CMLIB] Update Copyright year and fix GCC build Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmtools.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c [iso-8859-1] Sun Jan 12 21:55:20 2014 @@ -1,7 +1,7 @@ /* * FreeLoader * - * Copyright (C) 2001, 2002 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright (C) 2014 Timo Kreuzer <timo.kreuzer(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -53,13 +53,13 @@ NULL); if (!NT_SUCCESS(Status)) { - CmpFree(CmHive, 0); + FrLdrTempFree(CmHive, 'eviH'); ERR("Invalid hive Signature!\n"); return FALSE; } /* Save the root key node */ - RootKeyNode = HvGetCell(&CmHive->Hive, Hive->BaseBlock->RootCell); + RootKeyNode = HvGetCell(&CmHive->Hive, CmHive->Hive.BaseBlock->RootCell); TRACE("RegImportBinaryHive done\n"); return TRUE; @@ -316,7 +316,6 @@ _Out_ PFRLDRHKEY Key) { UNICODE_STRING RemainingPath, SubKeyName; - UNICODE_STRING RegistryStartPath = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\SYSTEM"); UNICODE_STRING CurrentControlSet = RTL_CONSTANT_STRING(L"CurrentControlSet"); PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode; Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6159… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Jan 12 21:55:20 2014 @@ -19,6 +19,16 @@ #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif//_WIN32 + + #ifndef _MSC_VER + #define _In_ + #define _Out_ + #define _Inout_ + #endif + + #ifndef min + #define min(a, b) (((a) < (b)) ? (a) : (b)) + #endif // Definitions copied from <ntstatus.h> // We only want to include host headers, so we define them manually @@ -350,7 +360,7 @@ ULONG NTAPI CmCopyKeyName( - IN PCM_KEY_NODE KeyNode, + _In_ PCM_KEY_NODE KeyNode, _Out_ PWCHAR KeyNameBuffer, _Inout_ ULONG BufferLength); Modified: trunk/reactos/lib/cmlib/cmtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmtools.c?rev=61… ============================================================================== --- trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] Sun Jan 12 21:55:20 2014 @@ -183,7 +183,7 @@ } } - if (BufferLength >= NameLength + sizeof(UNICODE_NULL)) + if (BufferLength >= NameLength + sizeof(WCHAR)) { Buffer[NameLength / sizeof(WCHAR)] = '\0'; } @@ -194,7 +194,7 @@ ULONG NTAPI CmCopyKeyName( - IN PCM_KEY_NODE KeyNode, + _In_ PCM_KEY_NODE KeyNode, _Out_ PWCHAR KeyNameBuffer, _Inout_ ULONG BufferLength) {

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
43
Older →

Jump to page:

2025

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