- Fix compilation with GCC 4.0-20041219.

svn path=/trunk/; revision=12326

diff --git a/reactos/apps/utils/pnpdump/pnpdump.c b/reactos/apps/utils/pnpdump/pnpdump.c
index 00a25ad..5fb804c 100644 (file)
--- a/reactos/apps/utils/pnpdump/pnpdump.c
+++ b/reactos/apps/utils/pnpdump/pnpdump.c
@@ -290,7 +290,7 @@ GetPnpKey(PHKEY PnpKey)
                               "Identifier",
                               NULL,
                               &dwType,
                               "Identifier",
                               NULL,
                               &dwType,

-                              szBuffer,
+                              (LPBYTE)szBuffer,

                               &dwSize);
       if (lError != ERROR_SUCCESS)
        {
                               &dwSize);
       if (lError != ERROR_SUCCESS)
        {


@@ -547,7 +547,7 @@ PnpDecodeFixedMemory(unsigned char *Ptr)
 
 void PrintDeviceData (PCM_PNP_BIOS_DEVICE_NODE DeviceNode)
 {
 
 void PrintDeviceData (PCM_PNP_BIOS_DEVICE_NODE DeviceNode)
 {

-  unsigned char PnpId[8];
+  char PnpId[8];

   unsigned char *Ptr;
   unsigned int TagSize;
   unsigned int TagType;
   unsigned char *Ptr;
   unsigned int TagSize;
   unsigned int TagType;


@@ -719,7 +719,7 @@ int main (int argc, char *argv[])
                           "Configuration Data",
                           NULL,
                           &dwType,
                           "Configuration Data",
                           NULL,
                           &dwType,

-                          (LPSTR)lpBuffer,
+                          (LPBYTE)lpBuffer,

                           &dwSize);
   if (lError != ERROR_SUCCESS)
     {
                           &dwSize);
   if (lError != ERROR_SUCCESS)
     {


@@ -753,13 +753,13 @@ int main (int argc, char *argv[])
 //  printf("ResourceSize: %lu\n", dwResourceSize);
 
   lpPnpInst = (PCM_PNP_BIOS_INSTALLATION_CHECK)
 //  printf("ResourceSize: %lu\n", dwResourceSize);
 
   lpPnpInst = (PCM_PNP_BIOS_INSTALLATION_CHECK)

-       ((DWORD)(&lpBuffer->PartialResourceList.PartialDescriptors[0]) +
+       ((ULONG_PTR)(&lpBuffer->PartialResourceList.PartialDescriptors[0]) +

          sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
 
 //  printf("lpPnpInst %p\n", lpPnpInst);
 
   printf("Signature '%.4s'\n", lpPnpInst->Signature);
          sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
 
 //  printf("lpPnpInst %p\n", lpPnpInst);
 
   printf("Signature '%.4s'\n", lpPnpInst->Signature);

-  if (strncmp(lpPnpInst->Signature, "$PnP", 4))
+  if (strncmp((PCHAR)lpPnpInst->Signature, "$PnP", 4))

     {
       printf("Error: Invalid PnP signature\n");
       free(lpBuffer);
     {
       printf("Error: Invalid PnP signature\n");
       free(lpBuffer);

diff --git a/reactos/drivers/dd/blue/blue.c b/reactos/drivers/dd/blue/blue.c
index bbe047d..4a53ad1 100644 (file)
--- a/reactos/drivers/dd/blue/blue.c
+++ b/reactos/drivers/dd/blue/blue.c
@@ -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
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel


@@ -166,7 +166,7 @@ ScrWrite(PDEVICE_OBJECT DeviceObject,
     PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension;
     NTSTATUS Status;
     char *pch = Irp->UserBuffer;
     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;
     int i, j, offset;
     int cursorx, cursory;
     int rows, columns;


@@ -437,7 +437,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
       case IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE:
         {
           POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer;
       case IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE:
         {
           POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer;

-          char *vidmem;
+          PBYTE vidmem;

           int offset;
           DWORD dwCount;
 
           int offset;
           DWORD dwCount;
 


@@ -461,7 +461,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
         {
           POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer;
           PWORD pAttr = (PWORD)MmGetSystemAddressForMdl(Irp->MdlAddress);
         {
           POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer;
           PWORD pAttr = (PWORD)MmGetSystemAddressForMdl(Irp->MdlAddress);

-          char *vidmem;
+          PBYTE vidmem;

           int offset;
           DWORD dwCount;
 
           int offset;
           DWORD dwCount;
 


@@ -485,7 +485,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
         {
           COORD *pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress);
           CHAR *pAttr = (CHAR *)(pCoord + 1);
         {
           COORD *pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress);
           CHAR *pAttr = (CHAR *)(pCoord + 1);

-          char *vidmem;
+          PBYTE vidmem;

           int offset;
           DWORD dwCount;
 
           int offset;
           DWORD dwCount;
 


@@ -511,7 +511,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
       case IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER:
         {
           POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer;
       case IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER:
         {
           POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer;

-          char *vidmem;
+          PBYTE vidmem;

           int offset;
           DWORD dwCount;
 
           int offset;
           DWORD dwCount;
 


@@ -537,7 +537,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
         {
           POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer;
           LPSTR pChar = (LPSTR)MmGetSystemAddressForMdl(Irp->MdlAddress);
         {
           POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer;
           LPSTR pChar = (LPSTR)MmGetSystemAddressForMdl(Irp->MdlAddress);

-          char *vidmem;
+          PBYTE vidmem;

           int offset;
           DWORD dwCount;
 
           int offset;
           DWORD dwCount;
 


@@ -561,7 +561,7 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
         {
           COORD *pCoord;
           LPSTR pChar;
         {
           COORD *pCoord;
           LPSTR pChar;

-          char *vidmem;
+          PBYTE vidmem;

           int offset;
           DWORD dwCount;
 
           int offset;
           DWORD dwCount;
 


@@ -584,11 +584,11 @@ ScrIoControl(PDEVICE_OBJECT DeviceObject,
       case IOCTL_CONSOLE_DRAW:
         {
           PCONSOLE_DRAW ConsoleDraw;
       case IOCTL_CONSOLE_DRAW:
         {
           PCONSOLE_DRAW ConsoleDraw;

-          char *Src, *Dest;
+          PBYTE Src, Dest;

           UINT SrcDelta, DestDelta, i, Offset;
 
           ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress);
           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;
           SrcDelta = ConsoleDraw->SizeX * 2;
           Dest = DeviceExtension->VideoMemory +
                  (ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2;

diff --git a/reactos/drivers/fs/cdfs/fsctl.c b/reactos/drivers/fs/cdfs/fsctl.c
index d21d0cb..bb57b0b 100644 (file)
--- a/reactos/drivers/fs/cdfs/fsctl.c
+++ b/reactos/drivers/fs/cdfs/fsctl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  *  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
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel


@@ -52,7 +52,7 @@ CdfsGetPVDData(PUCHAR Buffer,
 {
   PPVD Pvd;
   ULONG i;
 {
   PPVD Pvd;
   ULONG i;

-  PCHAR pc;
+  PUCHAR pc;

   PWCHAR pw;
 
   union
   PWCHAR pw;
 
   union


@@ -153,17 +153,17 @@ CdfsGetSVDData(PUCHAR Buffer,
 
   DPRINT("EscapeSequences: '%.32s'\n", Svd->EscapeSequences);
 
 
   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;
     }
     {
       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;
     }
     {
       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;
     {
       DPRINT("Joliet extension found (UCS-2 Level 3)\n");
       JolietLevel = 3;

diff --git a/reactos/drivers/fs/fs_rec/ntfs.c b/reactos/drivers/fs/fs_rec/ntfs.c
index 72821a9..44ac3a2 100644 (file)
--- a/reactos/drivers/fs/fs_rec/ntfs.c
+++ b/reactos/drivers/fs/fs_rec/ntfs.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  *  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
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel


@@ -79,7 +79,7 @@ FsRecIsNtfsVolume(IN PDEVICE_OBJECT DeviceObject)
     }
 
   DPRINT("NTFS-identifier: [%.8s]\n", &Buffer[3]);
     }
 
   DPRINT("NTFS-identifier: [%.8s]\n", &Buffer[3]);

-  if (strncmp(&Buffer[3], "NTFS    ", 8) == 0)
+  if (RtlCompareMemory(&Buffer[3], "NTFS    ", 8) == 8)

     {
       Status = STATUS_SUCCESS;
     }
     {
       Status = STATUS_SUCCESS;
     }

diff --git a/reactos/drivers/fs/ntfs/fsctl.c b/reactos/drivers/fs/ntfs/fsctl.c
index df09b40..ac463fa 100644 (file)
--- a/reactos/drivers/fs/ntfs/fsctl.c
+++ b/reactos/drivers/fs/ntfs/fsctl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  *  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
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel


@@ -108,7 +108,7 @@ NtfsHasFileSystem(PDEVICE_OBJECT DeviceToMount)
   if (NT_SUCCESS(Status))
     {
       DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OemName);
   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;
        }
        {
          Status = STATUS_UNRECOGNIZED_VOLUME;
        }

diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c
index e94998a..e71e6fa 100644 (file)
--- a/reactos/drivers/fs/vfat/create.c
+++ b/reactos/drivers/fs/vfat/create.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  *  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
  *
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/create.c


@@ -141,7 +141,7 @@ ReadVolumeLabel (PDEVICE_EXTENSION DeviceExt, PVPB Vpb)
           /* copy volume label */
           if (DeviceExt->Flags & VCB_IS_FATX)
           {
           /* 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);
           }
             StringO.MaximumLength = StringO.Length = Entry->FatX.FilenameLength;
             RtlOemStringToUnicodeString(&NameU, &StringO, FALSE);
           }

diff --git a/reactos/drivers/fs/vfat/direntry.c b/reactos/drivers/fs/vfat/direntry.c
index 1dd4d94..f2c8eaa 100644 (file)
--- a/reactos/drivers/fs/vfat/direntry.c
+++ b/reactos/drivers/fs/vfat/direntry.c
@@ -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
  *
  *
  * FILE:             DirEntry.c


@@ -455,7 +455,7 @@ NTSTATUS FATXGetNextDirEntry(PVOID * pContext,
    }
    DirContext->ShortNameU.Buffer[0] = 0;
    DirContext->ShortNameU.Length = 0;
    }
    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;
    StringO.Length = StringO.MaximumLength = fatxDirEntry->FilenameLength;
    RtlOemStringToUnicodeString(&DirContext->LongNameU, &StringO, FALSE);
    return STATUS_SUCCESS;

diff --git a/reactos/drivers/fs/vfat/dirwr.c b/reactos/drivers/fs/vfat/dirwr.c
index ada8d3b..2c3f6a9 100644 (file)
--- a/reactos/drivers/fs/vfat/dirwr.c
+++ b/reactos/drivers/fs/vfat/dirwr.c
@@ -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
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel


@@ -595,7 +595,7 @@ FATXAddEntry (PDEVICE_EXTENSION DeviceExt,
    DirContext.DirEntry.FatX.FileSize = 0;
    
    /* set file name */
    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);
    NameA.Length = 0;
    NameA.MaximumLength = 42;
    RtlUnicodeStringToOemString(&NameA, &DirContext.LongNameU, FALSE);

diff --git a/reactos/drivers/fs/vfat/fat.c b/reactos/drivers/fs/vfat/fat.c
index 741dd79..1ea0dda 100644 (file)
--- a/reactos/drivers/fs/vfat/fat.c
+++ b/reactos/drivers/fs/vfat/fat.c
@@ -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
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel


@@ -606,9 +606,9 @@ WriteCluster(PDEVICE_EXTENSION DeviceExt,
   if (DeviceExt->AvailableClustersValid)
   {
       if (OldValue && NewValue == 0)
   if (DeviceExt->AvailableClustersValid)
   {
       if (OldValue && NewValue == 0)

-        InterlockedIncrement(&DeviceExt->AvailableClusters);
+        InterlockedIncrement((PLONG)&DeviceExt->AvailableClusters);

       else if (OldValue == 0 && NewValue)
       else if (OldValue == 0 && NewValue)

-        InterlockedDecrement(&DeviceExt->AvailableClusters);
+        InterlockedDecrement((PLONG)&DeviceExt->AvailableClusters);

   }
   ExReleaseResourceLite(&DeviceExt->FatResource);
   return(Status);
   }
   ExReleaseResourceLite(&DeviceExt->FatResource);
   return(Status);

diff --git a/reactos/drivers/input/psaux/psaux.c b/reactos/drivers/input/psaux/psaux.c
index 655a6d3..4cb6369 100644 (file)
--- a/reactos/drivers/input/psaux/psaux.c
+++ b/reactos/drivers/input/psaux/psaux.c
@@ -156,7 +156,7 @@ VOID PS2MouseIsrDpc(PKDPC Dpc, PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Cont
    ULONG Queue;
 
    Queue = DeviceExtension->ActiveQueue % 2;
    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],
    (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack)(
                        DeviceExtension->ClassInformation.DeviceObject,
                        DeviceExtension->MouseInputData[Queue],

diff --git a/reactos/drivers/input/sermouse/sermouse.c b/reactos/drivers/input/sermouse/sermouse.c
index 62403a8..23ed60e 100644 (file)
--- a/reactos/drivers/input/sermouse/sermouse.c
+++ b/reactos/drivers/input/sermouse/sermouse.c
@@ -376,7 +376,7 @@ VOID SerialMouseIsrDpc(PKDPC Dpc, PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID C
        ULONG Queue;
 
        Queue = DeviceExtension->ActiveQueue % 2;
        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],
        (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack)(
                DeviceExtension->ClassInformation.DeviceObject,
                DeviceExtension->MouseInputData[Queue],

diff --git a/reactos/drivers/lib/bzip2/Makefile b/reactos/drivers/lib/bzip2/Makefile
index fa5ecce..bb154c2 100644 (file)
--- a/reactos/drivers/lib/bzip2/Makefile
+++ b/reactos/drivers/lib/bzip2/Makefile
@@ -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 = ../../..
 
 
 PATH_TO_TOP = ../../..
 


@@ -10,7 +10,8 @@ TARGET_NORC = yes
 
 TARGET_CFLAGS = \
  -Wall -Winline -Os -fomit-frame-pointer -fno-strength-reduce \
 
 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 \
 
 TARGET_OBJECTS = \
        bzlib.o \

diff --git a/reactos/drivers/lib/ip/network/ip.c b/reactos/drivers/lib/ip/network/ip.c
index 8a96bc7..d2ccd11 100644 (file)
--- a/reactos/drivers/lib/ip/network/ip.c
+++ b/reactos/drivers/lib/ip/network/ip.c
@@ -264,7 +264,6 @@ BOOLEAN IPRegisterInterface(
     }
     
     /* Add interface to the global interface list */
     }
     
     /* Add interface to the global interface list */

-    ASSERT(&IF->ListEntry);

     TcpipInterlockedInsertTailList(&InterfaceListHead, 
                                   &IF->ListEntry, 
                                   &InterfaceListLock);
     TcpipInterlockedInsertTailList(&InterfaceListHead, 
                                   &IF->ListEntry, 
                                   &InterfaceListLock);

diff --git a/reactos/drivers/net/dd/ne2000/ne2000/8390.c b/reactos/drivers/net/dd/ne2000/ne2000/8390.c
index bb9cdad..fae1a92 100644 (file)
--- a/reactos/drivers/net/dd/ne2000/ne2000/8390.c
+++ b/reactos/drivers/net/dd/ne2000/ne2000/8390.c
@@ -641,7 +641,7 @@ VOID NICUpdateCounters(
 VOID NICReadDataAlign(
     PNIC_ADAPTER Adapter,
     PUSHORT Target,
 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
     USHORT Length)
 /*
  * FUNCTION: Copies data from a NIC's RAM into a buffer


@@ -697,7 +697,7 @@ VOID NICReadDataAlign(
 
 VOID NICWriteDataAlign(
     PNIC_ADAPTER Adapter,
 
 VOID NICWriteDataAlign(
     PNIC_ADAPTER Adapter,

-    ULONG Target,
+    ULONG_PTR Target,

     PUSHORT Source,
     USHORT Length)
 /*
     PUSHORT Source,
     USHORT Length)
 /*


@@ -790,7 +790,7 @@ VOID NICWriteDataAlign(
 VOID NICReadData(
     PNIC_ADAPTER Adapter,
     PUCHAR Target,
 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
     USHORT Length)
 /*
  * FUNCTION: Copies data from a NIC's RAM into a buffer


@@ -831,7 +831,7 @@ VOID NICReadData(
 
 VOID NICWriteData(
     PNIC_ADAPTER Adapter,
 
 VOID NICWriteData(
     PNIC_ADAPTER Adapter,

-    ULONG Target,
+    ULONG_PTR Target,

     PUCHAR Source,
     USHORT Length)
 /*
     PUCHAR Source,
     USHORT Length)
 /*


@@ -858,7 +858,7 @@ VOID NICWriteData(
 
         /* Update pointers */
         Source = (PUCHAR) ((ULONG_PTR) Source + 1);
 
         /* Update pointers */
         Source = (PUCHAR) ((ULONG_PTR) Source + 1);

-        (ULONG_PTR)Target += 1;
+        Target += 1;

         Length--;
     }
 
         Length--;
     }
 


@@ -866,8 +866,8 @@ VOID NICWriteData(
         /* Transfer as many words as we can without exceeding the transfer length */
         Tmp = Length & 0xFFFE;
         NICWriteDataAlign(Adapter, Target, (PUSHORT)Source, Tmp);
         /* 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);
 
         /* Read one word */
         NICReadDataAlign(Adapter, &Tmp, Target, 0x02);

diff --git a/reactos/drivers/net/ndis/Makefile b/reactos/drivers/net/ndis/Makefile
index f74f2f6..1a9a6a3 100644 (file)
--- a/reactos/drivers/net/ndis/Makefile
+++ b/reactos/drivers/net/ndis/Makefile
@@ -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 = ../../..
 
 
 PATH_TO_TOP = ../../..
 


@@ -8,7 +8,7 @@ TARGET_NAME = ndis
 
 TARGET_PCH = include/ndissys.h
 
 
 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
 
 
 TARGET_CFLAGS += -DNDIS_WRAPPER -DNDIS50 -DNDIS50_MINIPORT -DBINARY_COMPATIBLE
 

diff --git a/reactos/drivers/net/ndis/include/ndissys.h b/reactos/drivers/net/ndis/include/ndissys.h
index 7556f23..5f38523 100644 (file)
--- a/reactos/drivers/net/ndis/include/ndissys.h
+++ b/reactos/drivers/net/ndis/include/ndissys.h
@@ -61,27 +61,27 @@ typedef struct _ATM_ADDRESS *PATM_ADDRESS;
  * VOID ReferenceObject(
  *     PVOID Object)
  */
  * 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", \
     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)
  */
 }
 
 /*
  * 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", \
     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);                                  \

 }
 
 
 }
 
 

diff --git a/reactos/drivers/net/ndis/ndis/miniport.c b/reactos/drivers/net/ndis/ndis/miniport.c
index de79ed8..aaaf07c 100644 (file)
--- a/reactos/drivers/net/ndis/ndis/miniport.c
+++ b/reactos/drivers/net/ndis/ndis/miniport.c
@@ -1256,7 +1256,8 @@ NdisIForwardIrpAndWait(PLOGICAL_ADAPTER Adapter, PIRP Irp)
 
   KeInitializeEvent(&Event, NotificationEvent, FALSE);
   IoCopyCurrentIrpStackLocationToNext(Irp);
 
   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)
     {
   Status = IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp);
   if (Status == STATUS_PENDING)
     {

diff --git a/reactos/drivers/net/npf/openclos.c b/reactos/drivers/net/npf/openclos.c
index ccb4bf4..b845adc 100644 (file)
--- a/reactos/drivers/net/npf/openclos.c
+++ b/reactos/drivers/net/npf/openclos.c
@@ -154,7 +154,7 @@ NPF_Open(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
 
        PacketItoa(NamedEventsCounter,(PUCHAR)(Open->ReadEventName.Buffer+21));
 
 
        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);)
 
        
        IF_LOUD(DbgPrint("\nCreated the named event for the read; name=%ws, counter=%d\n", Open->ReadEventName.Buffer,NamedEventsCounter-1);)
 

diff --git a/reactos/drivers/net/npf/packet.c b/reactos/drivers/net/npf/packet.c
index fc6ed0e..c2c8eea 100644 (file)
--- a/reactos/drivers/net/npf/packet.c
+++ b/reactos/drivers/net/npf/packet.c
@@ -706,7 +706,7 @@ NPF_IoControl(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp)
        case BIOCSENDPACKETSNOSYNC:
 
                WriteRes = NPF_BufferedWrite(Irp,
        case BIOCSENDPACKETSNOSYNC:
 
                WriteRes = NPF_BufferedWrite(Irp,

-                       (PUCHAR)Irp->AssociatedIrp.SystemBuffer,
+                       (PCHAR)Irp->AssociatedIrp.SystemBuffer,

                        IrpSp->Parameters.DeviceIoControl.InputBufferLength,
                        SyncWrite);
 
                        IrpSp->Parameters.DeviceIoControl.InputBufferLength,
                        SyncWrite);
 

diff --git a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
index aadc24a..620dbfd 100644 (file)
--- a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
+++ b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
@@ -11,7 +11,7 @@ int xconv[640];
 int bit8[640];
 int startmasks[8];
 int endmasks[8];
 int bit8[640];
 int startmasks[8];
 int endmasks[8];

-char* vidmem;
+PBYTE vidmem;

 static ULONG UnpackPixel[256];
 
 static unsigned char leftMask;
 static ULONG UnpackPixel[256];
 
 static unsigned char leftMask;

diff --git a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h
index 5a49675..57b291d 100644 (file)
--- a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h
+++ b/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h
@@ -21,7 +21,7 @@ extern int endmasks[8];
 
 extern UCHAR PreCalcReverseByte[256];
 
 
 extern UCHAR PreCalcReverseByte[256];
 

-extern char* vidmem;
+extern PBYTE vidmem;

 
 #define MISC     0x3c2
 #define SEQ      0x3c4
 
 #define MISC     0x3c2
 #define SEQ      0x3c4

diff --git a/reactos/include/msvcrt/ctype.h b/reactos/include/msvcrt/ctype.h
index 96e0b21..d70f3ae 100644 (file)
--- a/reactos/include/msvcrt/ctype.h
+++ b/reactos/include/msvcrt/ctype.h
@@ -18,9 +18,9 @@
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
  *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *

- * $Revision: 1.9 $
- * $Author: sedwards $
- * $Date: 2003/08/25 01:37:47 $
+ * $Revision: 1.10 $
+ * $Author: navaraf $
+ * $Date: 2004/12/25 11:22:37 $

  *
  */
 
  *
  */
 


@@ -119,10 +119,8 @@ int iswspace(wint_t);
 int iswupper(wint_t);
 int iswxdigit(wint_t);
 
 int iswupper(wint_t);
 int iswxdigit(wint_t);
 

-/* wchar_t towlower(wchar_t); */
-/* wchar_t towupper(wchar_t); */
-int towlower(wint_t);
-int towupper(wint_t);
+wchar_t towlower(wchar_t);
+wchar_t towupper(wchar_t);

 
 int isleadbyte(int);
 
 
 int isleadbyte(int);
 

diff --git a/reactos/include/wine/msacmdrv.h b/reactos/include/wine/msacmdrv.h
index 6d2668d..6292425 100644 (file)
--- a/reactos/include/wine/msacmdrv.h
+++ b/reactos/include/wine/msacmdrv.h
@@ -23,7 +23,7 @@
 
 #include <stdarg.h>
 
 
 #include <stdarg.h>
 

-#include "windef.h"
+#include <windef.h>

 #include "winbase.h"
 #include "mmsystem.h"
 #include "mmreg.h"
 #include "winbase.h"
 #include "mmsystem.h"
 #include "mmreg.h"

diff --git a/reactos/lib/advapi32/crypt/crypt.c b/reactos/lib/advapi32/crypt/crypt.c
index ce90065..ca505fc 100644 (file)
--- a/reactos/lib/advapi32/crypt/crypt.c
+++ b/reactos/lib/advapi32/crypt/crypt.c
@@ -325,7 +325,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
                        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
                        goto error;
                }
                        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
                        goto error;
                }

-               r = RegQueryValueExA(key, "Name", NULL, NULL, provname, &len);
+               r = RegQueryValueExA(key, "Name", NULL, NULL, (LPBYTE)provname, &len);

                if (r != ERROR_SUCCESS)
                {
                        DPRINT("error %ld reading 'Name' from registry\n", r );
                if (r != ERROR_SUCCESS)
                {
                        DPRINT("error %ld reading 'Name' from registry\n", r );


@@ -381,7 +381,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
                goto error;
        }
                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
                goto error;
        }

-       r = RegQueryValueExA(key, "Image Path", NULL, NULL, temp, &len);
+       r = RegQueryValueExA(key, "Image Path", NULL, NULL, (LPBYTE)temp, &len);

        if (r != ERROR_SUCCESS)
        {
                DPRINT("error %ld reading 'Image Path' from registry\n", r );
        if (r != ERROR_SUCCESS)
        {
                DPRINT("error %ld reading 'Image Path' from registry\n", r );


@@ -1124,7 +1124,7 @@ BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved,
        *pdwProvType += (*(--ch) - '0') * 100;
        CRYPT_Free(keyname);
        
        *pdwProvType += (*(--ch) - '0') * 100;
        CRYPT_Free(keyname);
        

-       result = RegQueryValueExA(hSubkey, "TypeName", NULL, &dwType, pszTypeName, pcbTypeName);
+       result = RegQueryValueExA(hSubkey, "TypeName", NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName);

        if (result)
                CRYPT_ReturnLastError(result);
 
        if (result)
                CRYPT_ReturnLastError(result);
 


@@ -1281,7 +1281,7 @@ BOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved,
        }
        CRYPT_Free(keyname);
        
        }
        CRYPT_Free(keyname);
        

-       result = RegQueryValueExA(hKey, "Name", NULL, NULL, pszProvName, pcbProvName); 
+       result = RegQueryValueExA(hKey, "Name", NULL, NULL, (LPBYTE)pszProvName, pcbProvName); 

        if (result)
        {
                if (result != ERROR_MORE_DATA)
        if (result)
        {
                if (result != ERROR_MORE_DATA)


@@ -1760,7 +1760,7 @@ BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pd
                }
                CRYPT_Free(keyname);
                
                }
                CRYPT_Free(keyname);
                

-               if (RegSetValueExA(hTypeKey, "Name", 0, REG_SZ, pszProvName, strlen(pszProvName) + 1))
+               if (RegSetValueExA(hTypeKey, "Name", 0, REG_SZ, (LPBYTE)pszProvName, strlen(pszProvName) + 1))

                {
                        RegCloseKey(hTypeKey);
                        RegCloseKey(hProvKey);
                {
                        RegCloseKey(hTypeKey);
                        RegCloseKey(hProvKey);

diff --git a/reactos/lib/advapi32/crypt/crypt_lmhash.c b/reactos/lib/advapi32/crypt/crypt_lmhash.c
index 9f1eaf4..e4d04cc 100644 (file)
--- a/reactos/lib/advapi32/crypt/crypt_lmhash.c
+++ b/reactos/lib/advapi32/crypt/crypt_lmhash.c
@@ -27,18 +27,18 @@
 static const unsigned char CRYPT_LMhash_Magic[8] =
     { 'K', 'G', 'S', '!', '@', '#', '$', '%' };
 
 static const unsigned char CRYPT_LMhash_Magic[8] =
     { 'K', 'G', 'S', '!', '@', '#', '$', '%' };
 

-static void CRYPT_LMhash(unsigned char *dst, const unsigned char *pwd, const int len)
+static void CRYPT_LMhash(LPSTR dst, LPCSTR pwd, const int len)

 {
     int i, max = 14;
 {
     int i, max = 14;

-    unsigned char tmp_pwd[14] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+    CHAR tmp_pwd[14] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0 };

 
     max = len > max ? max : len;
 
     for (i = 0; i < max; i++)
         tmp_pwd[i] = pwd[i];
 
 
     max = len > max ? max : len;
 
     for (i = 0; i < max; i++)
         tmp_pwd[i] = pwd[i];
 

-    CRYPT_DEShash(dst, tmp_pwd, CRYPT_LMhash_Magic);
-    CRYPT_DEShash(&dst[8], &tmp_pwd[7], CRYPT_LMhash_Magic);
+    CRYPT_DEShash((PUCHAR)dst, (PUCHAR)tmp_pwd, CRYPT_LMhash_Magic);
+    CRYPT_DEShash((PUCHAR)&dst[8], (PUCHAR)&tmp_pwd[7], CRYPT_LMhash_Magic);

 }
 
 NTSTATUS WINAPI SystemFunction006(LPCSTR password, LPSTR hash)
 }
 
 NTSTATUS WINAPI SystemFunction006(LPCSTR password, LPSTR hash)

diff --git a/reactos/lib/advapi32/crypt/crypt_sha.c b/reactos/lib/advapi32/crypt/crypt_sha.c
index 70225b8..40b79af 100644 (file)
--- a/reactos/lib/advapi32/crypt/crypt_sha.c
+++ b/reactos/lib/advapi32/crypt/crypt_sha.c
@@ -51,7 +51,7 @@ typedef struct {
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 static VOID
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 static VOID

-SHA1Transform(ULONG State[5], CHAR Buffer[64])
+SHA1Transform(ULONG State[5], UCHAR Buffer[64])

 {
    ULONG a, b, c, d, e;
    ULONG *Block;
 {
    ULONG a, b, c, d, e;
    ULONG *Block;


@@ -162,7 +162,7 @@ VOID WINAPI
 A_SHAFinal(PSHA_CTX Context, PULONG Result)
 {
    INT Pad, Index;
 A_SHAFinal(PSHA_CTX Context, PULONG Result)
 {
    INT Pad, Index;

-   UCHAR Buffer[72];
+   CHAR Buffer[72];

    ULONG *Count;
    ULONG BufferContentSize, LengthHi, LengthLo;
 
    ULONG *Count;
    ULONG BufferContentSize, LengthHi, LengthLo;
 

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index 70edf73..628f24e 100644 (file)
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.65 2004/12/18 22:54:37 gvg Exp $
+/* $Id: reg.c,v 1.66 2004/12/25 11:18:50 navaraf Exp $

  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries


@@ -2216,7 +2216,7 @@ RegQueryMultipleValuesA (HKEY hKey,
                                        val_list[i].ve_valuename,
                                        NULL,
                                        &val_list[i].ve_type,
                                        val_list[i].ve_valuename,
                                        NULL,
                                        &val_list[i].ve_type,

-                                       bufptr,
+                                       (LPBYTE)bufptr,

                                        &val_list[i].ve_valuelen);
          if (ErrorCode != ERROR_SUCCESS)
            {
                                        &val_list[i].ve_valuelen);
          if (ErrorCode != ERROR_SUCCESS)
            {


@@ -2280,7 +2280,7 @@ RegQueryMultipleValuesW (HKEY hKey,
                                        val_list[i].ve_valuename,
                                        NULL,
                                        &val_list[i].ve_type,
                                        val_list[i].ve_valuename,
                                        NULL,
                                        &val_list[i].ve_type,

-                                       bufptr,
+                                       (LPBYTE)bufptr,

                                        &val_list[i].ve_valuelen);
          if (ErrorCode != ERROR_SUCCESS)
            {
                                        &val_list[i].ve_valuelen);
          if (ErrorCode != ERROR_SUCCESS)
            {


@@ -2496,7 +2496,7 @@ RegQueryValueExA (HKEY hKey,
          if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL)
            {
              RtlInitAnsiString(&AnsiString, NULL);
          if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL)
            {
              RtlInitAnsiString(&AnsiString, NULL);

-             AnsiString.Buffer = lpData;
+             AnsiString.Buffer = (LPSTR)lpData;

              AnsiString.MaximumLength = *lpcbData;
              ValueData.Length = Length;
              ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR);
              AnsiString.MaximumLength = *lpcbData;
              ValueData.Length = Length;
              ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR);

diff --git a/reactos/lib/crtdll/mbstring/iskmoji.c b/reactos/lib/crtdll/mbstring/iskmoji.c
index b9bceac..e2f1d48 100644 (file)
--- a/reactos/lib/crtdll/mbstring/iskmoji.c
+++ b/reactos/lib/crtdll/mbstring/iskmoji.c
@@ -2,5 +2,5 @@
 
 int _ismbbkalpha(unsigned char c)
 {
 
 int _ismbbkalpha(unsigned char c)
 {

-       return (0xA7 <= c <= 0xDF);
+       return (0xA7 <= c && c <= 0xDF);

 }
 }

diff --git a/reactos/lib/gdi32/objects/font.c b/reactos/lib/gdi32/objects/font.c
index 56bebf9..a24129d 100644 (file)
--- a/reactos/lib/gdi32/objects/font.c
+++ b/reactos/lib/gdi32/objects/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.9 2004/09/06 21:15:46 weiden Exp $
+/* $Id: font.c,v 1.10 2004/12/25 11:18:50 navaraf Exp $

  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries


@@ -16,7 +16,7 @@
 #define INITIAL_FAMILY_COUNT 64
 
 static BOOL FASTCALL
 #define INITIAL_FAMILY_COUNT 64
 
 static BOOL FASTCALL

-MetricsCharConvert(WCHAR w, CHAR *b)
+MetricsCharConvert(WCHAR w, UCHAR *b)

   {
   UNICODE_STRING WString;
   WCHAR WBuf[2];
   {
   UNICODE_STRING WString;
   WCHAR WBuf[2];


@@ -243,11 +243,11 @@ IntEnumFontFamilies(HDC Dc, LPLOGFONTW LogFont, PVOID EnumProc, LPARAM lParam,
         {
           RosRtlLogFontW2A(&EnumLogFontExA.elfLogFont, &Info[i].EnumLogFontEx.elfLogFont);
           WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfFullName, -1,
         {
           RosRtlLogFontW2A(&EnumLogFontExA.elfLogFont, &Info[i].EnumLogFontEx.elfLogFont);
           WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfFullName, -1,

-                              EnumLogFontExA.elfFullName, LF_FULLFACESIZE, NULL, NULL);
+                              (LPSTR)EnumLogFontExA.elfFullName, LF_FULLFACESIZE, NULL, NULL);

           WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfStyle, -1,
           WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfStyle, -1,

-                              EnumLogFontExA.elfStyle, LF_FACESIZE, NULL, NULL);
+                              (LPSTR)EnumLogFontExA.elfStyle, LF_FACESIZE, NULL, NULL);

           WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfScript, -1,
           WideCharToMultiByte(CP_THREAD_ACP, 0, Info[i].EnumLogFontEx.elfScript, -1,

-                              EnumLogFontExA.elfScript, LF_FACESIZE, NULL, NULL);
+                              (LPSTR)EnumLogFontExA.elfScript, LF_FACESIZE, NULL, NULL);

           NewTextMetricExW2A(&NewTextMetricExA,
                              &Info[i].NewTextMetricEx);
           Ret = ((FONTENUMPROCA) EnumProc)(
           NewTextMetricExW2A(&NewTextMetricExA,
                              &Info[i].NewTextMetricEx);
           Ret = ((FONTENUMPROCA) EnumProc)(

diff --git a/reactos/lib/kernel32/misc/lzexpand_main.c b/reactos/lib/kernel32/misc/lzexpand_main.c
index e97b330..ef576bb 100644 (file)
--- a/reactos/lib/kernel32/misc/lzexpand_main.c
+++ b/reactos/lib/kernel32/misc/lzexpand_main.c
@@ -1,4 +1,4 @@
-/* $Id: lzexpand_main.c,v 1.3 2004/07/03 17:40:22 navaraf Exp $
+/* $Id: lzexpand_main.c,v 1.4 2004/12/25 11:18:50 navaraf Exp $

  *
  * LZ Decompression functions
  *
  *
  * LZ Decompression functions
  *


@@ -460,7 +460,7 @@ LONG WINAPI LZCopy( HFILE src, HFILE dest )
        struct  lzstate *lzs;
 
 #define BUFLEN 1000
        struct  lzstate *lzs;
 
 #define BUFLEN 1000

-       BYTE    buf[BUFLEN];
+       CHAR    buf[BUFLEN];

        /* we need that weird typedef, for i can't seem to get function pointer
         * casts right. (Or they probably just do not like WINAPI in general)
         */
        /* we need that weird typedef, for i can't seem to get function pointer
         * casts right. (Or they probably just do not like WINAPI in general)
         */

diff --git a/reactos/lib/mesa32/src/main/texformat_tmp.h b/reactos/lib/mesa32/src/main/texformat_tmp.h
index d341c78..5a920a8 100644 (file)
--- a/reactos/lib/mesa32/src/main/texformat_tmp.h
+++ b/reactos/lib/mesa32/src/main/texformat_tmp.h
@@ -1,6 +1,7 @@
+/* $XFree86$ */

 /*
  * Mesa 3-D graphics library
 /*
  * Mesa 3-D graphics library

- * Version:  6.1
+ * Version:  6.2

  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *


@@ -44,46 +45,34 @@
 #if DIM == 1
 
 #define CHAN_SRC( t, i, j, k, sz )                                     \
 #if DIM == 1
 
 #define CHAN_SRC( t, i, j, k, sz )                                     \

-       ((void) (j), (void) (k),                                        \
-        ((GLchan *)(t)->Data + (i) * (sz)))
+       ((GLchan *)(t)->Data + (i) * (sz))

 #define UBYTE_SRC( t, i, j, k, sz )                                    \
 #define UBYTE_SRC( t, i, j, k, sz )                                    \

-       ((void) (j), (void) (k),                                        \
-        ((GLubyte *)(t)->Data + (i) * (sz)))
+       ((GLubyte *)(t)->Data + (i) * (sz))

 #define USHORT_SRC( t, i, j, k )                                       \
 #define USHORT_SRC( t, i, j, k )                                       \

-       ((void) (j), (void) (k),                                        \
-        ((GLushort *)(t)->Data + (i)))
+       ((GLushort *)(t)->Data + (i))

 #define UINT_SRC( t, i, j, k )                                         \
 #define UINT_SRC( t, i, j, k )                                         \

-       ((void) (j), (void) (k),                                        \
-        ((GLuint *)(t)->Data + (i)))
+       ((GLuint *)(t)->Data + (i))

 #define FLOAT_SRC( t, i, j, k, sz )                                    \
 #define FLOAT_SRC( t, i, j, k, sz )                                    \

-       ((void) (j), (void) (k),                                        \
-        ((GLfloat *)(t)->Data + (i) * (sz)))
+       ((GLfloat *)(t)->Data + (i) * (sz))

 #define HALF_SRC( t, i, j, k, sz )                                     \
 #define HALF_SRC( t, i, j, k, sz )                                     \

-       ((void) (j), (void) (k),                                        \
-        ((GLhalfARB *)(t)->Data + (i) * (sz)))
+       ((GLhalfARB *)(t)->Data + (i) * (sz))

 
 #define FETCH(x) fetch_texel_1d_##x
 
 #elif DIM == 2
 
 #define CHAN_SRC( t, i, j, k, sz )                                     \
 
 #define FETCH(x) fetch_texel_1d_##x
 
 #elif DIM == 2
 
 #define CHAN_SRC( t, i, j, k, sz )                                     \

-       ((void) (k),                                                    \
-        ((GLchan *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)))
+       ((GLchan *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))

 #define UBYTE_SRC( t, i, j, k, sz )                                    \
 #define UBYTE_SRC( t, i, j, k, sz )                                    \

-       ((void) (k),                                                    \
-        ((GLubyte *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)))
+       ((GLubyte *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))

 #define USHORT_SRC( t, i, j, k )                                       \
 #define USHORT_SRC( t, i, j, k )                                       \

-       ((void) (k),                                                    \
-        ((GLushort *)(t)->Data + ((t)->RowStride * (j) + (i))))
+       ((GLushort *)(t)->Data + ((t)->RowStride * (j) + (i)))

 #define UINT_SRC( t, i, j, k )                                         \
 #define UINT_SRC( t, i, j, k )                                         \

-       ((void) (k),                                                    \
-        ((GLuint *)(t)->Data + ((t)->RowStride * (j) + (i))))
+       ((GLuint *)(t)->Data + ((t)->RowStride * (j) + (i)))

 #define FLOAT_SRC( t, i, j, k, sz )                                    \
 #define FLOAT_SRC( t, i, j, k, sz )                                    \

-       ((void) (k),                                                    \
-        ((GLfloat *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)))
+       ((GLfloat *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))

 #define HALF_SRC( t, i, j, k, sz )                                     \
 #define HALF_SRC( t, i, j, k, sz )                                     \

-       ((void) (k),                                                    \
-        ((GLhalfARB *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz)))
+       ((GLhalfARB *)(t)->Data + ((t)->RowStride * (j) + (i)) * (sz))

 
 #define FETCH(x) fetch_texel_2d_##x
 
 
 #define FETCH(x) fetch_texel_2d_##x
 


@@ -1023,9 +1012,9 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
                        GLint i, GLint j, GLint k, GLchan *texel )
 {
    const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );
                        GLint i, GLint j, GLint k, GLchan *texel )
 {
    const GLubyte *src = UBYTE_SRC( texImage, i, j, k, 1 );

-   const GLuint index = *src;

    const struct gl_color_table *palette;
    const GLchan *table;
    const struct gl_color_table *palette;
    const GLchan *table;

+   GLuint index;

    GET_CURRENT_CONTEXT(ctx);
 
    if (ctx->Texture.SharedPalette) {
    GET_CURRENT_CONTEXT(ctx);
 
    if (ctx->Texture.SharedPalette) {


@@ -1039,6 +1028,9 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
    ASSERT(palette->Type != GL_FLOAT);
    table = (const GLchan *) palette->Table;
 
    ASSERT(palette->Type != GL_FLOAT);
    table = (const GLchan *) palette->Table;
 

+   /* Mask the index against size of palette to avoid going out of bounds */
+   index = (*src) & (palette->Size - 1);
+

    switch (palette->Format) {
       case GL_ALPHA:
          texel[RCOMP] =
    switch (palette->Format) {
       case GL_ALPHA:
          texel[RCOMP] =

diff --git a/reactos/lib/msvcrt/ctype/tolower.c b/reactos/lib/msvcrt/ctype/tolower.c
index 3e998e9..34ceb97 100644 (file)
--- a/reactos/lib/msvcrt/ctype/tolower.c
+++ b/reactos/lib/msvcrt/ctype/tolower.c
@@ -16,8 +16,7 @@ int tolower(int c)
 /*
  * @implemented
  */
 /*
  * @implemented
  */

-int towlower(wint_t c)
-//wchar_t towlower(wchar_t c)
+wchar_t towlower(wchar_t c)

 {
    if (iswctype (c, _UPPER))
        return (c - (L'A' - L'a'));
 {
    if (iswctype (c, _UPPER))
        return (c - (L'A' - L'a'));

diff --git a/reactos/lib/msvcrt/ctype/toupper.c b/reactos/lib/msvcrt/ctype/toupper.c
index c61ae66..52c10c6 100644 (file)
--- a/reactos/lib/msvcrt/ctype/toupper.c
+++ b/reactos/lib/msvcrt/ctype/toupper.c
@@ -17,7 +17,7 @@ int toupper(int c)
 /*
  * @implemented
  */
 /*
  * @implemented
  */

-int towupper(wint_t c)
+wchar_t towupper(wchar_t c)

 {
    if (iswctype (c, _LOWER))
       return (c + (L'A' - L'a'));
 {
    if (iswctype (c, _LOWER))
       return (c + (L'A' - L'a'));

diff --git a/reactos/lib/msvcrt/mbstring/iskmoji.c b/reactos/lib/msvcrt/mbstring/iskmoji.c
index 88ac598..c47d5ba 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/iskmoji.c
+++ b/reactos/lib/msvcrt/mbstring/iskmoji.c
@@ -2,5 +2,5 @@
 
 int _ismbbkalpha(unsigned char c)
 {
 
 int _ismbbkalpha(unsigned char c)
 {

- return (0xA7 <= c <= 0xDF);
+ return (0xA7 <= c && c <= 0xDF);

 }
 }

diff --git a/reactos/lib/msvcrt/mbstring/mbclen.c b/reactos/lib/msvcrt/mbstring/mbclen.c
index a79be0b..d1e4c82 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbclen.c
+++ b/reactos/lib/msvcrt/mbstring/mbclen.c
@@ -26,7 +26,7 @@ int mblen( const char *s, size_t count )
        if ( s == NULL )
                return 0;
 
        if ( s == NULL )
                return 0;
 

-       l =  _mbclen(s);
+       l =  _mbclen((const unsigned char *)s);

        if ( l < count )
                return -1;
        return l;
        if ( l < count )
                return -1;
        return l;

diff --git a/reactos/lib/msvcrt/mbstring/mbscat.c b/reactos/lib/msvcrt/mbstring/mbscat.c
index f7f4716..85c6aab 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbscat.c
+++ b/reactos/lib/msvcrt/mbstring/mbscat.c
@@ -5,5 +5,5 @@
  */
 unsigned char * _mbscat(unsigned char *dst, const unsigned char *src)
 {
  */
 unsigned char * _mbscat(unsigned char *dst, const unsigned char *src)
 {

-  return strcat(dst,src);
+  return (unsigned char *)strcat((char*)dst,(const char*)src);

 }
 }

diff --git a/reactos/lib/msvcrt/mbstring/mbschr.c b/reactos/lib/msvcrt/mbstring/mbschr.c
index feeea9b..5b359bb 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbschr.c
+++ b/reactos/lib/msvcrt/mbstring/mbschr.c
@@ -5,5 +5,5 @@
  */
 unsigned char * _mbschr(const unsigned char *str, unsigned int c)
 {
  */
 unsigned char * _mbschr(const unsigned char *str, unsigned int c)
 {

-  return strchr(str,c);
+  return (unsigned char *)strchr((const char*)str, c);

 }
 }

diff --git a/reactos/lib/msvcrt/mbstring/mbscmp.c b/reactos/lib/msvcrt/mbstring/mbscmp.c
index 32f946b..8f5d0b3 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbscmp.c
+++ b/reactos/lib/msvcrt/mbstring/mbscmp.c
@@ -6,5 +6,5 @@
  */
 int _mbscmp(const unsigned char *str1, const unsigned char *str2)
 {
  */
 int _mbscmp(const unsigned char *str1, const unsigned char *str2)
 {

-  return strcmp(str1,str2);
+  return strcmp((const char*)str1, (char*)str2);

 }
 }

diff --git a/reactos/lib/msvcrt/mbstring/mbscpy.c b/reactos/lib/msvcrt/mbstring/mbscpy.c
index 4d2aff0..89007c2 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbscpy.c
+++ b/reactos/lib/msvcrt/mbstring/mbscpy.c
@@ -6,5 +6,5 @@
  */
 unsigned char * _mbscpy(unsigned char *dst, const unsigned char *str)
 {
  */
 unsigned char * _mbscpy(unsigned char *dst, const unsigned char *str)
 {

-  return strcpy(dst,str);
+  return (unsigned char*)strcpy((char*)dst,(const char*)str);

 }
 }

diff --git a/reactos/lib/msvcrt/mbstring/mbscspn.c b/reactos/lib/msvcrt/mbstring/mbscspn.c
index c5653dd..da27e5e 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbscspn.c
+++ b/reactos/lib/msvcrt/mbstring/mbscspn.c
@@ -7,7 +7,7 @@
  */
 size_t _mbscspn(const unsigned char *s1, const unsigned char *s2)
 {
  */
 size_t _mbscspn(const unsigned char *s1, const unsigned char *s2)
 {

-  const char *p, *spanp;
+  const unsigned char *p, *spanp;

   char c, sc;
 
   for (p = s1;;)
   char c, sc;
 
   for (p = s1;;)

diff --git a/reactos/lib/msvcrt/mbstring/mbsdup.c b/reactos/lib/msvcrt/mbstring/mbsdup.c
index cd5d6f1..db251c1 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbsdup.c
+++ b/reactos/lib/msvcrt/mbstring/mbsdup.c
@@ -17,10 +17,10 @@
  */
 unsigned char * _mbsdup(const unsigned char *_s)
 {
  */
 unsigned char * _mbsdup(const unsigned char *_s)
 {

-       char *rv;
+       unsigned char *rv;

        if (_s == 0)
                return 0;
        if (_s == 0)
                return 0;

-       rv = (char *)malloc(_mbslen(_s) + 1);
+       rv = (unsigned char *)malloc(_mbslen(_s) + 1);

        if (rv == 0)
                return 0;
        _mbscpy(rv, _s);
        if (rv == 0)
                return 0;
        _mbscpy(rv, _s);

diff --git a/reactos/lib/msvcrt/mbstring/mbsncat.c b/reactos/lib/msvcrt/mbstring/mbsncat.c
index 1adc02e..4eb97b2 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbsncat.c
+++ b/reactos/lib/msvcrt/mbstring/mbsncat.c
@@ -18,10 +18,10 @@ size_t _mbclen2(const unsigned int s);
  */
 unsigned char * _mbsncat(unsigned char *dst, const unsigned char *src, size_t n)
 {
  */
 unsigned char * _mbsncat(unsigned char *dst, const unsigned char *src, size_t n)
 {

-       char *d = (char *)dst;
-       char *s = (char *)src;
+       unsigned char *d = dst;
+       const unsigned char *s = src;

        if (n != 0) {
        if (n != 0) {

-               d = dst + strlen(dst); // get the end of string 
+               d = dst + _mbslen(dst); // get the end of string 

                d += _mbclen2(*d); // move 1 or 2 up
 
                do {
                d += _mbclen2(*d); // move 1 or 2 up
 
                do {


@@ -43,10 +43,10 @@ unsigned char * _mbsncat(unsigned char *dst, const unsigned char *src, size_t n)
  */
 unsigned char * _mbsnbcat(unsigned char *dst, const unsigned char *src, size_t n)
 {
  */
 unsigned char * _mbsnbcat(unsigned char *dst, const unsigned char *src, size_t n)
 {

-       char *d; 
-       char *s = (char *)src;
+       unsigned char *d; 
+       const unsigned char *s = src;

        if (n != 0) {
        if (n != 0) {

-               d = dst + strlen(dst); // get the end of string 
+               d = dst + _mbslen(dst); // get the end of string 

                d += _mbclen2(*d); // move 1 or 2 up
 
                do {
                d += _mbclen2(*d); // move 1 or 2 up
 
                do {

diff --git a/reactos/lib/msvcrt/mbstring/mbsspn.c b/reactos/lib/msvcrt/mbstring/mbsspn.c
index fe06e3a..0eb8ec0 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbsspn.c
+++ b/reactos/lib/msvcrt/mbstring/mbsspn.c
@@ -7,7 +7,7 @@
  */
 size_t _mbsspn(const unsigned char *s1, const unsigned char *s2)
 {
  */
 size_t _mbsspn(const unsigned char *s1, const unsigned char *s2)
 {

-  const char *p = s1, *spanp;
+  const unsigned char *p = s1, *spanp;

   char c, sc;
 
  cont:
   char c, sc;
 
  cont:

diff --git a/reactos/lib/msvcrt/mbstring/mbsspnp.c b/reactos/lib/msvcrt/mbstring/mbsspnp.c
index c75132f..c82fcf8 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbsspnp.c
+++ b/reactos/lib/msvcrt/mbstring/mbsspnp.c
@@ -7,7 +7,7 @@
  */
 unsigned char * _mbsspnp(const unsigned char *s1, const unsigned char *s2)
 {
  */
 unsigned char * _mbsspnp(const unsigned char *s1, const unsigned char *s2)
 {

-  const char *p = s1, *spanp;
+  const unsigned char *p = s1, *spanp;

   char c, sc;
 
  cont:
   char c, sc;
 
  cont:

diff --git a/reactos/lib/msvcrt/mbstring/mbsstr.c b/reactos/lib/msvcrt/mbstring/mbsstr.c
index 359ba2a..cbf9f39 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbsstr.c
+++ b/reactos/lib/msvcrt/mbstring/mbsstr.c
@@ -11,7 +11,7 @@ unsigned char *_mbsstr(const unsigned char *src1,const unsigned char *src2)
   if (src2 ==NULL || *src2 == 0)
     return (unsigned char *)src1;
 
   if (src2 ==NULL || *src2 == 0)
     return (unsigned char *)src1;
 

-  len = _mbstrlen(src2);
+  len = _mbslen(src2);

 
   while(*src1)
     {
 
   while(*src1)
     {

diff --git a/reactos/lib/msvcrt/mbstring/mbstok.c b/reactos/lib/msvcrt/mbstring/mbstok.c
index d8c184b..79015a8 100644 (file)
--- a/reactos/lib/msvcrt/mbstring/mbstok.c
+++ b/reactos/lib/msvcrt/mbstring/mbstok.c
@@ -5,10 +5,10 @@
  */
 unsigned char * _mbstok(unsigned char *s, unsigned char *delim)
 {
  */
 unsigned char * _mbstok(unsigned char *s, unsigned char *delim)
 {

-  const char *spanp;
+  const unsigned char *spanp;

   int c, sc;
   int c, sc;

-  char *tok;
-  static char *last;
+  unsigned char *tok;
+  static unsigned char *last;

 
 
   if (s == NULL && (s = last) == NULL)
 
 
   if (s == NULL && (s = last) == NULL)

diff --git a/reactos/lib/msvcrt/stdio/fputs.c b/reactos/lib/msvcrt/stdio/fputs.c
index a68698b..7fd6dc6 100644 (file)
--- a/reactos/lib/msvcrt/stdio/fputs.c
+++ b/reactos/lib/msvcrt/stdio/fputs.c
@@ -1,4 +1,4 @@
-/* $Id: fputs.c,v 1.8 2004/08/15 18:16:38 chorns Exp $
+/* $Id: fputs.c,v 1.9 2004/12/25 11:18:50 navaraf Exp $

  *
  *  ReactOS msvcrt library
  *
  *
  *  ReactOS msvcrt library
  *


@@ -76,7 +76,7 @@ fputws(const wchar_t* s, FILE* f)
   if (unbuffered)
   {
     f->_flag &= ~_IONBF;
   if (unbuffered)
   {
     f->_flag &= ~_IONBF;

-    f->_ptr = f->_base = (unsigned char*)localbuf;
+    f->_ptr = f->_base = (char*)localbuf;

     f->_bufsiz = BUFSIZ;
   }
 
     f->_bufsiz = BUFSIZ;
   }
 

diff --git a/reactos/lib/msvcrt/stdio/vfprintf.c b/reactos/lib/msvcrt/stdio/vfprintf.c
index 0763f97..a6a0601 100644 (file)
--- a/reactos/lib/msvcrt/stdio/vfprintf.c
+++ b/reactos/lib/msvcrt/stdio/vfprintf.c
@@ -723,7 +723,7 @@ int __vfprintf(FILE *f, const char *fmt, va_list args)
        long double _ldouble;
        double _double;
        const char *s;
        long double _ldouble;
        double _double;
        const char *s;

-       const short int* sw;
+       const wchar_t *sw;

        int result, done = 0;
 
        int flags;              /* flags to number() */
        int result, done = 0;
 
        int flags;              /* flags to number() */

diff --git a/reactos/lib/msvcrt/stdlib/swab.c b/reactos/lib/msvcrt/stdlib/swab.c
index 587c6ea..c3c1c09 100644 (file)
--- a/reactos/lib/msvcrt/stdlib/swab.c
+++ b/reactos/lib/msvcrt/stdlib/swab.c
@@ -1,4 +1,3 @@
-/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */

 #include <msvcrt/stdlib.h>
 
 /*
 #include <msvcrt/stdlib.h>
 
 /*


@@ -6,16 +5,14 @@
  */
 void _swab (const char* caFrom, char* caTo, size_t sizeToCopy)
 {
  */
 void _swab (const char* caFrom, char* caTo, size_t sizeToCopy)
 {

-  unsigned long temp;
+  if (sizeToCopy > 1)
+  {
+    sizeToCopy = sizeToCopy >> 1;

 
 

-  sizeToCopy >>= 1; sizeToCopy++;
-#define        STEP    temp = *((const char *)caFrom)++,*((char *)caTo)++ = *((const char *)caFrom)++,*((char *)caTo)++ = temp
-  /* round to multiple of 8 */
-  while ((--sizeToCopy) & 07)
-    STEP;
-  sizeToCopy >>= 3;
-  while (--sizeToCopy >= 0) {
-    STEP; STEP; STEP; STEP;
-    STEP; STEP; STEP; STEP;
+    while (sizeToCopy--) {
+      *caTo++ = caFrom[1];
+      *caTo++ = *caFrom++;
+      caFrom++;
+    }

   }
 }
   }
 }

diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index d82e8d4..8fa40ad 100644 (file)
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.103 2004/12/20 02:31:48 navaraf Exp $
+/* $Id: utils.c,v 1.104 2004/12/25 11:18:51 navaraf Exp $

  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel


@@ -974,7 +974,7 @@ LdrFixupForward(PCHAR ForwardName)
 
         DPRINT("BaseAddress: %p\n", Module->BaseAddress);
 
 
         DPRINT("BaseAddress: %p\n", Module->BaseAddress);
 

-        return LdrGetExportByName(Module->BaseAddress, p+1, -1);
+        return LdrGetExportByName(Module->BaseAddress, (PUCHAR)(p+1), -1);

      }
 
    return NULL;
      }
 
    return NULL;


@@ -1110,7 +1110,7 @@ LdrGetExportByName(PVOID BaseAddress,
    if (Hint < ExportDir->NumberOfNames)
      {
         ExName = RVA(BaseAddress, ExNames[Hint]);
    if (Hint < ExportDir->NumberOfNames)
      {
         ExName = RVA(BaseAddress, ExNames[Hint]);

-        if (strcmp(ExName, SymbolName) == 0)
+        if (strcmp(ExName, (PCHAR)SymbolName) == 0)

           {
              Ordinal = ExOrdinals[Hint];
              Function = RVA(BaseAddress, ExFunctions[Ordinal]);
           {
              Ordinal = ExOrdinals[Hint];
              Function = RVA(BaseAddress, ExFunctions[Ordinal]);


@@ -1143,7 +1143,7 @@ LdrGetExportByName(PVOID BaseAddress,
         mid = (minn + maxn) / 2;
 
         ExName = RVA(BaseAddress, ExNames[mid]);
         mid = (minn + maxn) / 2;
 
         ExName = RVA(BaseAddress, ExNames[mid]);

-        res = strcmp(ExName, SymbolName);
+        res = strcmp(ExName, (PCHAR)SymbolName);

         if (res == 0)
           {
              Ordinal = ExOrdinals[mid];
         if (res == 0)
           {
              Ordinal = ExOrdinals[mid];


@@ -1184,7 +1184,7 @@ LdrGetExportByName(PVOID BaseAddress,
    for (i = 0; i < ExportDir->NumberOfNames; i++)
      {
         ExName = RVA(BaseAddress, ExNames[i]);
    for (i = 0; i < ExportDir->NumberOfNames; i++)
      {
         ExName = RVA(BaseAddress, ExNames[i]);

-        if (strcmp(ExName,SymbolName) == 0)
+        if (strcmp(ExName, (PCHAR)SymbolName) == 0)

           {
              Ordinal = ExOrdinals[i];
              Function = RVA(BaseAddress, ExFunctions[Ordinal]);
           {
              Ordinal = ExOrdinals[i];
              Function = RVA(BaseAddress, ExFunctions[Ordinal]);


@@ -1504,7 +1504,7 @@ LdrpProcessImportDirectory(
 static NTSTATUS
 LdrpAdjustImportDirectory(PLDR_MODULE Module,
                           PLDR_MODULE ImportedModule,
 static NTSTATUS
 LdrpAdjustImportDirectory(PLDR_MODULE Module,
                           PLDR_MODULE ImportedModule,

-                          PUCHAR ImportedName)
+                          PCHAR ImportedName)

 {
    PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory;
    NTSTATUS Status;
 {
    PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory;
    NTSTATUS Status;


@@ -1535,7 +1535,7 @@ LdrpAdjustImportDirectory(PLDR_MODULE Module,
    while (ImportModuleDirectory->dwRVAModuleName)
      {
        Name = (PCHAR)Module->BaseAddress + ImportModuleDirectory->dwRVAModuleName;
    while (ImportModuleDirectory->dwRVAModuleName)
      {
        Name = (PCHAR)Module->BaseAddress + ImportModuleDirectory->dwRVAModuleName;

-       if (0 == _stricmp(Name, ImportedName))
+       if (0 == _stricmp(Name, (PCHAR)ImportedName))

          {
 
            /* Get the import address list. */
          {
 
            /* Get the import address list. */


@@ -1727,7 +1727,7 @@ LdrFixupImports(IN PWSTR SearchPath OPTIONAL,
                    PIMAGE_BOUND_FORWARDER_REF BoundForwarderRef;
                    ULONG i;
                    PLDR_MODULE ForwarderModule;
                    PIMAGE_BOUND_FORWARDER_REF BoundForwarderRef;
                    ULONG i;
                    PLDR_MODULE ForwarderModule;

-                   PUCHAR ForwarderName;
+                   PCHAR ForwarderName;

 
                    BoundForwarderRef = (PIMAGE_BOUND_FORWARDER_REF)(BoundImportDescriptorCurrent + 1);
                    for (i = 0; i < BoundImportDescriptorCurrent->NumberOfModuleForwarderRefs; i++, BoundForwarderRef++)
 
                    BoundForwarderRef = (PIMAGE_BOUND_FORWARDER_REF)(BoundImportDescriptorCurrent + 1);
                    for (i = 0; i < BoundImportDescriptorCurrent->NumberOfModuleForwarderRefs; i++, BoundForwarderRef++)


@@ -2319,7 +2319,7 @@ LdrGetProcedureAddress (IN PVOID BaseAddress,
    if (Name && Name->Length)
      {
        /* by name */
    if (Name && Name->Length)
      {
        /* by name */

-       *ProcedureAddress = LdrGetExportByName(BaseAddress, Name->Buffer, 0xffff);
+       *ProcedureAddress = LdrGetExportByName(BaseAddress, (PUCHAR)Name->Buffer, 0xffff);

        if (*ProcedureAddress != NULL)
          {
            return STATUS_SUCCESS;
        if (*ProcedureAddress != NULL)
          {
            return STATUS_SUCCESS;

diff --git a/reactos/lib/zlib/inftrees.c b/reactos/lib/zlib/inftrees.c
index 4c32ca3..6933f4a 100644 (file)
--- a/reactos/lib/zlib/inftrees.c
+++ b/reactos/lib/zlib/inftrees.c
@@ -127,6 +127,8 @@ uIntf *v;               /* working area: values in order of bit length */
   int y;                        /* number of dummy codes added */
   uInt z;                       /* number of entries in current table */
 
   int y;                        /* number of dummy codes added */
   uInt z;                       /* number of entries in current table */
 

+  /* Make GCC 4.0 happy. */
+  r.base = 0;

 
   /* Generate counts for each bit length */
   p = c;
 
   /* Generate counts for each bit length */
   p = c;

diff --git a/reactos/regtests/shared/regtests.h b/reactos/regtests/shared/regtests.h
index f5dfc32..9d2847d 100755 (executable)
--- a/reactos/regtests/shared/regtests.h
+++ b/reactos/regtests/shared/regtests.h
@@ -147,8 +147,6 @@ typedef struct _ROS_TEST
   TestRoutine Routine;
 } ROS_TEST, *PROS_TEST;
 
   TestRoutine Routine;
 } ROS_TEST, *PROS_TEST;
 

-extern LIST_ENTRY AllTests;
-

 extern VOID InitializeTests();
 extern VOID RegisterTests();
 extern VOID PerformTests(TestOutputRoutine OutputRoutine, LPSTR TestName);
 extern VOID InitializeTests();
 extern VOID RegisterTests();
 extern VOID PerformTests(TestOutputRoutine OutputRoutine, LPSTR TestName);

diff --git a/reactos/subsys/csrss/win32csr/conio.c b/reactos/subsys/csrss/win32csr/conio.c
index a4b3794..098aba4 100644 (file)
--- a/reactos/subsys/csrss/win32csr/conio.c
+++ b/reactos/subsys/csrss/win32csr/conio.c
@@ -1,4 +1,4 @@
-/* $Id: conio.c,v 1.18 2004/12/18 19:23:05 gvg Exp $
+/* $Id: conio.c,v 1.19 2004/12/25 11:22:37 navaraf Exp $

  *
  * reactos/subsys/csrss/win32csr/conio.c
  *
  *
  * reactos/subsys/csrss/win32csr/conio.c
  *


@@ -532,7 +532,7 @@ CSR_API(CsrReadConsole)
 {
   PLIST_ENTRY CurrentEntry;
   ConsoleInput *Input;
 {
   PLIST_ENTRY CurrentEntry;
   ConsoleInput *Input;

-  PCHAR Buffer;
+  PUCHAR Buffer;

   PWCHAR UnicodeBuffer;
   int i;
   ULONG nNumberOfCharsToRead, CharSize;
   PWCHAR UnicodeBuffer;
   int i;
   ULONG nNumberOfCharsToRead, CharSize;


@@ -894,7 +894,7 @@ ConioInputEventToAnsi(PCSRSS_CONSOLE Console, PINPUT_RECORD InputEvent)
 CSR_API(CsrWriteConsole)
 {
   NTSTATUS Status;
 CSR_API(CsrWriteConsole)
 {
   NTSTATUS Status;

-  BYTE *Buffer = Request->Data.WriteConsoleRequest.Buffer;
+  PCHAR Buffer = (PCHAR)Request->Data.WriteConsoleRequest.Buffer;

   PCSRSS_SCREEN_BUFFER Buff;
   PCSRSS_CONSOLE Console;
   ULONG CharSize = (Request->Data.WriteConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR));
   PCSRSS_SCREEN_BUFFER Buff;
   PCSRSS_CONSOLE Console;
   ULONG CharSize = (Request->Data.WriteConsoleRequest.Unicode ? sizeof(WCHAR) : sizeof(CHAR));


@@ -1504,7 +1504,7 @@ ConioComputeUpdateRect(PCSRSS_SCREEN_BUFFER Buff, RECT *UpdateRect, COORD *Start
 CSR_API(CsrWriteConsoleOutputChar)
 {
   NTSTATUS Status;
 CSR_API(CsrWriteConsoleOutputChar)
 {
   NTSTATUS Status;

-  PBYTE String = Request->Data.WriteConsoleOutputCharRequest.String;
+  PCHAR String = (PCHAR)Request->Data.WriteConsoleOutputCharRequest.String;

   PBYTE Buffer;
   PCSRSS_CONSOLE Console;
   PCSRSS_SCREEN_BUFFER Buff;
   PBYTE Buffer;
   PCSRSS_CONSOLE Console;
   PCSRSS_SCREEN_BUFFER Buff;


@@ -1595,7 +1595,7 @@ CSR_API(CsrFillOutputChar)
   PCSRSS_CONSOLE Console;
   PCSRSS_SCREEN_BUFFER Buff;
   DWORD X, Y, Length, Written = 0;
   PCSRSS_CONSOLE Console;
   PCSRSS_SCREEN_BUFFER Buff;
   DWORD X, Y, Length, Written = 0;

-  BYTE Char;
+  CHAR Char;

   PBYTE Buffer;
   RECT UpdateRect;
 
   PBYTE Buffer;
   RECT UpdateRect;
 


@@ -1783,7 +1783,7 @@ CSR_API(CsrWriteConsoleOutputAttrib)
   Y = (Request->Data.WriteConsoleOutputAttribRequest.Coord.Y + Buff->ShowY) % Buff->MaxY;
   Length = Request->Data.WriteConsoleOutputAttribRequest.Length;
   Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X) + 1];
   Y = (Request->Data.WriteConsoleOutputAttribRequest.Coord.Y + Buff->ShowY) % Buff->MaxY;
   Length = Request->Data.WriteConsoleOutputAttribRequest.Length;
   Buffer = &Buff->Buffer[2 * (Y * Buff->MaxX + X) + 1];

-  Attribute = Request->Data.WriteConsoleOutputAttribRequest.String;
+  Attribute = (PUCHAR)Request->Data.WriteConsoleOutputAttribRequest.String;

   while (Length--)
     {
       *Buffer = *Attribute++;
   while (Length--)
     {
       *Buffer = *Attribute++;


@@ -1822,7 +1822,7 @@ CSR_API(CsrWriteConsoleOutputAttrib)
 CSR_API(CsrFillOutputAttrib)
 {
   PCSRSS_SCREEN_BUFFER Buff;
 CSR_API(CsrFillOutputAttrib)
 {
   PCSRSS_SCREEN_BUFFER Buff;

-  PCHAR Buffer;
+  PUCHAR Buffer;

   NTSTATUS Status;
   int X, Y, Length;
   UCHAR Attr;
   NTSTATUS Status;
   int X, Y, Length;
   UCHAR Attr;


@@ -2524,7 +2524,7 @@ CSR_API(CsrReadConsoleOutputChar)
   PCSRSS_CONSOLE Console;
   PCSRSS_SCREEN_BUFFER Buff;
   DWORD Xpos, Ypos;
   PCSRSS_CONSOLE Console;
   PCSRSS_SCREEN_BUFFER Buff;
   DWORD Xpos, Ypos;

-  BYTE* ReadBuffer;
+  PCHAR ReadBuffer;

   DWORD i;
   ULONG CharSize;
   CHAR Char;
   DWORD i;
   ULONG CharSize;
   CHAR Char;


@@ -2838,7 +2838,7 @@ CSR_API(CsrReadConsoleOutput)
           if (Request->Data.ReadConsoleOutputRequest.Unicode)
             {
               MultiByteToWideChar(CodePage, 0,
           if (Request->Data.ReadConsoleOutputRequest.Unicode)
             {
               MultiByteToWideChar(CodePage, 0,

-                                  &GET_CELL_BUFFER(Buff, Offset), 1,
+                                  (PCHAR)&GET_CELL_BUFFER(Buff, Offset), 1,

                                   &CurCharInfo->Char.UnicodeChar, 1);
             }
           else
                                   &CurCharInfo->Char.UnicodeChar, 1);
             }
           else

diff --git a/reactos/subsys/csrss/win32csr/guiconsole.c b/reactos/subsys/csrss/win32csr/guiconsole.c
index 44f82e4..78b53e7 100644 (file)
--- a/reactos/subsys/csrss/win32csr/guiconsole.c
+++ b/reactos/subsys/csrss/win32csr/guiconsole.c
@@ -1,4 +1,4 @@
-/* $Id: guiconsole.c,v 1.25 2004/12/18 19:23:05 gvg Exp $
+/* $Id: guiconsole.c,v 1.26 2004/12/25 11:22:37 navaraf Exp $

  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries


@@ -317,7 +317,7 @@ GuiConsoleUpdateBitmap(HWND hWnd, RECT rc)
                       LastAttribute = Attribute;
                     }
                 }  
                       LastAttribute = Attribute;
                     }
                 }  

-              MultiByteToWideChar(Console->OutputCodePage, 0, From, 1, To, 1);
+              MultiByteToWideChar(Console->OutputCodePage, 0, (PCHAR)From, 1, To, 1);

               To++;
               From += 2;
             }
               To++;
               From += 2;
             }

diff --git a/reactos/subsys/csrss/win32csr/tuiconsole.c b/reactos/subsys/csrss/win32csr/tuiconsole.c
index bdf65b5..ee910c5 100644 (file)
--- a/reactos/subsys/csrss/win32csr/tuiconsole.c
+++ b/reactos/subsys/csrss/win32csr/tuiconsole.c
@@ -1,4 +1,4 @@
-/* $Id: tuiconsole.c,v 1.2 2004/07/20 11:06:47 navaraf Exp $
+/* $Id: tuiconsole.c,v 1.3 2004/12/25 11:22:37 navaraf Exp $

  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries


@@ -61,7 +61,7 @@ static void FASTCALL
 TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, RECT *Region)
 {
   UINT SrcDelta, DestDelta, i;
 TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, RECT *Region)
 {
   UINT SrcDelta, DestDelta, i;

-  char *Src, *SrcEnd;
+  PBYTE Src, SrcEnd;

 
   Src = Buff->Buffer + (((Region->top + Buff->ShowY) % Buff->MaxY) * Buff->MaxX
                         + Region->left + Buff->ShowX) * 2;
 
   Src = Buff->Buffer + (((Region->top + Buff->ShowY) % Buff->MaxY) * Buff->MaxX
                         + Region->left + Buff->ShowX) * 2;

diff --git a/reactos/subsys/system/cmd/dir.c b/reactos/subsys/system/cmd/dir.c
index dcfd190..0eecfb2 100644 (file)
--- a/reactos/subsys/system/cmd/dir.c
+++ b/reactos/subsys/system/cmd/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.12 2004/11/08 02:16:06 weiden Exp $
+/* $Id: dir.c,v 1.13 2004/12/25 11:22:37 navaraf Exp $

  *
  *  DIR.C - dir internal command.
  *
  *
  *  DIR.C - dir internal command.
  *


@@ -855,7 +855,7 @@ DirList (LPTSTR szPath, LPTSTR szFilespec, LPINT pLine, DWORD dwFlags)
        ULONG filecount = 0;
        ULONG dircount = 0;
        INT count = 0;
        ULONG filecount = 0;
        ULONG dircount = 0;
        INT count = 0;

-       USHORT screenwidth;
+       SHORT screenwidth;

        INT longestfname = 0;
 
        bytecount.QuadPart = 0;
        INT longestfname = 0;
 
        bytecount.QuadPart = 0;

diff --git a/reactos/subsys/system/taskmgr/dbgchnl.c b/reactos/subsys/system/taskmgr/dbgchnl.c
index 4ec1f61..c031bc7 100644 (file)
--- a/reactos/subsys/system/taskmgr/dbgchnl.c
+++ b/reactos/subsys/system/taskmgr/dbgchnl.c
@@ -249,7 +249,7 @@ static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user, unsigned
     struct dll_option_layout    dol;
     int                         i, j, ret = 1;
     void*                       buf_addr;
     struct dll_option_layout    dol;
     int                         i, j, ret = 1;
     void*                       buf_addr;

-    unsigned char               buffer[32];
+    char                        buffer[32];

     void*                       addr;
     const char**                cache = NULL;
     unsigned                    num_cache, used_cache;
     void*                       addr;
     const char**                cache = NULL;
     unsigned                    num_cache, used_cache;