Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

2003-07-10 Casper S. Hornstrup <chorns@users.sourceforge.net>

Browse source 
* 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
This commit is contained in:
Casper Hornstrup 2003-07-10 11:03:51 +00:00
parent 5fd0423e1b
commit b71535d7cf
5 changed files with 57 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/ChangeLog
View file

@ -1,3 +1,13 @@
2003-07-10 Casper S. Hornstrup <chorns@users.sourceforge.net>
* 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 <chorns@users.sourceforge.net> 2003-07-05 Casper S. Hornstrup <chorns@users.sourceforge.net>
* lib/user32/windows/defwnd.c (DefWndHandleLButtonUpNC, * lib/user32/windows/defwnd.c (DefWndHandleLButtonUpNC,

82
reactos/drivers/fs/vfat/misc.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -22,6 +22,46 @@
static LONG QueueCount = 0; 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 ( NTSTATUS VfatDispatchRequest (
IN PVFAT_IRP_CONTEXT IrpContext) 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 ( NTSTATUS STDCALL VfatBuildRequest (
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp) IN PIRP Irp)

4
reactos/include/win32k/ntuser.h
View file

@ -1087,8 +1087,8 @@ NtUserQueryUserCounters(
DWORD DWORD
STDCALL STDCALL
NtUserQueryWindow( NtUserQueryWindow(
DWORD Unknown0, HWND hWnd,
DWORD Unknown1); DWORD Index);
DWORD DWORD
STDCALL STDCALL

2
reactos/lib/winedbgc/debug.c
View file

@ -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])) if (cls < sizeof(debug_classes)/sizeof(debug_classes[0]))
ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel + 1, func ); ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel + 1, func );
if (format) if (format)
ret += __wine_dbg_vprintf( format, args ); ret += wine_dbg_vprintf( format, args );
return ret; return ret;
} }

4
reactos/ntoskrnl/nt/vdm.c
View file

@ -25,11 +25,13 @@ static UCHAR OrigBDA[256];
VOID VOID
NtEarlyInitVdm(VOID) NtEarlyInitVdm(VOID)
{ {
PVOID start = (PVOID)0x0;
/* /*
* Save various BIOS data tables. At this point the lower 4MB memory * 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. * 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); memcpy(OrigBDA, (PVOID)0x400, 256);
} }