Bugs fixed

- log message in vhdutils referred to non-existant dwBlockOffset
- headers computation fixed in fat12_mkfs and fat16_mkfs
- tries to account floppies while computating drive headers

Author: maxpat78

.gitignore

@@ -22,3 +22,7 @@ $RECYCLE.BIN/
 # Operating System Files
 # =========================
 BUGS.TXT
+
+# PyPI related
+FATtools.egg-info/
+dist/

FATtools/mkfat.py

@@ -118,8 +118,9 @@ def fat12_mkfs(stream, size, sector=512, params={}):
     boot.chPhysDriveNumber = 0
     boot.uchSignature = 0x29
     boot.wBootSignature = 0xAA55
-    boot.wSectorsPerTrack = 18
-    boot.wHeads = 2
+    boot.wSectorsPerTrack = 18 # CAVE! This is true with floppies, not little HDDs (20MB, 120MB etc.)
+    #~ boot.wHeads = 2
+    boot.wHeads = partutils.size2chs(size,1)[1] # not used with LBA
 
     boot.pack()
     #~ print boot
@@ -277,7 +278,7 @@ def fat16_mkfs(stream, size, sector=512, params={}):
     boot.uchSignature = 0x29
     boot.wBootSignature = 0xAA55
     boot.wSectorsPerTrack = 63 # not used w/o disk geometry!
-    boot.wHeads = partutils.size2chs(size)[1] # not used with LBA
+    boot.wHeads = partutils.size2chs(size,1)[1] # not used with LBA
 
     boot.pack()
     #~ print boot

FATtools/partutils.py

@@ -59,7 +59,7 @@ def lba2chs(lba, hpc=0):
 
 def size2chs(n, getgeometry=0):
     lba = n//512
-    for hpc in (16,32,64,128,255):
+    for hpc in (2,16,32,64,128,255): # 2 is typical for 720K DS/DD and 1.44M DS/HD floppies
         c,h,s = lba2chs(lba,hpc)
         if c < 1024: break
     if DEBUG&1: log("size2chs: calculated Heads Per Cylinder: %d", hpc)

FATtools/version.py

@@ -1 +1 @@
-__version__ = '1.0.10'
+__version__ = '1.0.11'

FATtools/vhdutils.py

@@ -540,7 +540,7 @@ def write(self, s):
                 if s[i:i+put] == self.zero[:put]:
                     i+=put
                     self._pos+=put
-                    if DEBUG&16: log("block #%d @0x%X is zeroed, virtualizing write", self._pos//self.block, (block*self.block)+self.header.dwBlocksOffset)
+                    if DEBUG&16: log("block #%d @0x%X is zeroed, virtualizing write", self._pos//self.block, (block*self.block)+self.header.u64DataOffset)
                     continue
                 # allocates a new block at end before writing
                 self.stream.seek(-512, 2) # overwrites old footer