Author: akhaldi Date: Sat Jan 25 22:24:43 2014 New Revision: 61820
URL: http://svn.reactos.org/svn/reactos?rev=61820&view=rev Log: [USERENV] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
Modified: trunk/reactos/dll/win32/userenv/desktop.c trunk/reactos/dll/win32/userenv/directory.c trunk/reactos/dll/win32/userenv/environment.c trunk/reactos/dll/win32/userenv/gpolicy.c trunk/reactos/dll/win32/userenv/internal.h trunk/reactos/dll/win32/userenv/misc.c trunk/reactos/dll/win32/userenv/precomp.h trunk/reactos/dll/win32/userenv/profile.c trunk/reactos/dll/win32/userenv/registry.c trunk/reactos/dll/win32/userenv/setup.c
Modified: trunk/reactos/dll/win32/userenv/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/desktop.c... ============================================================================== --- trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -26,9 +26,10 @@
#include "precomp.h"
+#include <shlobj.h> + #define NDEBUG #include <debug.h> -
/* FUNCTIONS ***************************************************************/
Modified: trunk/reactos/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/directory... ============================================================================== --- trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,7 +29,6 @@ #define NDEBUG #include <debug.h>
- /* FUNCTIONS ***************************************************************/
BOOL
Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environme... ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,7 +29,6 @@ #define NDEBUG #include <debug.h>
- static BOOL SetUserEnvironmentVariable(LPVOID *Environment,
Modified: trunk/reactos/dll/win32/userenv/gpolicy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/gpolicy.c... ============================================================================== --- trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -28,7 +28,6 @@
#define NDEBUG #include <debug.h> -
typedef struct _GP_NOTIFY {
Modified: trunk/reactos/dll/win32/userenv/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/internal.... ============================================================================== --- trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -111,5 +111,3 @@ UninitializeGPNotifications(VOID);
#endif /* _INTERNAL_H */ - -/* EOF */
Modified: trunk/reactos/dll/win32/userenv/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/misc.c?re... ============================================================================== --- trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -26,6 +26,8 @@
#include "precomp.h"
+#include <ndk/sefuncs.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/dll/win32/userenv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/precomp.h... ============================================================================== --- trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/precomp.h [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -1,17 +1,16 @@ #include <stdio.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <winnls.h> +#include <objbase.h> #define NTOS_MODE_USER -#include <ndk/sefuncs.h> #include <ndk/rtlfuncs.h> #include <userenv.h> -#include <sddl.h> -#include <shlobj.h>
#include "internal.h" -#include "resources.h"
Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.c... ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -26,9 +26,10 @@
#include "precomp.h"
+#include <sddl.h> + #define NDEBUG #include <debug.h> -
/* FUNCTIONS ***************************************************************/
Modified: trunk/reactos/dll/win32/userenv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/registry.... ============================================================================== --- trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,7 +29,6 @@ #define NDEBUG #include <debug.h>
- /* FUNCTIONS ***************************************************************/
static
Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?r... ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Sat Jan 25 22:24:43 2014 @@ -29,6 +29,7 @@ #define NDEBUG #include <debug.h>
+#include "resources.h"
typedef struct _FOLDERDATA {