From 38b680f392668c9bc96310dcce521cf1f06d0eee Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 13 Dec 2014 22:35:48 +0000
Subject: [PATCH] [EVENTVWR] Clean up the resource IDs. Fix small icon loading.

svn path=/trunk/; revision=65630
---
 .../applications/mscutils/eventvwr/eventvwr.c | 69 ++++++++-------
 .../mscutils/eventvwr/lang/bg-BG.rc           | 18 ++--
 .../mscutils/eventvwr/lang/cs-CZ.rc           | 18 ++--
 .../mscutils/eventvwr/lang/de-DE.rc           | 18 ++--
 .../mscutils/eventvwr/lang/el-GR.rc           | 18 ++--
 .../mscutils/eventvwr/lang/en-US.rc           | 18 ++--
 .../mscutils/eventvwr/lang/es-ES.rc           | 18 ++--
 .../mscutils/eventvwr/lang/fr-FR.rc           | 18 ++--
 .../mscutils/eventvwr/lang/he-IL.rc           | 18 ++--
 .../mscutils/eventvwr/lang/it-IT.rc           | 18 ++--
 .../mscutils/eventvwr/lang/ja-JP.rc           | 18 ++--
 .../mscutils/eventvwr/lang/ko-KR.rc           | 18 ++--
 .../mscutils/eventvwr/lang/no-NO.rc           | 18 ++--
 .../mscutils/eventvwr/lang/pl-PL.rc           | 18 ++--
 .../mscutils/eventvwr/lang/pt-BR.rc           | 18 ++--
 .../mscutils/eventvwr/lang/ro-RO.rc           | 18 ++--
 .../mscutils/eventvwr/lang/ru-RU.rc           | 18 ++--
 .../mscutils/eventvwr/lang/sk-SK.rc           | 18 ++--
 .../mscutils/eventvwr/lang/sq-AL.rc           | 18 ++--
 .../mscutils/eventvwr/lang/sv-SE.rc           | 18 ++--
 .../mscutils/eventvwr/lang/tr-TR.rc           | 18 ++--
 .../mscutils/eventvwr/lang/uk-UA.rc           | 18 ++--
 .../mscutils/eventvwr/lang/zh-CN.rc           | 18 ++--
 .../applications/mscutils/eventvwr/resource.h | 88 +++++++++----------
 24 files changed, 278 insertions(+), 275 deletions(-)

diff --git a/reactos/base/applications/mscutils/eventvwr/eventvwr.c b/reactos/base/applications/mscutils/eventvwr/eventvwr.c
index 2c203e76e24..22c4671895b 100644
--- a/reactos/base/applications/mscutils/eventvwr/eventvwr.c
+++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.c
@@ -116,7 +116,7 @@ wWinMain(HINSTANCE hInstance,
         return FALSE;
     }
 
-    hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_EVENTVWR));
+    hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDA_EVENTVWR));
 
     /* Main message loop: */
     while (GetMessageW(&msg, NULL, 0, 0))
@@ -575,13 +575,13 @@ QueryEventMessages(LPWSTR lpMachineName,
 
     if (dwTotalRecords > 0)
     {
-        EnableMenuItem(hMainMenu, ID_CLEAR_EVENTS, MF_BYCOMMAND | MF_ENABLED);
-        EnableMenuItem(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_ENABLED);
+        EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_ENABLED);
+        EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_ENABLED);
     }
     else
     {
-        EnableMenuItem(hMainMenu, ID_CLEAR_EVENTS, MF_BYCOMMAND | MF_GRAYED);
-        EnableMenuItem(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED);
+        EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_GRAYED);
+        EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED);
     }
 
     g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(PVOID));
@@ -851,7 +851,6 @@ MyRegisterClass(HINSTANCE hInstance)
     WNDCLASSEXW wcex;
 
     wcex.cbSize = sizeof(WNDCLASSEX);
-
     wcex.style = 0;
     wcex.lpfnWndProc = WndProc;
     wcex.cbClsExtra = 0;
@@ -860,9 +859,14 @@ MyRegisterClass(HINSTANCE hInstance)
     wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_EVENTVWR));
     wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
     wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-    wcex.lpszMenuName = MAKEINTRESOURCE(IDC_EVENTVWR);
