Commit fd16a5bca0c07eb12d19683b9a85d681e40cca69

Authored by xiemeng
1 parent db93a804

兼容10以上的端口

Showing 3 changed files with 10 additions and 6 deletions
@@ -373,15 +373,19 @@ HISTORY: Date: Author: Comment: @@ -373,15 +373,19 @@ HISTORY: Date: Author: Comment:
373 -----------------------------------------------------------------------------*/ 373 -----------------------------------------------------------------------------*/
374 HANDLE SetupCommPort() 374 HANDLE SetupCommPort()
375 { 375 {
  376 + int myintPort;
376 // 377 //
377 // get tty settings from settings dialog 378 // get tty settings from settings dialog
378 - // 379 +
  380 + //
379 UpdateTTYInfo(); 381 UpdateTTYInfo();
  382 + myintPort = atoi(gszPort+3);
380 383
381 // 384 //
382 // open communication port handle 385 // open communication port handle
383 // 386 //
384 - COMDEV( TTYInfo ) = CreateFile( gszPort[0], 387 + sprintf(gszPort, "\\\\.\\COM%d", myintPort);///¿ÉÒÔÏÔʾCOM10ÒÔÉ϶˿Ú//add by itas109 2014-01-09
  388 + COMDEV( TTYInfo ) = CreateFile( gszPort,
385 GENERIC_READ | GENERIC_WRITE, 389 GENERIC_READ | GENERIC_WRITE,
386 0, 390 0,
387 0, 391 0,
@@ -571,5 +575,5 @@ BOOL DisconnectOK() @@ -571,5 +575,5 @@ BOOL DisconnectOK()
571 if (!CONNECTED(TTYInfo)) 575 if (!CONNECTED(TTYInfo))
572 return TRUE; 576 return TRUE;
573 577
574 - return ((MessageBox(ghwndMain, "OK to Disconnect?", gszPort[0], MB_YESNO)) == IDYES); 578 + return ((MessageBox(ghwndMain, "OK to Disconnect?", gszPort, MB_YESNO)) == IDYES);
575 } 579 }
@@ -127,7 +127,7 @@ typedef struct STATUS_MESSAGE @@ -127,7 +127,7 @@ typedef struct STATUS_MESSAGE
127 // 127 //
128 // Port name 128 // Port name
129 // 129 //
130 -char gszPort[50][10]; 130 +char gszPort[10];
131 131
132 // 132 //
133 // Writer heap variables 133 // Writer heap variables
@@ -258,7 +258,7 @@ void UpdateTTYInfo() @@ -258,7 +258,7 @@ void UpdateTTYInfo()
258 // 258 //
259 // update globals from dialog settings 259 // update globals from dialog settings
260 // 260 //
261 - GetDlgItemText(ghWndToolbarDlg, IDC_PORTCOMBO, gszPort[0], sizeof(gszPort[0])); 261 + GetDlgItemText(ghWndToolbarDlg, IDC_PORTCOMBO, gszPort, sizeof(gszPort));
262 262
263 BAUDRATE(TTYInfo) = GetdwTTYItem( ghWndToolbarDlg, 263 BAUDRATE(TTYInfo) = GetdwTTYItem( ghWndToolbarDlg,
264 IDC_BAUDCOMBO, 264 IDC_BAUDCOMBO,
@@ -486,7 +486,7 @@ BOOL SettingsDlgInit( HWND hDlg ) @@ -486,7 +486,7 @@ BOOL SettingsDlgInit( HWND hDlg )
486 SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_SETCURSEL, 486 SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_SETCURSEL,
487 (WPARAM) (PORT( TTYInfo ) - 1), 0L ) ; 487 (WPARAM) (PORT( TTYInfo ) - 1), 0L ) ;
488 488
489 - GetDlgItemText(hDlg, IDC_PORTCOMBO, gszPort[0], sizeof(gszPort[0])); 489 + GetDlgItemText(hDlg, IDC_PORTCOMBO, gszPort, sizeof(gszPort));
490 490
491 // 491 //
492 // fill baud combo box and make initial selection 492 // fill baud combo box and make initial selection
Please register or login to post a comment