Skip to content

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

Closed
Copilot wants to merge 86 commits into
udf-devfrom
copilot/udfs-apply-all-open-prs
Closed

[UDFS] Revert recent commits and apply PR #360 geometry fixes#342
Copilot wants to merge 86 commits into
udf-devfrom
copilot/udfs-apply-all-open-prs

Conversation

Copy link
Copy Markdown

Copilot AI commented May 1, 2026

  • Inspect current UDFS geometry-detection logic in drivers/filesystems/udfs/Include/phys_lib.c and identify HDD vs CD-ROM path differences
  • Update HDD LastLBA path to use the old HDD-style calculation pattern with DiskGeometry (not CD-ROM logic)
  • Rebuild to verify no regressions in the modified code path
  • Run final validation checks

Copilot AI linked an issue May 1, 2026 that may be closed by this pull request
Copilot AI changed the title [WIP] Apply all open pull requests [UDFS] Apply all open PRs May 1, 2026
Copilot AI requested a review from Zero3K20 May 1, 2026 05:25
@Zero3K20
Copy link
Copy Markdown
Owner

Zero3K20 commented May 1, 2026

@copilot What about applying PR #312 ?

…chStart advance

Agent-Logs-Url: https://github.com/Zero3K20/reactos/sessions/733f211e-58cf-4005-b7ad-5cae71101dea

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
Copy link
Copy Markdown
Author

Copilot AI commented May 1, 2026

@copilot What about applying PR #312 ?

Applied in commit 7cffc5c9. The changes from PR #312 include:

  • udffs.h: added //#define BRUTE commented-out toggle
  • udf_dbg.h: replaced all {NOTHING;} and {} no-op macros with ((void)0) (C-safe, warning-free)
  • Include/mem_tools.c: same {NOTHING;}/{}((void)0) cleanup
  • udf_info/alloc.c: word-at-a-time bitmap verification in UDFCheckSpaceAllocation_ (32 blocks checked per instruction), advance SearchStart past the just-allocated fragment to avoid re-scanning

The UDFSetBits/UDFClrBits macro rewrite from PR #312 was superseded by the existing UDFChunkedSetBitRange/UDFChunkedClrBitRange implementation already present from PR #283, which uses chunked bitmaps and is more complete. Similarly, the UDFMarkBadSpaceAsUsed bounds-check variant from PR #312 was superseded by the UDFChunkedOrMemory-based implementation from PR #283.

@Zero3K20
Copy link
Copy Markdown
Owner

Zero3K20 commented May 1, 2026

@copilot

D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(247): error C2061: syntax
 error: identifier 'FCB'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(312): error C2059: syntax
 error: '}'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(363): error C2061: syntax
 error: identifier 'PUDF_DATALOC_INFO'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(408): error C2059: syntax
 error: '}'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(411): error C2061: syntax
 error: identifier 'PUDF_FILE_INFO'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(413): error C2059: syntax
 error: '}'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(433): error C2061: syntax
 error: identifier 'PUDF_DATALOC_INFO'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(434): error C2059: syntax
 error: '}'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(437): error C2061: syntax
 error: identifier 'PUDF_FILE_INFO'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(444): error C2059: syntax
 error: '}'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(451): error C2061: syntax
 error: identifier 'PUDF_FILE_INFO'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(456): error C2059: syntax
 error: '}'
