[wtl-cvs] wtl/include atlctrlx.h, 1.21, 1.22 atldlgs.h, 1.17, 1.18 atlframe.h, 1.20, 1.21 atlgdi.h, 1.16, 1.17 atlmisc.h, 1.24, 1.25

[Nenad S. <nen...@us...>]

Update of /cvsroot/wtl/wtl/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1990

Modified Files:
	atlctrlx.h atldlgs.h atlframe.h atlgdi.h atlmisc.h 
Log Message:
Fix for #1585259 - Bugs in AtlCompactPath after Secure CRT

Index: atlframe.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlframe.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** atlframe.h	30 Oct 2006 01:36:29 -0000	1.20
--- atlframe.h	31 Oct 2006 23:40:46 -0000	1.21
***************
*** 962,966 ****
  				{
  #if _SECURE_ATL
! 					ATL::Checked::strncpy_s(pDispInfo->szText, _countof(pDispInfo->szText), &szBuff[i + 1], _countof(pDispInfo->szText));
  #else
  					lstrcpynA(pDispInfo->szText, &szBuff[i + 1], sizeof(pDispInfo->szText) / sizeof(pDispInfo->szText[0]));
--- 962,966 ----
  				{
  #if _SECURE_ATL
! 					ATL::Checked::strncpy_s(pDispInfo->szText, _countof(pDispInfo->szText), &szBuff[i + 1], _TRUNCATE);
  #else
  					lstrcpynA(pDispInfo->szText, &szBuff[i + 1], sizeof(pDispInfo->szText) / sizeof(pDispInfo->szText[0]));
***************
*** 994,998 ****
  				{
  #if _SECURE_ATL
! 					ATL::Checked::wcsncpy_s(pDispInfo->szText, _countof(pDispInfo->szText), &szBuff[i + 1], _countof(pDispInfo->szText));
  #else
  					lstrcpynW(pDispInfo->szText, &szBuff[i + 1], sizeof(pDispInfo->szText) / sizeof(pDispInfo->szText[0]));
--- 994,998 ----
  				{
  #if _SECURE_ATL
! 					ATL::Checked::wcsncpy_s(pDispInfo->szText, _countof(pDispInfo->szText), &szBuff[i + 1], _TRUNCATE);
  #else
  					lstrcpynW(pDispInfo->szText, &szBuff[i + 1], sizeof(pDispInfo->szText) / sizeof(pDispInfo->szText[0]));

Index: atldlgs.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atldlgs.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** atldlgs.h	30 Oct 2006 01:36:29 -0000	1.17
--- atldlgs.h	31 Oct 2006 23:40:46 -0000	1.18
***************
*** 140,144 ****
  		if(lpszFileName != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szFileName, _countof(m_szFileName), lpszFileName, _MAX_PATH);
  #else
  			lstrcpyn(m_szFileName, lpszFileName, _MAX_PATH);
--- 140,144 ----
  		if(lpszFileName != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szFileName, _countof(m_szFileName), lpszFileName, _TRUNCATE);
  #else
  			lstrcpyn(m_szFileName, lpszFileName, _MAX_PATH);
***************
*** 1862,1866 ****
  		if(lpszFindWhat != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szFindWhat, _countof(m_szFindWhat), lpszFindWhat, _cchFindReplaceBuffer);
  #else
  			lstrcpyn(m_szFindWhat, lpszFindWhat, _cchFindReplaceBuffer);
--- 1862,1866 ----
  		if(lpszFindWhat != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szFindWhat, _countof(m_szFindWhat), lpszFindWhat, _TRUNCATE);
  #else
  			lstrcpyn(m_szFindWhat, lpszFindWhat, _cchFindReplaceBuffer);
***************
*** 1869,1873 ****
  		if(lpszReplaceWith != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szReplaceWith, _countof(m_szReplaceWith), lpszReplaceWith, _cchFindReplaceBuffer);
  #else
  			lstrcpyn(m_szReplaceWith, lpszReplaceWith, _cchFindReplaceBuffer);
--- 1869,1873 ----
  		if(lpszReplaceWith != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szReplaceWith, _countof(m_szReplaceWith), lpszReplaceWith, _TRUNCATE);
  #else
  			lstrcpyn(m_szReplaceWith, lpszReplaceWith, _cchFindReplaceBuffer);

Index: atlmisc.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlmisc.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** atlmisc.h	30 Oct 2006 01:36:29 -0000	1.24
--- atlmisc.h	31 Oct 2006 23:40:46 -0000	1.25
***************
*** 3026,3030 ****
  			pT;   // avoid level 4 warning
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szNoEntries, _countof(m_szNoEntries), pT->GetMRUEmptyText(), t_cchItemLen);
  #else
  			lstrcpyn(m_szNoEntries, pT->GetMRUEmptyText(), t_cchItemLen);
--- 3026,3030 ----
  			pT;   // avoid level 4 warning
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szNoEntries, _countof(m_szNoEntries), pT->GetMRUEmptyText(), _TRUNCATE);
  #else
  			lstrcpyn(m_szNoEntries, pT->GetMRUEmptyText(), t_cchItemLen);
***************
*** 3073,3081 ****
  		_DocEntry de;
  #if _SECURE_ATL
! 		if(ATL::Checked::tcsncpy_s(de.szDocName, _countof(de.szDocName), lpstrDocName, t_cchItemLen) != 0)
  #else
  		if(lstrcpyn(de.szDocName, lpstrDocName, t_cchItemLen) == NULL)
- #endif
  			return FALSE;
  
  		for(int i = 0; i < m_arrDocs.GetSize(); i++)
--- 3073,3081 ----
  		_DocEntry de;
  #if _SECURE_ATL
! 		ATL::Checked::tcsncpy_s(de.szDocName, _countof(de.szDocName), lpstrDocName, _TRUNCATE);
  #else
  		if(lstrcpyn(de.szDocName, lpstrDocName, t_cchItemLen) == NULL)
  			return FALSE;
+ #endif
  
  		for(int i = 0; i < m_arrDocs.GetSize(); i++)
***************
*** 3750,3754 ****
  #else // CE specific
    #if _SECURE_ATL
! 		bool bFullPath = (ATL::Checked::tcsncpy_s(m_lpszRoot, _countof(m_lpszRoot), pstrName, MAX_PATH) == 0);
    #else
  		bool bFullPath = (lstrcpyn(m_lpszRoot, pstrName, MAX_PATH) != NULL);
--- 3750,3755 ----
  #else // CE specific
    #if _SECURE_ATL
! 		ATL::Checked::tcsncpy_s(m_lpszRoot, _countof(m_lpszRoot), pstrName, _TRUNCATE);
! 		bool bFullPath = true;
    #else
  		bool bFullPath = (lstrcpyn(m_lpszRoot, pstrName, MAX_PATH) != NULL);
***************
*** 4059,4062 ****
--- 4060,4064 ----
  
  	if(lstrlen(lpstrIn) < cchLen)
+ 	{
  #if _SECURE_ATL
  		ATL::Checked::tcscpy_s(lpstrOut, cchLen, lpstrIn);
***************
*** 4065,4068 ****
--- 4067,4071 ----
  		return (lstrcpy(lpstrOut, lpstrIn) != NULL);
  #endif
+ 	}
  
  	lpstrOut[0] = 0;
***************
*** 4090,4094 ****
  	{
  #if _SECURE_ATL
! 		bool bRet = (ATL::Checked::tcsncpy_s(lpstrOut, cchLen, lpstrIn, cchLen - cchEndEllipsis) == 0);
  #else
  		bool bRet = (lstrcpyn(lpstrOut, lpstrIn, cchLen - cchEndEllipsis) != NULL);
--- 4093,4097 ----
  	{
  #if _SECURE_ATL
! 		bool bRet = (ATL::Checked::tcsncpy_s(lpstrOut, cchLen, lpstrIn, cchLen - cchEndEllipsis - 1) == 0);
  #else
  		bool bRet = (lstrcpyn(lpstrOut, lpstrIn, cchLen - cchEndEllipsis) != NULL);
***************
*** 4119,4123 ****
  
  	// calc how much we have to copy
! 	int cchToCopy = cchLen - (cchMidEllipsis + cchFileName);
  
  	if(cchToCopy < 0)
--- 4122,4126 ----
  
  	// calc how much we have to copy
! 	int cchToCopy = cchLen - (cchMidEllipsis + cchFileName) - 1;
  
  	if(cchToCopy < 0)
***************
*** 4132,4136 ****
  	bool bRet = (ATL::Checked::tcsncpy_s(lpstrOut, cchLen, lpstrIn, cchToCopy) == 0);
  #else
! 	bool bRet = (lstrcpyn(lpstrOut, lpstrIn, cchToCopy) != NULL);
  #endif
  	if(!bRet)
--- 4135,4139 ----
  	bool bRet = (ATL::Checked::tcsncpy_s(lpstrOut, cchLen, lpstrIn, cchToCopy) == 0);
  #else
! 	bool bRet = (lstrcpyn(lpstrOut, lpstrIn, cchToCopy + 1) != NULL);
  #endif
  	if(!bRet)
***************
*** 4165,4169 ****
  	else
  	{
! 		cchToCopy = cchLen - cchMidEllipsis - cchEndEllipsis;
  #ifndef _UNICODE
  		if(cchToCopy > 0 && _IsDBCSTrailByte(lpstrFileName, cchToCopy))
--- 4168,4172 ----
  	else
  	{
! 		cchToCopy = cchLen - cchMidEllipsis - cchEndEllipsis - 1;
  #ifndef _UNICODE
  		if(cchToCopy > 0 && _IsDBCSTrailByte(lpstrFileName, cchToCopy))
***************
*** 4173,4177 ****
  		bRet = (ATL::Checked::tcsncpy_s(&lpstrOut[cchMidEllipsis], cchLen - cchMidEllipsis, lpstrFileName, cchToCopy) == 0);
  #else
! 		bRet = (lstrcpyn(&lpstrOut[cchMidEllipsis], lpstrFileName, cchToCopy) != NULL);
  #endif
  		if(bRet)
--- 4176,4180 ----
  		bRet = (ATL::Checked::tcsncpy_s(&lpstrOut[cchMidEllipsis], cchLen - cchMidEllipsis, lpstrFileName, cchToCopy) == 0);
  #else
! 		bRet = (lstrcpyn(&lpstrOut[cchMidEllipsis], lpstrFileName, cchToCopy + 1) != NULL);
  #endif
  		if(bRet)

Index: atlctrlx.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlctrlx.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** atlctrlx.h	30 Oct 2006 01:36:29 -0000	1.21
--- atlctrlx.h	31 Oct 2006 23:40:46 -0000	1.22
***************
*** 178,182 ****
  			return false;
  #if _SECURE_ATL
! 		return (ATL::Checked::tcsncpy_s(lpstrText, nLength, m_lpstrToolTipText, min(nLength, lstrlen(m_lpstrToolTipText) + 1)) == 0);
  #else
  		return (lstrcpyn(lpstrText, m_lpstrToolTipText, min(nLength, lstrlen(m_lpstrToolTipText) + 1)) != NULL);
--- 178,183 ----
  			return false;
  #if _SECURE_ATL
! 		ATL::Checked::tcsncpy_s(lpstrText, nLength, m_lpstrToolTipText, _TRUNCATE);
! 		return true;
  #else
  		return (lstrcpyn(lpstrText, m_lpstrToolTipText, min(nLength, lstrlen(m_lpstrToolTipText) + 1)) != NULL);
***************
*** 2306,2310 ****
  		ATLASSERT(lpstrTitle != NULL);
  #if _SECURE_ATL
! 		return (ATL::Checked::tcsncpy_s(lpstrTitle, cchLength, m_szTitle, cchLength) == 0);
  #else
  		return (lstrcpyn(lpstrTitle, m_szTitle, cchLength) != NULL);
--- 2307,2312 ----
  		ATLASSERT(lpstrTitle != NULL);
  #if _SECURE_ATL
! 		ATL::Checked::tcsncpy_s(lpstrTitle, cchLength, m_szTitle, _TRUNCATE);
! 		return TRUE;
  #else
  		return (lstrcpyn(lpstrTitle, m_szTitle, cchLength) != NULL);
***************
*** 2316,2320 ****
  		ATLASSERT(lpstrTitle != NULL);
  #if _SECURE_ATL
! 		BOOL bRet = (ATL::Checked::tcsncpy_s(m_szTitle, m_cchTitle, lpstrTitle, m_cchTitle) == 0);
  #else
  		BOOL bRet = (lstrcpyn(m_szTitle, lpstrTitle, m_cchTitle) != NULL);
--- 2318,2323 ----
  		ATLASSERT(lpstrTitle != NULL);
  #if _SECURE_ATL
! 		ATL::Checked::tcsncpy_s(m_szTitle, m_cchTitle, lpstrTitle, _TRUNCATE);
! 		BOOL bRet = TRUE;
  #else
  		BOOL bRet = (lstrcpyn(m_szTitle, lpstrTitle, m_cchTitle) != NULL);
***************
*** 2339,2343 ****
  		if(lpstrTitle != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szTitle, m_cchTitle, lpstrTitle, m_cchTitle);
  #else
  			lstrcpyn(m_szTitle, lpstrTitle, m_cchTitle);
--- 2342,2346 ----
  		if(lpstrTitle != NULL)
  #if _SECURE_ATL
! 			ATL::Checked::tcsncpy_s(m_szTitle, m_cchTitle, lpstrTitle, _TRUNCATE);
  #else
  			lstrcpyn(m_szTitle, lpstrTitle, m_cchTitle);

Index: atlgdi.h
===================================================================
RCS file: /cvsroot/wtl/wtl/include/atlgdi.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** atlgdi.h	30 Oct 2006 01:36:29 -0000	1.16
--- atlgdi.h	31 Oct 2006 23:40:46 -0000	1.17
***************
*** 601,605 ****
  		logFont.lfHeight = nPointSize;
  #if _SECURE_ATL
! 		ATL::Checked::tcsncpy_s(logFont.lfFaceName, _countof(logFont.lfFaceName), lpszFaceName, _countof(logFont.lfFaceName));
  #else
  		lstrcpyn(logFont.lfFaceName, lpszFaceName, sizeof(logFont.lfFaceName) / sizeof(TCHAR));
--- 601,605 ----
  		logFont.lfHeight = nPointSize;
  #if _SECURE_ATL
! 		ATL::Checked::tcsncpy_s(logFont.lfFaceName, _countof(logFont.lfFaceName), lpszFaceName, _TRUNCATE);
  #else
  		lstrcpyn(logFont.lfFaceName, lpszFaceName, sizeof(logFont.lfFaceName) / sizeof(TCHAR));