commit 7c1ae16431eca9b1b22d44c77ab9c67cdc32122f
author Dmitry Timoshkov <dmitry@codeweavers.com> Mon Jun 14 19:32:32 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jun 14 19:32:32 2004 +0000
tree 7334cf8ca269b9145f68713e5f7af12701d56d80
parent 4e23f101f3c7d1e9bc0e5b7a5fd6c5fe594d1854

Ignore DdeClientTransaction error in ShellExecute.

dlls/shell32/shlexec.c

diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 46865f1..da844f0 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -746,6 +746,7 @@
     DWORD       tid;
     HSZ         hszApp, hszTopic;
     HCONV       hConv;
+    HDDEDATA    hDdeData;
     unsigned    ret = 31;
 
     strcpyW(endkey, wApplication);
@@ -803,8 +804,17 @@
     SHELL_ArgifyW(res, sizeof(res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline);
     TRACE("%s %s => %s\n", debugstr_w(exec), debugstr_w(lpFile), debugstr_w(res));
 
-    ret = (DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0,
-                                XTYP_EXECUTE, 10000, &tid) == 0) ? 31 : 33;
+    /* It's documented in the KB 330337 that IE has a bug and returns
+     * error DMLERR_NOTPROCESSED on XTYP_EXECUTE request.
+     */
+    hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0,
+                                     XTYP_EXECUTE, 10000, &tid);
+    if (hDdeData)
+        DdeFreeDataHandle(hDdeData);
+    else
+        WARN("DdeClientTransaction failed with error %04x\n", DdeGetLastError(ddeInst));
+    ret = 33;
+
     DdeDisconnect(hConv);
 
  error: