Francois Gouget : shell32: Remove dead code in SHELL_FindExecutable().

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jun 16 08:18:08 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 2d7ef72cf03b59c02c10a47997fc4beea0370d1d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2d7ef72cf03b59c02c10a47997fc4beea0370d1d

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun 15 18:29:29 2006 +0200

shell32: Remove dead code in SHELL_FindExecutable().

---

 dlls/shell32/shlexec.c |   35 +++--------------------------------
 1 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 39f1de7..f626b1d 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -607,38 +607,9 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath
 
     if (*filetype)
     {
-	if (lpOperation)
-	{
-	    /* pass the operation string to SHELL_FindExecutableByOperation() */
-	    filetype[filetypelen] = '\0';
-	    retval = SHELL_FindExecutableByOperation(lpPath, lpFile, lpOperation, key, filetype, command, sizeof(command));
-	}
-	else
-	{
-	    WCHAR operation[MAX_PATH];
-	    HKEY hkey;
-
-	    /* Looking for ...buffer\shell\<operation>\command */
-	    strcatW(filetype, wszShell);
-
-	    /* enumerate the operation subkeys in the registry and search for one with an associated command */
-	    if (RegOpenKeyW(HKEY_CLASSES_ROOT, filetype, &hkey) == ERROR_SUCCESS)
-	    {
-		int idx = 0;
-		for(;; ++idx)
-		{
-		    if (RegEnumKeyW(hkey, idx, operation, MAX_PATH) != ERROR_SUCCESS)
-			break;
-
-		    filetype[filetypelen] = '\0';
-		    retval = SHELL_FindExecutableByOperation(lpPath, lpFile, operation, key, filetype, command, sizeof(command));
-
-		    if (retval > 32)
-			break;
-	    }
-		RegCloseKey(hkey);
-	    }
-	}
+        /* pass the operation string to SHELL_FindExecutableByOperation() */
+        filetype[filetypelen] = '\0';
+        retval = SHELL_FindExecutableByOperation(lpPath, lpFile, lpOperation, key, filetype, command, sizeof(command));
 
 	if (retval > 32)
 	{




More information about the wine-cvs mailing list