Index: wizcfg/wizcfg.cpp
===================================================================
RCS file: /scotty/wizard/wizcfg/wizcfg.cpp,v
retrieving revision 1.1.2.12.2.97
diff -c -r1.1.2.12.2.97 wizcfg.cpp
*** wizcfg/wizcfg.cpp	8 Aug 2024 13:16:41 -0000	1.1.2.12.2.97
--- wizcfg/wizcfg.cpp	9 Aug 2024 03:08:37 -0000
***************
*** 1717,1724 ****
--- 1717,1726 ----
  	if ((!szPathToFile.IsEmpty()) && (szPathToFile != ""))
  	{
  		CString szPathToNewFile;
+ 		CString szOldSLNExtraSuffix = _T(""); // eg: .vc71
  		CString szOldSLNSuffix = _T(".sln");
  		CString szOldVCPROJSuffix = _T(".vcproj");
+ 		CString szOldVCPROJExtraSuffix = _T(""); // eg: .vc71
  		CString szNewSLNSuffix = szNewSuffix + szOldSLNSuffix;
  		CString szNewVCPROJSuffix = szNewSuffix + szOldVCPROJSuffix;
  		if (szPathToFile[0]==L'\"')
***************
*** 1763,1769 ****
  
  		DWORD dwBufferTotal = GetFileSize (hFile, NULL);
  
! 		CHAR ReadBuffer[8194];
  		CString slnContents = _T("");
  
  		BOOL bRead;
--- 1765,1771 ----
  
  		DWORD dwBufferTotal = GetFileSize (hFile, NULL);
  
! 		CHAR ReadBuffer[65345*4];
  		CString slnContents = _T("");
  
  		BOOL bRead;
***************
*** 1800,1813 ****
  			return;
  		}*/
  
  		szPathToNewFile = szPathToFile;
! 		szPathToNewFile.Replace(szOldSLNSuffix,szNewSLNSuffix);
  
  		DWORD dwBytesWritten=0;
  		CString defaultDirectory = szPathToNewFile;
! 		TCHAR pathFull[MAX_PATH];
! 		TCHAR *fileExt;
! 		DWORD pathres= GetFullPathName(szPathToNewFile,MAX_PATH,pathFull,&fileExt);
  		if (pathres==0)
  		{
  			szMessage.FormatMessage(_T("CVS Suite Server Configurator Wizard - cannot find directory of file location - unknown error."));
--- 1802,1827 ----
  			return;
  		}*/
  
+ 		TCHAR pathFull[MAX_PATH];
+ 		TCHAR *fileExt;
+ 		ZeroMemory(pathFull,MAX_PATH);
+ 		DWORD pathres= GetFullPathName(szPathToFile,MAX_PATH,pathFull,&fileExt);
+ 		CString szOrigNameSLN=fileExt;
+ 		int posOrigNameSLN=szOrigNameSLN.Find(szNewSuffix[0],0);
+ 		if (posOrigNameSLN!=-1)
+ 		{
+ 			szOldSLNExtraSuffix=szOrigNameSLN.Mid(posOrigNameSLN);
+ 			szOldSLNExtraSuffix.Replace(szOldSLNSuffix,_T(""));
+ 			//szOldSLNSuffix=szOldSLNExtraSuffix+szOldSLNSuffix;
+ 		}
+ 
  		szPathToNewFile = szPathToFile;
! 		szPathToNewFile.Replace(szOldSLNExtraSuffix+szOldSLNSuffix,szNewSLNSuffix);
  
  		DWORD dwBytesWritten=0;
  		CString defaultDirectory = szPathToNewFile;
! 		ZeroMemory(pathFull,MAX_PATH);
! 		pathres= GetFullPathName(szPathToNewFile,MAX_PATH,pathFull,&fileExt);
  		if (pathres==0)
  		{
  			szMessage.FormatMessage(_T("CVS Suite Server Configurator Wizard - cannot find directory of file location - unknown error."));
***************
*** 1880,1888 ****
  			}
  
  			szPathToOldProjFile = slnContents.Mid(slnProjectIndexStart,slnProjectIndexEnd-slnProjectIndexStart);
  
  			szPathToNewProjFile = szPathToOldProjFile;
! 			szPathToNewProjFile.Replace(szOldVCPROJSuffix,szNewVCPROJSuffix);
  
  			// now open the file
  
--- 1894,1914 ----
  			}
  
  			szPathToOldProjFile = slnContents.Mid(slnProjectIndexStart,slnProjectIndexEnd-slnProjectIndexStart);
+ 			ZeroMemory(pathFull,MAX_PATH);
+ 			pathres= GetFullPathName(szPathToOldProjFile,MAX_PATH,pathFull,&fileExt);
+ 			CString szOrigNamePROJ = _T("");
+ 			szOrigNamePROJ = fileExt;
+ 			int posOrigNamePROJ = 0;
+ 			posOrigNamePROJ = szOrigNamePROJ.Find(szNewSuffix[0],0);
+ 			if (posOrigNamePROJ != -1)
+ 			{
+ 				szOldVCPROJExtraSuffix=szOrigNamePROJ.Mid(posOrigNamePROJ);
+ 				szOldVCPROJExtraSuffix.Replace(szOldVCPROJSuffix,_T(""));
+ 				//szOldPROJSuffix=szOldPROJExtraSuffix+szOldPROJSuffix;
+ 			}
  
  			szPathToNewProjFile = szPathToOldProjFile;
! 			szPathToNewProjFile.Replace(szOldVCPROJExtraSuffix+szOldVCPROJSuffix,szNewVCPROJSuffix);
  
  			// now open the file