DDKAPI -> NTAPI

svn path=/branches/header-work/; revision=46357

include/ddk/ntpoapi.h

@@ -220,7 +220,7 @@ typedef struct _POWER_STATE_NOTIFY_HANDLER {
 
 NTSYSCALLAPI
 NTSTATUS
-DDKAPI
+NTAPI
 NtPowerInformation(
   IN POWER_INFORMATION_LEVEL  InformationLevel,
   IN PVOID  InputBuffer OPTIONAL,

include/psdk/batclass.h

@@ -180,11 +180,11 @@ typedef struct _BATTERY_WAIT_STATUS {
 
 
 typedef NTSTATUS
-(DDKAPI*BCLASS_DISABLE_STATUS_NOTIFY)(
+(NTAPI *BCLASS_DISABLE_STATUS_NOTIFY)(
   IN PVOID  Context);
 
 typedef NTSTATUS
-(DDKAPI*BCLASS_QUERY_INFORMATION)(
+(NTAPI *BCLASS_QUERY_INFORMATION)(
   IN PVOID  Context,
   IN ULONG  BatteryTag,
   IN BATTERY_QUERY_INFORMATION_LEVEL  Level,
@@ -194,25 +194,25 @@ typedef NTSTATUS
   OUT PULONG  ReturnedLength);
 
 typedef NTSTATUS
-(DDKAPI*BCLASS_QUERY_STATUS)(
+(NTAPI *BCLASS_QUERY_STATUS)(
   IN PVOID  Context,
   IN ULONG  BatteryTag,
   OUT PBATTERY_STATUS  BatteryStatus);
 
 typedef NTSTATUS
-(DDKAPI*BCLASS_QUERY_TAG)(
+(NTAPI *BCLASS_QUERY_TAG)(
   IN PVOID  Context,
   OUT PULONG  BatteryTag);
 
 typedef NTSTATUS
-(DDKAPI*BCLASS_SET_INFORMATION)(
+(NTAPI *BCLASS_SET_INFORMATION)(
   IN PVOID  Context,
   IN ULONG  BatteryTag,
   IN BATTERY_SET_INFORMATION_LEVEL  Level,
   IN PVOID  Buffer  OPTIONAL);
 
 typedef NTSTATUS
-(DDKAPI*BCLASS_SET_STATUS_NOTIFY)(
+(NTAPI *BCLASS_SET_STATUS_NOTIFY)(
   IN PVOID  Context,
   IN ULONG  BatteryTag,
   IN PBATTERY_NOTIFY  BatteryNotify);
@@ -239,21 +239,21 @@ typedef struct _BATTERY_MINIPORT_INFO {
 
 BCLASSAPI
 NTSTATUS
-DDKAPI
+NTAPI
 BatteryClassInitializeDevice(
   IN PBATTERY_MINIPORT_INFO  MiniportInfo,
   IN PVOID  *ClassData);
 
 BCLASSAPI
 NTSTATUS
-DDKAPI
+NTAPI
 BatteryClassIoctl(
   IN PVOID  ClassData,
   IN PIRP  Irp);
 
 BCLASSAPI
 NTSTATUS
-DDKAPI
+NTAPI
 BatteryClassQueryWmiDataBlock(
   IN PVOID  ClassData,
   IN PDEVICE_OBJECT  DeviceObject,
@@ -265,13 +265,13 @@ BatteryClassQueryWmiDataBlock(
 
 BCLASSAPI
 NTSTATUS
-DDKAPI
+NTAPI
 BatteryClassStatusNotify(
   IN PVOID  ClassData);
 
 BCLASSAPI
 NTSTATUS
-DDKAPI
+NTAPI
 BatteryClassSystemControl(
   IN  PVOID  ClassData,
   IN  PVOID  WmiLibContext, /* PWMILIB_CONTEXT */
@@ -281,7 +281,7 @@ BatteryClassSystemControl(
 
 BCLASSAPI
 NTSTATUS
-DDKAPI
+NTAPI
 BatteryClassUnload(
   IN PVOID  ClassData);
 

include/xdk/kdfuncs.h

@@ -15,7 +15,7 @@ $if (_WDMDDK_)
 #ifndef _DBGNT_
 
 ULONG
-DDKCDECLAPI
+__cdecl
 DbgPrint(
   IN PCSTR Format,
   IN ...);
@@ -23,7 +23,7 @@ DbgPrint(
 #if (NTDDI_VERSION >= NTDDI_WIN2K)
 NTSYSAPI
 ULONG
-DDKCDECLAPI
+__cdecl
 DbgPrintReturnControlC(
   IN PCCH Format,
   IN ...);
@@ -33,7 +33,7 @@ DbgPrintReturnControlC(
 
 NTSYSAPI
 ULONG
-DDKCDECLAPI
+__cdecl
 DbgPrintEx(
   IN ULONG ComponentId,
   IN ULONG Level,

include/xdk/wmifuncs.h

@@ -6,7 +6,7 @@
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 NTKERNELAPI
 NTSTATUS
-DDKCDECLAPI
+__cdecl
 WmiTraceMessage(
   IN TRACEHANDLE LoggerHandle,
   IN ULONG MessageFlags,
@@ -32,7 +32,7 @@ WmiQueryTraceInformation(
 /* FIXME: Get va_list from where? */
 NTKERNELAPI
 NTSTATUS
-DDKCDECLAPI
+__cdecl
 WmiTraceMessageVa(
   IN TRACEHANDLE LoggerHandle,
   IN ULONG MessageFlags,