Update to spice2x-25-04-25 (pre-apply)

> broken commit

api/modules/control.cpp

@@ -27,34 +27,6 @@ namespace api::modules {
             { SIGTERM, "SIGTERM" },
     };
 
-    static inline bool acquire_shutdown_privs() {
-
-        // check if already acquired
-        static bool acquired = false;
-        if (acquired)
-            return true;
-
-        // get process token
-        HANDLE hToken;
-        if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
-            return false;
-
-        // get the LUID for the shutdown privilege
-        TOKEN_PRIVILEGES tkp;
-        LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &tkp.Privileges[0].Luid);
-        tkp.PrivilegeCount = 1;
-        tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-
-        // get the shutdown privilege for this process
-        AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES) NULL, 0);
-
-        // check for error
-        bool success = GetLastError() == ERROR_SUCCESS;
-        if (success)
-            acquired = true;
-        return success;
-    }
-
     Control::Control() : Module("control", true) {
         functions["raise"] = std::bind(&Control::raise, this, _1, _2);
         functions["exit"] = std::bind(&Control::exit, this, _1, _2);
@@ -150,7 +122,7 @@ namespace api::modules {
             return error(res, "Unable to acquire shutdown privileges");
 
         // exit windows
-        if (!ExitWindowsEx(EWX_POWEROFF | EWX_FORCE,
+        if (!ExitWindowsEx(EWX_SHUTDOWN | EWX_HYBRID_SHUTDOWN | EWX_FORCE,
                            SHTDN_REASON_MAJOR_APPLICATION |
                            SHTDN_REASON_MINOR_MAINTENANCE))
             return error(res, "Unable to shutdown system");