December 2007 - Wine-commits

Francois Gouget : shell32/tests: Use GetProcAddress() on Shell_NotifyIconW( ) because it is missing on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 46735ae431f2657c20301d51c59e335516d37d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46735ae431f2657c20301d51c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:01:14 2007 +0100 shell32/tests: Use GetProcAddress() on Shell_NotifyIconW() because it is missing on Windows 95. --- dlls/shell32/tests/systray.c | 45 +++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 9c97a4e..35a59ad 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -26,30 +26,35 @@ static HWND hMainWnd; +static BOOL (WINAPI *pShell_NotifyIconW)(DWORD,PNOTIFYICONDATAW); void test_cbsize(void) { - NOTIFYICONDATAW nidW; NOTIFYICONDATAA nidA; - ZeroMemory(&nidW, sizeof(nidW)); - nidW.cbSize = NOTIFYICONDATAW_V1_SIZE; - nidW.hWnd = hMainWnd; - nidW.uID = 1; - nidW.uFlags = NIF_ICON|NIF_MESSAGE; - nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION); - nidW.uCallbackMessage = WM_USER+17; - ok(Shell_NotifyIconW(NIM_ADD, &nidW), "NIM_ADD failed!\n"); + if (pShell_NotifyIconW) + { + NOTIFYICONDATAW nidW; - /* using an invalid cbSize does work */ - nidW.cbSize = 3; - nidW.hWnd = hMainWnd; - nidW.uID = 1; - ok(Shell_NotifyIconW(NIM_DELETE, &nidW), "NIM_DELETE failed!\n"); - /* as icon doesn't exist anymore - now there will be an error */ - nidW.cbSize = sizeof(nidW); - /* wine currently doesn't return error code put prints an ERR(...) */ - todo_wine ok(!Shell_NotifyIconW(NIM_DELETE, &nidW), "The icon was not deleted\n"); + ZeroMemory(&nidW, sizeof(nidW)); + nidW.cbSize = NOTIFYICONDATAW_V1_SIZE; + nidW.hWnd = hMainWnd; + nidW.uID = 1; + nidW.uFlags = NIF_ICON|NIF_MESSAGE; + nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION); + nidW.uCallbackMessage = WM_USER+17; + ok(pShell_NotifyIconW(NIM_ADD, &nidW), "NIM_ADD failed!\n"); + + /* using an invalid cbSize does work */ + nidW.cbSize = 3; + nidW.hWnd = hMainWnd; + nidW.uID = 1; + ok(pShell_NotifyIconW(NIM_DELETE, &nidW), "NIM_DELETE failed!\n"); + /* as icon doesn't exist anymore - now there will be an error */ + nidW.cbSize = sizeof(nidW); + /* wine currently doesn't return error code put prints an ERR(...) */ + todo_wine ok(!pShell_NotifyIconW(NIM_DELETE, &nidW), "The icon was not deleted\n"); + } /* same for Shell_NotifyIconA */ ZeroMemory(&nidA, sizeof(nidA)); @@ -77,6 +82,10 @@ START_TEST(systray) WNDCLASSA wc; MSG msg; RECT rc; + HMODULE hdll; + + hdll = GetModuleHandleA("shell32.dll"); + pShell_NotifyIconW = (void*)GetProcAddress(hdll, "Shell_NotifyIconW"); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0;

1 0

