ChangeSet ID: 21182 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/09 04:30:15 Modified files: dlls/shell32/tests: shlfolder.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Disable code that segfaults on Win98 SE. Patch: http://cvs.winehq.org/patch.py?id=21182 Old revision New revision Changes Path 1.42 1.43 +6 -0 wine/dlls/shell32/tests/shlfolder.c Index: wine/dlls/shell32/tests/shlfolder.c diff -u -p wine/dlls/shell32/tests/shlfolder.c:1.42 wine/dlls/shell32/tests/shlfolder.c:1.43 --- wine/dlls/shell32/tests/shlfolder.c:1.42 9 Nov 2005 10:30:15 -0000 +++ wine/dlls/shell32/tests/shlfolder.c 9 Nov 2005 10:30:15 -0000 @@ -267,8 +267,11 @@ static void test_BindToObject(void) hr = IShellFolder_BindToObject(psfMyComputer, pidlEmpty, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with empty pidl! hr = %08lx\n", hr); +#if 0 + /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfMyComputer, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "MyComputers's BindToObject should fail, when called with NULL pidl! hr = %08lx\n", hr); +#endif cChars = GetSystemDirectoryA(szSystemDir, MAX_PATH); ok (cChars > 0 && cChars < MAX_PATH, "GetSystemDirectoryA failed! LastError: %08lx\n", GetLastError()); @@ -295,9 +298,12 @@ static void test_BindToObject(void) ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with empty pidl! hr = %08lx\n", hr); +#if 0 + /* this call segfaults on 98SE */ hr = IShellFolder_BindToObject(psfSystemDir, NULL, NULL, &IID_IShellFolder, (LPVOID*)&psfChild); ok (hr == E_INVALIDARG, "FileSystem ShellFolder's BindToObject should fail, when called with NULL pidl! hr = %08lx\n", hr); +#endif IShellFolder_Release(psfSystemDir); }