cac
/
iec103
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复linux下编译错误

Browse Source
main
Matthew 2 years ago
parent 4009682bd8
commit 034d5c5040
10 changed files with 243 additions and 67 deletions
Show Stats Download Patch File Download Diff File

82
basefunc.cpp
Unescape Escape View File

@ -3,25 +3,32 @@
#include <windows.h> #include <windows.h>
#include <direct.h> #include <direct.h>
#include <process.h> #include <process.h>
#else
#include <ctype.h>
#include <unistd.h>
#include <sys/time.h>
#endif #endif
/*#else /*#else
#include <sys/time.h>
#endif*/ #endif*/
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <time.h> #include <time.h>
#include <fcntl.h> #include <fcntl.h>
#include "basefunc.h" #include "basefunc.h"
#include <stdlib.h>
extern char IniFilePath[256]; extern char IniFilePath[256];
void DebugPrint(char *szDebug) void DebugPrint(char *szDebug)
{ {
//#ifdef OS_WINDOWS //#ifdef OS_WINDOWS
#ifdef _WIN32
OutputDebugString((WCHAR*)szDebug); OutputDebugString((WCHAR*)szDebug);
OutputDebugString((WCHAR*)"\n"); OutputDebugString((WCHAR*)"\n");
//#else #else
// printf("%s\n", szDebug); printf("%s\n", szDebug);
//#endif #endif
} }
int CmpString(const u_char *str1, const u_char *str2) int CmpString(const u_char *str1, const u_char *str2)
@ -29,8 +36,8 @@ int CmpString(const u_char *str1, const u_char *str2)
size_t i, len; size_t i, len;
len = strlen((char*)str1); len = strlen((const char*)str1);
if(len != strlen((char*)str2)) if(len != strlen((const char*)str2))
{ {
return 0; return 0;
} }
@ -326,24 +333,22 @@ BOOL GetLocalTimeEx(DAY_TIME *ptrDateTime)
struct tm *tmptr=NULL; struct tm *tmptr=NULL;
time_t tm_t; time_t tm_t;
/*#if OS_LINUX #ifdef _WIN32
SYSTEMTIME sm;
GetLocalTime(&sm);
msec = sm.wMilliseconds;
#else
struct timeval timeval; struct timeval timeval;
gettimeofday(&timeval, NULL); gettimeofday(&timeval, NULL);
msec = timeval.tv_usec/1000; msec = timeval.tv_usec/1000;
#elif OS_WINDOWS*/ #endif
SYSTEMTIME sm;
GetLocalTime(&sm);
msec = sm.wMilliseconds;
/*#else
msec = 0;
#endif*/
tm_t = time(NULL); tm_t = time(NULL);
// ¸ñÁÖÍþÖÎʱ¼ä // ¸ñÁÖÍþÖÎʱ¼ä
//tmptr = gmtime(&tm_t); //tmptr = gmtime(&tm_t);
// ±¾µØʱ¼ä // ±¾µØʱ¼ä
localtime_s(tmptr, &tm_t); tmptr = localtime(&tm_t);
if(!tmptr) if(!tmptr)
{ {
@ -371,7 +376,25 @@ BOOL GetLocalTimeEx(DAY_TIME *ptrDateTime)
//BOOL SetLocalTimeEx(DAY_TIME *ptrDateTime) //BOOL SetLocalTimeEx(DAY_TIME *ptrDateTime)
void SetLocalTimeEx(DAY_TIME *ptrDateTime) void SetLocalTimeEx(DAY_TIME *ptrDateTime)
{ {
#/*if OS_LINUX #ifdef _WIN32
SYSTEMTIME systime;
BOOL bRetVal;
systime.wYear = ptrDateTime->Year;
systime.wMonth = ptrDateTime->Month;
//systime.wDayOfWeek = ptrDateTime->wDayOfWeek;
systime.wDay = ptrDateTime->Day;
systime.wHour = ptrDateTime->Hour;
systime.wMinute = ptrDateTime->Min;
systime.wSecond = ptrDateTime->Sec;
systime.wMilliseconds = ptrDateTime->mSec;
bRetVal = SetLocalTime(&systime);
//if(!bRetVal) return FALSE;
//else return TRUE;
#else
//int ret; //int ret;
//pid_t pid; //pid_t pid;
//char szCmdLine[256]; //char szCmdLine[256];
@ -420,26 +443,7 @@ void SetLocalTimeEx(DAY_TIME *ptrDateTime)
//printf("TIP_(%04d): set time is ok.\n", getpid()); //printf("TIP_(%04d): set time is ok.\n", getpid());
} }
#else */ //windows #endif
SYSTEMTIME systime;
BOOL bRetVal;
systime.wYear = ptrDateTime->Year;
systime.wMonth = ptrDateTime->Month;
//systime.wDayOfWeek = ptrDateTime->wDayOfWeek;
systime.wDay = ptrDateTime->Day;
systime.wHour = ptrDateTime->Hour;
systime.wMinute = ptrDateTime->Min;
systime.wSecond = ptrDateTime->Sec;
systime.wMilliseconds = ptrDateTime->mSec;
bRetVal = SetLocalTime(&systime);
//if(!bRetVal) return FALSE;
//else return TRUE;
//#endif
} }
_int64 SystemTimeToMillseconds(DAY_TIME *lpTime, int i8HourOffset) _int64 SystemTimeToMillseconds(DAY_TIME *lpTime, int i8HourOffset)
@ -475,7 +479,7 @@ void LogRunRecord(char *pstrLogMsg, char *pstrfilename)
DAY_TIME sCurtime; DAY_TIME sCurtime;
char szFileName[256]; char szFileName[256];
//#if OS_WINDOWS #ifdef _WIN32
FILE *fp; FILE *fp;
GetLocalTimeEx(&sCurtime); GetLocalTimeEx(&sCurtime);
@ -504,7 +508,7 @@ void LogRunRecord(char *pstrLogMsg, char *pstrfilename)
fwrite(pstrLogMsg, sizeof(char), strlen(pstrLogMsg)+1, fp); fwrite(pstrLogMsg, sizeof(char), strlen(pstrLogMsg)+1, fp);
fclose(fp); fclose(fp);
} }
/*#else #else
int fp; int fp;
GetLocalTimeEx(&sCurtime); GetLocalTimeEx(&sCurtime);
@ -538,7 +542,7 @@ void LogRunRecord(char *pstrLogMsg, char *pstrfilename)
write(fp, pstrLogMsg, ilen); write(fp, pstrLogMsg, ilen);
close(fp); close(fp);
} }
#endif*/ #endif
} }
BOOL CheckTcpIpAddr(char *addr) BOOL CheckTcpIpAddr(char *addr)

