From b5fc9f995f562678d3fa82fdddef49bca364d726 Mon Sep 17 00:00:00 2001
From: rob_bielik <rob_bielik@0f58301d-fd10-0410-b4af-bbb618454e57>
Date: Tue, 10 May 2011 06:35:21 +0000
Subject: [PATCH] Added pa_win_coinitialize.c to MSVC project and windows
 configure scripts

---
 build/msvc/portaudio.vcproj      |   4 ++++
 configure                        | Bin 411358 -> 411457 bytes
 configure.in                     |   6 +++---
 src/os/win/pa_win_coinitialize.c |   2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build/msvc/portaudio.vcproj b/build/msvc/portaudio.vcproj
index e969009..6261de8 100644
--- a/build/msvc/portaudio.vcproj
+++ b/build/msvc/portaudio.vcproj
@@ -1699,6 +1699,10 @@
 				<Filter
 					Name="win"
 					>
+					<File
+						RelativePath="..\..\src\os\win\pa_win_coinitialize.c"
+						>
+					</File>
 					<File
 						RelativePath="..\..\src\os\win\pa_win_hostapis.c"
 						>
diff --git a/configure b/configure
index f91cbe7ad6cfd5c6c5cd8126e3fb7c9d69528f04..b77e40ea62449b182457f75d1211a15a2837edef 100755
GIT binary patch
delta 105
zcmccDD|xU_vY~~sg{g(Pg=Gut8D5^`{LH+}lFY=M%&OGs7kF7kr_UE-b=xk)$7;+p
meU%t1ABu|Yb^@$bY$!q?O-|DTL|M(-WyD#x%ZRfb(gy&S5+eox

delta 56
zcmX@uCwZ?|vY~~sg{g(Pg=Gut8Q$p%!mMo5pNp{yPnQ;F)!lB)$7;;9y<LE{n5`Ws
Luw7c5P0auR0s{}0

diff --git a/configure.in b/configure.in
index dd39fb7..6564c36 100644
--- 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 2fea85f..e15b145 100644
--- 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) */
     if( FAILED(hr) && hr != RPC_E_CHANGED_MODE )
     {
-        PA_DEBUG(("CoInitializeEx failed. hr=%d\n", hr));
+        PA_DEBUG(("CoInitialize(0) failed. hr=%d\n", hr));
 
         if( hr == E_OUTOFMEMORY )
             return paInsufficientMemory;
-- 
2.43.0