Commit b44df3a8 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

shell32/tests: Run tests again on win95.

parent b8ad05a2
...@@ -501,6 +501,12 @@ static void test_load_save(void) ...@@ -501,6 +501,12 @@ static void test_load_save(void)
HANDLE hf; HANDLE hf;
DWORD r; DWORD r;
if (!pGetLongPathNameA)
{
skip("GetLongPathNameA is not available\n");
return;
}
/* Save an empty .lnk file */ /* Save an empty .lnk file */
memset(&desc, 0, sizeof(desc)); memset(&desc, 0, sizeof(desc));
create_lnk(lnkfile, &desc, 0); create_lnk(lnkfile, &desc, 0);
...@@ -534,7 +540,7 @@ static void test_load_save(void) ...@@ -534,7 +540,7 @@ static void test_load_save(void)
*p='\0'; *p='\0';
/* IShellLink returns path in long form */ /* IShellLink returns path in long form */
GetLongPathNameA(mypath, realpath, MAX_PATH); pGetLongPathNameA(mypath, realpath, MAX_PATH);
/* Overwrite the existing lnk file and point it to existing files */ /* Overwrite the existing lnk file and point it to existing files */
desc.description="test 2"; desc.description="test 2";
...@@ -568,11 +574,6 @@ static void test_load_save(void) ...@@ -568,11 +574,6 @@ static void test_load_save(void)
/* Create a temporary non-executable file */ /* Create a temporary non-executable file */
r=GetTempPath(sizeof(mypath), mypath); r=GetTempPath(sizeof(mypath), mypath);
ok(r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); ok(r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError());
if (!pGetLongPathNameA)
{
skip("GetLongPathNameA is not available\n");
goto cleanup;
}
r=pGetLongPathNameA(mypath, mydir, sizeof(mydir)); r=pGetLongPathNameA(mypath, mydir, sizeof(mydir));
ok(r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); ok(r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError());
p=strrchr(mydir, '\\'); p=strrchr(mydir, '\\');
...@@ -605,7 +606,6 @@ static void test_load_save(void) ...@@ -605,7 +606,6 @@ static void test_load_save(void)
* represented as a path. * represented as a path.
*/ */
cleanup:
/* DeleteFileW is not implemented on Win9x */ /* DeleteFileW is not implemented on Win9x */
r=DeleteFileA("c:\\test.lnk"); r=DeleteFileA("c:\\test.lnk");
ok(r, "failed to delete link (%d)\n", GetLastError()); ok(r, "failed to delete link (%d)\n", GetLastError());
......
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