Francois Gouget : shell32/tests: Fix the shortcut vs. class interaction test.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3dff8bc2133e1118a7e74ab44742cc168d4229c1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3dff8bc2133e1118a7e74ab447...

Author: Francois Gouget 
Date:   Mon Jan 11 02:18:40 2016 +0100

shell32/tests: Fix the shortcut vs. class interaction test.

Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

dlls/shell32/tests/shlexec.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index b765f7c..f67206d 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -2010,11 +2010,12 @@ static void test_lnks(void)
     okChildInt("argcA", 4);
     okChildString("argvA3", "Lnk");

-    /* Lnk's ContextMenuHandler has priority over an explicit class */
-    rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec");
+    /* An explicit class overrides lnk's ContextMenuHandler */
+    rc=shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec");
     ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError());
-    okChildInt("argcA", 4);
-    okChildString("argvA3", "Lnk");
+    okChildInt("argcA", 5);
+    okChildString("argvA3", "Open");
+    okChildString("argvA4", filename);

if (dllver.dwMajorVersion>=6)
     {