[#80] Support for HxC Floppy Emulator *.HFE images (Part 1.6: Fixes)

Author: tomas-nestorovic

Main/src/HFE.cpp

@@ -28,12 +28,12 @@
 
 
 
-	#define HEADER_SIGNATURE	"HXCPICFE"
+	#define HEADER_SIGNATURE	"HXCPICFE"
 
-	CHFE::UHeader::UHeader(){
+	CHFE::UHeader::UHeader(){
 		// ctor
 		::ZeroMemory( this, sizeof(*this) );
-		::lstrcpyA( signature, HEADER_SIGNATURE );
+		::lstrcpyA( signature, HEADER_SIGNATURE );
 		trackEncoding=TTrackEncoding::UNKNOWN;
 		floppyInterface=TFloppyInterface::DISABLED;
 		cylInfosBegin=1;
@@ -43,10 +43,10 @@
 
 	bool CHFE::UHeader::IsValid() const{
 		// True <=> this Header follows HFE specification, otherwise False
-		return	!::memcmp( signature, HEADER_SIGNATURE, sizeof(signature) )
+		return	!::memcmp( signature, HEADER_SIGNATURE, sizeof(signature) )
+				&&
+				formatRevision==0
 				&&
-				formatRevision==0
-				&&
 				0<nCylinders // mustn't be zero for 'capsImageInfo.maxcylinder' is inclusive! (and "-1" isn't valid)
 				&&
 				0<nHeads && nHeads<=2
@@ -67,7 +67,7 @@
 
 	CHFE::CTrackBytes::CTrackBytes(WORD count)
 		// ctor
-		: Utils::CCallocPtr<BYTE>( Utils::RoundUpToMuls(count,(WORD)sizeof(TTrackData)), 0 )
+		: Utils::CCallocPtr<BYTE>( Utils::RoundUpToMuls<int>(count,sizeof(TTrackData)), 0 )
 		, count(count) {
 		ASSERT( count>0 ); // call Invalidate() to indicate "no Bytes"
 	}
@@ -85,7 +85,7 @@
 
 	void CHFE::CTrackBytes::ReverseBitsInEachByte() const{
 		// reverses the order of bits in each Byte
-		for( PBYTE p=*this,pLast=p+count; p<pLast; p++ )
+		for( PBYTE p=*this,pLast=GetEnd(); p<pLast; p++ )
 			*p=Utils::GetReversedByte(*p);
 	}
 
@@ -95,13 +95,13 @@
 
 
 
-
+
 	#define INI_SECTION		_T("HxC2k1")
 
-	CHFE::CHFE()
-		// ctor
-		: CCapsBase( &Properties, '\0', true, INI_SECTION ) {
-		Reset();
+	CHFE::CHFE()
+		// ctor
+		: CCapsBase( &Properties, '\0', true, INI_SECTION ) {
+		Reset();
 	}
 
 
@@ -232,8 +232,9 @@ formatError: ::SetLastError(ERROR_BAD_FORMAT);
 					else
 						return ERROR_UNRECOGNIZED_MEDIA;		
 		// - base
-		if (floppyType!=pFormat->mediumType)
-			DestroyAllTracks(); // must reconstruct all Tracks with parameters corresponding to new Medium Type
+		if (floppyType!=pFormat->mediumType) // must reconstruct all Tracks with parameters corresponding to new Medium Type?
+			if (m_strPathName.GetLength()>0)
+				DestroyAllTracks(); 
 		return __super::SetMediumTypeAndGeometry( pFormat, sideMap, firstSectorNumber );
 	}
 
@@ -249,12 +250,12 @@ formatError: ::SetLastError(ERROR_BAD_FORMAT);
 		if (const TStdWinError err=__super::Reset())
 			return err;
 		// - reinitializing to an empty Image
-		header=UHeader();
+		header=UHeader();
 		::ZeroMemory( cylInfos, sizeof(cylInfos) );
 		::ZeroMemory( &capsImageInfo, sizeof(capsImageInfo) );
 		return ERROR_SUCCESS;
 	}
-
+
 
 	CHFE::CTrackBytes CHFE::ReadTrackBytes(TCylinder cyl,THead head) const{
 		// reads from File and returns raw data of specified Track

Main/src/HFE.h

@@ -80,7 +80,7 @@
 			WORD nBlocksOffset;
 			WORD nBytesLength;
 
-			inline bool IsValid() const{ return nBlocksOffset!=0 && nBytesLength!=0; }
+			inline bool IsValid() const{ return nBlocksOffset>=2 && nBytesLength!=0; }
 		} cylInfos[FDD_CYLINDERS_MAX];
 
 		class CTrackBytes sealed:public Utils::CCallocPtr<BYTE>{
@@ -91,6 +91,7 @@
 
 			inline operator PBYTE() const{ return get(); }
 			inline WORD GetCount() const{ return count; }
+			inline PBYTE GetEnd() const{ return get()+count; }
 			void Invalidate();
 			void ReverseBitsInEachByte() const;
 		};