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

Fixed typos and warnings.

Browse source 
svn path=/trunk/; revision=2013
This commit is contained in:
Eric Kohl 2001-06-26 12:54:58 +00:00
parent edd3aa06a7
commit b8e0d46292
8 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/dd/vga/display/objects/screen.c
View file

@ -103,7 +103,7 @@ DWORD getAvailableModes(HANDLE Driver,
BOOL InitVGA(PPDEV ppdev, BOOL bFirst) BOOL InitVGA(PPDEV ppdev, BOOL bFirst)
{ {
UINT ReturnedDataLength; ULONG ReturnedDataLength;
VIDEO_MEMORY VideoMemory; VIDEO_MEMORY VideoMemory;
VIDEO_MEMORY_INFORMATION VideoMemoryInfo; VIDEO_MEMORY_INFORMATION VideoMemoryInfo;

2
reactos/drivers/dd/vga/display/vgaddi.h
View file

@ -195,7 +195,7 @@ typedef VOID (*PFN_ScreenToScreenBlt)(PDEVSURF, PRECTL, PPOINTL, INT);
BOOL InitVGA(PPDEV ppdev, BOOL bFirst); // screen.c: initialize VGA mode BOOL InitVGA(PPDEV ppdev, BOOL bFirst); // screen.c: initialize VGA mode
#define DRIVER_EXTRA_SIZE 0 #define DRIVER_EXTRA_SIZE 0
#define ALLOC_TAG 'agvD' // Dvga reversed #define ALLOC_TAG TAG('D', 'v', 'g', 'a') // Dvga tag
#define DLL_NAME L"vga" // DLL name in Unicode #define DLL_NAME L"vga" // DLL name in Unicode
#define MAX_SCAN_WIDTH 2048 // pixels #define MAX_SCAN_WIDTH 2048 // pixels

13
reactos/drivers/dd/vga/miniport/initvga.c
View file

@ -2,11 +2,11 @@
#include <debug.h> #include <debug.h>
#include "vgavideo.h" #include "vgavideo.h"
void outxay(USHORT ad, UCHAR x, UCHAR y) void outxay(PUSHORT ad, UCHAR x, UCHAR y)
{ {
USHORT xy = (x << 8) + y; USHORT xy = (x << 8) + y;
VideoPortWritePortUshort((PUSHORT)ad, xy); VideoPortWritePortUshort(ad, xy);
} }
void setMode(VideoMode mode) void setMode(VideoMode mode)
@ -20,7 +20,7 @@ void setMode(VideoMode mode)
for(x=0; x<5; x++) for(x=0; x<5; x++)
{ {
outxay(SEQ, mode.Seq[x], x); outxay((PUSHORT)SEQ, mode.Seq[x], x);
} }
VideoPortWritePortUshort((PUSHORT)CRTC, 0x11); VideoPortWritePortUshort((PUSHORT)CRTC, 0x11);
@ -28,12 +28,12 @@ void setMode(VideoMode mode)
for(x=0; x<25; x++) for(x=0; x<25; x++)
{ {
outxay(CRTC, mode.Crtc[x], x); outxay((PUSHORT)CRTC, mode.Crtc[x], x);
} }
for(x=0; x<9; x++) for(x=0; x<9; x++)
{ {
outxay(GRAPHICS, mode.Gfx[x], x); outxay((PUSHORT)GRAPHICS, mode.Gfx[x], x);
} }
x=VideoPortReadPortUchar((PUCHAR)FEATURE); x=VideoPortReadPortUchar((PUCHAR)FEATURE);
@ -103,6 +103,7 @@ VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock)
NTSTATUS Status; NTSTATUS Status;
VIDEO_X86_BIOS_ARGUMENTS vxba; VIDEO_X86_BIOS_ARGUMENTS vxba;
VP_STATUS vps; VP_STATUS vps;
ULONG ThreadRelease = 1;
CHECKPOINT; CHECKPOINT;
Event = 0; Event = 0;
@ -115,7 +116,7 @@ VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock)
if( !NT_SUCCESS( Status ) ) if( !NT_SUCCESS( Status ) )
DbgPrint( "VGA: Failed to open refresh event\n" ); DbgPrint( "VGA: Failed to open refresh event\n" );
else { else {
NtSetEvent( Event, 1 ); NtSetEvent( Event, &ThreadRelease );
NtClose( Event ); NtClose( Event );
} }
} }

