Synchronize with trunk revision 59636 (just before Alex's CreateProcess revamp).

[reactos.git] / drivers / wdm / audio / backpln / portcls / miniport_dmus.cpp

diff --git a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp
index 7d40c68..7fd55ae 100644 (file)
--- a/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp
+++ b/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp
@@ -118,7 +118,7 @@ public:
     }
 
     CMiniportDMusUART(IUnknown * Unknown){}
-    ~CMiniportDMusUART();
+    virtual ~CMiniportDMusUART();
 
     /*************************************************************************
      * IMiniport methods
@@ -181,9 +181,9 @@ public:
      * Friends 
      */
     friend class CMiniportDMusUARTStream;
-    friend NTSTATUS 
+    friend NTSTATUS NTAPI
         DMusMPUInterruptServiceRoutine(PINTERRUPTSYNC InterruptSync,PVOID DynamicContext);
-    friend NTSTATUS 
+    friend NTSTATUS NTAPI
         SynchronizedDMusMPUWrite(PINTERRUPTSYNC InterruptSync,PVOID syncWriteContext);
     friend VOID NTAPI 
         DMusUARTTimerDPC(PKDPC Dpc,PVOID DeferredContext,PVOID SystemArgument1,PVOID SystemArgument2);
@@ -242,7 +242,7 @@ public:
         return m_Ref;
     }
 
-    ~CMiniportDMusUARTStream();
+    virtual ~CMiniportDMusUARTStream();
 
     STDMETHODIMP_(NTSTATUS) Init
     (
@@ -278,7 +278,7 @@ public:
         IN      PVOID   SystemArgument1,
         IN      PVOID   SystemArgument2
     );
-    friend NTSTATUS PropertyHandler_Synth(IN PPCPROPERTY_REQUEST);
+    friend NTSTATUS NTAPI PropertyHandler_Synth(IN PPCPROPERTY_REQUEST);
     friend STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream);
 };
 
@@ -692,6 +692,7 @@ NTSTATUS CMiniportDMusUART::InitializeHardware(PINTERRUPTSYNC interruptSync,PUCH
  * Synchronized routine to initialize the MPU401.
  */
 NTSTATUS
+NTAPI
 InitMPU
 (
     IN      PINTERRUPTSYNC  InterruptSync,
@@ -861,6 +862,7 @@ Write
  * Writes outgoing MIDI data.
  */
 NTSTATUS
+NTAPI
 SynchronizedDMusMPUWrite
 (
     IN      PINTERRUPTSYNC  InterruptSync,
@@ -876,13 +878,13 @@ SynchronizedDMusMPUWrite
     ASSERT(context->BytesRead);
 
     PUCHAR  pChar = PUCHAR(context->BufferAddress);
-    NTSTATUS ntStatus,readStatus;
+    NTSTATUS ntStatus; // , readStatus
     ntStatus = STATUS_SUCCESS;
     //
     // while we're not there yet, and
     // while we don't have to wait on an aligned byte (including 0)
     // (we never wait on a byte.  Better to come back later)
-    readStatus = DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport));
+    /*readStatus = */ DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport));
     while (  (*(context->BytesRead) < context->Length)
           && (  TryMPU(context->PortBase) 
              || (*(context->BytesRead)%3)
@@ -901,7 +903,7 @@ SynchronizedDMusMPUWrite
             break;
         }
     }
-    readStatus = DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport));
+    /*readStatus = */ DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport));
     return ntStatus;
 }
 
@@ -1132,6 +1134,7 @@ CMiniportDMusUARTStream::SourceEvtsToPort()
  * ISR.
  */
 NTSTATUS
+NTAPI
 DMusMPUInterruptServiceRoutine
 (
     IN      PINTERRUPTSYNC  InterruptSync,
@@ -1309,7 +1312,7 @@ ProcessResources
     ULONG   countDMA    = ResourceList->NumberOfDmas();
     ULONG   lengthIO    = ResourceList->FindTranslatedPort(0)->u.Port.Length;
 
-#ifdef DBG
+#if DBG
     DPRINT("Starting MPU401 Port 0x%lx", ResourceList->FindTranslatedPort(0)->u.Port.Start.LowPart);
 #endif
 
@@ -2458,7 +2461,9 @@ DMusUARTTimerDPC
 const WCHAR wszDescOut[] = L"DMusic MPU-401 Out ";
 const WCHAR wszDescIn[] = L"DMusic MPU-401 In ";
 
-NTSTATUS PropertyHandler_Synth
+NTSTATUS
+NTAPI
+PropertyHandler_Synth
 (
     IN      PPCPROPERTY_REQUEST     pRequest
 )