[UDFS] Revert recent commits and apply PR #360 geometry fixes

drivers/filesystems/fs_rec/fs_rec.h

@@ -137,6 +137,9 @@ typedef struct BIOS_PARAMETER_BLOCK
     USHORT BackupBootSector;
 } BIOS_PARAMETER_BLOCK, *PBIOS_PARAMETER_BLOCK;
 
+/* UDFS Tag Identifier for Anchor Volume Descriptor Pointer (ECMA-167 7.2) */
+#define UDFS_TAG_ID_AVDP  0x0002
+
 /* UDFS Structures */
 #include <pshpack1.h>
 typedef struct _TAG

drivers/filesystems/fs_rec/udfs.c

@@ -29,7 +29,12 @@ FsRecIsUdfsVolume(IN PDEVICE_OBJECT DeviceObject,
     int i;
     PAGED_CODE();
 
-    Offset.QuadPart = 16 * SectorSize;
+    /* Per ECMA-167 section 8.4.1, the Volume Recognition Sequence starts at
+     * a fixed byte offset of 32768, regardless of the physical sector size.
+     * Using 16 * SectorSize is only correct for 2048-byte sectors (CD-ROM);
+     * for 512-byte sector devices (e.g. VHDs) it gives 8192 instead of 32768,
+     * causing the VRS to be missed entirely. */
+    Offset.QuadPart = UDFS_VRS_START_OFFSET;
     for (i = 0; i < 16; i++)
     {
         if (!FsRecReadBlock(DeviceObject,
@@ -55,6 +60,7 @@ FsRecIsUdfsVolume(IN PDEVICE_OBJECT DeviceObject,
         {
             DPRINT("NSR03 found\n");
             ret = TRUE;
+            break;
         }
 
         if (!strncmp((const char*)VolumeStructDesc->Ident,
@@ -63,6 +69,7 @@ FsRecIsUdfsVolume(IN PDEVICE_OBJECT DeviceObject,
         {
             DPRINT("NSR02 found\n");
             ret = TRUE;
+            break;
         }
 
         if (!strncmp((const char*)VolumeStructDesc->Ident,
@@ -98,6 +105,34 @@ FsRecIsUdfsVolume(IN PDEVICE_OBJECT DeviceObject,
 
     if (VolumeStructDesc)
         ExFreePool(VolumeStructDesc);
+
+    /* If the VRS scan did not find an NSR descriptor, fall back to checking
+     * for the Anchor Volume Descriptor Pointer at sector 256. This covers
+     * disks where the VRS is absent or could not be read, and mirrors the
+     * detection approach used by the UDFS driver itself. */
+    if (!ret)
+    {
+        PAVDP AnchorVDP = NULL;
+
+        Offset.QuadPart = (LONGLONG)UDFS_AVDP_SECTOR * SectorSize;
+        if (FsRecReadBlock(DeviceObject,
+                           &Offset,
+                           sizeof(AVDP),
+                           SectorSize,
+                           (PVOID *)&AnchorVDP,
+                           NULL))
+        {
+            /* Tag identifier 2 = Anchor Volume Descriptor Pointer (ECMA-167 7.2) */
+            if (AnchorVDP->DescriptorTag.Identifier == UDFS_TAG_ID_AVDP &&
+                AnchorVDP->DescriptorTag.Location == UDFS_AVDP_SECTOR)
+            {
+                DPRINT("AVDP found at sector 256\n");
+                ret = TRUE;
+            }
+            ExFreePool(AnchorVDP);
+        }
+    }
+
     return ret;
 }
 

drivers/filesystems/udfs/CMakeLists.txt

@@ -2,43 +2,43 @@
 include_directories(Include)
 
 list(APPEND SOURCE
-    udf_info/alloc.cpp
-    udf_info/dirtree.cpp
-    udf_info/extent.cpp
-    udf_info/mount.cpp
-    udf_info/phys_eject.cpp
-    udf_info/physical.cpp
-    udf_info/remap.cpp
-    udf_info/udf_info.cpp
-    cleanup.cpp
-    close.cpp
-    create.cpp
-    devcntrl.cpp
-    dircntrl.cpp
-    env_spec.cpp
-    fastio.cpp
-    fileinfo.cpp
-    flush.cpp
-    fscntrl.cpp
-    lockctrl.cpp
-    mem.cpp
-    misc.cpp
-    namesup.cpp
-    prefxsup.cpp
-    pnp.cpp
-    read.cpp
-    secursup.cpp
-    shutdown.cpp
-    sys_spec.cpp
-    udf_dbg.cpp
-    udfinit.cpp
-    unload.cpp
-    verfysup.cpp
-    volinfo.cpp
-    write.cpp
-    strucsup.cpp
-    filobsup.cpp
-    udfdata.cpp
+    udf_info/alloc.c
+    udf_info/dirtree.c
+    udf_info/extent.c
+    udf_info/mount.c
+    udf_info/phys_eject.c
+    udf_info/physical.c
+    udf_info/remap.c
+    udf_info/udf_info.c
+    cleanup.c
+    close.c
+    create.c
+    devcntrl.c
+    dircntrl.c
+    env_spec.c
+    fastio.c
+    fileinfo.c
+    flush.c
+    fscntrl.c
+    lockctrl.c
+    mem.c
+    misc.c
+    namesup.c
+    prefxsup.c
+    pnp.c
+    read.c
+    secursup.c
+    shutdown.c
+    sys_spec.c
+    udf_dbg.c
+    udfinit.c
+    unload.c
+    verfysup.c
+    volinfo.c
+    write.c
+    strucsup.c
+    filobsup.c
+    udfdata.c
     udffs.h)
 
 add_library(udfs MODULE ${SOURCE} udffs.rc)

drivers/filesystems/udfs/Include/Sys_spec_lib.cpp → drivers/filesystems/udfs/Include/Sys_spec_lib.c

@@ -150,10 +150,10 @@ UDFAttributesToUDF(
     IN ULONG NTAttr
     )
 {
-    PULONG attr; //permissions
-    PUSHORT Flags;
-    PUCHAR Type;
-    PUCHAR FCharact;
+    PULONG attr = NULL; //permissions
+    PUSHORT Flags = NULL;
+    PUCHAR Type = NULL;
+    PUCHAR FCharact = NULL;
 
     NTAttr &= UDF_VALID_FILE_ATTRIBUTES;
 
@@ -240,7 +240,7 @@ UDFFileDirInfoToNT(
     PEXTENDED_FILE_ENTRY ExFileEntry;
     USHORT Ident;
     BOOLEAN ReadSizes = FALSE;
-    NTSTATUS status;
+    NTSTATUS status = STATUS_SUCCESS;
     PFCB Fcb;
 
     UDFPrint(("@=%#x, FileDirNdx %x\n", &Vcb, FileDirNdx));
@@ -575,7 +575,7 @@ UDFDoesOSAllowFileToBeTargetForRename__(
     IN PUDF_FILE_INFO FileInfo
     )
 {
-    NTSTATUS RC;
+    NTSTATUS RC = STATUS_SUCCESS;
 
     if (UDFIsADirectory(FileInfo))
         return STATUS_ACCESS_DENIED;

drivers/filesystems/udfs/Include/Sys_spec_lib.h

@@ -104,7 +104,7 @@ __inline LARGE_INTEGER UDFMakeLargeInteger(LONGLONG value) {
 
 #define UDFGetNTFileId(Vcb, fi) \
     UDFMakeLargeInteger((((fi)->Dloc->FELoc.Mapping[0].extLocation - UDFPartStart(Vcb, -2)) + \
-                      ((LONGLONG)Vcb<<32)))
+                      ((LONGLONG)(ULONG_PTR)Vcb<<32)))
 
 #define UnicodeIsPrint(a) RtlIsValidOemCharacter(&(a))
 

drivers/filesystems/udfs/Include/mem_tools.cpp → drivers/filesystems/udfs/Include/mem_tools.c

@@ -6,25 +6,12 @@
 
 #ifdef MY_USE_INTERNAL_MEMMANAGER
 
-#ifdef _X86_
-
 __inline VOID DbgTouch(IN PVOID addr)
 {
-    __asm {
-        mov  eax,addr
-        mov  al,[byte ptr eax]
-    }
+    volatile UCHAR a = ((volatile UCHAR*)addr)[0];
+    (void)a;
 }
 
-#else   // NO X86 optimization , use generic C/C++
-
-__inline VOID DbgTouch(IN PVOID addr)
-{
-    UCHAR a = ((PUCHAR)addr)[0];
-}
-
-#endif // _X86_
-
 //MEM_ALLOC_DESC Allocs[MY_HEAP_MAX_BLOCKS];
 
 MEM_FRAME_ALLOC_DESC FrameList[MY_HEAP_MAX_FRAMES];
@@ -39,23 +26,23 @@ InitLockMemoryManager() {
     KeInitializeSpinLock(&FrameLock);
     return STATUS_SUCCESS;
 }
-#define DeinitLockMemoryManager()  {NOTHING;}
+#define DeinitLockMemoryManager()  ((void)0)
 #else //MEM_LOCK_BY_SPINLOCK
 ERESOURCE FrameLock;
 #define LockMemoryManager()        ExAcquireResourceExclusiveLite(&FrameLock, TRUE)
 #define UnlockMemoryManager()      ExReleaseResourceForThreadLite(&FrameLock, ExGetCurrentResourceThread())
 #define InitLockMemoryManager()    ExInitializeResourceLite(&FrameLock)
 #define DeinitLockMemoryManager()  ExDeleteResourceLite(&FrameLock)
 #endif //MEM_LOCK_BY_SPINLOCK
-ULONG FrameCount;
-ULONG LastFrame;
+ULONG FrameCount = 0;
+ULONG LastFrame = 0;
 BOOLEAN MyMemInitialized = FALSE;
 
 #define MyAllocIsFrameFree(FrameList, i) \
     (!(FrameList[i].LastUsed || FrameList[i].FirstFree))
 
 #ifdef UDF_DBG
-ULONG MemTotalAllocated;
+ULONG MemTotalAllocated = 0;
 PCHAR BreakAddr;
 
 VOID
@@ -64,7 +51,7 @@ MyAllocDumpDescr(
     ULONG i
     )
 {
-    BOOLEAN Used;
+    BOOLEAN Used = FALSE;
 
     Used = (Allocs[i].Len & MY_HEAP_FLAG_USED) ? TRUE : FALSE;
     UDFPrint(("block %x \t%s addr %x len %x  \t", i, Used ? "used" : "free", Allocs[i].Addr, (Allocs[i].Len) & MY_HEAP_FLAG_LEN_MASK));
@@ -93,11 +80,11 @@ MyAllocDumpFrame(
     ULONG Frame
     )
 {
-    ULONG i;
+    ULONG i = 0;
     PMEM_ALLOC_DESC Allocs;
     Allocs = FrameList[Frame].Frame;
     ULONG k=0;
-    BOOLEAN Used;
+    BOOLEAN Used = FALSE;
 #ifdef DUMP_MEM_FRAMES
     if (!MyDumpMem)
 #endif //DUMP_MEM_FRAMES
@@ -132,7 +119,7 @@ MyAllocDumpFrames(
     VOID
     )
 {
-    ULONG i;
+    ULONG i = 0;
 
     for(i=0;i<MY_HEAP_MAX_FRAMES; i++) {
         if (FrameList[i].Frame) {
@@ -184,9 +171,9 @@ MyAllocCheck(
 //#endif //CHECK_ALLOC_FRAMES
 #else
 
-#define MyAllocDumpFrame(a) {}
-#define MyAllocCheck(a) {}
-#define MyAllocDumpFrames() {}
+#define MyAllocDumpFrame(a) ((void)0)
+#define MyAllocCheck(a) ((void)0)
+#define MyAllocDumpFrames() ((void)0)
 
 #endif // UDF_DBG
 
@@ -206,14 +193,14 @@ MyAllocatePoolInFrame(
 #endif //MY_HEAP_TRACK_REF
     )
 {
-    ULONG addr;
-    ULONG i;
-    ULONG min_len;
-    ULONG best_i;
+    ULONG addr = 0;
+    ULONG i = 0;
+    ULONG min_len = 0;
+    ULONG best_i = 0;
     PMEM_ALLOC_DESC Allocs;
     PMEM_ALLOC_DESC Allocs0;
-    ULONG LastUsed, FirstFree;
-    ULONG l;
+    ULONG LastUsed = 0, FirstFree = 0;
+    ULONG l = 0;
 
 #ifdef CHECK_ALLOC_FRAMES
     MyAllocCheck(Frame);
@@ -313,9 +300,9 @@ MyFindMemDescByAddr(
     PCHAR addr
     )
 {
-    ULONG i;
-    ULONG left;
-    ULONG right;
+    ULONG i = 0;
+    ULONG left = 0;
+    ULONG right = 0;
     PMEM_ALLOC_DESC Allocs;
 
     Allocs = FrameList[Frame].Frame;
@@ -356,8 +343,8 @@ MyFreePoolInFrame(
     )
 {
     LONG i, j;
-    ULONG pc;
-    ULONG len, len2;
+    ULONG pc = 0;
+    ULONG len = 0, len2 = 0;
     PMEM_ALLOC_DESC Allocs;
 
     Allocs = FrameList[Frame].Frame;
@@ -622,8 +609,8 @@ MyAllocatePool(
 #endif //MY_HEAP_TRACK_REF
     )
 {
-    ULONG i;
-    ULONG addr;
+    ULONG i = 0;
+    ULONG addr = 0;
 
 //    UDFPrint(("MemFrames: %x\n",FrameCount));
 
@@ -708,7 +695,7 @@ MyFindFrameByAddr(
     PCHAR addr
     )
 {
-    ULONG i;
+    ULONG i = 0;
 //    ULONG j;
     PMEM_ALLOC_DESC Allocs;
 
@@ -780,7 +767,7 @@ MyReallocPool(
 #endif
     )
 {
-    ULONG i;
+    ULONG i = 0;
     PCHAR new_buff;
 #ifdef MY_HEAP_TRACK_REF
     PCHAR Tag;
@@ -855,12 +842,12 @@ MyFindMemDescByRangeInFrame(
     PCHAR addr
     )
 {
-    ULONG i;
-    ULONG left;
-    ULONG right;
+    ULONG i = 0;
+    ULONG left = 0;
+    ULONG right = 0;
     PMEM_ALLOC_DESC Allocs;
-    ULONG curaddr;
-    ULONG curlen;
+    ULONG curaddr = 0;
+    ULONG curlen = 0;
 
     Allocs = FrameList[Frame].Frame;
 //    i = FrameList[Frame].LastUsed >> 1;
@@ -933,7 +920,7 @@ MyAllocInit(VOID)
 VOID
 MyAllocRelease(VOID)
 {
-    ULONG i;
+    ULONG i = 0;
     PMEM_ALLOC_DESC Allocs;
 
     if (!MyMemInitialized)