Index: base/applications/mscutils/eventvwr/eventvwr.c
===================================================================
--- base/applications/mscutils/eventvwr/eventvwr.c	(revision 63904)
+++ base/applications/mscutils/eventvwr/eventvwr.c	(working copy)
@@ -41,10 +41,9 @@
     #define _CRT_SECURE_NO_DEPRECATE /* all deprecated unsafe string functions */
 #endif
 
-static const LPWSTR EVENT_SOURCE_APPLICATION = L"Application";
-static const LPWSTR EVENT_SOURCE_SECURITY    = L"Security";
-static const LPWSTR EVENT_SOURCE_SYSTEM      = L"System";
+
 static const WCHAR szWindowClass[]           = L"EVENTVWR"; /* the main window class name*/
+static const WCHAR EVENTLOG_BASE_KEY[]       = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\";
 
 //MessageFile message buffer size
 #define EVENT_MESSAGE_EVENTTEXT_BUFFER  1024*10
@@ -73,6 +72,9 @@
 LPWSTR lpSourceLogName = NULL;
 LPWSTR lpComputerName  = NULL;
 
+DWORD dwNumLogs = 0;
+WCHAR **LogNames;
+
 /* Forward declarations of functions included in this code module: */
 ATOM MyRegisterClass(HINSTANCE hInstance);
 BOOL InitInstance(HINSTANCE, int);
@@ -874,6 +876,192 @@
 }
 
 
+VOID
+GetDisplayNameFile(LPCWSTR lpLogName, LPWSTR lpModuleName)
+{
+    HKEY hKey;
+    WCHAR *KeyPath;
+    WCHAR szModuleName[MAX_PATH];
+    DWORD dwData;
+
+
+    KeyPath = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR));
+    if (!KeyPath)
+    {
+        return;
+    }
+
+    wcscpy(KeyPath, EVENTLOG_BASE_KEY);
+    wcscat(KeyPath, lpLogName);
+
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+    {
+        return;
+    }
+
+    dwData = MAX_PATH;
+
+    if (RegQueryValueExW(hKey, L"DisplayNameFile", NULL, NULL, (LPBYTE)szModuleName, &dwData) == ERROR_SUCCESS)
+    {
+        ExpandEnvironmentStringsW(szModuleName, lpModuleName, MAX_PATH);
+    }
+
+    RegCloseKey(hKey);
+    HeapFree(GetProcessHeap(), 0, KeyPath);
+}
+
+
+DWORD
+GetDisplayNameID(LPCWSTR lpLogName)
+{
+    HKEY hKey;
+    WCHAR *KeyPath;
+    DWORD dwMessageID = 0;
+    DWORD dwData;
+
+
+    KeyPath = (WCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(EVENTLOG_BASE_KEY) + wcslen(lpLogName) + 1) * sizeof(WCHAR));
+    if (!KeyPath)
+    {
+        return 0;
+    }
+
+    wcscpy(KeyPath, EVENTLOG_BASE_KEY);
+    wcscat(KeyPath, lpLogName);
+
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+    {
+        return 0;
+    }
+
+    dwData = sizeof(dwMessageID);
+
+    if (RegQueryValueExW(hKey, L"DisplayNameID", NULL, NULL, (LPBYTE)&dwMessageID, &dwData) != ERROR_SUCCESS)
+    {
+        return 0;
+    }
+
+    RegCloseKey(hKey);
+    HeapFree(GetProcessHeap(), 0, KeyPath);
+
+    return dwMessageID;
+}
+
+
+VOID
+BuildLogList(void)
+{
+    HKEY hKey;
+    DWORD lpcName;
+    DWORD dwIndex;
+    DWORD dwMessageID;
+    DWORD dwMaxKeyLength;
+    WCHAR szModuleName[MAX_PATH];
+    LPWSTR lpDisplayName;
+    HANDLE hLibrary = 0;
+
+
+
+    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, EVENTLOG_BASE_KEY, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
+    {
+        return;
+    }
+
+    if (RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &dwNumLogs, &dwMaxKeyLength, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey);
+        return;
+    }
+            
+    if (!dwNumLogs)
+    {
+        RegCloseKey(hKey);
+        return;
+    }
+
+    LogNames = (WCHAR**)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (dwNumLogs + 1) * sizeof(WCHAR*));
+
+    if (!LogNames)
+    {
+        RegCloseKey(hKey);
+        return;
+    }
+
+    for (dwIndex = 0; dwIndex < dwNumLogs; dwIndex++)
+    {
+        LogNames[dwIndex] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((dwMaxKeyLength + 1) * sizeof(WCHAR)));
+
+        if (LogNames[dwIndex] != NULL)
+        {
+            lpcName = dwMaxKeyLength + 1;
+
+            if (RegEnumKeyExW(hKey, dwIndex, LogNames[dwIndex], &lpcName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
+            {
+                lpDisplayName = NULL;
+
+                ZeroMemory(szModuleName, sizeof(szModuleName));
+                GetDisplayNameFile(LogNames[dwIndex], szModuleName);
+                dwMessageID = GetDisplayNameID(LogNames[dwIndex]);
+
+                hLibrary = LoadLibraryExW(szModuleName, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
+                if (hLibrary != NULL)
+                {
+                    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE, hLibrary, dwMessageID, 0, (LPWSTR)&lpDisplayName, 0, NULL);
+                    FreeLibrary(hLibrary);
+                }
+
+                if (lpDisplayName)
+                {
+                    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName);
+                }
+                else
+                {
+                    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]);
+                }
+
+                LocalFree(lpDisplayName);
+            }
+        }
+    }
+
+    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL);
+
+    RegCloseKey(hKey);
+    
+    return;
+}
+
+
+VOID
+FreeLogList(void)
+{
+    DWORD dwIndex;
+
+    if (!LogNames)
+    {
+        return;
+    }
+
+    for (dwIndex = 0; dwIndex < dwNumLogs; dwIndex++)
+    {
+        if (LogNames[dwIndex])
+        {
+            HeapFree(GetProcessHeap(), 0, LogNames[dwIndex]);
+        }
+
+        DeleteMenu(hMainMenu, ID_FIRST_LOG + dwIndex, MF_BYCOMMAND);
+    }
+
+    DeleteMenu(hMainMenu, ID_FIRST_LOG + dwIndex + 1, MF_BYCOMMAND);
+
+    HeapFree(GetProcessHeap(), 0, LogNames);
+
+    dwNumLogs = 0;
+
+    return;
+}
+
+
 //
 //   FUNCTION: InitInstance(HINSTANCE, int)
 //
@@ -1042,9 +1230,12 @@
     ShowWindow(hwndMainWindow, nCmdShow);
     UpdateWindow(hwndMainWindow);
 
-    QueryEventMessages(lpComputerName,            // Use the local computer.
-                       EVENT_SOURCE_APPLICATION); // The event log category
+    BuildLogList();
 
+    QueryEventMessages(lpComputerName, LogNames[0]);
+
+    CheckMenuRadioItem(GetMenu(hwndMainWindow), ID_FIRST_LOG, ID_FIRST_LOG + dwNumLogs, ID_FIRST_LOG, MF_BYCOMMAND);
+
     return TRUE;
 }
 
@@ -1069,11 +1260,6 @@
     {
         case WM_CREATE:
             hMainMenu = GetMenu(hWnd);
-            CheckMenuRadioItem(GetMenu(hWnd),
-                               ID_LOG_APPLICATION,
-                               ID_LOG_SYSTEM,
-                               ID_LOG_APPLICATION,
-                               MF_BYCOMMAND);
             break;
 
         case WM_NOTIFY:
@@ -1099,44 +1285,21 @@
 
         case WM_COMMAND:
             // Parse the menu selections:
-            switch (LOWORD(wParam))
+
+            if ((LOWORD(wParam) >= ID_FIRST_LOG) && (LOWORD(wParam) <= ID_FIRST_LOG + dwNumLogs))
             {
-                case ID_LOG_APPLICATION:
-                    if (QueryEventMessages(lpComputerName,            // Use the local computer.
-                                           EVENT_SOURCE_APPLICATION)) // The event log category
+                if (LogNames[LOWORD(wParam) - ID_FIRST_LOG])
+                {
+                    if (QueryEventMessages(lpComputerName, LogNames[LOWORD(wParam) - ID_FIRST_LOG]))
                     {
-                        CheckMenuRadioItem(GetMenu(hWnd),
-                                           ID_LOG_APPLICATION,
-                                           ID_LOG_SYSTEM,
-                                           ID_LOG_APPLICATION,
-                                           MF_BYCOMMAND);
+                        CheckMenuRadioItem(GetMenu(hWnd), ID_FIRST_LOG, ID_FIRST_LOG + dwNumLogs, LOWORD(wParam), MF_BYCOMMAND);
                     }
-                    break;
+                }
+            }
+            else
 
-                case ID_LOG_SECURITY:
-                    if (QueryEventMessages(lpComputerName,         // Use the local computer.
-                                           EVENT_SOURCE_SECURITY)) // The event log category
-                    {
-                        CheckMenuRadioItem(GetMenu(hWnd),
-                                           ID_LOG_APPLICATION,
-                                           ID_LOG_SYSTEM,
-                                           ID_LOG_SECURITY,
-                                           MF_BYCOMMAND);
-                    }
-                    break;
-
-                case ID_LOG_SYSTEM:
-                    if (QueryEventMessages(lpComputerName,       // Use the local computer.
-                                           EVENT_SOURCE_SYSTEM)) // The event log category
-                    {
-                        CheckMenuRadioItem(GetMenu(hWnd),
-                                           ID_LOG_APPLICATION,
-                                           ID_LOG_SYSTEM,
-                                           ID_LOG_SYSTEM,
-                                           MF_BYCOMMAND);
-                    }
-                    break;
-
+            switch (LOWORD(wParam))
+            {
                 case ID_SAVE_PROTOCOL:
                     SaveProtocol();
                     break;
@@ -1191,6 +1354,7 @@
             break;
         case WM_DESTROY:
             FreeRecords();
+            FreeLogList();
             PostQuitMessage(0);
             break;
 
Index: base/applications/mscutils/eventvwr/lang/bg-BG.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/bg-BG.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/bg-BG.rc	(working copy)
@@ -4,10 +4,6 @@
 BEGIN
     POPUP "&Дневник"
     BEGIN
-        MENUITEM "&Приложение", ID_LOG_APPLICATION
-        MENUITEM "&Сигурност", ID_LOG_SECURITY
-        MENUITEM "&Уредба", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/cs-CZ.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/cs-CZ.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/cs-CZ.rc	(working copy)
@@ -4,10 +4,6 @@
 BEGIN
     POPUP "&Protokol"
     BEGIN
-        MENUITEM "&Aplikace", ID_LOG_APPLICATION
-        MENUITEM "&Zabezpečení", ID_LOG_SECURITY
-        MENUITEM "&Systém", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Uložit &Protokol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Odstranit události", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/de-DE.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/de-DE.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/de-DE.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Protokoll"
     BEGIN
-        MENUITEM "&Anwendung", ID_LOG_APPLICATION
-        MENUITEM "&Sicherheit", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Protokoll s&peichern...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Alle E&reignisse löschen", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/el-GR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/el-GR.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/el-GR.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Εφαρμογή", ID_LOG_APPLICATION
-        MENUITEM "&Ασφάλεια", ID_LOG_SECURITY
-        MENUITEM "&Σύστημα", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/en-US.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/en-US.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/en-US.rc	(working copy)
@@ -12,10 +12,6 @@
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Application", ID_LOG_APPLICATION
-        MENUITEM "&Security", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/es-ES.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/es-ES.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/es-ES.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Aplicación", ID_LOG_APPLICATION
-        MENUITEM "&Seguridad", ID_LOG_SECURITY
-        MENUITEM "&Sistema", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/fr-FR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/fr-FR.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/fr-FR.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "Journa&l"
     BEGIN
-        MENUITEM "&Application", ID_LOG_APPLICATION
-        MENUITEM "&Sécurité", ID_LOG_SECURITY
-        MENUITEM "&Système", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/he-IL.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/he-IL.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/he-IL.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "מציג האירועים (מקומי)"
     BEGIN
-        MENUITEM "יישום", ID_LOG_APPLICATION
-        MENUITEM "אבטחה", ID_LOG_SECURITY
-        MENUITEM "מערכת", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/it-IT.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/it-IT.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/it-IT.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Applicazioni", ID_LOG_APPLICATION
-        MENUITEM "&Sicurezza", ID_LOG_SECURITY
-        MENUITEM "&Sistema", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/ja-JP.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ja-JP.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/ja-JP.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "ログ(&L)"
     BEGIN
-        MENUITEM "アプリケーション(&A)", ID_LOG_APPLICATION
-        MENUITEM "セキュリティ(&S)", ID_LOG_SECURITY
-        MENUITEM "システム(&S)", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/ko-KR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ko-KR.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/ko-KR.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "로그(&L)"
     BEGIN
-        MENUITEM "애플리케이션(&A)", ID_LOG_APPLICATION
-        MENUITEM "보안(&S)", ID_LOG_SECURITY
-        MENUITEM "시스템(&S)", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/no-NO.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/no-NO.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/no-NO.rc	(working copy)
@@ -4,10 +4,6 @@
 BEGIN
     POPUP "&Logg"
     BEGIN
-        MENUITEM "&Applikasjon", ID_LOG_APPLICATION
-        MENUITEM "&Sikkerhet", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/pl-PL.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/pl-PL.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/pl-PL.rc	(working copy)
@@ -8,10 +8,6 @@
 BEGIN
     POPUP "&Logi"
     BEGIN
-        MENUITEM "&Aplikacja", ID_LOG_APPLICATION
-        MENUITEM "&Zabezpieczenia", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Zapisz &protokół...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "W&yczyść wszystkie zdarzenia", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/pt-BR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/pt-BR.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/pt-BR.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Registro"
     BEGIN
-        MENUITEM "&Aplicativo", ID_LOG_APPLICATION
-        MENUITEM "S&egurança", ID_LOG_SECURITY
-        MENUITEM "&Sistema", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/ro-RO.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ro-RO.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/ro-RO.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "J&urnal"
     BEGIN
-        MENUITEM "&Aplicație", ID_LOG_APPLICATION
-        MENUITEM "Se&curitate", ID_LOG_SECURITY
-        MENUITEM "&Sistem", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Păstrare p&rotocol…", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Înlăt&ură toate evenimentele", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/ru-RU.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/ru-RU.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/ru-RU.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Логи"
     BEGIN
-        MENUITEM "&Приложений", ID_LOG_APPLICATION
-        MENUITEM "&Безопасности", ID_LOG_SECURITY
-        MENUITEM "&Системы", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/sk-SK.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/sk-SK.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/sk-SK.rc	(working copy)
@@ -9,10 +9,6 @@
 BEGIN
     POPUP "&Záznam"
     BEGIN
-        MENUITEM "&Application", ID_LOG_APPLICATION
-        MENUITEM "&Security", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/sq-AL.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/sq-AL.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/sq-AL.rc	(working copy)
@@ -12,10 +12,6 @@
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "&Aplikacion", ID_LOG_APPLICATION
-        MENUITEM "&Siguri", ID_LOG_SECURITY
-        MENUITEM "&Sistemi", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/sv-SE.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/sv-SE.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/sv-SE.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Logg"
     BEGIN
-        MENUITEM "&Applikation", ID_LOG_APPLICATION
-        MENUITEM "&Säkerhet", ID_LOG_SECURITY
-        MENUITEM "&System", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/tr-TR.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/tr-TR.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/tr-TR.rc	(working copy)
@@ -12,10 +12,6 @@
 BEGIN
     POPUP "&Kayıt"
     BEGIN
-        MENUITEM "&Uygulama", ID_LOG_APPLICATION
-        MENUITEM "&Güvenlik", ID_LOG_SECURITY
-        MENUITEM "&Dizge", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "&Protokolü Kaydet...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Tüm Olayları Sil", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/uk-UA.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/uk-UA.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/uk-UA.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "&Звіт"
     BEGIN
-        MENUITEM "&Програма", ID_LOG_APPLICATION
-        MENUITEM "&Захист", ID_LOG_SECURITY
-        MENUITEM "&Система", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/lang/zh-CN.rc
===================================================================
--- base/applications/mscutils/eventvwr/lang/zh-CN.rc	(revision 63904)
+++ base/applications/mscutils/eventvwr/lang/zh-CN.rc	(working copy)
@@ -6,10 +6,6 @@
 BEGIN
     POPUP "日志(&L)"
     BEGIN
-        MENUITEM "应用程序日志(&A)", ID_LOG_APPLICATION
-        MENUITEM "安全日志(&S)", ID_LOG_SECURITY
-        MENUITEM "系统日志(&Y)", ID_LOG_SYSTEM
-        MENUITEM SEPARATOR
         MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
Index: base/applications/mscutils/eventvwr/resource.h
===================================================================
--- base/applications/mscutils/eventvwr/resource.h	(revision 63904)
+++ base/applications/mscutils/eventvwr/resource.h	(working copy)
@@ -35,9 +35,6 @@
 #define IDC_WORDRADIO           1013
 #define IDC_EVENTDATAEDIT       1014
 
-#define ID_LOG_APPLICATION 32771
-#define ID_LOG_SECURITY    32772
-#define ID_LOG_SYSTEM      32773
 #define ID_HELP_HELP       32775
 #define ID_HELP            32776
 #define ID_OPTIONS         32777
@@ -49,6 +46,8 @@
 #define ID_CLEAR_EVENTS    32783
 #define ID_SAVE_PROTOCOL   32784
 
+#define ID_FIRST_LOG    45000
+
 /* String IDs */
 #define IDS_APP_TITLE                 103
 #define IDS_APP_TITLE_EX              104