Francois Gouget : shell32/tests: Use GetProcAddress() on SHFileOperationW() because it is missing on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: ca3606f3934c9101678a916805ecefbeab3d1cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3606f3934c9101678a91680… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:01:24 2007 +0100 shell32/tests: Use GetProcAddress() on SHFileOperationW() because it is missing on Windows 95. --- dlls/shell32/tests/shlfileop.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index c310e09..247ab76 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -40,6 +40,7 @@ static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00c4,'\0','\0'}; static HMODULE hshell32; static int (WINAPI *pSHCreateDirectoryExA)(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); static int (WINAPI *pSHCreateDirectoryExW)(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); +static int (WINAPI *pSHFileOperationW)(LPSHFILEOPSTRUCTW); static int (WINAPI *pSHPathPrepareForWriteA)(HWND, IUnknown*, LPCSTR, DWORD); static int (WINAPI *pSHPathPrepareForWriteW)(HWND, IUnknown*, LPCWSTR, DWORD); @@ -48,6 +49,7 @@ static void InitFunctionPointers(void) hshell32 = GetModuleHandleA("shell32.dll"); pSHCreateDirectoryExA = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExA"); pSHCreateDirectoryExW = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExW"); + pSHFileOperationW = (void*)GetProcAddress(hshell32, "SHFileOperationW"); pSHPathPrepareForWriteA = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteA"); pSHPathPrepareForWriteW = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteW"); } @@ -1119,6 +1121,12 @@ static void test_unicode(void) int ret; HANDLE file; + if (!pSHFileOperationW) + { + skip("SHFileOperationW() is missing\n"); + return; + } + shfoW.hwnd = NULL; shfoW.wFunc = FO_DELETE; shfoW.pFrom = UNICODE_PATH; @@ -1143,7 +1151,7 @@ static void test_unicode(void) /* Try to delete a file with unicode filename */ ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); - ret = SHFileOperationW(&shfoW); + ret = pSHFileOperationW(&shfoW); ok(!ret, "File is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); @@ -1151,7 +1159,7 @@ static void test_unicode(void) createTestFileW(UNICODE_PATH); shfoW.fFlags |= FOF_ALLOWUNDO; ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); - ret = SHFileOperationW(&shfoW); + ret = pSHFileOperationW(&shfoW); ok(!ret, "File is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); @@ -1166,7 +1174,7 @@ static void test_unicode(void) ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); ok(file_existsW(UNICODE_PATH), "The directory is not created\n"); shfoW.fFlags &= ~FOF_ALLOWUNDO; - ret = SHFileOperationW(&shfoW); + ret = pSHFileOperationW(&shfoW); ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); @@ -1175,7 +1183,7 @@ static void test_unicode(void) ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); ok(file_existsW(UNICODE_PATH), "The directory was not created\n"); shfoW.fFlags |= FOF_ALLOWUNDO; - ret = SHFileOperationW(&shfoW); + ret = pSHFileOperationW(&shfoW); ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); }

1 0