36
reactos/drivers/dd/vga/miniport/vgamp.c
View file

@ -217,56 +217,56 @@ VGAStartIO(PVOID DeviceExtension,
VGAMapVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer, VGAMapVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer,
(PVIDEO_MEMORY_INFORMATION) (PVIDEO_MEMORY_INFORMATION)
RequestPacket->OutputBuffer, RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_QUERY_AVAIL_MODES: case IOCTL_VIDEO_QUERY_AVAIL_MODES:
VGAQueryAvailModes((PVIDEO_MODE_INFORMATION) RequestPacket->OutputBuffer, VGAQueryAvailModes((PVIDEO_MODE_INFORMATION) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_QUERY_CURRENT_MODE: case IOCTL_VIDEO_QUERY_CURRENT_MODE:
VGAQueryCurrentMode((PVIDEO_MODE_INFORMATION) RequestPacket->OutputBuffer, VGAQueryCurrentMode((PVIDEO_MODE_INFORMATION) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES: case IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES:
VGAQueryNumAvailModes((PVIDEO_NUM_MODES) RequestPacket->OutputBuffer, VGAQueryNumAvailModes((PVIDEO_NUM_MODES) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_RESET_DEVICE: case IOCTL_VIDEO_RESET_DEVICE:
VGAResetDevice(&RequestPacket->StatusBlock); VGAResetDevice(RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_SET_COLOR_REGISTERS: case IOCTL_VIDEO_SET_COLOR_REGISTERS:
VGASetColorRegisters((PVIDEO_CLUT) RequestPacket->InputBuffer, VGASetColorRegisters((PVIDEO_CLUT) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_SET_CURRENT_MODE: case IOCTL_VIDEO_SET_CURRENT_MODE:
VGASetCurrentMode((PVIDEO_MODE) RequestPacket->InputBuffer, VGASetCurrentMode((PVIDEO_MODE) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_SHARE_VIDEO_MEMORY: case IOCTL_VIDEO_SHARE_VIDEO_MEMORY:
VGAShareVideoMemory((PVIDEO_SHARE_MEMORY) RequestPacket->InputBuffer, VGAShareVideoMemory((PVIDEO_SHARE_MEMORY) RequestPacket->InputBuffer,
(PVIDEO_MEMORY_INFORMATION) RequestPacket->OutputBuffer, (PVIDEO_MEMORY_INFORMATION) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_UNMAP_VIDEO_MEMORY: case IOCTL_VIDEO_UNMAP_VIDEO_MEMORY:
VGAUnmapVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer, VGAUnmapVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY: case IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY:
VGAUnshareVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer, VGAUnshareVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_SET_PALETTE_REGISTERS: case IOCTL_VIDEO_SET_PALETTE_REGISTERS:
VGASetPaletteRegisters((PVIDEO_CLUT) RequestPacket->InputBuffer, VGASetPaletteRegisters((PWORD) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
#if 0 #if 0
@ -278,7 +278,7 @@ VGAStartIO(PVOID DeviceExtension,
case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES: case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES:
VGAFreePublicAccessRanges((PVIDEO_PUBLIC_ACCESS_RANGES) VGAFreePublicAccessRanges((PVIDEO_PUBLIC_ACCESS_RANGES)
RequestPacket->InputBuffer, RequestPacket->InputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_GET_BANK_SELECT_CODE: case IOCTL_VIDEO_GET_BANK_SELECT_CODE:
@ -294,7 +294,7 @@ VGAStartIO(PVOID DeviceExtension,
case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES: case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES:
VGAQueryPublicAccessRanges((PVIDEO_PUBLIC_ACCESS_RANGES) VGAQueryPublicAccessRanges((PVIDEO_PUBLIC_ACCESS_RANGES)
RequestPacket->OutputBuffer, RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_RESTORE_HARDWARE_STATE: case IOCTL_VIDEO_RESTORE_HARDWARE_STATE:
@ -430,10 +430,10 @@ VOID VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable,
for (i=ColorLookUpTable->FirstEntry; i<ColorLookUpTable->NumEntries; i++) for (i=ColorLookUpTable->FirstEntry; i<ColorLookUpTable->NumEntries; i++)
{ {
VideoPortWritePortUchar(0x03c8, i); VideoPortWritePortUchar((PUCHAR)0x03c8, i);
VideoPortWritePortUchar(0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Red); VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Red);
VideoPortWritePortUchar(0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Green); VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Green);
VideoPortWritePortUchar(0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Blue); VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Blue);
} }
} }

8
reactos/drivers/dd/vidport/vidport.c
View file

@ -1,4 +1,4 @@
/* $Id: vidport.c,v 1.19 2001/05/02 12:37:06 jfilby Exp $ /* $Id: vidport.c,v 1.20 2001/06/26 12:51:00 ekohl Exp $
* *
* VideoPort driver * VideoPort driver
* Written by Rex Jolliff * Written by Rex Jolliff
@ -24,7 +24,7 @@ static struct _EPROCESS* Csrss;
PBYTE ReturnCsrssAddress(void) PBYTE ReturnCsrssAddress(void)
{ {
return Csrss; return (PBYTE)Csrss;
} }
// ------------------------------------------------------- Public Interface // ------------------------------------------------------- Public Interface
@ -295,7 +295,7 @@ VideoPortInitialize(IN PVOID Context1,
while (Again); while (Again);
/* Find a process handle for csrss */ /* Find a process handle for csrss */
Cid.UniqueProcess = 3; Cid.UniqueProcess = (HANDLE)3;
Cid.UniqueThread = 0; Cid.UniqueThread = 0;
Status = ZwOpenProcess(&CsrssHandle, Status = ZwOpenProcess(&CsrssHandle,
PROCESS_ALL_ACCESS, PROCESS_ALL_ACCESS,
@ -806,7 +806,7 @@ VidDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject,
vrp->OutputBufferLength = Irp->Stack[0].Parameters.DeviceIoControl.OutputBufferLength; vrp->OutputBufferLength = Irp->Stack[0].Parameters.DeviceIoControl.OutputBufferLength;
// Call the Miniport Driver with the VRP // Call the Miniport Driver with the VRP
DeviceObject->DriverObject->DriverStartIo(DeviceObject->DeviceExtension, vrp); DeviceObject->DriverObject->DriverStartIo(DeviceObject->DeviceExtension, (PIRP)vrp);
// Translate the VRP back into the IRP for OutputBuffer // Translate the VRP back into the IRP for OutputBuffer
Irp->UserBuffer = vrp->OutputBuffer; Irp->UserBuffer = vrp->OutputBuffer;

4
reactos/drivers/fs/ms/finfo.c
View file

@ -1,4 +1,4 @@
/* $Id: finfo.c,v 1.2 2001/06/12 12:33:42 ekohl Exp $ /* $Id: finfo.c,v 1.3 2001/06/26 12:46:57 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -143,7 +143,7 @@ MsfsSetInformation(PDEVICE_OBJECT DeviceObject,
PMSFS_FCB Fcb; PMSFS_FCB Fcb;
PMSFS_MAILSLOT Mailslot; PMSFS_MAILSLOT Mailslot;
PVOID SystemBuffer; PVOID SystemBuffer;
PULONG BufferLength; ULONG BufferLength;
NTSTATUS Status; NTSTATUS Status;
DPRINT("MsfsSetInformation(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DPRINT("MsfsSetInformation(DeviceObject %p Irp %p)\n", DeviceObject, Irp);

4
reactos/drivers/fs/np/volume.c
View file

@ -1,4 +1,4 @@
/* $Id: volume.c,v 1.1 2001/06/12 12:35:05 ekohl Exp $ /* $Id: volume.c,v 1.2 2001/06/26 12:47:26 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -21,7 +21,7 @@
static NTSTATUS static NTSTATUS
NpfsQueryFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, NpfsQueryFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo,
PULONG *BufferLength) PULONG BufferLength)
{ {
DPRINT("NpfsQueryFsDeviceInformation()\n"); DPRINT("NpfsQueryFsDeviceInformation()\n");
DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo);

4
reactos/drivers/input/mouclass/mouclass.c
View file

@ -137,7 +137,7 @@ NTSTATUS ConnectMousePortDriver(PDEVICE_OBJECT ClassDeviceObject)
return ioStatus.Status; return ioStatus.Status;
} }
NTSTATUS MouseClassDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) NTSTATUS STDCALL MouseClassDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{ {
PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp);
NTSTATUS Status; NTSTATUS Status;
@ -218,7 +218,7 @@ VOID MouseClassStartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
} }
} }
NTSTATUS MouseClassInternalDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) NTSTATUS STDCALL MouseClassInternalDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
{ {
// Retrieve GDI's callback // Retrieve GDI's callback