Misha Koshelev : shell32/tests: Remove duplicate code.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed May 30 08:56:49 CDT 2007
Module: wine
Branch: master
Commit: c7aa087504654cf2d3538bc970f3783bbab3a034
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7aa087504654cf2d3538bc970f3783bbab3a034
Author: Misha Koshelev <mk144210 at bcm.edu>
Date: Sun May 27 20:01:13 2007 -0500
shell32/tests: Remove duplicate code.
---
dlls/shell32/tests/shlexec.c | 44 ++++++-----------------------------------
1 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 2b19a76..8894364 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -233,43 +233,6 @@ static void delete_test_association(const char* extension)
SHDeleteKey(HKEY_CLASSES_ROOT, extension);
}
-static void create_test_verb(const char* extension, const char* verb,
- int rawcmd, const char* cmdtail)
-{
- HKEY hkey_shell, hkey_verb, hkey_cmd;
- char shell[MAX_PATH];
- char* cmd;
- LONG rc;
-
- sprintf(shell, "shlexec%s\\shell", extension);
- rc=RegOpenKeyEx(HKEY_CLASSES_ROOT, shell, 0,
- KEY_CREATE_SUB_KEY, &hkey_shell);
- assert(rc==ERROR_SUCCESS);
- rc=RegCreateKeyEx(hkey_shell, verb, 0, NULL, 0, KEY_CREATE_SUB_KEY,
- NULL, &hkey_verb, NULL);
- assert(rc==ERROR_SUCCESS);
- rc=RegCreateKeyEx(hkey_verb, "command", 0, NULL, 0, KEY_SET_VALUE,
- NULL, &hkey_cmd, NULL);
- assert(rc==ERROR_SUCCESS);
-
- if (rawcmd)
- {
- rc=RegSetValueEx(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmdtail, strlen(cmdtail)+1);
- }
- else
- {
- cmd=malloc(strlen(argv0)+10+strlen(child_file)+2+strlen(cmdtail)+1);
- sprintf(cmd,"%s shlexec \"%s\" %s", argv0, child_file, cmdtail);
- rc=RegSetValueEx(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmd, strlen(cmd)+1);
- assert(rc==ERROR_SUCCESS);
- free(cmd);
- }
-
- CloseHandle(hkey_shell);
- CloseHandle(hkey_verb);
- CloseHandle(hkey_cmd);
-}
-
static void create_test_verb_dde(const char* extension, const char* verb,
int rawcmd, const char* cmdtail, const char *ddeexec,
const char *application, const char *topic,
@@ -352,6 +315,13 @@ static void create_test_verb_dde(const char* extension, const char* verb,
CloseHandle(hkey_cmd);
}
+static void create_test_verb(const char* extension, const char* verb,
+ int rawcmd, const char* cmdtail)
+{
+ create_test_verb_dde(extension, verb, rawcmd, cmdtail, NULL, NULL,
+ NULL, NULL);
+}
+
/***
*
* Functions to check that the child process was started just right
More information about the wine-cvs
mailing list