11
basetype.h
Unescape Escape View File

@ -35,6 +35,12 @@ typedef struct tagCMDDEF
u_32 CmdTimerConst; //命令时间间隔 u_32 CmdTimerConst; //命令时间间隔
} CMDDEF, *pCMDDEF; } CMDDEF, *pCMDDEF;
#ifndef _WIN32
typedef long long _int64;
typedef unsigned long long _uint64;
typedef int SOCKET;
#endif
/*#ifndef OS_WINDOWS /*#ifndef OS_WINDOWS
typedef int bool; typedef int bool;
typedef int64_t _int64; typedef int64_t _int64;
@ -59,12 +65,15 @@ typedef struct
#define DSLIB_API #define DSLIB_API
#else*/ #else*/
#ifdef _WIN32
#ifdef DSLIB_EXPORTS #ifdef DSLIB_EXPORTS
#define DSLIB_API __declspec(dllexport) #define DSLIB_API __declspec(dllexport)
#else #else
#define DSLIB_API __declspec(dllimport) #define DSLIB_API __declspec(dllimport)
#endif// DSLIB_EXPORTS #endif// DSLIB_EXPORTS
#else
#define DSLIB_API
#endif
#pragma pack (push,1) #pragma pack (push,1)
typedef struct typedef struct
{ {

15
buban103.cpp
Unescape Escape View File

@ -7,12 +7,18 @@
#include "baohulib/commport.h" #include "baohulib/commport.h"
#include "baohulib/serialport.h" #include "baohulib/serialport.h"
#else*/ #else*/
#include "common.h"
#include "commport.h" #include "commport.h"
#include "udpcomm.h" #include "udpcomm.h"
#include "display.h" #include "display.h"
//#endif //#endif
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include <stdlib.h>
#ifndef _WIN32
#include <sys/types.h>
#include <unistd.h>
#endif
#include "buban103.h" #include "buban103.h"
#include "scadaprotect.h" #include "scadaprotect.h"
@ -111,8 +117,13 @@ void Buban103ReadConfig(int commid)
if(!SioParam[commid].ExtInfo) if(!SioParam[commid].ExtInfo)
{ {
#ifdef _WIN32
sprintf(szbuf, "WARN(%04d): commid_%02d ExtInfo=malloc(%d) failed.\n", sprintf(szbuf, "WARN(%04d): commid_%02d ExtInfo=malloc(%d) failed.\n",
_getpid(), commid, sizeof(BUBAN103PORTPARAM)); _getpid(), commid, sizeof(BUBAN103PORTPARAM));
#else
sprintf(szbuf, "WARN(%04d): commid_%02d ExtInfo=malloc(%d) failed.\n",
getpid(), commid, sizeof(BUBAN103PORTPARAM));
#endif
DebugPrint(szbuf); DebugPrint(szbuf);
return; return;
} }
@ -509,7 +520,11 @@ void Buban103YkYtProcess(int commid, u_char *buf, int len) // ң
YkYtParam.m_iYkYtUpDown = YKYT_SEND_UP; YkYtParam.m_iYkYtUpDown = YKYT_SEND_UP;
YkYtParam.m_iYkYtOperate = buf[9]; YkYtParam.m_iYkYtOperate = buf[9];
SendYkYtCommand2(commid, &YkYtParam); SendYkYtCommand2(commid, &YkYtParam);
#ifdef _WIN32
sprintf(szbuf, "WARN(%04d): ת·¢Ò£¿ØÔ¤ÁУ³É¹¦.\n", _getpid()); sprintf(szbuf, "WARN(%04d): ת·¢Ò£¿ØÔ¤ÁУ³É¹¦.\n", _getpid());
#else
sprintf(szbuf, "WARN(%04d): 转发遥控预令反校成功.\n", getpid());
#endif
DebugPrint(szbuf); DebugPrint(szbuf);
return; return;
} }

