winemenubuilder: Return FALSE on error when processing links and URLs

André Hentschel nerv at dawncrow.de
Mon Apr 28 13:10:23 CDT 2014


The logic suggests to do so:
>             if (bURL)
>                 bRet = Process_URL( token, bWait );
>             else
>                 bRet = Process_Link( token, bWait );
>             if (!bRet)
>             {
>                 WINE_ERR( "failed to build menu item for %s\n", wine_dbgstr_w(token) );
>                 ret = 1;
>             }

---
 programs/winemenubuilder/winemenubuilder.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index ca58a4a..4675369 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -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 ) )
-- 
1.8.1.2




More information about the wine-patches mailing list