fixed a bug in WAVEFORMATEX casts, and warnings on sprintf

diff --git a/src/hostapi/wasapi/pa_win_wasapi.cpp b/src/hostapi/wasapi/pa_win_wasapi.cpp
index ea91eb2b359be0a19139d176230e59e3f3784d45..498fc6c442d629146256fb025d6e2b42bada30cc 100644 (file)
--- a/src/hostapi/wasapi/pa_win_wasapi.cpp
+++ b/src/hostapi/wasapi/pa_win_wasapi.cpp
@@ -518,7 +518,7 @@ PaError PaWinWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApi
                                        if (value.pwszVal)\r
                                                wcstombs(deviceName,   value.pwszVal,MAX_STR_LEN-1); //todo proper size \r
                                        else{\r
-                                               sprintf(deviceName,"baddev%d",i);\r
+                                               _snprintf_s(deviceName,MAX_STR_LEN-1,MAX_STR_LEN-1,"baddev%d",i);\r
                                        }\r
 \r
                     deviceInfo->name = deviceName;\r
@@ -956,9 +956,9 @@ GetClosestFormat(IAudioClient * myClient, double sampleRate,const  PaStreamParam
        HRESULT hResult=!S_OK;\r
 \r
        if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)\r
-               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)outWavex,NULL);\r
+               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,&outWavex->Format,NULL);\r
        else\r
-               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   (WAVEFORMATEX*)&outWavex,&sharedClosestMatch);\r
+               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   &outWavex->Format,&sharedClosestMatch);\r
 \r
        if (hResult == S_OK)\r
                answer = paFormatIsSupported;\r
@@ -990,9 +990,9 @@ GetClosestFormat(IAudioClient * myClient, double sampleRate,const  PaStreamParam
                        WAVEFORMATEXTENSIBLE ext;\r
                        wasapiFillWFEXT(&ext,BestToWorst[i],sampleRate,params->channelCount);           \r
                        if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)\r
-                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)&ext,NULL);\r
+                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,&ext.Format,NULL);\r
                        else\r
-                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   (WAVEFORMATEX*)&ext,&sharedClosestMatch);\r
+                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   &ext.Format,&sharedClosestMatch);\r
 \r
                        if (hResult == S_OK){\r
                                memcpy(outWavex,&ext,sizeof(WAVEFORMATEXTENSIBLE));\r
@@ -1015,9 +1015,9 @@ GetClosestFormat(IAudioClient * myClient, double sampleRate,const  PaStreamParam
                        pcm16WaveFormat.cbSize = 0;\r
 \r
                        if (*shareMode == AUDCLNT_SHAREMODE_EXCLUSIVE)\r
-                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,(WAVEFORMATEX*)&pcm16WaveFormat,NULL);\r
+                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE,&pcm16WaveFormat,NULL);\r
                        else\r
-                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   (WAVEFORMATEX*)&pcm16WaveFormat,&sharedClosestMatch);\r
+                               hResult = myClient->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED,   &pcm16WaveFormat,&sharedClosestMatch);\r
 \r
                        if (hResult == S_OK){\r
                                memcpy(outWavex,&pcm16WaveFormat,sizeof(WAVEFORMATEX));\r