- Add "Clear display" command.

[reactos.git] / reactos / boot / freeldr / fdebug / fdebug.c

diff --git a/reactos/boot/freeldr/fdebug/fdebug.c b/reactos/boot/freeldr/fdebug/fdebug.c
index 05a0f96..bbadfef 100644 (file)
--- a/reactos/boot/freeldr/fdebug/fdebug.c
+++ b/reactos/boot/freeldr/fdebug/fdebug.c
@@ -51,13 +51,16 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        MSG msg;
        HACCEL hAccelTable;
 
+    UNREFERENCED_PARAMETER(lpCmdLine);
+    UNREFERENCED_PARAMETER(hPrevInstance);
+
        // Initialize global strings
        LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
        LoadString(hInstance, IDC_FDEBUG, szWindowClass, MAX_LOADSTRING);
        MyRegisterClass(hInstance);
 
        // Perform application initialization:
-       if (!InitInstance (hInstance, nCmdShow)) 
+       if (!InitInstance (hInstance, nCmdShow))
        {
                return FALSE;
        }
@@ -65,16 +68,16 @@ int APIENTRY WinMain(HINSTANCE hInstance,
        hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_FDEBUG);
 
        // Main message loop:
-       while (GetMessage(&msg, NULL, 0, 0)) 
+       while (GetMessage(&msg, NULL, 0, 0))
        {
-               if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) 
+               if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg))
                {
                        TranslateMessage(&msg);
                        DispatchMessage(&msg);
                }
        }
 
-       return msg.wParam;
+       return (int)msg.wParam;
 }
 
 
@@ -96,19 +99,24 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
 {
        WNDCLASSEX wcex;
 
-       wcex.cbSize = sizeof(WNDCLASSEX); 
+       wcex.cbSize = sizeof(WNDCLASSEX);
 
        wcex.style                      = CS_HREDRAW | CS_VREDRAW;
        wcex.lpfnWndProc        = (WNDPROC)WndProc;
        wcex.cbClsExtra         = 0;
        wcex.cbWndExtra         = 0;
        wcex.hInstance          = hInstance;
-       wcex.hIcon                      = LoadIcon(hInstance, (LPCTSTR)IDI_FDEBUG);
+       wcex.hIcon                      = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_FDEBUG));
        wcex.hCursor            = LoadCursor(NULL, IDC_ARROW);
        wcex.hbrBackground      = NULL;//(HBRUSH)(COLOR_WINDOW+1);
-       wcex.lpszMenuName       = (LPCSTR)IDC_FDEBUG;
+       wcex.lpszMenuName       = MAKEINTRESOURCE(IDC_FDEBUG);
        wcex.lpszClassName      = szWindowClass;
-       wcex.hIconSm            = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
+       wcex.hIconSm            = (HICON)LoadImage(hInstance,
+                                           MAKEINTRESOURCE(IDI_FDEBUG),
+                                           IMAGE_ICON,
+                                           16,
+                                           16,
+                                           LR_SHARED);
 
        return RegisterClassEx(&wcex);
 }
@@ -156,12 +164,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
        NONCLIENTMETRICS        ncm;
        HFONT                           hFont;
 
-       switch (message) 
+       switch (message)
        {
        case WM_CREATE:
 
-               hEditWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_VSCROLL|ES_AUTOHSCROLL|ES_LEFT|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL);
-               hDisplayWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL);
+               hEditWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), TEXT(""), WS_CHILD|WS_VISIBLE|WS_VSCROLL|ES_AUTOHSCROLL|ES_LEFT|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL);
+               hDisplayWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), TEXT(""), WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL);
 
                memset(&ncm, 0, sizeof(NONCLIENTMETRICS));
                ncm.cbSize = sizeof(NONCLIENTMETRICS);
@@ -174,7 +182,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
                break;
        case WM_COMMAND:
-               wmId    = LOWORD(wParam); 
+               wmId    = LOWORD(wParam);
                wmEvent = HIWORD(wParam);
 
                if (lParam == (LPARAM)hEditWnd && wmEvent == EN_CHANGE)
@@ -210,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);
@@ -226,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;
@@ -238,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;
@@ -247,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;
@@ -257,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;
@@ -299,6 +310,8 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
        HWND    hLicenseEditWnd;
        TCHAR   strLicense[0x1000];
 
+    UNREFERENCED_PARAMETER(lParam);
+
        switch (message)
        {
        case WM_INITDIALOG:
@@ -312,7 +325,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                return TRUE;
 
        case WM_COMMAND:
-               if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+               if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
                {
                        EndDialog(hDlg, LOWORD(wParam));
                        return TRUE;
@@ -324,6 +337,8 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
 LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
+    UNREFERENCED_PARAMETER(lParam);
+
        switch (message)
        {
        case WM_INITDIALOG:
@@ -340,7 +355,7 @@ LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LP
                        GetWindowText(GetDlgItem(hDlg, IDC_BAUTRATE), strBaudRate, MAX_PATH);
                }
 
-               if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+               if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
                {
                        EndDialog(hDlg, LOWORD(wParam));
                        return TRUE;
@@ -354,6 +369,8 @@ LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARA
 {
        OPENFILENAME    ofn;
 
+    UNREFERENCED_PARAMETER(lParam);
+
        switch (message)
        {
        case WM_INITDIALOG:
@@ -392,7 +409,7 @@ LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARA
                        GetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName, MAX_PATH);
                }
 
-               if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+               if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
                {
                        EndDialog(hDlg, LOWORD(wParam));
                        return TRUE;
@@ -412,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);
        }
 }
 
@@ -430,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);
        }
 }
 
@@ -448,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);
        }
 }
 
@@ -466,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);
        }
 }
 
@@ -484,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);
        }
 }
 
@@ -499,6 +516,8 @@ VOID Rs232Thread(VOID* Parameter)
        MSG             msg;
        DWORD   dwNumberOfBytesWritten;
 
+    UNREFERENCED_PARAMETER(Parameter);
+
        dwThreadId = GetCurrentThreadId();
 
        if (!Rs232OpenPortWin32(strComPort))