From: dmitrykos <dmitrykos@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Thu, 4 Mar 2010 11:02:06 +0000 (+0000)
Subject: wasapi: fixed initialization stage of PaWasapi_Initialize() which was returning error... 
X-Git-Tag: pa_stable_v19_20110326_r1647~162
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=779ef401acac9659e558367e9e68458f62cd7868;p=portaudio

wasapi: fixed initialization stage of PaWasapi_Initialize() which was returning error if WASAPI wasn't found (for example under Windows XP), this was causing PA's whole initialization to fail completely
---

diff --git a/src/hostapi/wasapi/pa_win_wasapi.c b/src/hostapi/wasapi/pa_win_wasapi.c
index 75813b8..e55eed1 100644
--- a/src/hostapi/wasapi/pa_win_wasapi.c
+++ b/src/hostapi/wasapi/pa_win_wasapi.c
@@ -834,7 +834,7 @@ static BOOL UseWOW64VistaWorkaround()
 // ------------------------------------------------------------------------------------------
 PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
 {
-    PaError result = paUnanticipatedHostError;
+    PaError result = paNoError;
     PaWasapiHostApiRepresentation *paWasapi;
     PaDeviceInfo *deviceInfoArray;
     HRESULT hResult = S_OK;
@@ -843,13 +843,13 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
 
     if (!SetupAVRT())
 	{
-        PRINT(("Windows WASAPI : No AVRT! (not VISTA?)"));
-        return paHostApiNotFound;
+        PRINT(("WASAPI: No AVRT! (not VISTA?)"));
+        return paNoError;
     }
 
     CoInitialize(NULL);
 
-    paWasapi = (PaWasapiHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWasapiHostApiRepresentation) );
+    paWasapi = (PaWasapiHostApiRepresentation *)PaUtil_AllocateMemory( sizeof(PaWasapiHostApiRepresentation) );
     if (paWasapi == NULL)
 	{
         result = paInsufficientMemory;
@@ -863,7 +863,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
         goto error;
     }
 
-    *hostApi = &paWasapi->inheritedHostApiRep;
+    *hostApi                             = &paWasapi->inheritedHostApiRep;
     (*hostApi)->info.structVersion		 = 1;
     (*hostApi)->info.type				 = paWASAPI;
     (*hostApi)->info.name				 = "Windows WASAPI";
@@ -1101,7 +1101,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
                 deviceInfo->defaultLowInputLatency  = nano100ToSeconds(paWasapi->devInfo[i].MinimumDevicePeriod);
             break;
             default:
-                PRINT(("WASAPI device:%d bad Data FLow! \n",i));
+                PRINT(("WASAPI: device %d bad Data FLow! \n",i));
                 goto error;
             break;
             }
@@ -1134,7 +1134,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
 
     SAFE_RELEASE(pEndPoints);
 
-    return (result = paNoError);
+    return paNoError;
 
 error: