From b71535d7cfe1d9d751c08497b1570693bfcfe751 Mon Sep 17 00:00:00 2001 From: Casper Hornstrup Date: Thu, 10 Jul 2003 11:03:51 +0000 Subject: [PATCH] 2003-07-10 Casper S. Hornstrup * drivers/fs/vfat/misc.c (VfatLockControl): Move it so it is placed before it is referenced. * include/win32k/ntuser.h (NtUserQueryWindow): Correct prototype. * lib/winedbgc/debug.c (default_dbg_vlog): Use wine_dbg_vprintf, not __wine_dbg_vprintf. * ntoskrnl/nt/vdm.c (NtEarlyInitVdm): Work around GCC 3.4 trying to be smart. svn path=/trunk/; revision=5034 --- reactos/ChangeLog | 10 ++++ reactos/drivers/fs/vfat/misc.c | 82 ++++++++++++++++----------------- reactos/include/win32k/ntuser.h | 4 +- reactos/lib/winedbgc/debug.c | 2 +- reactos/ntoskrnl/nt/vdm.c | 4 +- 5 files changed, 57 insertions(+), 45 deletions(-) diff --git a/reactos/ChangeLog b/reactos/ChangeLog index 80cf7b08ca4..110dbc5c1d4 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -1,3 +1,13 @@ +2003-07-10 Casper S. Hornstrup + + * drivers/fs/vfat/misc.c (VfatLockControl): Move it so it is placed + before it is referenced. + * include/win32k/ntuser.h (NtUserQueryWindow): Correct prototype. + * lib/winedbgc/debug.c (default_dbg_vlog): Use wine_dbg_vprintf, not + __wine_dbg_vprintf. + * ntoskrnl/nt/vdm.c (NtEarlyInitVdm): Work around GCC 3.4 trying to be + smart. + 2003-07-05 Casper S. Hornstrup * lib/user32/windows/defwnd.c (DefWndHandleLButtonUpNC, diff --git a/reactos/drivers/fs/vfat/misc.c b/reactos/drivers/fs/vfat/misc.c index 6c2ac2cfae7..150feefb7ee 100644 --- a/reactos/drivers/fs/vfat/misc.c +++ b/reactos/drivers/fs/vfat/misc.c @@ -1,4 +1,4 @@ -/* $Id: misc.c,v 1.7 2003/02/13 22:24:17 hbirr Exp $ +/* $Id: misc.c,v 1.8 2003/07/10 11:03:51 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -22,6 +22,46 @@ static LONG QueueCount = 0; +NTSTATUS VfatLockControl( + IN PVFAT_IRP_CONTEXT IrpContext + ) +{ + PVFATFCB Fcb; + NTSTATUS Status; + + DPRINT("VfatLockControl(IrpContext %x)\n", IrpContext); + + assert(IrpContext); + + Fcb = (PVFATFCB)IrpContext->FileObject->FsContext; + + if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) + { + Status = STATUS_INVALID_DEVICE_REQUEST; + goto Fail; + } + + if (Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY) + { + Status = STATUS_INVALID_PARAMETER; + goto Fail; + } + + Status = FsRtlProcessFileLock(&Fcb->FileLock, + IrpContext->Irp, + NULL + ); + + VfatFreeIrpContext(IrpContext); + return Status; + +Fail:; + IrpContext->Irp->IoStatus.Status = Status; + IofCompleteRequest(IrpContext->Irp, NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT); + VfatFreeIrpContext(IrpContext); + return Status; +} + NTSTATUS VfatDispatchRequest ( IN PVFAT_IRP_CONTEXT IrpContext) { @@ -66,46 +106,6 @@ NTSTATUS VfatDispatchRequest ( } } -NTSTATUS VfatLockControl( - IN PVFAT_IRP_CONTEXT IrpContext - ) -{ - PVFATFCB Fcb; - NTSTATUS Status; - - DPRINT("VfatLockControl(IrpContext %x)\n", IrpContext); - - assert(IrpContext); - - Fcb = (PVFATFCB)IrpContext->FileObject->FsContext; - - if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - goto Fail; - } - - if (Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY) - { - Status = STATUS_INVALID_PARAMETER; - goto Fail; - } - - Status = FsRtlProcessFileLock(&Fcb->FileLock, - IrpContext->Irp, - NULL - ); - - VfatFreeIrpContext(IrpContext); - return Status; - -Fail:; - IrpContext->Irp->IoStatus.Status = Status; - IofCompleteRequest(IrpContext->Irp, NT_SUCCESS(Status) ? IO_DISK_INCREMENT : IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); - return Status; -} - NTSTATUS STDCALL VfatBuildRequest ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h index b37a5d4108f..634c08c78b0 100644 --- a/reactos/include/win32k/ntuser.h +++ b/reactos/include/win32k/ntuser.h @@ -1087,8 +1087,8 @@ NtUserQueryUserCounters( DWORD STDCALL NtUserQueryWindow( - DWORD Unknown0, - DWORD Unknown1); + HWND hWnd, + DWORD Index); DWORD STDCALL diff --git a/reactos/lib/winedbgc/debug.c b/reactos/lib/winedbgc/debug.c index 9dff056e7d5..60d88de2f0c 100644 --- a/reactos/lib/winedbgc/debug.c +++ b/reactos/lib/winedbgc/debug.c @@ -390,7 +390,7 @@ static int default_dbg_vlog( int cls, const char *channel, const char *func, if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel + 1, func ); if (format) - ret += __wine_dbg_vprintf( format, args ); + ret += wine_dbg_vprintf( format, args ); return ret; } diff --git a/reactos/ntoskrnl/nt/vdm.c b/reactos/ntoskrnl/nt/vdm.c index 59630a2c777..d2c8d548e10 100644 --- a/reactos/ntoskrnl/nt/vdm.c +++ b/reactos/ntoskrnl/nt/vdm.c @@ -25,11 +25,13 @@ static UCHAR OrigBDA[256]; VOID NtEarlyInitVdm(VOID) { + PVOID start = (PVOID)0x0; + /* * Save various BIOS data tables. At this point the lower 4MB memory * map is still active so we can just copy the data from low memory. */ - memcpy(OrigIVT, (PVOID)0x0, 1024); + memcpy(OrigIVT, start, 1024); memcpy(OrigBDA, (PVOID)0x400, 256); }