20 modified files
reactos/drivers/dd/blue
diff -u -r1.48 -r1.49
--- blue.c 22 Jul 2004 20:40:17 -0000 1.48
+++ blue.c 25 Dec 2004 11:18:38 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Id: blue.c,v 1.48 2004/07/22 20:40:17 navaraf Exp $
+/* $Id: blue.c,v 1.49 2004/12/25 11:18:38 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -166,7 +166,7 @@
PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension;
NTSTATUS Status;
char *pch = Irp->UserBuffer;
- char *vidmem;
+ PBYTE vidmem;
int i, j, offset;
int cursorx, cursory;
int rows, columns;
@@ -437,7 +437,7 @@
case IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE:
{
POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer;
- char *vidmem;
+ PBYTE vidmem;
int offset;
DWORD dwCount;
@@ -461,7 +461,7 @@
{
POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer;
PWORD pAttr = (PWORD)MmGetSystemAddressForMdl(Irp->MdlAddress);
- char *vidmem;
+ PBYTE vidmem;
int offset;
DWORD dwCount;
@@ -485,7 +485,7 @@
{
COORD *pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress);
CHAR *pAttr = (CHAR *)(pCoord + 1);
- char *vidmem;
+ PBYTE vidmem;
int offset;
DWORD dwCount;
@@ -511,7 +511,7 @@
case IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER:
{
POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer;
- char *vidmem;
+ PBYTE vidmem;
int offset;
DWORD dwCount;
@@ -537,7 +537,7 @@
{
POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer;
LPSTR pChar = (LPSTR)MmGetSystemAddressForMdl(Irp->MdlAddress);
- char *vidmem;
+ PBYTE vidmem;
int offset;
DWORD dwCount;
@@ -561,7 +561,7 @@
{
COORD *pCoord;
LPSTR pChar;
- char *vidmem;
+ PBYTE vidmem;
int offset;
DWORD dwCount;
@@ -584,11 +584,11 @@
case IOCTL_CONSOLE_DRAW:
{
PCONSOLE_DRAW ConsoleDraw;
- char *Src, *Dest;
+ PBYTE Src, Dest;
UINT SrcDelta, DestDelta, i, Offset;
ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress);
- Src = (char *) (ConsoleDraw + 1);
+ Src = (PBYTE) (ConsoleDraw + 1);
SrcDelta = ConsoleDraw->SizeX * 2;
Dest = DeviceExtension->VideoMemory +
(ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2;
reactos/drivers/fs/cdfs
diff -u -r1.19 -r1.20
--- fsctl.c 16 Mar 2004 08:30:28 -0000 1.19
+++ fsctl.c 25 Dec 2004 11:18:38 -0000 1.20
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: fsctl.c,v 1.19 2004/03/16 08:30:28 arty Exp $
+/* $Id: fsctl.c,v 1.20 2004/12/25 11:18:38 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -52,7 +52,7 @@
{
PPVD Pvd;
ULONG i;
- PCHAR pc;
+ PUCHAR pc;
PWCHAR pw;
union
@@ -153,17 +153,17 @@
DPRINT("EscapeSequences: '%.32s'\n", Svd->EscapeSequences);
- if (strncmp(Svd->EscapeSequences, "%/@", 3) == 0)
+ if (strncmp((PCHAR)Svd->EscapeSequences, "%/@", 3) == 0)
{
DPRINT("Joliet extension found (UCS-2 Level 1)\n");
JolietLevel = 1;
}
- else if (strncmp(Svd->EscapeSequences, "%/C", 3) == 0)
+ else if (strncmp((PCHAR)Svd->EscapeSequences, "%/C", 3) == 0)
{
DPRINT("Joliet extension found (UCS-2 Level 2)\n");
JolietLevel = 2;
}
- else if (strncmp(Svd->EscapeSequences, "%/E", 3) == 0)
+ else if (strncmp((PCHAR)Svd->EscapeSequences, "%/E", 3) == 0)
{
DPRINT("Joliet extension found (UCS-2 Level 3)\n");
JolietLevel = 3;
reactos/drivers/fs/fs_rec
diff -u -r1.7 -r1.8
--- ntfs.c 16 Jan 2003 11:58:15 -0000 1.7
+++ ntfs.c 25 Dec 2004 11:18:38 -0000 1.8
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: ntfs.c,v 1.7 2003/01/16 11:58:15 ekohl Exp $
+/* $Id: ntfs.c,v 1.8 2004/12/25 11:18:38 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -79,7 +79,7 @@
}
DPRINT("NTFS-identifier: [%.8s]\n", &Buffer[3]);
- if (strncmp(&Buffer[3], "NTFS ", 8) == 0)
+ if (RtlCompareMemory(&Buffer[3], "NTFS ", 8) == 8)
{
Status = STATUS_SUCCESS;
}
reactos/drivers/fs/ntfs
diff -u -r1.10 -r1.11
--- fsctl.c 5 Jun 2004 08:28:37 -0000 1.10
+++ fsctl.c 25 Dec 2004 11:18:38 -0000 1.11
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: fsctl.c,v 1.10 2004/06/05 08:28:37 navaraf Exp $
+/* $Id: fsctl.c,v 1.11 2004/12/25 11:18:38 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -108,7 +108,7 @@
if (NT_SUCCESS(Status))
{
DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OemName);
- if (strncmp(BootSector->OemName, "NTFS ", 8) != 0)
+ if (RtlCompareMemory(BootSector->OemName, "NTFS ", 8) != 8)
{
Status = STATUS_UNRECOGNIZED_VOLUME;
}
reactos/drivers/fs/vfat
diff -u -r1.77 -r1.78
--- create.c 6 Dec 2004 00:26:47 -0000 1.77
+++ create.c 25 Dec 2004 11:18:38 -0000 1.78
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: create.c,v 1.77 2004/12/06 00:26:47 gdalsnes Exp $
+/* $Id: create.c,v 1.78 2004/12/25 11:18:38 navaraf Exp $
*
* PROJECT: ReactOS kernel
* FILE: drivers/fs/vfat/create.c
@@ -141,7 +141,7 @@
/* copy volume label */
if (DeviceExt->Flags & VCB_IS_FATX)
{
- StringO.Buffer = Entry->FatX.Filename;
+ StringO.Buffer = (PCHAR)Entry->FatX.Filename;
StringO.MaximumLength = StringO.Length = Entry->FatX.FilenameLength;
RtlOemStringToUnicodeString(&NameU, &StringO, FALSE);
}
reactos/drivers/fs/vfat
diff -u -r1.18 -r1.19
--- direntry.c 5 Dec 2004 16:31:50 -0000 1.18
+++ direntry.c 25 Dec 2004 11:18:38 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Id: direntry.c,v 1.18 2004/12/05 16:31:50 gvg Exp $
+/* $Id: direntry.c,v 1.19 2004/12/25 11:18:38 navaraf Exp $
*
*
* FILE: DirEntry.c
@@ -455,7 +455,7 @@
}
DirContext->ShortNameU.Buffer[0] = 0;
DirContext->ShortNameU.Length = 0;
- StringO.Buffer = fatxDirEntry->Filename;
+ StringO.Buffer = (PCHAR)fatxDirEntry->Filename;
StringO.Length = StringO.MaximumLength = fatxDirEntry->FilenameLength;
RtlOemStringToUnicodeString(&DirContext->LongNameU, &StringO, FALSE);
return STATUS_SUCCESS;
reactos/drivers/fs/vfat
diff -u -r1.43 -r1.44
--- dirwr.c 5 Dec 2004 16:31:50 -0000 1.43
+++ dirwr.c 25 Dec 2004 11:18:38 -0000 1.44
@@ -1,4 +1,4 @@
-/* $Id: dirwr.c,v 1.43 2004/12/05 16:31:50 gvg Exp $
+/* $Id: dirwr.c,v 1.44 2004/12/25 11:18:38 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -595,7 +595,7 @@
DirContext.DirEntry.FatX.FileSize = 0;
/* set file name */
- NameA.Buffer = DirContext.DirEntry.FatX.Filename;
+ NameA.Buffer = (PCHAR)DirContext.DirEntry.FatX.Filename;
NameA.Length = 0;
NameA.MaximumLength = 42;
RtlUnicodeStringToOemString(&NameA, &DirContext.LongNameU, FALSE);
reactos/drivers/fs/vfat
diff -u -r1.47 -r1.48
--- fat.c 5 Dec 2004 16:31:50 -0000 1.47
+++ fat.c 25 Dec 2004 11:18:38 -0000 1.48
@@ -1,5 +1,5 @@
/*
- * $Id: fat.c,v 1.47 2004/12/05 16:31:50 gvg Exp $
+ * $Id: fat.c,v 1.48 2004/12/25 11:18:38 navaraf Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -606,9 +606,9 @@
if (DeviceExt->AvailableClustersValid)
{
if (OldValue && NewValue == 0)
- InterlockedIncrement(&DeviceExt->AvailableClusters);
+ InterlockedIncrement((PLONG)&DeviceExt->AvailableClusters);
else if (OldValue == 0 && NewValue)
- InterlockedDecrement(&DeviceExt->AvailableClusters);
+ InterlockedDecrement((PLONG)&DeviceExt->AvailableClusters);
}
ExReleaseResourceLite(&DeviceExt->FatResource);
return(Status);
reactos/drivers/input/psaux
diff -u -r1.19 -r1.20
--- psaux.c 10 Feb 2004 16:22:56 -0000 1.19
+++ psaux.c 25 Dec 2004 11:18:39 -0000 1.20
@@ -156,7 +156,7 @@
ULONG Queue;
Queue = DeviceExtension->ActiveQueue % 2;
- InterlockedIncrement(&DeviceExtension->ActiveQueue);
+ InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue);
(*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack)(
DeviceExtension->ClassInformation.DeviceObject,
DeviceExtension->MouseInputData[Queue],
reactos/drivers/input/sermouse
diff -u -r1.18 -r1.19
--- sermouse.c 6 Jun 2004 15:55:03 -0000 1.18
+++ sermouse.c 25 Dec 2004 11:18:39 -0000 1.19
@@ -376,7 +376,7 @@
ULONG Queue;
Queue = DeviceExtension->ActiveQueue % 2;
- InterlockedIncrement(&DeviceExtension->ActiveQueue);
+ InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue);
(*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack)(
DeviceExtension->ClassInformation.DeviceObject,
DeviceExtension->MouseInputData[Queue],
reactos/drivers/lib/bzip2
diff -u -r1.6 -r1.7
--- Makefile 16 Nov 2003 22:37:06 -0000 1.6
+++ Makefile 25 Dec 2004 11:18:39 -0000 1.7
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2003/11/16 22:37:06 sedwards Exp $
+# $Id: Makefile,v 1.7 2004/12/25 11:18:39 navaraf Exp $
PATH_TO_TOP = ../../..
@@ -10,7 +10,8 @@
TARGET_CFLAGS = \
-Wall -Winline -Os -fomit-frame-pointer -fno-strength-reduce \
- -DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY $(BIGFILES) -g -Werror -D__USE_W32API
+ -DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY $(BIGFILES) -g -Werror -D__USE_W32API \
+ -finline-limit=1000
TARGET_OBJECTS = \
bzlib.o \
reactos/drivers/lib/ip/network
diff -u -r1.8 -r1.9
--- ip.c 30 Nov 2004 00:10:40 -0000 1.8
+++ ip.c 25 Dec 2004 11:18:39 -0000 1.9
@@ -264,7 +264,6 @@
}
/* Add interface to the global interface list */
- ASSERT(&IF->ListEntry);
TcpipInterlockedInsertTailList(&InterfaceListHead,
&IF->ListEntry,
&InterfaceListLock);
reactos/drivers/net/dd/ne2000/ne2000
diff -u -r1.6 -r1.7
--- 8390.c 24 Jul 2004 04:48:01 -0000 1.6
+++ 8390.c 25 Dec 2004 11:18:39 -0000 1.7
@@ -641,7 +641,7 @@
VOID NICReadDataAlign(
PNIC_ADAPTER Adapter,
PUSHORT Target,
- ULONG Source,
+ ULONG_PTR Source,
USHORT Length)
/*
* FUNCTION: Copies data from a NIC's RAM into a buffer
@@ -697,7 +697,7 @@
VOID NICWriteDataAlign(
PNIC_ADAPTER Adapter,
- ULONG Target,
+ ULONG_PTR Target,
PUSHORT Source,
USHORT Length)
/*
@@ -790,7 +790,7 @@
VOID NICReadData(
PNIC_ADAPTER Adapter,
PUCHAR Target,
- ULONG Source,
+ ULONG_PTR Source,
USHORT Length)
/*
* FUNCTION: Copies data from a NIC's RAM into a buffer
@@ -831,7 +831,7 @@
VOID NICWriteData(
PNIC_ADAPTER Adapter,
- ULONG Target,
+ ULONG_PTR Target,
PUCHAR Source,
USHORT Length)
/*
@@ -858,7 +858,7 @@
/* Update pointers */
Source = (PUCHAR) ((ULONG_PTR) Source + 1);
- (ULONG_PTR)Target += 1;
+ Target += 1;
Length--;
}
@@ -866,8 +866,8 @@
/* Transfer as many words as we can without exceeding the transfer length */
Tmp = Length & 0xFFFE;
NICWriteDataAlign(Adapter, Target, (PUSHORT)Source, Tmp);
- Source += Tmp;
- (ULONG_PTR)Target += Tmp;
+ Source += Tmp;
+ Target += Tmp;
/* Read one word */
NICReadDataAlign(Adapter, &Tmp, Target, 0x02);
reactos/drivers/net/ndis
diff -u -r1.23 -r1.24
--- Makefile 23 Nov 2004 18:58:44 -0000 1.23
+++ Makefile 25 Dec 2004 11:18:40 -0000 1.24
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.23 2004/11/23 18:58:44 navaraf Exp $
+# $Id: Makefile,v 1.24 2004/12/25 11:18:40 navaraf Exp $
PATH_TO_TOP = ../../..
@@ -8,7 +8,7 @@
TARGET_PCH = include/ndissys.h
-TARGET_CFLAGS = -I./include -D__USE_W32API -Wall -Werror
+TARGET_CFLAGS = -I./include -D__USE_W32API -Wall
TARGET_CFLAGS += -DNDIS_WRAPPER -DNDIS50 -DNDIS50_MINIPORT -DBINARY_COMPATIBLE
reactos/drivers/net/ndis/include
diff -u -r1.9 -r1.10
--- ndissys.h 18 Dec 2004 19:32:36 -0000 1.9
+++ ndissys.h 25 Dec 2004 11:18:40 -0000 1.10
@@ -61,27 +61,27 @@
* VOID ReferenceObject(
* PVOID Object)
*/
-#define ReferenceObject(Object) \
-{ \
- DEBUG_REFCHECK(Object); \
+#define ReferenceObject(Object) \
+{ \
+ DEBUG_REFCHECK(Object); \
NDIS_DbgPrint(DEBUG_REFCOUNT, ("Referencing object at (0x%X). RefCount (%d).\n", \
- (Object), (Object)->RefCount)); \
- \
- InterlockedIncrement(&((Object)->RefCount)); \
+ (Object), (Object)->RefCount)); \
+ \
+ InterlockedIncrement((PLONG)&((Object)->RefCount)); \
}
/*
* VOID DereferenceObject(
* PVOID Object)
*/
-#define DereferenceObject(Object) \
-{ \
- DEBUG_REFCHECK(Object); \
+#define DereferenceObject(Object) \
+{ \
+ DEBUG_REFCHECK(Object); \
NDIS_DbgPrint(DEBUG_REFCOUNT, ("Dereferencing object at (0x%X). RefCount (%d).\n", \
- (Object), (Object)->RefCount)); \
- \
- if (InterlockedDecrement(&((Object)->RefCount)) == 0) \
- PoolFreeBuffer(Object); \
+ (Object), (Object)->RefCount)); \
+ \
+ if (InterlockedDecrement((PLONG)&((Object)->RefCount)) == 0) \
+ PoolFreeBuffer(Object); \
}
reactos/drivers/net/ndis/ndis
diff -u -r1.50 -r1.51
--- miniport.c 18 Dec 2004 20:32:41 -0000 1.50
+++ miniport.c 25 Dec 2004 11:18:40 -0000 1.51
@@ -1256,7 +1256,8 @@
KeInitializeEvent(&Event, NotificationEvent, FALSE);
IoCopyCurrentIrpStackLocationToNext(Irp);
- IoSetCompletionRoutine(Irp, NdisIForwardIrpAndWaitCompletionRoutine, &Event, TRUE, TRUE, TRUE);
+ IoSetCompletionRoutine(Irp, NdisIForwardIrpAndWaitCompletionRoutine, &Event,
+ TRUE, TRUE, TRUE);
Status = IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp);
if (Status == STATUS_PENDING)
{
reactos/drivers/net/npf
diff -u -r1.4 -r1.5
--- openclos.c 11 May 2004 20:52:09 -0000 1.4
+++ openclos.c 25 Dec 2004 11:18:40 -0000 1.5
@@ -154,7 +154,7 @@
PacketItoa(NamedEventsCounter,(PUCHAR)(Open->ReadEventName.Buffer+21));
- InterlockedIncrement(&NamedEventsCounter);
+ InterlockedIncrement((PLONG)&NamedEventsCounter);
IF_LOUD(DbgPrint("\nCreated the named event for the read; name=%ws, counter=%d\n", Open->ReadEventName.Buffer,NamedEventsCounter-1);)
reactos/drivers/net/npf
diff -u -r1.6 -r1.7
--- packet.c 3 Jul 2004 17:40:21 -0000 1.6
+++ packet.c 25 Dec 2004 11:18:40 -0000 1.7
@@ -706,7 +706,7 @@
case BIOCSENDPACKETSNOSYNC:
WriteRes = NPF_BufferedWrite(Irp,
- (PUCHAR)Irp->AssociatedIrp.SystemBuffer,
+ (PCHAR)Irp->AssociatedIrp.SystemBuffer,
IrpSp->Parameters.DeviceIoControl.InputBufferLength,
SyncWrite);
reactos/drivers/video/displays/vga/vgavideo
diff -u -r1.3 -r1.4
--- vgavideo.c 3 Jul 2004 13:45:42 -0000 1.3
+++ vgavideo.c 25 Dec 2004 11:18:40 -0000 1.4
@@ -11,7 +11,7 @@
int bit8[640];
int startmasks[8];
int endmasks[8];
-char* vidmem;
+PBYTE vidmem;
static ULONG UnpackPixel[256];
static unsigned char leftMask;
reactos/drivers/video/displays/vga/vgavideo
diff -u -r1.1 -r1.2
--- vgavideo.h 10 Jan 2004 14:39:20 -0000 1.1
+++ vgavideo.h 25 Dec 2004 11:18:40 -0000 1.2
@@ -21,7 +21,7 @@
extern UCHAR PreCalcReverseByte[256];
-extern char* vidmem;
+extern PBYTE vidmem;
#define MISC 0x3c2
#define SEQ 0x3c4
CVSspam 0.2.8