mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
Some checks are pending
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (actions) (push) Waiting to run
Build Desktop / Configure (push) Waiting to run
Build Desktop / Debian 13 (push) Blocked by required conditions
Build Desktop / Debian 12 (push) Blocked by required conditions
Build Desktop / Fedora 44 (push) Blocked by required conditions
Build Desktop / Fedora 43 (push) Blocked by required conditions
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Build Desktop / Arch (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 cover (push) Blocked by required conditions
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Build Desktop / macOS 14 (push) Blocked by required conditions
Build Desktop / macOS 15 (push) Blocked by required conditions
Build Desktop / macOS 26 Debug (push) Blocked by required conditions
Build Desktop / Windows 10 (push) Blocked by required conditions
Build Desktop / Prune caches (push) Waiting to run
Build Docker / Servatrice (arm) (push) Waiting to run
Build Docker / Servatrice (x86) (push) Waiting to run
Build Docker / Publish multi-platform Servatrice image (push) Blocked by required conditions
* [Installer] Offer to end running Cockatrice immediately when auto-close fails * [Installer] Keep the way out that costs nothing in the first prompt The prompt now offers to end Cockatrice, so what the deleted close-again text said has to survive in it: an instance the probe reports as waiting for an answer to a question of its own has been brought forward, and answering that window is the way out that ends nothing. Say so, and say where to go when Yes leaves it listed - Task Manager - so an end that cannot take effect does not loop on the same dialog. * [Installer] Bring the comments back in line with the code GuardCloseTried no longer counts closes, and the file header, CloseHolders and GuardAppsNotRunning still described an escalation after a second close, as did the probe's --end-holders note. * [Installer] End Oracle and Servatrice too when the guard's end answer is confirmed The guard's end answer only ever stopped cockatrice.exe, so an Oracle holding the card database or a Servatrice service kept the payload locked and the prompt came back with nothing left that could free it. The probe now ends every program the payload installs, services included: isPayloadProgram() - the list restart_manager_holders already used for its parent walk - decides the set, so a scanner holding a DLL or a program the user keeps in the install directory is still named and left to the user. A service is terminated rather than sent a stop through the SCM, which notices the process exit and marks it stopped afterwards. The guard prompt now says what ending costs: an unsaved deck, an unwritten setting, players on a running Servatrice, and an Oracle mid-way through the card database. It also keeps the notification-area hint, which the probe's "has no window to ask" answer depends on, and drops the claim that Oracle and Servatrice had been brought forward. * [Installer] Give every running-program prompt the same end-or-retry answers Four prompts meet a running program and each offered a different set: the guard ended it, the launcher wait only kept waiting, and the recovery prompt after a failed purge could only ask Cockatrice to close. With Oracle or Servatrice holding the files, that last one had no answer that could free anything - Yes and No both retried the purge and Cancel aborted an install whose old version was already gone. All four now follow the guard's shape: one automatic attempt, then a prompt whose Yes ends the programs it names and whose No retries, with Cancel to give up. - RecoverFromHolders closes once and purges before it asks anything, then offers EndHolders - the same end answer as the guard - instead of a close the user had to trigger himself. - WaitForLauncherToExit can end the launcher by pid, the one process it holds a pid for, rather than looping 60 s waits with Cancel as the only way out. - END_COST and AFTER_CLOSING_GUIDANCE are !defines, so the cost of ending and the guidance for the answers that end nothing read the same in every prompt. * [Installer] End the launcher through the handle it was waited on The "end it" answer used to look the launcher's pid up again after a dialog that can stay open as long as the user takes, so a pid that had been reused in the meantime - or a /PID= that was never the launcher - would be terminated instead. The handle the wait already holds names that process and cannot be handed to another, so the terminate answer now acts on it. PROCESS_TERMINATE is requested along with PROCESS_SYNCHRONIZE; when only the synchronize right is granted the launcher is still waited on and the answer falls back to asking it to close, instead of reporting a live launcher as gone and writing the payload over it. * [Installer] Say what the end answer ends, and report a failed end The prompt offered "end every program listed above", but EndHolders only ends the programs the payload installs: a scanner holding a payload DLL, or a service the Restart Manager names by its long name, was listed and then silently left alone, so Yes looked like it did nothing and the same dialog came back unchanged. The wording now says which programs Yes ends and that anything else has to be closed by hand, and the round after an end that did not free the files says so, so the same dialog no longer reappears word for word. The three prompts are one macro so they cannot drift apart again. The added sentences eat into the 1024 characters one NSIS string holds, so the holder line's budget drops from 400 to 320 characters to keep the longest message (cancel line included) inside it: 977 characters, measured against the worst case the probe can produce. --------- Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com> Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
89 lines
4.4 KiB
C++
89 lines
4.4 KiB
C++
#ifndef CLOSE_HOLDERS_H
|
|
#define CLOSE_HOLDERS_H
|
|
|
|
#include "holder_line.h"
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
/**
|
|
* @brief What asking the holders to close did, in the form the installer logs.
|
|
*
|
|
* @c report is one line naming every holder, including the ones this deliberately
|
|
* leaves alone, because the installer repeats it in its log and in the second prompt.
|
|
*/
|
|
struct CloseHoldersResult
|
|
{
|
|
unsigned int askedToClose = 0; ///< holders a WM_CLOSE was posted to
|
|
std::wstring report; ///< one line, narrowed to ASCII when written
|
|
};
|
|
|
|
/**
|
|
* @brief Brings every running Cockatrice holding an installer file forward and asks it
|
|
* to close.
|
|
*
|
|
* The set is the Restart Manager answer, so it is exactly the processes holding a file of
|
|
* the previous version: nothing here has to guess at an executable path, and an
|
|
* application that merely shares the image name is never touched. Only cockatrice.exe is
|
|
* asked to close. Oracle and Servatrice are left to the user - Oracle writes the card
|
|
* database in place - and so is every service.
|
|
*
|
|
* One thing happens per instance: its main window is brought to the foreground, because
|
|
* Cockatrice may answer the close with a confirmation of its own that would otherwise open
|
|
* behind the installer's prompt. Then WM_CLOSE is posted to the main window, the same
|
|
* request as clicking its close button - unless the instance is asking a question of its
|
|
* own, which disables that window: posting the close then only hides the question, so it is
|
|
* brought forward and left to the user. An instance with no window a user could answer -
|
|
* one hidden in the notification area, say - is named and left to the user as well; showing
|
|
* its windows from here does not help, because the application would still believe they are
|
|
* hidden and never paint them. Stopping the process is never attempted.
|
|
*
|
|
* Once the requests are out, this waits up to @c waitMilliseconds for the processes to
|
|
* exit, so the caller can measure the purge immediately afterwards instead of sleeping
|
|
* for a fixed time or re-asking a question this call already answered. A process that is
|
|
* still running is described further: whether its window is gone, still open, hidden
|
|
* again, and whether it answers at all, so the log can tell an instance that refused the
|
|
* close from one that never received it.
|
|
*
|
|
* @param holders the Restart Manager answer, one entry per application or service
|
|
* @param waitMilliseconds how long to wait for the asked instances to exit, 0 to not wait
|
|
*/
|
|
CloseHoldersResult closeCockatriceHolders(const std::vector<Holder> &holders, unsigned long waitMilliseconds);
|
|
|
|
/**
|
|
* @brief What ending the holders did, in the form the installer logs.
|
|
*
|
|
* @c report is one line naming every holder, including the ones this deliberately leaves
|
|
* alone, because the installer repeats it in its log.
|
|
*/
|
|
struct EndHoldersResult
|
|
{
|
|
unsigned int ended = 0; ///< holders TerminateProcess was accepted for
|
|
std::wstring report; ///< one line, narrowed to ASCII when written
|
|
};
|
|
|
|
/**
|
|
* @brief Ends every running Cockatrice, Oracle and Servatrice the probe named.
|
|
*
|
|
* This is the last resort behind the installer's "end it now" answer, never a first move: a
|
|
* client that is still running may have an unsaved deck, an open game or a settings write in
|
|
* flight, Oracle may be part-way through writing the card database, and Servatrice may be
|
|
* serving a game, so the caller only gets here after the user picked it from a prompt that
|
|
* says so.
|
|
*
|
|
* Every program the payload installs is ended, services included. A service is terminated
|
|
* like a process rather than stopped through the Service Control Manager: the installer has
|
|
* asked the user first, and the SCM notices the process exit and marks the service stopped
|
|
* afterwards, so it can be started again normally. Anything else the Restart Manager named -
|
|
* a scanner holding a DLL, a program the user keeps in the install directory - is left to
|
|
* the user, because ending it would destroy something this installer does not own.
|
|
*
|
|
* Waits up to @c waitMilliseconds for what it ended to be gone, so the caller can measure the
|
|
* purge immediately afterwards instead of racing a process that is still exiting.
|
|
*
|
|
* @param holders what the probe named, one entry per application or service
|
|
* @param waitMilliseconds how long to wait for the ended instances to be gone, 0 to not wait
|
|
*/
|
|
EndHoldersResult endHolders(const std::vector<Holder> &holders, unsigned long waitMilliseconds);
|
|
|
|
#endif
|