Commit Graph

144 Commits

Author SHA1 Message Date
Francois Gouget 15d9a4a711 shell32/tests: Fix a race condition in the DDE ShellExecute() tests on Windows 10.
Even if we have a results file after a failed ShellExecuteEx() call, it
may not correspond to the last call and should thus be ignored.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 12:03:57 +09:00
Francois Gouget d02e559b91 shell32/tests: Make shlexec's reset_association_description() static.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 22:23:42 +09:00
Francois Gouget 822e78ee04 shell32/tests: Test default verb detection for files as well as for URLs.
When Internet Explorer 6 is installer, Windows XP detects non-standard
verbs just fine for files but not for URLs.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:27 +09:00
Francois Gouget e7065e0c51 shell32/tests: Move a file URL test to test_fileurl().
This way it's integrated with the rest of the matching tests and skipped
on plaforms where file URLs don't work right (old Windows XP versions).

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:27 +09:00
Francois Gouget 11d77e51d5 shell32/tests: Delete the shlproto test class when done.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 00:36:27 +09:00
Francois Gouget 6e9c7adcee shell32/tests: Test ShellExecute()'s URL handling.
Also tweak the class creation functions and add create_test_class() so
one can create a class without associating it with an extension.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-22 17:37:11 +09:00
Francois Gouget c8bc68ecb4 shell32/tests: Take into account the Windows 10 DDE race condition.
Also improve the description of this race condition.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:39 +09:00
Francois Gouget e48a569434 shell32/tests: Use todo_wine_if() in tests.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:39 +09:00
Francois Gouget 43fe3574f4 shell32/tests: Fix an ok() call so it shows which DDE test caused the failure.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-14 12:39:44 +09:00
Francois Gouget 5af9c123f6 shell32/tests: Allow the short and long forms when checking a ShellExecute() path.
ShellExecute() sometimes converts a short path to a long one so always accept the long form.
Windows XP SP1 often converts them to short paths instead but consider this behavior to be broken.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:33 +09:00
Francois Gouget bfc1244381 shell32/tests: Fix the ShellExecute() environment variable inheritance checks.
The child process does not inherit environment variables when the
calling process does not have elevated privileges and specifies
SEE_MASK_NOZONECHECKS.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:33 +09:00
Francois Gouget c1636cd279 shell32/tests: Move a test_argify() check so it is run even if we could not create associations.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:33 +09:00
Francois Gouget 96baeb72c2 shell32/tests: Skip a few ShellExecute() tests when the process has insufficient privileges.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:33 +09:00
Francois Gouget 13fdfedead shell32/tests: Remove support for a todo_wine flag in ShellExecute()'s test_lnks() loop.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:33 +09:00
Francois Gouget f4130de33e shell32/tests: Fix a ShellExecute() race condition.
On Windows XP SP1 a ShellExecute() call that is supposed to fail
succeeds instead. This means the child process is started but
ShellExecute() returns without waiting for it, resulting in a race
condition on the child's results file. So use our shell_execute_ex()
wrapper instead as it always waits for the child process.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:33 +09:00
Francois Gouget cc240bdb14 shell32/tests: Fix test_dde_default_app() on Windows XP SP1.
There are three possible sets of results: Windows <= 2000, XP SP1 and >= XP SP2.
Use the first two tests to figure out which results to expect.
Only accept the >= XP SP2 results in Wine.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:32 +09:00
Francois Gouget b742145cab shell32/tests: Fix the DDE tests on Windows 10.
Windows 10 does not call WaitForInputIdle() if the DDE server is a
console application. So force the call by adding
SEE_MASK_WAITFORINPUTIDLE.  Also Windows calls WaitForInputIdle() with a
60s timeout and while we should not hit it, trace and cap it to 5s
anyway.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 20:03:32 +09:00
Francois Gouget a090eff243 shell32/tests: Fix okShell()'s tracing so it takes todo and other flags into account.
This also causes the ShellExecute() and association descriptions to be
printed with each failing test. This makes the messages more readable in
TestBot's abbreviated logs, at the cost of a lot more redundancy.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-08 13:46:02 +09:00
Francois Gouget 805b5e36a9 shell32/tests: Add server-side DDE checks.
Should something go wrong a failed ok() call will leave a clearer trace
in the log than an assert.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:20 +09:00
Francois Gouget 446ade3b3c shell32/tests: Test environment variable inheritance with ShellExecute().
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:20 +09:00
Francois Gouget bdfaa8c807 shell32/tests: Check for failures in the child process.
Return the number of failures through both the child result file and the process exit code.
Also rename the child result file section to 'Child' since it no longer only contains 'Arguments'.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:19 +09:00
Francois Gouget 30230fae5f shell32/tests: Check the child process exit code and close the process handle.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:19 +09:00
Francois Gouget 3a9b09aa7d shell32/tests: Declare childPrintf() as a printf-style function.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:18 +09:00
Francois Gouget 38ad0ee01d shell32/tests: Reorder the functions to avoid forward declarations.
This also groups the helpers in a more logical fashion.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:18 +09:00
Francois Gouget 759bd96ac2 shell32/tests: Add traces to the WaitForInputIdle() hooking process.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:17 +09:00
Francois Gouget 78ada2e154 shell32/tests: Fix a couple of okChildPath()/okChildString() mixups.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 15:51:07 +09:00
Francois Gouget 3079179753 shell32/tests: Show that verbs and classes override ShellExecute()'s normal handling of executables.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 15:51:04 +09:00
Francois Gouget 2c0daad786 shell32/tests: Test handling of nonexistent verbs in ShellExecute() & co.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 15:51:00 +09:00
Francois Gouget 198e0d5d78 shell32/tests: Trace the association properties for the DDE tests.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 23:17:57 +09:00
Francois Gouget 7e000abeda shell32/tests: Call okShell() after a shell_execute{_ex}() test.
This ensures all the failed call parameters will be traced.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 23:17:24 +09:00
Francois Gouget c133ef7326 shell32/tests: Trace the last ShellExecute command whenever a corresponding test fails.
okShell() serves to encapsulate handling of shell_call and also provides a means for further extensions.