45
buban104.cpp
Unescape Escape View File

@ -3,9 +3,13 @@
//* aaawen 2005.09.14 * //* aaawen 2005.09.14 *
//*************************************************************** //***************************************************************
//_DEBUG_MSG_,_OS_WINDOWS_DEBUG_ //_DEBUG_MSG_,_OS_WINDOWS_DEBUG_
#ifdef OS_LINUX #ifndef _WIN32
#include "baohulib/commport.h" #include <sys/types.h>
#include "baohulib/serialport.h" #include <unistd.h>
#include "commport.h"
// #include "baohulib/serialport.h"
#else #else
#include "commport.h" #include "commport.h"
#include "udpcomm.h" #include "udpcomm.h"
@ -13,6 +17,7 @@
#endif #endif
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include <stdlib.h>
#include "buban101.h" #include "buban101.h"
#include "buban104.h" #include "buban104.h"
#include "scadaprotect.h" #include "scadaprotect.h"
@ -221,7 +226,7 @@ void Buban104RecvData(int commid, u_char *buf, int len)//
Buban104ProcessData(commid, pPortParam, TRUE); Buban104ProcessData(commid, pPortParam, TRUE);
pPortParam->m_psBaoHu->m_iRevStatus = 0; pPortParam->m_psBaoHu->m_iRevStatus = 0;
pPortParam->m_psBaoHu->RevCmdFlag = 1; pPortParam->m_psBaoHu->RevCmdFlag = 1;
#ifndef OS_LINUX #ifdef _WIN32
if((GetCurPort() == commid) && IsRealDataDisp()) if((GetCurPort() == commid) && IsRealDataDisp())
{ {
WatchDataPutDispBuf(commid, SDS_SIO_RECV_DATA, WatchDataPutDispBuf(commid, SDS_SIO_RECV_DATA,
@ -234,7 +239,7 @@ void Buban104RecvData(int commid, u_char *buf, int len)//
default: default:
if(buf[i] == 0x68) if(buf[i] == 0x68)
{ {
#ifndef OS_LINUX #ifdef _WIN32
// wen 2004.11.22 Ôö¼ÓÏÔʾ // wen 2004.11.22 Ôö¼ÓÏÔʾ
if((GetCurPort() == commid) && IsRealDataDisp()) if((GetCurPort() == commid) && IsRealDataDisp())
{ {
@ -253,7 +258,7 @@ void Buban104RecvData(int commid, u_char *buf, int len)//
pPortParam->m_au8RecvBuf[pPortParam->m_iRecvLen++] = buf[i]; pPortParam->m_au8RecvBuf[pPortParam->m_iRecvLen++] = buf[i];
if(pPortParam->m_iRecvLen > 200) if(pPortParam->m_iRecvLen > 200)
{ {
#ifndef OS_LINUX #ifdef _WIN32
// wen 2004.11.22 Ôö¼ÓÏÔʾ // wen 2004.11.22 Ôö¼ÓÏÔʾ
if((GetCurPort() == commid) && IsRealDataDisp()) if((GetCurPort() == commid) && IsRealDataDisp())
{ {
@ -1049,8 +1054,13 @@ void MakeBuBan104YkYtCommand( u_32 commid, u_char *buf, int len )
if(ShmGetDispYkYtFlag()) if(ShmGetDispYkYtFlag())
{ {
#ifdef _WIN32
printf("TIP_(%04d): commid =%d ykytpnt=%d, op=%d checked.\n", printf("TIP_(%04d): commid =%d ykytpnt=%d, op=%d checked.\n",
_getpid(), commid, ykpoint, (buf[9] & 0x7F)); _getpid(), commid, ykpoint, (buf[9] & 0x7F));
#else
printf("TIP_(%04d): commid =%d ykytpnt=%d, op=%d checked.\n",
getpid(), commid, ykpoint, (buf[9] & 0x7F));
#endif
} }
} }
@ -1394,7 +1404,7 @@ void Buban104SendCmdFormPollCmdBuf(int commid)
return; return;
} }
#ifndef OS_LINUX #ifdef _WIN32
if(isUdpSocketExist() == TRUE) if(isUdpSocketExist() == TRUE)
#endif #endif
{ {
@ -1430,7 +1440,7 @@ void Buban104SendCmdFormPollCmdBuf(int commid)
pPortParam->m_psBaoHu->RetryTimeCnt = 0; pPortParam->m_psBaoHu->RetryTimeCnt = 0;
} }
#ifdef OS_LINUX #ifndef _WIN32
if(pPortParam->m_psBaoHu->LastGetCmdBuf == FAST_CMD_TYPE) if(pPortParam->m_psBaoHu->LastGetCmdBuf == FAST_CMD_TYPE)
#else #else
if((pPortParam->m_psBaoHu->LastGetCmdBuf == FAST_CMD_TYPE) if((pPortParam->m_psBaoHu->LastGetCmdBuf == FAST_CMD_TYPE)
@ -2738,8 +2748,13 @@ void Buban104AiWithDataProcessWithM_ME_TD_1(RTUMSG * rtumsg)
{ {
if( ( i + istep ) > (2 + len)) if( ( i + istep ) > (2 + len))
{ {
#ifdef _WIN32
sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104AiWithDataProcessWithM_ME_TD_1", sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104AiWithDataProcessWithM_ME_TD_1",
_getpid(), commid, len); _getpid(), commid, len);
#else
sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104AiWithDataProcessWithM_ME_TD_1",
getpid(), commid, len);
#endif
DebugPrint(szbuf); DebugPrint(szbuf);
break; break;
} }
@ -2799,8 +2814,13 @@ void Buban104AiWithDataProcessWithM_ME_TF_1(RTUMSG * rtumsg)
{ {
if( ( i + istep ) > (2 + len)) if( ( i + istep ) > (2 + len))
{ {
#ifdef _WIN32
sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104AiWithDataProcessWithM_ME_TF_1", sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104AiWithDataProcessWithM_ME_TF_1",
_getpid(), commid, len); _getpid(), commid, len);
#else
sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104AiWithDataProcessWithM_ME_TF_1",
getpid(), commid, len);
#endif
DebugPrint(szbuf); DebugPrint(szbuf);
break; break;
} }
@ -2860,8 +2880,13 @@ void Buban104PiWithTimeDataProcessWithM_IT_TB_1(RTUMSG *rtumsg)
{ {
if( ( i + istep ) > (2 + len)) if( ( i + istep ) > (2 + len))
{ {
#ifdef _WIN32
sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104PiWithTimeDataProcessWithM_IT_TB_1", sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104PiWithTimeDataProcessWithM_IT_TB_1",
_getpid(), commid, len); _getpid(), commid, len);
#else
sprintf(szbuf, ">>>>>WARN(%04d): Commid_%02d (iLen=%d) is not enough in Buban104PiWithTimeDataProcessWithM_IT_TB_1",
getpid(), commid, len);
#endif
DebugPrint(szbuf); DebugPrint(szbuf);
break; break;
} }
@ -4045,7 +4070,11 @@ void ProvBuban104YkYtData(int commid, RTUMSG *rtumsg)
if(ShmGetDispYkYtFlag()) if(ShmGetDispYkYtFlag())
{ {
#ifdef _WIN32
printf("TIP_(%04d): commid =%d recv ykyt select.\n", _getpid(), commid); printf("TIP_(%04d): commid =%d recv ykyt select.\n", _getpid(), commid);
#else
printf("TIP_(%04d): commid =%d recv ykyt select.\n", getpid(), commid);
#endif
} }
ykytpnt -= pPortParam->iYkBaseAddr; ykytpnt -= pPortParam->iYkBaseAddr;

6
chainlist.cpp
Unescape Escape View File

@ -4,11 +4,17 @@
//*************************************************************** //***************************************************************
//#ifdef OS_WINDOWS //#ifdef OS_WINDOWS
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32
#include <process.h> #include <process.h>
#else
#include <sys/types.h>
#include <unistd.h>
#endif
//#endif //#endif
#include <memory.h> #include <memory.h>
#include <stdlib.h> #include <stdlib.h>
#include "chainlist.h" #include "chainlist.h"
#include "common.h"
#include "basefunc.h" #include "basefunc.h"
#include "os_heap.h" #include "os_heap.h"

30
common.h
Unescape Escape View File

@ -10,15 +10,27 @@
#ifndef __COMMON_H_ICL__ #ifndef __COMMON_H_ICL__
#define __COMMON_H_ICL__ #define __COMMON_H_ICL__
#ifdef _WIN32
#ifdef _DEBUG
// #define _OS_WINDOWS_DEBUG_
#else // _DEBUG
#define _OS_WINDOWS_
#endif // _DEBUG
#include <windows.h> #include <windows.h>
#include <winsock.h> #include <winsock.h>
#include <dos.h> #include <dos.h>
#include <direct.h>
#include <sys/timeb.h>
#include <process.h>
#else
#include <sys/time.h>
#include <netinet/in.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <direct.h>
#include <time.h> #include <time.h>
#include <sys\timeb.h>
#include <process.h>
//#include "menu.h" //#include "menu.h"
@ -77,7 +89,19 @@ typedef u_char BYTE;
typedef u_short WORD; typedef u_short WORD;
typedef u_long DWORD; typedef u_long DWORD;
#ifndef _WIN32
typedef unsigned long long ULONG_PTR, *PULONG_PTR;
typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
#define LOWORD(l) ((WORD)(((DWORD_PTR)(l)) & 0xffff))
#define HIWORD(l) ((WORD)((((DWORD_PTR)(l)) >> 16) & 0xffff))
#define LOBYTE(w) ((BYTE)(((DWORD_PTR)(w)) & 0xff))
#define HIBYTE(w) ((BYTE)((((DWORD_PTR)(w)) >> 8) & 0xff))
#define _getpid getpid
#define _stricmp strcasecmp
#define Sleep(x) usleep(1000*x)
#endif
#define BYTE3(a) (((a)&0xff)<<24) #define BYTE3(a) (((a)&0xff)<<24)
#define BYTE2(a) (((a)&0xff)<<16) #define BYTE2(a) (((a)&0xff)<<16)
#define BYTE1(a) (((a)&0xff)<<8) #define BYTE1(a) (((a)&0xff)<<8)

109
commport.cpp
Unescape Escape View File

@ -14,7 +14,16 @@
#include "udpping.h" #include "udpping.h"
#include "tcphost.h" #include "tcphost.h"
#include "netport.h" #include "netport.h"
#ifdef _WIN32
#include <winsock.h> #include <winsock.h>
#else
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <math.h>
#endif
//#include "..\confrwlib\confrw.h" //#include "..\confrwlib\confrw.h"
#define MAX_STRING_LEN 512 #define MAX_STRING_LEN 512
@ -658,7 +667,7 @@ void ReadPortConfigInfo(u_short netport)
sprintf(szbuf, "%02d_%02d:%02d:%02d.%03d 初始化端口%d... ...\n", sm.wDay, sm.wHour, sprintf(szbuf, "%02d_%02d:%02d:%02d.%03d 初始化端口%d... ...\n", sm.wDay, sm.wHour,
sm.wMinute, sm.wSecond, sm.wMilliseconds, i+1); sm.wMinute, sm.wSecond, sm.wMilliseconds, i+1);
OutputDebugString((LPCWSTR)szbuf); OutputDebugString((LPCWSTR)szbuf);
#elif _OS_WINDOWS_DEBUG_ #elif _DEBUG
printf("初始化端口%d... ...\n", i+1); printf("初始化端口%d... ...\n", i+1);
#endif #endif
@ -2375,8 +2384,6 @@ void BaohuLibMain(int netportnum)
int msec, tmp1, tmp2; int msec, tmp1, tmp2;
static int systimecnt = 0; static int systimecnt = 0;
SYSTEMTIME stm;
if (InitBaohuLibMainFlag == 0) if (InitBaohuLibMainFlag == 0)
{ {
systimecnt = 0; systimecnt = 0;
@ -2392,15 +2399,15 @@ void BaohuLibMain(int netportnum)
//msec = (msec + TIMER_CNT) % 1000; //msec = (msec + TIMER_CNT) % 1000;
GetLocalTime(&stm); struct tm* ptm = localtime(NULL);
DayTime.Year = stm.wYear; DayTime.Year = ptm->tm_year + 1900;
DayTime.Month = (stm.wMonth & 0xff); DayTime.Month = ptm->tm_mon + 1;
DayTime.Day = (stm.wDay & 0xff); DayTime.Day = ptm->tm_mday;
DayTime.Hour = stm.wHour & 0xff; DayTime.Hour = ptm->tm_hour;
DayTime.Min = stm.wMinute & 0xff; DayTime.Min = ptm->tm_min;
DayTime.Sec = stm.wSecond & 0xff; DayTime.Sec = ptm->tm_sec;
DayTime.mSec = stm.wMilliseconds; DayTime.mSec = 0;
Sleep(100); Sleep(100);
// 网络端口写 // 网络端口写
//SetUdpRecv(); //SetUdpRecv();
@ -2419,9 +2426,9 @@ void BaohuLibMain(int netportnum)
//CreatUdpSetSock(); //CreatUdpSetSock();
OpenAllPort(); OpenAllPort();
if (stm.wSecond == 0) if (ptm->tm_sec == 0)
{ {
tmp2 = stm.wMinute * 60; tmp2 = ptm->tm_min * 60;
tmp1 = tmp2 - systimecnt; tmp1 = tmp2 - systimecnt;
if (tmp1 < 0) if (tmp1 < 0)
tmp1 += 3600; tmp1 += 3600;
@ -2913,25 +2920,31 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
//SioParam[commid].PortType = PROTOCOL_MASTER; //SioParam[commid].PortType = PROTOCOL_MASTER;
if (pBaohuParam->AiPtr) if (pBaohuParam->AiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->AiPtr); _getpid(), commid + 1, pBaohuParam->AiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->AiPtr); free(pBaohuParam->AiPtr);
} }
if (pBaohuParam->DiPtr) if (pBaohuParam->DiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->DiPtr); _getpid(), commid + 1, pBaohuParam->DiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->DiPtr); free(pBaohuParam->DiPtr);
} }
if (pBaohuParam->PiPtr) if (pBaohuParam->PiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->PiPtr); _getpid(), commid + 1, pBaohuParam->PiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->PiPtr); free(pBaohuParam->PiPtr);
} }
@ -2947,9 +2960,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(AI_DEF)*pBaohuParam->AiNum); _getpid(), commid + 1, sizeof(AI_DEF)*pBaohuParam->AiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->AiNum = 0; pBaohuParam->AiNum = 0;
} }
} }
@ -2971,9 +2986,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(DI_DEF)*pBaohuParam->DiNum); _getpid(), commid + 1, sizeof(DI_DEF)*pBaohuParam->DiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->DiNum = 0; pBaohuParam->DiNum = 0;
} }
@ -2996,9 +3013,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n",
_getpid(), commid, sizeof(PI_DEF)*pBaohuParam->PiNum); _getpid(), commid, sizeof(PI_DEF)*pBaohuParam->PiNum);
OutputDebugString((LPCWSTR)szDebugInfo + 1); OutputDebugString((LPCWSTR)szDebugInfo + 1);
#endif
pBaohuParam->PiNum = 0; pBaohuParam->PiNum = 0;
} }
} }
@ -3099,9 +3118,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
case PROTOCOL_SLAVE: case PROTOCOL_SLAVE:
if ((ProvPortCnt+1) > MAX_PROV_PORT_NUM) if ((ProvPortCnt+1) > MAX_PROV_PORT_NUM)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "WARN(%04d): commid_%02d is error, the Prov Port is over !!!\n", sprintf(szDebugInfo, "WARN(%04d): commid_%02d is error, the Prov Port is over !!!\n",
_getpid(), commid + 1); _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
break; break;
} }
ProvPortCnt++; ProvPortCnt++;
@ -3109,33 +3130,41 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
if (pBaohuParam->AiPtr) if (pBaohuParam->AiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->AiPtr); _getpid(), commid + 1, pBaohuParam->AiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->AiPtr); free(pBaohuParam->AiPtr);
} }
if (pBaohuParam->DiPtr) if (pBaohuParam->DiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->DiPtr); _getpid(), commid + 1, pBaohuParam->DiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->DiPtr); free(pBaohuParam->DiPtr);
} }
if (pBaohuParam->PiPtr) if (pBaohuParam->PiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->PiPtr); _getpid(), commid + 1, pBaohuParam->PiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->PiPtr); free(pBaohuParam->PiPtr);
} }
if(pBaohuParam->ProvSoeBuf.ptrProvSoe) if(pBaohuParam->ProvSoeBuf.ptrProvSoe)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(soeptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(soeptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->ProvSoeBuf.ptrProvSoe); _getpid(), commid + 1, pBaohuParam->ProvSoeBuf.ptrProvSoe);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->ProvSoeBuf.ptrProvSoe); free(pBaohuParam->ProvSoeBuf.ptrProvSoe);
} }
@ -3151,9 +3180,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(PROV_AI_PNT)*pBaohuParam->AiNum); _getpid(), commid + 1, sizeof(PROV_AI_PNT)*pBaohuParam->AiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->AiNum = 0; pBaohuParam->AiNum = 0;
} }
} }
@ -3174,9 +3205,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(PROV_DI_PNT)*pBaohuParam->DiNum); _getpid(), commid + 1, sizeof(PROV_DI_PNT)*pBaohuParam->DiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->DiNum = 0; pBaohuParam->DiNum = 0;
} }
@ -3189,9 +3222,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d soeptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d soeptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(SOE_DEF)*MAX_PROV_SOE); _getpid(), commid + 1, sizeof(SOE_DEF)*MAX_PROV_SOE);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
} }
else else
@ -3212,9 +3247,11 @@ void PortMemoryMalloc(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(PROV_PI_PNT)*pBaohuParam->PiNum); _getpid(), commid + 1, sizeof(PROV_PI_PNT)*pBaohuParam->PiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->PiNum = 0; pBaohuParam->PiNum = 0;
} }
} }
@ -3437,25 +3474,31 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
//SioParam[commid].PortType = PROTOCOL_MASTER; //SioParam[commid].PortType = PROTOCOL_MASTER;
if (pBaohuParam->AiPtr) if (pBaohuParam->AiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->AiPtr); _getpid(), commid + 1, pBaohuParam->AiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->AiPtr); free(pBaohuParam->AiPtr);
} }
if (pBaohuParam->DiPtr) if (pBaohuParam->DiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->DiPtr); _getpid(), commid + 1, pBaohuParam->DiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->DiPtr); free(pBaohuParam->DiPtr);
} }
if (pBaohuParam->PiPtr) if (pBaohuParam->PiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->PiPtr); _getpid(), commid + 1, pBaohuParam->PiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->PiPtr); free(pBaohuParam->PiPtr);
} }
@ -3471,9 +3514,11 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(AI_DEF)*pBaohuParam->AiNum); _getpid(), commid + 1, sizeof(AI_DEF)*pBaohuParam->AiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->AiNum = 0; pBaohuParam->AiNum = 0;
} }
} }
@ -3495,9 +3540,11 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(DI_DEF)*pBaohuParam->DiNum); _getpid(), commid + 1, sizeof(DI_DEF)*pBaohuParam->DiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->DiNum = 0; pBaohuParam->DiNum = 0;
} }
@ -3520,9 +3567,11 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(PI_DEF)*pBaohuParam->PiNum); _getpid(), commid + 1, sizeof(PI_DEF)*pBaohuParam->PiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->PiNum = 0; pBaohuParam->PiNum = 0;
} }
} }
@ -3536,42 +3585,52 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
case PROTOCOL_SLAVE: case PROTOCOL_SLAVE:
if ((ProvPortCnt+1) > MAX_PROV_PORT_NUM) if ((ProvPortCnt+1) > MAX_PROV_PORT_NUM)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "WARN(%04d): commid_%02d is error, the Prov Port is over !!!\n", sprintf(szDebugInfo, "WARN(%04d): commid_%02d is error, the Prov Port is over !!!\n",
_getpid(), commid + 1); _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
break; break;
} }
ProvPortCnt++; ProvPortCnt++;
if (pBaohuParam->AiPtr) if (pBaohuParam->AiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(aiptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->AiPtr); _getpid(), commid + 1, pBaohuParam->AiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->AiPtr); free(pBaohuParam->AiPtr);
} }
if (pBaohuParam->DiPtr) if (pBaohuParam->DiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(diptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->DiPtr); _getpid(), commid + 1, pBaohuParam->DiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->DiPtr); free(pBaohuParam->DiPtr);
} }
if (pBaohuParam->PiPtr) if (pBaohuParam->PiPtr)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(piptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->PiPtr); _getpid(), commid + 1, pBaohuParam->PiPtr);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->PiPtr); free(pBaohuParam->PiPtr);
} }
if(pBaohuParam->ProvSoeBuf.ptrProvSoe) if(pBaohuParam->ProvSoeBuf.ptrProvSoe)
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(soeptr=0x%08x).\n", sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free(soeptr=0x%08x).\n",
_getpid(), commid + 1, pBaohuParam->ProvSoeBuf.ptrProvSoe); _getpid(), commid + 1, pBaohuParam->ProvSoeBuf.ptrProvSoe);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
free(pBaohuParam->ProvSoeBuf.ptrProvSoe); free(pBaohuParam->ProvSoeBuf.ptrProvSoe);
} }
@ -3587,9 +3646,11 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d aiptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(PROV_AI_PNT)*pBaohuParam->AiNum); _getpid(), commid + 1, sizeof(PROV_AI_PNT)*pBaohuParam->AiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->AiNum = 0; pBaohuParam->AiNum = 0;
} }
} }
@ -3610,9 +3671,11 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d diptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(PROV_DI_PNT)*pBaohuParam->DiNum); _getpid(), commid + 1, sizeof(PROV_DI_PNT)*pBaohuParam->DiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->DiNum = 0; pBaohuParam->DiNum = 0;
} }
@ -3625,9 +3688,11 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d soeptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d soeptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(SOE_DEF)*MAX_PROV_SOE); _getpid(), commid + 1, sizeof(SOE_DEF)*MAX_PROV_SOE);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
} }
else else
@ -3648,9 +3713,11 @@ void PortMemoryMallocEx(int commid, int type, SIO_PARAM_BAOHU_DEF *pBaohuParam)
} }
else else
{ {
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n", sprintf(szDebugInfo, "ERR_(%04d): commid_%02d piptr=malloc(%d) is failed.\n",
_getpid(), commid + 1, sizeof(PROV_PI_PNT)*pBaohuParam->PiNum); _getpid(), commid + 1, sizeof(PROV_PI_PNT)*pBaohuParam->PiNum);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
pBaohuParam->PiNum = 0; pBaohuParam->PiNum = 0;
} }
} }
@ -4009,41 +4076,53 @@ void PortMemoryFree(int commid, SIO_PARAM_DEF *pGenParam)
if (pGenParam->m_psBaoHu->AiPtr) if (pGenParam->m_psBaoHu->AiPtr)
{ {
free(pGenParam->m_psBaoHu->AiPtr); free(pGenParam->m_psBaoHu->AiPtr);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free ai memory.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free ai memory.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
if (pGenParam->m_psBaoHu->DiPtr) if (pGenParam->m_psBaoHu->DiPtr)
{ {
free(pGenParam->m_psBaoHu->DiPtr); free(pGenParam->m_psBaoHu->DiPtr);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free di memory.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free di memory.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
if (pGenParam->m_psBaoHu->PiPtr) if (pGenParam->m_psBaoHu->PiPtr)
{ {
free(pGenParam->m_psBaoHu->PiPtr); free(pGenParam->m_psBaoHu->PiPtr);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free pi memory.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free pi memory.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
if(pGenParam->m_psBaoHu->ProvSoeBuf.ptrProvSoe) if(pGenParam->m_psBaoHu->ProvSoeBuf.ptrProvSoe)
{ {
free(pGenParam->m_psBaoHu->ProvSoeBuf.ptrProvSoe); free(pGenParam->m_psBaoHu->ProvSoeBuf.ptrProvSoe);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free ProvSoe memory.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free ProvSoe memory.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
free(pGenParam->m_psBaoHu); free(pGenParam->m_psBaoHu);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free psBaohu memory.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free psBaohu memory.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
if (pGenParam->m_psSerial) if (pGenParam->m_psSerial)
{ {
free(pGenParam->m_psSerial); free(pGenParam->m_psSerial);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free psSerial memory.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free psSerial memory.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
if (pGenParam->ExtInfo) if (pGenParam->ExtInfo)
@ -4052,14 +4131,18 @@ void PortMemoryFree(int commid, SIO_PARAM_DEF *pGenParam)
if (FunCallPtr[SioParam[commid].ProtocolIdx].ProtocolExit) if (FunCallPtr[SioParam[commid].ProtocolIdx].ProtocolExit)
{ {
FunCallPtr[SioParam[commid].ProtocolIdx].ProtocolExit(commid); FunCallPtr[SioParam[commid].ProtocolIdx].ProtocolExit(commid);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d Protocol Exit.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d Protocol Exit.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
HEAP_FREE(pGenParam->ExtInfo); HEAP_FREE(pGenParam->ExtInfo);
//free(pGenParam->ExtInfo); //free(pGenParam->ExtInfo);
#ifdef _OS_WINDOWS_DEBUG_
sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free ExtInfo memory.\n", _getpid(), commid + 1); sprintf(szDebugInfo, "TIP_(%04d): commid_%02d free ExtInfo memory.\n", _getpid(), commid + 1);
OutputDebugString((LPCWSTR)szDebugInfo); OutputDebugString((LPCWSTR)szDebugInfo);
#endif
} }
PortWriteDataFree(commid); PortWriteDataFree(commid);

6
confrw.h
Unescape Escape View File

@ -21,15 +21,15 @@
//#include <util/util.h> //#include <util/util.h>
#include "confrw_errno.h" #include "confrw_errno.h"
#ifdef OS_LINUX #ifndef _WIN32
#define DSLIB_API #define CONFRWLIB_API
#else #else
#ifdef CONFRWLIB_EXPORTS #ifdef CONFRWLIB_EXPORTS
#define CONFRWLIB_API __declspec(dllexport) #define CONFRWLIB_API __declspec(dllexport)
#else #else
#define CONFRWLIB_API __declspec(dllimport) #define CONFRWLIB_API __declspec(dllimport)
#endif// CONFRWLIB_EXPORTS #endif// CONFRWLIB_EXPORTS
#endif//OS_LINUX #endif// _WIN32
/*! /*!
* \if by_group * \if by_group

3
display.cpp
Unescape Escape View File

@ -19,6 +19,7 @@ int DispType = 0;
int ListIndex = 0; // 显示序号索引起始 int ListIndex = 0; // 显示序号索引起始
int ItemNumOfPage; // 页显示项目数 int ItemNumOfPage; // 页显示项目数
#ifdef _WIN32
COLORREF dwColorVal[16] = // 显示颜色定义 COLORREF dwColorVal[16] = // 显示颜色定义
{ {
@ -564,6 +565,8 @@ void CaculateWH( HDC hdc, UINT *xWidth, UINT *yHeight, char *szStr )
*yHeight = rc.bottom - rc.top; *yHeight = rc.bottom - rc.top;
} }
#endif
//**************************************************************** //****************************************************************
//* 显示数据上页? * //* 显示数据上页? *
//**************************************************************** //****************************************************************

3
display.h
Unescape Escape View File

@ -27,6 +27,7 @@
#define WATCH_DATA_DISP 8 #define WATCH_DATA_DISP 8
#ifdef _WIN32
void RealAiDataDisp( HDC hdc ); void RealAiDataDisp( HDC hdc );
void RealDiDataDisp( HDC hdc ); void RealDiDataDisp( HDC hdc );
void RealPiDataDisp( HDC hdc ); void RealPiDataDisp( HDC hdc );
@ -40,6 +41,8 @@ HFONT NewFont( int nFSize );
void CaculateWH( HDC hdc, UINT *xWidth, UINT *yHeight, char *szStr ); void CaculateWH( HDC hdc, UINT *xWidth, UINT *yHeight, char *szStr );
#endif
void PageUp( void ); void PageUp( void );
void PageDown( void ); void PageDown( void );
void PageHome( void ); void PageHome( void );

Write Preview
Loading…
Cancel
Save