Fix context menu handling for more than one entry in order to repair

.lnk-file execution: Don't break at the first non-matching entry.

Fix context menu handling for more than one entry in order to repair
04103939 · Martin Fuchs · Alexandre Julliard · 902edb11 · 04103939
Commit 04103939 authored Nov 30, 2005 by Martin Fuchs Committed by Alexandre Julliard Nov 30, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

shlexec.c dlls/shell32/shlexec.c +8 -8

No files found.
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1156,15 +1156,15 @@ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei )
            r = RegEnumKeyW( hkeycm, i++, szguid, 39 );
            if ( r != ERROR_SUCCESS )
                break;
-            r = ERROR_FUNCTION_FAILED;
+
            hr = CLSIDFromString( szguid, &guid );
-            if ( FAILED( hr ) )
-                break;
-            r = ERROR_SUCCESS;
-            /* stop at the first one that succeeds in running */
-            hr = shellex_load_object_and_run( hkey, &guid, sei );
-            if ( SUCCEEDED( hr ) )
-                break;
+            if (SUCCEEDED(hr))
+            {
+                /* stop at the first one that succeeds in running */
+                hr = shellex_load_object_and_run( hkey, &guid, sei );
+                if ( SUCCEEDED( hr ) )
+                    break;
+            }
        }
        RegCloseKey( hkeycm );
    }