Author: gschneider Date: Mon May 31 21:16:14 2010 New Revision: 47503
URL: http://svn.reactos.org/svn/reactos?rev=47503&view=rev Log: [EXPLORER_NEW] Display a message box if the explorer registry key cannot be loaded, patch by Katayama Hirofumi
See issue #5407 for more details.
Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/lang/no-NO.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/resource.h
Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/exp... ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Mon May 31 21:16:14 2010 @@ -284,7 +284,9 @@ TEXT("Software\Microsoft\Windows\CurrentVersion\Explorer"), &hkExplorer) != ERROR_SUCCESS) { - /* FIXME - display error */ + TCHAR Message[256]; + LoadString(hInstance, IDS_STARTUP_ERROR, Message, 256); + MessageBox(NULL, Message, NULL, MB_ICONERROR); return 1; }
Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -121,6 +121,7 @@ IDS_PROPERTIES "&Ñâîéñòâà" IDS_OPEN_ALL_USERS "&Îòâàðÿíå íà âñè÷êè ïîòðåáèòåëè" IDS_EXPLORE_ALL_USERS "&Ðàçëèñòâàíå íà âñè÷êè ïîòðåáèòåëè" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -126,6 +126,7 @@ IDS_PROPERTIES "Vl&astnosti" IDS_OPEN_ALL_USERS "Ote&vøít sloku All Users" IDS_EXPLORE_ALL_USERS "Pro&cházet sloku All Users" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "E&igenschaften" IDS_OPEN_ALL_USERS "Öffnen (&Alle Benutzer)" IDS_EXPLORE_ALL_USERS "Explorer (A&lle Benutzer)" + IDS_STARTUP_ERROR "Das System kann den Explorer nicht starten, weil die Registrierung nicht verfügbar bzw. fehlerhaft ist." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "P&roperties" IDS_OPEN_ALL_USERS "O&pen All Users" IDS_EXPLORE_ALL_USERS "E&xplore All Users" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -129,6 +129,7 @@ IDS_PROPERTIES "P&ropiedades" IDS_OPEN_ALL_USERS "A&brir todos los usuarios" IDS_EXPLORE_ALL_USERS "E&xplorar todos los usuarios" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "P&ropriétés" IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs" IDS_EXPLORE_ALL_USERS "E&xplorer tous les utilisateurs" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "&Proprietà" IDS_OPEN_ALL_USERS "&Apri tutti gli utenti" IDS_EXPLORE_ALL_USERS "&Esplora tutti gli utenti" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "vpeB(&R)" IDS_OPEN_ALL_USERS "J - All Users(&P)" IDS_EXPLORE_ALL_USERS "GNXv[ - All Users(&E)" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -125,6 +125,7 @@ IDS_PROPERTIES "¼Ó¼º(&R)" IDS_OPEN_ALL_USERS "¿±â - All Users(&P)" IDS_EXPLORE_ALL_USERS "Ž»ö - All Users(&X)" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -124,6 +124,7 @@ IDS_PROPERTIES "&Parametrai" IDS_OPEN_ALL_USERS "&Atverti visus vartotojus" IDS_EXPLORE_ALL_USERS "&Narðyti visus vartotojus" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "&Eigenschappen" IDS_OPEN_ALL_USERS "&Alle Gebruikers weergeven" IDS_EXPLORE_ALL_USERS "Alle Gebruikers V&erkennen" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "E&genskaper" IDS_OPEN_ALL_USERS "Å&pne alle brukere" IDS_EXPLORE_ALL_USERS "U&tforsk alle brukere" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -123,6 +123,7 @@ IDS_PROPERTIES "W³a&ciwoci" IDS_OPEN_ALL_USERS "&Otwórz - wszyscy u¿ytkownicy" IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "P&roprietãþi" IDS_OPEN_ALL_USERS "Deschidere& Toþi Utilizatorii" IDS_EXPLORE_ALL_USERS "E&xplorare Toþi Utilizatorii" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -122,6 +122,7 @@ IDS_PROPERTIES "&Ñâîéñòâà" IDS_OPEN_ALL_USERS "&Âñå ïîëüçîâàòåëè" IDS_EXPLORE_ALL_USERS "&Îáçîð Âñåõ ïîëüçîâàòåëåé" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -120,6 +120,7 @@ IDS_PROPERTIES "Vl&astnosti" IDS_OPEN_ALL_USERS "&Otvori profil All Users" IDS_EXPLORE_ALL_USERS "&Preskúma profil All Users" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/lan... ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Mon May 31 21:16:14 2010 @@ -128,6 +128,7 @@ IDS_PROPERTIES "Â&ëàñòèâîñò³" IDS_OPEN_ALL_USERS "&Âñ³ êîðèñòóâà÷³" IDS_EXPLORE_ALL_USERS "&Îãëÿä âñ³õ êîðèñòóâà÷³â" + IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." END
STRINGTABLE DISCARDABLE
Modified: trunk/reactos/base/shell/explorer-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/res... ============================================================================== --- trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] Mon May 31 21:16:14 2010 @@ -8,6 +8,7 @@ #define IDS_PROPERTIES 102 #define IDS_OPEN_ALL_USERS 103 #define IDS_EXPLORE_ALL_USERS 104 +#define IDS_STARTUP_ERROR 105
#define IDC_STARTBTN 304