fehler bereinigt

git-svn-id: http://svn.02strich.de/Treiber@25 a67c404b-3300-0410-b3cc-a7ebe1bea36c

common.cpp

@@ -6,7 +6,7 @@ Module Name:
   Implementation of the AdapterCommon class. 
 */
 
-#include "msvad.h"
+#include "vdcaudio.h"
 #include "common.h"
 #include "hw.h"
 #include "savedata.h"
@@ -33,7 +33,7 @@ class CAdapterCommon : public IAdapterCommon, public IAdapterPowerManagement, pu
 		PDEVICE_OBJECT          m_pDeviceObject;      
 		DEVICE_POWER_STATE      m_PowerState;        
 
-        PCMSVADHW               m_pHW;          // Virtual MSVAD HW object
+        PCVDCAudioHW            m_pHW;          // Virtual MSVAD HW object
 
 	public:
 		//=====================================================================
@@ -252,7 +252,7 @@ Return Value:
 
     // Initialize HW.
     // 
-    m_pHW = new (NonPagedPool, MSVAD_POOLTAG)  CMSVADHW;
+    m_pHW = new (NonPagedPool, VDCAUDIO_POOLTAG)  CVDCAudioHW;
     if (!m_pHW)
     {
         DPF(D_TERSE, ("Insufficient memory for MSVAD HW"));

hw.cpp

@@ -18,12 +18,12 @@ Module Name:
 #include "hw.h"
 
 //=============================================================================
-// CMSVADHW
+// CVDCAudioHW
 //=============================================================================
 
 //=============================================================================
 #pragma code_seg("PAGE")
-CMSVADHW::CMSVADHW()
+CVDCAudioHW::CVDCAudioHW()
 : m_ulMux(0)
 /*++
 
@@ -42,12 +42,12 @@ Return Value:
     PAGED_CODE();
 
     MixerReset();
-} // CMSVADHW
+} // CVDCAudioHW
 #pragma code_seg()
 
 //=============================================================================
 BOOL
-CMSVADHW::GetMixerMute
+CVDCAudioHW::GetMixerMute
 (
     IN  ULONG                   ulNode
 )
@@ -77,7 +77,7 @@ Return Value:
 
 //=============================================================================
 ULONG                       
-CMSVADHW::GetMixerMux()
+CVDCAudioHW::GetMixerMux()
 /*++
 
 Routine Description:
@@ -97,7 +97,7 @@ Return Value:
 
 //=============================================================================
 LONG
-CMSVADHW::GetMixerVolume
+CVDCAudioHW::GetMixerVolume
 (   
     IN  ULONG                   ulNode,
     IN  LONG                    lChannel
@@ -131,7 +131,7 @@ Return Value:
 //=============================================================================
 #pragma code_seg("PAGE")
 void 
-CMSVADHW::MixerReset()
+CVDCAudioHW::MixerReset()
 /*++
 
 Routine Description:
@@ -158,7 +158,7 @@ Return Value:
 
 //=============================================================================
 void
-CMSVADHW::SetMixerMute
+CVDCAudioHW::SetMixerMute
 (
     IN  ULONG                   ulNode,
     IN  BOOL                    fMute
@@ -189,7 +189,7 @@ Return Value:
 
 //=============================================================================
 void                        
-CMSVADHW::SetMixerMux
+CVDCAudioHW::SetMixerMux
 (
     IN  ULONG                   ulNode
 )
@@ -214,7 +214,7 @@ Return Value:
 
 //=============================================================================
 void  
-CMSVADHW::SetMixerVolume
+CVDCAudioHW::SetMixerVolume
 (   
     IN  ULONG                   ulNode,
     IN  LONG                    lChannel,

savedata.cpp

@@ -428,7 +428,7 @@ CSaveData::Initialize
             (
                 NonPagedPool,
                 m_ulBufferSize,
-                MSVAD_POOLTAG
+                VDCAUDIO_POOLTAG
             );
         if (!m_pDataBuffer)
         {
@@ -447,7 +447,7 @@ CSaveData::Initialize
                 NonPagedPool,
                 m_ulFrameCount * sizeof(BOOL) +
                 sizeof(LARGE_INTEGER),
-                MSVAD_POOLTAG
+                VDCAUDIO_POOLTAG
             );
         if (!m_fFrameUsed)
         {
@@ -515,7 +515,7 @@ CSaveData::InitializeWorkItems
         (
             NonPagedPool,
             sizeof(SAVEWORKER_PARAM) * MAX_WORKER_ITEM_COUNT,
-            MSVAD_POOLTAG
+            VDCAUDIO_POOLTAG
         );
     if (m_pWorkItems)
     {
@@ -637,7 +637,7 @@ CSaveData::SetDataFormat
                 (pwfx->wFormatTag == WAVE_FORMAT_PCM) ?
                 sizeof( PCMWAVEFORMAT ) :
                 sizeof( WAVEFORMATEX ) + pwfx->cbSize,
-                MSVAD_POOLTAG
+                VDCAUDIO_POOLTAG
             );
 
         if(m_waveFormat)

toptable.h

@@ -8,7 +8,7 @@ Module Name:
 
 #ifndef __TOPTABLE_H_
 #define __TOPTABLE_H_
-*/
+
 
 //=============================================================================
 static KSDATARANGE PinDataRangesBridge[] = {

vdcaudio.h

@@ -24,15 +24,15 @@ Module Name:
 
 // Product Id
 // {5B722BF8-F0AB-47ee-B9C8-8D61D31375A1}
-#define STATIC_PID_MSVAD 0x5b722bf8, 0xf0ab, 0x47ee, 0xb9, 0xc8, 0x8d, 0x61, 0xd3, 0x13, 0x75, 0xa1
+#define STATIC_PID_VDCAUDIO 0x5b722bf8, 0xf0ab, 0x47ee, 0xb9, 0xc8, 0x8d, 0x61, 0xd3, 0x13, 0x75, 0xa1
 DEFINE_GUIDSTRUCT("5B722BF8-F0AB-47ee-B9C8-8D61D31375A1", PID_MSVAD);
-#define PID_MSVAD DEFINE_GUIDNAMED(PID_MSVAD)
+#define PID_VDCAUDIO DEFINE_GUIDNAMED(PID_MSVAD)
 
 // Name Guid
 // {946A7B1A-EBBC-422a-A81F-F07C8D40D3B4}
-#define STATIC_NAME_MSVAD_SIMPLE 0x946a7b1a, 0xebbc, 0x422a, 0xa8, 0x1f, 0xf0, 0x7c, 0x8d, 0x40, 0xd3, 0xb4
+#define STATIC_NAME_VDCAUDIO 0x946a7b1a, 0xebbc, 0x422a, 0xa8, 0x1f, 0xf0, 0x7c, 0x8d, 0x40, 0xd3, 0xb4
 DEFINE_GUIDSTRUCT("946A7B1A-EBBC-422a-A81F-F07C8D40D3B4", NAME_MSVAD_SIMPLE);
-#define NAME_MSVAD_SIMPLE DEFINE_GUIDNAMED(NAME_MSVAD_SIMPLE)
+#define NAME_VDCAUDIO DEFINE_GUIDNAMED(NAME_MSVAD_SIMPLE)
 
 // Pool tag used for MSVAD allocations
 #define VDCAUDIO_POOLTAG           'VDCA'  

vdctopo.cpp

@@ -6,8 +6,8 @@ Module Name:
   Implementation of topology miniport.
 */
 
-#include "common.h"
 #include "vdcaudio.h"
+#include "common.h"
 #include "vdcwave.h"
 #include "vdctopo.h"
 #include "toptable.h"

vdcwave.cpp

@@ -6,8 +6,8 @@ Module Name:
     Implementation of wavecyclic miniport.
 */
 
-#include "common.h"
 #include "vdcaudio.h"
+#include "common.h"
 #include "vdcwave.h"
 #include "vdcwavestream.h"
 #include "wavtable.h"
@@ -300,7 +300,7 @@ Return Value:
   // Instantiate a stream. Stream must be in
   // NonPagedPool because of file saving.
   if (NT_SUCCESS(ntStatus)) {
-    stream = new (NonPagedPool, MSVAD_POOLTAG) CMiniportWaveCyclicStream(OuterUnknown);
+    stream = new (NonPagedPool, VDCAUDIO_POOLTAG) CMiniportWaveCyclicStream(OuterUnknown);
     if (stream) {
       stream->AddRef();
       ntStatus = stream->Init(this, Pin, Capture, DataFormat);
@@ -410,11 +410,11 @@ Return Value:
         PKSCOMPONENTID pComponentId = (PKSCOMPONENTID) PropertyRequest->Value;
 
         INIT_MMREG_MID(&pComponentId->Manufacturer, MM_MICROSOFT);
-        pComponentId->Product   = PID_MSVAD;
-        pComponentId->Name      = NAME_MSVAD_SIMPLE;
+        pComponentId->Product   = PID_VDCAUDIO;
+        pComponentId->Name      = NAME_VDCAUDIO;
         pComponentId->Component = GUID_NULL; // Not used for extended caps.
-        pComponentId->Version   = MSVAD_VERSION;
-        pComponentId->Revision  = MSVAD_REVISION;
+        pComponentId->Version   = VDCAUDIO_VERSION;
+        pComponentId->Revision  = VDCAUDIO_REVISION;
 
         PropertyRequest->ValueSize = sizeof(KSCOMPONENTID);
         ntStatus = STATUS_SUCCESS;

vdcwavestream.cpp

@@ -816,4 +816,5 @@ Return Value:
 */
 {
   DBGPRINT("[CMiniportWaveCyclicStream::TransferCount]");
-  return m_ulDmaBuff
+  return m_ulDmaBufferSize;
+}

wavtable.h

@@ -8,7 +8,6 @@ Module Name:
 
 #ifndef __WAVTABLE_H_
 #define __WAVTABLE_H_
-*/
 
 //=============================================================================
 static KSDATARANGE_AUDIO PinDataRangesStream[] = {