Index: wizcfg/wizcfg.cpp
===================================================================
RCS file: /scotty/wizard/wizcfg/wizcfg.cpp,v
retrieving revision 1.1.2.12.2.98
diff -c -r1.1.2.12.2.98 wizcfg.cpp
*** wizcfg/wizcfg.cpp	9 Aug 2024 03:19:08 -0000	1.1.2.12.2.98
--- wizcfg/wizcfg.cpp	9 Aug 2024 03:32:57 -0000
***************
*** 1721,1726 ****
--- 1721,1727 ----
  		CString szOldSLNSuffix = _T(".sln");
  		CString szOldVCPROJSuffix = _T(".vcproj");
  		CString szOldVCPROJExtraSuffix = _T(""); // eg: .vc71
+ 		CStringList csList;
  		CString szNewSLNSuffix = szNewSuffix + szOldSLNSuffix;
  		CString szNewVCPROJSuffix = szNewSuffix + szOldVCPROJSuffix;
  		if (szPathToFile[0]==L'\"')
***************
*** 1802,1807 ****
--- 1803,1809 ----
  			return;
  		}*/
  
+ 		int slnReplaceCount = 0;
  		TCHAR pathFull[MAX_PATH];
  		TCHAR *fileExt;
  		ZeroMemory(pathFull,MAX_PATH);
***************
*** 1909,1914 ****
--- 1911,1922 ----
  
  			szPathToNewProjFile = szPathToOldProjFile;
  			szPathToNewProjFile.Replace(szOldVCPROJExtraSuffix+szOldVCPROJSuffix,szNewVCPROJSuffix);
+ 			// if this is the first time we've seen this ExtraSuffix, replace it in Contents and add it to the list...
+ 			if (csList.Find(szOldVCPROJExtraSuffix) == NULL)
+ 			{
+ 				csList.AddHead(szOldVCPROJExtraSuffix);
+ 				slnReplaceCount += slnContents.Replace(szOldVCPROJExtraSuffix+szOldVCPROJSuffix,szNewVCPROJSuffix);
+ 			}
  
  			// now open the file
  
***************
*** 1990,1996 ****
  			slnIndex = slnProjectIndexEnd;
  		} // while
  
- 		int slnReplaceCount = slnContents.Replace(szOldVCPROJSuffix,szNewVCPROJSuffix);
  		if (slnReplaceCount<=0)
  		{
  			szMessage.FormatMessage(_T("CVS Suite Server Configurator Wizard - no \"%2!s!\" projects in file \"%1!s!\"."), szPathToFile, szOldVCPROJSuffix);
--- 1998,2003 ----
Index: wizcfg/wizcfg.cpp
===================================================================
RCS file: /scotty/wizard/wizcfg/wizcfg.cpp,v
retrieving revision 1.1.2.12.2.99
diff -c -r1.1.2.12.2.99 wizcfg.cpp
*** wizcfg/wizcfg.cpp	9 Aug 2024 03:34:33 -0000	1.1.2.12.2.99
--- wizcfg/wizcfg.cpp	9 Aug 2024 05:00:33 -0000
***************
*** 1912,1921 ****
  			szPathToNewProjFile = szPathToOldProjFile;
  			szPathToNewProjFile.Replace(szOldVCPROJExtraSuffix+szOldVCPROJSuffix,szNewVCPROJSuffix);
  			// if this is the first time we've seen this ExtraSuffix, replace it in Contents and add it to the list...
! 			if (csList.Find(szOldVCPROJExtraSuffix) == NULL)
  			{
! 				csList.AddHead(szOldVCPROJExtraSuffix);
! 				slnReplaceCount += slnContents.Replace(szOldVCPROJExtraSuffix+szOldVCPROJSuffix,szNewVCPROJSuffix);
  			}
  
  			// now open the file
--- 1912,1924 ----
  			szPathToNewProjFile = szPathToOldProjFile;
  			szPathToNewProjFile.Replace(szOldVCPROJExtraSuffix+szOldVCPROJSuffix,szNewVCPROJSuffix);
  			// if this is the first time we've seen this ExtraSuffix, replace it in Contents and add it to the list...
! 			POSITION posList;
! 			if ((csList.GetCount() == 0) || ((posList = csList.Find(szOldVCPROJExtraSuffix+szOldVCPROJSuffix)) == NULL))
  			{
! 				if (szOldVCPROJExtraSuffix+szOldVCPROJSuffix!=szNewVCPROJSuffix)
! 				{
! 					csList.AddHead(szOldVCPROJExtraSuffix+szOldVCPROJSuffix);
! 				}
  			}
  
  			// now open the file
***************
*** 1997,2002 ****
--- 2000,2025 ----
  			tmp2 += _T("cvs add -ko ") + szPathToNewProjFile + _T("\n");
  			slnIndex = slnProjectIndexEnd;
  		} // while
+ 
+ 
+ 
+ 
+ 		if (csList.GetCount() == 0)
+ 		{
+ 			szMessage.FormatMessage(_T("CVS Suite Server Configurator Wizard - no \"%2!s!\" projects in file \"%1!s!\" (csList count)."), szPathToFile, szOldVCPROJSuffix);
+ 			CT2A strMessage(szMessage);
+ 			CServerIo::log(CServerIo::logError,strMessage.m_psz);
+ 			AfxMessageBox(szMessage,MB_ICONSTOP);
+ 			return;
+ 		}
+ 
+ 		slnReplaceCount = 0;
+ 		POSITION csListPos = csList.GetHeadPosition();
+ 		while(csListPos != NULL)
+ 		{
+ 			CString szValue = csList.GetNext(csListPos);
+ 			slnReplaceCount += slnContents.Replace(szValue,szNewVCPROJSuffix);
+ 		}
  
  		if (slnReplaceCount<=0)
  		{