From d5569c08aa2818c6240744bb47a00f67f20fdb54 Mon Sep 17 00:00:00 2001 From: Adonais Romero Gonzalez Date: Mon, 1 Jul 2024 17:33:16 -0700 Subject: Standarize INF files enconding to UTF-16 (LE with BOM); renormalize files --- audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf | Bin 8526 -> 4123 bytes .../Source/Main/SimpleAudioSample.inx | Bin 15004 -> 7299 bytes .../TabletAudioSample/ComponentizedApoSample.inx | Bin 22624 -> 11119 bytes .../TabletAudioSample/ComponentizedAudioSample.inx | Bin 52952 -> 25853 bytes .../ComponentizedAudioSampleExtension.inx | Bin 13660 -> 6686 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'audio') diff --git a/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf b/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf index 889f9bdb..0bc5fe23 100644 Binary files a/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf and b/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf differ diff --git a/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx b/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx index d0835f1f..db2b62c1 100644 Binary files a/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx and b/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx differ diff --git a/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx b/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx index 7c08f86a..2cda2dae 100644 Binary files a/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx and b/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx differ diff --git a/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx b/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx index 1c638273..c6655868 100644 Binary files a/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx and b/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx differ diff --git a/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx b/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx index 2ce2f6a0..7511017c 100644 Binary files a/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx and b/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx differ -- cgit v1.3.1 From 82646a919592c06a98e60766760e70e8fcaaf656 Mon Sep 17 00:00:00 2001 From: Julia DZmura Date: Thu, 19 Sep 2024 12:13:06 -0700 Subject: Small fixes to sample. --- .../Source/Filters/speakertoptable.h | 2 +- audio/simpleaudiosample/Source/Main/common.cpp | 6 ++- audio/simpleaudiosample/Source/Main/minwavert.h | 52 ---------------------- .../Source/Main/minwavertstream.h | 52 ---------------------- 4 files changed, 5 insertions(+), 107 deletions(-) (limited to 'audio') 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/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() { -- cgit v1.3.1 From 8785be37a62c68536a8675fb5823094ce2e2868c Mon Sep 17 00:00:00 2001 From: Adonais Romero Gonzalez Date: Fri, 22 Nov 2024 17:27:04 -0800 Subject: Remove legacy EmbedManifest property. --- audio/sysvad/APO/AecApo/AecApo.vcxproj | 4 ---- audio/sysvad/APO/DelayAPO/DelayAPO.vcxproj | 4 ---- audio/sysvad/APO/KWSApo/KWSApo.vcxproj | 4 ---- audio/sysvad/APO/SwapAPO/SwapAPO.vcxproj | 4 ---- 4 files changed, 16 deletions(-) (limited to 'audio') diff --git a/audio/sysvad/APO/AecApo/AecApo.vcxproj b/audio/sysvad/APO/AecApo/AecApo.vcxproj index 7de1a862..37c814b1 100644 --- a/audio/sysvad/APO/AecApo/AecApo.vcxproj +++ b/audio/sysvad/APO/AecApo/AecApo.vcxproj @@ -32,7 +32,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -41,7 +40,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -50,7 +48,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -59,7 +56,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary diff --git a/audio/sysvad/APO/DelayAPO/DelayAPO.vcxproj b/audio/sysvad/APO/DelayAPO/DelayAPO.vcxproj index a5d6ff37..81004ea0 100644 --- a/audio/sysvad/APO/DelayAPO/DelayAPO.vcxproj +++ b/audio/sysvad/APO/DelayAPO/DelayAPO.vcxproj @@ -32,7 +32,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -41,7 +40,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -50,7 +48,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -59,7 +56,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary diff --git a/audio/sysvad/APO/KWSApo/KWSApo.vcxproj b/audio/sysvad/APO/KWSApo/KWSApo.vcxproj index 938e5974..05430973 100644 --- a/audio/sysvad/APO/KWSApo/KWSApo.vcxproj +++ b/audio/sysvad/APO/KWSApo/KWSApo.vcxproj @@ -32,7 +32,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -41,7 +40,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -50,7 +48,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -59,7 +56,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary diff --git a/audio/sysvad/APO/SwapAPO/SwapAPO.vcxproj b/audio/sysvad/APO/SwapAPO/SwapAPO.vcxproj index 61bea0cb..c1e2f27a 100644 --- a/audio/sysvad/APO/SwapAPO/SwapAPO.vcxproj +++ b/audio/sysvad/APO/SwapAPO/SwapAPO.vcxproj @@ -32,7 +32,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -41,7 +40,6 @@ Windows10 False Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -50,7 +48,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary @@ -59,7 +56,6 @@ Windows10 True Windows Driver - false WindowsApplicationForDrivers10.0 DynamicLibrary -- cgit v1.3.1