Author: gadamopoulos
Date: Sun Mar 15 16:50:55 2015
New Revision: 66728
URL: http://svn.reactos.org/svn/reactos?rev=66728&view=rev
Log:
[HEADERS]
- Remove winlogon.h and move its contents in undocuser.h
Removed:
trunk/reactos/include/reactos/winlogon.h
Modified:
trunk/reactos/base/system/winlogon/sas.c
trunk/reactos/include/reactos/undocuser.h
trunk/reactos/win32ss/user/ntuser/shutdown.c
trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
Modified: trunk/reactos/base/system/winlogon/sas.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c?rev=66728&r1=66727&r2=66728&view=diff
==============================================================================
--- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Mar 15
16:50:55 2015
@@ -19,7 +19,6 @@
#include <userenv.h>
#include <ndk/setypes.h>
#include <ndk/sefuncs.h>
-#include <reactos/winlogon.h>
/* GLOBALS ******************************************************************/
Modified: trunk/reactos/include/reactos/undocuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.h?rev=66728&r1=66727&r2=66728&view=diff
==============================================================================
--- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sun Mar 15
16:50:55 2015
@@ -109,6 +109,19 @@
#define LN_START_SCREENSAVE 0xA
#define LN_LOGOFF_CANCELED 0xB
+//
+// Undocumented flags for ExitWindowsEx
+//
+#define EWX_SHUTDOWN_CANCELED 0x0080
+#define EWX_CALLER_SYSTEM 0x0100
+#define EWX_CALLER_WINLOGON 0x0200
+#define EWX_CALLER_WINLOGON_LOGOFF 0x1000 // WARNING!! Broken flag.
+// All the range 0x0400 to 0x1000 is reserved for Winlogon.
+// Flag 0x2000 appears to be a flag set when we call InitiateSystemShutdown*
APIs (Winlogon shutdown APIs).
+// 0x4000 is also reserved.
+#define EWX_NOTIFY 0x8000
+#define EWX_NONOTIFY 0x10000
+
// From WinCE 6.0 Imm.h SDK
// Returns for ImmProcessHotKey
#define IPHK_HOTKEY 0x0001
Removed: trunk/reactos/include/reactos/winlogon.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winlogon.h?rev=66727
==============================================================================
--- trunk/reactos/include/reactos/winlogon.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/winlogon.h (removed)
@@ -1,30 +0,0 @@
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS kernel
- * FILE: include/reactos/winlogon.h
- * PURPOSE: Private interface between Win32 and Winlogon
- * PROGRAMMER: Ge van Geldorp (g...@reactos.com)
- */
-
-#ifndef REACTOS_WINLOGON_H_INCLUDED
-#define REACTOS_WINLOGON_H_INCLUDED
-
-#define EWX_SHUTDOWN_CANCELED 0x0080
-
-#define EWX_CALLER_SYSTEM 0x0100
-#define EWX_CALLER_WINLOGON 0x0200
-
-#define EWX_CALLER_WINLOGON_LOGOFF 0x1000 // WARNING!! Broken flag.
-
-// All the range 0x0400 to 0x1000 is reserved for Winlogon.
-
-// Flag 0x2000 appears to be a flag set when we call InitiateSystemShutdown*
APIs (Winlogon shutdown APIs).
-
-// 0x4000 is also reserved.
-
-#define EWX_NOTIFY 0x8000
-#define EWX_NONOTIFY 0x10000
-
-#endif /* REACTOS_WINLOGON_H_INCLUDED */
-
-/* EOF */
Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdown.c?rev=66728&r1=66727&r2=66728&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Sun Mar 15
16:50:55 2015
@@ -7,7 +7,6 @@
*/
#include <win32k.h>
-#include <winlogon.h>
DBG_DEFAULT_CHANNEL(UserShutdown);
Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c?rev=66728&r1=66727&r2=66728&view=diff
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1]
(original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1]
Sun Mar 15 16:50:55 2015
@@ -10,7 +10,6 @@
#include "usersrv.h"
-#include <winlogon.h>
#include <commctrl.h>
#include "resource.h"
