27 May
2007
27 May
'07
3:27 p.m.
Author: ekohl
Date: Sun May 27 19:27:40 2007
New Revision: 26924
URL: http://svn.reactos.org/svn/reactos?rev=26924&view=rev
Log:
- Add "Clear display" command.
- Change menu item prefix to IDM.
Modified:
trunk/reactos/boot/freeldr/fdebug/De.rc
trunk/reactos/boot/freeldr/fdebug/En.rc
trunk/reactos/boot/freeldr/fdebug/Fr.rc
trunk/reactos/boot/freeldr/fdebug/Hu.rc
trunk/reactos/boot/freeldr/fdebug/Id.rc
trunk/reactos/boot/freeldr/fdebug/It.rc
trunk/reactos/boot/freeldr/fdebug/Ja.rc
trunk/reactos/boot/freeldr/fdebug/No.rc
trunk/reactos/boot/freeldr/fdebug/Pl.rc
trunk/reactos/boot/freeldr/fdebug/Tr.rc
trunk/reactos/boot/freeldr/fdebug/fdebug.c
trunk/reactos/boot/freeldr/fdebug/resource.h
Modified: trunk/reactos/boot/freeldr/fdebug/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/De.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/De.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/De.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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 @@
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(a)reactos.org)"quot;,
@@ -135,8 +137,7 @@
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 @@
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
Modified: trunk/reactos/boot/freeldr/fdebug/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/En.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/En.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/En.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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
Modified: trunk/reactos/boot/freeldr/fdebug/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Fr.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Fr.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Fr.rc Sun May 27 19:27:40 2007
@@ -25,19 +25,21 @@
BEGIN
POPUP "&Fichier"
BEGIN
- MENUITEM "&Connecter", ID_FILE_CONNECT
- MENUITEM "&Déconnecter", ID_FILE_DISCONNECT,
GRAYED
- MENUITEM SEPARATOR
- MENUITEM "Démarrer la &Capture", ID_FILE_STARTCAPTURE
- MENUITEM "A&rréter la Capture", ID_FILE_STOPCAPTURE,
GRAYED
- MENUITEM SEPARATOR
- MENUITEM "Echo &Local", ID_FILE_LOCALECHO
- MENUITEM SEPARATOR
- MENUITEM "&Quitter", IDM_EXIT
+ MENUITEM "&Connecter", IDM_FILE_CONNECT
+ MENUITEM "&Déconnecter", IDM_FILE_DISCONNECT, GRAYED
+ MENUITEM SEPARATOR
+ MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
+ MENUITEM SEPARATOR
+ MENUITEM "Démarrer la &Capture", IDM_FILE_STARTCAPTURE
+ MENUITEM "A&rréter la Capture", IDM_FILE_STOPCAPTURE, GRAYED
+ MENUITEM SEPARATOR
+ 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
Modified: trunk/reactos/boot/freeldr/fdebug/Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Hu.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Hu.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Hu.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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
Modified: trunk/reactos/boot/freeldr/fdebug/Id.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Id.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Id.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Id.rc Sun May 27 19:27:40 2007
@@ -17,19 +17,21 @@
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 @@
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
Modified: trunk/reactos/boot/freeldr/fdebug/It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/It.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/It.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/It.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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
Modified: trunk/reactos/boot/freeldr/fdebug/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Ja.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Ja.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Ja.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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 GR[(&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 GR[(&L)", IDM_FILE_LOCALECHO
+ MENUITEM SEPARATOR
+ MENUITEM "I¹(&X)", IDM_EXIT
END
POPUP "wv(&H)"
BEGIN
- MENUITEM "o[Wîñ(&A)...", IDM_ABOUT
+ MENUITEM "o[Wîñ(&A)...", IDM_ABOUT
END
END
Modified: trunk/reactos/boot/freeldr/fdebug/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/No.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/No.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/No.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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
Modified: trunk/reactos/boot/freeldr/fdebug/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Pl.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Pl.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Pl.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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 "&Wyjcie", IDM_EXIT
+ MENUITEM "Lo&kalne Echo", IDM_FILE_LOCALECHO
+ MENUITEM SEPARATOR
+ MENUITEM "&Wyjcie", IDM_EXIT
END
POPUP "Po&moc"
BEGIN
- MENUITEM "&O ...", IDM_ABOUT
+ MENUITEM "&O ...", IDM_ABOUT
END
END
Modified: trunk/reactos/boot/freeldr/fdebug/Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Tr.rc?…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Tr.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Tr.rc Sun May 27 19:27:40 2007
@@ -16,19 +16,21 @@
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
Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/fdebug.c (original)
+++ trunk/reactos/boot/freeldr/fdebug/fdebug.c Sun May 27 19:27:40 2007
@@ -218,7 +218,10 @@
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 @@
}
}
break;
- case ID_FILE_DISCONNECT:
+ case IDM_FILE_DISCONNECT:
if (bConnected)
{
bConnected = FALSE;
@@ -246,7 +249,7 @@
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 @@
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 @@
hCaptureFile = NULL;
}
break;
- case ID_FILE_LOCALECHO:
+ case IDM_FILE_LOCALECHO:
if (bLocalEcho)
{
bLocalEcho = FALSE;
@@ -426,11 +429,11 @@
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 @@
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 @@
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 @@
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 @@
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);
}
}
Modified: trunk/reactos/boot/freeldr/fdebug/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/resour…
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/resource.h (original)
+++ trunk/reactos/boot/freeldr/fdebug/resource.h Sun May 27 19:27:40 2007
@@ -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