From 485fb49bc0394352653bbbfb5b5896e47ee2cc9d Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Thu, 22 Nov 2007 11:27:17 +0000
Subject: [PATCH] fix msvc build by replacing DDKAPI with NTAPI (both
 __stdcall) fix some format strings

svn path=/trunk/; revision=30667
---
 reactos/drivers/input/i8042prt/i8042prt.h  | 4 ++--
 reactos/drivers/input/i8042prt/keyboard.c  | 4 ++--
 reactos/drivers/input/i8042prt/pnp.c       | 6 +++---
 reactos/drivers/input/i8042prt/readwrite.c | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/reactos/drivers/input/i8042prt/i8042prt.h b/reactos/drivers/input/i8042prt/i8042prt.h
index 42d4e16f499..4c40b2d4de5 100644
--- a/reactos/drivers/input/i8042prt/i8042prt.h
+++ b/reactos/drivers/input/i8042prt/i8042prt.h
@@ -303,7 +303,7 @@ DRIVER_DISPATCH i8042Close;
 
 /* keyboard.c */
 
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchWritePortKbd(
 	IN PVOID Context,
 	IN UCHAR Value,
@@ -414,7 +414,7 @@ i8042ReadStatus(
 	IN PPORT_DEVICE_EXTENSION DeviceExtension,
 	OUT PUCHAR Status);
 
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchReadPort(
 	IN PVOID Context,
 	OUT PUCHAR Value,
diff --git a/reactos/drivers/input/i8042prt/keyboard.c b/reactos/drivers/input/i8042prt/keyboard.c
index 8cfa930605a..7f39490ac3f 100644
--- a/reactos/drivers/input/i8042prt/keyboard.c
+++ b/reactos/drivers/input/i8042prt/keyboard.c
@@ -39,7 +39,7 @@ i8042DebugWorkItem(
 	IN PDEVICE_OBJECT DeviceObject,
 	IN PVOID Key)
 {
-	DPRINT("Debug key: 0x%02x\n", Key);
+	DPRINT("Debug key: %p\n", Key);
 
 	if (!Key)
 		return;
@@ -97,7 +97,7 @@ i8042KbdQueuePacket(
  * These functions are callbacks for filter driver custom
  * initialization routines.
  */
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchWritePortKbd(
 	IN PVOID Context,
 	IN UCHAR Value,
diff --git a/reactos/drivers/input/i8042prt/pnp.c b/reactos/drivers/input/i8042prt/pnp.c
index c41da577834..41431cbdda5 100644
--- a/reactos/drivers/input/i8042prt/pnp.c
+++ b/reactos/drivers/input/i8042prt/pnp.c
@@ -515,18 +515,18 @@ i8042PnpStartDevice(
 					if (!FoundDataPort)
 					{
 						PortDeviceExtension->DataPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart);
-						DPRINT("Found data port: 0x%lx\n", PortDeviceExtension->DataPort);
+						DPRINT("Found data port: %p\n", PortDeviceExtension->DataPort);
 						FoundDataPort = TRUE;
 					}
 					else if (!FoundControlPort)
 					{
 						PortDeviceExtension->ControlPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart);
-						DPRINT("Found control port: 0x%lx\n", PortDeviceExtension->ControlPort);
+						DPRINT("Found control port: %p\n", PortDeviceExtension->ControlPort);
 						FoundControlPort = TRUE;
 					}
 					else
 					{
-						DPRINT("Too much I/O ranges provided\n", ResourceDescriptor->u.Port.Length);
+						DPRINT("Too much I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length);
 						return STATUS_INVALID_PARAMETER;
 					}
 				}
diff --git a/reactos/drivers/input/i8042prt/readwrite.c b/reactos/drivers/input/i8042prt/readwrite.c
index e22517390dd..6be9555796f 100644
--- a/reactos/drivers/input/i8042prt/readwrite.c
+++ b/reactos/drivers/input/i8042prt/readwrite.c
@@ -111,7 +111,7 @@ i8042ReadDataWait(
  * is enough this time. Note how MSDN specifies the
  * WaitForAck parameter to be ignored.
  */
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchReadPort(
 	IN PVOID Context,
 	OUT PUCHAR Value,
@@ -205,7 +205,7 @@ i8042Write(
 	if (ResendIterations)
 	{
 		WRITE_PORT_UCHAR(addr, data);
-		DPRINT("Sent 0x%x to port 0x%x\n", data, addr);
+		DPRINT("Sent 0x%x to port %p\n", data, addr);
 		return TRUE;
 	}
 	return FALSE;