fixed compiler warnings

svn path=/trunk/; revision=6103
This commit is contained in:
Thomas Bluemel 2003-09-20 20:31:57 +00:00
parent 174238220d
commit 9fb56830e8
14 changed files with 146 additions and 119 deletions

View file

@ -1,4 +1,4 @@
/* $Id: isapnp.c,v 1.6 2003/07/15 10:42:53 gvg Exp $ /* $Id: isapnp.c,v 1.7 2003/09/20 20:31:57 weiden Exp $
* *
* PROJECT: ReactOS ISA PnP Bus driver * PROJECT: ReactOS ISA PnP Bus driver
* FILE: isapnp.c * FILE: isapnp.c
@ -215,26 +215,46 @@ VOID DeactivateLogicalDevice(UCHAR LogicalDevice)
static ULONG FindNextReadPort(VOID) static ULONG FindNextReadPort(VOID)
{ {
ULONG Port; ULONG Port;
Port = (ULONG)IsaPnPReadPort;
while (TRUE) {
Port += READ_DATA_PORT_STEP; Port = (ULONG)IsaPnPReadPort;
if (Port > ISAPNP_MAX_READ_PORT) while (TRUE) {
{
return 0; Port += READ_DATA_PORT_STEP;
}
/*
* We cannot use NE2000 probe spaces for if (Port > ISAPNP_MAX_READ_PORT)
* ISAPnP or we will lock up machines
*/ {
if ((Port < 0x280) || (Port > 0x380))
{ return 0;
return Port;
} }
}
/*
* We cannot use NE2000 probe spaces for
* ISAPnP or we will lock up machines
*/
if ((Port < 0x280) || (Port > 0x380))
{
return Port;
}
}
} }
static BOOLEAN IsolateReadDataPortSelect(VOID) static BOOLEAN IsolateReadDataPortSelect(VOID)
@ -1709,12 +1729,12 @@ DriverEntry(
{ {
DbgPrint("ISA Plug and Play Bus Driver\n"); DbgPrint("ISA Plug and Play Bus Driver\n");
DriverObject->MajorFunction[IRP_MJ_CREATE] = ISAPNPDispatchOpenClose; DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)ISAPNPDispatchOpenClose;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = ISAPNPDispatchOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)ISAPNPDispatchOpenClose;
DriverObject->MajorFunction[IRP_MJ_READ] = ISAPNPDispatchReadWrite; DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)ISAPNPDispatchReadWrite;
DriverObject->MajorFunction[IRP_MJ_WRITE] = ISAPNPDispatchReadWrite; DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)ISAPNPDispatchReadWrite;
DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ISAPNPDispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)ISAPNPDispatchDeviceControl;
DriverObject->MajorFunction[IRP_MJ_PNP] = ISAPNPControl; DriverObject->MajorFunction[IRP_MJ_PNP] = (PDRIVER_DISPATCH)ISAPNPControl;
DriverObject->DriverExtension->AddDevice = ISAPNPAddDevice; DriverObject->DriverExtension->AddDevice = ISAPNPAddDevice;
return STATUS_SUCCESS; return STATUS_SUCCESS;

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: cdfs.c,v 1.8 2002/09/15 22:23:22 hbirr Exp $ /* $Id: cdfs.c,v 1.9 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -81,23 +81,23 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
/* Initialize driver data */ /* Initialize driver data */
DeviceObject->Flags = DO_DIRECT_IO; DeviceObject->Flags = DO_DIRECT_IO;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = CdfsClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)CdfsClose;
DriverObject->MajorFunction[IRP_MJ_CLEANUP] = CdfsCleanup; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH)CdfsCleanup;
DriverObject->MajorFunction[IRP_MJ_CREATE] = CdfsCreate; DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)CdfsCreate;
DriverObject->MajorFunction[IRP_MJ_READ] = CdfsRead; DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)CdfsRead;
DriverObject->MajorFunction[IRP_MJ_WRITE] = CdfsWrite; DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)CdfsWrite;
DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] =
CdfsFileSystemControl; (PDRIVER_DISPATCH)CdfsFileSystemControl;
DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] =
CdfsDirectoryControl; (PDRIVER_DISPATCH)CdfsDirectoryControl;
DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] =
CdfsQueryInformation; (PDRIVER_DISPATCH)CdfsQueryInformation;
DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] =
CdfsSetInformation; (PDRIVER_DISPATCH)CdfsSetInformation;
DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] =
CdfsQueryVolumeInformation; (PDRIVER_DISPATCH)CdfsQueryVolumeInformation;
DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] =
CdfsSetVolumeInformation; (PDRIVER_DISPATCH)CdfsSetVolumeInformation;
DriverObject->DriverUnload = NULL; DriverObject->DriverUnload = NULL;

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: cleanup.c,v 1.4 2003/06/07 11:34:35 chorns Exp $ /* $Id: cleanup.c,v 1.5 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -97,4 +97,5 @@ ByeBye:
return(Status); return(Status);
} }
/* EOF */ /* EOF */

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: close.c,v 1.6 2003/02/13 22:24:15 hbirr Exp $ /* $Id: close.c,v 1.7 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -111,4 +111,5 @@ ByeBye:
return(Status); return(Status);
} }
/* EOF */ /* EOF */

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: finfo.c,v 1.7 2002/11/20 21:55:25 ekohl Exp $ /* $Id: finfo.c,v 1.8 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -105,13 +105,13 @@ CdfsGetBasicInformation(PFILE_OBJECT FileObject,
return STATUS_BUFFER_OVERFLOW; return STATUS_BUFFER_OVERFLOW;
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&BasicInfo->CreationTime); (TIME *)&BasicInfo->CreationTime);
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&BasicInfo->LastAccessTime); (TIME *)&BasicInfo->LastAccessTime);
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&BasicInfo->LastWriteTime); (TIME *)&BasicInfo->LastWriteTime);
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&BasicInfo->ChangeTime); (TIME *)&BasicInfo->ChangeTime);
CdfsFileFlagsToAttributes(Fcb, CdfsFileFlagsToAttributes(Fcb,
&BasicInfo->FileAttributes); &BasicInfo->FileAttributes);
@ -230,13 +230,13 @@ CdfsGetAllInformation(PFILE_OBJECT FileObject,
/* Basic Information */ /* Basic Information */
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&Info->BasicInformation.CreationTime); (TIME *)&Info->BasicInformation.CreationTime);
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&Info->BasicInformation.LastAccessTime); (TIME *)&Info->BasicInformation.LastAccessTime);
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&Info->BasicInformation.LastWriteTime); (TIME *)&Info->BasicInformation.LastWriteTime);
CdfsDateTimeToFileTime(Fcb, CdfsDateTimeToFileTime(Fcb,
&Info->BasicInformation.ChangeTime); (TIME *)&Info->BasicInformation.ChangeTime);
CdfsFileFlagsToAttributes(Fcb, CdfsFileFlagsToAttributes(Fcb,
&Info->BasicInformation.FileAttributes); &Info->BasicInformation.FileAttributes);

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: fs_rec.c,v 1.6 2003/07/17 16:57:38 silverblade Exp $ /* $Id: fs_rec.c,v 1.7 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -200,11 +200,11 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
DeviceCount = 0; DeviceCount = 0;
DriverObject->MajorFunction[IRP_MJ_CREATE] = FsRecCreate; DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)FsRecCreate;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = FsRecClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)FsRecClose;
DriverObject->MajorFunction[IRP_MJ_CLEANUP] = FsRecClose; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH)FsRecClose;
DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FsRecFsControl; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = (PDRIVER_DISPATCH)FsRecFsControl;
DriverObject->DriverUnload = FsRecUnload; DriverObject->DriverUnload = (PDRIVER_UNLOAD)FsRecUnload;
ConfigInfo = IoGetConfigurationInformation(); ConfigInfo = IoGetConfigurationInformation();

View file

@ -1,4 +1,4 @@
/* $Id: msfs.c,v 1.5 2002/09/08 10:22:10 chorns Exp $ /* $Id: msfs.c,v 1.6 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -30,26 +30,26 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
DbgPrint("Mailslot FSD 0.0.1\n"); DbgPrint("Mailslot FSD 0.0.1\n");
DriverObject->Flags = 0; DriverObject->Flags = 0;
DriverObject->MajorFunction[IRP_MJ_CREATE] = MsfsCreate; DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)MsfsCreate;
DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] = DriverObject->MajorFunction[IRP_MJ_CREATE_MAILSLOT] =
MsfsCreateMailslot; (PDRIVER_DISPATCH)MsfsCreateMailslot;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = MsfsClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)MsfsClose;
DriverObject->MajorFunction[IRP_MJ_READ] = MsfsRead; DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)MsfsRead;
DriverObject->MajorFunction[IRP_MJ_WRITE] = MsfsWrite; DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)MsfsWrite;
DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] =
MsfsQueryInformation; (PDRIVER_DISPATCH)MsfsQueryInformation;
DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] =
MsfsSetInformation; (PDRIVER_DISPATCH)MsfsSetInformation;
// DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = // DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] =
// MsfsDirectoryControl; // (PDRIVER_DISPATCH)MsfsDirectoryControl;
// DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = MsfsFlushBuffers; // DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = (PDRIVER_DISPATCH)MsfsFlushBuffers;
// DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = MsfsShutdown; // DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = (PDRIVER_DISPATCH)MsfsShutdown;
// DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = // DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] =
// MsfsQuerySecurity; // (PDRIVER_DISPATCH)MsfsQuerySecurity;
// DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = // DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] =
// MsfsSetSecurity; // (PDRIVER_DISPATCH)MsfsSetSecurity;
DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] =
MsfsFileSystemControl; (PDRIVER_DISPATCH)MsfsFileSystemControl;
DriverObject->DriverUnload = NULL; DriverObject->DriverUnload = NULL;

View file

@ -1,4 +1,4 @@
/* $Id: fsctrl.c,v 1.11 2003/08/07 11:47:32 silverblade Exp $ /* $Id: fsctrl.c,v 1.12 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -434,7 +434,7 @@ NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
case FSCTL_PIPE_PEEK: case FSCTL_PIPE_PEEK:
DPRINT("Peeking pipe %wZ\n", &Pipe->PipeName); DPRINT("Peeking pipe %wZ\n", &Pipe->PipeName);
Status = NpfsPeekPipe(Irp, IoStack); Status = NpfsPeekPipe(Irp, (PIO_STACK_LOCATION)IoStack);
break; break;
case FSCTL_PIPE_QUERY_EVENT: case FSCTL_PIPE_QUERY_EVENT:
@ -469,12 +469,12 @@ NpfsFileSystemControl(PDEVICE_OBJECT DeviceObject,
case FSCTL_PIPE_GET_STATE: case FSCTL_PIPE_GET_STATE:
DPRINT("Get state\n"); DPRINT("Get state\n");
Status = NpfsGetState(Irp, IoStack); Status = NpfsGetState(Irp, (PIO_STACK_LOCATION)IoStack);
break; break;
case FSCTL_PIPE_SET_STATE: case FSCTL_PIPE_SET_STATE:
DPRINT("Set state\n"); DPRINT("Set state\n");
Status = NpfsSetState(Irp, IoStack); Status = NpfsSetState(Irp, (PIO_STACK_LOCATION)IoStack);
break; break;
case FSCTL_PIPE_INTERNAL_READ: case FSCTL_PIPE_INTERNAL_READ:

View file

@ -1,4 +1,4 @@
/* $Id: npfs.c,v 1.6 2003/06/21 19:55:55 hbirr Exp $ /* $Id: npfs.c,v 1.7 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -28,28 +28,28 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
DbgPrint("Named Pipe FSD 0.0.2\n"); DbgPrint("Named Pipe FSD 0.0.2\n");
DriverObject->MajorFunction[IRP_MJ_CREATE] = NpfsCreate; DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)NpfsCreate;
DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] = DriverObject->MajorFunction[IRP_MJ_CREATE_NAMED_PIPE] =
NpfsCreateNamedPipe; (PDRIVER_DISPATCH)NpfsCreateNamedPipe;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = NpfsClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)NpfsClose;
DriverObject->MajorFunction[IRP_MJ_READ] = NpfsRead; DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)NpfsRead;
DriverObject->MajorFunction[IRP_MJ_WRITE] = NpfsWrite; DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)NpfsWrite;
DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] =
NpfsQueryInformation; (PDRIVER_DISPATCH)NpfsQueryInformation;
DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] =
NpfsSetInformation; (PDRIVER_DISPATCH)NpfsSetInformation;
DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] =
NpfsQueryVolumeInformation; (PDRIVER_DISPATCH)NpfsQueryVolumeInformation;
// DriverObject->MajorFunction[IRP_MJ_CLEANUP] = NpfsCleanup; // DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH)NpfsCleanup;
// DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = NpfsFlushBuffers; // DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = (PDRIVER_DISPATCH)NpfsFlushBuffers;
// DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = // DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] =
// NpfsDirectoryControl; // (PDRIVER_DISPATCH)NpfsDirectoryControl;
DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] =
NpfsFileSystemControl; (PDRIVER_DISPATCH)NpfsFileSystemControl;
// DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] = // DriverObject->MajorFunction[IRP_MJ_QUERY_SECURITY] =
// NpfsQuerySecurity; // (PDRIVER_DISPATCH)NpfsQuerySecurity;
// DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] = // DriverObject->MajorFunction[IRP_MJ_SET_SECURITY] =
// NpfsSetSecurity; // (PDRIVER_DISPATCH)NpfsSetSecurity;
DriverObject->DriverUnload = NULL; DriverObject->DriverUnload = NULL;

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.4 2003/07/17 13:31:39 chorns Exp $ # $Id: makefile,v 1.5 2003/09/20 20:31:57 weiden Exp $
PATH_TO_TOP = ../../.. PATH_TO_TOP = ../../..
@ -8,6 +8,8 @@ TARGET_TYPE = driver
TARGET_NAME = ntfs TARGET_NAME = ntfs
TARGET_CFLAGS = -Wno-multichar
TARGET_OBJECTS = $(TARGET_NAME).o attrib.o blockdev.o create.o dirctl.o \ TARGET_OBJECTS = $(TARGET_NAME).o attrib.o blockdev.o create.o dirctl.o \
fcb.o finfo.o fsctl.o mft.o volinfo.o close.o rw.o fcb.o finfo.o fsctl.o mft.o volinfo.o close.o rw.o

View file

@ -1,4 +1,4 @@
/* $Id: finfo.c,v 1.32 2003/07/24 20:52:58 chorns Exp $ /* $Id: finfo.c,v 1.33 2003/09/20 20:31:57 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -100,13 +100,13 @@ VfatSetBasicInformation(PFILE_OBJECT FileObject,
/* Check volume label bit */ /* Check volume label bit */
assert(0 == (FCB->entry.Attrib & 0x08)); assert(0 == (FCB->entry.Attrib & 0x08));
FsdFileTimeToDosDateTime(&(BasicInfo->CreationTime), FsdFileTimeToDosDateTime((TIME *)&(BasicInfo->CreationTime),
&(FCB->entry.CreationDate), &(FCB->entry.CreationDate),
&(FCB->entry.CreationTime)); &(FCB->entry.CreationTime));
FsdFileTimeToDosDateTime(&(BasicInfo->LastAccessTime), FsdFileTimeToDosDateTime((TIME *)&(BasicInfo->LastAccessTime),
&(FCB->entry.AccessDate), &(FCB->entry.AccessDate),
NULL); NULL);
FsdFileTimeToDosDateTime(&(BasicInfo->LastWriteTime), FsdFileTimeToDosDateTime((TIME *)&(BasicInfo->LastWriteTime),
&(FCB->entry.UpdateDate), &(FCB->entry.UpdateDate),
&(FCB->entry.UpdateTime)); &(FCB->entry.UpdateTime));
@ -138,13 +138,13 @@ VfatGetBasicInformation(PFILE_OBJECT FileObject,
FsdDosDateTimeToFileTime(FCB->entry.CreationDate, FsdDosDateTimeToFileTime(FCB->entry.CreationDate,
FCB->entry.CreationTime, FCB->entry.CreationTime,
&BasicInfo->CreationTime); (TIME *)&BasicInfo->CreationTime);
FsdDosDateTimeToFileTime(FCB->entry.AccessDate, FsdDosDateTimeToFileTime(FCB->entry.AccessDate,
0, 0,
&BasicInfo->LastAccessTime); (TIME *)&BasicInfo->LastAccessTime);
FsdDosDateTimeToFileTime(FCB->entry.UpdateDate, FsdDosDateTimeToFileTime(FCB->entry.UpdateDate,
FCB->entry.UpdateTime, FCB->entry.UpdateTime,
&BasicInfo->LastWriteTime); (TIME *)&BasicInfo->LastWriteTime);
BasicInfo->ChangeTime = BasicInfo->LastWriteTime; BasicInfo->ChangeTime = BasicInfo->LastWriteTime;
BasicInfo->FileAttributes = FCB->entry.Attrib; BasicInfo->FileAttributes = FCB->entry.Attrib;
@ -340,13 +340,13 @@ VfatGetAllInformation(PFILE_OBJECT FileObject,
/* Basic Information */ /* Basic Information */
FsdDosDateTimeToFileTime(Fcb->entry.CreationDate, FsdDosDateTimeToFileTime(Fcb->entry.CreationDate,
Fcb->entry.CreationTime, Fcb->entry.CreationTime,
&Info->BasicInformation.CreationTime); (TIME *)&Info->BasicInformation.CreationTime);
FsdDosDateTimeToFileTime(Fcb->entry.AccessDate, FsdDosDateTimeToFileTime(Fcb->entry.AccessDate,
0, 0,
&Info->BasicInformation.LastAccessTime); (TIME *)&Info->BasicInformation.LastAccessTime);
FsdDosDateTimeToFileTime(Fcb->entry.UpdateDate, FsdDosDateTimeToFileTime(Fcb->entry.UpdateDate,
Fcb->entry.UpdateTime, Fcb->entry.UpdateTime,
&Info->BasicInformation.LastWriteTime); (TIME *)&Info->BasicInformation.LastWriteTime);
Info->BasicInformation.ChangeTime = Info->BasicInformation.LastWriteTime; Info->BasicInformation.ChangeTime = Info->BasicInformation.LastWriteTime;
Info->BasicInformation.FileAttributes = Fcb->entry.Attrib; Info->BasicInformation.FileAttributes = Fcb->entry.Attrib;

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: iface.c,v 1.70 2003/07/24 20:52:58 chorns Exp $ /* $Id: iface.c,v 1.71 2003/09/20 20:31:57 weiden Exp $
* *
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: services/fs/vfat/iface.c * FILE: services/fs/vfat/iface.c
@ -71,22 +71,22 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
VfatGlobalData->DeviceObject = DeviceObject; VfatGlobalData->DeviceObject = DeviceObject;
DeviceObject->Flags = DO_DIRECT_IO; DeviceObject->Flags = DO_DIRECT_IO;
DriverObject->MajorFunction[IRP_MJ_CLOSE] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_CREATE] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_READ] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_READ] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_WRITE] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_WRITE] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] =
VfatBuildRequest; (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] =
VfatBuildRequest; (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = VfatShutdown; DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = (PDRIVER_DISPATCH)VfatShutdown;
DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_CLEANUP] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = (PDRIVER_DISPATCH)VfatBuildRequest;
DriverObject->DriverUnload = NULL; DriverObject->DriverUnload = NULL;

View file

@ -74,7 +74,9 @@
--*/ --*/
#ifdef BZ_DECOMPRESS_ONLY #ifdef BZ_DECOMPRESS_ONLY
#define __NTDRIVER__ #ifndef __NTDRIVER__
#define __NTDRIVER__
#endif
#include <ntddk.h> #include <ntddk.h>
#include <debug.h> #include <debug.h>
#endif #endif

View file

@ -375,4 +375,5 @@ uint32 set_autodeletion(TME_DATA *data, uint32 value)
data->enable_deletion=TRUE; data->enable_deletion=TRUE;
return TME_SUCCESS; return TME_SUCCESS;
} }