[ros-diffs] [cwittich] 27507: -fix some compilation errors

Author: cwittich
Date: Sun Jul  8 22:54:07 2007
New Revision: 27507

URL: http://svn.reactos.org/svn/reactos?rev=27507&view=rev
Log:
-fix some compilation errors

Modified:
    trunk/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c
    trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c
    trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c
    trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c Sun Jul  8 22:54:07
2007
@@ -33,8 +33,8 @@
     Basic IUnknown methods
 */
 
-STDMETHODCALLTYPE
 NTSTATUS
+STDMETHODCALLTYPE
 ResourceList_QueryInterface(
     IResourceList* this_container,
     IN  REFIID refiid,
@@ -44,8 +44,8 @@
     return STATUS_SUCCESS;
 }
 
-STDMETHODCALLTYPE
-ULONG
+ULONG
+STDMETHODCALLTYPE
 ResourceList_AddRef(
     IResourceList* this_container)
 {
@@ -56,8 +56,8 @@
     return this->m_ref_count;
 }
 
-STDMETHODCALLTYPE
-ULONG
+ULONG
+STDMETHODCALLTYPE
 ResourceList_Release(
     IResourceList* this_container)
 {
@@ -80,15 +80,15 @@
     IResourceList methods
 */
 
-STDMETHODCALLTYPE
-ULONG
+ULONG
+STDMETHODCALLTYPE
 ResourceList_NumberOfEntries(IResourceList* this_container)
 {
     return 0;
 }
 
-STDMETHODCALLTYPE
-ULONG
+ULONG
+STDMETHODCALLTYPE
 ResourceList_NumberOfEntriesOfType(
     IResourceList* this_container,
     IN  CM_RESOURCE_TYPE type)
@@ -120,8 +120,8 @@
     return count;
 }
 
-STDMETHODCALLTYPE
 PCM_PARTIAL_RESOURCE_DESCRIPTOR
+STDMETHODCALLTYPE
 ResourceList_FindTranslatedEntry(
     IResourceList* this_container,
     IN  CM_RESOURCE_TYPE Type,
@@ -130,8 +130,8 @@
     return NULL;
 }
 
-STDMETHODCALLTYPE
 PCM_PARTIAL_RESOURCE_DESCRIPTOR
+STDMETHODCALLTYPE
 ResourceList_FindUntranslatedEntry(
     IResourceList* this_container,
     IN  CM_RESOURCE_TYPE Type,
@@ -140,8 +140,8 @@
     return NULL;
 }
 
-STDMETHODCALLTYPE
 NTSTATUS
+STDMETHODCALLTYPE
 ResourceList_AddEntry(
     IResourceList* this_container,
     IN  PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated,
@@ -150,8 +150,8 @@
     return STATUS_SUCCESS;
 }
 
-STDMETHODCALLTYPE
 NTSTATUS
+STDMETHODCALLTYPE
 ResourceList_AddEntryFromParent(
     IResourceList* this_container,
     IN  IResourceList* Parent,
@@ -161,16 +161,16 @@
     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)
 {

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dll.c Sun Jul  8 22:54:07 2007
@@ -8,7 +8,7 @@
     -
 */
 
-#include <ntddk.h>
+#include "private.h"
 
 /*
  * @implemented

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c Sun Jul  8 22:54:07 2007
@@ -18,8 +18,9 @@
     set. Whether this is a good idea or not...?
 */
 #if 0
-static NTAPI
-NTSTATUS
+static
+NTSTATUS
+NTAPI
 IrpStub(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -40,8 +41,8 @@
     Handles IRP_MJ_CREATE, which occurs when someone wants to make use of
     a device.
 */
-NTAPI
-NTSTATUS
+NTSTATUS
+NTAPI
 PortClsCreate(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -62,8 +63,8 @@
     IRP_MJ_PNP handler
     Used for things like IRP_MN_START_DEVICE
 */
-NTAPI
-NTSTATUS
+NTSTATUS
+NTAPI
 PortClsPnp(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -148,8 +149,8 @@
     Power management. Handles IRP_MJ_POWER
     (not implemented)
 */
-NTAPI
-NTSTATUS
+NTSTATUS
+NTAPI
 PortClsPower(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)
@@ -169,8 +170,8 @@
     System control. Handles IRP_MJ_SYSTEM_CONTROL
     (not implemented)
 */
-NTAPI
-NTSTATUS
+NTSTATUS
+NTAPI
 PortClsSysControl(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp)

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Sun Jul  8 22:54:07 2007
@@ -13,26 +13,31 @@
 
 #include <portcls.h>
 
+#ifdef _MSC_VER
+  #define STDCALL
+  #define DDKAPI
+#endif
+
+NTSTATUS
 NTAPI
-NTSTATUS
 PortClsCreate(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);
 
+NTSTATUS
 NTAPI
-NTSTATUS
 PortClsPnp(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);
 
+NTSTATUS
 NTAPI
-NTSTATUS
 PortClsPower(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);
 
+NTSTATUS
 NTAPI
-NTSTATUS
 PortClsSysControl(
     IN  PDEVICE_OBJECT DeviceObject,
     IN  PIRP Irp);