Zebediah Figura : shell32: Implement the DeleteItem() command for Progman DDE.
Alexandre Julliard
julliard at winehq.org
Fri Dec 1 14:08:20 CST 2017
Module: wine
Branch: master
Commit: 64c456af77f0584fb93da773cacdf083a3b89f9f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c456af77f0584fb93da773cacdf083a3b89f9f
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Dec 1 10:08:13 2017 -0600
shell32: Implement the DeleteItem() command for Progman DDE.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/dde.c | 20 ++++++++++++++++++++
dlls/shell32/tests/progman_dde.c | 4 ----
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c
index 412c047..7505c2c 100644
--- a/dlls/shell32/dde.c
+++ b/dlls/shell32/dde.c
@@ -126,6 +126,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv)
static const WCHAR delete_groupW[] = {'D','e','l','e','t','e','G','r','o','u','p',0};
static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',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 dotexeW[] = {'.','e','x','e',0};
static const WCHAR dotlnkW[] = {'.','l','n','k',0};
@@ -254,6 +255,25 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv)
if (FAILED(hres)) return DDE_FNOTPROCESSED;
}
+ else if (!strcmpiW(command, delete_itemW))
+ {
+ WCHAR *name;
+ BOOL ret;
+
+ if (argc < 1) return DDE_FNOTPROCESSED;
+
+ name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + strlenW(argv[0]) + 5) * sizeof(*name));
+ lstrcpyW(name, last_group);
+ lstrcatW(name, slashW);
+ lstrcatW(name, argv[0]);
+ lstrcatW(name, dotlnkW);
+
+ ret = DeleteFileW(name);
+
+ HeapFree(GetProcessHeap(), 0, name);
+
+ if (!ret) return DDE_FNOTPROCESSED;
+ }
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 544df97..3f88205 100644
--- a/dlls/shell32/tests/progman_dde.c
+++ b/dlls/shell32/tests/progman_dde.c
@@ -296,10 +296,8 @@ static void test_progman_dde(DWORD instance, HCONV hConv)
ok(check_exists("Group1/f2g1Name.lnk"), "link not created\n");
error = dde_execute(instance, hConv, "[DeleteItem(f2g1Name)]");
- todo_wine {
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
ok(!check_exists("Group1/f2g1Name.lnk"), "link should not exist\n");
- }
sprintf(itemtext, "[AddItem(%s,f3g1Name)]", f3g1);
error = dde_execute(instance, hConv, itemtext);
@@ -322,10 +320,8 @@ static void test_progman_dde(DWORD instance, HCONV hConv)
ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error);
error = dde_execute(instance, hConv, "[DeleteItem(f3g1Name)]");
- todo_wine {
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
ok(!check_exists("Group1/f3g1Name.lnk"), "link should not exist\n");
- }
error = dde_execute(instance, hConv, "[ShowGroup(Startup, 0)]");
ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);
More information about the wine-cvs
mailing list