Commit in reactos/apps/utils/shutdown on MAIN
Makefile+2-21.1 -> 1.2
shutdown.c+7-41.1 -> 1.2
+9-6
2 modified files
Add forceifhung flag

reactos/apps/utils/shutdown
Makefile 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Makefile	7 Jul 2004 22:29:37 -0000	1.1
+++ Makefile	16 Sep 2004 12:46:43 -0000	1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/07/07 22:29:37 gvg Exp $
+# $Id: Makefile,v 1.2 2004/09/16 12:46:43 gvg Exp $
 
 PATH_TO_TOP = ../../..
 
@@ -14,7 +14,7 @@
 
 TARGET_OBJECTS = shutdown.o
 
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
+TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -D_WIN32_WINNT=0x0501
 
 include $(PATH_TO_TOP)/rules.mak
 

reactos/apps/utils/shutdown
shutdown.c 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- shutdown.c	7 Jul 2004 22:29:37 -0000	1.1
+++ shutdown.c	16 Sep 2004 12:46:43 -0000	1.2
@@ -1,4 +1,4 @@
-/* $Id: shutdown.c,v 1.1 2004/07/07 22:29:37 gvg Exp $
+/* $Id: shutdown.c,v 1.2 2004/09/16 12:46:43 gvg Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS shutdown/logoff utility
@@ -37,7 +37,10 @@
       { _T("reboot"), EWX_REBOOT, 0 },
       { _T("restart"), EWX_REBOOT, 0 },
       { _T("shutdown"), EWX_SHUTDOWN, 0 },
-      { _T("force"), 0, EWX_FORCE }
+      { _T("force"), 0, EWX_FORCE },
+      { _T("forceifhung"), 0, EWX_FORCEIFHUNG },
+      { _T("ifhung"), 0, EWX_FORCEIFHUNG },
+      { _T("hung"), 0, EWX_FORCEIFHUNG },
     };
   UINT ExitType, ExitFlags;
   HANDLE hToken;
@@ -70,7 +73,7 @@
           /* Match if arg starts the same as the option name */
           if (0 == _tcsnicmp(Options[j].Name, Arg, _tcslen(Arg)))
             {
-              if (0 != Options[j].ExitType)
+              if (0 == Options[j].ExitFlags)
                 {
                   /* Can have only 1 type */
                   if (HaveType)
@@ -108,7 +111,7 @@
     {
       for (j = 0; j < sizeof(Options) / sizeof(Options[0]); j++)
         {
-          if (0 == _tcsicmp(Options[j].Name, BaseName) && 0 != Options[j].ExitType)
+          if (0 == _tcsicmp(Options[j].Name, BaseName) && 0 == Options[j].ExitFlags)
             {
               ExitType = Options[j].ExitType;
               HaveType = TRUE;
CVSspam 0.2.8