advapi32: Parital Implement InitiateSystemShutdown(Ex) (try 2)

André Hentschel nerv at dawncrow.de
Mon Jan 3 13:24:21 CST 2011


Oops, forgot some Hunks
---
 dlls/advapi32/Makefile.in |    2 +-
 dlls/advapi32/advapi.c    |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index 0a9709c..c80aeaa 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -1,7 +1,7 @@
 EXTRADEFS = -D_ADVAPI32_
 MODULE    = advapi32.dll
 IMPORTLIB = advapi32
-DELAYIMPORTS = rpcrt4
+DELAYIMPORTS = rpcrt4 user32
 EXTRALIBS = @SECURITYLIB@
 
 C_SRCS = \
diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index 47286a1..4bd8d57 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -30,6 +30,7 @@
 #include "winternl.h"
 #include "winerror.h"
 #include "wincred.h"
+#include "winuser.h"
 
 #include "wine/library.h"
 #include "wine/unicode.h"
@@ -232,6 +233,10 @@ BOOL WINAPI InitiateSystemShutdownExA( LPSTR lpMachineName, LPSTR lpMessage,
          DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown,
          DWORD dwReason)
 {
+     if (!lpMachineName && !lpMessage && !dwTimeout)
+        ExitWindowsEx(bRebootAfterShutdown ? EWX_REBOOT : 0 |
+                      bForceAppsClosed ? EWX_FORCE : 0,
+                      dwReason);
      FIXME("%s %s %d %d %d %d\n", debugstr_a(lpMachineName),
             debugstr_a(lpMessage), dwTimeout, bForceAppsClosed,
             bRebootAfterShutdown, dwReason);
@@ -247,6 +252,10 @@ BOOL WINAPI InitiateSystemShutdownExW( LPWSTR lpMachineName, LPWSTR lpMessage,
          DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown,
          DWORD dwReason)
 {
+     if (!lpMachineName && !lpMessage && !dwTimeout)
+        ExitWindowsEx(bRebootAfterShutdown ? EWX_REBOOT : 0 |
+                      bForceAppsClosed ? EWX_FORCE : 0,
+                      dwReason);
      FIXME("%s %s %d %d %d %d\n", debugstr_w(lpMachineName),
             debugstr_w(lpMessage), dwTimeout, bForceAppsClosed,
             bRebootAfterShutdown, dwReason);
-- 
1.7.3.3.585.g74f6e





More information about the wine-patches mailing list