增加__OPTEK_EDIT__ 区分optek编辑部分

xiemeng
1 parent 261b3bdf
Showing 8 changed files with 294 additions and 189 deletions
INIT.C
MAKEFILE
MTTTY.C
MTTTY.H
SETTINGS.C
TRANSFER.C
TTYINFO.H
WRITER.C
--- a/INIT.C
View file @a01030b
+++ b/INIT.C
View file @a01030b
@@ -34,8 +34,6 @@
 #include <commctrl.h>
 #include "mttty.h"
-#pragma comment(lib,"comctl32.lib")
-
 /*
     Prototypes for functions called only within this file
 */
@@ -51,13 +49,14 @@ DWORD WaitForThreads( DWORD );
 */
 COMMTIMEOUTS gTimeoutsDefault = { 0x01, 0, 0, 0, 0 };
+#ifdef __OPTEK_EDIT__
 extern char szFileName[MAX_PATH];
 void oem_init(void)
 {
 	memset(szFileName,0,sizeof(szFileName));
 }
-
+#endif
 /*-----------------------------------------------------------------------------
@@ -75,7 +74,9 @@ void GlobalInitialize()
 {
     int cyMenuHeight, cyCaptionHeight, cyFrameHeight;
+#ifdef __OPTEK_EDIT__
 	oem_init();
+#endif
     //
     // critical sections in status reporting & node management
     //
@@ -213,7 +214,9 @@ void InitNewFont(LOGFONT LogFont, COLORREF rgbColor)
     YOFFSET( TTYInfo ) = YCHAR(TTYInfo) * ROW(TTYInfo);
 }
+#ifdef __OPTEK_EDIT__
 extern DWORD   BaudTable[];
+#endif
 /*-----------------------------------------------------------------------------
 FUNCTION: InitTTYInfo
@@ -238,7 +241,11 @@ BOOL InitTTYInfo()
     LOCALECHO( TTYInfo )     = FALSE ;
     CURSORSTATE( TTYInfo )   = CS_HIDE ;
     PORT( TTYInfo )          = 1 ;
+#ifdef __OPTEK_EDIT__
     BAUDRATE( TTYInfo )      = BaudTable[2] ;
+#else
+    BAUDRATE( TTYInfo )      = CBR_9600 ;
+#endif
     BYTESIZE( TTYInfo )      = 8 ;
     PARITY( TTYInfo )        = NOPARITY ;
     STOPBITS( TTYInfo )      = ONESTOPBIT ;
@@ -289,7 +296,11 @@ BOOL InitTTYInfo()
     //
     // setup default font information
     // 
+#ifdef __OPTEK_EDIT__
     LFTTYFONT( TTYInfo ).lfHeight =         20 ;
+#else
+    LFTTYFONT( TTYInfo ).lfHeight =         12 ;
+#endif
     LFTTYFONT( TTYInfo ).lfWidth =          0 ;
     LFTTYFONT( TTYInfo ).lfEscapement =     0 ;
     LFTTYFONT( TTYInfo ).lfOrientation =    0 ;
@@ -297,13 +308,16 @@ BOOL InitTTYInfo()
     LFTTYFONT( TTYInfo ).lfItalic =         0 ;
     LFTTYFONT( TTYInfo ).lfUnderline =      0 ;
     LFTTYFONT( TTYInfo ).lfStrikeOut =      0 ;
+#ifdef __OPTEK_EDIT__
     LFTTYFONT( TTYInfo ).lfCharSet =        ANSI_CHARSET;//OEM_CHARSET ;
+#else
+    LFTTYFONT( TTYInfo ).lfCharSet =        OEM_CHARSET ;
+#endif
     LFTTYFONT( TTYInfo ).lfOutPrecision =   OUT_DEFAULT_PRECIS ;
     LFTTYFONT( TTYInfo ).lfClipPrecision =  CLIP_DEFAULT_PRECIS ;
     LFTTYFONT( TTYInfo ).lfQuality =        DEFAULT_QUALITY ;
     LFTTYFONT( TTYInfo ).lfPitchAndFamily = FIXED_PITCH | FF_MODERN ;
     strcpy( LFTTYFONT( TTYInfo ).lfFaceName, "FixedSys" ) ;
-//    strcpy( LFTTYFONT( TTYInfo ).lfFaceName, "Courier New" ) ;
     InitNewFont( LFTTYFONT(TTYInfo), RGB(0,0,0));
@@ -579,11 +593,14 @@ HISTORY:   Date:      Author:     Comment:
 -----------------------------------------------------------------------------*/
 BOOL DisconnectOK()
 {
+#ifdef __OPTEK_EDIT__
 	char gszPort_Temp[20] = { 0 };
+#endif
     if (!CONNECTED(TTYInfo))
         return TRUE;
+#ifdef __OPTEK_EDIT__
 	GetDlgItemText(ghWndToolbarDlg, IDC_PORTCOMBO, gszPort, sizeof(gszPort));
 	if (gszPort[3] - '0' > 0 && gszPort[4] - '0' > 0)
@@ -592,6 +609,7 @@ BOOL DisconnectOK()
 		memset(gszPort, 20, sizeof(char));
 		strcpy(gszPort, gszPort_Temp);
 	}
+#endif
     return ((MessageBox(ghwndMain, "OK to Disconnect?", gszPort, MB_YESNO)) == IDYES);
 }
