Removed MSVC dependence on ksguid.lib from src/os/win/pa_win_wdmks_utils.c (ksguid...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb2ef924e05e53217ee7a063ed6f27b1620dfd67..21c7b663d01494ec39178c4d6f7b748d5fc66304 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,6 @@ SOURCE_GROUP("hostapi\\wasapi" FILES
 ENDIF(PA_USE_WASAPI)
 
 IF(PA_USE_WDMKS)
-ADD_DEFINITIONS(-DPA_WDMKS_NO_KSGUID_LIB)
 
 SET(PA_WDMKS_INCLUDES
   include/pa_win_wdmks.h

diff --git a/build/msvc/portaudio.vcproj b/build/msvc/portaudio.vcproj
index 6261de84e5de8126d9fabf98c44b5fdf7bdb1f3e..abdb8ff21c942c7826bd9165f17f292fc1f8acd2 100644 (file)
--- a/build/msvc/portaudio.vcproj
+++ b/build/msvc/portaudio.vcproj
@@ -152,7 +152,7 @@
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\src\common;..\..\include;.\;..\..\src\os\win"\r
-                               PreprocessorDefinitions="_WIN64;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_WDMKS_NO_KSGUID_LIB;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1"\r
+                               PreprocessorDefinitions="_WIN64;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
@@ -272,7 +272,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ksguid.lib"\r
+                               AdditionalDependencies=""\r
                                OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x86.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -343,7 +343,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\common,..\..\include,.\,..\..\src\os\win"\r
-                               PreprocessorDefinitions="_WIN64;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_WDMKS_NO_KSGUID_LIB;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1"\r
+                               PreprocessorDefinitions="_WIN64;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -368,7 +368,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ksguid.lib"\r
+                               AdditionalDependencies=""\r
                                OutputFile="$(PlatformName)\$(ConfigurationName)\portaudio_x64.dll"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -540,7 +540,7 @@
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                AdditionalIncludeDirectories="..\..\src\common;..\..\include;.\;..\..\src\os\win"\r
-                               PreprocessorDefinitions="_WIN64;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_WDMKS_NO_KSGUID_LIB;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1"\r
+                               PreprocessorDefinitions="_WIN64;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_ASIO=0;PA_USE_DS=0;PA_USE_WMME=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r

diff --git a/src/os/win/pa_win_wdmks_utils.c b/src/os/win/pa_win_wdmks_utils.c
index 47e4f10b1622b81397c5a0dc08a7f60b327cc31f..e5e8f3abc0e48955d7bb5d80eff5fb0b26164c6e 100644 (file)
--- a/src/os/win/pa_win_wdmks_utils.c
+++ b/src/os/win/pa_win_wdmks_utils.c
@@ -66,33 +66,34 @@
 #include "pa_util.h"\r
 #include "pa_win_wdmks_utils.h"\r
 \r
-#if !defined(PA_WDMKS_NO_KSGUID_LIB) && !defined(PAWIN_WDMKS_NO_KSGUID_LIB) && !defined(__GNUC__)\r
-    #if (defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1200))) /* MSC version 6 and above */\r
-        #pragma comment( lib, "ksguid.lib" )\r
-    #endif\r
-    #define pa_KSDATAFORMAT_TYPE_AUDIO            KSDATAFORMAT_TYPE_AUDIO\r
-    #define pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT    KSDATAFORMAT_SUBTYPE_IEEE_FLOAT\r
-    #define pa_KSDATAFORMAT_SUBTYPE_PCM           KSDATAFORMAT_SUBTYPE_PCM\r
-    #define pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX  KSDATAFORMAT_SUBTYPE_WAVEFORMATEX\r
-    #define pa_KSMEDIUMSETID_Standard             KSMEDIUMSETID_Standard\r
-    #define pa_KSINTERFACESETID_Standard          KSINTERFACESETID_Standard\r
-    #define pa_KSPROPSETID_Pin                    KSPROPSETID_Pin\r
-#else\r
-    static const GUID pa_KSDATAFORMAT_TYPE_AUDIO            = { STATIC_KSDATAFORMAT_TYPE_AUDIO };\r
-    static const GUID pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT    = { STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT };\r
-    static const GUID pa_KSDATAFORMAT_SUBTYPE_PCM           = { STATIC_KSDATAFORMAT_SUBTYPE_PCM };\r
-    static const GUID pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX  = { STATIC_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX };\r
-    static const GUID pa_KSMEDIUMSETID_Standard             = { STATIC_KSMEDIUMSETID_Standard };\r
-    static const GUID pa_KSINTERFACESETID_Standard          = { STATIC_KSINTERFACESETID_Standard };\r
-    static const GUID pa_KSPROPSETID_Pin                    = { STATIC_KSPROPSETID_Pin };\r
-#endif\r
 \r
+/* PortAudio-local instances of GUIDs previously sourced from ksguid.lib */\r
+\r
+/* GUID KSDATAFORMAT_TYPE_AUDIO */\r
+static const GUID pa_KSDATAFORMAT_TYPE_AUDIO = { STATIC_KSDATAFORMAT_TYPE_AUDIO };\r
+\r
+/* GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT */\r
+static const GUID pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { STATIC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT };\r
+\r
+/* GUID KSDATAFORMAT_SUBTYPE_PCM */\r
+static const GUID pa_KSDATAFORMAT_SUBTYPE_PCM = { STATIC_KSDATAFORMAT_SUBTYPE_PCM };\r
+\r
+/* GUID KSDATAFORMAT_SUBTYPE_WAVEFORMATEX */\r
+static const GUID pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX = { STATIC_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX };\r
+\r
+/* GUID KSMEDIUMSETID_Standard */\r
+static const GUID pa_KSMEDIUMSETID_Standard = { STATIC_KSMEDIUMSETID_Standard };\r
+\r
+/* GUID KSINTERFACESETID_Standard */\r
+static const GUID pa_KSINTERFACESETID_Standard = { STATIC_KSINTERFACESETID_Standard };\r
+\r
+/* GUID KSPROPSETID_Pin */\r
+static const GUID pa_KSPROPSETID_Pin = { STATIC_KSPROPSETID_Pin };\r
 \r
 #define pa_IS_VALID_WAVEFORMATEX_GUID(Guid)\\r
     (!memcmp(((PUSHORT)&pa_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX) + 1, ((PUSHORT)(Guid)) + 1, sizeof(GUID) - sizeof(USHORT)))\r
 \r
 \r
-\r
 static PaError WdmGetPinPropertySimple(\r
     HANDLE  handle,\r
     unsigned long pinId,\r