Francois Gouget : oleaut32/tests: Avoid SHDeleteKeyW() because shlwapi. dll is missing on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 745bd4f233e84e45fc16a97f7eef37f80d6b5e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=745bd4f233e84e45fc16a97f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:01:39 2007 +0100 oleaut32/tests: Avoid SHDeleteKeyW() because shlwapi.dll is missing on Windows 95. --- dlls/oleaut32/tests/Makefile.in | 2 +- dlls/oleaut32/tests/typelib.c | 66 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in index d0f025d..49b8706 100644 --- a/dlls/oleaut32/tests/Makefile.in +++ b/dlls/oleaut32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = oleaut32.dll -IMPORTS = oleaut32 ole32 shlwapi rpcrt4 user32 gdi32 advapi32 kernel32 +IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid -luser32 CTESTS = \ diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e022b82..a30b275 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -513,6 +513,70 @@ static void test_TypeInfo(void) ITypeLib_Release(pTypeLib); } +/* RegDeleteTreeW from dlls/advapi32/registry.c */ +static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) return ret; + } + + ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(WCHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = myRegDeleteTreeW(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyW(hKey, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueW(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueW(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + if (lpszName != szNameBuf) + HeapFree(GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL remove) { static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; @@ -527,7 +591,7 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL if (remove) { - ok(SHDeleteKeyW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); + ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); return TRUE; }

1 0

Francois Gouget : dinput: Make _dump_cooperativelevel_DI() and _dump_EnumDevices_dwFlags() more self-contained.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 96d6a25fa1120e2dc3670c3c8cbf15aade83df7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d6a25fa1120e2dc3670c3c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:01:51 2007 +0100 dinput: Make _dump_cooperativelevel_DI() and _dump_EnumDevices_dwFlags() more self-contained. --- dlls/dinput/device.c | 2 +- dlls/dinput/dinput_main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d1e6ac8..43cd946 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -59,6 +59,7 @@ void _dump_cooperativelevel_DI(DWORD dwFlags) { FE(DISCL_NOWINKEY) #undef FE }; + TRACE(" cooperative level : "); for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) if (flags[i].mask & dwFlags) TRACE("%s ",flags[i].name); @@ -675,7 +676,6 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags); - TRACE(" cooperative level : "); _dump_cooperativelevel_DI(dwflags); if ((dwflags & (DISCL_EXCLUSIVE | DISCL_NONEXCLUSIVE)) == 0 || diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c3d41fd..fc3c90a 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -198,6 +198,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { FE(DIEDFL_INCLUDEPHANTOMS) #undef FE }; + TRACE(" flags: "); if (dwFlags == 0) { TRACE("DIEDFL_ALLDEVICES"); return; @@ -206,6 +207,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { if (flags[i].mask & dwFlags) TRACE("%s ",flags[i].name); } + TRACE("\n"); } /****************************************************************************** @@ -222,7 +224,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); - TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n"); + _dump_EnumDevices_dwFlags(dwFlags); for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceA) continue; @@ -252,7 +254,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); - TRACE(" flags: "); _dump_EnumDevices_dwFlags(dwFlags); TRACE("\n"); + _dump_EnumDevices_dwFlags(dwFlags); for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceW) continue;

1 0

Peter Beutner : d3d9: Add stub for Direct3DShaderValidatorCreate9().
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: b4a0d47809a117a8a52795d47ede8018009e1a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a0d47809a117a8a52795d47… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Tue Dec 18 10:44:18 2007 +0100 d3d9: Add stub for Direct3DShaderValidatorCreate9(). --- dlls/d3d9/d3d9.spec | 1 + dlls/d3d9/d3d9_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/d3d9.spec b/dlls/d3d9/d3d9.spec index 949f03f..a9232fc 100644 --- a/dlls/d3d9/d3d9.spec +++ b/dlls/d3d9/d3d9.spec @@ -1,6 +1,7 @@ @ stdcall D3D9GetSWInfo() @ stdcall DebugSetMute() @ stdcall Direct3DCreate9(long) +@ stdcall Direct3DShaderValidatorCreate9() @ stdcall D3DPERF_BeginEvent(long wstr) @ stdcall D3DPERF_EndEvent() @ stdcall D3DPERF_GetStatus() diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index ba4da66..38f1c8c 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -61,6 +61,18 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { return (IDirect3D9*) object; } +/******************************************************************* + * Direct3DShaderValidatorCreate9 (D3D9.@) + * + * No documentation available for this function. + * SDK only says it is internal and shouldn't be used. + */ +void* WINAPI Direct3DShaderValidatorCreate9(void) +{ + FIXME("stub\n"); + return NULL; +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) {

1 0

Stefan Dösinger : d3d9: Remove a few more incorrect D3DLOCK_DISCARDs.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 110facbac4cbbce6d7bcb9985d596aa8c2a959a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110facbac4cbbce6d7bcb9985… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 8 22:31:50 2007 +0100 d3d9: Remove a few more incorrect D3DLOCK_DISCARDs. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5d9ec8a..7118b19 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -873,7 +873,7 @@ static void test_cube_wrap(IDirect3DDevice9 *device) D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, NULL); ok(SUCCEEDED(hr), "CreateOffscreenPlainSurface failed (0x%08x)\n", hr); - hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); for (y = 0; y < 128; ++y) @@ -1378,7 +1378,7 @@ static void texbem_test(IDirect3DDevice9 *device) D3DPOOL_MANAGED, &texture[i], NULL); ok(SUCCEEDED(hr), "CreateTexture failed (0x%08x)\n", hr); - hr = IDirect3DTexture9_LockRect(texture[i], 0, &locked_rect, NULL, D3DLOCK_DISCARD); + hr = IDirect3DTexture9_LockRect(texture[i], 0, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); for (y = 0; y < 128; ++y) {

1 0

Stefan Dösinger : d3d9: Add a note about a breakage in the refrast.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: de6aba11d4d647cbc82320d8b3aef22551173aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6aba11d4d647cbc82320d8b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 8 22:34:45 2007 +0100 d3d9: Add a note about a breakage in the refrast. --- dlls/d3d9/tests/visual.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7118b19..125c535 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4968,7 +4968,15 @@ void test_vshader_input(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); color = getPixelColor(device, 480, 360); - /* vs_1_1 may fail, accept the clear color */ + /* vs_1_1 may fail, accept the clear color + * + * NOTE: This test fails on the reference rasterizer. In the refrast, the 4 vertices have different colors, + * i.e., the whole old stream is read, and not just the last used attribute. Some games require that this + * does *not* happen, otherwise they can crash because of a read from a bad pointer, so do not accept the + * refrast's result. + * + * A test app for this behavior is Half Life 2 Episode 2 in dxlevel 95, and related games(Portal, TF2). + */ ok(color == 0x000000FF || color == 0x00808080, "Input test: Quad 2(different colors) returned color 0x%08x, expected 0x000000FF\n", color); color = getPixelColor(device, 160, 120);

1 0

Francois Gouget : shell32/tests: Copy the PathRemoveBackslashA() and PathAddBackslashW() implementations because shlwapi. dll is missing on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 3874c55cc4a36e6f2fb705b6172b6e6fa81ff749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3874c55cc4a36e6f2fb705b61… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:00:47 2007 +0100 shell32/tests: Copy the PathRemoveBackslashA() and PathAddBackslashW() implementations because shlwapi.dll is missing on Windows 95. --- dlls/shell32/tests/Makefile.in | 2 +- dlls/shell32/tests/shellpath.c | 31 ++++++++++++++++++++++++++----- dlls/shell32/tests/shlfolder.c | 30 +++++++++++++++++++++++++----- 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index cd15eb3..364bb3d 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shell32.dll -IMPORTS = shell32 ole32 oleaut32 shlwapi user32 advapi32 kernel32 +IMPORTS = shell32 ole32 oleaut32 user32 advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 8c237df..6fb485e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -642,6 +642,27 @@ static void testEnvVars(void) matchSpecialFolderPathToEnv(CSIDL_SYSTEM, "winsysdir"); } +/* Loosely based on PathRemoveBackslashA from dlls/shlwapi/path.c */ +static BOOL myPathIsRootA(LPCSTR lpszPath) +{ + if (lpszPath && *lpszPath && + lpszPath[1] == ':' && lpszPath[2] == '\\' && lpszPath[3] == '\0') + return TRUE; /* X:\ */ + return FALSE; +} +static LPSTR myPathRemoveBackslashA( LPSTR lpszPath ) +{ + LPSTR szTemp = NULL; + + if(lpszPath) + { + szTemp = CharPrevA(lpszPath, lpszPath + strlen(lpszPath)); + if (!myPathIsRootA(lpszPath) && *szTemp == '\\') + *szTemp = '\0'; + } + return szTemp; +} + /* Verifies the shell path for CSIDL_WINDOWS matches the return from * GetWindowsDirectory. If SHGetSpecialFolderPath fails, no harm, no foul--not * every shell32 version supports CSIDL_WINDOWS. @@ -654,9 +675,9 @@ static void testWinDir(void) if (pSHGetSpecialFolderPathA(NULL, windowsShellPath, CSIDL_WINDOWS, FALSE)) { - PathRemoveBackslashA(windowsShellPath); + myPathRemoveBackslashA(windowsShellPath); GetWindowsDirectoryA(windowsDir, sizeof(windowsDir)); - PathRemoveBackslashA(windowsDir); + myPathRemoveBackslashA(windowsDir); ok(!lstrcmpiA(windowsDir, windowsShellPath), "GetWindowsDirectory does not match SHGetSpecialFolderPath:\n" "GetWindowsDirectory returns %s\nSHGetSpecialFolderPath returns %s\n", @@ -675,10 +696,10 @@ static void testSystemDir(void) if (!pSHGetSpecialFolderPathA) return; GetSystemDirectoryA(systemDir, sizeof(systemDir)); - PathRemoveBackslashA(systemDir); + myPathRemoveBackslashA(systemDir); if (pSHGetSpecialFolderPathA(NULL, systemShellPath, CSIDL_SYSTEM, FALSE)) { - PathRemoveBackslashA(systemShellPath); + myPathRemoveBackslashA(systemShellPath); ok(!lstrcmpiA(systemDir, systemShellPath), "GetSystemDirectory does not match SHGetSpecialFolderPath:\n" "GetSystemDirectory returns %s\nSHGetSpecialFolderPath returns %s\n", @@ -689,7 +710,7 @@ static void testSystemDir(void) */ if (pSHGetSpecialFolderPathA(NULL, systemShellPath, CSIDL_SYSTEMX86, FALSE)) { - PathRemoveBackslashA(systemShellPath); + myPathRemoveBackslashA(systemShellPath); ok(!lstrcmpiA(systemDir, systemShellPath), "GetSystemDirectory does not match SHGetSpecialFolderPath:\n" "GetSystemDirectory returns %s\nSHGetSpecialFolderPath returns %s\n", diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0cf398a..721b9da 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -324,7 +324,27 @@ static void test_BindToObject(void) IShellFolder_Release(psfSystemDir); } - + +/* Based on PathAddBackslashW from dlls/shlwapi/path.c */ +static LPWSTR myPathAddBackslashW( LPWSTR lpszPath ) +{ + size_t iLen; + + if (!lpszPath || (iLen = lstrlenW(lpszPath)) >= MAX_PATH) + return NULL; + + if (iLen) + { + lpszPath += iLen; + if (lpszPath[-1] != '\\') + { + *lpszPath++ = '\\'; + *lpszPath = '\0'; + } + } + return lpszPath; +} + static void test_GetDisplayName(void) { BOOL result; @@ -357,7 +377,7 @@ static void test_GetDisplayName(void) ok(result, "SHGetSpecialFolderPathW failed! Last error: %u\n", GetLastError()); if (!result) return; - PathAddBackslashW(wszTestDir); + myPathAddBackslashW(wszTestDir); lstrcatW(wszTestDir, wszDirName); /* Use ANSI file functions so this works on Windows 9x */ WideCharToMultiByte(CP_ACP, 0, wszTestDir, -1, szTestDir, MAX_PATH, 0, 0); @@ -370,7 +390,7 @@ static void test_GetDisplayName(void) } lstrcpyW(wszTestFile, wszTestDir); - PathAddBackslashW(wszTestFile); + myPathAddBackslashW(wszTestFile); lstrcatW(wszTestFile, wszFileName); WideCharToMultiByte(CP_ACP, 0, wszTestFile, -1, szTestFile, MAX_PATH, 0, 0); @@ -824,7 +844,7 @@ static void test_SHGetPathFromIDList(void) IShellFolder_Release(psfDesktop); return; } - PathAddBackslashW(wszFileName); + myPathAddBackslashW(wszFileName); lstrcatW(wszFileName, wszTestFile); hTestFile = CreateFileW(wszFileName, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); ok(hTestFile != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: %u\n", GetLastError()); @@ -1153,7 +1173,7 @@ static void test_FolderShortcut(void) { /* Next few lines are meant to show that children of FolderShortcuts are not FolderShortcuts, * but ShellFSFolders. */ - PathAddBackslashW(wszDesktopPath); + myPathAddBackslashW(wszDesktopPath); lstrcatW(wszDesktopPath, wszSomeSubFolder); if (!CreateDirectoryW(wszDesktopPath, NULL)) { IShellFolder_Release(pShellFolder);

1 0

Francois Gouget : shell32/tests: Use GetProcAddress() on SHGetPathFromIDListW() because it is missing on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: d22568d094d1ca82632f22216743a5cf728eeb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22568d094d1ca82632f22216… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:01:05 2007 +0100 shell32/tests: Use GetProcAddress() on SHGetPathFromIDListW() because it is missing on Windows 95. --- dlls/shell32/tests/shlfolder.c | 47 +++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 721b9da..59e032e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -43,6 +43,7 @@ static IMalloc *ppM; static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*); +static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); @@ -56,6 +57,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHBindToParent = (void*)GetProcAddress(hmod, "SHBindToParent"); + pSHGetPathFromIDListW = (void*)GetProcAddress(hmod, "SHGetPathFromIDListW"); pSHGetSpecialFolderPathW = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathW"); pILFindLastID = (void *)GetProcAddress(hmod, (LPCSTR)16); pILFree = (void*)GetProcAddress(hmod, (LPSTR)155); @@ -363,10 +365,10 @@ static void test_GetDisplayName(void) static const WCHAR wszDirName[] = { 'w','i','n','e','t','e','s','t',0 }; /* I'm trying to figure if there is a functional difference between calling - * SHGetPathFromIDList and calling GetDisplayNameOf(SHGDN_FORPARSING) after + * SHGetPathFromIDListW and calling GetDisplayNameOf(SHGDN_FORPARSING) after * binding to the shellfolder. One thing I thought of was that perhaps - * SHGetPathFromIDList would be able to get the path to a file, which does - * not exist anymore, while the other method would'nt. It turns out there's + * SHGetPathFromIDListW would be able to get the path to a file, which does + * not exist anymore, while the other method wouldn't. It turns out there's * no functional difference in this respect. */ @@ -461,9 +463,12 @@ static void test_GetDisplayName(void) RemoveDirectoryA(szTestDir); /* SHGetPathFromIDListW still works, although the file is not present anymore. */ - result = SHGetPathFromIDListW(pidlTestFile, wszTestFile2); - ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); - ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); + if (pSHGetPathFromIDListW) + { + result = pSHGetPathFromIDListW(pidlTestFile, wszTestFile2); + ok (result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); + ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n"); + } if(!pSHBindToParent) return; @@ -793,26 +798,30 @@ static void test_SHGetPathFromIDList(void) HMODULE hShell32; LPITEMIDLIST pidlPrograms; - if(!pSHGetSpecialFolderPathW) return; + if(!pSHGetPathFromIDListW || !pSHGetSpecialFolderPathW) + { + skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); + return; + } - /* Calling SHGetPathFromIDList with no pidl should return the empty string */ + /* Calling SHGetPathFromIDListW with no pidl should return the empty string */ wszPath[0] = 'a'; wszPath[1] = '\0'; - result = SHGetPathFromIDListW(NULL, wszPath); + result = pSHGetPathFromIDListW(NULL, wszPath); ok(!result, "Expected failure\n"); ok(!wszPath[0], "Expected empty string\n"); - /* Calling SHGetPathFromIDList with an empty pidl should return the desktop folder's path. */ + /* Calling SHGetPathFromIDListW with an empty pidl should return the desktop folder's path. */ result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; - result = SHGetPathFromIDListW(pidlEmpty, wszPath); + result = pSHGetPathFromIDListW(pidlEmpty, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return; - ok(!lstrcmpiW(wszDesktop, wszPath), "SHGetPathFromIDList didn't return desktop path for empty pidl!\n"); + ok(!lstrcmpiW(wszDesktop, wszPath), "SHGetPathFromIDListW didn't return desktop path for empty pidl!\n"); - /* MyComputer does not map to a filesystem path. SHGetPathFromIDList should fail. */ + /* MyComputer does not map to a filesystem path. SHGetPathFromIDListW should fail. */ hr = SHGetDesktopFolder(&psfDesktop); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08x\n", hr); if (FAILED(hr)) return; @@ -827,9 +836,9 @@ static void test_SHGetPathFromIDList(void) SetLastError(0xdeadbeef); wszPath[0] = 'a'; wszPath[1] = '\0'; - result = SHGetPathFromIDListW(pidlMyComputer, wszPath); - ok (!result, "SHGetPathFromIDList succeeded where it shouldn't!\n"); - ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDList shouldn't set last error! Last error: %u\n", GetLastError()); + result = pSHGetPathFromIDListW(pidlMyComputer, wszPath); + ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n"); + ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDListW shouldn't set last error! Last error: %u\n", GetLastError()); ok (!wszPath[0], "Expected empty path\n"); if (result) { IShellFolder_Release(psfDesktop); @@ -881,7 +890,7 @@ static void test_SHGetPathFromIDList(void) "returned incorrect path for file placed on desktop\n"); } - result = SHGetPathFromIDListW(pidlTestFile, wszPath); + result = pSHGetPathFromIDListW(pidlTestFile, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); IMalloc_Free(ppM, pidlTestFile); if (!result) return; @@ -896,9 +905,9 @@ static void test_SHGetPathFromIDList(void) ok(SUCCEEDED(hr), "SHGetFolderLocation failed: 0x%08x\n", hr); SetLastError(0xdeadbeef); - result = SHGetPathFromIDListW(pidlPrograms, wszPath); + result = pSHGetPathFromIDListW(pidlPrograms, wszPath); IMalloc_Free(ppM, pidlPrograms); - ok(result, "SHGetPathFromIDList failed\n"); + ok(result, "SHGetPathFromIDListW failed\n"); } static void test_EnumObjects_and_CompareIDs(void)