--- a/MAKEFILE
View file @a01030b
+++ b/MAKEFILE
View file @a01030b
@@ -25,7 +25,7 @@ STD_LIBS   =    libcmt.lib kernel32.lib \
 		user32.lib gdi32.lib \
 		comdlg32.lib
 EXTRA_LIBS =    winmm.lib comctl32.lib 
-GLOBAL_DEP =    mttty.h ttyinfo.h
+GLOBAL_DEP =    mttty.h
 RC_DEP     =    resource.h mttty.ico \
 		mttty2.ico mttty3.ico \
 		mttty4.ico
--- a/MTTTY.C
View file @a01030b
+++ b/MTTTY.C
View file @a01030b
@@ -46,8 +46,9 @@ BOOL ScrollTTYHorz( HWND, WORD, WORD );
 BOOL VersionCheck();
 BOOL PaintTTY( HWND );
+#ifdef __OPTEK_EDIT__
 char szFileName[MAX_PATH];
-
+#endif
 /*-----------------------------------------------------------------------------
 FUNCTION: WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
@@ -150,7 +151,11 @@ BOOL InitializeApp(HINSTANCE hInst, int nShowCmd)
     //
     wc.lpfnWndProc      = (WNDPROC) MTTTYWndProc;
     wc.hInstance        = hInst;
+#ifdef __OPTEK_EDIT__
     wc.hIcon            = LoadIcon(hInst,MAKEINTRESOURCE(IDI_TITLE));
+#else
+    wc.hIcon            = LoadIcon(hInst,MAKEINTRESOURCE(IDI_APPICON));
+#endif
     wc.hCursor          = LoadCursor(NULL, IDC_ARROW);
     wc.lpszMenuName     = MAKEINTRESOURCE(IDR_MTTTYMENU);
     wc.hbrBackground    = (HBRUSH) (COLOR_WINDOW + 1) ;
@@ -180,11 +185,19 @@ BOOL InitializeApp(HINSTANCE hInst, int nShowCmd)
     //
     // create main window
     //
+#ifdef __OPTEK_EDIT__
     ghwndMain = CreateWindow("MTTTYClass", "OPTEK",
             WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
             STARTXWINDOW, STARTYWINDOW,
             MAXXWINDOW, MAXYWINDOW,
             NULL, NULL, hInst, NULL);
+#else
+    ghwndMain = CreateWindow("MTTTYClass", "Multi-threaded TTY",
+            WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
+            STARTXWINDOW, STARTYWINDOW,
+            MAXXWINDOW, MAXYWINDOW,
+            NULL, NULL, hInst, NULL);
+#endif
     if (ghwndMain == NULL) {
         GlobalCleanup();
@@ -314,20 +327,24 @@ int WINAPI MTTTYWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             break;
       case WM_CLOSE:
-           /* if (DisconnectOK()) {
-                if (CONNECTED(TTYInfo)) {
-                    if (TRANSFERRING(TTYInfo))
-                        TransferFileTextEnd();
-                    BreakDownCommPort();
-                }
-                DestroyWindow(hwnd);
-            }*/
+#ifdef __OPTEK_EDIT__
+
 		  if (CONNECTED(TTYInfo)) {
 			  if (TRANSFERRING(TTYInfo))
 				  TransferFileTextEnd();
 			  BreakDownCommPort();
 		  }
 		  DestroyWindow(hwnd);
+#else
+            if (DisconnectOK()) {
+                if (CONNECTED(TTYInfo)) {
+                    if (TRANSFERRING(TTYInfo))
+                        TransferFileTextEnd();
+                    BreakDownCommPort();
+                }
+                DestroyWindow(hwnd);
+            }
+#endif
             break;
       default:
@@ -363,7 +380,11 @@ void CmdDispatch(int iMenuChoice, HWND hwnd, LPARAM lParam)
         case ID_TRANSFER_SENDFILETEXT:
             {
+#ifdef __OPTEK_EDIT__
                 char * szFilter = "bin Files\0*.bin\0";
+#else
+                char * szFilter = "Text Files\0*.TXT\0";
+#endif
                 OPENFILENAME ofn = {0};
                 ofn.lStructSize = sizeof(OPENFILENAME);
@@ -371,15 +392,22 @@ void CmdDispatch(int iMenuChoice, HWND hwnd, LPARAM lParam)
                 ofn.lpstrFilter = szFilter;
                 ofn.lpstrFile = szFileName;
                 ofn.nMaxFile = MAX_PATH;
+#ifdef __OPTEK_EDIT__
                 ofn.lpstrTitle = "Select file";
+#else
+                ofn.lpstrTitle = "Send File";
+#endif
                 ofn.Flags = OFN_FILEMUSTEXIST;
                 if (!GetOpenFileName(&ofn))
                     break;
+#ifdef __OPTEK_EDIT__
 				UpdateStatus(szFileName);
-                //if (TRUE)
-                  //  TransferFileTextStart(szFileName);
+#else
+                if (TRUE)
+                    TransferFileTextStart(szFileName);
+#endif
             }
             break;
@@ -455,7 +483,9 @@ void CmdDispatch(int iMenuChoice, HWND hwnd, LPARAM lParam)
         // The following correspond to menu choices and buttons in the settings dlog
         case IDC_FONTBTN:
+#ifdef __OPTEK_EDIT__
         case IDC_SENDBTN:
+#endif
         case IDC_COMMEVENTSBTN:
         case IDC_FLOWCONTROLBTN:
         case IDC_TIMEOUTSBTN:
@@ -573,19 +603,20 @@ BOOL NEAR ScrollTTYVert( HWND hWnd, WORD wScrollCmd, WORD wScrollPos )
    if ((YOFFSET( TTYInfo ) + nScrollAmt) < 0)
       nScrollAmt = -YOFFSET( TTYInfo ) ;
