1、合并master与2021.1

PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/CMMIO_SERIAL.H

@@ -112,6 +112,7 @@ public:
   DWORD ReadPort( CString &Buffer, DWORD Bytes );
   // Attempt to write the specified number of bytes
   DWORD WritePort( const char *Buffer, DWORD Bytes );
+  DWORD SendWriteFile(const char *Buffer, DWORD Bytes);
   // Send the specifed number of bytes out when possible
   int Transmit( const char *Buffer, DWORD Bytes );
   // Add a block of data to the internal list of receieved blocks
@@ -141,7 +142,7 @@ private:
   void SendBuffer(int Next);
   void ReceiveTask(void);
   int ProgramPort(int Port,int Baud,char Parity,int Bits,int StopBits,int HandShake);
-
+  int ReadBlock(BYTE *abIn, int MaxLength);
   // Attributes
 protected:
   int m_RXTimeout;
@@ -188,7 +189,8 @@ public:
   //	CRITICAL_SECTION m_QueueLock;
   BOOL m_iRecvState;
   INT m_iRecvBytes;
-  char m_RecvData[MAX_RECIEVE_BUFFER_SIZE];
+  INT m_iRecvCount;
+  unsigned char m_RecvData[MAX_RECIEVE_BUFFER_SIZE];
 };
 
 #endif // CMMIO_SERIAL_H