Author: cwittich
Date: Tue Jul 17 02:56:04 2007
New Revision: 27703
URL: http://svn.reactos.org/svn/reactos?rev=27703&view=rev
Log:
-get rid of DS_SHELLFONT when set as EXSTYLE, it is a STYLE flag
See issue #2289 for more details.
Modified:
trunk/reactos/dll/win32/user32/windows/dialog.c
Modified: trunk/reactos/dll/win32/user32/windows/dialog.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dialog.c (original)
+++ trunk/reactos/dll/win32/user32/windows/dialog.c Tue Jul 17 02:56:04 2007
@@ -611,7 +611,7 @@
}
/* First control is on dword boundary */
- return (LPCSTR)((((int)p) + 3) & ~3);
+ return (LPCSTR)((((UINT_PTR)p) + 3) & ~3);
}
/***********************************************************************
Author: cfinck
Date: Tue Jul 17 01:50:50 2007
New Revision: 27702
URL: http://svn.reactos.org/svn/reactos?rev=27702&view=rev
Log:
Readd the removed line from the patch and add more information about the Usage of the "-f" option (see comment #6 of bug #2379)
The "-f" option now works like in Windows: If you did not specify any other parameter, it will also log off from the current session.
Modified:
trunk/reactos/base/applications/shutdown/shutdown.c
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 (original)
+++ trunk/reactos/base/applications/shutdown/shutdown.c Tue Jul 17 01:50:50 2007
@@ -19,6 +19,8 @@
_tprintf(_T("\n -s\t\t\tShutdown the computer"));
_tprintf(_T("\n -r\t\t\tShutdown and restart the computer"));
_tprintf(_T("\n -f\t\t\tForces running applications to close without warnings"));
+ _tprintf(_T("\n \t\t\tIf you did not specify any other parameter, this option"));
+ _tprintf(_T("\n \t\t\twill also log off"));
_tprintf(_T("\n"));
}
@@ -96,7 +98,13 @@
// Sets additional flags
if (opts.force)
+ {
exitOpts.flags = exitOpts.flags | EWX_FORCE;
+
+ // This makes sure that we log off, also if there is only the "-f" option specified.
+ // The Windows shutdown utility does it the same way.
+ exitOpts.shouldExit = TRUE;
+ }
// Reason for shutdown
// Hardcoded to "Other (Planned)"