-	
-   
-  
+#ifdef __OPTEK_EDIT__
     if (nScrollAmt != 0)
    {
 		YOFFSET( TTYInfo ) = YOFFSET( TTYInfo ) + nScrollAmt ;
-
 		SetScrollPos( hWnd, SB_VERT, YOFFSET( TTYInfo ), TRUE ) ;
-	
 		ScrollWindowEx( hWnd, 0, -nScrollAmt, NULL, NULL, NULL, NULL, SW_INVALIDATE | SW_ERASE) ;
    }
+#else
+   ScrollWindowEx( hWnd, 0, -nScrollAmt, NULL, NULL, NULL, NULL, SW_INVALIDATE | SW_ERASE) ;
+   YOFFSET( TTYInfo ) = YOFFSET( TTYInfo ) + nScrollAmt ;
+   SetScrollPos( hWnd, SB_VERT, YOFFSET( TTYInfo ), TRUE ) ;
+#endif
    return ( TRUE ) ;
 } // end of ScrollTTYVert()
--- a/MTTTY.H
View file @a01030b
+++ b/MTTTY.H
View file @a01030b
@@ -19,7 +19,142 @@
 //
 #include "resource.h"
-#include "ttyinfo.h"
+//#include "ttyinfo.h"
+#define __OPTEK_EDIT__
+
+#ifdef __OPTEK_EDIT__
+#pragma comment(lib,"comctl32.lib")
+#pragma comment(lib,"winmm.lib")
+#endif
+
+
+//
+// constant definitions
+//
+
+//
+// hard coded maximum number of ports
+//
+#ifdef __OPTEK_EDIT__
+#define MAXPORTS        32
+#else
+#define MAXPORTS        4
+#endif
+
+//
+// terminal size
+//
+#define MAXROWS         50
+#define MAXCOLS         80
+
+//
+// cursor states
+//
+#define CS_HIDE         0x00
+#define CS_SHOW         0x01
+
+//
+// ascii definitions
+//
+#define ASCII_BEL       0x07
+#define ASCII_BS        0x08
+#define ASCII_LF        0x0A
+#define ASCII_CR        0x0D
+#define ASCII_XON       0x11
+#define ASCII_XOFF      0x13
+
+//
+// data structures
+//
+struct TTYInfoStruct
+{
+    HANDLE  hCommPort, hReaderStatus, hWriter ;
+    DWORD   dwEventFlags;
+    CHAR    Screen[MAXCOLS * MAXROWS];
+    CHAR    chFlag, chXON, chXOFF;
+    WORD    wXONLimit, wXOFFLimit;
+    DWORD   fRtsControl;
+    DWORD   fDtrControl;
+    BOOL    fConnected, fTransferring, fRepeating,
+            fLocalEcho, fNewLine,
+            fDisplayErrors, fAutowrap,
+            fCTSOutFlow, fDSROutFlow, fDSRInFlow, 
+            fXonXoffOutFlow, fXonXoffInFlow,
+            fTXafterXoffSent,
+            fNoReading, fNoWriting, fNoEvents, fNoStatus,
+            fDisplayTimeouts;
+    BYTE    bPort, bByteSize, bParity, bStopBits ;
+    DWORD   dwBaudRate ;
+    WORD    wCursorState ;
+    HFONT   hTTYFont ;
+    LOGFONT lfTTYFont ;
+    DWORD   rgbFGColor ;
+    COMMTIMEOUTS timeoutsorig;
+    COMMTIMEOUTS timeoutsnew;
+    int     xSize, ySize, xScroll, yScroll, xOffset, yOffset,
+            nColumn, nRow, xChar, yChar , nCharPos;
+
+} TTYInfo;
+
+//
+// macros ( for easier readability )
+//
+#define COMDEV( x )         (x.hCommPort)
+#define CURSORSTATE( x )    (x.wCursorState)
+#define PORT( x )           (x.bPort)
+#define SCREEN( x )         (x.Screen)
+#define CONNECTED( x )      (x.fConnected)
+#define TRANSFERRING( x )   (x.fTransferring)
+#define REPEATING( x )      (x.fRepeating)
+#define LOCALECHO( x )      (x.fLocalEcho)
+#define NEWLINE( x )        (x.fNewLine)
+#define AUTOWRAP( x )       (x.fAutowrap)
+#define BYTESIZE( x )       (x.bByteSize)
+#define PARITY( x )         (x.bParity)
+#define STOPBITS( x )       (x.bStopBits)
+#define BAUDRATE( x )       (x.dwBaudRate)
+#define HTTYFONT( x )       (x.hTTYFont)
+#define LFTTYFONT( x )      (x.lfTTYFont)
+#define FGCOLOR( x )        (x.rgbFGColor)
+#define XSIZE( x )          (x.xSize)
+#define YSIZE( x )          (x.ySize)
+#define XSCROLL( x )        (x.xScroll)
+#define YSCROLL( x )        (x.yScroll)
+#define XOFFSET( x )        (x.xOffset)
+#define YOFFSET( x )        (x.yOffset)
+#define COLUMN( x )         (x.nColumn)
+#define ROW( x )            (x.nRow)
+#define XCHAR( x )          (x.xChar)
+#define YCHAR( x )          (x.yChar)
+#define DISPLAYERRORS( x )  (x.fDisplayErrors)
+#define TIMEOUTSORIG( x )   (x.timeoutsorig)
+#define TIMEOUTSNEW( x )    (x.timeoutsnew)
+#define WRITERTHREAD( x )   (x.hWriter)
+#define READSTATTHREAD( x ) (x.hReaderStatus)
+#define EVENTFLAGS( x )     (x.dwEventFlags)
+#define FLAGCHAR( x )       (x.chFlag)
+#define SCREENCHAR( x, col, row )   (x.Screen[row * MAXCOLS + col])
+
+#define DTRCONTROL( x )     (x.fDtrControl)
+#define RTSCONTROL( x )     (x.fRtsControl)
+#define XONCHAR( x )        (x.chXON)
+#define XOFFCHAR( x )       (x.chXOFF)
+#define XONLIMIT( x )       (x.wXONLimit)
+#define XOFFLIMIT( x )      (x.wXOFFLimit)
+#define CTSOUTFLOW( x )     (x.fCTSOutFlow)
+#define DSROUTFLOW( x )     (x.fDSROutFlow)
+#define DSRINFLOW( x )      (x.fDSRInFlow)
+#define XONXOFFOUTFLOW( x ) (x.fXonXoffOutFlow)
+#define XONXOFFINFLOW( x )  (x.fXonXoffInFlow)
+#define TXAFTERXOFFSENT(x)  (x.fTXafterXoffSent)
+
+#define NOREADING( x )      (x.fNoReading)
+#define NOWRITING( x )      (x.fNoWriting)
+#define NOEVENTS( x )       (x.fNoEvents)
+#define NOSTATUS( x )       (x.fNoStatus)
+#define SHOWTIMEOUTS( x )   (x.fDisplayTimeouts)
+
+
 //
 // GLOBAL DEFINES
