Commit 9cbe48f8 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard

Fix a test failing on Windows. Reported by Katerina Nizhnik.

parent 160b9149
......@@ -827,13 +827,13 @@ static void testNonExistentPath(void)
modifiedPath[len++] = '\0';
if (winetest_interactive)
printf("Changing CSIDL_FAVORITES to %s\n", modifiedPath);
if (!RegSetValueExA(key, "Favorites", 0, type, (LPBYTE) modifiedPath, len))
if (!RegSetValueExA(key, "Favorites", 0, type, (LPBYTE)modifiedPath, len))
{
char buffer[MAX_PATH];
STARTUPINFOA startup;
PROCESS_INFORMATION info;
HRESULT hr;
BOOL ret;
SHFILEOPSTRUCTA shFileOp;
wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 1",
selfname);
......@@ -869,8 +869,16 @@ static void testNonExistentPath(void)
ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0,
"child process termination\n");
ret = RemoveDirectoryA(modifiedPath);
ok( ret, "RemoveDirectoryA failed: %ld\n", GetLastError());
/* Remove the directory. In some Windows versions, it
* contains the system file desktop.ini, so use SHFileOperation
* to remove it and its contents.
*/
shFileOp.hwnd = NULL;
shFileOp.wFunc = FO_DELETE;
shFileOp.pFrom = modifiedPath;
shFileOp.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI |
FOF_SILENT;
SHFileOperationA(&shFileOp);
}
}
else if (winetest_interactive)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment