Silence compiler warnings (4/11).

svn path=/trunk/; revision=37826

diff --git a/reactos/drivers/base/bootvid/i386/bootvid.c b/reactos/drivers/base/bootvid/i386/bootvid.c
index aaf11a3..8cf2ba1 100644 (file)
--- a/reactos/drivers/base/bootvid/i386/bootvid.c
+++ b/reactos/drivers/base/bootvid/i386/bootvid.c
@@ -357,7 +357,7 @@ VidInitialize(IN BOOLEAN SetMode)
 {
     ULONG Context = 0;
     PHYSICAL_ADDRESS TranslatedAddress;
-    PHYSICAL_ADDRESS NullAddress = {{0}};
+    PHYSICAL_ADDRESS NullAddress = {{0, 0}};
     ULONG AddressSpace = 1;
     BOOLEAN Result;
     ULONG_PTR Base;

diff --git a/reactos/drivers/filesystems/fs_rec/ext2.c b/reactos/drivers/filesystems/fs_rec/ext2.c
index 678ac81..78e0a18 100644 (file)
--- a/reactos/drivers/filesystems/fs_rec/ext2.c
+++ b/reactos/drivers/filesystems/fs_rec/ext2.c
@@ -32,7 +32,7 @@ FsRecExt2FsControl(IN PDEVICE_OBJECT DeviceObject,
     PDEVICE_OBJECT MountDevice;
     PVOID Bpb = NULL;
     ULONG SectorSize;
-    LARGE_INTEGER Offset = {{0}};
+    LARGE_INTEGER Offset = {{0, 0}};
     BOOLEAN DeviceError = FALSE;
     PAGED_CODE();
 

diff --git a/reactos/drivers/filesystems/fs_rec/fat.c b/reactos/drivers/filesystems/fs_rec/fat.c
index f61fdfb..b63a4be 100644 (file)
--- a/reactos/drivers/filesystems/fs_rec/fat.c
+++ b/reactos/drivers/filesystems/fs_rec/fat.c
@@ -104,7 +104,7 @@ FsRecVfatFsControl(IN PDEVICE_OBJECT DeviceObject,
     PDEVICE_OBJECT MountDevice;
     PPACKED_BOOT_SECTOR Bpb = NULL;
     ULONG SectorSize;
-    LARGE_INTEGER Offset = {{0}};
+    LARGE_INTEGER Offset = {{0, 0}};
     BOOLEAN DeviceError = FALSE;
     PAGED_CODE();
 

diff --git a/reactos/drivers/filesystems/fs_rec/ntfs.c b/reactos/drivers/filesystems/fs_rec/ntfs.c
index a939337..bc09a3d 100644 (file)
--- a/reactos/drivers/filesystems/fs_rec/ntfs.c
+++ b/reactos/drivers/filesystems/fs_rec/ntfs.c
@@ -53,7 +53,7 @@ FsRecNtfsFsControl(IN PDEVICE_OBJECT DeviceObject,
     PDEVICE_OBJECT MountDevice;
     PPACKED_BOOT_SECTOR Bpb = NULL;
     ULONG SectorSize;
-    LARGE_INTEGER Offset = {{0}}, Offset2, Offset3, SectorCount;
+    LARGE_INTEGER Offset = {{0, 0}}, Offset2, Offset3, SectorCount;
     PAGED_CODE();
 
     /* Get the I/O Stack and check the function type */

diff --git a/reactos/drivers/input/kbdclass/kbdclass.c b/reactos/drivers/input/kbdclass/kbdclass.c
index ba1e54b..b0a0482 100644 (file)
--- a/reactos/drivers/input/kbdclass/kbdclass.c
+++ b/reactos/drivers/input/kbdclass/kbdclass.c
@@ -845,7 +845,7 @@ SearchForLegacyDrivers(
 {
        UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP");
        PCLASS_DRIVER_EXTENSION DriverExtension;
-       UNICODE_STRING PortBaseName = {0, };
+       UNICODE_STRING PortBaseName = { 0, 0, NULL };
        PKEY_VALUE_BASIC_INFORMATION KeyValueInformation = NULL;
        OBJECT_ATTRIBUTES ObjectAttributes;
        HANDLE hDeviceMapKey = (HANDLE)-1;

diff --git a/reactos/drivers/input/mouclass/mouclass.c b/reactos/drivers/input/mouclass/mouclass.c
index de8ff2f..ea736c7 100644 (file)
--- a/reactos/drivers/input/mouclass/mouclass.c
+++ b/reactos/drivers/input/mouclass/mouclass.c
@@ -821,7 +821,7 @@ SearchForLegacyDrivers(
 {
        UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP");
        PCLASS_DRIVER_EXTENSION DriverExtension;
-       UNICODE_STRING PortBaseName = {0, };
+       UNICODE_STRING PortBaseName = { 0, 0, NULL };
        PKEY_VALUE_BASIC_INFORMATION KeyValueInformation = NULL;
        OBJECT_ATTRIBUTES ObjectAttributes;
        HANDLE hDeviceMapKey = (HANDLE)-1;

diff --git a/reactos/drivers/network/tcpip/datalink/lan.c b/reactos/drivers/network/tcpip/datalink/lan.c
index 2e50193..7928bf0 100644 (file)
--- a/reactos/drivers/network/tcpip/datalink/lan.c
+++ b/reactos/drivers/network/tcpip/datalink/lan.c
@@ -808,9 +808,9 @@ static NTSTATUS CheckForDeviceDesc( PUNICODE_STRING EnumKeyName,
                                     PUNICODE_STRING TargetKeyName,
                                     PUNICODE_STRING Name,
                                     PUNICODE_STRING DeviceDesc ) {
-    UNICODE_STRING RootDevice = { 0 }, LinkageKeyName = { 0 };
-    UNICODE_STRING DescKeyName = { 0 }, Linkage = { 0 };
-    UNICODE_STRING BackSlash = { 0 };
+    UNICODE_STRING RootDevice = { 0, 0, NULL }, LinkageKeyName = { 0, 0, NULL };
+    UNICODE_STRING DescKeyName = { 0, 0, NULL }, Linkage = { 0, 0, NULL };
+    UNICODE_STRING BackSlash = { 0, 0, NULL };
     HANDLE DescKey = NULL, LinkageKey = NULL;
     NTSTATUS Status;
 
@@ -962,7 +962,7 @@ BOOLEAN BindAdapter(
     PIP_INTERFACE IF;
     NDIS_STATUS NdisStatus;
     LLIP_BIND_INFO BindInfo;
-    IP_ADDRESS DefaultMask = { 0 };
+    IP_ADDRESS DefaultMask;
     ULONG Lookahead = LOOKAHEAD_SIZE;
     NTSTATUS Status;
 
@@ -1012,7 +1012,7 @@ BOOLEAN BindAdapter(
     TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n",
                 &IF->Description));
 
-    DefaultMask.Type = IP_ADDRESS_V4;
+    AddrInitIPv4(&DefaultMask, 0);
 
     IF->Unicast = DefaultMask;
     IF->Netmask = DefaultMask;

diff --git a/reactos/drivers/serial/serial/misc.c b/reactos/drivers/serial/serial/misc.c
index 6c2daa3..b72ccd9 100644 (file)
--- a/reactos/drivers/serial/serial/misc.c
+++ b/reactos/drivers/serial/serial/misc.c
@@ -186,7 +186,9 @@ SerialInterruptService(
                                if (MSR & SR_MSR_CTS)
                                        KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL);
                                else
+                               {
                                        ; /* FIXME: stop transmission */
+                               }
                                Events |= SERIAL_EV_CTS;
                        }
                        if (MSR & SR_MSR_DSR_CHANGED)
@@ -194,7 +196,9 @@ SerialInterruptService(
                                if (MSR & SR_MSR_DSR)
                                        KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL);
                                else
+                               {
                                        ; /* FIXME: stop reception */
+                               }
                                Events |= SERIAL_EV_DSR;
                        }
                        if (MSR & SR_MSR_RI_CHANGED)

diff --git a/reactos/drivers/storage/class/ramdisk/ramdisk.c b/reactos/drivers/storage/class/ramdisk/ramdisk.c
index 59f3d24..ae13361 100644 (file)
--- a/reactos/drivers/storage/class/ramdisk/ramdisk.c
+++ b/reactos/drivers/storage/class/ramdisk/ramdisk.c
@@ -1199,7 +1199,7 @@ RamdiskGetPartitionInfo(IN PIRP Irp,
     NTSTATUS Status;
     PPARTITION_INFORMATION PartitionInfo;
     PVOID BaseAddress;
-    LARGE_INTEGER Zero = {{0}};
+    LARGE_INTEGER Zero = {{0, 0}};
     ULONG Length;
     PIO_STACK_LOCATION IoStackLocation;
     

diff --git a/reactos/drivers/storage/port/diskdump/diskdump.c b/reactos/drivers/storage/port/diskdump/diskdump.c
index 6d674b3..0b5fc71 100644 (file)
--- a/reactos/drivers/storage/port/diskdump/diskdump.c
+++ b/reactos/drivers/storage/port/diskdump/diskdump.c
@@ -101,16 +101,16 @@ static SUBSTITUTE_EXPORT DiskDumpExports[] =
     {"ScsiPortConvertUlongToPhysicalAddress", 3, NULL, NULL},
     {"ScsiPortFreeDeviceBase", 5, NULL, DiskDumpScsiInvalid},
     {"ScsiPortGetBusData", 6, NULL, DiskDumpScsiInvalid},
-    {"ScsiPortGetDeviceBase", 7, DiskDumpScsiInvalid},
+    {"ScsiPortGetDeviceBase", 7, NULL, DiskDumpScsiInvalid},
     {"ScsiPortInitialize", 13, NULL, DiskDumpScsiInvalid},
     {"ScsiPortNotification", 17, NULL, _DiskDumpScsiPortNotification},
-    {"ScsiPortReadPortBufferUlong", 19, NULL},
-    {"ScsiPortReadPortBufferUshort", 20, NULL},
+    {"ScsiPortReadPortBufferUlong", 19, NULL, NULL},
+    {"ScsiPortReadPortBufferUshort", 20, NULL, NULL},
     {"ScsiPortReadPortUchar", 21, NULL, NULL},
     {"ScsiPortReadPortUshort", 23, NULL, NULL},
     {"ScsiPortStallExecution", 31, NULL, NULL},
-    {"ScsiPortWritePortBufferUlong", 34, NULL},
-    {"ScsiPortWritePortBufferUshort", 35, NULL},
+    {"ScsiPortWritePortBufferUlong", 34, NULL, NULL},
+    {"ScsiPortWritePortBufferUshort", 35, NULL, NULL},
     {"ScsiPortWritePortUchar", 36, NULL, NULL},
     {"ScsiDebugPrint", 0, NULL, NULL},
   };

diff --git a/reactos/drivers/video/displays/vga/main/enable.c b/reactos/drivers/video/displays/vga/main/enable.c
index 50df414..2d1a943 100644 (file)
--- a/reactos/drivers/video/displays/vga/main/enable.c
+++ b/reactos/drivers/video/displays/vga/main/enable.c
@@ -56,7 +56,7 @@ static DRVFN FuncList[] =
 };
 
 static GDIINFO gaulCap = {
-    GDI_DRIVER_VERSION,
+    GDI_DRIVER_VERSION,    // ulVersion
     DT_RASDISPLAY,         // ulTechnology
     0,                     // ulHorzSize
     0,                     // ulVertSize
@@ -73,7 +73,7 @@ static GDIINFO gaulCap = {
     TC_RA_ABLE | TC_SCROLLBLT,  // flTextCaps
 
     6,                     // ulDACRed
-    6,                     // ulDACGree
+    6,                     // ulDACGreen
     6,                     // ulDACBlue
 
     0x0024,                // ulAspectX  (one-to-one aspect ratio)
@@ -115,7 +115,18 @@ static GDIINFO gaulCap = {
     8,                                         // ulBltAlignment
     0,                                         // ulPanningHorzRes
     0,                                         // ulPanningVertRes
-  };
+
+    0,                                         // xPanningAlignment
+    0,                                         // yPanningAlignment
+    0,                                         // cxHTPat
+    0,                                         // cyHTPat
+    NULL,                                      // pHTPatA
+    NULL,                                      // pHTPatB
+    NULL,                                      // pHTPatC
+    0,                                         // flShadeBlend
+    0,                                         // ulPhysicalPixelCharacteristics
+    0                                          // ulPhysicalPixelGamma
+};
 
 // Palette for VGA
 
@@ -170,7 +181,8 @@ DEVINFO devinfoVGA =
     BMF_4BPP,       // preferred DIB format
     8,              // Width of color dither
     8,              // Height of color dither
-    0               // Default palette to use for this device
+    NULL,           // Default palette to use for this device
+    0               // flGraphicsCaps2
 };
 
 BOOL APIENTRY

diff --git a/reactos/drivers/video/videoprt/agp.c b/reactos/drivers/video/videoprt/agp.c
index bf61944..3b1f81d 100644 (file)
--- a/reactos/drivers/video/videoprt/agp.c
+++ b/reactos/drivers/video/videoprt/agp.c
@@ -99,7 +99,7 @@ IntAgpCommitPhysical(
 {
    PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension;
    PAGP_BUS_INTERFACE_STANDARD AgpBusInterface;
-   PHYSICAL_ADDRESS MappingAddr = {{0}};
+   PHYSICAL_ADDRESS MappingAddr = {{0, 0}};
    PVIDEO_PORT_AGP_MAPPING AgpMapping;
    NTSTATUS Status;
 
@@ -186,7 +186,7 @@ IntAgpReservePhysical(
    IN  VIDEO_PORT_CACHE_TYPE Caching,
    OUT PVOID *PhysicalContext)
 {
-   PHYSICAL_ADDRESS ZeroAddress = {{0}};
+   PHYSICAL_ADDRESS ZeroAddress = {{0, 0}};
    PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension;
    PAGP_BUS_INTERFACE_STANDARD AgpBusInterface;
    MEMORY_CACHING_TYPE MemCachingType;

diff --git a/reactos/drivers/video/videoprt/ddc.c b/reactos/drivers/video/videoprt/ddc.c
index a29f639..33424e0 100644 (file)
--- a/reactos/drivers/video/videoprt/ddc.c
+++ b/reactos/drivers/video/videoprt/ddc.c
@@ -35,7 +35,7 @@
 #define WRITE_SDA(state)  (i2c->WriteDataLine(HwDeviceExtension, state))
 #define WRITE_SCL(state)  (i2c->WriteClockLine(HwDeviceExtension, state))
 
-STATIC LARGE_INTEGER HalfPeriodDelay = { { 70LL } };
+STATIC LARGE_INTEGER HalfPeriodDelay = {{0, 70}};
 #define DELAY_HALF()      KeDelayExecutionThread(KernelMode, FALSE, &HalfPeriodDelay)