Commit aa831198 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

winemenubuilder: Return FALSE on error when processing links and URLs.

parent 46594b8e
......@@ -3216,14 +3216,14 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait )
if( !linkname[0] )
{
WINE_ERR("link name missing\n");
return TRUE;
return FALSE;
}
len=GetFullPathNameW( linkname, MAX_PATH, fullname, NULL );
if (len==0 || len>MAX_PATH)
{
WINE_ERR("couldn't get full path of link file\n");
return TRUE;
return FALSE;
}
r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
......@@ -3231,14 +3231,14 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait )
if( FAILED( r ) )
{
WINE_ERR("No IID_IShellLink\n");
return TRUE;
return FALSE;
}
r = IShellLinkW_QueryInterface( sl, &IID_IPersistFile, (LPVOID*) &pf );
if( FAILED( r ) )
{
WINE_ERR("No IID_IPersistFile\n");
return TRUE;
return FALSE;
}
r = IPersistFile_Load( pf, fullname, STGM_READ );
......@@ -3277,14 +3277,14 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait )
if( !urlname[0] )
{
WINE_ERR("URL name missing\n");
return TRUE;
return FALSE;
}
len=GetFullPathNameW( urlname, MAX_PATH, fullname, NULL );
if (len==0 || len>MAX_PATH)
{
WINE_ERR("couldn't get full path of URL file\n");
return TRUE;
return FALSE;
}
r = CoCreateInstance( &CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER,
......@@ -3292,14 +3292,14 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait )
if( FAILED( r ) )
{
WINE_ERR("No IID_IUniformResourceLocatorW\n");
return TRUE;
return FALSE;
}
r = url->lpVtbl->QueryInterface( url, &IID_IPersistFile, (LPVOID*) &pf );
if( FAILED( r ) )
{
WINE_ERR("No IID_IPersistFile\n");
return TRUE;
return FALSE;
}
r = IPersistFile_Load( pf, fullname, STGM_READ );
if( SUCCEEDED( r ) )
......
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