1 0

Francois Gouget : shell32/tests: Avoid SHDeleteKeyA() because shlwapi. dll is missing on Windows 95.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 000fd0edc5505a3a393a1ca5352a2c141fbb80a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000fd0edc5505a3a393a1ca53… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 18 10:00:31 2007 +0100 shell32/tests: Avoid SHDeleteKeyA() because shlwapi.dll is missing on Windows 95. --- dlls/shell32/tests/shlexec.c | 71 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 66b9406..4b1bf1b 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -224,13 +224,80 @@ static void create_test_association(const char* extension) CloseHandle(hkey_shell); } +/* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ +static LSTATUS myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + CHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) return ret; + } + + /* Get highest length for keys, values */ + ret = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(CHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(CHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = myRegDeleteTreeA(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyA(hKey, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueA(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueA(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + /* Free buffer if allocated */ + if (lpszName != szNameBuf) + HeapFree( GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + static void delete_test_association(const char* extension) { char class[MAX_PATH]; sprintf(class, "shlexec%s", extension); - SHDeleteKey(HKEY_CLASSES_ROOT, class); - SHDeleteKey(HKEY_CLASSES_ROOT, extension); + myRegDeleteTreeA(HKEY_CLASSES_ROOT, class); + myRegDeleteTreeA(HKEY_CLASSES_ROOT, extension); } static void create_test_verb_dde(const char* extension, const char* verb,

1 0