diff --git a/CC_TDSet_Signature.cpp b/CC_TDSet_Signature.cpp index 50587c0..e29fe17 100644 --- a/CC_TDSet_Signature.cpp +++ b/CC_TDSet_Signature.cpp @@ -191,9 +191,9 @@ BOOL CC_TDSet_Signature::OnInitDialog() #ifdef SMSMANAGER_KF //m_wndList.SetHeadings(_T("序号,80; 平台,80;客户类型,100;充值类型,100;企业ID,100; 企业名称,220; 出单人,100;充值方式,150;充值金额,120;预开票,70;充值时间,180;收款时间,180; 发票,150;发票状态,100;开票时间,180;发票号码,120;客户经理,120; 代理商,180;")); - m_wndList.SetHeadings(_T("序号,80; 通道,200; 端口号,200; 签名 ,160; 状态,100;操作类型,120; 错误提示,300; 添加时间,180; 更新时间,180; 审核时间,180;")); + m_wndList.SetHeadings(_T("序号,80; 通道,200; 端口号,200; 签名 ,160; 状态,100;发送量,90;操作类型,120; 错误提示,300; 添加时间,180; 更新时间,180; 审核时间,180;")); #else - m_wndList.SetHeadings(_T("序号,80; 通道,200; 端口号,200; 签名 ,160; 企业名称,300; 状态,120;操作类型,120; 错误提示,300; 添加时间,180; 更新时间,180; 审核时间,180;")); + m_wndList.SetHeadings(_T("序号,80; 通道,200; 端口号,200; 签名 ,160; 企业名称,300; 状态,100;发送量,90操作类型,120; 错误提示,300; 添加时间,180; 更新时间,180; 审核时间,180;")); #endif m_bInit = true; @@ -605,7 +605,7 @@ BOOL CC_TDSet_Signature::ShowDataInList(long lItem, ANS_TD2Signature_Data* pData int iIndex = 1; int iIconIndex = 0; - //m_wndList.SetHeadings(_T("序号,80; 通道,150; 端口号,120; 签名 ,150; 企业名称,200; 状态,100;操作类型,100; 错误提示,200; 添加时间,150; 更新时间,150; 修改时间,150;")); + //m_wndList.SetHeadings(_T("序号,80; 通道,150; 端口号,120; 签名 ,150; 企业名称,200; 状态,100;发送量,100;操作类型,100; 错误提示,200; 添加时间,150; 更新时间,150; 修改时间,150;")); m_wndList.SetItemText(lItem, iIndex++, GetTD2SignatureTitle(pData->iTDID,m_TitleData)); //通道名称 m_wndList.SetItemText(lItem, iIndex++, pData->szSmsNum); //端口号 @@ -615,6 +615,8 @@ BOOL CC_TDSet_Signature::ShowDataInList(long lItem, ANS_TD2Signature_Data* pData #endif m_lStatusCount = iIndex; m_wndList.SetItemText(lItem, iIndex++, GetTD2SiggnatureStatus(pData->iStatus)); //状态 + str.Format(_T("%d"), pData->iSendCount); + m_wndList.SetItemText(lItem, iIndex++, str); m_wndList.SetItemText(lItem, iIndex++, GetTD2SiggnatureOperType(pData->iOperType)); //操作类型 str = pData->szerrType; if (str.GetLength() <= 0) @@ -663,7 +665,7 @@ void CC_TDSet_Signature::ShowRMenu() if (lItem >= 0) { POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos >= 0) + if ((LONG_PTR)pos >= 0) { pData = m_ListData.GetNext(pos); } @@ -688,7 +690,7 @@ void CC_TDSet_Signature::ShowRMenu() MenuModifyStatus.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_MODIFY_STATUS_5, _T(" 5-上传失败 (标记为不可用) ")); - menu.AppendMenu(MF_STRING | MF_POPUP, (UINT)MenuModifyStatus.GetSafeHmenu(), _T(" 修改状态 ")); + menu.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)MenuModifyStatus.GetSafeHmenu(), _T(" 修改状态 ")); menu.AppendMenu(MF_SEPARATOR); } @@ -703,16 +705,16 @@ void CC_TDSet_Signature::ShowRMenu() CMenu MenuCopy; MenuCopy.CreatePopupMenu(); - MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_0, _T(" 端口号+签名 ")); - MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_1, _T(" 端口号+签名+错误信息 ")); - MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_2, _T(" 端口号+签名+企业名称 ")); - MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_3, _T(" 端口号+签名+企业名称+错误信息 ")); + MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_0, _T(" 端口号+签名+发送量 ")); + MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_1, _T(" 端口号+签名+发送量+错误信息 ")); + MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_2, _T(" 端口号+签名+发送量+企业名称 ")); + MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_3, _T(" 端口号+签名+发送量+企业名称+错误信息 ")); #ifndef SMSMANAGER_KF //MenuCopy.AppendMenu(MF_STRING, MENU_TDSET_SIGNATURE_COPY_4, _T(" 所有数据 ")); #endif menu.AppendMenu(MF_SEPARATOR); - menu.AppendMenu(MF_STRING | MF_POPUP, (UINT)MenuCopy.GetSafeHmenu(), _T(" 复制数据 ")); + menu.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)MenuCopy.GetSafeHmenu(), _T(" 复制数据 ")); menu.AppendMenu(MF_SEPARATOR); @@ -747,7 +749,7 @@ void CC_TDSet_Signature::On_User_See() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_TD2Signature_Data* pData = m_ListData.GetNext(pos); if (!pData) @@ -827,7 +829,7 @@ void CC_TDSet_Signature::On_User_Modify() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_TD2Signature_Data* pData = m_ListData.GetNext(pos); if (!pData) @@ -982,7 +984,7 @@ void CC_TDSet_Signature::On_User_Copy(UINT nID) if (iType == 4) //复制所有数据,先生成表头 { //复制所有数据 - strLine = _T("操作类型\t短信子端口号\t短信主端口号\t接入省\t接入地市\t端口类型\t用途类别\t企业名称\t企业统一社会信用代码\t责任人名称\t责任人证件类型\t责任人证件号码\t经办人名称\t经办人证件类型\t经办人证件号码\t经办人手机号\t具体用途\t签名来源\t短信签名\t短信端口企业接入机房及设备\t短信模板\t错误提示\r\n"); + strLine = _T("操作类型\t短信子端口号\t短信主端口号\t发送量\t接入省\t接入地市\t端口类型\t用途类别\t企业名称\t企业统一社会信用代码\t责任人名称\t责任人证件类型\t责任人证件号码\t经办人名称\t经办人证件类型\t经办人证件号码\t经办人手机号\t具体用途\t签名来源\t短信签名\t短信端口企业接入机房及设备\t短信模板\t错误提示\r\n"); str.Append(strLine); } POSITION pos = m_ListData.GetHeadPosition(); // 列表头位置 @@ -998,6 +1000,9 @@ void CC_TDSet_Signature::On_User_Copy(UINT nID) strLine.Append(On_User_Copy_GetAddStr(pData->szSmsNum, true)); //签名: strLine.Append(On_User_Copy_GetAddStr(pData->szSignature)); + //短信量 + strTemp.Format(_T("\t%d"), pData->iSendCount); + strLine.Append(On_User_Copy_GetAddStr(strTemp)); if (iType == 2 || iType == 3) //有企业名称 { strLine.Append(On_User_Copy_GetAddStr(pData->szCorpanyName)); @@ -1018,6 +1023,8 @@ void CC_TDSet_Signature::On_User_Copy(UINT nID) strLine.Append(On_User_Copy_GetAddStr(strTemp, true));//操作类型 strLine.Append(On_User_Copy_GetAddStr(pData->szSmsNum));//短信子端口号 strLine.Append(On_User_Copy_GetAddStr(pData->szMainSmsNum));//短信主端口号 + strTemp.Format(_T("\t%d"), pData->iSendCount); //短信量 + strLine.Append(On_User_Copy_GetAddStr(strTemp)); strLine.Append(On_User_Copy_GetAddStr(pData->szProvvince));//接入省 strLine.Append(On_User_Copy_GetAddStr(pData->szCity));//接入地市 strLine.Append(On_User_Copy_GetAddStr(pData->szPortType));//端口类型 diff --git a/CK_AllQuery_Client.cpp b/CK_AllQuery_Client.cpp index 990989e..fe7968b 100644 --- a/CK_AllQuery_Client.cpp +++ b/CK_AllQuery_Client.cpp @@ -335,7 +335,7 @@ void CK_AllQuery_Client::ShowRMenu() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Client_Data* pData = m_ListData.GetNext(pos); @@ -411,7 +411,7 @@ void CK_AllQuery_Client::On_User_CopyID() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Client_Data* pData = m_ListData.GetNext(pos); @@ -452,7 +452,7 @@ void CK_AllQuery_Client::On_User_CopyName() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Client_Data* pData = m_ListData.GetNext(pos); diff --git a/CK_AllQuery_Report.cpp b/CK_AllQuery_Report.cpp index 876d398..130cf3e 100644 --- a/CK_AllQuery_Report.cpp +++ b/CK_AllQuery_Report.cpp @@ -514,7 +514,7 @@ BOOL CK_AllQuery_Report::ProcessSocket(Socket_Head_Add* pHead, BYTE* pFrame) } POSITION pos = (POSITION)m_wndList.GetItemData(pRet->req.lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return true; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); if (!pData) @@ -624,7 +624,7 @@ void CK_AllQuery_Report::ShowRMenu() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -772,7 +772,7 @@ void CK_AllQuery_Report::On_User_See() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); if (!pData) @@ -802,7 +802,7 @@ void CK_AllQuery_Report::On_User_CopyID() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; POSITION pos2 = pos; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -844,7 +844,7 @@ void CK_AllQuery_Report::On_User_CopyName() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -895,7 +895,7 @@ void CK_AllQuery_Report::On_User_Oper_Test() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -934,7 +934,7 @@ void CK_AllQuery_Report::On_User_Oper_CB() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -970,7 +970,7 @@ void CK_AllQuery_Report::On_User_Oper_FPExpress() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1004,7 +1004,7 @@ void CK_AllQuery_Report::On_User_Oper_FPMsg() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1036,7 +1036,7 @@ void CK_AllQuery_Report::On_User_Oper_FPIssue() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1068,7 +1068,7 @@ void CK_AllQuery_Report::On_User_Oper_FPDel() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1100,7 +1100,7 @@ void CK_AllQuery_Report::On_User_Oper_Bank() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1131,7 +1131,7 @@ void CK_AllQuery_Report::On_User_Oper_LP() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1162,7 +1162,7 @@ void CK_AllQuery_Report::On_User_Oper_PayTime() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1193,7 +1193,7 @@ void CK_AllQuery_Report::On_User_Oper_YS() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1229,7 +1229,7 @@ void CK_AllQuery_Report::On_User_Oper_CJQR() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1263,7 +1263,7 @@ void CK_AllQuery_Report::On_User_Oper_CJZF() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); @@ -1299,7 +1299,7 @@ void CK_AllQuery_Report::On_User_Oper_Cancel() if (lItem < 0) return; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos <= 0) + if ((LONG_PTR)pos <= 0) return; ANS_AllQuery_Report_Data* pData = m_ListData.GetNext(pos); diff --git a/C_AgentMmsPay.cpp b/C_AgentMmsPay.cpp index 9d5f222..eeca49d 100644 --- a/C_AgentMmsPay.cpp +++ b/C_AgentMmsPay.cpp @@ -779,7 +779,7 @@ void CC_AgentMmsPay::ShowRMenu() if (lItem >= 0 && lItem < m_PayData.GetCount()) { POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ((DWORD_PTR)pos >= 0) + if ((LONG_PTR)pos >= 0) { pData = m_PayData.GetNext(pos); } @@ -854,7 +854,7 @@ void CC_AgentMmsPay::ShowRMenu() MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE6, _T(" ӯ׸Ʊ ")); MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE7, _T(" ӯ׸רƱ ")); - menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); + menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT_PTR)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); } #endif if ( lItem>=0 &&pData&& pData->bFP&& pData->lFPStatus==0 ) @@ -919,7 +919,7 @@ void CC_AgentMmsPay::On_User_YS() if ( lItem <0 ) return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -963,7 +963,7 @@ void CC_AgentMmsPay::On_User_FPManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -993,7 +993,7 @@ void CC_AgentMmsPay::On_User_LXRManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1027,7 +1027,7 @@ void CC_AgentMmsPay::On_User_Test() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1074,7 +1074,7 @@ void CC_AgentMmsPay::On_User_CB() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1121,7 +1121,7 @@ void CC_AgentMmsPay::On_User_YSTYPE_YC() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1160,7 +1160,7 @@ void CC_AgentMmsPay::On_User_YSTYPE_ZF() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1198,7 +1198,7 @@ void CC_AgentMmsPay::On_User_FP_Type(UINT nID) BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1264,7 +1264,7 @@ void CC_AgentMmsPay::On_User_FP() BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1310,7 +1310,7 @@ void CC_AgentMmsPay::On_User_FP_YK() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1345,7 +1345,7 @@ void CC_AgentMmsPay::On_User_FP_YJ() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentMmsPay_SeeData * pData = m_PayData.GetNext( pos ); diff --git a/C_AgentPay.cpp b/C_AgentPay.cpp index 40fe466..e1672d4 100644 --- a/C_AgentPay.cpp +++ b/C_AgentPay.cpp @@ -789,7 +789,7 @@ void CC_AgentPay::ShowRMenu() if ( lItem>=0 && lItem=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_PayData.GetNext( pos ); } @@ -863,7 +863,7 @@ void CC_AgentPay::ShowRMenu() MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE6, _T(" ӯ׸Ʊ ")); MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE7, _T(" ӯ׸רƱ ")); - menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); + menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT_PTR)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); } #endif if ( lItem>=0 &&pData&& pData->bFP&& pData->lFPStatus==0 ) @@ -928,7 +928,7 @@ void CC_AgentPay::On_User_YS() if ( lItem <0 ) return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -972,7 +972,7 @@ void CC_AgentPay::On_User_FPManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1002,7 +1002,7 @@ void CC_AgentPay::On_User_LXRManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1036,7 +1036,7 @@ void CC_AgentPay::On_User_Test() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1083,7 +1083,7 @@ void CC_AgentPay::On_User_CB() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1130,7 +1130,7 @@ void CC_AgentPay::On_User_YSTYPE_YC() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1169,7 +1169,7 @@ void CC_AgentPay::On_User_YSTYPE_ZF() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1207,7 +1207,7 @@ void CC_AgentPay::On_User_FP_Type(UINT nID) BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1273,7 +1273,7 @@ void CC_AgentPay::On_User_FP() BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1319,7 +1319,7 @@ void CC_AgentPay::On_User_FP_YK() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1354,7 +1354,7 @@ void CC_AgentPay::On_User_FP_YJ() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_AgentPay_SeeData * pData = m_PayData.GetNext( pos ); diff --git a/C_FPQuery.cpp b/C_FPQuery.cpp index 7b85d90..c7cca13 100644 --- a/C_FPQuery.cpp +++ b/C_FPQuery.cpp @@ -480,7 +480,7 @@ void CC_FPQuery::On_User_See() ANS_FPQuery_Data * pData = NULL; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos>=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_FPData.GetNext( pos ); } diff --git a/C_FaxNum.cpp b/C_FaxNum.cpp index 9a099f2..50a14f5 100644 --- a/C_FaxNum.cpp +++ b/C_FaxNum.cpp @@ -315,7 +315,7 @@ void CC_FaxNum::ShowRMenu() if ( lItem>=0 ) { POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos>=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_FaxNumData.GetNext( pos ); } @@ -361,7 +361,7 @@ void CC_FaxNum::On_User_FP() ANS_FaxNum_Data * pData = NULL; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos>=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_FaxNumData.GetNext( pos ); } @@ -472,7 +472,7 @@ BOOL CC_FaxNum::ProcessSocket(Socket_Head_Add *pHead, BYTE *pFrame) { ANS_FaxNum_Data * pData = NULL; POSITION pos = (POSITION)m_wndList.GetItemData(pFax->lItem); - if ( (DWORD_PTR)pos>=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_FaxNumData.GetNext( pos ); } diff --git a/C_FuncPay.cpp b/C_FuncPay.cpp index d8a25f3..d35eba7 100644 --- a/C_FuncPay.cpp +++ b/C_FuncPay.cpp @@ -647,7 +647,7 @@ void CC_FuncPay::ShowRMenu() if ( lItem>=0 && lItem=0) + if ( (LONG_PTR)pos>=0) { pData = m_PayData.GetNext( pos ); } @@ -703,7 +703,7 @@ void CC_FuncPay::ShowRMenu() MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE6, _T(" ӯ׸Ʊ ")); MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE7, _T(" ӯ׸רƱ ")); - menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); + menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT_PTR)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); } #endif if ( lItem>=0 && strFPS==_T("δƱ") ) @@ -765,7 +765,7 @@ void CC_FuncPay::On_User_YS() ANS_FuncPay_SeeData * pData = NULL; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos>=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_PayData.GetNext( pos ); } @@ -810,7 +810,7 @@ void CC_FuncPay::On_User_FPManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_FuncPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -841,7 +841,7 @@ void CC_FuncPay::On_User_LXRManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_FuncPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -873,7 +873,7 @@ void CC_FuncPay::On_User_Test() ANS_FuncPay_SeeData * pData = NULL; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos>=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_PayData.GetNext( pos ); } @@ -912,7 +912,7 @@ void CC_FuncPay::On_User_FP_Type(UINT nID) BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_FuncPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1022,7 +1022,7 @@ void CC_FuncPay::On_User_FP_YK() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_FuncPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1060,7 +1060,7 @@ void CC_FuncPay::On_User_FP_YJ() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_FuncPay_SeeData * pData = m_PayData.GetNext( pos ); diff --git a/C_MmsPay.cpp b/C_MmsPay.cpp index 8032369..8c746a8 100644 --- a/C_MmsPay.cpp +++ b/C_MmsPay.cpp @@ -551,7 +551,7 @@ void CC_MmsPay::ShowRMenu() if ( lItem>=0 && lItem=0 ) + if ( (LONG_PTR)pos>=0 ) { pData = m_PayData.GetNext( pos ); } @@ -623,7 +623,7 @@ void CC_MmsPay::ShowRMenu() MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE6, _T(" ӯ׸Ʊ ")); MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE7, _T(" ӯ׸רƱ ")); - menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); + menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT_PTR)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); } #endif if ( lItem>=0 && pData && pData->bFP && pData->lFPStatus==0 ) @@ -691,7 +691,7 @@ void CC_MmsPay::On_User_YS() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -735,7 +735,7 @@ void CC_MmsPay::On_User_FPManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -766,7 +766,7 @@ void CC_MmsPay::On_User_LXRManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -799,7 +799,7 @@ void CC_MmsPay::On_User_Test() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -845,7 +845,7 @@ void CC_MmsPay::On_User_CB() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -891,7 +891,7 @@ void CC_MmsPay::On_User_YSTYPE_YC() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -929,7 +929,7 @@ void CC_MmsPay::On_User_YSTYPE_ZF() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -968,7 +968,7 @@ void CC_MmsPay::On_User_FP_Type(UINT nID) BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1035,7 +1035,7 @@ void CC_MmsPay::On_User_FP() BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1080,7 +1080,7 @@ void CC_MmsPay::On_User_FP_YK() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1116,7 +1116,7 @@ void CC_MmsPay::On_User_FP_YJ() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_MmsPay_SeeData * pData = m_PayData.GetNext( pos ); diff --git a/C_MonPay.cpp b/C_MonPay.cpp index ab08a74..12d313f 100644 --- a/C_MonPay.cpp +++ b/C_MonPay.cpp @@ -709,7 +709,7 @@ void CC_MonPay::ShowRMenu() MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE6, _T(" 盈易付普票 ")); MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE7, _T(" 盈易付专票 ")); - menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT)MenuFP.GetSafeHmenu(), _T(" 发票选择(已集成到综合查询) ") ); + menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT_PTR)MenuFP.GetSafeHmenu(), _T(" 发票选择(已集成到综合查询) ") ); } #endif if ( lItem>=0 && pData && pData->bFP && pData->lFPStatus==0 ) @@ -838,7 +838,7 @@ void CC_MonPay::On_User_FPManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Corp_MonPayData * pData = m_PayData.GetNext( pos ); @@ -867,7 +867,7 @@ void CC_MonPay::On_User_LXRManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Corp_MonPayData * pData = m_PayData.GetNext( pos ); @@ -938,7 +938,7 @@ void CC_MonPay::On_User_FP_Type(UINT nID) BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Corp_MonPayData * pData = m_PayData.GetNext( pos ); diff --git a/C_Pay.cpp b/C_Pay.cpp index d0271e7..71943e1 100644 --- a/C_Pay.cpp +++ b/C_Pay.cpp @@ -808,7 +808,7 @@ void CC_Pay::ShowRMenu() MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE6, _T(" ӯ׸Ʊ ")); MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE7, _T(" ӯ׸רƱ ")); - menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED ,(UINT)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); + menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED ,(UINT_PTR)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); } /* if ( lItem>=0 && pData && !pData->bFP ) @@ -852,7 +852,7 @@ void CC_Pay::ShowRMenu() MenuType.AppendMenu(MF_STRING , MENU_PAY_ADC_TC_SEL , _T(" ѡӦ¼ ") ); MenuType.AppendMenu(MF_STRING , MENU_PAY_ADC_TC_QR , _T(" ȷϷŴ ") ); menu.AppendMenu(MF_SEPARATOR ); - menu.AppendMenu(MF_STRING|MF_POPUP,(UINT)MenuType.GetSafeHmenu(), _T(" ADC̳ ") ); + menu.AppendMenu(MF_STRING|MF_POPUP,(UINT_PTR)MenuType.GetSafeHmenu(), _T(" ADC̳ ") ); */ #endif menu.AppendMenu(MF_SEPARATOR ); @@ -897,7 +897,7 @@ void CC_Pay::On_User_YS() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -940,7 +940,7 @@ void CC_Pay::On_User_FPManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -970,7 +970,7 @@ void CC_Pay::On_User_LXRManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1003,7 +1003,7 @@ void CC_Pay::On_User_Test() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1049,7 +1049,7 @@ void CC_Pay::On_User_CB() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1095,7 +1095,7 @@ void CC_Pay::On_User_YSTYPE_YC() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1133,7 +1133,7 @@ void CC_Pay::On_User_YSTYPE_ZF() BOOL bTest=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1171,7 +1171,7 @@ void CC_Pay::On_User_FP_Type(UINT nID) BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1238,7 +1238,7 @@ void CC_Pay::On_User_FP() BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1283,7 +1283,7 @@ void CC_Pay::On_User_FP_YK() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); @@ -1319,7 +1319,7 @@ void CC_Pay::On_User_FP_YJ() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Pay_SeeData * pData = m_PayData.GetNext( pos ); diff --git a/C_TDSet.cpp b/C_TDSet.cpp index 2b97ad9..d4b45d5 100644 --- a/C_TDSet.cpp +++ b/C_TDSet.cpp @@ -542,7 +542,7 @@ void CC_TDSet::On_User_Modify() } POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_GetTD2Data * pData = m_TD.GetNext( pos ); diff --git a/C_YYSPay.cpp b/C_YYSPay.cpp index aa88c24..46bac71 100644 --- a/C_YYSPay.cpp +++ b/C_YYSPay.cpp @@ -763,7 +763,7 @@ void CC_YYSPay::ShowRMenu() MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE6, _T(" ӯ׸Ʊ ")); MenuFP.AppendMenu(MF_STRING, MENU_PAY_FP_TYPE7, _T(" ӯ׸רƱ ")); - menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); + menu.AppendMenu(MF_STRING|MF_POPUP | MF_DISABLED | MF_GRAYED,(UINT_PTR)MenuFP.GetSafeHmenu(), _T(" Ʊѡ(Ѽɵۺϲѯ) ") ); } #endif if ( lItem>=0 && pData && pData->bFP && pData->lFPStatus==0 ) @@ -920,7 +920,7 @@ void CC_YYSPay::On_User_FPManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Corp_YYSPayData * pData = m_PayData.GetNext( pos ); @@ -949,7 +949,7 @@ void CC_YYSPay::On_User_LXRManager() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Corp_YYSPayData * pData = m_PayData.GetNext( pos ); @@ -1017,7 +1017,7 @@ void CC_YYSPay::On_User_FP_Type(UINT nID) BOOL bKP=true; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ((LONG_PTR)pos < 0) return ; POSITION pos2 = pos; ANS_Corp_YYSPayData * pData = m_PayData.GetNext( pos ); diff --git a/DLG_C_TDSet_Signature_Modify.cpp b/DLG_C_TDSet_Signature_Modify.cpp index 13cf06f..29aaff5 100644 --- a/DLG_C_TDSet_Signature_Modify.cpp +++ b/DLG_C_TDSet_Signature_Modify.cpp @@ -40,6 +40,7 @@ DLG_C_TDSet_Signature_Modify::DLG_C_TDSet_Signature_Modify(CWnd* pParent /*=null , m_strSignature(_T("")) , m_strSignatureSource(_T("")) , m_iConflict(0) + , m_strSendCount(_T("")) { m_pMainFrame = NULL; memset((BYTE*)&m_Data, 0, sizeof(ANS_TD2Signature_Data)); @@ -99,6 +100,7 @@ void DLG_C_TDSet_Signature_Modify::DoDataExchange(CDataExchange* pDX) DDV_MaxChars(pDX, m_strSignatureSource, 20); DDX_Control(pDX, IDC_TDSET_SIGNATURE_MODIFY_TDTITLE, m_L_TD); DDX_CBIndex(pDX, IDC_TDSET_SIGNATURE_MODIFY_CONFLICT, m_iConflict); + DDX_Text(pDX, IDC_TDSET_SIGNATURE_MODIFY_SENDCOUNT, m_strSendCount); } @@ -144,6 +146,7 @@ BOOL DLG_C_TDSet_Signature_Modify::OnInitDialog() m_strConentTemplate = m_Data.szContentTemplate; + m_strSendCount.Format(_T("%d"), m_Data.iSendCount); m_strAddTime.Format(_T("%04d.%02d.%02d %02d:%02d:%02d"), m_Data.tAddTime.wYear, m_Data.tAddTime.wMonth, m_Data.tAddTime.wDay, m_Data.tAddTime.wHour, m_Data.tAddTime.wMinute, m_Data.tAddTime.wSecond); m_strUpdateTime.Format(_T("%04d.%02d.%02d %02d:%02d:%02d"), m_Data.tUploadTime.wYear, m_Data.tUploadTime.wMonth, m_Data.tUploadTime.wDay, m_Data.tUploadTime.wHour, m_Data.tUploadTime.wMinute, m_Data.tUploadTime.wSecond); m_strAuditTime.Format(_T("%04d.%02d.%02d %02d:%02d:%02d"), m_Data.tAuditTime.wYear, m_Data.tAuditTime.wMonth, m_Data.tAuditTime.wDay, m_Data.tAuditTime.wHour, m_Data.tAuditTime.wMinute, m_Data.tAuditTime.wSecond); diff --git a/DLG_C_TDSet_Signature_Modify.h b/DLG_C_TDSet_Signature_Modify.h index 7234523..497168a 100644 --- a/DLG_C_TDSet_Signature_Modify.h +++ b/DLG_C_TDSet_Signature_Modify.h @@ -61,4 +61,5 @@ public: CComboBox m_L_TD; afx_msg void OnSelchangeTdsetSignatureModifyTdtitle(); int m_iConflict; + CString m_strSendCount; }; diff --git a/DLG_CliSmsTD.cpp b/DLG_CliSmsTD.cpp index 120e0db..69ca9cd 100644 --- a/DLG_CliSmsTD.cpp +++ b/DLG_CliSmsTD.cpp @@ -101,15 +101,15 @@ BOOL DLG_CliSmsTD::OnInitDialog() m_bRefresh = true; //ƶ int j=0; - for ( int i=0 ; i<30 ; i++ ) + for ( int i=0 ; i< 41; i++ ) { CString strSrcTD; if ( i== 0 ) - strSrcTD = _T("Զѡ"); + strSrcTD = _T("0ͨ"); if ( i>0 && i<10 ) strSrcTD.Format( _T("%dͨ"),i ); if ( i== 10 ) - strSrcTD = _T("ͨ"); + strSrcTD = _T("10ͨ"); if ( i>10 ) strSrcTD.Format( _T("%dͨ"),i-1 ); @@ -123,17 +123,17 @@ BOOL DLG_CliSmsTD::OnInitDialog() } //ͨ j=0; - for ( i=0 ; i<30 ; i++ ) + for ( i=0 ; i< 41; i++ ) { CString strSrcTD; - if ( i== 0 ) - strSrcTD = _T("Զѡ"); - if ( i>0 && i<10 ) - strSrcTD.Format( _T("%dͨ"),i ); - if ( i== 10 ) - strSrcTD = _T("ͨ"); - if ( i>10 ) - strSrcTD.Format( _T("%dͨ"),i-1 ); + if (i == 0) + strSrcTD = _T("0ͨ"); + if (i > 0 && i < 10) + strSrcTD.Format(_T("%dͨ"), i); + if (i == 10) + strSrcTD = _T("10ͨ"); + if (i > 10) + strSrcTD.Format(_T("%dͨ"), i - 1); m_wndUnicom.InsertItem( i , strSrcTD ); if (jlCliTD_Unicom && (TCHAR)('0'+i) == pRetTD_Unicom[j].cSrcTD ) @@ -146,17 +146,17 @@ BOOL DLG_CliSmsTD::OnInitDialog() //Сͨ j=0; - for ( i=0 ; i<30 ; i++ ) + for ( i=0 ; i< 41; i++ ) { CString strSrcTD; - if ( i== 0 ) - strSrcTD = _T("Զѡ"); - if ( i>0 && i<10 ) - strSrcTD.Format( _T("%dͨ"),i ); - if ( i== 10 ) - strSrcTD = _T("ͨ"); - if ( i>10 ) - strSrcTD.Format( _T("%dͨ"),i-1 ); + if (i == 0) + strSrcTD = _T("0ͨ"); + if (i > 0 && i < 10) + strSrcTD.Format(_T("%dͨ"), i); + if (i == 10) + strSrcTD = _T("10ͨ"); + if (i > 10) + strSrcTD.Format(_T("%dͨ"), i - 1); m_wndPhs.InsertItem( i , strSrcTD ); if (jlCliTD_Phs && (TCHAR)('0'+i) == pRetTD_Phs[j].cSrcTD ) @@ -168,17 +168,17 @@ BOOL DLG_CliSmsTD::OnInitDialog() } // j=0; - for ( i=0 ; i<30 ; i++ ) + for ( i=0 ; i<41 ; i++ ) { CString strSrcTD; - if ( i== 0 ) - strSrcTD = _T("Զѡ"); - if ( i>0 && i<10 ) - strSrcTD.Format( _T("%dͨ"),i ); - if ( i== 10 ) - strSrcTD = _T("ͨ"); - if ( i>10 ) - strSrcTD.Format( _T("%dͨ"),i-1 ); + if (i == 0) + strSrcTD = _T("0ͨ"); + if (i > 0 && i < 10) + strSrcTD.Format(_T("%dͨ"), i); + if (i == 10) + strSrcTD = _T("10ͨ"); + if (i > 10) + strSrcTD.Format(_T("%dͨ"), i - 1); m_wndTelcom.InsertItem( i , strSrcTD ); if (jlCliTD_Telcom && (TCHAR)('0'+i) == pRetTD_Telcom[j].cSrcTD ) @@ -188,6 +188,16 @@ BOOL DLG_CliSmsTD::OnInitDialog() j++; } } + + m_wndCmcc.SetColumnWidth(0, LVSCW_AUTOSIZE_USEHEADER); + m_wndCmcc.SetColumnWidth(1, LVSCW_AUTOSIZE_USEHEADER); + m_wndUnicom.SetColumnWidth(0, LVSCW_AUTOSIZE_USEHEADER); + m_wndUnicom.SetColumnWidth(1, LVSCW_AUTOSIZE_USEHEADER); + m_wndPhs.SetColumnWidth(0, LVSCW_AUTOSIZE_USEHEADER); + m_wndPhs.SetColumnWidth(1, LVSCW_AUTOSIZE_USEHEADER); + m_wndTelcom.SetColumnWidth(0, LVSCW_AUTOSIZE_USEHEADER); + m_wndTelcom.SetColumnWidth(1, LVSCW_AUTOSIZE_USEHEADER); + m_bRefresh = false; return TRUE; // return TRUE unless you set the focus to a control diff --git a/DLG_Corp_File.cpp b/DLG_Corp_File.cpp index 7461e33..4ef9745 100644 --- a/DLG_Corp_File.cpp +++ b/DLG_Corp_File.cpp @@ -556,10 +556,14 @@ void DLG_Corp_File::OnCorpFileUpload() //ѹɹɾԭļ //::DeleteFile( strFileName ); } + Sleep(500); //ʱһ + strName2 = strRarName; + } + else + { + strCmd.Format(_T("ѹļʧܣ%dʹԭļϴ!\r\n%s"), ::GetLastError(),strCmd); + MessageBox(strCmd, _T("ʾ"), MB_ICONINFORMATION); } - Sleep(500); //ʱһ - - strName2 = strRarName; } //ȡԭʼļ m_strUpFileName = strName; diff --git a/DLG_Corp_Modify.cpp b/DLG_Corp_Modify.cpp index 8c9f261..a367151 100644 --- a/DLG_Corp_Modify.cpp +++ b/DLG_Corp_Modify.cpp @@ -414,12 +414,15 @@ void DLG_Corp_Modify::OnBnClickedOk() GetDlgItem( IDC_CORP_MODIFY_SMSNUM )->SetFocus(); return ; } + //2025.04.27ȡط + /* if ( m_pUserDlg->FindSMSNum( m_strSMSNum,m_CorpData.lCorpID ) ) { MessageBox( _T("طʹãط!") , _T("") , MB_ICONWARNING ); GetDlgItem( IDC_CORP_MODIFY_SMSNUM )->SetFocus(); return ; } + */ _tcscpy( m_CorpData.szSMSNum2 , m_strSMSNum2 ); #endif #ifdef DEFAULT_SERVERGDYD_ADC diff --git a/Debug_Unicode/Rar.exe b/Debug_Unicode/Rar.exe new file mode 100644 index 0000000..073b93e Binary files /dev/null and b/Debug_Unicode/Rar.exe differ diff --git a/Debug_Unicode/SmsManager.exe b/Debug_Unicode/SmsManager.exe index 8f5a0d3..3d65d26 100644 Binary files a/Debug_Unicode/SmsManager.exe and b/Debug_Unicode/SmsManager.exe differ diff --git a/K_Agent.cpp b/K_Agent.cpp index 84d30c8..0d72355 100644 --- a/K_Agent.cpp +++ b/K_Agent.cpp @@ -825,10 +825,18 @@ void CK_Agent::ShowRMenu() bLock = isLockItem( lItem , false ); //ȡǷ POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos >0 ) + if ( (LONG_PTR)pos >0 ) { pData = m_Agent.GetNext( pos ); } + else + { + lItem = -1; //ûѡм¼ + } + } + else + { + lItem = -1; //ûѡм¼ } #ifndef SMSMANAGER_KF // @@ -907,7 +915,7 @@ void CK_Agent::ShowRMenu() } } //menu.AppendMenu(MF_SEPARATOR); - menu.AppendMenu(MF_STRING | MF_POPUP, (UINT)MenuAssist.GetSafeHmenu(), _T(" ")); + menu.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)MenuAssist.GetSafeHmenu(), _T(" ")); } #if !defined(SMSCENTER_NX) @@ -1028,7 +1036,7 @@ void CK_Agent::ShowRMenu() #endif MenuType.AppendMenu(MF_STRING , MENU_AGENT_OPER , _T(" ¼ ") ); menu.AppendMenu(MF_SEPARATOR ); - menu.AppendMenu(MF_STRING|MF_POPUP,(UINT)MenuType.GetSafeHmenu(), _T(" ҵ ") ); + menu.AppendMenu(MF_STRING|MF_POPUP,(UINT_PTR)MenuType.GetSafeHmenu(), _T(" ҵ ") ); } #ifndef SMSMANAGER_KF menu.AppendMenu(MF_SEPARATOR); @@ -1101,7 +1109,7 @@ void CK_Agent::On_Agent_Modify() } POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos <0 ) + if ( (LONG_PTR)pos <0 ) return ; POSITION pos2 = pos; ANS_Agent_SeeData * pData = m_Agent.GetNext( pos ); @@ -1225,7 +1233,7 @@ void CK_Agent::On_Agent_File() return ; POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos <0 ) + if ( (LONG_PTR)pos <0 ) return ; ANS_Agent_SeeData * pData = m_Agent.GetNext( pos ); diff --git a/Release_Unicode/SmsManager.res b/Release_Unicode/SmsManager.res index e61e16a..c416be0 100644 Binary files a/Release_Unicode/SmsManager.res and b/Release_Unicode/SmsManager.res differ diff --git a/Release_Unicode/SmsManager3.exe b/Release_Unicode/SmsManager3.exe index 5212768..87a9d8f 100644 Binary files a/Release_Unicode/SmsManager3.exe and b/Release_Unicode/SmsManager3.exe differ diff --git a/SmsManager.rc b/SmsManager.rc index 35ba9e8..2942d70 100644 --- a/SmsManager.rc +++ b/SmsManager.rc @@ -5619,10 +5619,10 @@ BEGIN EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_PORTUSAGECATEGORY,49,176,107,12,ES_AUTOHSCROLL EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_LOCATIONSERVERROOM,205,175,143,12,ES_AUTOHSCROLL EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_COTENTTEMPLATE,49,193,299,12,ES_AUTOHSCROLL - EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_ADDTIME,48,224,107,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_ADDTIME,48,224,86,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_UPDATETIME,49,238,107,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_AUDITTIME,49,252,107,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_ERRDATA,203,224,143,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_ERRDATA,179,224,78,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_ERRTYPE,203,237,143,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_BZ,203,251,143,12,ES_AUTOHSCROLL | ES_READONLY DEFPUSHBUTTON "ȷ ",IDOK,122,279,45,21 @@ -5652,11 +5652,13 @@ BEGIN LTEXT "ʱ",IDC_STATIC,15,227,30,8 LTEXT "ʱ",IDC_STATIC,16,241,30,8 LTEXT "ʱ",IDC_STATIC,16,255,30,8 - LTEXT "ӿڷ",IDC_STATIC,168,226,30,8 + LTEXT "ӿڷ",IDC_STATIC,144,226,30,8 LTEXT "",IDC_STATIC,167,239,30,8 LTEXT "עϢ",IDC_STATIC,166,253,30,8 LTEXT "ͨ",IDC_STATIC,237,21,15,8 LTEXT "˿ڳͻ",IDC_STATIC,247,37,37,8 + EDITTEXT IDC_TDSET_SIGNATURE_MODIFY_SENDCOUNT,298,223,48,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "",IDC_STATIC,263,225,30,8 END IDD_DOUBLECONFIRM DIALOGEX 0, 0, 285, 135 @@ -13413,6 +13415,8 @@ BEGIN 0xf6ba, 0xd4c2, 0xb22d, 0xd7d9, 0xcaf7, 0xb0a7, 0x00dc, IDC_TDSET_SIGNATURE_MODIFY_CONFLICT, 0x403, 11, 0 0xbbbb, 0xe6cb, 0xfabb, 0xcbb6, 0xdabf, "\000" + IDC_TDSET_SIGNATURE_MODIFY_CONFLICT, 0x403, 9, 0 +0xd4c8, 0xbbc8, 0xc2d0, 0xf6d4, "\000" IDC_TDSET_SIGNATURE_MODIFY_SIGNATURESOURCE, 0x403, 5, 0 0xabc8, 0xc6b3, "\000" IDC_TDSET_SIGNATURE_MODIFY_SIGNATURESOURCE, 0x403, 5, 0 diff --git a/UserDlg.cpp b/UserDlg.cpp index 5dfbb77..f7f07a1 100644 --- a/UserDlg.cpp +++ b/UserDlg.cpp @@ -1656,7 +1656,7 @@ void CUserDlg::ShowRMenu() if ( lItem>=0 ) { POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<=0 ) return ; POSITION pos2 = pos; pData = m_Corp.GetNext( pos ); @@ -1835,7 +1835,7 @@ void CUserDlg::ShowRMenu() } menu.AppendMenu(MF_SEPARATOR); - menu.AppendMenu(MF_STRING | MF_POPUP, (UINT)MenuAssist.GetSafeHmenu(), _T(" 账务辅助操作 ")); + menu.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)MenuAssist.GetSafeHmenu(), _T(" 账务辅助操作 ")); } menu.AppendMenu(MF_SEPARATOR ); @@ -1981,7 +1981,7 @@ void CUserDlg::ShowRMenu() MenuSms.AppendMenu(MF_STRING, MENU_CORP_OPER_SECURITY, _T(" 更改所有安全设置 ")); - MenuType.AppendMenu(MF_STRING | MF_POPUP, (UINT)MenuSms.GetSafeHmenu(), _T(" 短信操作 ")); + MenuType.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)MenuSms.GetSafeHmenu(), _T(" 短信操作 ")); CMenu MenuMms; MenuMms.CreatePopupMenu(); @@ -2008,7 +2008,7 @@ void CUserDlg::ShowRMenu() } - MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT)MenuMms.GetSafeHmenu(), _T(" 彩信操作 ") ); + MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT_PTR)MenuMms.GetSafeHmenu(), _T(" 彩信操作 ") ); #if !defined(SMSCENTER_NX) CMenu MenuWork; MenuWork.CreatePopupMenu(); @@ -2019,7 +2019,7 @@ void CUserDlg::ShowRMenu() MenuWork.AppendMenu(MF_STRING , MENU_CORP_OPER_WORK_SETSPACE , _T(" 设置附件容量 ") ); #endif - MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT)MenuWork.GetSafeHmenu(), _T(" 管理易操作 ") ); + MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT_PTR)MenuWork.GetSafeHmenu(), _T(" 管理易操作 ") ); #endif CMenu MenuQQT; @@ -2033,7 +2033,7 @@ void CUserDlg::ShowRMenu() MenuQQT.AppendMenu(MF_STRING , MENU_CORP_OPER_QQT_OPEN , _T(" 企Q通-开通 ") ); MenuQQT.AppendMenu(MF_STRING , MENU_CORP_OPER_QQT_CLOSE , _T(" 企Q通-关闭 ") ); - MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT)MenuQQT.GetSafeHmenu(), _T(" 企Q通操作 ") ); + MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT_PTR)MenuQQT.GetSafeHmenu(), _T(" 企Q通操作 ") ); CMenu MenuXY; MenuXY.CreatePopupMenu(); @@ -2048,7 +2048,7 @@ void CUserDlg::ShowRMenu() MenuXY.AppendMenu(MF_STRING|MF_DISABLED|MF_GRAYED , MENU_CORP_OPER_XY_CLOSE , _T(" 信易-关闭 ") ); } - MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT)MenuXY.GetSafeHmenu(), _T(" 信易操作 ") ); + MenuType.AppendMenu(MF_STRING|MF_POPUP,(UINT_PTR)MenuXY.GetSafeHmenu(), _T(" 信易操作 ") ); @@ -2141,7 +2141,7 @@ void CUserDlg::ShowRMenu() menu.AppendMenu(MF_SEPARATOR ); - menu.AppendMenu(MF_STRING|MF_POPUP,(UINT)MenuType.GetSafeHmenu(), _T(" 企业操作 ") ); + menu.AppendMenu(MF_STRING|MF_POPUP,(UINT_PTR)MenuType.GetSafeHmenu(), _T(" 企业操作 ") ); } #if !defined(SMSCENTER_NX) #ifndef SMSMANAGER_KF @@ -2181,7 +2181,7 @@ void CUserDlg::ShowRMenu() menu.AppendMenu(MF_SEPARATOR ); if (lItem >= 0 && pData) { - menu.AppendMenu(MF_STRING | MF_POPUP, (UINT)MenuPriority.GetSafeHmenu(), _T(" 提高已发短信优先级 ")); + menu.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)MenuPriority.GetSafeHmenu(), _T(" 提高已发短信优先级 ")); } #if !defined(SMSCENTER_NX) @@ -2256,7 +2256,7 @@ void CUserDlg::On_User_Modify() } POSITION pos = (POSITION)m_wndList.GetItemData(lItem); - if ( (DWORD_PTR)pos<0 ) + if ( (LONG_PTR)pos<0 ) return ; POSITION pos2 = pos; ANS_Corp_SeeData * pData = m_Corp.GetNext( pos ); diff --git a/resource.h b/resource.h index 3ff9a29..05dee37 100644 --- a/resource.h +++ b/resource.h @@ -2153,8 +2153,9 @@ #define IDC_TDSET_SIGNATURE_MODIFY_ERRTYPE 2477 #define IDC_TDSET_SIGNATURE_MODIFY_BZ 2478 #define IDC_TDSET_SIGNATURE_MODIFY_TDTITLE 2479 -#define IDC_TDSET_SIGNATURE_MODIFY_TDTITLE2 2480 #define IDC_TDSET_SIGNATURE_MODIFY_CONFLICT 2480 +#define IDC_TDSET_SIGNATURE_MODIFY_ERRDATA2 2481 +#define IDC_TDSET_SIGNATURE_MODIFY_SENDCOUNT 2481 #define IDC_HANDCUR 3010 #define IDD_CORP_BZ 32260 #define IDD_CORP_OPER_OPEN 32261