Remove the shell_call static initialization to not hide potential
use-before-assignment compiler warnings.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 23:17:05 +09:00
Francois Gouget 09dac2f482 shell32/tests: Use the shell_execute{_ex}() call site for its traces and error messages.
This makes it easier to match their internal test failures with the site of the real test.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-19 21:44:15 +09:00
Francois Gouget 9cc07a2b31 shell32/tests: Trace the effective ShellExecuteEx() flags.
shell_execute_ex() adds some flags for its own internal needs. The
traces should reflect that.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-13 23:47:04 +09:00
Francois Gouget f816bc93b0 shell32/tests: Tweak some overly optimistic ok() messages.
ShellExecute() is more likely to have returned an unexpected error code
than it is to have succeeded.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-13 23:46:53 +09:00
Francois Gouget 3dff8bc213 shell32/tests: Fix the shortcut vs. class interaction test.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-12 19:10:04 +09:00
Francois Gouget 201de16e30 shell32/tests: Create_test_association() should either succeed or fail due to insufficient permissions.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-12 19:10:04 +09:00
Francois Gouget 0a867de22d shell32/tests: Check the hProcess field when ShellExecuteEx() fails.
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-12 19:10:04 +09:00
Francois Gouget 2fb84d5c50 shell32/tests: The expectedArgs parameter of the DDE tests is an argument count, not a boolean.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-12 19:10:03 +09:00
Piotr Caban 943ead5022 shell32: Fix SHELL_execute code that removes quote arround file name. 2015-07-16 16:29:12 +09:00
Piotr Caban 8e853a3e90 shell32: Remove code for separating arguments from file path. 2015-07-16 16:29:06 +09:00
Nikolay Sivov 28caa68d41 shell32/tests: Try harder to close Open With window. 2015-07-07 16:52:20 +09:00
Huw Davies f5e16e0638 shell32/tests: Win 2k doesn't cope with spaces in the path. 2015-07-07 16:52:20 +09:00
Huw Davies c5053f5712 shell32/tests: Win XP splits the args if there are spaces in the path.
This isn't seen on winetest runs, but is when jobs are submitted to
the testbot.  Presumably the path of the executable is different in
the two cases.
2015-07-07 16:52:19 +09:00
Sebastian Lackner d892239f5a shell32: Return NULL-terminated list of arguments in CommandLineToArgvW. 2014-07-09 09:29:33 +02:00
Vincent Povirk 3ebb9b7b75 shell32/tests: Use SW_HIDE with ShellExecuteA in tests. 2014-05-07 21:28:46 +02:00
Vincent Povirk 3d1cf168cf shell32/tests: Use SEE_MASK_NO_CONSOLE with ShellExecuteExA. 2014-04-25 10:22:47 +02:00
Hans Leidekker 807998ed4c shell32/tests: Mark some test results as broken. 2014-04-01 18:20:45 +02:00
Hans Leidekker e957dd89f9 shell32/tests: Remove todo handling from DDE tests. 2014-04-01 18:20:43 +02:00
Jacek Caban cf2098cf2d shell32/tests: Ensure that tmpdir contains long path name. 2014-02-19 16:46:19 +01:00
Francois Gouget 3e033bb130 shell32/tests: Skip any test that needs the .shlexec association if we could not create it. 2014-02-12 19:15:26 +01:00