D:\reactos\drivers\filesystems\udfs\struct.h(245): error C2061: syntax error: id
entifier 'PUDF_FILE_INFO'
D:\reactos\drivers\filesystems\udfs\struct.h(330): warning C4094: untagged 'unio
n' declared no symbols
D:\reactos\drivers\filesystems\udfs\struct.h(331): error C2059: syntax error: '}
'
D:\reactos\drivers\filesystems\udfs\struct.h(662): error C2061: syntax error: id
entifier 'LogicalVolIntegrityDesc'
D:\reactos\drivers\filesystems\udfs\struct.h(680): error C2061: syntax error: id
entifier 'VatFileInfo'
D:\reactos\drivers\filesystems\udfs\struct.h(680): error C2059: syntax error: ';
'
D:\reactos\drivers\filesystems\udfs\struct.h(715): error C2061: syntax error: id
entifier 'SysSDirFileInfo'
D:\reactos\drivers\filesystems\udfs\struct.h(715): error C2059: syntax error: ';
'
D:\reactos\drivers\filesystems\udfs\struct.h(717): error C2061: syntax error: id
entifier 'NonAllocFileInfo'
D:\reactos\drivers\filesystems\udfs\struct.h(717): error C2059: syntax error: ';
'
D:\reactos\drivers\filesystems\udfs\struct.h(719): error C2061: syntax error: id
entifier 'UniqueIDMapFileInfo'
D:\reactos\drivers\filesystems\udfs\struct.h(719): error C2059: syntax error: ';
'
D:\reactos\drivers\filesystems\udfs\struct.h(728): error C2061: syntax error: id
entifier 'DlocList'
D:\reactos\drivers\filesystems\udfs\struct.h(728): error C2059: syntax error: ';
'
D:\reactos\drivers\filesystems\udfs\struct.h(761): error C2059: syntax error: '}
'
D:\reactos\drivers\filesystems\udfs\struct.h(813): error C2079: 'Vcb' uses undef
ined struct 'VCB'
D:\reactos\drivers\filesystems\udfs\udf_dbg.h(54): warning C4028: formal paramet
er 1 different from declaration
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(50): error C2146: syn
tax error: missing ')' before identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(50): error C2061: syn
tax error: identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(50): error C2059: syn
tax error: ';'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(50): error C2059: syn
tax error: ','
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(54): error C2059: syn
tax error: ')'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(56): error C2146: syn
tax error: missing ')' before identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(56): error C2061: syn
tax error: identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(56): error C2059: syn
tax error: ';'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(56): error C2059: syn
tax error: ','
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(60): error C2059: syn
tax error: ')'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(113): error C2146: sy
ntax error: missing ')' before identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(113): error C2061: sy
ntax error: identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(113): error C2059: sy
ntax error: ';'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(113): error C2059: sy
ntax error: ')'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(115): error C2146: sy
ntax error: missing ')' before identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(115): error C2061: sy
ntax error: identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(115): error C2059: sy
ntax error: ';'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(115): error C2059: sy
ntax error: ')'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(117): error C2146: sy
ntax error: missing ')' before identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(117): error C2061: sy
ntax error: identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(117): error C2059: sy
ntax error: ';'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(117): error C2059: sy
ntax error: ')'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(118): error C2146: sy
ntax error: missing ')' before identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(118): error C2061: sy
ntax error: identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(118): error C2059: sy
ntax error: ';'
D:\reactos\drivers\filesystems\udfs\Include/Sys_spec_lib.h(118): error C2059: sy
ntax error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(98): error C2146: syntax
 error: missing ')' before identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(98): error C2061: syntax
 error: identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(98): error C2059: syntax
 error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(98): error C2059: syntax
 error: ','
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(100): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(102): error C2146: synta
x error: missing ')' before identifier 'Context'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(102): error C2061: synta
x error: identifier 'Context'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(102): error C2059: synta
x error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(102): error C2059: synta
x error: ','
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(103): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(110): error C2146: synta
x error: missing ')' before identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(110): error C2081: 'PUDF
_FILE_INFO': name in formal parameter list illegal
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(110): error C2061: synta
x error: identifier 'FileInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(110): error C2059: synta
x error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(111): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(119): error C2146: synta
x error: missing ')' before identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(119): error C2081: 'PUDF
_FILE_INFO': name in formal parameter list illegal
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(119): error C2061: synta
x error: identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(119): error C2059: synta
x error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(119): error C2059: synta
x error: ','
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(120): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(125): error C2146: synta
x error: missing ')' before identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(125): error C2081: 'PUDF
_FILE_INFO': name in formal parameter list illegal
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(125): error C2061: synta
x error: identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(125): error C2059: synta
x error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(125): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(126): error C2449: found
 '{' at file scope (missing function header?)
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(131): error C2059: synta
x error: '}'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(146): error C2146: synta
x error: missing ')' before identifier 'DirContext'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(146): error C2081: 'PDIR
_ENUM_CONTEXT': name in formal parameter list illegal
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(146): error C2061: synta
x error: identifier 'DirContext'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(146): error C2059: synta
x error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(146): error C2059: synta
x error: ','
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(148): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(445): error C2146: synta
x error: missing ')' before identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(445): error C2081: 'PUDF
_FILE_INFO': name in formal parameter list illegal
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(445): error C2061: synta
x error: identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(445): error C2059: synta
x error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(445): error C2059: synta
x error: ','
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(449): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(453): error C2146: synta
x error: missing ')' before identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(453): error C2081: 'PUDF
_FILE_INFO': name in formal parameter list illegal
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(453): error C2061: synta
x error: identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(453): error C2059: synta
x error: ';'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(453): error C2059: synta
x error: ','
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(454): error C2059: synta
x error: ')'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(458): error C2146: synta
x error: missing ')' before identifier 'DirInfo'
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(458): error C2081: 'PUDF
_FILE_INFO': name in formal parameter list illegal
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(458): fatal error C1003:
 error count exceeds 100; stopping compilation