+    wcex.lpszMenuName = MAKEINTRESOURCE(IDM_EVENTVWR);
     wcex.lpszClassName = szWindowClass;
-    wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
+    wcex.hIconSm = (HICON)LoadImage(hInstance,
+                                    MAKEINTRESOURCE(IDI_EVENTVWR),
+                                    IMAGE_ICON,
+                                    16,
+                                    16,
+                                    LR_SHARED);
 
     return RegisterClassExW(&wcex);
 }
@@ -1002,11 +1006,11 @@ BuildLogList(void)
 
                 if (lpDisplayName)
                 {
-                    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName);
+                    InsertMenuW(hMainMenu, IDM_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]);
+                    InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]);
                 }
 
                 LocalFree(lpDisplayName);
@@ -1014,7 +1018,7 @@ BuildLogList(void)
         }
     }
 
-    InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL);
+    InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL);
 
     RegCloseKey(hKey);
 
@@ -1244,7 +1248,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                         if (lpnmitem->iItem != -1)
                         {
                             DialogBox(hInst,
-                                      MAKEINTRESOURCE(IDD_EVENTDETAILDIALOG),
+                                      MAKEINTRESOURCE(IDD_EVENTPROPERTIES),
                                       hWnd,
                                       EventDetails);
                         }
@@ -1270,11 +1274,11 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
             switch (LOWORD(wParam))
             {
-                case ID_SAVE_PROTOCOL:
+                case IDM_SAVE_PROTOCOL:
                     SaveProtocol();
                     break;
 
-                case ID_CLEAR_EVENTS:
+                case IDM_CLEAR_EVENTS:
                     if (ClearEvents())
                     {
                         Refresh();
@@ -1306,22 +1310,21 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
 
         case WM_SIZE:
-            {
-                // Gets the window rectangle
-                GetClientRect(hWnd, &rect);
+            // Gets the window rectangle
+            GetClientRect(hWnd, &rect);
 
-                // Relocate the listview
-                MoveWindow(hwndListView,
-                           0,
-                           0,
-                           rect.right,
-                           rect.bottom - 20,
-                           1);
+            // Relocate the listview
+            MoveWindow(hwndListView,
+                       0,
+                       0,
+                       rect.right,
+                       rect.bottom - 20,
+                       1);
 
-                // Resize the statusbar;
-                SendMessage(hwndStatus, message, wParam, lParam);
-            }
+            // Resize the statusbar;
+            SendMessage(hwndStatus, message, wParam, lParam);
             break;
+
         case WM_DESTROY:
             FreeRecords();
             FreeLogList();
@@ -1516,9 +1519,9 @@ InitDetailsDlg(HWND hDlg)
     HANDLE prevIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_PREV), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
     HANDLE copyIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_COPY), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 
-    SendMessage(GetDlgItem(hDlg, IDNEXT), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon);
-    SendMessage(GetDlgItem(hDlg, IDPREVIOUS), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon);
-    SendMessage(GetDlgItem(hDlg, IDCOPY), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon);
+    SendMessage(GetDlgItem(hDlg, IDC_NEXT), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon);
+    SendMessage(GetDlgItem(hDlg, IDC_PREVIOUS), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon);
+    SendMessage(GetDlgItem(hDlg, IDC_COPY), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon);
 }
 
 // Message handler for event details box.
