Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 09:46:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINLOGON]

Browse source 
- Do not shutdown the computer if winlogon cannot register itself to user32 (eg. the user double-clicks on winlogon.exe when ReactOS is already launched :P ).
- Add a note about a possible improvement of the error dialog if msgina cannot be loaded correctly.
- Fix french translation.

svn path=/trunk/; revision=63680
This commit is contained in:
Hermès Bélusca-Maïto 2014-06-30 21:08:32 +00:00
parent 291c34f5c7
commit 73d7ba1daf
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/system/winlogon/lang/fr-FR.rc
View file

@ -18,7 +18,7 @@ CAPTION "Échec de l'interface utilisateur"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué", IDC_GINALOADFAILED, 39, 16, 156, 24 LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué", IDC_GINALOADFAILED, 39, 16, 156, 24
LTEXT "Contactez votre administrateur système pour remplacer le DLL, ou restaurez le DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 LTEXT "Contactez votre administrateur système pour remplacer la DLL, ou restaurez la DLL originale.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25
DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14 DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14
END END

10
reactos/base/system/winlogon/winlogon.c
View file

@ -321,8 +321,8 @@ WinMain(
if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE))
{ {
ERR("WL: Could not register logon process\n"); ERR("WL: Could not register logon process\n");
NtShutdownSystem(ShutdownNoReboot); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse);
ExitProcess(0); ExitProcess(1);
} }
WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION)); WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION));
@ -366,7 +366,7 @@ WinMain(
if (!StartLsass()) if (!StartLsass())
{ {
ERR("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); ERR("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError());
NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, OptionOk, &HardErrorResponse); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse);
ExitProcess(1); ExitProcess(1);
} }
@ -377,7 +377,9 @@ WinMain(
if (!GinaInit(WLSession)) if (!GinaInit(WLSession))
{ {
ERR("WL: Failed to initialize Gina\n"); ERR("WL: Failed to initialize Gina\n");
DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), GetDesktopWindow(), GinaLoadFailedWindowProc, (LPARAM)L""); // FIXME: Retrieve the real name of the GINA DLL we were trying to load.
// It is known only inside the GinaInit function...
DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), GetDesktopWindow(), GinaLoadFailedWindowProc, (LPARAM)L"msgina.dll");
HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT);
ExitProcess(1); ExitProcess(1);
} }