Commit 13e609fd authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

shell32/tests: Fix test when running on Wine.

parent b3e75eea
...@@ -86,9 +86,7 @@ static LPITEMIDLIST path_to_pidl(const char* path) ...@@ -86,9 +86,7 @@ static LPITEMIDLIST path_to_pidl(const char* path)
MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len);
r=pSHILCreateFromPath(pathW, &pidl, NULL); r=pSHILCreateFromPath(pathW, &pidl, NULL);
todo_wine {
ok(SUCCEEDED(r), "SHILCreateFromPath failed (0x%08x)\n", r); ok(SUCCEEDED(r), "SHILCreateFromPath failed (0x%08x)\n", r);
}
HeapFree(GetProcessHeap(), 0, pathW); HeapFree(GetProcessHeap(), 0, pathW);
} }
return pidl; return pidl;
...@@ -170,9 +168,9 @@ static void test_get_set(void) ...@@ -170,9 +168,9 @@ static void test_get_set(void)
ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r);
ok(lstrcmpi(buffer,str)==0, "GetPath returned '%s'\n", buffer); ok(lstrcmpi(buffer,str)==0, "GetPath returned '%s'\n", buffer);
/* Get some a real path to play with */ /* Get some real path to play with */
r=GetModuleFileName(NULL, mypath, sizeof(mypath)); GetWindowsDirectoryA( mypath, sizeof(mypath)-12 );
ok(r>=0 && r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r); strcat(mypath, "\\regedit.exe");
/* Test the interaction of SetPath and SetIDList */ /* Test the interaction of SetPath and SetIDList */
tmp_pidl=NULL; tmp_pidl=NULL;
...@@ -190,9 +188,7 @@ static void test_get_set(void) ...@@ -190,9 +188,7 @@ static void test_get_set(void)
} }
pidl=path_to_pidl(mypath); pidl=path_to_pidl(mypath);
todo_wine {
ok(pidl!=NULL, "path_to_pidl returned a NULL pidl\n"); ok(pidl!=NULL, "path_to_pidl returned a NULL pidl\n");
}
if (pidl) if (pidl)
{ {
...@@ -211,7 +207,9 @@ static void test_get_set(void) ...@@ -211,7 +207,9 @@ static void test_get_set(void)
strcpy(buffer,"garbage"); strcpy(buffer,"garbage");
r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH);
ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r);
todo_wine
ok(lstrcmpi(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); ok(lstrcmpi(buffer, mypath)==0, "GetPath returned '%s'\n", buffer);
} }
/* test path with quotes (Win98 IShellLinkA_SetPath returns S_FALSE, WinXP returns S_OK) */ /* test path with quotes (Win98 IShellLinkA_SetPath returns S_FALSE, WinXP returns S_OK) */
......
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