Added pa_win_coinitialize.c to MSVC project and windows configure scripts

diff --git a/build/msvc/portaudio.vcproj b/build/msvc/portaudio.vcproj
index e969009345cc17366c4df3f4ee34b368d3554ee7..6261de84e5de8126d9fabf98c44b5fdf7bdb1f3e 100644 (file)
--- a/build/msvc/portaudio.vcproj
+++ b/build/msvc/portaudio.vcproj
@@ -1699,6 +1699,10 @@
                                <Filter\r
                                        Name="win"\r
                                        >\r
+                                       <File\r
+                                               RelativePath="..\..\src\os\win\pa_win_coinitialize.c"\r
+                                               >\r
+                                       </File>\r
                                        <File\r
                                                RelativePath="..\..\src\os\win\pa_win_hostapis.c"\r
                                                >\r

diff --git a/configure b/configure
index f91cbe7ad6cfd5c6c5cd8126e3fb7c9d69528f04..b77e40ea62449b182457f75d1211a15a2837edef 100755 (executable)
Binary files a/configure and b/configure differ

diff --git a/configure.in b/configure.in
index dd39fb74abf6b135bdcd8da58b17b324b8acce01..6564c365a7ee727b751dff7983b7d53b6d9fa30d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -230,7 +230,7 @@ case "${host_os}" in
 
         if [[ "x$with_directx" = "xyes" ]]; then
             DXDIR="$with_dxdir"
-            add_objects src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o
+            add_objects src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_coinitialize.o src/os/win/pa_win_waveformat.o
             LIBS="-lwinmm -lm -ldsound -lole32"
             DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -ldsound -lole32"
             #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""
@@ -240,7 +240,7 @@ case "${host_os}" in
 
         if [[ "x$with_asio" = "xyes" ]]; then
             ASIODIR="$with_asiodir"
-            add_objects src/hostapi/asio/pa_asio.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/hostapi/asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o
+            add_objects src/hostapi/asio/pa_asio.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_coinitialize.o src/hostapi/asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o
             LIBS="-lwinmm -lm -lole32 -luuid"
             DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lole32 -luuid"
             CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/src/hostapi/asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -UPA_USE_ASIO -DPA_USE_ASIO=1 -DWINDOWS"
@@ -265,7 +265,7 @@ case "${host_os}" in
         fi
 
         if [[ "x$with_wasapi" = "xyes" ]]; then
-            add_objects src/hostapi/wasapi/pa_win_wasapi.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o
+            add_objects src/hostapi/wasapi/pa_win_wasapi.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_coinitialize.o src/os/win/pa_win_waveformat.o
             LIBS="-lwinmm -lm -lole32 -luuid"
             DLL_LIBS="${DLL_LIBS} -lwinmm -lole32"
             CFLAGS="$CFLAGS -I\$(top_srcdir)/src/common -I\$(top_srcdir)/src/hostapi/wasapi/mingw-include -UPA_USE_WASAPI -DPA_USE_WASAPI=1"

diff --git a/src/os/win/pa_win_coinitialize.c b/src/os/win/pa_win_coinitialize.c
index 2fea85f9e26d2edbd3b846f2411d87be4cb83331..e15b145e23b9a0b7ce75aa9692a88bce55a73a42 100644 (file)
--- a/src/os/win/pa_win_coinitialize.c
+++ b/src/os/win/pa_win_coinitialize.c
@@ -79,7 +79,7 @@ PaError PaWinUtil_CoInitialize( PaHostApiTypeId hostApiType, PaWinUtilComInitial
     hr = CoInitialize(0); /* use legacy-safe equivalent to CoInitializeEx(NULL, COINIT_APARTMENTTHREADED) */\r
     if( FAILED(hr) && hr != RPC_E_CHANGED_MODE )\r
     {\r
-        PA_DEBUG(("CoInitializeEx failed. hr=%d\n", hr));\r
+        PA_DEBUG(("CoInitialize(0) failed. hr=%d\n", hr));\r
 \r
         if( hr == E_OUTOFMEMORY )\r
             return paInsufficientMemory;\r