Commit 600555d4 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Test for the pointer iso for the pointer to the pointer. Fixes bug with get_aspectRatio().

parent eec7c30f
...@@ -270,7 +270,7 @@ STDMETHODIMP VLCAudio::get_channel(BSTR *channel) ...@@ -270,7 +270,7 @@ STDMETHODIMP VLCAudio::get_channel(BSTR *channel)
*channel = BSTRFromCStr(CP_UTF8, psz_channel); *channel = BSTRFromCStr(CP_UTF8, psz_channel);
free( psz_channel ); free( psz_channel );
psz_channel = NULL; psz_channel = NULL;
return (NULL == *channel) ? E_OUTOFMEMORY : NOERROR; return (NULL == channel) ? E_OUTOFMEMORY : NOERROR;
} }
if( psz_channel ) free( psz_channel ); if( psz_channel ) free( psz_channel );
psz_channel = NULL; psz_channel = NULL;
...@@ -2095,7 +2095,7 @@ STDMETHODIMP VLCVideo::get_aspectRatio(BSTR* aspect) ...@@ -2095,7 +2095,7 @@ STDMETHODIMP VLCVideo::get_aspectRatio(BSTR* aspect)
*aspect = BSTRFromCStr(CP_UTF8, psz_aspect); *aspect = BSTRFromCStr(CP_UTF8, psz_aspect);
free( psz_aspect ); free( psz_aspect );
psz_aspect = NULL; psz_aspect = NULL;
return (NULL == *aspect) ? E_OUTOFMEMORY : NOERROR; return (NULL == aspect) ? E_OUTOFMEMORY : NOERROR;
} }
if( psz_aspect ) free( psz_aspect ); if( psz_aspect ) free( psz_aspect );
psz_aspect = NULL; psz_aspect = NULL;
...@@ -2347,14 +2347,14 @@ STDMETHODIMP VLCControl2::get_StartTime(long *seconds) ...@@ -2347,14 +2347,14 @@ STDMETHODIMP VLCControl2::get_StartTime(long *seconds)
return S_OK; return S_OK;
}; };
STDMETHODIMP VLCControl2::put_StartTime(long seconds) STDMETHODIMP VLCControl2::put_StartTime(long seconds)
{ {
_p_instance->setStartTime(seconds); _p_instance->setStartTime(seconds);
return NOERROR; return NOERROR;
}; };
STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version) STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version)
{ {
if( NULL == version ) if( NULL == version )
...@@ -2364,7 +2364,6 @@ STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version) ...@@ -2364,7 +2364,6 @@ STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version)
if( NULL != versionStr ) if( NULL != versionStr )
{ {
*version = BSTRFromCStr(CP_UTF8, versionStr); *version = BSTRFromCStr(CP_UTF8, versionStr);
return NULL == *version ? E_OUTOFMEMORY : NOERROR; return NULL == *version ? E_OUTOFMEMORY : NOERROR;
} }
*version = NULL; *version = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment