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

shell32/tests: Fix the tests when run from the top directory.

This commit is contained in:
Huw Davies 2014-05-15 10:27:11 +01:00 committed by Alexandre Julliard
parent 04af7227da
commit d87aa43ce5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/shell32/tests/shlfolder.c
View File

@ -533,12 +533,13 @@ if (0)
IShellFolder_Release(psfSystemDir);
GetCurrentDirectoryA(MAX_PATH, buf);
if(!lstrlenA(buf))
cChars = GetCurrentDirectoryA(MAX_PATH, buf);
if(!cChars)
{
skip("Failed to get current directory, skipping tests.\n");
return;
}
if(buf[cChars-1] != '\\') lstrcatA(buf, "\\");
SHGetDesktopFolder(&psfDesktop);
@ -546,7 +547,6 @@ if (0)
/* .html */
lstrcpyA(pathA, buf);
lstrcatA(pathA, "\\");
lstrcatA(pathA, filename_html);
hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
if(hfile != INVALID_HANDLE_VALUE)
@ -590,7 +590,6 @@ if (0)
/* .txt */
lstrcpyA(pathA, buf);
lstrcatA(pathA, "\\");
lstrcatA(pathA, filename_txt);
hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
if(hfile != INVALID_HANDLE_VALUE)
@ -604,6 +603,7 @@ if (0)
hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild);
ok(hr == E_FAIL || /* Vista+ */
hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */
hr == E_INVALIDARG || /* W2K item in top dir */
broken(hr == S_OK), /* Win9x, NT4, W2K */
"Got 0x%08x\n", hr);
if(SUCCEEDED(hr)) IShellFolder_Release(psfChild);
@ -616,7 +616,6 @@ if (0)
/* .foo */
lstrcpyA(pathA, buf);
lstrcatA(pathA, "\\");
lstrcatA(pathA, filename_foo);
hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
if(hfile != INVALID_HANDLE_VALUE)
@ -630,6 +629,7 @@ if (0)
hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild);
ok(hr == E_FAIL || /* Vista+ */
hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */
hr == E_INVALIDARG || /* W2K item in top dir */
broken(hr == S_OK), /* Win9x, NT4, W2K */
"Got 0x%08x\n", hr);
if(SUCCEEDED(hr)) IShellFolder_Release(psfChild);