Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

patch by vizzini - Fixed a typoed struct member, Fixed a unicode->hex integer bug.

Browse source 
svn path=/trunk/; revision=5692
This commit is contained in:
Royce Mitchell III 2003-08-20 04:18:31 +00:00
parent 05bd5fcc78
commit 974eb2f364
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/dd/floppy/floppy.c
View file

@ -109,7 +109,7 @@ FloppyCreateController(PDRIVER_OBJECT DriverObject,
DeviceDescription.Master = FALSE; DeviceDescription.Master = FALSE;
DeviceDescription.ScatterGather = FALSE; DeviceDescription.ScatterGather = FALSE;
DeviceDescription.AutoInitialize = FALSE; DeviceDescription.AutoInitialize = FALSE;
DeviceDescription.Dma32BitAddress = FALSE; DeviceDescription.Dma32BitAddresses = FALSE;
DeviceDescription.DmaChannel = ControllerParameters->DmaChannel; DeviceDescription.DmaChannel = ControllerParameters->DmaChannel;
DeviceDescription.InterfaceType = Isa; DeviceDescription.InterfaceType = Isa;
// DeviceDescription.DmaWidth = Width8Bits; // DeviceDescription.DmaWidth = Width8Bits;

4
reactos/hal/halx86/dma.c
View file

@ -1,4 +1,4 @@
/* $Id: dma.c,v 1.4 2003/06/07 12:25:53 chorns Exp $ /* $Id: dma.c,v 1.5 2003/08/20 04:18:31 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -95,7 +95,7 @@ HalGetAdapter (PDEVICE_DESCRIPTION DeviceDescription,
return NULL; return NULL;
if( DeviceDescription->AutoInitialize ) if( DeviceDescription->AutoInitialize )
return NULL; return NULL;
if( DeviceDescription->Dma32BitAddress ) if( DeviceDescription->Dma32BitAddresses )
return NULL; return NULL;
if( DeviceDescription->InterfaceType != Isa ) if( DeviceDescription->InterfaceType != Isa )
return NULL; return NULL;

4
reactos/include/ntos/haltypes.h
View file

@ -1,4 +1,4 @@
/* $Id: haltypes.h,v 1.2 2003/08/14 18:30:27 silverblade Exp $ /* $Id: haltypes.h,v 1.3 2003/08/20 04:18:31 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -64,7 +64,7 @@ typedef struct _DEVICE_DESCRIPTION
BOOLEAN ScatterGather; BOOLEAN ScatterGather;
BOOLEAN DemandMode; BOOLEAN DemandMode;
BOOLEAN AutoInitialize; BOOLEAN AutoInitialize;
BOOLEAN Dma32BitAddress; BOOLEAN Dma32BitAddresses;
BOOLEAN IgnoreCount; BOOLEAN IgnoreCount;
BOOLEAN Reserved1; BOOLEAN Reserved1;
BOOLEAN Reserved2; BOOLEAN Reserved2;

9
reactos/ntoskrnl/rtl/unicode.c
View file

@ -1,4 +1,4 @@
/* $Id: unicode.c,v 1.30 2003/07/11 01:23:16 royce Exp $ /* $Id: unicode.c,v 1.31 2003/08/20 04:18:31 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1252,9 +1252,16 @@ RtlUnicodeStringToInteger(IN PUNICODE_STRING String,
{ {
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
/*
else if ((((*Str > L'9') || (*Str < L'0')) || else if ((((*Str > L'9') || (*Str < L'0')) ||
((towupper (*Str) > L'F') || ((towupper (*Str) > L'F') ||
(towupper (*Str) < L'A'))) && (Base == 16)) (towupper (*Str) < L'A'))) && (Base == 16))
*/
else if ((*Str < '0' ||
(*Str > '9' && *Str < 'A') ||
(*Str > 'F' && *Str < 'a') ||
*Str > 'f') &&
(Base == 16))
{ {
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }