Merge branch 'main' into fix-transaction-processing

5 files changed, 5 insertions, 107 deletions

diff --git a/audio/simpleaudiosample/Source/Filters/speakertoptable.h b/audio/simpleaudiosample/Source/Filters/speakertoptable.h
index 1b046d96..f9e54df6 100644
--- a/audio/simpleaudiosample/Source/Filters/speakertoptable.h
+++ b/audio/simpleaudiosample/Source/Filters/speakertoptable.h
@@ -87,7 +87,7 @@ static
 KSJACK_DESCRIPTION SpeakerJackDescBridge =
 {
     KSAUDIO_SPEAKER_STEREO,
-    0xB3C98C,               // Color spec for green
+    JACKDESC_RGB(0xB3,0xC9,0x8C),              // Color spec for green
     eConnTypeUnknown,
     eGeoLocFront,
     eGenLocPrimaryBox,
diff --git a/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx b/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx
index d0835f1f..db2b62c1 100644
--- a/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx
+++ b/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx
diff --git a/audio/simpleaudiosample/Source/Main/common.cpp b/audio/simpleaudiosample/Source/Main/common.cpp
index 457bdb17..7c19130e 100644
--- a/audio/simpleaudiosample/Source/Main/common.cpp
+++ b/audio/simpleaudiosample/Source/Main/common.cpp
@@ -2511,7 +2511,7 @@ Return Value:
 
         // Allocate the key value name string
         pwstrKeyValueName = (PWSTR)ExAllocatePool2(POOL_FLAG_NON_PAGED, kvFullInfo->NameLength + sizeof(WCHAR)*2, MINADAPTER_POOLTAG);
-        IF_TRUE_ACTION_JUMP(kvFullInfo == NULL, ntStatus = STATUS_INSUFFICIENT_RESOURCES, loop_exit);
+        IF_TRUE_ACTION_JUMP(pwstrKeyValueName == NULL, ntStatus = STATUS_INSUFFICIENT_RESOURCES, loop_exit);
 
         // Copy the key value name from the full information struct
         RtlStringCbCopyNW(pwstrKeyValueName, kvFullInfo->NameLength + sizeof(WCHAR)*2, kvFullInfo->Name, kvFullInfo->NameLength);
@@ -2531,6 +2531,7 @@ Return Value:
         if (pwstrKeyValueName)
         {
             ExFreePoolWithTag(pwstrKeyValueName, MINADAPTER_POOLTAG);
+            pwstrKeyValueName = NULL;
         }
 
         // Bail if anything failed
@@ -2618,7 +2619,7 @@ Return Value:
 
         // Allocate the key name string 
         pwstrKeyName = (PWSTR)ExAllocatePool2(POOL_FLAG_NON_PAGED, kBasicInfo->NameLength + sizeof(WCHAR), MINADAPTER_POOLTAG);
-        IF_TRUE_ACTION_JUMP(kBasicInfo == NULL, ntStatus = STATUS_INSUFFICIENT_RESOURCES, loop_exit);
+        IF_TRUE_ACTION_JUMP(pwstrKeyName == NULL, ntStatus = STATUS_INSUFFICIENT_RESOURCES, loop_exit);
 
         // Copy the key name from the basic information struct
         RtlStringCbCopyNW(pwstrKeyName, kBasicInfo->NameLength + sizeof(WCHAR), kBasicInfo->Name, kBasicInfo->NameLength);
@@ -2652,6 +2653,7 @@ Return Value:
         if (pwstrKeyName)
         {
             ExFreePoolWithTag(pwstrKeyName, MINADAPTER_POOLTAG);
+            pwstrKeyName = NULL;
         }
 
         // Close the current source key
diff --git a/audio/simpleaudiosample/Source/Main/minwavert.h b/audio/simpleaudiosample/Source/Main/minwavert.h
index 4c0ccd83..a5ed89ff 100644
--- a/audio/simpleaudiosample/Source/Main/minwavert.h
+++ b/audio/simpleaudiosample/Source/Main/minwavert.h
@@ -204,58 +204,6 @@ public:
     };
 #pragma code_seg()
 
-    //---------------------------------------------------------------------------------------------------------
-    // volume
-    //---------------------------------------------------------------------------------------------------------
-    NTSTATUS GetVolumeChannelCount
-    (
-        _Out_  UINT32* pulChannelCount
-    );
-
-    NTSTATUS GetVolumeSteppings
-    (
-        _Out_writes_bytes_(_ui32DataSize)  PKSPROPERTY_STEPPING_LONG _pKsPropStepLong,
-        _In_  UINT32    _ui32DataSize
-    );
-
-    NTSTATUS GetChannelVolume
-    (
-        _In_  UINT32    _uiChannel,
-        _Out_  LONG* _pVolume
-    );
-
-    NTSTATUS SetChannelVolume
-    (
-        _In_  UINT32    _uiChannel,
-        _In_  LONG      _Volume
-    );
-
-    //-----------------------------------------------------------------------------
-    // mute
-    //-----------------------------------------------------------------------------
-    NTSTATUS GetMuteChannelCount
-    (
-        _Out_  UINT32* pulChannelCount
-    );
-
-    NTSTATUS GetMuteSteppings
-    (
-        _Out_writes_bytes_(_ui32DataSize)  PKSPROPERTY_STEPPING_LONG _pKsPropStepLong,
-        _In_  UINT32    _ui32DataSize
-    );
-
-    NTSTATUS GetChannelMute
-    (
-        _In_  UINT32    _uiChannel,
-        _Out_  BOOL* _pbMute
-    );
-
-    NTSTATUS SetChannelMute
-    (
-        _In_  UINT32    _uiChannel,
-        _In_  BOOL      _bMute
-    );
-
 private:
     _IRQL_raises_(DISPATCH_LEVEL)
     _Acquires_lock_(m_DeviceFormatsAndModesLock)
diff --git a/audio/simpleaudiosample/Source/Main/minwavertstream.h b/audio/simpleaudiosample/Source/Main/minwavertstream.h
index 5545e0d8..0124cab2 100644
--- a/audio/simpleaudiosample/Source/Main/minwavertstream.h
+++ b/audio/simpleaudiosample/Source/Main/minwavertstream.h
@@ -131,63 +131,11 @@ protected:
 
 public:
 
-    NTSTATUS GetVolumeChannelCount
-    (
-        _Out_ UINT32* puiChannelCount
-    );
-
-    NTSTATUS GetVolumeSteppings
-    (
-        _Out_writes_bytes_(_ui32DataSize) PKSPROPERTY_STEPPING_LONG _pKsPropStepLong,
-        _In_  UINT32 _ui32DataSize
-    );
-
-    NTSTATUS GetChannelVolume
-    (
-        _In_  UINT32 _uiChannel,
-        _Out_  LONG* _pVolume
-    );
-
-    NTSTATUS SetChannelVolume
-    (
-        _In_  UINT32 _uiChannel,
-        _In_  LONG _Volume
-    );
-
-    NTSTATUS GetMuteChannelCount
-    (
-        _Out_ UINT32* puiChannelCount
-    );
-
-    NTSTATUS GetMuteSteppings
-    (
-        _Out_writes_bytes_(_ui32DataSize)  PKSPROPERTY_STEPPING_LONG _pKsPropStepLong,
-        _In_  UINT32 _ui32DataSize
-    );
-
-    NTSTATUS GetChannelMute
-    (
-        _In_  UINT32 _uiChannel,
-        _Out_  BOOL* _pbMute
-    );
-
-    NTSTATUS SetChannelMute
-    (
-        _In_  UINT32 _uiChannel,
-        _In_  BOOL _bMute
-    );
-
     //presentation
     NTSTATUS GetPresentationPosition
     (
         _Out_  KSAUDIO_PRESENTATION_POSITION *_pPresentationPosition
     );
-
-    NTSTATUS SetCurrentWritePosition
-    (
-        _In_  ULONG ulCurrentWritePosition
-    );
-
         
     ULONG GetCurrentWaveRTWritePosition() 
     {