[180/218] Linking C static library sdk\lib\pseh\pseh.lib

Copy link
Copy Markdown
Author

Copilot AI commented May 1, 2026

@copilot

D:\reactos\drivers\filesystems\udfs\udf_info/udf_rel.h(247): error C2061: syntax

...

Fixed in commit c13c99c8. The build errors were all C typedef forward-declaration issues introduced by the C++ → C conversion (PR #304):

  1. struct.h: Added struct FCB; typedef struct FCB FCB; before #include "udf_info/udf_rel.h" so that FCB* is a valid pointer type in C when _UDF_DATALOC_INFO is parsed inside udf_rel.h. The typedef struct FCB FCB; that was already in struct.h arrived too late (after the include).

  2. ecma_167.h: Added missing typedef aliases for ImpUseVolDesc, PartitionDesc, LogicalVolDesc, GenericPartitionMap, LogicalVolIntegrityDesc, and LogicalVolHeaderDesc — fixing the struct.h(662) LogicalVolIntegrityDesc error and pre-empting similar errors in mount.c.

  3. osta_misc.h: Added missing typedef aliases for LogicalVolIntegrityDescImpUse, ImpUseVolDescImpUse, UdfPartitionMap2, VirtualAllocationTable15, VirtualAllocationTable20, and FidADImpUse — fixing equivalent errors in mount.c and udf_info.c.

All other errors in the log (Sys_spec_lib.h, udf_info.h, struct.h lines 680–813) were cascades from the FCB* issue and will disappear with the primary fix.

@Zero3K20
Copy link
Copy Markdown
Owner

Zero3K20 commented May 1, 2026

@copilot

D:\reactos\drivers\filesystems\udfs\udf_dbg.h(54): error C2220: the following wa
rning is treated as an error
D:\reactos\drivers\filesystems\udfs\udf_dbg.h(54): warning C4028: formal paramet
er 1 different from declaration
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(1026): error C2143: synt
ax error: missing ')' before '='
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(1026): error C2072: 'UDF
FlushFile__': initialization of a function
D:\reactos\drivers\filesystems\udfs\udf_info/udf_info.h(1027): error C2059: synt
ax error: ')'
D:\reactos\drivers\filesystems\udfs\protos.h(515): error C2143: syntax error: mi
ssing ')' before '='
D:\reactos\drivers\filesystems\udfs\protos.h(515): error C2072: 'UDFFlushAFile':
 initialization of a function
D:\reactos\drivers\filesystems\udfs\protos.h(516): error C2059: syntax error: ')
'
D:\reactos\drivers\filesystems\udfs\protos.h(524): error C2143: syntax error: mi
ssing ')' before '='
D:\reactos\drivers\filesystems\udfs\protos.h(524): error C2072: 'UDFFlushADirect
ory': initialization of a function
D:\reactos\drivers\filesystems\udfs\protos.h(525): error C2059: syntax error: ')
'
D:\reactos\drivers\filesystems\udfs\protos.h(531): error C2143: syntax error: mi
ssing ')' before '='
D:\reactos\drivers\filesystems\udfs\protos.h(531): error C2072: 'UDFFlushVolume'
: initialization of a function
D:\reactos\drivers\filesystems\udfs\protos.h(532): error C2059: syntax error: ')
'
D:\reactos\drivers\filesystems\udfs\protos.h(541): error C2143: syntax error: mi
ssing ')' before '='
D:\reactos\drivers\filesystems\udfs\protos.h(541): error C2072: 'UDFFlushIsBreak
ing': initialization of a function
D:\reactos\drivers\filesystems\udfs\protos.h(541): error C2059: syntax error: ')
'
D:\reactos\drivers\filesystems\udfs\protos.h(932): error C2143: syntax error: mi
ssing ')' before '='
D:\reactos\drivers\filesystems\udfs\protos.h(932): error C2072: 'UDFGetRegParame
ter': initialization of a function
D:\reactos\drivers\filesystems\udfs\protos.h(932): error C2059: syntax error: ')
'

…int signature

Agent-Logs-Url: https://github.com/Zero3K20/reactos/sessions/9779df76-ba39-4fe0-992c-e8299fd022bb

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
Copy link
Copy Markdown
Author

Copilot AI commented May 1, 2026

@copilot

D:\reactos\drivers\filesystems\udfs\udf_dbg.h(54): error C2220: the following wa

...

Fixed in commit 6d1a8092. Two categories of errors:

  1. udf_dbg.h(54): warning C4028 — The local DbgPrint forward-declaration used PCH Format (non-const char*), but the SDK declares it with PCSTR Format (const char*). Changed to PCSTR Format to match.

  2. C++ default parameter valuesUDFFlushFile__, UDFFlushAFile, UDFFlushADirectory, UDFFlushVolume, UDFFlushIsBreaking, and UDFGetRegParameter all had = 0 default arguments in their declarations, which is not valid C. Removed = 0 from all declarations in udf_info/udf_info.h and protos.h, and updated all 17 call sites across strucsup.c, cleanup.c, create.c, shutdown.c, flush.c, write.c, fscntrl.c, udf_info/mount.c, udf_info/udf_info.c, and udf_info/phys_eject.c to pass an explicit 0.

@Zero3K20
Copy link
Copy Markdown
Owner

Zero3K20 commented May 1, 2026

@copilot

..\drivers\filesystems\udfs\udf_info\mount.c(1508): error C2065: 'GenericPartiti
onMap1': undeclared identifier
..\drivers\filesystems\udfs\udf_info\mount.c(1508): error C2065: 'gpm1': undecla
red identifier
..\drivers\filesystems\udfs\udf_info\mount.c(1508): error C2059: syntax error: '
)'
..\drivers\filesystems\udfs\udf_info\mount.c(1511): error C2065: 'gpm1': undecla
red identifier
..\drivers\filesystems\udfs\udf_info\mount.c(1511): error C2223: left of '->volS
eqNum' must point to struct/union
..\drivers\filesystems\udfs\udf_info\mount.c(1512): error C2065: 'gpm1': undecla
red identifier
..\drivers\filesystems\udfs\udf_info\mount.c(1512): error C2223: left of '->part
itionNum' must point to struct/union
..\drivers\filesystems\udfs\udf_info\mount.c(2315): error C2065: 'GenericDesc':
undeclared identifier
..\drivers\filesystems\udfs\udf_info\mount.c(2315): error C2065: 'gd': undeclare
d identifier
..\drivers\filesystems\udfs\udf_info\mount.c(2315): warning C4552: '*': result o
f expression not used
..\drivers\filesystems\udfs\udf_info\mount.c(2329): error C2065: 'gd': undeclare
d identifier
..\drivers\filesystems\udfs\udf_info\mount.c(2329): warning C4047: '=': 'int' di
ffers in levels of indirection from 'GenericDesc *'
..\drivers\filesystems\udfs\udf_info\mount.c(2330): error C2065: 'gd': undeclare
d identifier
..\drivers\filesystems\udfs\udf_info\mount.c(2330): error C2223: left of '->volD
escSeqNum' must point to struct/union
..\drivers\filesystems\udfs\udf_info\mount.c(2760): warning C4047: '=': 'uint32'
 differs in levels of indirection from 'void *'
ninja: build stopped: subcommand failed.

Copy link
Copy Markdown
Author

Copilot AI commented May 1, 2026

@copilot

..\drivers\filesystems\udfs\udf_info\mount.c(1508): error C2065: 'GenericPartiti

...

Fixed in commit 54da39bc. Two issues:

  1. GenericPartitionMap1/GenericDesc undeclaredecma_167.h was missing typedef aliases for GenericPartitionMap1, GenericPartitionMap2, TerminatingDesc, and GenericDesc. Added them alongside the existing aliases at the end of the header.

  2. relPrevExt, prevExt = NULL (C4047) — This was a C++ comma-expression that only assigned NULL to prevExt (leaving relPrevExt uninitialized) while producing a pointer-vs-integer type warning. Replaced with relPrevExt = 0; prevExt = 0;.

@Zero3K20
Copy link
Copy Markdown
Owner

Zero3K20 commented May 1, 2026

@copilot

..\drivers\filesystems\udfs\udf_info\extent.c(265): error C2220: the following w
arning is treated as an error
..\drivers\filesystems\udfs\udf_info\extent.c(265): warning C4028: formal parame
ter 4 different from declaration
..\drivers\filesystems\udfs\udf_info\extent.c(597): warning C4028: formal parame
ter 3 different from declaration

