-fix some compilation errors

svn path=/trunk/; revision=27507

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c b/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c
index 14caaa0..eb7340a 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c
@@ -33,8 +33,8 @@ typedef struct CResourceList
     Basic IUnknown methods
 */
 
-STDMETHODCALLTYPE
 NTSTATUS
+STDMETHODCALLTYPE
 ResourceList_QueryInterface(
     IResourceList* this_container,
     IN  REFIID refiid,
@@ -44,8 +44,8 @@ ResourceList_QueryInterface(
     return STATUS_SUCCESS;
 }
 
-STDMETHODCALLTYPE
 ULONG
+STDMETHODCALLTYPE
 ResourceList_AddRef(
     IResourceList* this_container)
 {
@@ -56,8 +56,8 @@ ResourceList_AddRef(
     return this->m_ref_count;
 }
 
-STDMETHODCALLTYPE
 ULONG
+STDMETHODCALLTYPE
 ResourceList_Release(
     IResourceList* this_container)
 {
@@ -80,15 +80,15 @@ ResourceList_Release(
     IResourceList methods
 */
 
-STDMETHODCALLTYPE
 ULONG
+STDMETHODCALLTYPE
 ResourceList_NumberOfEntries(IResourceList* this_container)
 {
     return 0;
 }
 
-STDMETHODCALLTYPE
 ULONG
+STDMETHODCALLTYPE
 ResourceList_NumberOfEntriesOfType(
     IResourceList* this_container,
     IN  CM_RESOURCE_TYPE type)
@@ -120,8 +120,8 @@ ResourceList_NumberOfEntriesOfType(
     return count;
 }
 
-STDMETHODCALLTYPE
 PCM_PARTIAL_RESOURCE_DESCRIPTOR
+STDMETHODCALLTYPE
 ResourceList_FindTranslatedEntry(
     IResourceList* this_container,
     IN  CM_RESOURCE_TYPE Type,
@@ -130,8 +130,8 @@ ResourceList_FindTranslatedEntry(
     return NULL;
 }
 
-STDMETHODCALLTYPE
 PCM_PARTIAL_RESOURCE_DESCRIPTOR
+STDMETHODCALLTYPE
 ResourceList_FindUntranslatedEntry(
     IResourceList* this_container,
     IN  CM_RESOURCE_TYPE Type,
@@ -140,8 +140,8 @@ ResourceList_FindUntranslatedEntry(
     return NULL;
 }
 
-STDMETHODCALLTYPE
 NTSTATUS
+STDMETHODCALLTYPE
 ResourceList_AddEntry(
     IResourceList* this_container,
     IN  PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated,
@@ -150,8 +150,8 @@ ResourceList_AddEntry(
     return STATUS_SUCCESS;
 }
 
-STDMETHODCALLTYPE
 NTSTATUS
+STDMETHODCALLTYPE
 ResourceList_AddEntryFromParent(
     IResourceList* this_container,
     IN  IResourceList* Parent,
@@ -161,16 +161,16 @@ ResourceList_AddEntryFromParent(
     return STATUS_SUCCESS;
 }
 
-STDMETHODCALLTYPE
 PCM_RESOURCE_LIST
+STDMETHODCALLTYPE
 ResourceList_TranslatedList(
     IResourceList* this_container)
 {
     return NULL;
 }
 
-STDMETHODCALLTYPE
 PCM_RESOURCE_LIST
+STDMETHODCALLTYPE
 ResourceList_UntranslatedList(
     IResourceList* this_container)
 {

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/dll.c b/reactos/drivers/wdm/audio/backpln/portcls/dll.c
index 5d60253..0bcc4cd 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/dll.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/dll.c
@@ -8,7 +8,7 @@
     -
 */
 
-#include <ntddk.h>
+#include "private.h"
 
 /*
  * @implemented

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/irp.c b/reactos/drivers/wdm/audio/backpln/portcls/irp.c
index 11424ab..e6a1e41 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/irp.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/irp.c
@@ -18,8 +18,9 @@
     set. Whether this is a good idea or not...?
 */
 #if 0
-static NTAPI
+static
 NTSTATUS
+NTAPI
 IrpStub(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -40,8 +41,8 @@ IrpStub(
     Handles IRP_MJ_CREATE, which occurs when someone wants to make use of
     a device.
 */
-NTAPI
 NTSTATUS
+NTAPI
 PortClsCreate(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -62,8 +63,8 @@ PortClsCreate(
     IRP_MJ_PNP handler
     Used for things like IRP_MN_START_DEVICE
 */
-NTAPI
 NTSTATUS
+NTAPI
 PortClsPnp(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -148,8 +149,8 @@ PortClsPnp(
     Power management. Handles IRP_MJ_POWER
     (not implemented)
 */
-NTAPI
 NTSTATUS
+NTAPI
 PortClsPower(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -169,8 +170,8 @@ PortClsPower(
     System control. Handles IRP_MJ_SYSTEM_CONTROL
     (not implemented)
 */
-NTAPI
 NTSTATUS
+NTAPI
 PortClsSysControl(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/private.h b/reactos/drivers/wdm/audio/backpln/portcls/private.h
index 7a2fa9f..dd224be 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/private.h
+++ b/reactos/drivers/wdm/audio/backpln/portcls/private.h
@@ -13,26 +13,31 @@
 
 #include <portcls.h>
 
-NTAPI
+#ifdef _MSC_VER
+  #define STDCALL
+  #define DDKAPI
+#endif
+
 NTSTATUS
+NTAPI
 PortClsCreate(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);
 
-NTAPI
 NTSTATUS
+NTAPI
 PortClsPnp(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);
 
-NTAPI
 NTSTATUS
+NTAPI
 PortClsPower(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);
 
-NTAPI
 NTSTATUS
+NTAPI
 PortClsSysControl(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);