File tree Expand file tree Collapse file tree 5 files changed +23
-3
lines changed
drivers/filesystems/cdfs_new Expand file tree Collapse file tree 5 files changed +23
-3
lines changed Original file line number Diff line number Diff line change @@ -171,7 +171,7 @@ typedef PVOID PBCB; //**** Bcb's are now part of the cache module
171
171
#define BYTE_COUNT_EMBEDDED_NAME (32)
172
172
173
173
#ifdef __REACTOS__
174
- #define __volatile
174
+ #define __volatile volatile
175
175
#define _Unreferenced_parameter_
176
176
#define __field_range (a ,b )
177
177
#define __analysis_assert (x )
Original file line number Diff line number Diff line change @@ -2607,6 +2607,9 @@ Return Value:
2607
2607
// Make sure we don't try and read past end of the last track.
2608
2608
//
2609
2609
2610
+ #ifdef __REACTOS__
2611
+ if (Vcb -> CdromToc ) {
2612
+ #endif
2610
2613
TrackData = & Vcb -> CdromToc -> TrackData [(Vcb -> CdromToc -> LastTrack - Vcb -> CdromToc -> FirstTrack + 1 )];
2611
2614
2612
2615
SwapCopyUchar4 ( & EndBlock , & TrackData -> Address );
@@ -2617,6 +2620,12 @@ Return Value:
2617
2620
2618
2621
Blocks = CD_SEC_CHUNK_BLOCKS ;
2619
2622
}
2623
+ #ifdef __REACTOS__
2624
+ } else {
2625
+ // HACK!!!!!!!! Might cause reads to overrun the end of the partition, no idea what consequences that can have.
2626
+ Blocks = CD_SEC_CHUNK_BLOCKS ;
2627
+ }
2628
+ #endif
2620
2629
2621
2630
if ((0 == Blocks ) || (Lbn < 16 )) {
2622
2631
Original file line number Diff line number Diff line change @@ -1066,7 +1066,12 @@ Return Value:
1066
1066
//
1067
1067
1068
1068
if (!FlagOn ( Vcb -> VcbState , VCB_STATE_AUDIO_DISK ) &&
1069
+ #ifndef __REACTOS__
1069
1070
((Vcb -> CdromToc -> LastTrack - Vcb -> CdromToc -> FirstTrack ) == 0 )) {
1071
+ #else
1072
+ ((FilesystemDeviceType == FILE_DEVICE_DISK_FILE_SYSTEM ) ||
1073
+ ((Vcb -> CdromToc -> LastTrack - Vcb -> CdromToc -> FirstTrack ) == 0 ))) {
1074
+ #endif
1070
1075
1071
1076
ULONG Index ;
1072
1077
PUCHAR Buffer ;
Original file line number Diff line number Diff line change @@ -167,6 +167,10 @@ Return Value:
167
167
168
168
IoUnregisterFileSystem ( CdData .FileSystemDeviceObject );
169
169
IoDeleteDevice ( CdData .FileSystemDeviceObject );
170
+ #ifdef __REACTOS__
171
+ IoUnregisterFileSystem ( CdData .HddFileSystemDeviceObject );
172
+ IoDeleteDevice ( CdData .HddFileSystemDeviceObject );
173
+ #endif
170
174
171
175
CdCompleteRequest ( IrpContext , Irp , STATUS_SUCCESS );
172
176
return STATUS_SUCCESS ;
Original file line number Diff line number Diff line change @@ -16,5 +16,7 @@ The following FSD are shared with: http://www.acc.umu.se/~bosse/
16
16
reactos/drivers/filesystems/ffs # Synced to 0.5.2
17
17
reactos/drivers/filesystems/reiserfs # Synced to 0.26
18
18
19
- The following FSD are shared with: https://github.com/Microsoft/Windows-driver-samples.
20
- reactos/drivers/filesystems/fastfat_new # Synced to 2817004
19
+ The following FSD are shared with: https://github.com/Microsoft/Windows-driver-samples
20
+
21
+ reactos/drivers/filesystems/fastfat_new # Synced to 2817004
22
+ reactos/drivers/filesystems/cdfs_new # Synced to 2817004
You can’t perform that action at this time.
0 commit comments