Fix some typos in docs.

Fix some compiler warnings for win32.

diff --git a/doc/src/tutorial/querying_devices.dox b/doc/src/tutorial/querying_devices.dox
index 2286060c64884ca6c663fa267898d454f7be58bb..b97cd113b8a7ecc8ac8d4fbef7601c11612b6fbe 100644 (file)
--- a/doc/src/tutorial/querying_devices.dox
+++ b/doc/src/tutorial/querying_devices.dox
@@ -30,7 +30,7 @@ If you want to get information about each device, simply loop through as follows
     }\r
 @endcode\r
 \r
-The Pa_DeviceInfo structure contains a wealth of information such as the name of the devices, the default latency associated with the devices and more. The structure ihas the following fields:\r
+The Pa_DeviceInfo structure contains a wealth of information such as the name of the devices, the default latency associated with the devices and more. The structure has the following fields:\r
 \r
 @code\r
 int    structVersion\r

diff --git a/include/portaudio.h b/include/portaudio.h
index 2dcdf8f76b62e95ab92cc5ffdf3d3e9eec52eadd..1d2323349cfc02213c8031ab7c4dd4cfc0a7b03e 100644 (file)
--- a/include/portaudio.h
+++ b/include/portaudio.h
@@ -1021,7 +1021,7 @@ typedef struct PaStreamInfo
 /** Retrieve a pointer to a PaStreamInfo structure containing information
  about the specified stream.
  @return A pointer to an immutable PaStreamInfo structure. If the stream
- parameter invalid, or an error is encountered, the function returns NULL.
+ parameter is invalid, or an error is encountered, the function returns NULL.
 
  @param stream A pointer to an open stream previously created with Pa_OpenStream.
 

diff --git a/src/hostapi/dsound/pa_win_ds.c b/src/hostapi/dsound/pa_win_ds.c
index f863cb15d76c6f53b92825ea803371fe5cdf06c5..60c202fcc893af75f703324f5ac9a08e0fe5f038 100644 (file)
--- a/src/hostapi/dsound/pa_win_ds.c
+++ b/src/hostapi/dsound/pa_win_ds.c
@@ -2728,8 +2728,6 @@ static void CALLBACK WaitableTimerAPCProc(
 PA_THREAD_FUNC ProcessingThreadProc( void *pArg )
 {
     PaWinDsStream *stream = (PaWinDsStream *)pArg;
-    MMRESULT mmResult;
-    HANDLE hWaitableTimer;
     LARGE_INTEGER dueTime;
     int timerPeriodMs;
 

diff --git a/src/hostapi/wmme/pa_win_wmme.c b/src/hostapi/wmme/pa_win_wmme.c
index ec990857b49de5f84c0fb0322968bbd6bd390eab..fdd238b0c3feb796e1e6224a7680c8a88f207031 100644 (file)
--- a/src/hostapi/wmme/pa_win_wmme.c
+++ b/src/hostapi/wmme/pa_win_wmme.c
@@ -709,7 +709,8 @@ static PaError InitializeInputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeH
     {
         /* Append I/O suffix to WAVE_MAPPER device. */
         deviceName = (char *)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, StrTLen( wic.szPname ) + 1 + sizeof(constInputMapperSuffix_) );
+                    winMmeHostApi->allocations,
+                                       (long) (StrTLen( wic.szPname ) + 1 + sizeof(constInputMapperSuffix_)) );
         if( !deviceName )
         {
             result = paInsufficientMemory;
@@ -721,7 +722,8 @@ static PaError InitializeInputDeviceInfo( PaWinMmeHostApiRepresentation *winMmeH
     else
     {
         deviceName = (char*)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, StrTLen( wic.szPname ) + 1 );
+                    winMmeHostApi->allocations, 
+                                       (long) (StrTLen( wic.szPname ) + 1) );
         if( !deviceName )
         {
             result = paInsufficientMemory;
@@ -835,7 +837,8 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme
     {
         /* Append I/O suffix to WAVE_MAPPER device. */
         deviceName = (char *)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, StrTLen( woc.szPname ) + 1 + sizeof(constOutputMapperSuffix_) );
+                    winMmeHostApi->allocations, 
+                                       (long) (StrTLen( woc.szPname ) + 1 + sizeof(constOutputMapperSuffix_)) );
         if( !deviceName )
         {
             result = paInsufficientMemory;
@@ -847,7 +850,8 @@ static PaError InitializeOutputDeviceInfo( PaWinMmeHostApiRepresentation *winMme
     else
     {
         deviceName = (char*)PaUtil_GroupAllocateMemory(
-                    winMmeHostApi->allocations, StrTLen( woc.szPname ) + 1 );
+                    winMmeHostApi->allocations, 
+                                       (long) (StrTLen( woc.szPname ) + 1) );
         if( !deviceName )
         {
             result = paInsufficientMemory;