@@ -1544,21 +1547,21 @@ EventDetails(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                     EndDialog(hDlg, LOWORD(wParam));
                     return (INT_PTR)TRUE;
 
-                case IDPREVIOUS:
+                case IDC_PREVIOUS:
                     SendMessage(hwndListView, WM_KEYDOWN, VK_UP, 0);
 
                     // Show event info on dialog box
                     DisplayEvent(hDlg);
                     return (INT_PTR)TRUE;
 
-                case IDNEXT:
+                case IDC_NEXT:
                     SendMessage(hwndListView, WM_KEYDOWN, VK_DOWN, 0);
 
                     // Show event info on dialog box
                     DisplayEvent(hDlg);
                     return (INT_PTR)TRUE;
 
-                case IDCOPY:
+                case IDC_COPY:
                     CopyEventEntry(hDlg);
                     return (INT_PTR)TRUE;
 
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc b/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc
index 39637f2fba0..db034f8c5a9 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc
@@ -1,12 +1,12 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Дневник"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Из&ход", IDM_EXIT
     END
@@ -14,7 +14,7 @@ BEGIN
     BEGIN
         MENUITEM "О&пресняване", IDM_REFRESH
     END
-    MENUITEM "На&стройки", ID_OPTIONS
+    MENUITEM "На&стройки", IDM_OPTIONS
     POPUP "Помо&щ"
     BEGIN
         MENUITEM "Помо&щ", IDM_HELP
@@ -23,7 +23,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -48,7 +48,7 @@ BEGIN
     CTEXT "Зареждане на събитията. Почакайте...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Подробно за събитието"
@@ -71,9 +71,9 @@ BEGIN
     LTEXT "&Компютър:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Описание:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc b/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc
index b177abdd8ae..1267d9fde51 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc
@@ -1,12 +1,12 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Protokol"
     BEGIN
-        MENUITEM "Uložit &Protokol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Uložit &Protokol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Odstranit události", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "&Odstranit události", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Konec", IDM_EXIT
     END
@@ -14,7 +14,7 @@ BEGIN
     BEGIN
         MENUITEM "&Obnovit", IDM_REFRESH
     END
-    MENUITEM "&Možnosti", ID_OPTIONS
+    MENUITEM "&Možnosti", IDM_OPTIONS
     POPUP "&Nápověda"
     BEGIN
         MENUITEM "Ná&pověda", IDM_HELP
@@ -23,7 +23,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -48,7 +48,7 @@ BEGIN
     CTEXT "Načítám protokol událostí. Prosím čekejte ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Podrobnosti události"
@@ -71,9 +71,9 @@ BEGIN
     LTEXT "P&očítač:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 52, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Popis:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc b/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc
index dc0bb1b0e9c..791e8748b61 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Protokoll"
     BEGIN
-        MENUITEM "Protokoll s&peichern...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Protokoll s&peichern...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Alle E&reignisse löschen", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "Alle E&reignisse löschen", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "B&eenden", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Aktualisieren", IDM_REFRESH
     END
-    MENUITEM "&Optionen", ID_OPTIONS
+    MENUITEM "&Optionen", IDM_OPTIONS
     POPUP "&Hilfe"
     BEGIN
         MENUITEM "H&ilfe", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Ereignis-Protokolle werden geladen. Bitte warten...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Ereignisdetails"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "&Computer:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Bezeichnung:", IDC_STATIC, 8, 65, 45, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc b/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc
index 983099810e2..a60ee3eb185 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Έ&ξοδος", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Ανανέωση", IDM_REFRESH
     END
-    MENUITEM "&Επιλογές", ID_OPTIONS
+    MENUITEM "&Επιλογές", IDM_OPTIONS
     POPUP "&Βοήθεια"
     BEGIN
         MENUITEM "Βο&ήθεια", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Γίνεται φόρτωση των Logs συμβάντων. Παρακαλώ περιμένετε ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Λεπτομέρειες συμβάντος"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "&Υπολογιστής:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Περιγραφή:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc b/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc
index cbc0d3eb393..95ef4fc8b66 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc
@@ -8,13 +8,13 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
@@ -22,7 +22,7 @@ BEGIN
     BEGIN
         MENUITEM "&Refresh", IDM_REFRESH
     END
-    MENUITEM "&Options", ID_OPTIONS
+    MENUITEM "&Options", IDM_OPTIONS
     POPUP "&Help"
     BEGIN
         MENUITEM "H&elp", IDM_HELP
@@ -31,7 +31,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -56,7 +56,7 @@ BEGIN
     CTEXT "Loading Event Logs. Please wait ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Event Properties"
@@ -79,9 +79,9 @@ BEGIN
     LTEXT "&Computer:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Description:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc b/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc
index e3b062d0d4b..67d07e5dc2b 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Registro"
     BEGIN
-        MENUITEM "Guardar &protocolo...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Guardar &protocolo...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Borrar todos los eventos", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "&Borrar todos los eventos", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "S&alir", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Actualizar", IDM_REFRESH
     END
-    MENUITEM "&Opciones", ID_OPTIONS
+    MENUITEM "&Opciones", IDM_OPTIONS
     POPUP "Ay&uda"
     BEGIN
         MENUITEM "Ay&uda", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Recuperando eventos. Espere un momento...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Detalles del evento"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "&Equipo:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Descripción:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc b/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc
index 60706ea00f8..f41b80b4586 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "Journa&l"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Effacer tous &les événements", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "Effacer tous &les événements", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Quitter", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Rafraîchir", IDM_REFRESH
     END
-    MENUITEM "&Options", ID_OPTIONS
+    MENUITEM "&Options", IDM_OPTIONS
     POPUP "Aide"
     BEGIN
         MENUITEM "Aide", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Chargement des journaux d'événements. Veuillez patienter...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Détail de l'événement"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "Ordinateur :", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Description :", IDC_STATIC, 8, 65, 45, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc b/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc
index 16dfe7f4b39..535302368f3 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "מציג האירועים (מקומי)"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "יציאה", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "רענן", IDM_REFRESH
     END
-    MENUITEM "אפשרויות", ID_OPTIONS
+    MENUITEM "אפשרויות", IDM_OPTIONS
     POPUP "עזרה"
     BEGIN
         MENUITEM "עזרה", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "טוען יומני אירועים, נא להמתין...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "מאפייני אירוע"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "מחשב:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "תיאור:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc b/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc
index 222638d15d6..abec4ab59c1 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Aggiorna", IDM_REFRESH
     END
-    MENUITEM "&Opzioni", ID_OPTIONS
+    MENUITEM "&Opzioni", IDM_OPTIONS
     POPUP "&Aiuto"
     BEGIN
         MENUITEM "A&iuto", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Caricamento eventi in corso. Attendere...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Dettagli"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "&Computer:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Descrizione:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc
index 88cd23089a4..d36370cfe70 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "ログ(&L)"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "終了(&X)", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "更新(&R)", IDM_REFRESH
     END
-    MENUITEM "オプション(&O)", ID_OPTIONS
+    MENUITEM "オプション(&O)", IDM_OPTIONS
     POPUP "ヘルプ(&H)"
     BEGIN
         MENUITEM "ヘルプ(&E)", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "イベント ログを読み込んでいます。 お待ちください ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "イベントの詳細情報"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "コンピュータ(&C):", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "説明(&D):", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc
index 5ef80a45a91..12109eef462 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "로그(&L)"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "종료(&X)", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "새로 고침(&R)", IDM_REFRESH
     END
-    MENUITEM "옵션(&O)", ID_OPTIONS
+    MENUITEM "옵션(&O)", IDM_OPTIONS
     POPUP "도움말(&H)"
     BEGIN
         MENUITEM "도움말(&H)", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "이벤트 로그 로딩중. 기다려주세요...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Event Detail"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "컴퓨터(&C):", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "설명(&D):", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc b/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc
index 697cf882a9d..a8f16040028 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc
@@ -1,12 +1,12 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Logg"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "A&vslutt", IDM_EXIT
     END
@@ -14,7 +14,7 @@ BEGIN
     BEGIN
         MENUITEM "&Oppdater", IDM_REFRESH
     END
-    MENUITEM "&Handling", ID_OPTIONS
+    MENUITEM "&Handling", IDM_OPTIONS
     POPUP "&Hjelp"
     BEGIN
         MENUITEM "Hj&elp", IDM_HELP
@@ -23,7 +23,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -48,7 +48,7 @@ BEGIN
     CTEXT "Laster Hendelseliste. Venligst vent ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Hendelse detaljer"
@@ -71,9 +71,9 @@ BEGIN
     LTEXT "&Datamaskin:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Beskrivelse:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc
index c2bb3ca6235..1131a6918d2 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc
@@ -4,13 +4,13 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Logi"
     BEGIN
-        MENUITEM "Zapisz &protokół...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Zapisz &protokół...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "W&yczyść wszystkie zdarzenia", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "W&yczyść wszystkie zdarzenia", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Wyjście", IDM_EXIT
     END
@@ -18,7 +18,7 @@ BEGIN
     BEGIN
         MENUITEM "&Odśwież", IDM_REFRESH
     END
-    MENUITEM "Op&cje", ID_OPTIONS
+    MENUITEM "Op&cje", IDM_OPTIONS
     POPUP "Po&moc"
     BEGIN
         MENUITEM "Pomo&c", IDM_HELP
@@ -27,7 +27,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -52,7 +52,7 @@ BEGIN
     CTEXT "Ładowanie logów zdarzeń. Proszę czekać ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Szczegóły zdarzenia"
@@ -75,9 +75,9 @@ BEGIN
     LTEXT "&Komputer:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Opis:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc b/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc
index b9e8785ba16..1f00302e223 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Registro"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Sair", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Atualizar", IDM_REFRESH
     END
-    MENUITEM "&Opções", ID_OPTIONS
+    MENUITEM "&Opções", IDM_OPTIONS
     POPUP "&Ajuda"
     BEGIN
         MENUITEM "&Ajuda", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Carregando Registros de Eventos. Por favor aguarde ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Detalhes do Evento"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "&Computador:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Descrição:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc
index 93da3f9223b..2429d6eb0d5 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "J&urnal"
     BEGIN
-        MENUITEM "Păstrare p&rotocol…", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Păstrare p&rotocol…", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Înlăt&ură toate evenimentele", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "Înlăt&ură toate evenimentele", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "I&eșire", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "Împ&rospătare", IDM_REFRESH
     END
-    MENUITEM "&Opțiuni", ID_OPTIONS
+    MENUITEM "&Opțiuni", IDM_OPTIONS
     POPUP "&?"
     BEGIN
         MENUITEM "&Manual…", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Se încarcă jurnalul de evenimentele…", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Detalii eveniment"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "&Calculator:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Descriere:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc b/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc
index 4a775bb73b7..40fd9425078 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "С&обытия"
     BEGIN
-        MENUITEM "Сохранить &протокол...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Сохранить &протокол...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Очистить &все события", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "Очистить &все события", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "В&ыход", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Обновить", IDM_REFRESH
     END
-    MENUITEM "&Настройки", ID_OPTIONS
+    MENUITEM "&Настройки", IDM_OPTIONS
     POPUP "&Справка"
     BEGIN
         MENUITEM "&Помощь", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Идет загрузка. Подождите...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Свойства события"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "Компьютер:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "Описание:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc b/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc
index e57c6d52a39..cef3a39efcf 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc
@@ -5,13 +5,13 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Záznam"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Skončiť", IDM_EXIT
     END
@@ -19,7 +19,7 @@ BEGIN
     BEGIN
         MENUITEM "&Obnoviť", IDM_REFRESH
     END
-    MENUITEM "&Možnosti", ID_OPTIONS
+    MENUITEM "&Možnosti", IDM_OPTIONS
     POPUP "&Pomocník"
     BEGIN
         MENUITEM "&Pomocník", IDM_HELP
@@ -28,7 +28,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -53,7 +53,7 @@ BEGIN
     CTEXT "Nahrávam záznamy s udalosťami. Počkajte, prosím ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Podrobnosti o udalosti"
@@ -76,9 +76,9 @@ BEGIN
     LTEXT "P&očítač:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Popis:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc b/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc
index e4b104758a3..2cbf6647875 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc
@@ -8,13 +8,13 @@
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Log"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "Dil", IDM_EXIT
     END
@@ -22,7 +22,7 @@ BEGIN
     BEGIN
         MENUITEM "&Rifresko", IDM_REFRESH
     END
-    MENUITEM "&Opsione", ID_OPTIONS
+    MENUITEM "&Opsione", IDM_OPTIONS
     POPUP "Ndihmë"
     BEGIN
         MENUITEM "Ndihmë", IDM_HELP
@@ -31,7 +31,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -56,7 +56,7 @@ BEGIN
     CTEXT "Ngarkim loget e ngjarjeve. Ju lutem prisniPlease wait ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Detaje te ngjarjeve"
@@ -79,9 +79,9 @@ BEGIN
     LTEXT "Kompjuteri:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "Përshkrimi:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc
index 2e0d50bf6c2..a849460b7d3 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Logg"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "A&vsluta", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Uppdatera", IDM_REFRESH
     END
-    MENUITEM "&Åtgärd", ID_OPTIONS
+    MENUITEM "&Åtgärd", IDM_OPTIONS
     POPUP "&Hjälp"
     BEGIN
         MENUITEM "Hj&älp", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Laddar in Händelseloggen. Vänligen vänta...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Händelsedetaljer"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "&Dator:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Beskrivning:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc b/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc
index c63e4ad42b2..8d157cf2806 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc
@@ -8,13 +8,13 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Kayıt"
     BEGIN
-        MENUITEM "&Protokolü Sakla...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "&Protokolü Sakla...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "&Tüm Olayları Sil", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "&Tüm Olayları Sil", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Çıkış", IDM_EXIT
     END
@@ -22,7 +22,7 @@ BEGIN
     BEGIN
         MENUITEM "&Yenile", IDM_REFRESH
     END
-    MENUITEM "&Seçenekler", ID_OPTIONS
+    MENUITEM "&Seçenekler", IDM_OPTIONS
     POPUP "&Yardım"
     BEGIN
         MENUITEM "&Yardım", IDM_HELP
@@ -31,7 +31,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -56,7 +56,7 @@ BEGIN
     CTEXT "Olay kayıtları yükleniyor. Lütfen bekleyiniz.", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Olay Ayrıntıları"
@@ -79,9 +79,9 @@ BEGIN
     LTEXT "Bilgisayar:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "Açıklama:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc b/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc
index a308f8570d8..e13baa75f70 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "&Звіт"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "В&ихід", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "&Оновити", IDM_REFRESH
     END
-    MENUITEM "&Властивості", ID_OPTIONS
+    MENUITEM "&Властивості", IDM_OPTIONS
     POPUP    "&Допомога"
     BEGIN
         MENUITEM "Д&опомога", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "Завантаження Звіту подій. Будь ласка, зачекайте ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Деталі події"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "Ко&мп'ютер:", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "&Опис:", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc b/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc
index 8fad3778849..77b4596c094 100644
--- a/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc
@@ -2,13 +2,13 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDC_EVENTVWR MENU
+IDM_EVENTVWR MENU
 BEGIN
     POPUP "日志(&L)"
     BEGIN
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "退出(&X)", IDM_EXIT
     END
@@ -16,7 +16,7 @@ BEGIN
     BEGIN
         MENUITEM "刷新(&R)", IDM_REFRESH
     END
-    MENUITEM "选项(&O)", ID_OPTIONS
+    MENUITEM "选项(&O)", IDM_OPTIONS
     POPUP "帮助(&H)"
     BEGIN
         MENUITEM "帮助内容(&E)", IDM_HELP
@@ -25,7 +25,7 @@ BEGIN
     END
 END
 
-IDC_EVENTVWR ACCELERATORS
+IDA_EVENTVWR ACCELERATORS
 BEGIN
     "?", IDM_ABOUT, ASCII, ALT
     "/", IDM_ABOUT, ASCII, ALT
@@ -50,7 +50,7 @@ BEGIN
     CTEXT "正在载入日志。请稍候...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX
 END
 
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251
+IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "事件详细信息"
@@ -73,9 +73,9 @@ BEGIN
     LTEXT "计算机(&C)：", IDC_STATIC, 8, 45, 36, 8
     EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
 
-    PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON
-    PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON
-    PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON
+    PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON
 
     LTEXT "描述(&D)：", IDC_STATIC, 8, 65, 39, 8
     EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY
diff --git a/reactos/base/applications/mscutils/eventvwr/resource.h b/reactos/base/applications/mscutils/eventvwr/resource.h
index e96afdddfc0..f9511267403 100644
--- a/reactos/base/applications/mscutils/eventvwr/resource.h
+++ b/reactos/base/applications/mscutils/eventvwr/resource.h
@@ -1,58 +1,58 @@
 #pragma once
 
-#define IDC_STATIC -1
+/* Icon IDs */
+#define IDI_EVENTVWR          10
+#define IDI_WARNINGICON       11
+#define IDI_INFORMATIONICON   12
+#define IDI_ERRORICON         13
+#define IDI_NEXT              14
+#define IDI_PREV              15
+#define IDI_COPY              16
 
-#define IDC_MYICON 2
-#define IDNEXT     3
-#define IDCOPY   4
 
-#define IDI_NEXT 11
-#define IDI_PREV 12
-#define IDI_COPY 13
+/* Accelerator IDs */
+#define IDA_EVENTVWR          50
 
-#define IDD_EVENTVWR_DIALOG   102
-#define IDD_PROGRESSBOX       150
-#define IDD_ABOUTBOX          103
-#define IDM_ABOUT             104
-#define IDM_EXIT              105
-#define IDI_EVENTVWR          107
-#define IDI_SMALL             108
-#define IDC_EVENTVWR          109
-#define IDC_PROCESSPROGRESS   250
-#define IDR_MAINFRAME         128
-#define IDI_WARNINGICON       129
-#define IDI_INFORMATIONICON   130
-#define IDI_ERRORICON         131
-#define IDD_EVENTDETAILDIALOG 132
 
-#define IDC_EVENTTEXTEDIT       1000
+/* Dialog IDs */
+#define IDD_ABOUTBOX          101
+#define IDD_PROGRESSBOX       102
+#define IDD_EVENTPROPERTIES   103
+
+
+/* Control IDs*/
+#define IDC_STATIC              -1
+#define IDC_MYICON              1000
 #define IDC_EVENTDATESTATIC     1001
-#define IDC_EVENTTIMESTATIC     1002
-#define IDC_EVENTUSERSTATIC     1003
-#define IDC_EVENTCOMPUTERSTATIC 1004
-#define IDC_EVENTIDSTATIC       1005
-#define IDC_EVENTSOURCESTATIC   1006
-#define IDC_EVENTTYPESTATIC     1007
-#define IDC_EVENTCATEGORYSTATIC 1008
-#define IDPREVIOUS              1009
-#define IDC_EVENTTEXTEDIT2      1010
-#define IDC_BYTESRADIO          1011
-#define IDC_WORDRADIO           1013
-#define IDC_EVENTDATAEDIT       1014
+#define IDC_EVENTSOURCESTATIC   1002
+#define IDC_EVENTTIMESTATIC     1003
+#define IDC_EVENTCATEGORYSTATIC 1004
+#define IDC_EVENTTYPESTATIC     1005
+#define IDC_EVENTIDSTATIC       1006
+#define IDC_EVENTUSERSTATIC     1007
+#define IDC_EVENTCOMPUTERSTATIC 1008
+#define IDC_PREVIOUS            1009
+#define IDC_NEXT                1010
+#define IDC_COPY                1011
+#define IDC_EVENTTEXTEDIT       1012
+#define IDC_BYTESRADIO          1013
+#define IDC_WORDRADIO           1014
+#define IDC_EVENTDATAEDIT       1015
 
-#define ID_HELP_HELP       32771
-#define ID_HELP            32772
-#define ID_OPTIONS         32773
-#define ID_VIEW            32774
-#define IDM_HELP           32775
-#define ID_VIEW_REFRESH    32776
-#define ID_REFRESH         32777
-#define IDM_REFRESH        32778
-#define ID_CLEAR_EVENTS    32779
-#define ID_SAVE_PROTOCOL   32780
+
+/* Menu IDs */
+#define IDM_EVENTVWR       32771
+#define IDM_CLEAR_EVENTS   32772
+#define IDM_SAVE_PROTOCOL  32773
+#define IDM_EXIT           32774
+#define IDM_REFRESH        32775
+#define IDM_OPTIONS        32776
+#define IDM_HELP           32777
+#define IDM_ABOUT          32778
 
 #define ID_FIRST_LOG       45000
 
+
 /* String IDs */
 #define IDS_APP_TITLE                 103
 #define IDS_APP_TITLE_EX              104