@@ -127,7 +262,11 @@ typedef struct STATUS_MESSAGE
 //
 //  Port name
 //
+#ifdef __OPTEK_EDIT__
 char gszPort[20];
+#else
+char gszPort[10];
+#endif
 //
 //  Writer heap variables
--- a/SETTINGS.C
View file @a01030b
+++ b/SETTINGS.C
View file @a01030b
@@ -77,7 +77,7 @@ BOOL CALLBACK GetADWORDProc( HWND, UINT, WPARAM, LPARAM );
 DCB dcbTemp;
-#if 1
+#ifdef __OPTEK_EDIT__
 char * szBaud[] = {
 	"115200*1", "115200*2", "115200*4", "115200*8"
 };
@@ -90,14 +90,14 @@ DWORD   BaudTable[] =  {
 char * szBaud[] = {
 	    "110", "300", "600", "1200", "2400", 
 	    "4800", "9600", "14400", "19200",
-	    "38400", "56000", "57600", "460800", 
-	    "128000"
+	    "38400", "56000", "57600", "115200", 
+	    "128000", "256000"
 	};
 DWORD   BaudTable[] =  {
 	    CBR_110, CBR_300, CBR_600, CBR_1200, CBR_2400,
 	    CBR_4800, CBR_9600, CBR_14400, CBR_19200, CBR_38400,
-	    CBR_56000, CBR_57600, (CBR_115200)*4, CBR_128000
+	    CBR_56000, CBR_57600, CBR_115200, CBR_128000, CBR_256000
 	} ;
 #endif
 char * szParity[] =   {   "None", "Even", "Odd", "Mark", "Space" };
@@ -273,11 +273,11 @@ void UpdateTTYInfo()
     //
     // update globals from dialog settings
     //
+#ifdef __OPTEK_EDIT__
 	char gszPort_Temp[20] = {0};
-	
+#endif	
     GetDlgItemText(ghWndToolbarDlg, IDC_PORTCOMBO, gszPort, sizeof(gszPort));
-	/*MessageBox(NULL, gszPort, "TEST", MB_OK);*/
-
+#ifdef __OPTEK_EDIT__
 	if (gszPort[3] - '0' > 0 && gszPort[4] - '0' > 0)
 	{
 		wsprintf(gszPort_Temp,"\\\\.\\%s%d","COM", (gszPort[3] - '0' )*10 + (gszPort[4] - '0'));
@@ -285,7 +285,7 @@ void UpdateTTYInfo()
 		strcpy(gszPort, gszPort_Temp);
 		/*MessageBox(NULL, gszPort, "TEST---", MB_OK);*/
 	}
-
+#endif
     BAUDRATE(TTYInfo) = GetdwTTYItem( ghWndToolbarDlg, 
 					IDC_BAUDCOMBO, 
 					szBaud, 
@@ -474,9 +474,7 @@ void SetComboBox( HWND hCtrlWnd, WORD wTableLen, DWORD dwNewSetting )
     return ;
 }
-//???ù′??ú
-//2?êy￡obEnablePort￡?????′??úóDD§￡?bEnablePort[0]±íê?COM1￡?bEnablePort[n-1]±íê?COMn
-//·μ???μ￡oóDD§μ?′??ú??êy
+#ifdef __OPTEK_EDIT__
 int EnumAllComPort(int* bEnablePort)
 {
     int nCommSum = 0;//¡ä??¨²??¨ºy
@@ -517,7 +515,7 @@ int EnumAllComPort(int* bEnablePort)
     return nCommSum;
 } 
-
+#endif
 /*-----------------------------------------------------------------------------
@@ -541,24 +539,25 @@ BOOL SettingsDlgInit( HWND hDlg )
 {
     char szBuffer[ MAXLEN_TEMPSTR ], szTemp[ MAXLEN_TEMPSTR ] ;
     WORD wCount, wMaxCOM, wPosition ;
+#ifdef __OPTEK_EDIT__
 	int cmdT[MAXPORTS];
-
+#endif
     wMaxCOM = MAXPORTS ;
     strcpy(szTemp, "COM");
+#ifdef __OPTEK_EDIT__
 	memset(cmdT,0,sizeof(cmdT));
 	EnumAllComPort(cmdT);
-
 	//for (int i=0;i<10;i++)
 	{
 		//UpdateStatus("com%d:%d\r\n",i+1,cmdT[i]);
 	}
-
-
+#endif
     //
     // fill port combo box and make initial selection
     //
     for (wCount = 0; wCount < wMaxCOM; wCount++) {
+#ifdef __OPTEK_EDIT__
 	//wsprintf( szBuffer, "%s%d", (LPSTR) szTemp, wCount + 1 ) ;
 		if (cmdT[wCount])
 		{			
@@ -566,6 +565,11 @@ BOOL SettingsDlgInit( HWND hDlg )
 			SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_ADDSTRING, 0,
 					    (LPARAM) (LPSTR) szBuffer ) ;
 		}
+#else
+	wsprintf( szBuffer, "%s%d", (LPSTR) szTemp, wCount + 1 ) ;
+	SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_ADDSTRING, 0,
+			    (LPARAM) (LPSTR) szBuffer ) ;
+#endif
     }
     SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_SETCURSEL,
@@ -717,6 +721,7 @@ BYTE GetbTTYItem(HWND hDlg, int idControl, char ** szString, DWORD * pTable, int
     return 0;
 }
+#ifdef __OPTEK_EDIT__
 extern char szFileName[MAX_PATH];
 int szFileName_check(char* fileName)
@@ -733,7 +738,7 @@ int szFileName_check(char* fileName)
 	return ret;
 }
-
+#endif
 /*-----------------------------------------------------------------------------
 FUNCTION: ToolbarProc(HWND, UINT, WPARAM, LPARAM)
@@ -811,6 +816,7 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 				fRet = FALSE;
 				break;
+#ifdef __OPTEK_EDIT__
 			    case IDC_SENDBTN:       // send button pressed
 					if (!EnableWindow( GetDlgItem(ghWndToolbarDlg, IDC_PORTCOMBO), FALSE))
 					{
@@ -819,11 +825,9 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 						fRet = FALSE;
 						break;
 					}
-					
 					if (szFileName_check(szFileName))
 		   			{
 						EnableWindow( GetDlgItem(ghWndToolbarDlg, IDC_SENDBTN), FALSE);
-	//					EnableWindow(GetDlgItem(ghWndToolbarDlg, IDC_PORTCOMBO), FALSE);
 						TransferFileTextStart(szFileName);
 					}
 					else
@@ -831,10 +835,9 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 						/*MessageBox(NULL,"-_-","test3", MB_OK);*/
 						ErrorReporter("Please select file!\r\n");
 					}
