mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 01:42:30 +00:00
- Now it compiles.
- Add wdk_wnet_to_ros.diff to easily merge changes with any possible future WDK updates. svn path=/trunk/; revision=34616
This commit is contained in:
parent
77a8db07f3
commit
c1937b5160
|
@ -128,7 +128,7 @@ Return Value:
|
||||||
{
|
{
|
||||||
BOOLEAN FirstPass = TRUE;
|
BOOLEAN FirstPass = TRUE;
|
||||||
ULONG McbEntryOffset;
|
ULONG McbEntryOffset;
|
||||||
PFCB ParentFcb;
|
PFCB ParentFcb = NULL; /* ReactOS Change: GCC uninitialized variable bug */
|
||||||
BOOLEAN CleanupParent = FALSE;
|
BOOLEAN CleanupParent = FALSE;
|
||||||
|
|
||||||
BOOLEAN UnlockFcb = FALSE;
|
BOOLEAN UnlockFcb = FALSE;
|
||||||
|
|
|
@ -417,7 +417,6 @@ Return Value:
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef CD_SANITY
|
#ifdef CD_SANITY
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
@ -481,7 +480,6 @@ CdRaiseStatusEx(
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
LONG
|
LONG
|
||||||
CdExceptionFilter (
|
CdExceptionFilter (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
|
@ -1006,6 +1004,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastIoCheckIfPossible (
|
CdFastIoCheckIfPossible (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN PLARGE_INTEGER FileOffset,
|
IN PLARGE_INTEGER FileOffset,
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
|
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
|
||||||
<module name="cdfs_new" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs_new.sys">
|
<module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys">
|
||||||
<bootstrap installbase="$(CDOUTPUT)" />
|
<bootstrap installbase="$(CDOUTPUT)" />
|
||||||
<include base="cdfs_new">.</include>
|
<include base="cdfs">.</include>
|
||||||
<library>ntoskrnl</library>
|
<library>ntoskrnl</library>
|
||||||
<library>hal</library>
|
<library>hal</library>
|
||||||
<file>allocsup.c</file>
|
<file>allocsup.c</file>
|
||||||
|
@ -32,6 +32,5 @@
|
||||||
<file>volinfo.c</file>
|
<file>volinfo.c</file>
|
||||||
<file>workque.c</file>
|
<file>workque.c</file>
|
||||||
<file>cdfs.rc</file>
|
<file>cdfs.rc</file>
|
||||||
<compilerflag>-fms-extensions</compilerflag>
|
|
||||||
<pch>cdprocs.h</pch>
|
<pch>cdprocs.h</pch>
|
||||||
</module>
|
</module>
|
||||||
|
|
|
@ -22,12 +22,14 @@ Abstract:
|
||||||
#define BugCheckFileId (CDFS_BUG_CHECK_CDINIT)
|
#define BugCheckFileId (CDFS_BUG_CHECK_CDINIT)
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
DriverEntry(
|
DriverEntry(
|
||||||
IN PDRIVER_OBJECT DriverObject,
|
IN PDRIVER_OBJECT DriverObject,
|
||||||
IN PUNICODE_STRING RegistryPath
|
IN PUNICODE_STRING RegistryPath
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdUnload(
|
CdUnload(
|
||||||
IN PDRIVER_OBJECT DriverObject
|
IN PDRIVER_OBJECT DriverObject
|
||||||
);
|
);
|
||||||
|
@ -39,6 +41,7 @@ CdInitializeGlobalData (
|
||||||
);
|
);
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdShutdown (
|
CdShutdown (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
|
@ -57,6 +60,7 @@ CdShutdown (
|
||||||
//
|
//
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
DriverEntry(
|
DriverEntry(
|
||||||
IN PDRIVER_OBJECT DriverObject,
|
IN PDRIVER_OBJECT DriverObject,
|
||||||
IN PUNICODE_STRING RegistryPath
|
IN PUNICODE_STRING RegistryPath
|
||||||
|
@ -169,6 +173,7 @@ Return Value:
|
||||||
}
|
}
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdShutdown (
|
CdShutdown (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
|
@ -200,6 +205,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdUnload(
|
CdUnload(
|
||||||
IN PDRIVER_OBJECT DriverObject
|
IN PDRIVER_OBJECT DriverObject
|
||||||
)
|
)
|
||||||
|
@ -310,10 +316,10 @@ Return Value:
|
||||||
// Initialize the cache manager callback routines
|
// Initialize the cache manager callback routines
|
||||||
//
|
//
|
||||||
|
|
||||||
CdData.CacheManagerCallbacks.AcquireForLazyWrite = &CdAcquireForCache;
|
CdData.CacheManagerCallbacks.AcquireForLazyWrite = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = &CdReleaseFromCache;
|
CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
CdData.CacheManagerCallbacks.AcquireForReadAhead = &CdAcquireForCache;
|
CdData.CacheManagerCallbacks.AcquireForReadAhead = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
CdData.CacheManagerCallbacks.ReleaseFromReadAhead = &CdReleaseFromCache;
|
CdData.CacheManagerCallbacks.ReleaseFromReadAhead = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
|
|
||||||
CdData.CacheManagerVolumeCallbacks.AcquireForLazyWrite = &CdNoopAcquire;
|
CdData.CacheManagerVolumeCallbacks.AcquireForLazyWrite = &CdNoopAcquire;
|
||||||
CdData.CacheManagerVolumeCallbacks.ReleaseFromLazyWrite = &CdNoopRelease;
|
CdData.CacheManagerVolumeCallbacks.ReleaseFromLazyWrite = &CdNoopRelease;
|
||||||
|
|
|
@ -44,28 +44,30 @@ Abstract:
|
||||||
// Here are the different pool tags.
|
// Here are the different pool tags.
|
||||||
//
|
//
|
||||||
|
|
||||||
#define TAG_CCB 'ccdC' // Ccb
|
/* ReactOS Change: GCC doesn't understand this, use TAG macro */
|
||||||
#define TAG_CDROM_TOC 'ctdC' // TOC
|
#include <reactos/helper.h>
|
||||||
#define TAG_DIRENT_NAME 'nddC' // CdName in dirent
|
#define TAG_CCB TAG('c','c','d','C') // Ccb
|
||||||
#define TAG_ENUM_EXPRESSION 'eedC' // Search expression for enumeration
|
#define TAG_CDROM_TOC TAG('c','t','d','C') // TOC
|
||||||
#define TAG_FCB_DATA 'dfdC' // Data Fcb
|
#define TAG_DIRENT_NAME TAG('n','d','d','C') // CdName in dirent
|
||||||
#define TAG_FCB_INDEX 'ifdC' // Index Fcb
|
#define TAG_ENUM_EXPRESSION TAG('e','e','d','C') // Search expression for enumeration
|
||||||
#define TAG_FCB_NONPAGED 'nfdC' // Nonpaged Fcb
|
#define TAG_FCB_DATA TAG('d','f','d','C') // Data Fcb
|
||||||
#define TAG_FCB_TABLE 'tfdC' // Fcb Table entry
|
#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb
|
||||||
#define TAG_FILE_NAME 'nFdC' // Filename buffer
|
#define TAG_FCB_NONPAGED TAG('n','f','d','C') // Nonpaged Fcb
|
||||||
#define TAG_GEN_SHORT_NAME 'sgdC' // Generated short name
|
#define TAG_FCB_TABLE TAG('t','f','d','C') // Fcb Table entry
|
||||||
#define TAG_IO_BUFFER 'fbdC' // Temporary IO buffer
|
#define TAG_FILE_NAME TAG('n','F','d','C') // Filename buffer
|
||||||
#define TAG_IO_CONTEXT 'oidC' // Io context for async reads
|
#define TAG_GEN_SHORT_NAME TAG('s','g','d','C') // Generated short name
|
||||||
#define TAG_IRP_CONTEXT 'cidC' // Irp Context
|
#define TAG_IO_BUFFER TAG('f','b','d','C') // Temporary IO buffer
|
||||||
#define TAG_IRP_CONTEXT_LITE 'lidC' // Irp Context lite
|
#define TAG_IO_CONTEXT TAG('o','i','d','C') // Io context for async reads
|
||||||
#define TAG_MCB_ARRAY 'amdC' // Mcb array
|
#define TAG_IRP_CONTEXT TAG('c','i','d','C') // Irp Context
|
||||||
#define TAG_PATH_ENTRY_NAME 'nPdC' // CdName in path entry
|
#define TAG_IRP_CONTEXT_LITE TAG('l','i','d','C') // Irp Context lite
|
||||||
#define TAG_PREFIX_ENTRY 'epdC' // Prefix Entry
|
#define TAG_MCB_ARRAY TAG('a','m','d','C') // Mcb array
|
||||||
#define TAG_PREFIX_NAME 'npdC' // Prefix Entry name
|
#define TAG_PATH_ENTRY_NAME TAG('n','P','d','C') // CdName in path entry
|
||||||
#define TAG_SPANNING_PATH_TABLE 'psdC' // Buffer for spanning path table
|
#define TAG_PREFIX_ENTRY TAG('e','p','d','C') // Prefix Entry
|
||||||
#define TAG_UPCASE_NAME 'nudC' // Buffer for upcased name
|
#define TAG_PREFIX_NAME TAG('n','p','d','C') // Prefix Entry name
|
||||||
#define TAG_VOL_DESC 'dvdC' // Buffer for volume descriptor
|
#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C') // Buffer for spanning path table
|
||||||
#define TAG_VPB 'pvdC' // Vpb allocated in filesystem
|
#define TAG_UPCASE_NAME TAG('n','u','d','C') // Buffer for upcased name
|
||||||
|
#define TAG_VOL_DESC TAG('d','v','d','C') // Buffer for volume descriptor
|
||||||
|
#define TAG_VPB TAG('p','v','d','C') // Vpb allocated in filesystem
|
||||||
|
|
||||||
//
|
//
|
||||||
// Tag all of our allocations if tagging is turned on
|
// Tag all of our allocations if tagging is turned on
|
||||||
|
@ -902,33 +904,39 @@ CdAcquireResource (
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdNoopAcquire (
|
CdNoopAcquire (
|
||||||
IN PVOID Fcb,
|
IN PVOID Fcb,
|
||||||
IN BOOLEAN Wait
|
IN BOOLEAN Wait
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdNoopRelease (
|
CdNoopRelease (
|
||||||
IN PVOID Fcb
|
IN PVOID Fcb
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdAcquireForCache (
|
CdAcquireForCache (
|
||||||
IN PFCB Fcb,
|
IN PFCB Fcb,
|
||||||
IN BOOLEAN Wait
|
IN BOOLEAN Wait
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdReleaseFromCache (
|
CdReleaseFromCache (
|
||||||
IN PFCB Fcb
|
IN PFCB Fcb
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdAcquireForCreateSection (
|
CdAcquireForCreateSection (
|
||||||
IN PFILE_OBJECT FileObject
|
IN PFILE_OBJECT FileObject
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdReleaseForCreateSection (
|
CdReleaseForCreateSection (
|
||||||
IN PFILE_OBJECT FileObject
|
IN PFILE_OBJECT FileObject
|
||||||
);
|
);
|
||||||
|
@ -1184,8 +1192,8 @@ CdProcessToc (
|
||||||
// Verification support routines. Contained in verfysup.c
|
// Verification support routines. Contained in verfysup.c
|
||||||
//
|
//
|
||||||
|
|
||||||
|
/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */
|
||||||
INLINE
|
static inline
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
CdOperationIsDasdOpen(
|
CdOperationIsDasdOpen(
|
||||||
IN PIRP_CONTEXT IrpContext
|
IN PIRP_CONTEXT IrpContext
|
||||||
|
@ -1272,12 +1280,14 @@ CdFsdPostRequest(
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdPrePostIrp (
|
CdPrePostIrp (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdOplockComplete (
|
CdOplockComplete (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
|
@ -1293,7 +1303,9 @@ CdOplockComplete (
|
||||||
// otherwise
|
// otherwise
|
||||||
//
|
//
|
||||||
|
|
||||||
//#ifndef BooleanFlagOn
|
/* ReactOS Change: GCC doesn't understand the comment style */
|
||||||
|
/*
|
||||||
|
//#ifndef BooleanFlagOn
|
||||||
//#define BooleanFlagOn(F,SF) ( \
|
//#define BooleanFlagOn(F,SF) ( \
|
||||||
// (BOOLEAN)(((F) & (SF)) != 0) \
|
// (BOOLEAN)(((F) & (SF)) != 0) \
|
||||||
//)
|
//)
|
||||||
|
@ -1310,6 +1322,7 @@ CdOplockComplete (
|
||||||
// (Flags) &= ~(SingleFlag); \
|
// (Flags) &= ~(SingleFlag); \
|
||||||
//}
|
//}
|
||||||
//#endif
|
//#endif
|
||||||
|
*/
|
||||||
|
|
||||||
//
|
//
|
||||||
// CAST
|
// CAST
|
||||||
|
@ -1598,6 +1611,7 @@ CdRaiseStatusEx(
|
||||||
//
|
//
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastQueryBasicInfo (
|
CdFastQueryBasicInfo (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN BOOLEAN Wait,
|
IN BOOLEAN Wait,
|
||||||
|
@ -1607,6 +1621,7 @@ CdFastQueryBasicInfo (
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastQueryStdInfo (
|
CdFastQueryStdInfo (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN BOOLEAN Wait,
|
IN BOOLEAN Wait,
|
||||||
|
@ -1616,6 +1631,7 @@ CdFastQueryStdInfo (
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastLock (
|
CdFastLock (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN PLARGE_INTEGER FileOffset,
|
IN PLARGE_INTEGER FileOffset,
|
||||||
|
@ -1629,6 +1645,7 @@ CdFastLock (
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastUnlockSingle (
|
CdFastUnlockSingle (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN PLARGE_INTEGER FileOffset,
|
IN PLARGE_INTEGER FileOffset,
|
||||||
|
@ -1640,6 +1657,7 @@ CdFastUnlockSingle (
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastUnlockAll (
|
CdFastUnlockAll (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
PEPROCESS ProcessId,
|
PEPROCESS ProcessId,
|
||||||
|
@ -1648,6 +1666,7 @@ CdFastUnlockAll (
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastUnlockAllByKey (
|
CdFastUnlockAllByKey (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
PVOID ProcessId,
|
PVOID ProcessId,
|
||||||
|
@ -1657,6 +1676,7 @@ CdFastUnlockAllByKey (
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastIoCheckIfPossible (
|
CdFastIoCheckIfPossible (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN PLARGE_INTEGER FileOffset,
|
IN PLARGE_INTEGER FileOffset,
|
||||||
|
@ -1669,6 +1689,7 @@ CdFastIoCheckIfPossible (
|
||||||
);
|
);
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastQueryNetworkInfo (
|
CdFastQueryNetworkInfo (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN BOOLEAN Wait,
|
IN BOOLEAN Wait,
|
||||||
|
@ -1862,17 +1883,26 @@ CdCommonPnp ( // Implemented in Pnp.c
|
||||||
//
|
//
|
||||||
// #define try_return(S) { S; goto try_exit; }
|
// #define try_return(S) { S; goto try_exit; }
|
||||||
//
|
//
|
||||||
|
/* ReactOS Change: Remove SEH */
|
||||||
|
#define try
|
||||||
|
#define leave goto exitLabel;
|
||||||
|
#define finally if (0) goto exitLabel; exitLabel:
|
||||||
|
#define except(x) while (0)
|
||||||
|
#define GetExceptionCode() 0
|
||||||
|
#define AbnormalTermination() 0
|
||||||
|
|
||||||
|
#define try_return(S) { goto try_exit; }
|
||||||
|
#define try_leave(S) { leave; }
|
||||||
|
|
||||||
#define try_return(S) { S; goto try_exit; }
|
|
||||||
#define try_leave(S) { S; leave; }
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Encapsulate safe pool freeing
|
// Encapsulate safe pool freeing
|
||||||
//
|
//
|
||||||
|
/* ReactOS Change: GCC "passing argument 1 of CdFreePool from incompatible pointer type" */
|
||||||
|
#define CdFreePool(x) _CdFreePool((PVOID*)(x))
|
||||||
|
|
||||||
INLINE
|
/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */
|
||||||
VOID
|
static inline void _CdFreePool(
|
||||||
CdFreePool(
|
|
||||||
IN PVOID *Pool
|
IN PVOID *Pool
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
|
@ -504,8 +504,8 @@ typedef struct _VCB {
|
||||||
//
|
//
|
||||||
|
|
||||||
ULONG VcbCleanup;
|
ULONG VcbCleanup;
|
||||||
ULONG VcbReference;
|
LONG VcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */
|
||||||
ULONG VcbUserReference;
|
LONG VcbUserReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */
|
||||||
|
|
||||||
//
|
//
|
||||||
// Fcb for the Volume Dasd file, root directory and the Path Table.
|
// Fcb for the Volume Dasd file, root directory and the Path Table.
|
||||||
|
@ -655,7 +655,7 @@ typedef struct _VOLUME_DEVICE_OBJECT {
|
||||||
// executed later.
|
// executed later.
|
||||||
//
|
//
|
||||||
|
|
||||||
ULONG PostedRequestCount;
|
LONG PostedRequestCount; /* ReactOS Change: GCC "pointer targets in passing argument 1 of 'InterlockedDecrement' differ in signedness" */
|
||||||
|
|
||||||
//
|
//
|
||||||
// The following field indicates the number of IRP's waiting
|
// The following field indicates the number of IRP's waiting
|
||||||
|
@ -878,7 +878,7 @@ typedef struct _FCB {
|
||||||
//
|
//
|
||||||
|
|
||||||
ULONG FcbCleanup;
|
ULONG FcbCleanup;
|
||||||
ULONG FcbReference;
|
LONG FcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */
|
||||||
ULONG FcbUserReference;
|
ULONG FcbUserReference;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -159,7 +159,7 @@ Return Value:
|
||||||
// Use a try-finally to facilitate cleanup.
|
// Use a try-finally to facilitate cleanup.
|
||||||
//
|
//
|
||||||
|
|
||||||
try {
|
//try { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */
|
||||||
|
|
||||||
//
|
//
|
||||||
// Case on the type of open that we are trying to cleanup.
|
// Case on the type of open that we are trying to cleanup.
|
||||||
|
@ -279,7 +279,7 @@ Return Value:
|
||||||
|
|
||||||
IoRemoveShareAccess( FileObject, &Fcb->ShareAccess );
|
IoRemoveShareAccess( FileObject, &Fcb->ShareAccess );
|
||||||
|
|
||||||
} finally {
|
//} finally { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */
|
||||||
|
|
||||||
CdReleaseFcb( IrpContext, Fcb );
|
CdReleaseFcb( IrpContext, Fcb );
|
||||||
|
|
||||||
|
@ -287,7 +287,7 @@ Return Value:
|
||||||
|
|
||||||
FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK );
|
FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK );
|
||||||
}
|
}
|
||||||
}
|
//} /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */
|
||||||
|
|
||||||
//
|
//
|
||||||
// If appropriate, try to spark teardown by purging the volume. Should
|
// If appropriate, try to spark teardown by purging the volume. Should
|
||||||
|
|
|
@ -77,6 +77,7 @@ CdRemoveClose (
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdCloseWorker (
|
CdCloseWorker (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PVOID Context
|
IN PVOID Context
|
||||||
|
@ -136,8 +137,8 @@ Return Value:
|
||||||
//
|
//
|
||||||
// Continue processing until there are no more closes to process.
|
// Continue processing until there are no more closes to process.
|
||||||
//
|
//
|
||||||
|
/* ReactOS Change: "GCC suggest parentheses around assignment used as truth value" */
|
||||||
while (IrpContext = CdRemoveClose( Vcb )) {
|
while ((IrpContext = CdRemoveClose( Vcb ))) {
|
||||||
|
|
||||||
//
|
//
|
||||||
// If we don't have an IrpContext then use the one on the stack.
|
// If we don't have an IrpContext then use the one on the stack.
|
||||||
|
@ -165,7 +166,7 @@ Return Value:
|
||||||
// Free the IrpContextLite.
|
// Free the IrpContextLite.
|
||||||
//
|
//
|
||||||
|
|
||||||
CdFreeIrpContextLite( (PIRP_CONTEXT_LITE) IrpContext );
|
CdFreeIrpContextLite( IrpContext ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */
|
||||||
|
|
||||||
//
|
//
|
||||||
// Remember we have the IrpContext from the stack.
|
// Remember we have the IrpContext from the stack.
|
||||||
|
@ -662,6 +663,7 @@ Return Value:
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdCloseWorker (
|
CdCloseWorker (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PVOID Context
|
IN PVOID Context
|
||||||
|
|
|
@ -2106,7 +2106,7 @@ Return Value:
|
||||||
PFCB NextFcb;
|
PFCB NextFcb;
|
||||||
PFCB ParentFcb = NULL;
|
PFCB ParentFcb = NULL;
|
||||||
|
|
||||||
NTSTATUS Status;
|
NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC uninitialized variable */
|
||||||
|
|
||||||
PAGED_CODE();
|
PAGED_CODE();
|
||||||
|
|
||||||
|
@ -2757,8 +2757,8 @@ Return Value:
|
||||||
OplockStatus = FsRtlCheckOplock( &Fcb->Oplock,
|
OplockStatus = FsRtlCheckOplock( &Fcb->Oplock,
|
||||||
IrpContext->Irp,
|
IrpContext->Irp,
|
||||||
IrpContext,
|
IrpContext,
|
||||||
CdOplockComplete,
|
(PVOID)CdOplockComplete, /* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
CdPrePostIrp );
|
(PVOID)CdPrePostIrp ); /* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
|
|
||||||
if (OplockStatus == STATUS_PENDING) {
|
if (OplockStatus == STATUS_PENDING) {
|
||||||
|
|
||||||
|
@ -2789,8 +2789,8 @@ Return Value:
|
||||||
OplockStatus = FsRtlCheckOplock( &Fcb->Oplock,
|
OplockStatus = FsRtlCheckOplock( &Fcb->Oplock,
|
||||||
IrpContext->Irp,
|
IrpContext->Irp,
|
||||||
IrpContext,
|
IrpContext,
|
||||||
CdOplockComplete,
|
(PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
CdPrePostIrp );
|
(PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
|
|
||||||
if (OplockStatus == STATUS_PENDING) {
|
if (OplockStatus == STATUS_PENDING) {
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ Return Value:
|
||||||
PIO_STACK_LOCATION IrpSp;
|
PIO_STACK_LOCATION IrpSp;
|
||||||
PIO_STACK_LOCATION NextIrpSp;
|
PIO_STACK_LOCATION NextIrpSp;
|
||||||
|
|
||||||
PVOID TargetBuffer = NULL;
|
// PVOID TargetBuffer = NULL; /* ReactOS Change: GCC unused variable */
|
||||||
|
|
||||||
PAGED_CODE();
|
PAGED_CODE();
|
||||||
|
|
||||||
|
|
|
@ -165,6 +165,7 @@ CdWaitSync (
|
||||||
);
|
);
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdMultiSyncCompletionRoutine (
|
CdMultiSyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -172,6 +173,7 @@ CdMultiSyncCompletionRoutine (
|
||||||
);
|
);
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdMultiAsyncCompletionRoutine (
|
CdMultiAsyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -179,6 +181,7 @@ CdMultiAsyncCompletionRoutine (
|
||||||
);
|
);
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdSingleSyncCompletionRoutine (
|
CdSingleSyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -186,6 +189,7 @@ CdSingleSyncCompletionRoutine (
|
||||||
);
|
);
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdSingleAsyncCompletionRoutine (
|
CdSingleAsyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -2943,6 +2947,7 @@ Return Value:
|
||||||
//
|
//
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdMultiSyncCompletionRoutine (
|
CdMultiSyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -3029,6 +3034,7 @@ Return Value:
|
||||||
//
|
//
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdMultiAsyncCompletionRoutine (
|
CdMultiAsyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -3066,7 +3072,8 @@ Return Value:
|
||||||
|
|
||||||
{
|
{
|
||||||
PCD_IO_CONTEXT IoContext = Context;
|
PCD_IO_CONTEXT IoContext = Context;
|
||||||
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp );
|
/* ReactOS Change: GCC Unused Variable */
|
||||||
|
//PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp );
|
||||||
|
|
||||||
AssertVerifyDeviceIrp( Irp );
|
AssertVerifyDeviceIrp( Irp );
|
||||||
|
|
||||||
|
@ -3148,6 +3155,7 @@ Return Value:
|
||||||
//
|
//
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdSingleSyncCompletionRoutine (
|
CdSingleSyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -3207,6 +3215,7 @@ Return Value:
|
||||||
//
|
//
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdSingleAsyncCompletionRoutine (
|
CdSingleAsyncCompletionRoutine (
|
||||||
IN PDEVICE_OBJECT DeviceObject,
|
IN PDEVICE_OBJECT DeviceObject,
|
||||||
IN PIRP Irp,
|
IN PIRP Irp,
|
||||||
|
@ -3267,7 +3276,7 @@ Return Value:
|
||||||
// and finally, free the context record.
|
// and finally, free the context record.
|
||||||
//
|
//
|
||||||
|
|
||||||
CdFreeIoContext( (PCD_IO_CONTEXT) Context );
|
CdFreeIoContext( Context ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
|
|
||||||
UNREFERENCED_PARAMETER( DeviceObject );
|
UNREFERENCED_PARAMETER( DeviceObject );
|
||||||
|
|
|
@ -209,7 +209,7 @@ Return Value:
|
||||||
|
|
||||||
ULONG BaseLength;
|
ULONG BaseLength;
|
||||||
|
|
||||||
PFILE_BOTH_DIR_INFORMATION DirInfo;
|
PFILE_BOTH_DIR_INFORMATION DirInfo = NULL; /* ReactOS Change: GCC Uninit var */
|
||||||
PFILE_NAMES_INFORMATION NamesInfo;
|
PFILE_NAMES_INFORMATION NamesInfo;
|
||||||
PFILE_ID_FULL_DIR_INFORMATION IdFullDirInfo;
|
PFILE_ID_FULL_DIR_INFORMATION IdFullDirInfo;
|
||||||
PFILE_ID_BOTH_DIR_INFORMATION IdBothDirInfo;
|
PFILE_ID_BOTH_DIR_INFORMATION IdBothDirInfo;
|
||||||
|
@ -579,6 +579,9 @@ Return Value:
|
||||||
NamesInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes;
|
NamesInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* ReactOS Change: GCC "enumeration value not handled in switch" */
|
||||||
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -465,7 +465,7 @@ Return Value:
|
||||||
// Save a pointer to the time stamps.
|
// Save a pointer to the time stamps.
|
||||||
//
|
//
|
||||||
|
|
||||||
Dirent->CdTime = RawDirent->RecordTime;
|
Dirent->CdTime = (PCHAR)RawDirent->RecordTime; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
|
|
||||||
//
|
//
|
||||||
// Copy the dirent flags.
|
// Copy the dirent flags.
|
||||||
|
@ -501,7 +501,7 @@ Return Value:
|
||||||
}
|
}
|
||||||
|
|
||||||
Dirent->FileNameLen = RawDirent->FileIdLen;
|
Dirent->FileNameLen = RawDirent->FileIdLen;
|
||||||
Dirent->FileName = RawDirent->FileId;
|
Dirent->FileName = (PCHAR)RawDirent->FileId; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
|
|
||||||
//
|
//
|
||||||
// If there are any remaining bytes at the end of the dirent then
|
// If there are any remaining bytes at the end of the dirent then
|
||||||
|
@ -1457,7 +1457,7 @@ Return Value:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
{
|
{
|
||||||
XA_EXTENT_TYPE ExtentType;
|
XA_EXTENT_TYPE ExtentType = 0; /* ReactOS Change: GCC Uninit var */
|
||||||
PCOMPOUND_DIRENT CurrentCompoundDirent;
|
PCOMPOUND_DIRENT CurrentCompoundDirent;
|
||||||
PDIRENT CurrentDirent;
|
PDIRENT CurrentDirent;
|
||||||
|
|
||||||
|
|
|
@ -460,6 +460,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastQueryBasicInfo (
|
CdFastQueryBasicInfo (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN BOOLEAN Wait,
|
IN BOOLEAN Wait,
|
||||||
|
@ -577,6 +578,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastQueryStdInfo (
|
CdFastQueryStdInfo (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN BOOLEAN Wait,
|
IN BOOLEAN Wait,
|
||||||
|
@ -704,6 +706,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastQueryNetworkInfo (
|
CdFastQueryNetworkInfo (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN BOOLEAN Wait,
|
IN BOOLEAN Wait,
|
||||||
|
|
|
@ -105,7 +105,7 @@ Return Value:
|
||||||
FileObject->FsContext = Fcb;
|
FileObject->FsContext = Fcb;
|
||||||
FileObject->FsContext2 = Ccb;
|
FileObject->FsContext2 = Ccb;
|
||||||
|
|
||||||
SetFlag( ((ULONG_PTR) FileObject->FsContext2), TypeOfOpen );
|
SetFlag( (*(PULONG_PTR)&FileObject->FsContext2), TypeOfOpen ); /* ReactOS Change: GCC "invalid lvalue in assignment" */
|
||||||
|
|
||||||
//
|
//
|
||||||
// Set the Vpb field in the file object.
|
// Set the Vpb field in the file object.
|
||||||
|
@ -176,7 +176,7 @@ Return Value:
|
||||||
*Fcb = FileObject->FsContext;
|
*Fcb = FileObject->FsContext;
|
||||||
*Ccb = FileObject->FsContext2;
|
*Ccb = FileObject->FsContext2;
|
||||||
|
|
||||||
ClearFlag( (ULONG_PTR) *Ccb, TYPE_OF_OPEN_MASK );
|
ClearFlag( (*(PULONG_PTR)Ccb), TYPE_OF_OPEN_MASK ); /* ReactOS Change: GCC "invalid lvalue in assignment" */
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -82,7 +82,8 @@ CdDismountVolume (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
);
|
);
|
||||||
|
|
||||||
|
NTSTATUS /* ReactOS Change: Function did not have a type??? */
|
||||||
CdIsVolumeDirty (
|
CdIsVolumeDirty (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
|
@ -918,7 +919,7 @@ Return Value:
|
||||||
|
|
||||||
if (CdIsRemount( IrpContext, Vcb, &OldVcb )) {
|
if (CdIsRemount( IrpContext, Vcb, &OldVcb )) {
|
||||||
|
|
||||||
KIRQL SavedIrql;
|
//KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */
|
||||||
|
|
||||||
ASSERT( NULL != OldVcb->SwapVpb );
|
ASSERT( NULL != OldVcb->SwapVpb );
|
||||||
|
|
||||||
|
@ -1374,7 +1375,7 @@ Return Value:
|
||||||
// Compute the length of the volume name
|
// Compute the length of the volume name
|
||||||
//
|
//
|
||||||
|
|
||||||
AnsiLabel.Buffer = CdRvdVolId( RawIsoVd, Vcb->VcbState );
|
AnsiLabel.Buffer = (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ); /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
AnsiLabel.MaximumLength = AnsiLabel.Length = VOLUME_ID_LENGTH;
|
AnsiLabel.MaximumLength = AnsiLabel.Length = VOLUME_ID_LENGTH;
|
||||||
|
|
||||||
UnicodeLabel.MaximumLength = VOLUME_ID_LENGTH * sizeof( WCHAR );
|
UnicodeLabel.MaximumLength = VOLUME_ID_LENGTH * sizeof( WCHAR );
|
||||||
|
@ -1401,7 +1402,7 @@ Return Value:
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
CdConvertBigToLittleEndian( IrpContext,
|
CdConvertBigToLittleEndian( IrpContext,
|
||||||
CdRvdVolId( RawIsoVd, Vcb->VcbState ),
|
(PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
VOLUME_ID_LENGTH,
|
VOLUME_ID_LENGTH,
|
||||||
(PCHAR) VolumeLabel );
|
(PCHAR) VolumeLabel );
|
||||||
|
|
||||||
|
@ -2005,7 +2006,7 @@ Return Value:
|
||||||
//
|
//
|
||||||
// Local support routine
|
// Local support routine
|
||||||
//
|
//
|
||||||
|
NTSTATUS /* ReactOS Change: Function did not have a type??? */
|
||||||
CdIsVolumeDirty (
|
CdIsVolumeDirty (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
|
@ -2294,9 +2295,9 @@ Return Value:
|
||||||
|
|
||||||
Status = ObReferenceObjectByHandle( Handle,
|
Status = ObReferenceObjectByHandle( Handle,
|
||||||
0,
|
0,
|
||||||
*IoFileObjectType,
|
IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibily with exported kernel data */
|
||||||
KernelMode,
|
KernelMode,
|
||||||
&FileToMarkBad,
|
(PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */
|
||||||
NULL );
|
NULL );
|
||||||
|
|
||||||
if (!NT_SUCCESS(Status)) {
|
if (!NT_SUCCESS(Status)) {
|
||||||
|
@ -2642,8 +2643,8 @@ Return Value:
|
||||||
// The track address is BigEndian, we need to flip the bytes.
|
// The track address is BigEndian, we need to flip the bytes.
|
||||||
//
|
//
|
||||||
|
|
||||||
Source = (PUCHAR) &CdromToc->TrackData[0].Address[3];
|
Source = (PCHAR) &CdromToc->TrackData[0].Address[3];/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
Dest = (PUCHAR) &BaseSector;
|
Dest = (PCHAR) &BaseSector; /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
|
||||||
|
@ -3118,7 +3119,7 @@ Return Value:
|
||||||
if (NT_SUCCESS( RtlOemToUnicodeN( &Vcb->Vpb->VolumeLabel[0],
|
if (NT_SUCCESS( RtlOemToUnicodeN( &Vcb->Vpb->VolumeLabel[0],
|
||||||
MAXIMUM_VOLUME_LABEL_LENGTH,
|
MAXIMUM_VOLUME_LABEL_LENGTH,
|
||||||
&Length,
|
&Length,
|
||||||
CdRvdVolId( RawIsoVd, Vcb->VcbState ),
|
(PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
VOLUME_ID_LENGTH ))) {
|
VOLUME_ID_LENGTH ))) {
|
||||||
|
|
||||||
Vcb->Vpb->VolumeLabelLength = (USHORT) Length;
|
Vcb->Vpb->VolumeLabelLength = (USHORT) Length;
|
||||||
|
@ -3131,7 +3132,7 @@ Return Value:
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
CdConvertBigToLittleEndian( IrpContext,
|
CdConvertBigToLittleEndian( IrpContext,
|
||||||
CdRvdVolId( RawIsoVd, Vcb->VcbState ),
|
(PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
|
||||||
VOLUME_ID_LENGTH,
|
VOLUME_ID_LENGTH,
|
||||||
(PCHAR) Vcb->Vpb->VolumeLabel );
|
(PCHAR) Vcb->Vpb->VolumeLabel );
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,7 @@ Return Value:
|
||||||
Status = FsRtlCheckOplock( &Fcb->Oplock,
|
Status = FsRtlCheckOplock( &Fcb->Oplock,
|
||||||
Irp,
|
Irp,
|
||||||
IrpContext,
|
IrpContext,
|
||||||
CdOplockComplete,
|
(PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
NULL );
|
NULL );
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -138,6 +138,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastLock (
|
CdFastLock (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN PLARGE_INTEGER FileOffset,
|
IN PLARGE_INTEGER FileOffset,
|
||||||
|
@ -246,8 +247,8 @@ Return Value:
|
||||||
//
|
//
|
||||||
// Now call the FsRtl routine to perform the lock request.
|
// Now call the FsRtl routine to perform the lock request.
|
||||||
//
|
//
|
||||||
|
/* ReactOS Change: GCC "suggest parentheses around assignment used as truth value" */
|
||||||
if (Results = FsRtlFastLock( Fcb->FileLock,
|
if ((Results = FsRtlFastLock( Fcb->FileLock,
|
||||||
FileObject,
|
FileObject,
|
||||||
FileOffset,
|
FileOffset,
|
||||||
Length,
|
Length,
|
||||||
|
@ -257,7 +258,7 @@ Return Value:
|
||||||
ExclusiveLock,
|
ExclusiveLock,
|
||||||
IoStatus,
|
IoStatus,
|
||||||
NULL,
|
NULL,
|
||||||
FALSE )) {
|
FALSE ))) {
|
||||||
|
|
||||||
//
|
//
|
||||||
// Set the flag indicating if Fast I/O is questionable. We
|
// Set the flag indicating if Fast I/O is questionable. We
|
||||||
|
@ -284,6 +285,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastUnlockSingle (
|
CdFastUnlockSingle (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
IN PLARGE_INTEGER FileOffset,
|
IN PLARGE_INTEGER FileOffset,
|
||||||
|
@ -424,6 +426,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastUnlockAll (
|
CdFastUnlockAll (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
PEPROCESS ProcessId,
|
PEPROCESS ProcessId,
|
||||||
|
@ -546,6 +549,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdFastUnlockAllByKey (
|
CdFastUnlockAllByKey (
|
||||||
IN PFILE_OBJECT FileObject,
|
IN PFILE_OBJECT FileObject,
|
||||||
PVOID ProcessId,
|
PVOID ProcessId,
|
||||||
|
|
|
@ -206,7 +206,7 @@ Return Value:
|
||||||
|
|
||||||
{
|
{
|
||||||
NTSTATUS Status;
|
NTSTATUS Status;
|
||||||
PVOID NewBuffer;
|
//PVOID NewBuffer; /* ReactOS Change: GCC Uninitialized variable */
|
||||||
|
|
||||||
PAGED_CODE();
|
PAGED_CODE();
|
||||||
|
|
||||||
|
|
|
@ -97,6 +97,8 @@ typedef CSHORT NODE_BYTE_SIZE;
|
||||||
#define CDFS_BUG_CHECK_VOLINFO (0x001b0000)
|
#define CDFS_BUG_CHECK_VOLINFO (0x001b0000)
|
||||||
#define CDFS_BUG_CHECK_WORKQUE (0x001c0000)
|
#define CDFS_BUG_CHECK_WORKQUE (0x001c0000)
|
||||||
|
|
||||||
|
/* ReactOS Change: Need to add to reactos.mc */
|
||||||
|
#define CDFS_FILE_SYSTEM ((ULONG)0x00000026L)
|
||||||
#define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); }
|
#define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); }
|
||||||
|
|
||||||
#endif // _NODETYPE_
|
#endif // _NODETYPE_
|
||||||
|
|
|
@ -764,7 +764,7 @@ Return Value:
|
||||||
|
|
||||||
PathEntry->PathEntryLength = WordAlign( PathEntry->PathEntryLength );
|
PathEntry->PathEntryLength = WordAlign( PathEntry->PathEntryLength );
|
||||||
|
|
||||||
PathEntry->DirName = RawPathEntry->DirId;
|
PathEntry->DirName = (PCHAR)RawPathEntry->DirId; /* ReactOS Change: GCC "assignment makes pointer from integer without a cast" */
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ Return Value:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
{
|
{
|
||||||
NTSTATUS Status;
|
NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Uninit var */
|
||||||
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp );
|
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp );
|
||||||
|
|
||||||
TYPE_OF_OPEN TypeOfOpen;
|
TYPE_OF_OPEN TypeOfOpen;
|
||||||
|
@ -225,8 +225,8 @@ Return Value:
|
||||||
Status = FsRtlCheckOplock( &Fcb->Oplock,
|
Status = FsRtlCheckOplock( &Fcb->Oplock,
|
||||||
Irp,
|
Irp,
|
||||||
IrpContext,
|
IrpContext,
|
||||||
CdOplockComplete,
|
(PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
CdPrePostIrp );
|
(PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
|
|
||||||
//
|
//
|
||||||
// If the result is not STATUS_SUCCESS then the Irp was completed
|
// If the result is not STATUS_SUCCESS then the Irp was completed
|
||||||
|
|
|
@ -123,6 +123,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdAcquireForCache (
|
CdAcquireForCache (
|
||||||
IN PFCB Fcb,
|
IN PFCB Fcb,
|
||||||
IN BOOLEAN Wait
|
IN BOOLEAN Wait
|
||||||
|
@ -159,6 +160,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdReleaseFromCache (
|
CdReleaseFromCache (
|
||||||
IN PFCB Fcb
|
IN PFCB Fcb
|
||||||
)
|
)
|
||||||
|
@ -193,6 +195,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdNoopAcquire (
|
CdNoopAcquire (
|
||||||
IN PVOID Fcb,
|
IN PVOID Fcb,
|
||||||
IN BOOLEAN Wait
|
IN BOOLEAN Wait
|
||||||
|
@ -224,6 +227,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdNoopRelease (
|
CdNoopRelease (
|
||||||
IN PVOID Fcb
|
IN PVOID Fcb
|
||||||
)
|
)
|
||||||
|
@ -251,6 +255,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdAcquireForCreateSection (
|
CdAcquireForCreateSection (
|
||||||
IN PFILE_OBJECT FileObject
|
IN PFILE_OBJECT FileObject
|
||||||
)
|
)
|
||||||
|
@ -298,6 +303,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdReleaseForCreateSection (
|
CdReleaseForCreateSection (
|
||||||
IN PFILE_OBJECT FileObject
|
IN PFILE_OBJECT FileObject
|
||||||
)
|
)
|
||||||
|
|
|
@ -438,7 +438,7 @@ Return Value:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
{
|
{
|
||||||
ULONG Shift;
|
//ULONG Shift; /* ReactOS Change: GCC Unused variable */
|
||||||
ULONG StartingBlock;
|
ULONG StartingBlock;
|
||||||
ULONG ByteCount;
|
ULONG ByteCount;
|
||||||
|
|
||||||
|
|
|
@ -431,7 +431,7 @@ Return Value:
|
||||||
ULONG MediaChangeCount = 0;
|
ULONG MediaChangeCount = 0;
|
||||||
BOOLEAN ForceVerify = FALSE;
|
BOOLEAN ForceVerify = FALSE;
|
||||||
BOOLEAN DevMarkedForVerify;
|
BOOLEAN DevMarkedForVerify;
|
||||||
KIRQL SavedIrql;
|
//KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */
|
||||||
|
|
||||||
PAGED_CODE();
|
PAGED_CODE();
|
||||||
|
|
||||||
|
@ -581,6 +581,9 @@ Return Value:
|
||||||
|
|
||||||
CdRaiseStatus( IrpContext, STATUS_FILE_INVALID );
|
CdRaiseStatus( IrpContext, STATUS_FILE_INVALID );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* ReactOS Change: GCC "enumeration value not handled in switch" */
|
||||||
|
default: break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -613,7 +616,7 @@ Return Value:
|
||||||
--*/
|
--*/
|
||||||
|
|
||||||
{
|
{
|
||||||
NTSTATUS Status = STATUS_SUCCESS;
|
//NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Unused variable */
|
||||||
PVCB Vcb = Fcb->Vcb;
|
PVCB Vcb = Fcb->Vcb;
|
||||||
PDEVICE_OBJECT RealDevice = Vcb->Vpb->RealDevice;
|
PDEVICE_OBJECT RealDevice = Vcb->Vpb->RealDevice;
|
||||||
PIRP Irp;
|
PIRP Irp;
|
||||||
|
|
|
@ -166,8 +166,11 @@ Return Value:
|
||||||
|
|
||||||
Status = CdQueryFsAttributeInfo( IrpContext, Fcb->Vcb, Irp->AssociatedIrp.SystemBuffer, &Length );
|
Status = CdQueryFsAttributeInfo( IrpContext, Fcb->Vcb, Irp->AssociatedIrp.SystemBuffer, &Length );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* ReactOS Change: GCC "enumeration value not handled in switch" */
|
||||||
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Set the information field to the number of bytes actually filled in
|
// Set the information field to the number of bytes actually filled in
|
||||||
//
|
//
|
||||||
|
|
1073
reactos/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
Normal file
1073
reactos/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
Normal file
File diff suppressed because it is too large
Load diff
|
@ -97,6 +97,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdPrePostIrp (
|
CdPrePostIrp (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
|
@ -209,6 +210,7 @@ Return Value:
|
||||||
|
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
|
||||||
CdOplockComplete (
|
CdOplockComplete (
|
||||||
IN PIRP_CONTEXT IrpContext,
|
IN PIRP_CONTEXT IrpContext,
|
||||||
IN PIRP Irp
|
IN PIRP Irp
|
||||||
|
@ -386,7 +388,7 @@ Return Value:
|
||||||
//
|
//
|
||||||
|
|
||||||
ExInitializeWorkItem( &IrpContext->WorkQueueItem,
|
ExInitializeWorkItem( &IrpContext->WorkQueueItem,
|
||||||
CdFspDispatch,
|
(PVOID)CdFspDispatch,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
|
||||||
IrpContext );
|
IrpContext );
|
||||||
|
|
||||||
ExQueueWorkItem( &IrpContext->WorkQueueItem, CriticalWorkQueue );
|
ExQueueWorkItem( &IrpContext->WorkQueueItem, CriticalWorkQueue );
|
||||||
|
|
Loading…
Reference in a new issue