Copilot AI and others added 13 commits May 14, 2026 20:00
This reverts commit 49b920f.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit efaea67.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit 89d8617.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit 31d9e9e.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit a261606.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit 443823d.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit 9313fcd.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit aaac78c.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit b564a9a.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit 2ebd474.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
This reverts commit 72e209f.

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
Copy link
Copy Markdown
Author

Copilot AI commented May 14, 2026

@copilot Please revert the 18 most recent commits and then apply the commits from PR #360.

Done. I reverted the 18 most recent commits and then applied PR #360’s UDFS commits. The resulting commits are cdaa9bc and c943f4f.

@Zero3K20
Copy link
Copy Markdown
Owner

@copilot Vcb->LastLBA = (uint32)(PartitionInfo.PartitionLength.QuadPart >> Vcb->SectorShift)/* + Vcb->FirstLBA*/ - 1; is causing slowdown and the drive isn't being mounted after the commit did the change from what it was before to what I mentioned. Please change the line to use DiskGeometry.

Copilot AI and others added 4 commits May 14, 2026 21:43
Agent-Logs-Url: https://github.com/Zero3K20/reactos/sessions/1f3edd4c-1628-4e54-9b5e-22bbc239ebe0

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Zero3K20/reactos/sessions/1f3edd4c-1628-4e54-9b5e-22bbc239ebe0

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Zero3K20/reactos/sessions/1f3edd4c-1628-4e54-9b5e-22bbc239ebe0

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Zero3K20/reactos/sessions/1f3edd4c-1628-4e54-9b5e-22bbc239ebe0

Co-authored-by: Zero3K20 <258969903+Zero3K20@users.noreply.github.com>
Copy link
Copy Markdown
Author

Copilot AI commented May 14, 2026

@copilot Vcb->LastLBA = (uint32)(PartitionInfo.PartitionLength.QuadPart >> Vcb->SectorShift)/* + Vcb->FirstLBA*/ - 1; is causing slowdown and the drive isn't being mounted after the commit did the ch...

Updated in commit 47d60ea4. I changed the disk-path Vcb->LastLBA calculation in UDFGetBlockSize to use DiskGeometry instead of PartitionInfo.PartitionLength, with explicit 64-bit multiplication and bounds checks before assigning to uint32.

@Zero3K20
Copy link
Copy Markdown
Owner

@copilot The current DiskGeometry code being used for HDD mounting should be modified to be like how it was before the changes but with the Ex variant changed to the regular one.

Copilot AI and others added 2 commits May 14, 2026 22:54
Copy link
Copy Markdown
Author

Copilot AI commented May 14, 2026

@copilot The current DiskGeometry code being used for HDD mounting should be modified to be like how it was before the changes but with the Ex variant changed to the regular one.

Implemented in commit 1ca061f5. I changed the HDD mount LastLBA block back to the prior style while keeping the EX-to-regular geometry conversion (IOCTL_DISK_GET_DRIVE_GEOMETRY/DISK_GEOMETRY), with only minimal safety handling retained.

@Zero3K20
Copy link
Copy Markdown
Owner

@copilot I meant the old line that is as follows:

Vcb->LastLBA = (uint32)(DiskGeometryEx.DiskSize.QuadPart >> Vcb->SectorShift)/* + Vcb->FirstLBA*/ - 1;

It was in phys_lib.cpp at line 837. It should be reverted to that/those line(s) and modified to use DiskGeometry instead of DiskGeometryEx.

Copy link
Copy Markdown
Author

Copilot AI commented May 14, 2026

@copilot I meant the old line that is as follows:

...

Applied in commit 8f703cf6. I reverted the HDD LastLBA calculation to the old (... >> Vcb->SectorShift) - 1 style and adapted it to regular DiskGeometry fields (instead of DiskGeometryEx) in phys_lib.c.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[UDFS] Apply all open PRs

2 participants