- Don't use DDKAPI either

svn path=/trunk/; revision=37754

reactos/dll/win32/hid/hid.c

@@ -63,7 +63,7 @@ DllMain(HINSTANCE hinstDLL,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_FlushQueue(IN HANDLE HidDeviceObject)
 {
   DWORD RetLen;
@@ -80,7 +80,7 @@ HidD_FlushQueue(IN HANDLE HidDeviceObject)
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_FreePreparsedData(IN PHIDP_PREPARSED_DATA PreparsedData)
 {
   return (LocalFree((HLOCAL)PreparsedData) == NULL);
@@ -93,7 +93,7 @@ HidD_FreePreparsedData(IN PHIDP_PREPARSED_DATA PreparsedData)
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetAttributes(IN HANDLE HidDeviceObject,
                    OUT PHIDD_ATTRIBUTES Attributes)
 {
@@ -124,7 +124,7 @@ HidD_GetAttributes(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetButtonCaps(IN HIDP_REPORT_TYPE ReportType,
                    OUT PHIDP_BUTTON_CAPS ButtonCaps,
                    IN OUT PULONG ButtonCapsLength,
@@ -141,7 +141,7 @@ HidP_GetButtonCaps(IN HIDP_REPORT_TYPE ReportType,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetFeature(IN HANDLE HidDeviceObject,
                 OUT PVOID ReportBuffer,
                 IN ULONG ReportBufferLength)
@@ -160,7 +160,7 @@ HidD_GetFeature(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-VOID DDKAPI
+VOID WINAPI
 HidD_GetHidGuid(OUT LPGUID HidGuid)
 {
   *HidGuid = HidClassGuid;
@@ -173,7 +173,7 @@ HidD_GetHidGuid(OUT LPGUID HidGuid)
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetInputReport(IN HANDLE HidDeviceObject,
                     IN OUT PVOID ReportBuffer,
                     IN ULONG ReportBufferLength)
@@ -192,7 +192,7 @@ HidD_GetInputReport(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetManufacturerString(IN HANDLE HidDeviceObject,
                            OUT PVOID Buffer,
                            IN ULONG BufferLength)
@@ -211,7 +211,7 @@ HidD_GetManufacturerString(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetNumInputBuffers(IN HANDLE HidDeviceObject,
                         OUT PULONG NumberBuffers)
 {
@@ -229,7 +229,7 @@ HidD_GetNumInputBuffers(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetPhysicalDescriptor(IN HANDLE HidDeviceObject,
                            OUT PVOID Buffer,
                            IN ULONG BufferLength)
@@ -248,7 +248,7 @@ HidD_GetPhysicalDescriptor(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetPreparsedData(IN HANDLE HidDeviceObject,
                       OUT PHIDP_PREPARSED_DATA *PreparsedData)
 {
@@ -303,7 +303,7 @@ HidD_GetPreparsedData(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetProductString(IN HANDLE HidDeviceObject,
                       OUT PVOID Buffer,
                       IN ULONG BufferLength)
@@ -322,7 +322,7 @@ HidD_GetProductString(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetSerialNumberString(IN HANDLE HidDeviceObject,
                            OUT PVOID Buffer,
                            IN ULONG BufferLength)
@@ -341,7 +341,7 @@ HidD_GetSerialNumberString(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetValueCaps(IN HIDP_REPORT_TYPE ReportType,
                   OUT PHIDP_VALUE_CAPS ValueCaps,
                   IN OUT PULONG ValueCapsLength,
@@ -364,7 +364,7 @@ HidP_GetValueCaps(IN HIDP_REPORT_TYPE ReportType,
  * @implemented
  */
 HIDAPI
-ULONG DDKAPI
+ULONG WINAPI
 HidD_Hello(OUT PCHAR Buffer,
            IN ULONG BufferLength)
 {
@@ -385,7 +385,7 @@ HidD_Hello(OUT PCHAR Buffer,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_SetFeature(IN HANDLE HidDeviceObject,
                 IN PVOID ReportBuffer,
                 IN ULONG ReportBufferLength)
@@ -404,7 +404,7 @@ HidD_SetFeature(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_SetNumInputBuffers(IN HANDLE HidDeviceObject,
                         IN ULONG NumberBuffers)
 {
@@ -422,7 +422,7 @@ HidD_SetNumInputBuffers(IN HANDLE HidDeviceObject,
  * @implemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_SetOutputReport(IN HANDLE HidDeviceObject,
                      IN PVOID ReportBuffer,
                      IN ULONG ReportBufferLength)

reactos/dll/win32/hid/precomp.h

@@ -2,14 +2,13 @@
 #include <windows.h>
 #include <debug.h>
 
-#define DDKAPI __stdcall
 #define _HIDPI_
 #define _HIDPI_NO_FUNCTION_MACROS_
 typedef VOID
-(DDKAPI *PINTERFACE_REFERENCE)(
+(WINAPI *PINTERFACE_REFERENCE)(
   PVOID  Context);
 typedef VOID
-(DDKAPI *PINTERFACE_DEREFERENCE)(
+(WINAPI *PINTERFACE_DEREFERENCE)(
   PVOID  Context);
 #include <ntndk.h>
 #include <hidusage.h>

reactos/dll/win32/hid/stubs.c

@@ -15,7 +15,7 @@
  * @unimplemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetConfiguration(IN HANDLE HidDeviceObject,
                       OUT PHIDD_CONFIGURATION Configuration,
                       IN ULONG ConfigurationLength)
@@ -29,7 +29,7 @@ HidD_GetConfiguration(IN HANDLE HidDeviceObject,
  * @unimplemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetIndexedString(IN HANDLE HidDeviceObject,
                       IN ULONG StringIndex,
                       OUT PVOID Buffer,
@@ -44,7 +44,7 @@ HidD_GetIndexedString(IN HANDLE HidDeviceObject,
  * @unimplemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject,
                           OUT PVOID Buffer,
                           IN ULONG BufferLength)
@@ -58,7 +58,7 @@ HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject,
  * @unimplemented
  */
 HIDAPI
-BOOLEAN DDKAPI
+BOOLEAN WINAPI
 HidD_SetConfiguration(IN HANDLE HidDeviceObject,
                       IN PHIDD_CONFIGURATION Configuration,
                       IN ULONG ConfigurationLength)
@@ -72,7 +72,7 @@ HidD_SetConfiguration(IN HANDLE HidDeviceObject,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetCaps(IN PHIDP_PREPARSED_DATA PreparsedData,
              OUT PHIDP_CAPS Capabilities)
 {
@@ -85,7 +85,7 @@ HidP_GetCaps(IN PHIDP_PREPARSED_DATA PreparsedData,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetData(IN HIDP_REPORT_TYPE ReportType,
              OUT PHIDP_DATA DataList,
              IN OUT PULONG DataLength,
@@ -102,7 +102,7 @@ HidP_GetData(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetExtendedAttributes(IN HIDP_REPORT_TYPE ReportType,
                            IN USHORT DataIndex,
                            IN PHIDP_PREPARSED_DATA PreparsedData,
@@ -118,7 +118,7 @@ HidP_GetExtendedAttributes(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetLinkCollectionNodes(OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes,
                             IN OUT PULONG LinkCollectionNodesLength,
                             IN PHIDP_PREPARSED_DATA PreparsedData)
@@ -132,7 +132,7 @@ HidP_GetLinkCollectionNodes(OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType,
                          IN USAGE UsagePage,
                          IN USHORT LinkCollection OPTIONAL,
@@ -151,7 +151,7 @@ HidP_GetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetSpecificButtonCaps(IN HIDP_REPORT_TYPE ReportType,
                            IN USAGE UsagePage,
                            IN USHORT LinkCollection,
@@ -169,7 +169,7 @@ HidP_GetSpecificButtonCaps(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetSpecificValueCaps(IN HIDP_REPORT_TYPE ReportType,
                           IN USAGE UsagePage,
                           IN USHORT LinkCollection,
@@ -187,7 +187,7 @@ HidP_GetSpecificValueCaps(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetUsageValue(IN HIDP_REPORT_TYPE ReportType,
                    IN USAGE UsagePage,
                    IN USHORT LinkCollection,
@@ -206,7 +206,7 @@ HidP_GetUsageValue(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetUsageValueArray(IN HIDP_REPORT_TYPE ReportType,
                         IN USAGE UsagePage,
                         IN USHORT LinkCollection  OPTIONAL,
@@ -226,7 +226,7 @@ HidP_GetUsageValueArray(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetUsages(IN HIDP_REPORT_TYPE ReportType,
                IN USAGE UsagePage,
                IN USHORT LinkCollection  OPTIONAL,
@@ -245,7 +245,7 @@ HidP_GetUsages(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType,
                  IN USHORT LinkCollection,
                  OUT PUSAGE_AND_PAGE ButtonList,
@@ -263,7 +263,7 @@ HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_InitializeReportForID(IN HIDP_REPORT_TYPE ReportType,
                            IN UCHAR ReportID,
                            IN PHIDP_PREPARSED_DATA PreparsedData,
@@ -279,7 +279,7 @@ HidP_InitializeReportForID(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-ULONG DDKAPI
+ULONG WINAPI
 HidP_MaxDataListLength(IN HIDP_REPORT_TYPE  ReportType,
                        IN PHIDP_PREPARSED_DATA  PreparsedData)
 {
@@ -292,7 +292,7 @@ HidP_MaxDataListLength(IN HIDP_REPORT_TYPE  ReportType,
  * @unimplemented
  */
 HIDAPI
-ULONG DDKAPI
+ULONG WINAPI
 HidP_MaxUsageListLength(IN HIDP_REPORT_TYPE ReportType,
                         IN USAGE UsagePage OPTIONAL,
                         IN PHIDP_PREPARSED_DATA PreparsedData)
@@ -306,7 +306,7 @@ HidP_MaxUsageListLength(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_SetData(IN HIDP_REPORT_TYPE ReportType,
              IN PHIDP_DATA DataList,
              IN OUT PULONG DataLength,
@@ -323,7 +323,7 @@ HidP_SetData(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_SetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType,
                          IN USAGE UsagePage,
                          IN USHORT LinkCollection OPTIONAL,
@@ -342,7 +342,7 @@ HidP_SetScaledUsageValue(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_SetUsageValue(IN HIDP_REPORT_TYPE ReportType,
                    IN USAGE UsagePage,
                    IN USHORT LinkCollection,
@@ -361,7 +361,7 @@ HidP_SetUsageValue(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_SetUsageValueArray(IN HIDP_REPORT_TYPE ReportType,
                         IN USAGE UsagePage,
                         IN USHORT LinkCollection OPTIONAL,
@@ -381,7 +381,7 @@ HidP_SetUsageValueArray(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_SetUsages(IN HIDP_REPORT_TYPE ReportType,
                IN USAGE UsagePage,
                IN USHORT LinkCollection OPTIONAL,
@@ -400,7 +400,7 @@ HidP_SetUsages(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_TranslateUsagesToI8042ScanCodes(IN PUSAGE ChangedUsageList,
                                      IN ULONG UsageListLength,
                                      IN HIDP_KEYBOARD_DIRECTION KeyAction,
@@ -417,7 +417,7 @@ HidP_TranslateUsagesToI8042ScanCodes(IN PUSAGE ChangedUsageList,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_UnsetUsages(IN HIDP_REPORT_TYPE ReportType,
                  IN USAGE UsagePage,
                  IN USHORT LinkCollection OPTIONAL,
@@ -436,7 +436,7 @@ HidP_UnsetUsages(IN HIDP_REPORT_TYPE ReportType,
  * @unimplemented
  */
 HIDAPI
-NTSTATUS DDKAPI
+NTSTATUS WINAPI
 HidP_UsageListDifference(IN PUSAGE PreviousUsageList,
                          IN PUSAGE CurrentUsageList,
                          OUT PUSAGE BreakUsageList,

reactos/drivers/bus/isapnp/isapnp.h

@@ -5,7 +5,6 @@
 
 #ifdef _MSC_VER
   #define STDCALL
-  #define DDKAPI
 #endif
 
 #ifdef __cplusplus

reactos/drivers/bus/pci/pci.h

@@ -8,7 +8,6 @@
 
 #ifdef _MSC_VER
   #define STDCALL
-  #define DDKAPI
 #endif
 
 #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))

reactos/drivers/video/displays/framebuf/ddenable.c

@@ -20,7 +20,7 @@
 
 #include "framebuf.h"
 
-VOID DDKAPI
+VOID APIENTRY
 DrvDisableDirectDraw( IN DHPDEV  dhpdev)
 {
    PPDEV ppdev = (PPDEV)dhpdev;
@@ -29,7 +29,7 @@ DrvDisableDirectDraw( IN DHPDEV  dhpdev)
       when we shout down directx interface */
 }
 
-BOOL DDKAPI
+BOOL APIENTRY
 DrvEnableDirectDraw(
   IN DHPDEV  dhpdev,
   OUT DD_CALLBACKS  *pCallBacks,
@@ -127,7 +127,7 @@ DrvEnableDirectDraw(
 	 return ppdev->bDDInitialized;
 }
 
-BOOL DDKAPI
+BOOL APIENTRY
 DrvGetDirectDrawInfo(
   IN DHPDEV  dhpdev,
   OUT DD_HALINFO  *pHalInfo,

reactos/drivers/video/displays/framebufacc/ddenable.c

@@ -20,7 +20,7 @@
 
 #include "framebuf.h"
 
-VOID DDKAPI
+VOID APIENTRY
 DrvDisableDirectDraw( IN DHPDEV  dhpdev)
 {
    PPDEV ppdev = (PPDEV)dhpdev;
@@ -29,7 +29,7 @@ DrvDisableDirectDraw( IN DHPDEV  dhpdev)
       when we shout down directx interface */
 }
 
-BOOL DDKAPI
+BOOL APIENTRY
 DrvEnableDirectDraw(
   IN DHPDEV  dhpdev,
   OUT DD_CALLBACKS  *pCallBacks,
@@ -127,7 +127,7 @@ DrvEnableDirectDraw(
 	 return ppdev->bDDInitialized;
 }
 
-BOOL DDKAPI
+BOOL APIENTRY
 DrvGetDirectDrawInfo(
   IN DHPDEV  dhpdev,
   OUT DD_HALINFO  *pHalInfo,

reactos/drivers/video/displays/vga/vgaddi.h

@@ -25,7 +25,6 @@
 
 /* FIXME - what a headers mess.... */
 
-#define DDKAPI __stdcall
 #define DDKFASTAPI __fastcall
 #define FASTCALL __fastcall
 #define DDKCDECLAPI __cdecl