From 77286996f062d2a922d864ff3cdab6f681ab46f4 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 27 May 2007 15:27:40 +0000 Subject: [PATCH] - Add "Clear display" command. - Change menu item prefix to IDM. svn path=/trunk/; revision=26924 --- reactos/boot/freeldr/fdebug/De.rc | 25 +++++++++---------- reactos/boot/freeldr/fdebug/En.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/Fr.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/Hu.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/Id.rc | 18 +++++++------- reactos/boot/freeldr/fdebug/It.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/Ja.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/No.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/Pl.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/Tr.rc | 16 +++++++------ reactos/boot/freeldr/fdebug/fdebug.c | 33 ++++++++++++++------------ reactos/boot/freeldr/fdebug/resource.h | 11 +++++---- 12 files changed, 119 insertions(+), 96 deletions(-) diff --git a/reactos/boot/freeldr/fdebug/De.rc b/reactos/boot/freeldr/fdebug/De.rc index f34e50eca88..2b6d4495963 100644 --- a/reactos/boot/freeldr/fdebug/De.rc +++ b/reactos/boot/freeldr/fdebug/De.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Verbinden", ID_FILE_CONNECT - MENUITEM "&Trennen", ID_FILE_DISCONNECT, GRAYED + MENUITEM "&Verbinden", IDM_FILE_CONNECT + MENUITEM "&Trennen", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Aufnahme starten", ID_FILE_STARTCAPTURE - MENUITEM "A&ufnahme stoppen", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "A&nzeige löschen", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "&Local Echo", ID_FILE_LOCALECHO + MENUITEM "&Aufnahme starten", IDM_FILE_STARTCAPTURE + MENUITEM "A&ufnahme stoppen", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "B&eenden", IDM_EXIT + MENUITEM "&Local Echo", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "B&eenden", IDM_EXIT END POPUP "&Hilfe" BEGIN - MENUITEM "&Über ...", IDM_ABOUT + MENUITEM "&Über ...", IDM_ABOUT END END @@ -116,7 +118,7 @@ END IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About FreeLoader Debugger" +CAPTION "Über FreeLoader Debugger" FONT 8, "Tahoma" BEGIN CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp@reactos.org)", @@ -135,8 +137,7 @@ FONT 8, "Tahoma" BEGIN LTEXT "COM Port angeben (z.B. COM1):",IDC_STATIC,7,7,108,8 EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL - LTEXT "Bandbreite angeben (z.B. 115200):",IDC_STATIC,7,38,114, - 8 + LTEXT "Bandbreite angeben (z.B. 115200):",IDC_STATIC,7,38,114, 8 EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,45,79,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,100,79,50,14 @@ -144,10 +145,10 @@ END IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Capture File" +CAPTION "Protokolldatei" FONT 8, "Tahoma" BEGIN - LTEXT "Name der aufgenommenden Datei:",IDC_STATIC,7,17,120,8 + LTEXT "Name der Protokolldatei:",IDC_STATIC,7,17,120,8 EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL PUSHBUTTON "&Durchsuchen",IDC_BROWSE,194,26,50,14 DEFPUSHBUTTON "OK",IDOK,139,74,50,14 diff --git a/reactos/boot/freeldr/fdebug/En.rc b/reactos/boot/freeldr/fdebug/En.rc index afa2f7d9aa0..9fca9f70907 100644 --- a/reactos/boot/freeldr/fdebug/En.rc +++ b/reactos/boot/freeldr/fdebug/En.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&File" BEGIN - MENUITEM "&Connect", ID_FILE_CONNECT - MENUITEM "&Disconnect", ID_FILE_DISCONNECT, GRAYED + MENUITEM "&Connect", IDM_FILE_CONNECT + MENUITEM "&Disconnect", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Start Capture", ID_FILE_STARTCAPTURE - MENUITEM "S&top Capture", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "&Local Echo", ID_FILE_LOCALECHO + MENUITEM "&Start Capture", IDM_FILE_STARTCAPTURE + MENUITEM "S&top Capture", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT + MENUITEM "&Local Echo", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT END POPUP "&Help" BEGIN - MENUITEM "&About ...", IDM_ABOUT + MENUITEM "&About ...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/Fr.rc b/reactos/boot/freeldr/fdebug/Fr.rc index 56115e92964..40c6726a67d 100644 --- a/reactos/boot/freeldr/fdebug/Fr.rc +++ b/reactos/boot/freeldr/fdebug/Fr.rc @@ -25,19 +25,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Connecter", ID_FILE_CONNECT - MENUITEM "&Déconnecter", ID_FILE_DISCONNECT, GRAYED + MENUITEM "&Connecter", IDM_FILE_CONNECT + MENUITEM "&Déconnecter", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "Démarrer la &Capture", ID_FILE_STARTCAPTURE - MENUITEM "A&rréter la Capture", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "Echo &Local", ID_FILE_LOCALECHO + MENUITEM "Démarrer la &Capture", IDM_FILE_STARTCAPTURE + MENUITEM "A&rréter la Capture", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Quitter", IDM_EXIT + MENUITEM "Echo &Local", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Quitter", IDM_EXIT END POPUP "&Aide" BEGIN - MENUITEM "&A propos ...", IDM_ABOUT + MENUITEM "&A propos ...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/Hu.rc b/reactos/boot/freeldr/fdebug/Hu.rc index 174eb33b54d..fecb020a09b 100644 --- a/reactos/boot/freeldr/fdebug/Hu.rc +++ b/reactos/boot/freeldr/fdebug/Hu.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&File" BEGIN - MENUITEM "&Csatlakoztatás", ID_FILE_CONNECT - MENUITEM "Kapcsolat&bontás", ID_FILE_DISCONNECT, GRAYED + MENUITEM "&Csatlakoztatás", IDM_FILE_CONNECT + MENUITEM "Kapcsolat&bontás", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Start Capture", ID_FILE_STARTCAPTURE - MENUITEM "S&top Capture", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "Helyi &visszhang", ID_FILE_LOCALECHO + MENUITEM "&Start Capture", IDM_FILE_STARTCAPTURE + MENUITEM "S&top Capture", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Kilépés", IDM_EXIT + MENUITEM "Helyi &visszhang", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Kilépés", IDM_EXIT END POPUP "&Súgó" BEGIN - MENUITEM "&Névjegy ...", IDM_ABOUT + MENUITEM "&Névjegy ...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/Id.rc b/reactos/boot/freeldr/fdebug/Id.rc index 995aee78607..cfdae52a8f0 100644 --- a/reactos/boot/freeldr/fdebug/Id.rc +++ b/reactos/boot/freeldr/fdebug/Id.rc @@ -17,19 +17,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&File" BEGIN - MENUITEM "&Sambung", ID_FILE_CONNECT - MENUITEM "&Putus", ID_FILE_DISCONNECT, GRAYED + MENUITEM "&Sambung", IDM_FILE_CONNECT + MENUITEM "&Putus", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Mulai Penangkapan", ID_FILE_STARTCAPTURE - MENUITEM "&Hentikan Penangkapan", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "Echo &Lokal", ID_FILE_LOCALECHO + MENUITEM "&Mulai Penangkapan", IDM_FILE_STARTCAPTURE + MENUITEM "&Hentikan Penangkapan", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Keluar", IDM_EXIT + MENUITEM "Echo &Lokal", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Keluar", IDM_EXIT END POPUP "&Bantuan" BEGIN - MENUITEM "&Tentang ...", IDM_ABOUT + MENUITEM "&Tentang ...", IDM_ABOUT END END @@ -170,7 +172,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END #endif // Indonesian resources diff --git a/reactos/boot/freeldr/fdebug/It.rc b/reactos/boot/freeldr/fdebug/It.rc index 8ed68a48c9e..873c280ee9e 100644 --- a/reactos/boot/freeldr/fdebug/It.rc +++ b/reactos/boot/freeldr/fdebug/It.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&File" BEGIN - MENUITEM "&Connetti", ID_FILE_CONNECT - MENUITEM "&Disconnetti", ID_FILE_DISCONNECT, GRAYED + MENUITEM "&Connetti", IDM_FILE_CONNECT + MENUITEM "&Disconnetti", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Inizia Cattura", ID_FILE_STARTCAPTURE - MENUITEM "&Fine Cattura", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "Eco &Locale", ID_FILE_LOCALECHO + MENUITEM "&Inizia Cattura", IDM_FILE_STARTCAPTURE + MENUITEM "&Fine Cattura", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "E&sci", IDM_EXIT + MENUITEM "Eco &Locale", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "E&sci", IDM_EXIT END POPUP "&Aiuto" BEGIN - MENUITEM "&Informazioni su ...", IDM_ABOUT + MENUITEM "&Informazioni su ...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/Ja.rc b/reactos/boot/freeldr/fdebug/Ja.rc index 9a53f60a9d3..f2325a3e5d1 100644 --- a/reactos/boot/freeldr/fdebug/Ja.rc +++ b/reactos/boot/freeldr/fdebug/Ja.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "ƒtƒ@ƒCƒ‹(&F)" BEGIN - MENUITEM "Ú‘±(&C)", ID_FILE_CONNECT - MENUITEM "Ø’f(&D)", ID_FILE_DISCONNECT, GRAYED + MENUITEM "Ú‘±(&C)", IDM_FILE_CONNECT + MENUITEM "Ø’f(&D)", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "æ‚è‚İŠJn(&S)", ID_FILE_STARTCAPTURE - MENUITEM "æ‚è‚İ’â~(&T)", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "ƒ[ƒJƒ‹ ƒGƒR[(&L)", ID_FILE_LOCALECHO + MENUITEM "æ‚è‚İŠJn(&S)", IDM_FILE_STARTCAPTURE + MENUITEM "æ‚è‚İ’â~(&T)", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "I—¹(&X)", IDM_EXIT + MENUITEM "ƒ[ƒJƒ‹ ƒGƒR[(&L)", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "I—¹(&X)", IDM_EXIT END POPUP "ƒwƒ‹ƒv(&H)" BEGIN - MENUITEM "ƒo[ƒWƒ‡ƒ“î•ñ(&A)...", IDM_ABOUT + MENUITEM "ƒo[ƒWƒ‡ƒ“î•ñ(&A)...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/No.rc b/reactos/boot/freeldr/fdebug/No.rc index e9945afa56c..01223317a28 100644 --- a/reactos/boot/freeldr/fdebug/No.rc +++ b/reactos/boot/freeldr/fdebug/No.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&Fil" BEGIN - MENUITEM "Koble &til", ID_FILE_CONNECT - MENUITEM "Koble &fra", ID_FILE_DISCONNECT, GRAYED + MENUITEM "Koble &til", IDM_FILE_CONNECT + MENUITEM "Koble &fra", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Start Opptak", ID_FILE_STARTCAPTURE - MENUITEM "S&topp Opptak", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "&Lokalt Ekko", ID_FILE_LOCALECHO + MENUITEM "&Start Opptak", IDM_FILE_STARTCAPTURE + MENUITEM "S&topp Opptak", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Avslutt", IDM_EXIT + MENUITEM "&Lokalt Ekko", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Avslutt", IDM_EXIT END POPUP "&Hjelp" BEGIN - MENUITEM "&Om ...", IDM_ABOUT + MENUITEM "&Om ...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/Pl.rc b/reactos/boot/freeldr/fdebug/Pl.rc index 6a124faaf1d..66f0a7834e4 100644 --- a/reactos/boot/freeldr/fdebug/Pl.rc +++ b/reactos/boot/freeldr/fdebug/Pl.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&Plik" BEGIN - MENUITEM "P&o³¹cz", ID_FILE_CONNECT - MENUITEM "&Roz³¹cz", ID_FILE_DISCONNECT, GRAYED + MENUITEM "P&o³¹cz", IDM_FILE_CONNECT + MENUITEM "&Roz³¹cz", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "Ro&zpocznij zrzut", ID_FILE_STARTCAPTURE - MENUITEM "Za&trzymaj zrzut", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "Lo&kalne Echo", ID_FILE_LOCALECHO + MENUITEM "Ro&zpocznij zrzut", IDM_FILE_STARTCAPTURE + MENUITEM "Za&trzymaj zrzut", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Wyjœcie", IDM_EXIT + MENUITEM "Lo&kalne Echo", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Wyjœcie", IDM_EXIT END POPUP "Po&moc" BEGIN - MENUITEM "&O ...", IDM_ABOUT + MENUITEM "&O ...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/Tr.rc b/reactos/boot/freeldr/fdebug/Tr.rc index e9bcd4a3800..4c34581ff6d 100644 --- a/reactos/boot/freeldr/fdebug/Tr.rc +++ b/reactos/boot/freeldr/fdebug/Tr.rc @@ -16,19 +16,21 @@ IDC_FDEBUG MENU DISCARDABLE BEGIN POPUP "&Dosya" BEGIN - MENUITEM "&Bağlan", ID_FILE_CONNECT - MENUITEM "Bağlantıyı &Kes", ID_FILE_DISCONNECT, GRAYED + MENUITEM "&Bağlan", IDM_FILE_CONNECT + MENUITEM "Bağlantıyı &Kes", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Yakalamayı Başlat", ID_FILE_STARTCAPTURE - MENUITEM "Yakalamayı &Durdur", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR - MENUITEM "Bölgesel &Yankı", ID_FILE_LOCALECHO + MENUITEM "&Yakalamayı Başlat", IDM_FILE_STARTCAPTURE + MENUITEM "Yakalamayı &Durdur", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Çıkış", IDM_EXIT + MENUITEM "Bölgesel &Yankı", IDM_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Çıkış", IDM_EXIT END POPUP "&Yardım" BEGIN - MENUITEM "&Hakkında ...", IDM_ABOUT + MENUITEM "&Hakkında ...", IDM_ABOUT END END diff --git a/reactos/boot/freeldr/fdebug/fdebug.c b/reactos/boot/freeldr/fdebug/fdebug.c index 715981f4ada..bbadfef35ff 100644 --- a/reactos/boot/freeldr/fdebug/fdebug.c +++ b/reactos/boot/freeldr/fdebug/fdebug.c @@ -218,7 +218,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case IDM_EXIT: DestroyWindow(hWnd); break; - case ID_FILE_CONNECT: + case IDM_FILE_CLEARDISPLAY: + SetWindowText(hDisplayWnd, TEXT("")); + break; + case IDM_FILE_CONNECT: if (bConnected) { MessageBox(hWnd, TEXT("You are already connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); @@ -234,7 +237,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } } break; - case ID_FILE_DISCONNECT: + case IDM_FILE_DISCONNECT: if (bConnected) { bConnected = FALSE; @@ -246,7 +249,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) MessageBox(hWnd, TEXT("You are not currently connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); } break; - case ID_FILE_STARTCAPTURE: + case IDM_FILE_STARTCAPTURE: if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK) { bCapturing = TRUE; @@ -255,7 +258,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) hCaptureFile = CreateFile(strCaptureFileName, FILE_APPEND_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); } break; - case ID_FILE_STOPCAPTURE: + case IDM_FILE_STOPCAPTURE: if (bCapturing) { bCapturing = FALSE; @@ -265,7 +268,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) hCaptureFile = NULL; } break; - case ID_FILE_LOCALECHO: + case IDM_FILE_LOCALECHO: if (bLocalEcho) { bLocalEcho = FALSE; @@ -426,11 +429,11 @@ VOID EnableConnectMenuItem(BOOL Enable) if (Enable) { - EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED); + EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED); } else { - EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED); + EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED); } } @@ -444,11 +447,11 @@ VOID EnableDisconnectMenuItem(BOOL Enable) if (Enable) { - EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED); + EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED); } else { - EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED); + EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED); } } @@ -462,11 +465,11 @@ VOID EnableStartCaptureMenuItem(BOOL Enable) if (Enable) { - EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED); + EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED); } else { - EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED); + EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED); } } @@ -480,11 +483,11 @@ VOID EnableStopCaptureMenuItem(BOOL Enable) if (Enable) { - EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED); + EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED); } else { - EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED); + EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED); } } @@ -498,11 +501,11 @@ VOID CheckLocalEchoMenuItem(BOOL Checked) if (Checked) { - CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED); } else { - CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED); + CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED); } } diff --git a/reactos/boot/freeldr/fdebug/resource.h b/reactos/boot/freeldr/fdebug/resource.h index 03a94e57e01..1357cf23203 100644 --- a/reactos/boot/freeldr/fdebug/resource.h +++ b/reactos/boot/freeldr/fdebug/resource.h @@ -19,11 +19,12 @@ #define IDC_CAPTUREFILENAME 1002 #define IDC_BROWSE 1003 #define IDC_LICENSE_EDIT 1029 -#define ID_FILE_CONNECT 32771 -#define ID_FILE_DISCONNECT 32772 -#define ID_FILE_STARTCAPTURE 32773 -#define ID_FILE_STOPCAPTURE 32774 -#define ID_FILE_LOCALECHO 32775 +#define IDM_FILE_CLEARDISPLAY 32770 +#define IDM_FILE_CONNECT 32771 +#define IDM_FILE_DISCONNECT 32772 +#define IDM_FILE_STARTCAPTURE 32773 +#define IDM_FILE_STOPCAPTURE 32774 +#define IDM_FILE_LOCALECHO 32775 #define IDS_LICENSE 32815 #define IDC_STATIC -1