[#49] Formatting/unformatting cylinders needs revision (Part 19: Minor improvements)

Author: tomas-nestorovic

Main/src/DialogFormatting.cpp

@@ -163,7 +163,7 @@
 						const LPCTSTR currMediumDesc=Medium::GetDescription((Medium::TType)ComboBox_GetItemData( hMedium, ComboBox_GetCurSel(hMedium) ));
 						CImage::PopulateComboBoxWithCompatibleMedia( hMedium, dos->properties->supportedMedia, dos->image->properties );
 						ComboBox_SelectString( hMedium, 0, currMediumDesc );
-						::SetWindowPos( hMedium, nullptr, 0,0, rc.Width(),rc.Height(), SWP_NOZORDER|SWP_NOMOVE );
+						SetDlgItemSize( ID_MEDIUM, rc.Width(), rc.Height() );
 						::EnableWindow( hMedium, TRUE );
 					}
 					*pResult=0;

Main/src/Dos.cpp

@@ -157,6 +157,12 @@ reportError:Utils::Information(buf);
 		return ERROR_EMPTY;
 	}
 
+	TStdWinError CDos::IsStdTrackEmpty(TCylinder cyl,THead head) const{
+		// returns ERROR_EMPTY/ERROR_NOT_EMPTY or another Windows standard i/o error
+		TSectorId bufferId[(TSector)-1];
+		return IsTrackEmpty( cyl, head, GetListOfStdSectors(cyl,head,bufferId), bufferId );
+	}
+
 	CDos::TEmptyCylinderParams::TEmptyCylinderParams(const CDos *dos,TCylinder cylA,TCylinder cylZInclusive)
 		: dos(dos)
 		, cylA(cylA) , cylZInclusive(cylZInclusive) {
@@ -177,9 +183,8 @@ reportError:Utils::Information(buf);
 		// - checking if range of Cylinders empty
 		for( TCylinder cyl=ecp.cylA; cyl<=ecp.cylZInclusive; pAction->UpdateProgress(++cyl-ecp.cylA) ){
 			if (pAction->Cancelled) return ERROR_CANCELLED;
-			TSectorId bufferId[(TSector)-1];
 			for( THead head=0; head<ecp.dos->formatBoot.nHeads; head++ ){
-				const TStdWinError err=ecp.dos->IsTrackEmpty( cyl, head, ecp.dos->GetListOfStdSectors(cyl,head,bufferId), bufferId );
+				const TStdWinError err=ecp.dos->IsStdTrackEmpty( cyl, head );
 				if (err!=ERROR_EMPTY)
 					return pAction->TerminateWithError(err);
 			}

Main/src/Dos.h

@@ -400,6 +400,7 @@
 		virtual TCylinder GetFirstCylinderWithEmptySector() const;
 		TCylinder GetLastOccupiedStdCylinder() const;
 		TStdWinError GetFirstEmptyHealthySector(bool skipBadSectors,TPhysicalAddress &rOutChs) const;
+		TStdWinError IsStdTrackEmpty(TCylinder cyl,THead head) const;
 		TStdWinError AreStdCylindersEmpty(TCylinder cylA,TCylinder cylZInclusive) const;
 		bool AddStdCylindersToFatAsEmpty(TCylinder cylA,TCylinder cylZInclusive,CActionProgress &ap) const;
 		bool RemoveStdCylindersFromFat(TCylinder cylA,TCylinder cylZInclusive,CActionProgress &ap) const;

Main/src/Dsk5.cpp

@@ -536,8 +536,7 @@ formatError: ::SetLastError(ERROR_BAD_FORMAT);
 		if (trackLength>0xff80) // 0xff80 = maximum for "standard" DSK, 0xff00 = maximum for Revision 5
 			return ERROR_BAD_COMMAND;
 		// - if Track already formatted, unformatting it
-		if (__findTrack__(cyl,head))
-			UnformatTrack(cyl,head);
+		UnformatTrack(cyl,head);
 		// - formatting Track
 		do{
 			if (cancelled)