-
 					fRet = FALSE;
 				break;
-
+#endif
 			    case IDC_COMMEVENTSBTN:     // comm events button pressed
 				DialogBox(ghInst, MAKEINTRESOURCE(IDD_COMMEVENTSDLG), ghwndMain, CommEventsProc);
 				fRet = FALSE;
@@ -847,7 +850,6 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			    case IDC_TIMEOUTSBTN:
 				DialogBox(ghInst, MAKEINTRESOURCE(IDD_TIMEOUTSDLG), ghwndMain, TimeoutsProc);
-				break;
 				fRet = FALSE;
 				break;
--- a/TRANSFER.C
View file @a01030b
+++ b/TRANSFER.C
View file @a01030b
@@ -35,8 +35,6 @@
 #include <commctrl.h>
 #include "mttty.h"
-#pragma comment(lib,"winmm.lib")
-
 //
 // Globals used in this file only
 //
@@ -102,7 +100,9 @@ void TransferRepeatCreate(LPCTSTR lpszFileName, DWORD dwFrequency)
     hMenu = GetMenu(ghwndMain);
     MenuFlags = MF_DISABLED | MF_GRAYED;
     EnableMenuItem(hMenu, ID_TRANSFER_SENDFILETEXT, MenuFlags);
+#ifdef __OPTEK_EDIT__
     EnableMenuItem(hMenu, IDC_SENDBTN, MenuFlags);
+#endif
     EnableMenuItem(hMenu, ID_TRANSFER_SENDREPEATEDLY, MenuFlags);
     EnableMenuItem(hMenu, ID_TRANSFER_ABORTREPEATEDSENDING, MF_ENABLED);
     EnableMenuItem(hMenu, ID_TRANSFER_RECEIVEFILETEXT, MenuFlags);
@@ -194,7 +194,9 @@ void TransferRepeatDestroy()
     MenuFlags = MF_ENABLED;
     EnableMenuItem(hMenu, ID_TRANSFER_ABORTREPEATEDSENDING, MF_DISABLED | MF_GRAYED);
     EnableMenuItem(hMenu, ID_TRANSFER_SENDFILETEXT, MenuFlags);
+#ifdef __OPTEK_EDIT__
     EnableMenuItem(hMenu, IDC_SENDBTN, MenuFlags);
+	#endif
     EnableMenuItem(hMenu, ID_TRANSFER_SENDREPEATEDLY, MenuFlags);
     EnableMenuItem(hMenu, ID_TRANSFER_RECEIVEFILETEXT, MenuFlags);
