mirror of
https://github.com/reactos/reactos.git
synced 2025-06-03 08:20:27 +00:00
remove duplicated code
svn path=/trunk/; revision=32501
This commit is contained in:
parent
d49acd34e8
commit
6da06e7853
1 changed files with 12 additions and 85 deletions
|
@ -35,10 +35,7 @@ LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
|
||||||
LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM);
|
LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM);
|
||||||
LRESULT CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM);
|
LRESULT CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM);
|
||||||
LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM);
|
LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM);
|
||||||
VOID EnableConnectMenuItem(BOOL Enable);
|
VOID EnableFileMenuItemByID(UINT Id, BOOL Enable);
|
||||||
VOID EnableDisconnectMenuItem(BOOL Enable);
|
|
||||||
VOID EnableStartCaptureMenuItem(BOOL Enable);
|
|
||||||
VOID EnableStopCaptureMenuItem(BOOL Enable);
|
|
||||||
VOID CheckLocalEchoMenuItem(BOOL Checked);
|
VOID CheckLocalEchoMenuItem(BOOL Checked);
|
||||||
VOID Rs232Thread(VOID* Parameter);
|
VOID Rs232Thread(VOID* Parameter);
|
||||||
|
|
||||||
|
@ -231,8 +228,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, (DLGPROC)ConnectionDialogProc) == IDOK)
|
if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, (DLGPROC)ConnectionDialogProc) == IDOK)
|
||||||
{
|
{
|
||||||
bConnected = TRUE;
|
bConnected = TRUE;
|
||||||
EnableDisconnectMenuItem(TRUE);
|
EnableFileMenuItemByID(IDM_FILE_DISCONNECT, TRUE);
|
||||||
EnableConnectMenuItem(FALSE);
|
EnableFileMenuItemByID(IDM_FILE_CONNECT, FALSE);
|
||||||
_beginthread(Rs232Thread, 0, NULL);
|
_beginthread(Rs232Thread, 0, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -241,8 +238,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if (bConnected)
|
if (bConnected)
|
||||||
{
|
{
|
||||||
bConnected = FALSE;
|
bConnected = FALSE;
|
||||||
EnableDisconnectMenuItem(FALSE);
|
EnableFileMenuItemByID(IDM_FILE_DISCONNECT, FALSE);
|
||||||
EnableConnectMenuItem(TRUE);
|
EnableFileMenuItemByID(IDM_FILE_CONNECT, TRUE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -253,8 +250,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK)
|
if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK)
|
||||||
{
|
{
|
||||||
bCapturing = TRUE;
|
bCapturing = TRUE;
|
||||||
EnableStopCaptureMenuItem(TRUE);
|
EnableFileMenuItemByID(IDM_FILE_STOPCAPTURE, TRUE);
|
||||||
EnableStartCaptureMenuItem(FALSE);
|
EnableFileMenuItemByID(IDM_FILE_STARTCAPTURE, FALSE);
|
||||||
hCaptureFile = CreateFile(strCaptureFileName, FILE_APPEND_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
hCaptureFile = CreateFile(strCaptureFileName, FILE_APPEND_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -262,8 +259,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
if (bCapturing)
|
if (bCapturing)
|
||||||
{
|
{
|
||||||
bCapturing = FALSE;
|
bCapturing = FALSE;
|
||||||
EnableStopCaptureMenuItem(FALSE);
|
EnableFileMenuItemByID(IDM_FILE_STOPCAPTURE, FALSE);
|
||||||
EnableStartCaptureMenuItem(TRUE);
|
EnableFileMenuItemByID(IDM_FILE_STARTCAPTURE, TRUE);
|
||||||
CloseHandle(hCaptureFile);
|
CloseHandle(hCaptureFile);
|
||||||
hCaptureFile = NULL;
|
hCaptureFile = NULL;
|
||||||
}
|
}
|
||||||
|
@ -419,76 +416,14 @@ LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARA
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID EnableConnectMenuItem(BOOL Enable)
|
VOID EnableFileMenuItemByID(UINT Id, BOOL Enable)
|
||||||
{
|
{
|
||||||
HMENU hMenuBar;
|
HMENU hMenuBar;
|
||||||
HMENU hFileMenu;
|
HMENU hFileMenu;
|
||||||
|
|
||||||
hMenuBar = GetMenu(hMainWnd);
|
hMenuBar = GetMenu(hMainWnd);
|
||||||
hFileMenu = GetSubMenu(hMenuBar, 0);
|
hFileMenu = GetSubMenu(hMenuBar, 0);
|
||||||
|
EnableMenuItem(hFileMenu, Id, MF_BYCOMMAND|(Enable ? MF_ENABLED : MF_GRAYED));
|
||||||
if (Enable)
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
VOID EnableDisconnectMenuItem(BOOL Enable)
|
|
||||||
{
|
|
||||||
HMENU hMenuBar;
|
|
||||||
HMENU hFileMenu;
|
|
||||||
|
|
||||||
hMenuBar = GetMenu(hMainWnd);
|
|
||||||
hFileMenu = GetSubMenu(hMenuBar, 0);
|
|
||||||
|
|
||||||
if (Enable)
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
VOID EnableStartCaptureMenuItem(BOOL Enable)
|
|
||||||
{
|
|
||||||
HMENU hMenuBar;
|
|
||||||
HMENU hFileMenu;
|
|
||||||
|
|
||||||
hMenuBar = GetMenu(hMainWnd);
|
|
||||||
hFileMenu = GetSubMenu(hMenuBar, 0);
|
|
||||||
|
|
||||||
if (Enable)
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
VOID EnableStopCaptureMenuItem(BOOL Enable)
|
|
||||||
{
|
|
||||||
HMENU hMenuBar;
|
|
||||||
HMENU hFileMenu;
|
|
||||||
|
|
||||||
hMenuBar = GetMenu(hMainWnd);
|
|
||||||
hFileMenu = GetSubMenu(hMenuBar, 0);
|
|
||||||
|
|
||||||
if (Enable)
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID CheckLocalEchoMenuItem(BOOL Checked)
|
VOID CheckLocalEchoMenuItem(BOOL Checked)
|
||||||
|
@ -498,15 +433,7 @@ VOID CheckLocalEchoMenuItem(BOOL Checked)
|
||||||
|
|
||||||
hMenuBar = GetMenu(hMainWnd);
|
hMenuBar = GetMenu(hMainWnd);
|
||||||
hFileMenu = GetSubMenu(hMenuBar, 0);
|
hFileMenu = GetSubMenu(hMenuBar, 0);
|
||||||
|
CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|(Checked ? MF_CHECKED : MF_UNCHECKED));
|
||||||
if (Checked)
|
|
||||||
{
|
|
||||||
CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID Rs232Thread(VOID* Parameter)
|
VOID Rs232Thread(VOID* Parameter)
|
||||||
|
|
Loading…
Reference in a new issue