ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32/tests: Fix the temporary directory creation in shlexec. 

Since the test no longer uses a random directory name, the directory is
more likely to exist already. So use it even if it already exists.
Also on some Windows versions (e.g. Windos 2008) GetLongPathName() does
not return the long name if the path does not exist. So do the
conversion before appending the new directory name.

Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2020-03-26 21:53:06 +01:00 committed by Alexandre Julliard
parent e2a1f00a38
commit fd7e5741ae
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/shell32/tests/shlexec.c
View File

@ -2693,16 +2693,17 @@ static void init_test(void)
strcpy(tmpdir, "c:\\");
else
GetTempPathA(sizeof(tmpdir), tmpdir);
GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir));
/* In case of a failure it is necessary to show the path that was passed to
* ShellExecute(). That means the paths must not be randomized so as not to
* prevent the TestBot from detecting new failures.
*/
strcat(tmpdir, "wtShlexecDir");
GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir));
DeleteFileA( tmpdir );
rc = CreateDirectoryA( tmpdir, NULL );
ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() );
ok( rc || GetLastError() == ERROR_ALREADY_EXISTS,
"failed to create %s err %u\n", tmpdir, GetLastError() );
/* Set %TMPDIR% for the tests */
SetEnvironmentVariableA("TMPDIR", tmpdir);