@@ -262,7 +264,9 @@ void TransferFileTextStart(LPCTSTR lpstrFileName)
     hMenu = GetMenu(ghwndMain);
     MenuFlags = MF_DISABLED | MF_GRAYED;
     EnableMenuItem(hMenu, ID_TRANSFER_SENDFILETEXT, MenuFlags);
+#ifdef __OPTEK_EDIT__
     EnableMenuItem(hMenu, IDC_SENDBTN, MenuFlags);
+#endif
     EnableMenuItem(hMenu, ID_TRANSFER_SENDREPEATEDLY, MenuFlags);
     EnableMenuItem(hMenu, ID_TRANSFER_ABORTSENDING, MF_ENABLED);
     EnableMenuItem(hMenu, ID_TRANSFER_RECEIVEFILETEXT, MenuFlags);
@@ -333,7 +337,9 @@ void TransferFileTextEnd()
     hMenu = GetMenu(ghwndMain);
     MenuFlags = MF_ENABLED;
     EnableMenuItem(hMenu, ID_TRANSFER_SENDFILETEXT, MenuFlags);
+#ifdef __OPTEK_EDIT__
     EnableMenuItem(hMenu, IDC_SENDBTN, MenuFlags);
+#endif
     EnableMenuItem(hMenu, ID_TRANSFER_SENDREPEATEDLY, MenuFlags);
     EnableMenuItem(hMenu, ID_TRANSFER_RECEIVEFILETEXT, MenuFlags);
     EnableMenuItem(hMenu, ID_TRANSFER_ABORTSENDING, MF_DISABLED | MF_GRAYED);
@@ -343,7 +349,9 @@ void TransferFileTextEnd()
     //
     ShowWindow(GetDlgItem(ghWndStatusDlg, IDC_ABORTBTN), SW_HIDE);
     ShowWindow(GetDlgItem(ghWndStatusDlg, IDC_TRANSFERPROGRESS), SW_HIDE);
+#ifdef __OPTEK_EDIT__
 	EnableWindow( GetDlgItem(ghWndToolbarDlg, IDC_SENDBTN), TRUE);
+#endif
     //
     // close the file
     //
@@ -391,7 +399,9 @@ void ReceiveFileText(LPCTSTR lpstrFileName)
     // disable transfer menu
     //
     EnableMenuItem(hMenu, ID_TRANSFER_SENDFILETEXT, MenuFlags);
+#ifdef __OPTEK_EDIT__
     EnableMenuItem(hMenu, IDC_SENDBTN, MenuFlags);
+#endif
     EnableMenuItem(hMenu, ID_TRANSFER_RECEIVEFILETEXT, MenuFlags);
     EnableMenuItem(hMenu, ID_TRANSFER_SENDREPEATEDLY, MenuFlags);
@@ -419,7 +429,9 @@ void ReceiveFileText(LPCTSTR lpstrFileName)
     // enable transfer menu
     //
     EnableMenuItem(hMenu, ID_TRANSFER_SENDFILETEXT, MenuFlags);
+#ifdef __OPTEK_EDIT__
     EnableMenuItem(hMenu, IDC_SENDBTN, MenuFlags);
+#endif
     EnableMenuItem(hMenu, ID_TRANSFER_RECEIVEFILETEXT, MenuFlags);
     EnableMenuItem(hMenu, ID_TRANSFER_SENDREPEATEDLY, MenuFlags);
@@ -685,21 +697,19 @@ HISTORY:   Date:      Author:     Comment:
 -----------------------------------------------------------------------------*/
+#ifdef __OPTEK_EDIT__
 #define  HEADER_START 0x44332211
 #define  BAUDRATE_DET_DATA 0xFFAAFF55
 #define  BAUDRATE_DET_DATA_LEN 0xB00
 #define  HEADER_LEN 0x20
 #define  MAC_ADDR_OFFSET 0x68000
-
 #define U32 unsigned int
-
 enum {
     READ_CPU_TICKS_ERR,
     WRONG_FILE_FORMAT,
     CHECKSUM_ERROR,
     FILE_CHCK_SUCCESSFUL
 };
-
 typedef struct {
     U32 rx_header_start;
     U32 rx_copy_addr;
@@ -894,7 +904,7 @@ int fileCheck(char *fData,char *dataLen)
     }
 	return ret;
 }
-
+#endif
 DWORD WINAPI TransferThreadProc(LPVOID lpV)
 {
     DWORD  dwPacketSize, dwMaxPackets, dwFileSize;
@@ -904,12 +914,13 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
     HANDLE hDataHeap;
     BOOL fStarted = TRUE;
     BOOL fAborting = FALSE;
+#ifdef __OPTEK_EDIT__
     BOOL userAborting = TRUE;
 	char *lpfileBuf;
 	char *pRead;
 	DWORD dwRead;
 	int err;
-
+#endif
     hFileHandle = (HANDLE) lpV;
     hWndProgress = GetDlgItem(ghWndStatusDlg, IDC_TRANSFERPROGRESS);
@@ -919,7 +930,6 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
         fAborting = TRUE;
     else {
         SendMessage(hWndProgress, PBM_SETRANGE, 0, MAKELPARAM(0, dwMaxPackets+1));
-//        SendMessage(hWndProgress, PBM_SETRANGE, 0, MAKELPARAM(0, 100));
         SendMessage(hWndProgress, PBM_SETSTEP, (WPARAM) 1, 0);
         SendMessage(hWndProgress, PBM_SETPOS, 0, 0);
     }
@@ -928,14 +938,18 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
     if (!fAborting) {
         SYSTEM_INFO sysInfo;
         GetSystemInfo(&sysInfo);
-//        hDataHeap = HeapCreate(0, sysInfo.dwPageSize * 2, sysInfo.dwPageSize * 10);
-        hDataHeap = HeapCreate(0, sysInfo.dwPageSize * 20,0);
+#ifdef __OPTEK_EDIT__
+hDataHeap = HeapCreate(0, sysInfo.dwPageSize * 20,0);
+#else
+hDataHeap = HeapCreate(0, sysInfo.dwPageSize * 2, sysInfo.dwPageSize * 10);
+#endif
         if (hDataHeap == NULL) {
             ErrorReporter("HeapCreate (Data Heap)");
             fAborting = TRUE;
         }
     }
+#ifdef __OPTEK_EDIT__
 	/**********************check file*********************************/
 	lpfileBuf = HeapAlloc(hDataHeap, 0, dwFileSize);
 	pRead = lpfileBuf;
@@ -969,17 +983,11 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
 		userAborting =FALSE;
 		fAborting = TRUE;
 	}	
-
-
-
-    if (WaitForSingleObject(hTransferAbortEvent, 0) == WAIT_OBJECT_0)
-        fAborting = TRUE;
-
+#endif
     // inform writer thread that a file is about to be transferred
     if (!fAborting) {
         if (!WriterAddNewNode(WRITE_FILESTART, dwFileSize, 0, NULL, NULL, NULL))
             fAborting = TRUE;
-		
     }
     OutputDebugString("Xfer: About to start sending data\n");
@@ -987,34 +995,52 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
     // Get Transfer Start Time
     dwStartTime = GetTickCount();
+    if (WaitForSingleObject(hTransferAbortEvent, 0) == WAIT_OBJECT_0)
+        fAborting = TRUE;
+
     while (!fAborting) {
+        char * lpDataBuf;
         PWRITEREQUEST pWrite;
-		char * lpDataBuf;
         // transfer file, loop until all blocks of file have been read
         lpDataBuf = HeapAlloc(hDataHeap, 0, dwPacketSize);
         pWrite = HeapAlloc(ghWriterHeap, 0, sizeof(WRITEREQUEST));
-        if ((lpDataBuf != NULL) && (pWrite != NULL)) {
+        if ((lpDataBuf != NULL) && (pWrite != NULL)) 
+		{
+#ifdef __OPTEK_EDIT__
             DWORD wrLen;
             // read from file into new buffer
             //if (ReadFile(hFileHandle, lpDataBuf, dwPacketSize, &dwRead, NULL)) {
-            if (dwRead > dwPacketSize){
+            if (dwRead > dwPacketSize)
+			{
 				memcpy(lpDataBuf,pRead,dwPacketSize);
                 WriterAddExistingNode(pWrite, WRITE_FILE, dwPacketSize, 0, lpDataBuf, hDataHeap, hWndProgress);
 				dwRead -= dwPacketSize;
 				pRead += dwPacketSize;
 			}
-			else{
+			else
+			{
 				memcpy(lpDataBuf,pRead,dwRead);
 				WriterAddExistingNode(pWrite, WRITE_FILE, dwRead, 0, lpDataBuf, hDataHeap, hWndProgress);
 				// eof
 				break;
 			}
+#else
+            DWORD dwRead;
+            // read from file into new buffer
+            if (ReadFile(hFileHandle, lpDataBuf, dwPacketSize, &dwRead, NULL)) 
+			{
+                WriterAddExistingNode(pWrite, WRITE_FILE, dwRead, 0, lpDataBuf, hDataHeap, hWndProgress);
+                if (dwRead != dwPacketSize) // eof
+                    break;
+            }
+#endif
         }
-        else {
+        else 
+		{
             BOOL fRes;
             /*
                 Either the data heap is full, or the writer heap is full.
@@ -1053,16 +1079,17 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
             fAborting = TRUE;
     }
-    if (lpfileBuf) {
+#ifdef __OPTEK_EDIT__
+    if (lpfileBuf) 
+	{
 		BOOL fRes;
-	
         EnterCriticalSection(&gcsDataHeap);
         fRes = HeapFree(hDataHeap, 0, lpfileBuf);
         LeaveCriticalSection(&gcsDataHeap);
         if (!fRes)
             ErrorReporter("HeapFree (Data block)");
     }
-
+#endif
     OutputDebugString("Xfer: Done sending packets.\n");
     if (fAborting) {
@@ -1127,7 +1154,11 @@ DWORD WINAPI TransferThreadProc(LPVOID lpV)
     // If I am done without user intervention, then post the
     // "abort" message myself.  This will cause the main thread to
     // clean up after the file transfer.
+#ifdef __OPTEK_EDIT__
     if ((!fAborting)|| (!userAborting))
+#else
+    if (!fAborting)
+#endif
     {
         PostMessage(ghwndMain, WM_COMMAND, ID_TRANSFER_ABORTSENDING, 0);
 	}
--- a/TTYINFO.H
View file @a01030b
+++ b/TTYINFO.H
View file @a01030b
@@ -14,127 +14,7 @@
 -----------------------------------------------------------------------------*/
-//
-// constant definitions
-//
-//
-// hard coded maximum number of ports
-//
-#define MAXPORTS        32
-
-//
-// terminal size
-//
-#define MAXROWS         50
-#define MAXCOLS         80
-
-//
-// cursor states
-//
-#define CS_HIDE         0x00
-#define CS_SHOW         0x01
-
-//
-// ascii definitions
-//
-#define ASCII_BEL       0x07
-#define ASCII_BS        0x08
-#define ASCII_LF        0x0A
-#define ASCII_CR        0x0D
-#define ASCII_XON       0x11
-#define ASCII_XOFF      0x13
-
-//
-// data structures
-//
-struct TTYInfoStruct
-{
-    HANDLE  hCommPort, hReaderStatus, hWriter ;
-    DWORD   dwEventFlags;
-    CHAR    Screen[MAXCOLS * MAXROWS];
-    CHAR    chFlag, chXON, chXOFF;
-    WORD    wXONLimit, wXOFFLimit;
-    DWORD   fRtsControl;
-    DWORD   fDtrControl;
-    BOOL    fConnected, fTransferring, fRepeating,
-            fLocalEcho, fNewLine,
-            fDisplayErrors, fAutowrap,
-            fCTSOutFlow, fDSROutFlow, fDSRInFlow, 
-            fXonXoffOutFlow, fXonXoffInFlow,
-            fTXafterXoffSent,
-            fNoReading, fNoWriting, fNoEvents, fNoStatus,
-            fDisplayTimeouts;
-    BYTE    bPort, bByteSize, bParity, bStopBits ;
-    DWORD   dwBaudRate ;
-    WORD    wCursorState ;
-    HFONT   hTTYFont ;
-    LOGFONT lfTTYFont ;
-    DWORD   rgbFGColor ;
-    COMMTIMEOUTS timeoutsorig;
-    COMMTIMEOUTS timeoutsnew;
-    int     xSize, ySize, xScroll, yScroll, xOffset, yOffset,
-            nColumn, nRow, xChar, yChar , nCharPos;
-
-} TTYInfo;
-
-//
-// macros ( for easier readability )
-//
-#define COMDEV( x )         (x.hCommPort)
-#define CURSORSTATE( x )    (x.wCursorState)
-#define PORT( x )           (x.bPort)
-#define SCREEN( x )         (x.Screen)
-#define CONNECTED( x )      (x.fConnected)
-#define TRANSFERRING( x )   (x.fTransferring)
-#define REPEATING( x )      (x.fRepeating)
-#define LOCALECHO( x )      (x.fLocalEcho)
-#define NEWLINE( x )        (x.fNewLine)
-#define AUTOWRAP( x )       (x.fAutowrap)
-#define BYTESIZE( x )       (x.bByteSize)
-#define PARITY( x )         (x.bParity)
-#define STOPBITS( x )       (x.bStopBits)
-#define BAUDRATE( x )       (x.dwBaudRate)
-#define HTTYFONT( x )       (x.hTTYFont)
-#define LFTTYFONT( x )      (x.lfTTYFont)
-#define FGCOLOR( x )        (x.rgbFGColor)
-#define XSIZE( x )          (x.xSize)
-#define YSIZE( x )          (x.ySize)
-#define XSCROLL( x )        (x.xScroll)
-#define YSCROLL( x )        (x.yScroll)
-#define XOFFSET( x )        (x.xOffset)
-#define YOFFSET( x )        (x.yOffset)
-#define COLUMN( x )         (x.nColumn)
-#define ROW( x )            (x.nRow)
-#define XCHAR( x )          (x.xChar)
-#define YCHAR( x )          (x.yChar)
-#define DISPLAYERRORS( x )  (x.fDisplayErrors)
-#define TIMEOUTSORIG( x )   (x.timeoutsorig)
-#define TIMEOUTSNEW( x )    (x.timeoutsnew)
-#define WRITERTHREAD( x )   (x.hWriter)
-#define READSTATTHREAD( x ) (x.hReaderStatus)
-#define EVENTFLAGS( x )     (x.dwEventFlags)
-#define FLAGCHAR( x )       (x.chFlag)
-#define SCREENCHAR( x, col, row )   (x.Screen[row * MAXCOLS + col])
-
-#define DTRCONTROL( x )     (x.fDtrControl)
-#define RTSCONTROL( x )     (x.fRtsControl)
-#define XONCHAR( x )        (x.chXON)
-#define XOFFCHAR( x )       (x.chXOFF)
-#define XONLIMIT( x )       (x.wXONLimit)
-#define XOFFLIMIT( x )      (x.wXOFFLimit)
-#define CTSOUTFLOW( x )     (x.fCTSOutFlow)
-#define DSROUTFLOW( x )     (x.fDSROutFlow)
-#define DSRINFLOW( x )      (x.fDSRInFlow)
-#define XONXOFFOUTFLOW( x ) (x.fXonXoffOutFlow)
-#define XONXOFFINFLOW( x )  (x.fXonXoffInFlow)
-#define TXAFTERXOFFSENT(x)  (x.fTXafterXoffSent)
-
-#define NOREADING( x )      (x.fNoReading)
-#define NOWRITING( x )      (x.fNoWriting)
-#define NOEVENTS( x )       (x.fNoEvents)
-#define NOSTATUS( x )       (x.fNoStatus)
-#define SHOWTIMEOUTS( x )   (x.fDisplayTimeouts)
 //---------------------------------------------------------------------------
 //  End of File: ttyinfo.h
--- a/WRITER.C
View file @a01030b
+++ b/WRITER.C
View file @a01030b
@@ -277,7 +277,11 @@ void WriterAbort(PWRITEREQUEST pAbortNode)
 {
     PWRITEREQUEST pCurrent;
     PWRITEREQUEST pNextNode;
+#ifdef __OPTEK_EDIT__
     BOOL fRes = TRUE;
+#else
+    BOOL fRes;
+#endif
     int i = 0;
     char szMessage[30];