Commit 1ceb883e authored by damienf's avatar damienf

plugin.cpp: formatting cleanup

vlccontrol.cpp: fixed a bug when processing target options stored in a safe array, last element in array was never processed
parent 62ee2f9d
......@@ -560,7 +560,7 @@ HRESULT VLCPlugin::onLoad(void)
if( SUCCEEDED(pContMoniker->GetDisplayName(pBC, NULL, &base_url)) )
{
/*
** check that the moinker is in a URL
** check that the moniker name is a URL
*/
if( UrlIsW(base_url, URLIS_URL) )
{
......
......@@ -619,7 +619,7 @@ static HRESULT createTargetOptions(int codePage, VARIANT *options, char ***cOpti
SafeArrayGetUBound(array, 1, &uBound);
// have we got any options
if( uBound > lBound )
if( uBound >= lBound )
{
VARTYPE vType;
hr = SafeArrayGetVartype(array, &vType);
......@@ -636,7 +636,7 @@ static HRESULT createTargetOptions(int codePage, VARIANT *options, char ***cOpti
return E_OUTOFMEMORY;
ZeroMemory(*cOptions, sizeof(char *)*(uBound-lBound));
for(pos=lBound; SUCCEEDED(hr) && (pos<uBound); ++pos )
for(pos=lBound; SUCCEEDED(hr) && (pos<=uBound); ++pos )
{
VARIANT option;
hr = SafeArrayGetElement(array, &pos, &option);
......
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