Commit 7ddd41e3 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

shell32: Implement the ExitProgman() command for Progman DDE.

parent 57a94970
...@@ -128,6 +128,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ...@@ -128,6 +128,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv)
static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0};
static const WCHAR delete_itemW[] = {'D','e','l','e','t','e','I','t','e','m',0}; static const WCHAR delete_itemW[] = {'D','e','l','e','t','e','I','t','e','m',0};
static const WCHAR replace_itemW[] = {'R','e','p','l','a','c','e','I','t','e','m',0}; static const WCHAR replace_itemW[] = {'R','e','p','l','a','c','e','I','t','e','m',0};
static const WCHAR exit_progmanW[] = {'E','x','i','t','P','r','o','g','m','a','n',0};
static const WCHAR dotexeW[] = {'.','e','x','e',0}; static const WCHAR dotexeW[] = {'.','e','x','e',0};
static const WCHAR dotlnkW[] = {'.','l','n','k',0}; static const WCHAR dotlnkW[] = {'.','l','n','k',0};
...@@ -275,6 +276,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ...@@ -275,6 +276,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv)
if (!ret) return DDE_FNOTPROCESSED; if (!ret) return DDE_FNOTPROCESSED;
} }
else if (!strcmpiW(command, exit_progmanW))
{
/* do nothing */
}
else else
{ {
FIXME("unhandled command %s\n", debugstr_w(command)); FIXME("unhandled command %s\n", debugstr_w(command));
......
...@@ -270,6 +270,12 @@ static void test_parser(DWORD instance, HCONV hConv) ...@@ -270,6 +270,12 @@ static void test_parser(DWORD instance, HCONV hConv)
error = dde_execute(instance, hConv, "[DeleteGroup(test)]"); error = dde_execute(instance, hConv, "[DeleteGroup(test)]");
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
ok(!check_exists("test"), "directory should not exist\n"); ok(!check_exists("test"), "directory should not exist\n");
error = dde_execute(instance, hConv, "[ExitProgman()]");
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
error = dde_execute(instance, hConv, "[ExitProgman]");
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
} }
/* 1st set of tests */ /* 1st set of tests */
...@@ -372,6 +378,13 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ...@@ -372,6 +378,13 @@ static void test_progman_dde(DWORD instance, HCONV hConv)
error = dde_execute(instance, hConv, "[ShowGroup(Group2, 0)]"); error = dde_execute(instance, hConv, "[ShowGroup(Group2, 0)]");
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
ok(check_window_exists("Group2"), "window not created\n"); ok(check_window_exists("Group2"), "window not created\n");
error = dde_execute(instance, hConv, "[ExitProgman(1)]");
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
error = dde_execute(instance, hConv, "[AddItem(notepad,test4)]");
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
ok(check_exists("Group2/test4.lnk"), "link not created\n");
} }
/* 2nd set of tests - 2nd connection */ /* 2nd set of tests - 2nd connection */
......
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