[#57] Support for KryoFlux and associated images (Part 187: Fixed cooperation with legacy MFC)

Author: tomas-nestorovic

Main/src/Greaseweazle.cpp

@@ -419,53 +419,53 @@
 			params.GetGlobalFluxDecoder(), params.resetFluxDecoderOnIndex
 		);
 		const PCBYTE pEnd=p+length;
-		for( int sampleCounter=0,sampleCounterSinceIndex=0; p<pEnd; p++ ){
-			const BYTE i=*p;
-			if (i<TFluxOp::Special){
-				// flux information
-				if (i<250)
-					// "short" flux (1-249 samples, single Byte; 0 indicates end of Stream)
-					sampleCounter+=i;
-				else{
-					// "long" flux (250-1524 samples, two Bytes)
-					if (++p>=pEnd) // unexpected end of Stream?
-						return CTrackReaderWriter::Invalid;
-					sampleCounter+=250+(i-250)*255+*p-1;
-				}
-				result.AddTime(
-					result.GetLastIndexTime()+sampleClock*( sampleCounterSinceIndex+=sampleCounter )
-				);
-				sampleCounter=0;
-			}else{
-				// special information
-				if (++p>=pEnd) // unexpected end of Stream? (incl. below Opcode)
-					return CTrackReaderWriter::Invalid;
-				switch (const TFluxOp opcode=(TFluxOp)*p++){
-					case TFluxOp::Index:{ // index information
-						if (p+sizeof(int)>=pEnd) // unexpected end of Stream?
-							return CTrackReaderWriter::Invalid;
-						const int value=ReadBits28(p);
-						p+=sizeof(int)-1; // "-1" = see "p++" at the end of cycle
-						result.AddIndexTime(
-							result.GetLastIndexTime()+sampleClock*( sampleCounterSinceIndex+sampleCounter+value )
-						);
-						sampleCounterSinceIndex= -(sampleCounter+value);
-						break;
-					}
-					case TFluxOp::Space: // "extra long" flux (1525-(2^28-1), seven Bytes, e.g. unformatted area)
-						if (p+sizeof(int)>=pEnd) // unexpected end of Stream?
-							return CTrackReaderWriter::Invalid;
-						sampleCounter+=ReadBits28(p); // addendum to ...
-						p+=sizeof(int)-1; // "-1" = see "p++" at the end of cycle
-						break; // ... another flux
-					//case TFluxOp::Astable:
-						//commented out as Astable is intended for representation of non-formatted areas during writing, so it never appears during reading [personal communication with Keir Fraser]
-					default:
-						return CTrackReaderWriter::Invalid;
-				}
-			}
-		}
-		return result;
+		for( int sampleCounter=0,sampleCounterSinceIndex=0; p<pEnd; p++ ){
+			const BYTE i=*p;
+			if (i<TFluxOp::Special){
+				// flux information
+				if (i<250)
+					// "short" flux (1-249 samples, single Byte; 0 indicates end of Stream)
+					sampleCounter+=i;
+				else{
+					// "long" flux (250-1524 samples, two Bytes)
+					if (++p>=pEnd) // unexpected end of Stream?
+						return CTrackReaderWriter::Invalid;
+					sampleCounter+=250+(i-250)*255+*p-1;
+				}
+				result.AddTime(
+					result.GetLastIndexTime()+sampleClock*( sampleCounterSinceIndex+=sampleCounter )
+				);
+				sampleCounter=0;
+			}else{
+				// special information
+				if (++p>=pEnd) // unexpected end of Stream? (incl. below Opcode)
+					return CTrackReaderWriter::Invalid;
+				switch (const TFluxOp opcode=(TFluxOp)*p++){
+					case TFluxOp::Index:{ // index information
+						if (p+sizeof(int)>=pEnd) // unexpected end of Stream?
+							return CTrackReaderWriter::Invalid;
+						const int value=ReadBits28(p);
+						p+=sizeof(int)-1; // "-1" = see "p++" at the end of cycle
+						result.AddIndexTime(
+							result.GetLastIndexTime()+sampleClock*( sampleCounterSinceIndex+sampleCounter+value )
+						);
+						sampleCounterSinceIndex= -(sampleCounter+value);
+						break;
+					}
+					case TFluxOp::Space: // "extra long" flux (1525-(2^28-1), seven Bytes, e.g. unformatted area)
+						if (p+sizeof(int)>=pEnd) // unexpected end of Stream?
+							return CTrackReaderWriter::Invalid;
+						sampleCounter+=ReadBits28(p); // addendum to ...
+						p+=sizeof(int)-1; // "-1" = see "p++" at the end of cycle
+						break; // ... another flux
+					//case TFluxOp::Astable:
+						//commented out as Astable is intended for representation of non-formatted areas during writing, so it never appears during reading [personal communication with Keir Fraser]
+					default:
+						return CTrackReaderWriter::Invalid;
+				}
+			}
+		}
+		return result;
 	}
 
 	CImage::CTrackReader CGreaseweazleV4::ReadTrack(TCylinder cyl,THead head) const{
@@ -650,6 +650,7 @@
 	}
 
 	void CGreaseweazleV4::SetPathName(LPCTSTR lpszPathName,BOOL bAddToMRU){
-		__super::SetPathName( lpszPathName, bAddToMRU );
-		m_strPathName=lpszPathName;
+		TCHAR copy[DEVICE_NAME_CHARS_MAX+1];
+		__super::SetPathName( ::lstrcpy(copy,lpszPathName), bAddToMRU );
+		m_strPathName=copy;
 	}

Main/src/KryoFluxDevice.cpp

@@ -914,6 +914,7 @@
 	}
 
 	void CKryoFluxDevice::SetPathName(LPCTSTR lpszPathName,BOOL bAddToMRU){
-		__super::SetPathName( lpszPathName, bAddToMRU );
-		m_strPathName=lpszPathName;
+		TCHAR copy[DEVICE_NAME_CHARS_MAX+1];
+		__super::SetPathName( ::lstrcpy(copy,lpszPathName), bAddToMRU );
+		m_strPathName=copy;
 	}