fix most compilation issues with msvc

svn path=/trunk/; revision=30557

diff --git a/reactos/drivers/bus/acpi/executer/amutils.c b/reactos/drivers/bus/acpi/executer/amutils.c
index 21cd25c..28333f8 100644 (file)
--- a/reactos/drivers/bus/acpi/executer/amutils.c
+++ b/reactos/drivers/bus/acpi/executer/amutils.c
@@ -246,7 +246,7 @@ acpi_aml_digits_needed (
        }
 
        else {
-               for (num_digits = 1 + (val < 0); (val = ACPI_DIVIDE (val,base)); ++num_digits) { ; }
+               for (num_digits = 1; (val = ACPI_DIVIDE (val,base)); ++num_digits) { ; }
        }
 
        return (num_digits);

diff --git a/reactos/drivers/bus/acpi/ospm/fdo.c b/reactos/drivers/bus/acpi/ospm/fdo.c
index 5d75e0f..773a67b 100644 (file)
--- a/reactos/drivers/bus/acpi/ospm/fdo.c
+++ b/reactos/drivers/bus/acpi/ospm/fdo.c
@@ -108,7 +108,7 @@ AcpiCreateInstanceIDString(PUNICODE_STRING InstanceID,
     swprintf(Buffer, L"%S", Node->device.id.uid);
   else
     /* FIXME: Generate unique id! */
-    swprintf(Buffer, L"0000");
+    swprintf(Buffer, L"%S", L"0000");
 
   return AcpiCreateUnicodeString(InstanceID, Buffer, PagedPool);
 }

diff --git a/reactos/drivers/bus/acpi/ospm/osl.c b/reactos/drivers/bus/acpi/ospm/osl.c
index 833804f..36e6948 100644 (file)
--- a/reactos/drivers/bus/acpi/ospm/osl.c
+++ b/reactos/drivers/bus/acpi/ospm/osl.c
@@ -302,38 +302,38 @@ acpi_os_out32(ACPI_IO_ADDRESS port, u32 val)
   WRITE_PORT_ULONG((PULONG)port, val);
 }
 
-UINT8
+u8
 acpi_os_mem_in8 (ACPI_PHYSICAL_ADDRESS phys_addr)
 {
   return (*(PUCHAR)(ULONG)phys_addr);
 }
 
-UINT16
+u16
 acpi_os_mem_in16 (ACPI_PHYSICAL_ADDRESS phys_addr)
 {
   return (*(PUSHORT)(ULONG)phys_addr);
 }
 
-UINT32
+u32
 acpi_os_mem_in32 (ACPI_PHYSICAL_ADDRESS phys_addr)
 {
   return (*(PULONG)(ULONG)phys_addr);
 }
 
 void
-acpi_os_mem_out8 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT8 value)
+acpi_os_mem_out8 (ACPI_PHYSICAL_ADDRESS phys_addr, u8 value)
 {
   *(PUCHAR)(ULONG)phys_addr = value;
 }
 
 void
-acpi_os_mem_out16 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT16 value)
+acpi_os_mem_out16 (ACPI_PHYSICAL_ADDRESS phys_addr, u16 value)
 {
   *(PUSHORT)(ULONG)phys_addr = value;
 }
 
 void
-acpi_os_mem_out32 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT32 value)
+acpi_os_mem_out32 (ACPI_PHYSICAL_ADDRESS phys_addr, u32 value)
 {
   *(PULONG)(ULONG)phys_addr = value;
 }