Module: wine Branch: master Commit: 7ddd41e3268419726b2097f964b07485685b1165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ddd41e3268419726b2097f964...
Author: Zebediah Figura z.figura12@gmail.com Date: Fri Dec 1 20:52:50 2017 -0600
shell32: Implement the ExitProgman() command for Progman DDE.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/dde.c | 5 +++++ dlls/shell32/tests/progman_dde.c | 13 +++++++++++++ 2 files changed, 18 insertions(+)
diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 8ac6f9c..cfe5a05 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -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 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 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 dotlnkW[] = {'.','l','n','k',0}; @@ -275,6 +276,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv)
if (!ret) return DDE_FNOTPROCESSED; } + else if (!strcmpiW(command, exit_progmanW)) + { + /* do nothing */ + } else { FIXME("unhandled command %s\n", debugstr_w(command)); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index dd9b777..b66c862 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -270,6 +270,12 @@ static void test_parser(DWORD instance, HCONV hConv) error = dde_execute(instance, hConv, "[DeleteGroup(test)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); 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 */ @@ -372,6 +378,13 @@ static void test_progman_dde(DWORD instance, HCONV hConv) error = dde_execute(instance, hConv, "[ShowGroup(Group2, 0)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); 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 */