Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[akhaldi] 57862: [ADVPACK_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 10 14:29:16 2012 New Revision: 57862 URL: http://svn.reactos.org/svn/reactos?rev=57862&view=rev Log: [ADVPACK_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/advpack/CMakeLists.txt trunk/rostests/winetests/advpack/files.c trunk/rostests/winetests/advpack/install.c Modified: trunk/rostests/winetests/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/CMakeLi… ============================================================================== --- trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] Mon Dec 10 14:29:16 2012 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE advpack.c @@ -10,9 +8,7 @@ testlist.c) add_executable(advpack_winetest ${SOURCE}) - target_link_libraries(advpack_winetest wine) - set_module_type(advpack_winetest win32cui) -add_importlibs(advpack_winetest cabinet advapi32 msvcrt kernel32 ntdll) +add_importlibs(advpack_winetest advpack cabinet advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET advpack_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… ============================================================================== --- trunk/rostests/winetests/advpack/files.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/files.c [iso-8859-1] Mon Dec 10 14:29:16 2012 @@ -32,6 +32,7 @@ static HMODULE hAdvPack; static HRESULT (WINAPI *pAddDelBackupEntry)(LPCSTR, LPCSTR, LPCSTR, DWORD); static HRESULT (WINAPI *pExtractFiles)(LPCSTR, LPCSTR, DWORD, LPCSTR, LPVOID, DWORD); +static HRESULT (WINAPI *pExtractFilesW)(const WCHAR*,const WCHAR*,DWORD,const WCHAR*,void*,DWORD); static HRESULT (WINAPI *pAdvInstallFile)(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,DWORD,DWORD); static CHAR CURR_DIR[MAX_PATH]; @@ -44,6 +45,7 @@ { pAddDelBackupEntry = (void *)GetProcAddress(hAdvPack, "AddDelBackupEntry"); pExtractFiles = (void *)GetProcAddress(hAdvPack, "ExtractFiles"); + pExtractFilesW = (void *)GetProcAddress(hAdvPack, "ExtractFilesW"); pAdvInstallFile = (void*)GetProcAddress(hAdvPack, "AdvInstallFile"); } } @@ -468,13 +470,29 @@ ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); + + if(pExtractFilesW) { + static const WCHAR extract_cabW[] = {'e','x','t','r','a','c','t','.','c','a','b',0}; + static const WCHAR destW[] = {'d','e','s','t',0}; + static const WCHAR file_listW[] = + {'a','.','t','x','t',':','t','e','s','t','d','i','r','\\','c','.','t','x','t',0}; + + hr = pExtractFilesW(extract_cabW, destW, 0, file_listW, NULL, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + }else { + win_skip("ExtractFilesW not available\n"); + } } static void test_AdvInstallFile(void) { HRESULT hr; HMODULE hmod; - char CURR_DIR[MAX_PATH]; char destFolder[MAX_PATH]; hmod = LoadLibrary("setupapi.dll"); @@ -485,8 +503,6 @@ } FreeLibrary(hmod); - - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); lstrcpyA(destFolder, CURR_DIR); lstrcatA(destFolder, "\\"); Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install… ============================================================================== --- trunk/rostests/winetests/advpack/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/install.c [iso-8859-1] Mon Dec 10 14:29:16 2012 @@ -259,6 +259,12 @@ if (!init_function_pointers()) return; + if (!IsNTAdmin(0, NULL)) + { + skip("Most tests need admin rights\n"); + return; + } + GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPath(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path);

11 years, 9 months

[akhaldi] 57861: [ADVPACK]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 10 14:28:25 2012 New Revision: 57861 URL: http://svn.reactos.org/svn/reactos?rev=57861&view=rev Log: [ADVPACK]: Sync with Wine 1.5.19. Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt trunk/reactos/dll/win32/advpack/advpack_private.h trunk/reactos/dll/win32/advpack/files.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Mon Dec 10 14:28:25 2012 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(advpack.dll advpack.spec) +spec2def(advpack.dll advpack.spec ADD_IMPORTLIB) list(APPEND SOURCE advpack.c Modified: trunk/reactos/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/advpack_private.h [iso-8859-1] Mon Dec 10 14:28:25 2012 @@ -27,4 +27,28 @@ HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline char *heap_strdupWtoA(const WCHAR *str) +{ + char *ret = NULL; + + if(str) { + size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc(size); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + } + + return ret; +} + #endif /* __ADVPACK_PRIVATE_H */ Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Mon Dec 10 14:28:25 2012 @@ -779,11 +779,39 @@ HRESULT WINAPI ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir, DWORD Flags, LPCWSTR FileList, LPVOID LReserved, DWORD Reserved) { - - FIXME("(%s, %s, %d, %s, %p, %d) stub!\n", debugstr_w(CabName), debugstr_w(ExpandDir), + char *cab_name = NULL, *expand_dir = NULL, *file_list = NULL; + HRESULT hres = S_OK; + + TRACE("(%s, %s, %d, %s, %p, %d)\n", debugstr_w(CabName), debugstr_w(ExpandDir), Flags, debugstr_w(FileList), LReserved, Reserved); - return E_FAIL; + if(CabName) { + cab_name = heap_strdupWtoA(CabName); + if(!cab_name) + return E_OUTOFMEMORY; + } + + if(ExpandDir) { + expand_dir = heap_strdupWtoA(ExpandDir); + if(!expand_dir) + hres = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hres) && FileList) { + file_list = heap_strdupWtoA(FileList); + if(!file_list) + hres = E_OUTOFMEMORY; + } + + /* cabinet.dll, which does the real job of extracting files, doesn't have UNICODE API, + so we need W->A conversion at some point anyway. */ + if(SUCCEEDED(hres)) + hres = ExtractFilesA(cab_name, expand_dir, Flags, file_list, LReserved, Reserved); + + heap_free(cab_name); + heap_free(expand_dir); + heap_free(file_list); + return hres; } /*********************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Dec 10 14:28:25 2012 @@ -39,7 +39,7 @@ reactos/dll/directx/quartz # Autosync reactos/dll/win32/activeds # Synced to Wine-1.1.43? reactos/dll/win32/actxprxy # Synced to Wine-1.3.29? -reactos/dll/win32/advpack # Synced to Wine-1.5.4 +reactos/dll/win32/advpack # Synced to Wine-1.5.19 reactos/dll/win32/atl # Synced to Wine-1.3.37 reactos/dll/win32/avifil32 # Synced to Wine-1.3.37 reactos/dll/win32/bcrypt # Synced to Wine-1.5.4

11 years, 9 months

[janderwald] 57860: [USBCCGP] - Fix bug in the debugging code CORE-6574

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Dec 10 08:50:21 2012 New Revision: 57860 URL: http://svn.reactos.org/svn/reactos?rev=57860&view=rev Log: [USBCCGP] - Fix bug in the debugging code CORE-6574 Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Mon Dec 10 08:50:21 2012 @@ -282,7 +282,7 @@ do { - if (((ULONG_PTR)Descriptor + Descriptor->bLength) <= ((ULONG_PTR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength)) + if (((ULONG_PTR)Descriptor) >= ((ULONG_PTR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength)) break; DbgPrint("Descriptor Type %x Length %lu Offset %lu\n", Descriptor->bDescriptorType, Descriptor->bLength, ((ULONG_PTR)Descriptor - (ULONG_PTR)ConfigurationDescriptor));

11 years, 9 months

[hbelusca] 57859: [NTOSKRNL] Do the fading if we are in a valid state.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 9 22:15:42 2012 New Revision: 57859 URL: http://svn.reactos.org/svn/reactos?rev=57859&view=rev Log: [NTOSKRNL] Do the fading if we are in a valid state. Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Sun Dec 9 22:15:42 2012 @@ -61,6 +61,12 @@ } BITMAPINFOHEADER, *PBITMAPINFOHEADER; /****************************/ +// +// Needed prototypes +// +VOID NTAPI InbvAcquireLock(VOID); +VOID NTAPI InbvReleaseLock(VOID); + static VOID NTAPI BootImageFadeIn(VOID) @@ -74,41 +80,51 @@ Interval.QuadPart = -PALETTE_FADE_TIME; - /* - * Build a bitmap containing the fade in palette. The palette entries - * are then processed in a loop and set using VidBitBlt function. - */ - ClrUsed = sizeof(_MainPalette) / sizeof(_MainPalette[0]); - RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); - PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); - PaletteBitmap->biBitCount = 4; - PaletteBitmap->biClrUsed = ClrUsed; - - /* - * Main animation loop. - */ - for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) - { - for (Index = 0; Index < ClrUsed; Index++) - { - Palette[Index].rgbRed = - _MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS; - Palette[Index].rgbGreen = - _MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS; - Palette[Index].rgbBlue = - _MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS; - } - - VidBitBlt(PaletteBitmapBuffer, 0, 0); + /* Check if we're installed and we own it */ + if ((InbvBootDriverInstalled) && + (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) + { + /* Acquire the lock */ + InbvAcquireLock(); + + /* + * Build a bitmap containing the fade in palette. The palette entries + * are then processed in a loop and set using VidBitBlt function. + */ + ClrUsed = sizeof(_MainPalette) / sizeof(_MainPalette[0]); + RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); + PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); + PaletteBitmap->biBitCount = 4; + PaletteBitmap->biClrUsed = ClrUsed; + + /* + * Main animation loop. + */ + for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) + { + for (Index = 0; Index < ClrUsed; Index++) + { + Palette[Index].rgbRed = + _MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS; + Palette[Index].rgbGreen = + _MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS; + Palette[Index].rgbBlue = + _MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS; + } + + VidBitBlt(PaletteBitmapBuffer, 0, 0); + + /* Wait for a bit. */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + } + + /* Release the lock */ + InbvReleaseLock(); /* Wait for a bit. */ KeDelayExecutionThread(KernelMode, FALSE, &Interval); } - - /* Wait for a bit. */ - KeDelayExecutionThread(KernelMode, FALSE, &Interval); -} - +} /* FUNCTIONS *****************************************************************/

11 years, 9 months

[akhaldi] 57858: [SHELL32_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 9 22:05:54 2012 New Revision: 57858 URL: http://svn.reactos.org/svn/reactos?rev=57858&view=rev Log: [SHELL32_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shell32/assoc.c trunk/rostests/winetests/shell32/shelldispatch.c trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/shlview.c Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -1,9 +1,7 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE appbar.c @@ -12,7 +10,7 @@ brsfolder.c ebrowser.c generated.c - #progman_dde.c FIXME: bug 7233 + #progman_dde.c FIXME: CORE-6559 recyclebin.c shelldispatch.c shelllink.c Modified: trunk/rostests/winetests/shell32/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/assoc.c… ============================================================================== --- trunk/rostests/winetests/shell32/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/assoc.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -43,19 +43,19 @@ return; } - hr = IUnknown_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); + hr = IQueryAssociations_QueryInterface(qa, &IID_IQueryAssociations, (void**)&qa2); ok(hr == S_OK, "QueryInterface (IQueryAssociations) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - IUnknown_Release(qa2); + IQueryAssociations_Release(qa2); } - hr = IUnknown_QueryInterface(qa, &IID_IUnknown, (void**)&unk); + hr = IQueryAssociations_QueryInterface(qa, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(qa, &IID_IUnknown, NULL); + hr = IQueryAssociations_QueryInterface(qa, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); IQueryAssociations_Release(qa); @@ -78,19 +78,20 @@ return; } - hr = IUnknown_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, (void**)&appreg2); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IApplicationAssociationRegistration, + (void**)&appreg2); ok(hr == S_OK, "QueryInterface (IApplicationAssociationRegistration) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { - IUnknown_Release(appreg2); + IApplicationAssociationRegistration_Release(appreg2); } - hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } - hr = IUnknown_QueryInterface(appreg, &IID_IUnknown, NULL); + hr = IApplicationAssociationRegistration_QueryInterface(appreg, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); IApplicationAssociationRegistration_Release(appreg); Modified: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… ============================================================================== --- trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelldispatch.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -140,7 +140,7 @@ p = path + lstrlenW(path); while (path < p && *(p - 1) != '\\') p--; - ok(!lstrcmpW(title, p), "expected %s, got %s\n", + ok(!lstrcmpiW(title, p), "expected %s, got %s\n", wine_dbgstr_w(p), wine_dbgstr_w(title)); } else skip("skipping Folder::get_Title test\n"); @@ -157,7 +157,7 @@ r = FolderItem_get_Path(item, &item_path); ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); if (pSHGetFolderPathW) - ok(!lstrcmpW(item_path, path), "expected %s, got %s\n", + ok(!lstrcmpiW(item_path, path), "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(item_path)); SysFreeString(item_path); FolderItem_Release(item); @@ -360,7 +360,7 @@ ok(V_BOOL(&v) == VARIANT_FALSE, "got %d\n", V_BOOL(&v)); SysFreeString(name); - IShellDispatch_Release(sd); + IShellDispatch2_Release(sd); } START_TEST(shelldispatch) Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… ============================================================================== --- trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shelllink.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -16,9 +16,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * This is a test program for the SHGet{Special}Folder{Path|Location} functions - * of shell32, that get either a filesystem path or a LPITEMIDLIST (shell - * namespace) path for a given folder (CSIDL value). * */ @@ -37,15 +34,10 @@ # define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */ #endif -typedef void (WINAPI *fnILFree)(LPITEMIDLIST); -typedef BOOL (WINAPI *fnILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); -typedef HRESULT (WINAPI *fnSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); -typedef HRESULT (WINAPI *fnSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); - -static fnILFree pILFree; -static fnILIsEqual pILIsEqual; -static fnSHILCreateFromPath pSHILCreateFromPath; -static fnSHDefExtractIconA pSHDefExtractIconA; +static void (WINAPI *pILFree)(LPITEMIDLIST); +static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); +static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); +static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); @@ -422,7 +414,7 @@ lok(r == S_OK, "SetHotkey failed (0x%08x)\n", r); } - r = IShellLinkW_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf); + r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (void**)&pf); lok(r == S_OK, "no IID_IPersistFile (0x%08x)\n", r); if (r == S_OK) { @@ -907,7 +899,7 @@ LocalFree( dar ); - IUnknown_Release( dl ); + IShellLinkDataList_Release( dl ); IShellLinkW_Release( sl ); } @@ -1005,10 +997,10 @@ HMODULE hmod = GetModuleHandleA("shell32.dll"); HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); - pILFree = (fnILFree) GetProcAddress(hmod, (LPSTR)155); - pILIsEqual = (fnILIsEqual) GetProcAddress(hmod, (LPSTR)21); - pSHILCreateFromPath = (fnSHILCreateFromPath) GetProcAddress(hmod, (LPSTR)28); - pSHDefExtractIconA = (fnSHDefExtractIconA) GetProcAddress(hmod, "SHDefExtractIconA"); + pILFree = (void *)GetProcAddress(hmod, (LPSTR)155); + pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); + pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28); + pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… ============================================================================== --- trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shellpath.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -30,9 +30,10 @@ #include "shlguid.h" #include "shlobj.h" #include "shlwapi.h" -#include "initguid.h" #include "knownfolders.h" #include "wine/test.h" + +#include "initguid.h" /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want * here is its original value. @@ -2494,6 +2495,157 @@ CoUninitialize(); } + +static void test_DoEnvironmentSubst(void) +{ + WCHAR expectedW[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + CHAR expectedA[MAX_PATH]; + CHAR bufferA[MAX_PATH]; + DWORD res; + DWORD res2; + DWORD len; + INT i; + static const WCHAR does_not_existW[] = {'%','D','O','E','S','_','N','O','T','_','E','X','I','S','T','%',0}; + static const CHAR does_not_existA[] = "%DOES_NOT_EXIST%"; + static const CHAR *names[] = { + /* interactive apps and services (works on all windows versions) */ + "%ALLUSERSPROFILE%", "%APPDATA%", "%LOCALAPPDATA%", + "%NUMBER_OF_PROCESSORS%", "%OS%", "%PROCESSOR_ARCHITECTURE%", + "%PROCESSOR_IDENTIFIER%", "%PROCESSOR_LEVEL%", "%PROCESSOR_REVISION%", + "%ProgramFiles%", "%SystemDrive%", + "%SystemRoot%", "%USERPROFILE%", "%windir%", + /* todo_wine: "%COMPUTERNAME%", "%ProgramData%", "%PUBLIC%", */ + + /* replace more than one var is allowed */ + "%HOMEDRIVE%%HOMEPATH%", + "%OS% %windir%"}; /* always the last entry in the table */ + + for (i = 0; i < (sizeof(names)/sizeof(LPSTR)); i++) + { + memset(bufferA, '#', MAX_PATH - 1); + bufferA[MAX_PATH - 1] = 0; + lstrcpyA(bufferA, names[i]); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + + res2 = ExpandEnvironmentStringsA(names[i], expectedA, MAX_PATH); + res = DoEnvironmentSubstA(bufferA, MAX_PATH); + + /* is the space for the terminating 0 included? */ + if (!i && HIWORD(res) && (LOWORD(res) == (lstrlenA(bufferA)))) + { + win_skip("DoEnvironmentSubstA/W are broken on NT 4\n"); + return; + } + ok(HIWORD(res) && (LOWORD(res) == res2), + "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + ok(!lstrcmpA(bufferA, expectedA), + "%d: got %s (expected %s)\n", i, bufferA, expectedA); + + res2 = ExpandEnvironmentStringsW(bufferW, expectedW, MAX_PATH); + res = DoEnvironmentSubstW(bufferW, MAX_PATH); + ok(HIWORD(res) && (LOWORD(res) == res2), + "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + ok(!lstrcmpW(bufferW, expectedW), + "%d: got %s (expected %s)\n", i, wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + } + + i--; /* reuse data in the last table entry */ + len = LOWORD(res); /* needed length */ + + /* one character extra is fine */ + memset(bufferA, '#', MAX_PATH - 1); + bufferA[len + 2] = 0; + lstrcpyA(bufferA, names[i]); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + + res2 = ExpandEnvironmentStringsA(bufferA, expectedA, MAX_PATH); + res = DoEnvironmentSubstA(bufferA, len + 1); + ok(HIWORD(res) && (LOWORD(res) == res2), + "+1: got %d/%d (expected TRUE/%d)\n", HIWORD(res), LOWORD(res), res2); + ok(!lstrcmpA(bufferA, expectedA), + "+1: got %s (expected %s)\n", bufferA, expectedA); + + res2 = ExpandEnvironmentStringsW(bufferW, expectedW, MAX_PATH); + res = DoEnvironmentSubstW(bufferW, len + 1); + ok(HIWORD(res) && (LOWORD(res) == res2), + "+1: got %d/%d (expected TRUE/%d)\n", HIWORD(res), LOWORD(res), res2); + ok(!lstrcmpW(bufferW, expectedW), + "+1: got %s (expected %s)\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + + + /* minimal buffer length (result string and terminating 0) */ + memset(bufferA, '#', MAX_PATH - 1); + bufferA[len + 2] = 0; + lstrcpyA(bufferA, names[i]); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + + /* ANSI version failed without an extra byte, as documented on msdn */ + res = DoEnvironmentSubstA(bufferA, len); + ok(!HIWORD(res) && (LOWORD(res) == len), + " 0: got %d/%d (expected FALSE/%d)\n", HIWORD(res), LOWORD(res), len); + ok(!lstrcmpA(bufferA, names[i]), + " 0: got %s (expected %s)\n", bufferA, names[i]); + + /* DoEnvironmentSubstW works as expected */ + res2 = ExpandEnvironmentStringsW(bufferW, expectedW, MAX_PATH); + res = DoEnvironmentSubstW(bufferW, len); + ok(HIWORD(res) && (LOWORD(res) == res2), + " 0: got %d/%d (expected TRUE/%d)\n", HIWORD(res), LOWORD(res), res2); + ok(!lstrcmpW(bufferW, expectedW), + " 0: got %s (expected %s)\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + + + /* buffer to small */ + /* result: FALSE / provided buffer length / the buffer is untouched */ + memset(bufferA, '#', MAX_PATH - 1); + bufferA[len + 2] = 0; + lstrcpyA(bufferA, names[i]); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + + res = DoEnvironmentSubstA(bufferA, len - 1); + ok(!HIWORD(res) && (LOWORD(res) == (len - 1)), + "-1: got %d/%d (expected FALSE/%d)\n", HIWORD(res), LOWORD(res), len - 1); + ok(!lstrcmpA(bufferA, names[i]), + "-1: got %s (expected %s)\n", bufferA, names[i]); + + lstrcpyW(expectedW, bufferW); + res = DoEnvironmentSubstW(bufferW, len - 1); + ok(!HIWORD(res) && (LOWORD(res) == (len - 1)), + "-1: got %d/%d (expected FALSE/%d)\n", HIWORD(res), LOWORD(res), len - 1); + ok(!lstrcmpW(bufferW, expectedW), + "-1: got %s (expected %s)\n", wine_dbgstr_w(bufferW), wine_dbgstr_w(expectedW)); + + + /* unknown variable */ + /* result: TRUE / string length including terminating 0 / the buffer is untouched */ + memset(bufferA, '#', MAX_PATH - 1); + bufferA[MAX_PATH - 1] = 0; + lstrcpyA(bufferA, does_not_existA); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + + res2 = lstrlenA(does_not_existA) + 1; + res = DoEnvironmentSubstA(bufferA, MAX_PATH); + ok(HIWORD(res) && (LOWORD(res) == res2), + "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + ok(!lstrcmpA(bufferA, does_not_existA), + "%d: got %s (expected %s)\n", i, bufferA, does_not_existA); + + res = DoEnvironmentSubstW(bufferW, MAX_PATH); + ok(HIWORD(res) && (LOWORD(res) == res2), + "%d: got %d/%d (expected TRUE/%d)\n", i, HIWORD(res), LOWORD(res), res2); + ok(!lstrcmpW(bufferW, does_not_existW), + "%d: got %s (expected %s)\n", i, wine_dbgstr_w(bufferW), wine_dbgstr_w(does_not_existW)); + + + if (0) + { + /* NULL crashes on windows */ + res = DoEnvironmentSubstA(NULL, MAX_PATH); + res = DoEnvironmentSubstW(NULL, MAX_PATH); + } +} + START_TEST(shellpath) { if (!init()) return; @@ -2521,5 +2673,6 @@ test_NonExistentPath(); test_SHGetFolderPathEx(); test_knownFolders(); + test_DoEnvironmentSubst(); } } Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… ============================================================================== --- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -57,7 +57,7 @@ static char child_file[MAX_PATH]; static DLLVERSIONINFO dllver; static BOOL skip_noassoc_tests = FALSE; -//static HANDLE dde_ready_event; FIXME: bug 7233 +//static HANDLE dde_ready_event; FIXME: CORE-6559 /*** @@ -75,36 +75,36 @@ hEvent=CreateEvent(NULL, FALSE, FALSE, event_name); } -static void strcat_param(char* str, const char* param) -{ - if (param!=NULL) - { - strcat(str, "\""); +static void strcat_param(char* str, const char* name, const char* param) +{ + if (param) + { + if (str[strlen(str)-1] == '"') + strcat(str, ", "); + strcat(str, name); + strcat(str, "=\""); strcat(str, param); strcat(str, "\""); } - else - { - strcat(str, "null"); - } -} +} + +static int _todo_wait = 0; +#define todo_wait for (_todo_wait = 1; _todo_wait; _todo_wait = 0) static char shell_call[2048]=""; -static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) +static int bad_shellexecute = 0; +static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR directory) { INT_PTR rc, rcEmpty = 0; - if(!operation) + if(!verb) rcEmpty = shell_execute("", file, parameters, directory); strcpy(shell_call, "ShellExecute("); - strcat_param(shell_call, operation); - strcat(shell_call, ", "); - strcat_param(shell_call, file); - strcat(shell_call, ", "); - strcat_param(shell_call, parameters); - strcat(shell_call, ", "); - strcat_param(shell_call, directory); + strcat_param(shell_call, "verb", verb); + strcat_param(shell_call, "file", file); + strcat_param(shell_call, "params", parameters); + strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call); @@ -116,7 +116,7 @@ * association it displays the 'Open With' dialog and I could not find * a flag to prevent this. */ - rc=(INT_PTR)ShellExecute(NULL, operation, file, parameters, directory, SW_SHOWNORMAL); + rc=(INT_PTR)ShellExecute(NULL, verb, file, parameters, directory, SW_SHOWNORMAL); if (rc > 32) { @@ -133,7 +133,10 @@ rc = SE_ERR_NOASSOC; } } - ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "WaitForSingleObject returned %d\n", wait_rc); + if (!_todo_wait) + ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); + else todo_wine + ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it @@ -142,28 +145,37 @@ if (rc > 32) dump_child(); - if(!operation) - ok(rc == rcEmpty || broken(rc > 32 && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, - "Got different return value with empty string: %lu %lu\n", rc, rcEmpty); + if(!verb) + { + if (rc != rcEmpty && rcEmpty == SE_ERR_NOASSOC) /* NT4 */ + bad_shellexecute = 1; + ok(rc == rcEmpty || broken(rc != rcEmpty && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, + "%s Got different return value with empty string: %lu %lu\n", shell_call, rc, rcEmpty); + } return rc; } -static int shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, - LPCSTR parameters, LPCSTR directory) +static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, + LPCSTR parameters, LPCSTR directory, + LPCSTR class) { SHELLEXECUTEINFO sei; BOOL success; INT_PTR rc; strcpy(shell_call, "ShellExecuteEx("); - strcat_param(shell_call, operation); - strcat(shell_call, ", "); - strcat_param(shell_call, file); - strcat(shell_call, ", "); - strcat_param(shell_call, parameters); - strcat(shell_call, ", "); - strcat_param(shell_call, directory); + if (mask) + { + char smask[11]; + sprintf(smask, "0x%x", mask); + strcat_param(shell_call, "mask", smask); + } + strcat_param(shell_call, "verb", verb); + strcat_param(shell_call, "file", file); + strcat_param(shell_call, "params", parameters); + strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "class", class); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call); @@ -171,14 +183,14 @@ sei.cbSize=sizeof(sei); sei.fMask=SEE_MASK_NOCLOSEPROCESS | mask; sei.hwnd=NULL; - sei.lpVerb=operation; + sei.lpVerb=verb; sei.lpFile=file; sei.lpParameters=parameters; sei.lpDirectory=directory; sei.nShow=SW_SHOWNORMAL; sei.hInstApp=NULL; /* Out */ sei.lpIDList=NULL; - sei.lpClass=NULL; + sei.lpClass=class; sei.hkeyClass=NULL; sei.dwHotKey=0; U(sei).hIcon=NULL; @@ -200,7 +212,10 @@ ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); } wait_rc=WaitForSingleObject(hEvent, 5000); - ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + if (!_todo_wait) + ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + else todo_wine + ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it @@ -552,12 +567,16 @@ /* Arguments */ childPrintf(hFile, "[Arguments]\r\n"); if (winetest_debug > 2) + { + trace("cmdlineA='%s'\n", GetCommandLineA()); trace("argcA=%d\n", argc); + } + childPrintf(hFile, "cmdlineA=%s\r\n", encodeA(GetCommandLineA())); childPrintf(hFile, "argcA=%d\r\n", argc); for (i = 0; i < argc; i++) { if (winetest_debug > 2) - trace("argvA%d=%s\n", i, argv[i]); + trace("argvA%d='%s'\n", i, argv[i]); childPrintf(hFile, "argvA%d=%s\r\n", i, encodeA(argv[i])); } GetModuleFileNameA(GetModuleHandleA(NULL), longpath, MAX_PATH); @@ -635,13 +654,15 @@ char* str; int i, c; + str=getChildString("Arguments", "cmdlineA"); + trace("cmdlineA='%s'\n", str); c=GetPrivateProfileIntA("Arguments", "argcA", -1, child_file); trace("argcA=%d\n",c); for (i=0;i<c;i++) { sprintf(key, "argvA%d", i); str=getChildString("Arguments", key); - trace("%s=%s\n", key, str); + trace("%s='%s'\n", key, str); } } } @@ -683,7 +704,7 @@ return 0; } -static void _okChildString(const char* file, int line, const char* key, const char* expected) +static void _okChildString(const char* file, int line, const char* key, const char* expected, const char* bad) { char* result; result=getChildString("Arguments", key); @@ -692,7 +713,8 @@ ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); return; } - ok_(file, line)(lstrcmpiA(result, expected) == 0, + ok_(file, line)(lstrcmpiA(result, expected) == 0 || + broken(lstrcmpiA(result, bad) == 0), "%s expected '%s', got '%s'\n", key, expected, result); } @@ -717,7 +739,8 @@ "%s expected %d, but got %d\n", key, expected, result); } -#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected)) +#define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected), (expected)) +#define okChildStringBroken(key, expected, broken) _okChildString(__FILE__, __LINE__, (key), (expected), (broken)) #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) #define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) @@ -793,26 +816,6 @@ } return tmplen; -} - -/*** - * - * PathFindFileNameA equivalent that supports WinNT - * - ***/ - -static LPSTR path_find_file_name(LPCSTR lpszPath) -{ - LPCSTR lastSlash = lpszPath; - - while (lpszPath && *lpszPath) - { - if ((*lpszPath == '\\' || *lpszPath == '/' || *lpszPath == ':') && - lpszPath[1] && lpszPath[1] != '\\' && lpszPath[1] != '/') - lastSlash = lpszPath + 1; - lpszPath = CharNext(lpszPath); - } - return (LPSTR)lastSlash; } /*** @@ -850,7 +853,7 @@ const char* verb; const char* basename; int todo; - int rc; + INT_PTR rc; } filename_tests_t; static filename_tests_t filename_tests[]= @@ -899,235 +902,559 @@ static void test_lpFile_parsed(void) { - /* basename tmpdir */ - const char* shorttmpdir; - - const char *testfile; char fileA[MAX_PATH]; - - int rc; - - GetTempPathA(sizeof(fileA), fileA); - shorttmpdir = tmpdir + strlen(fileA); - - /* ensure tmpdir is in %TEMP%: GetTempPath() can succeed even if TEMP is undefined */ - SetEnvironmentVariableA("TEMP", fileA); + INT_PTR rc; /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ - testfile = "%s\\drawback_file.noassoc foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + todo_wine ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ - testfile = "\"%s\\drawback_file.noassoc foo.shlexec\""; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - - /* error should be 2, not 31 */ - testfile = "\"%s\\drawback_file.noassoc\" foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, + "%s failed: rc=%lu\n", shell_call, rc); + + /* error should be SE_ERR_FNF, not SE_ERR_NOASSOC */ + sprintf(fileA, "\"%s\\drawback_file.noassoc\" foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* ""command"" not works on wine (and real win9x and w2k) */ - testfile = "\"\"%s\\simple.shlexec\"\""; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "\"\"%s\\simple.shlexec\"\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc>32 || broken(rc == 2) /* Win9x/2000 */, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + todo_wine ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, + "%s failed: rc=%lu\n", shell_call, rc); /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ - testfile = "%s\\drawback_nonexist.noassoc foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* is SEE_MASK_DOENVSUBST default flag? Should only be when XP emulates 9x (XP bug or real 95 or ME behavior ?) */ - testfile = "%%TEMP%%\\%s\\simple.shlexec"; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + rc=shell_execute(NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* quoted */ - testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + rc=shell_execute(NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* test SEE_MASK_DOENVSUBST works */ - testfile = "%%TEMP%%\\%s\\simple.shlexec"; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - - /* quoted lpFile not works only on real win95 and nt4 */ - testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); - ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - -} + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, + NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + + /* quoted lpFile does not work on real win95 and nt4 */ + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, + NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL, NULL); + ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, + "%s failed: rc=%lu\n", shell_call, rc); +} + +typedef struct +{ + const char* cmd; + const char* args[11]; + int todo; +} cmdline_tests_t; + +static const cmdline_tests_t cmdline_tests[] = +{ + {"exe", + {"exe", NULL}, 0}, + + {"exe arg1 arg2 \"arg three\" 'four five` six\\ $even)", + {"exe", "arg1", "arg2", "arg three", "'four", "five`", "six\\", "$even)", NULL}, 0}, + + {"exe arg=1 arg-2 three\tfour\rfour\nfour ", + {"exe", "arg=1", "arg-2", "three", "four\rfour\nfour", NULL}, 0}, + + {"exe arg\"one\" \"second\"arg thirdarg ", + {"exe", "argone", "secondarg", "thirdarg", NULL}, 0}, + + /* Don't lose unclosed quoted arguments */ + {"exe arg1 \"unclosed", + {"exe", "arg1", "unclosed", NULL}, 0}, + + {"exe arg1 \"", + {"exe", "arg1", "", NULL}, 0}, + + /* cmd's metacharacters have no special meaning */ + {"exe \"one^\" \"arg\"&two three|four", + {"exe", "one^", "arg&two", "three|four", NULL}, 0}, + + /* Environment variables are not interpreted either */ + {"exe %TMPDIR% %2", + {"exe", "%TMPDIR%", "%2", NULL}, 0}, + + /* If not followed by a quote, backslashes go through as is */ + {"exe o\\ne t\\\\wo t\\\\\\ree f\\\\\\\\our ", + {"exe", "o\\ne", "t\\\\wo", "t\\\\\\ree", "f\\\\\\\\our", NULL}, 0}, + + {"exe \"o\\ne\" \"t\\\\wo\" \"t\\\\\\ree\" \"f\\\\\\\\our\" ", + {"exe", "o\\ne", "t\\\\wo", "t\\\\\\ree", "f\\\\\\\\our", NULL}, 0}, + + /* When followed by a quote their number is halved and the remainder + * escapes the quote + */ + {"exe \\\"one \\\\\"two\" \\\\\\\"three \\\\\\\\\"four\" end", + {"exe", "\"one", "\\two", "\\\"three", "\\\\four", "end", NULL}, 0}, + + {"exe \"one\\\" still\" \"two\\\\\" \"three\\\\\\\" still\" \"four\\\\\\\\\" end", + {"exe", "one\" still", "two\\", "three\\\" still", "four\\\\", "end", NULL}, 0}, + + /* One can put a quote in an unquoted string by tripling it, that is in + * effect quoting it like so """ -> ". The general rule is as follows: + * 3n quotes -> n quotes + * 3n+1 quotes -> n quotes plus start of a quoted string + * 3n+2 quotes -> n quotes (plus an empty string from the remaining pair) + * Nicely, when n is 0 we get the standard rules back. + */ + {"exe two\"\"quotes next", + {"exe", "twoquotes", "next", NULL}, 0}, + + {"exe three\"\"\"quotes next", + {"exe", "three\"quotes", "next", NULL}, 0}, + + {"exe four\"\"\"\" quotes\" next 4%3=1", + {"exe", "four\" quotes", "next", "4%3=1", NULL}, 0}, + + {"exe five\"\"\"\"\"quotes next", + {"exe", "five\"quotes", "next", NULL}, 0}, + + {"exe six\"\"\"\"\"\"quotes next", + {"exe", "six\"\"quotes", "next", NULL}, 0}, + + {"exe seven\"\"\"\"\"\"\" quotes\" next 7%3=1", + {"exe", "seven\"\" quotes", "next", "7%3=1", NULL}, 0}, + + {"exe twelve\"\"\"\"\"\"\"\"\"\"\"\"quotes next", + {"exe", "twelve\"\"\"\"quotes", "next", NULL}, 0}, + + {"exe thirteen\"\"\"\"\"\"\"\"\"\"\"\"\" quotes\" next 13%3=1", + {"exe", "thirteen\"\"\"\" quotes", "next", "13%3=1", NULL}, 0}, + + /* Inside a quoted string the opening quote is added to the set of + * consecutive quotes to get the effective quotes count. This gives: + * 1+3n quotes -> n quotes + * 1+3n+1 quotes -> n quotes plus closes the quoted string + * 1+3n+2 quotes -> n+1 quotes plus closes the quoted string + */ + {"exe \"two\"\"quotes next", + {"exe", "two\"quotes", "next", NULL}, 0}, + + {"exe \"two\"\" next", + {"exe", "two\"", "next", NULL}, 0}, + + {"exe \"three\"\"\" quotes\" next 4%3=1", + {"exe", "three\" quotes", "next", "4%3=1", NULL}, 0}, + + {"exe \"four\"\"\"\"quotes next", + {"exe", "four\"quotes", "next", NULL}, 0}, + + {"exe \"five\"\"\"\"\"quotes next", + {"exe", "five\"\"quotes", "next", NULL}, 0}, + + {"exe \"six\"\"\"\"\"\" quotes\" next 7%3=1", + {"exe", "six\"\" quotes", "next", "7%3=1", NULL}, 0}, + + {"exe \"eleven\"\"\"\"\"\"\"\"\"\"\"quotes next", + {"exe", "eleven\"\"\"\"quotes", "next", NULL}, 0}, + + {"exe \"twelve\"\"\"\"\"\"\"\"\"\"\"\" quotes\" next 13%3=1", + {"exe", "twelve\"\"\"\" quotes", "next", "13%3=1", NULL}, 0}, + + /* Escaped consecutive quotes are fun */ + {"exe \"the crazy \\\\\"\"\"\\\\\" quotes", + {"exe", "the crazy \\\"\\", "quotes", NULL}, 0}, + + /* The executable path has its own rules!!! + * - Backslashes have no special meaning. + * - If the first character is a quote, then the second quote ends the + * executable path. + * - The previous rule holds even if the next character is not a space! + * - If the first character is not a quote, then quotes have no special + * meaning either and the executable path stops at the first space. + * - The consecutive quotes rules don't apply either. + * - Even if there is no space between the executable path and the first + * argument, the latter is parsed using the regular rules. + */ + {"exe\"file\"path arg1", + {"exe\"file\"path", "arg1", NULL}, 0}, + + {"exe\"file\"path\targ1", + {"exe\"file\"path", "arg1", NULL}, 0}, + + {"exe\"path\\ arg1", + {"exe\"path\\", "arg1", NULL}, 0}, + + {"\\\"exe \"arg one\"", + {"\\\"exe", "arg one", NULL}, 0}, + + {"\"spaced exe\" \"next arg\"", + {"spaced exe", "next arg", NULL}, 0}, + + {"\"spaced exe\"\t\"next arg\"", + {"spaced exe", "next arg", NULL}, 0}, + + {"\"exe\"arg\" one\" argtwo", + {"exe", "arg one", "argtwo", NULL}, 0}, + + {"\"spaced exe\\\"arg1 arg2", + {"spaced exe\\", "arg1", "arg2", NULL}, 0}, + + {"\"two\"\" arg1 ", + {"two", " arg1 ", NULL}, 0}, + + {"\"three\"\"\" arg2", + {"three", "", "arg2", NULL}, 0}, + + {"\"four\"\"\"\"arg1", + {"four", "\"arg1", NULL}, 0}, + + /* If the first character is a space then the executable path is empty */ + {" \"arg\"one argtwo", + {"", "argone", "argtwo", NULL}, 0}, + + {NULL, {NULL}, 0} +}; + +static BOOL test_one_cmdline(const cmdline_tests_t* test) +{ + WCHAR cmdW[MAX_PATH], argW[MAX_PATH]; + LPWSTR *cl2a; + int cl2a_count; + LPWSTR *argsW; + int i, count; + + /* trace("----- cmd='%s'\n", test->cmd); */ + MultiByteToWideChar(CP_ACP, 0, test->cmd, -1, cmdW, sizeof(cmdW)/sizeof(*cmdW)); + argsW = cl2a = CommandLineToArgvW(cmdW, &cl2a_count); + if (argsW == NULL && cl2a_count == -1) + { + win_skip("CommandLineToArgvW not implemented, skipping\n"); + return FALSE; + } + + count = 0; + while (test->args[count]) + count++; + if ((test->todo & 0x1) == 0) + ok(cl2a_count == count, "%s: expected %d arguments, but got %d\n", test->cmd, count, cl2a_count); + else todo_wine + ok(cl2a_count == count, "%s: expected %d arguments, but got %d\n", test->cmd, count, cl2a_count); + + for (i = 0; i < cl2a_count; i++) + { + if (i < count) + { + MultiByteToWideChar(CP_ACP, 0, test->args[i], -1, argW, sizeof(argW)/sizeof(*argW)); + if ((test->todo & (1 << (i+4))) == 0) + ok(!lstrcmpW(*argsW, argW), "%s: arg[%d] expected %s but got %s\n", test->cmd, i, wine_dbgstr_w(argW), wine_dbgstr_w(*argsW)); + else todo_wine + ok(!lstrcmpW(*argsW, argW), "%s: arg[%d] expected %s but got %s\n", test->cmd, i, wine_dbgstr_w(argW), wine_dbgstr_w(*argsW)); + } + else if ((test->todo & 0x1) == 0) + ok(0, "%s: got extra arg[%d]=%s\n", test->cmd, i, wine_dbgstr_w(*argsW)); + else todo_wine + ok(0, "%s: got extra arg[%d]=%s\n", test->cmd, i, wine_dbgstr_w(*argsW)); + argsW++; + } + LocalFree(cl2a); + return TRUE; +} + +static void test_commandline2argv(void) +{ + static const WCHAR exeW[] = {'e','x','e',0}; + const cmdline_tests_t* test; + WCHAR strW[MAX_PATH]; + LPWSTR *args; + int numargs; + DWORD le; + + test = cmdline_tests; + while (test->cmd) + { + if (!test_one_cmdline(test)) + return; + test++; + } + + SetLastError(0xdeadbeef); + args = CommandLineToArgvW(exeW, NULL); + le = GetLastError(); + ok(args == NULL && le == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %u\n", args, le); + + SetLastError(0xdeadbeef); + args = CommandLineToArgvW(NULL, NULL); + le = GetLastError(); + ok(args == NULL && le == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %u\n", args, le); + + *strW = 0; + args = CommandLineToArgvW(strW, &numargs); + ok(numargs == 1, "expected 1 args, got %d\n", numargs); + if (numargs == 1) + { + GetModuleFileNameW(NULL, strW, sizeof(strW)/sizeof(*strW)); + ok(!lstrcmpW(args[0], strW), "wrong path to the current executable: %s instead of %s\n", wine_dbgstr_w(args[0]), wine_dbgstr_w(strW)); + } + if (args) LocalFree(args); +} + +/* The goal here is to analyze how ShellExecute() builds the command that + * will be run. The tricky part is that there are three transformation + * steps between the 'parameters' string we pass to ShellExecute() and the + * argument list we observe in the child process: + * - The parsing of 'parameters' string into individual arguments. The tests + * show this is done differently from both CreateProcess() and + * CommandLineToArgv()! + * - The way the command 'formatting directives' such as %1, %2, etc are + * handled. + * - And the way the resulting command line is then parsed to yield the + * argument list we check. + */ +typedef struct +{ + const char* verb; + const char* params; + int todo; + cmdline_tests_t cmd; + cmdline_tests_t broken; +} argify_tests_t; + +static const argify_tests_t argify_tests[] = +{ + /* Start with three simple parameters. Notice that one can reorder and + * duplicate the parameters. Also notice how %* take the raw input + * parameters string, including the trailing spaces, no matter what + * arguments have already been used. + */ + {"Params232S", "p2 p3 p4 ", 0xc2, + {" p2 p3 \"p2\" \"p2 p3 p4 \"", + {"", "p2", "p3", "p2", "p2 p3 p4 ", NULL}, 0}}, + + /* Unquoted argument references like %2 don't automatically quote their + * argument. Similarly, when they are quoted they don't escape the quotes + * that their argument may contain. + */ + {"Params232S", "\"p two\" p3 p4 ", 0x3f3, + {" p two p3 \"p two\" \"\"p two\" p3 p4 \"", + {"", "p", "two", "p3", "p two", "p", "two p3 p4 ", NULL}, 0}}, + + /* Only single digits are supported so only %1 to %9. Shown here with %20 + * because %10 is a pain. + */ + {"Params20", "p", 0, + {" \"p0\"", + {"", "p0", NULL}, 0}}, + + /* Only (double-)quotes have a special meaning. */ + {"Params23456", "'p2 p3` p4\\ $even", 0x40, + {" \"'p2\" \"p3`\" \"p4\\\" \"$even\" \"\"", + {"", "'p2", "p3`", "p4\" $even \"", NULL}, 0}}, + + {"Params23456", "p=2 p-3 p4\tp4\rp4\np4", 0x1c2, + {" \"p=2\" \"p-3\" \"p4\tp4\rp4\np4\" \"\" \"\"", + {"", "p=2", "p-3", "p4\tp4\rp4\np4", "", "", NULL}, 0}}, + + /* In unquoted strings, quotes are treated are a parameter separator just + * like spaces! However they can be doubled to get a literal quote. + * Specifically: + * 2n quotes -> n quotes + * 2n+1 quotes -> n quotes and a parameter separator + */ + {"Params23456789", "one\"quote \"p four\" one\"quote p7", 0xff3, + {" \"one\" \"quote\" \"p four\" \"one\" \"quote\" \"p7\" \"\" \"\"", + {"", "one", "quote", "p four", "one", "quote", "p7", "", "", NULL}, 0}}, + + {"Params23456789", "two\"\"quotes \"p three\" two\"\"quotes p5", 0xf2, + {" \"two\"quotes\" \"p three\" \"two\"quotes\" \"p5\" \"\" \"\" \"\" \"\"", + {"", "twoquotes p", "three twoquotes", "p5", "", "", "", "", NULL}, 0}}, + + {"Params23456789", "three\"\"\"quotes \"p four\" three\"\"\"quotes p6", 0xff3, + {" \"three\"\" \"quotes\" \"p four\" \"three\"\" \"quotes\" \"p6\" \"\" \"\"", + {"", "three\"", "quotes", "p four", "three\"", "quotes", "p6", "", "", NULL}, 0}}, + + {"Params23456789", "four\"\"\"\"quotes \"p three\" four\"\"\"\"quotes p5", 0xf3, + {" \"four\"\"quotes\" \"p three\" \"four\"\"quotes\" \"p5\" \"\" \"\" \"\" \"\"", + {"", "four\"quotes p", "three fourquotes p5 \"", "", "", "", NULL}, 0}}, + + /* Quoted strings cannot be continued by tacking on a non space character + * either. + */ + {"Params23456", "\"p two\"p3 \"p four\"p5 p6", 0x1f3, + {" \"p two\" \"p3\" \"p four\" \"p5\" \"p6\"", + {"", "p two", "p3", "p four", "p5", "p6", NULL}, 0}}, + + /* In quoted strings, the quotes are halved and an odd number closes the + * string. Specifically: + * 2n quotes -> n quotes + * 2n+1 quotes -> n quotes and closes the string and hence the parameter + */ + {"Params23456789", "\"one q\"uote \"p four\" \"one q\"uote p7", 0xff3, + {" \"one q\" \"uote\" \"p four\" \"one q\" \"uote\" \"p7\" \"\" \"\"", + {"", "one q", "uote", "p four", "one q", "uote", "p7", "", "", NULL}, 0}}, + + {"Params23456789", "\"two \"\" quotes\" \"p three\" \"two \"\" quotes\" p5", 0x1ff3, + {" \"two \" quotes\" \"p three\" \"two \" quotes\" \"p5\" \"\" \"\" \"\" \"\"", + {"", "two ", "quotes p", "three two", " quotes", "p5", "", "", "", "", NULL}, 0}}, + + {"Params23456789", "\"three q\"\"\"uotes \"p four\" \"three q\"\"\"uotes p7", 0xff3, + {" \"three q\"\" \"uotes\" \"p four\" \"three q\"\" \"uotes\" \"p7\" \"\" \"\"", + {"", "three q\"", "uotes", "p four", "three q\"", "uotes", "p7", "", "", NULL}, 0}}, + + {"Params23456789", "\"four \"\"\"\" quotes\" \"p three\" \"four \"\"\"\" quotes\" p5", 0xff3, + {" \"four \"\" quotes\" \"p three\" \"four \"\" quotes\" \"p5\" \"\" \"\" \"\" \"\"", + {"", "four \"", "quotes p", "three four", "", "quotes p5 \"", "", "", "", NULL}, 0}}, + + /* The quoted string rules also apply to consecutive quotes at the start + * of a parameter but don't count the opening quote! + */ + {"Params23456789", "\"\"twoquotes \"p four\" \"\"twoquotes p7", 0xbf3, + {" \"\" \"twoquotes\" \"p four\" \"\" \"twoquotes\" \"p7\" \"\" \"\"", + {"", "", "twoquotes", "p four", "", "twoquotes", "p7", "", "", NULL}, 0}}, + + {"Params23456789", "\"\"\"three quotes\" \"p three\" \"\"\"three quotes\" p5", 0x6f3, + {" \"\"three quotes\" \"p three\" \"\"three quotes\" \"p5\" \"\" \"\" \"\" \"\"", + {"", "three", "quotes p", "three \"three", "quotes p5 \"", "", "", "", NULL}, 0}}, + + {"Params23456789", "\"\"\"\"fourquotes \"p four\" \"\"\"\"fourquotes p7", 0xbf3, + {" \"\"\" \"fourquotes\" \"p four\" \"\"\" \"fourquotes\" \"p7\" \"\" \"\"", + {"", "\"", "fourquotes", "p four", "\"", "fourquotes", "p7", "", "", NULL}, 0}}, + + /* An unclosed quoted string gets lost! */ + {"Params23456", "p2 \"p3\" \"p4 is lost", 0x1c3, + {" \"p2\" \"p3\" \"\" \"\" \"\"", + {"", "p2", "p3", "", "", "", NULL}, 0}, + {" \"p2\" \"p3\" \"p3\" \"\" \"\"", + {"", "p2", "p3", "p3", "", "", NULL}, 0}}, + + /* Backslashes have no special meaning even when preceding quotes. All + * they do is start an unquoted string. + */ + {"Params23456", "\\\"p\\three \"pfour\\\" pfive", 0x73, + {" \"\\\" \"p\\three\" \"pfour\\\" \"pfive\" \"\"", + {"", "\" p\\three pfour\"", "pfive", "", NULL}, 0}}, + + /* Environment variables are left untouched. */ + {"Params23456", "%TMPDIR% %t %c", 0, + {" \"%TMPDIR%\" \"%t\" \"%c\" \"\" \"\"", + {"", "%TMPDIR%", "%t", "%c", "", "", NULL}, 0}}, + + /* %~2 is equivalent to %*. However %~3 and higher include the spaces + * before the parameter! + * (but not the previous parameter's closing quote fortunately) + */ + {"Params2345Etc", "p2 p3 \"p4\" p5 p6 ", 0x3f3, + {" ~2=\"p2 p3 \"p4\" p5 p6 \" ~3=\" p3 \"p4\" p5 p6 \" ~4=\" \"p4\" p5 p6 \" ~5= p5 p6 ", + {"", "~2=p2 p3 p4 p5 p6 ", "~3= p3 p4 p5 p6 ", "~4= p4 p5 p6 ", "~5=", "p5", "p6", NULL}, 0}}, + + /* %~n works even if there is no nth parameter. */ + {"Params9Etc", "p2 p3 p4 p5 p6 p7 p8 ", 0x12, + {" ~9=\" \"", + {"", "~9= ", NULL}, 0}}, + + {"Params9Etc", "p2 p3 p4 p5 p6 p7 ", 0x12, + {" ~9=\"\"", + {"", "~9=", NULL}, 0}}, + + /* The %~n directives also transmit the tenth parameter and beyond. */ + {"Params9Etc", "p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 and beyond!", 0x12, + {" ~9=\" p9 p10 p11 and beyond!\"", + {"", "~9= p9 p10 p11 and beyond!", NULL}, 0}}, + + /* Bad formatting directives lose their % sign, except those followed by + * a tilde! Environment variables are not expanded but lose their % sign. + */ + {"ParamsBad", "p2 p3 p4 p5", 0x12, + {" \"% - %~ %~0 %~1 %~a %~* a b c TMPDIR\"", + {"", "% - %~ %~0 %~1 %~a %~* a b c TMPDIR", NULL}, 0}}, + + {NULL, NULL, 0, {NULL, {NULL}, 0}} +}; static void test_argify(void) { - char fileA[MAX_PATH]; - - int rc; + BOOL has_cl2a = TRUE; + char fileA[MAX_PATH], params[2*MAX_PATH+12]; + INT_PTR rc; + const argify_tests_t* test; + const cmdline_tests_t *bad; + const char* cmd; + unsigned i, count; + + create_test_verb(".shlexec", "Params232S", 0, "Params232S %2 %3 \"%2\" \"%*\""); + create_test_verb(".shlexec", "Params23456", 0, "Params23456 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\""); + create_test_verb(".shlexec", "Params23456789", 0, "Params23456789 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" \"%7\" \"%8\" \"%9\""); + create_test_verb(".shlexec", "Params2345Etc", 0, "Params2345Etc ~2=\"%~2\" ~3=\"%~3\" ~4=\"%~4\" ~5=%~5"); + create_test_verb(".shlexec", "Params9Etc", 0, "Params9Etc ~9=\"%~9\""); + create_test_verb(".shlexec", "Params20", 0, "Params20 \"%20\""); + create_test_verb(".shlexec", "ParamsBad", 0, "ParamsBad \"%% %- %~ %~0 %~1 %~a %~* %a %b %c %TMPDIR%\""); sprintf(fileA, "%s\\test file.shlexec", tmpdir); - /* %2 */ - rc=shell_execute("NoQuotesParam2", fileA, "a b", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - okChildInt("argcA", 5); - okChildString("argvA4", "a"); - } - - /* %2 */ - /* '"a"""' -> 'a"' */ - rc=shell_execute("NoQuotesParam2", fileA, "\"a:\"\"some string\"\"\"", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - okChildInt("argcA", 5); - todo_wine { - okChildString("argvA4", "a:some string"); - } - } - - /* %2 */ - /* backslash isn't escape char - * '"a\""' -> '"a\""' */ - rc=shell_execute("NoQuotesParam2", fileA, "\"a:\\\"some string\\\"\"", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - okChildInt("argcA", 5); - todo_wine { - okChildString("argvA4", "a:\\"); - } - } - - /* "%2" */ - /* \t isn't whitespace */ - rc=shell_execute("QuotedParam2", fileA, "a\tb c", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - okChildInt("argcA", 5); - todo_wine { - okChildString("argvA4", "a\tb"); - } - } - - /* %* */ - rc=shell_execute("NoQuotesAllParams", fileA, "a b c d e f g h", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - todo_wine { - okChildInt("argcA", 12); - okChildString("argvA4", "a"); - okChildString("argvA11", "h"); - } - } - - /* %* can sometimes contain only whitespaces and no args */ - rc=shell_execute("QuotedAllParams", fileA, " ", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - todo_wine { - okChildInt("argcA", 5); - okChildString("argvA4", " "); - } - } - - /* %~3 */ - rc=shell_execute("NoQuotesParams345etc", fileA, "a b c d e f g h", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - todo_wine { - okChildInt("argcA", 11); - okChildString("argvA4", "b"); - okChildString("argvA10", "h"); - } - } - - /* %~3 is rest of command line starting with whitespaces after 2nd arg */ - rc=shell_execute("QuotedParams345etc", fileA, "a ", NULL); - ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - if (rc>32) - { - okChildInt("argcA", 5); - todo_wine { - okChildString("argvA4", " "); - } - } - + test = argify_tests; + while (test->params) + { + bad = test->broken.cmd ? &test->broken : &test->cmd; + + /* trace("***** verb='%s' params='%s'\n", test->verb, test->params); */ + rc = shell_execute_ex(SEE_MASK_DOENVSUBST, test->verb, fileA, test->params, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + + count = 0; + while (test->cmd.args[count]) + count++; + if ((test->todo & 0x1) == 0) + /* +4 for the shlexec arguments, -1 because of the added "" + * argument for the CommandLineToArgvW() tests. + */ + okChildInt("argcA", 4 + count - 1); + else todo_wine + okChildInt("argcA", 4 + count - 1); + + cmd = getChildString("Arguments", "cmdlineA"); + /* Our commands are such that the verb immediately precedes the + * part we are interested in. + */ + if (cmd) cmd = strstr(cmd, test->verb); + if (cmd) cmd += strlen(test->verb); + if (!cmd) cmd = "(null)"; + if ((test->todo & 0x2) == 0) + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + else todo_wine + ok(!strcmp(cmd, test->cmd.cmd) || broken(!strcmp(cmd, bad->cmd)), + "%s: the cmdline is '%s' instead of '%s'\n", shell_call, cmd, test->cmd.cmd); + + for (i = 0; i < count - 1; i++) + { + char argname[18]; + sprintf(argname, "argvA%d", 4 + i); + if ((test->todo & (1 << (i+4))) == 0) + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); + else todo_wine + okChildStringBroken(argname, test->cmd.args[i+1], bad->args[i+1]); + } + + if (has_cl2a) + has_cl2a = test_one_cmdline(&(test->cmd)); + test++; + } + + /* Test with a long parameter */ + for (rc = 0; rc < MAX_PATH; rc++) + fileA[rc] = 'a' + rc % 26; + fileA[MAX_PATH-1] = '\0'; + sprintf(params, "shlexec \"%s\" %s", child_file, fileA); + + /* We need NOZONECHECKS on Win2003 to block a dialog */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", fileA); } static void test_filename(void) @@ -1135,7 +1462,7 @@ char filename[MAX_PATH]; const filename_tests_t* test; char* c; - int rc; + INT_PTR rc; test=filename_tests; while (test->basename) @@ -1177,13 +1504,13 @@ if ((test->todo & 0x1)==0) { ok(rc==test->rc || - broken(quotedfile && rc == 2), /* NT4 */ - "%s failed: rc=%d err=%d\n", shell_call, + broken(quotedfile && rc == SE_ERR_FNF), /* NT4 */ + "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } if (rc == 33) @@ -1227,12 +1554,12 @@ rc=33; if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } if (rc==0) @@ -1296,7 +1623,7 @@ */ sprintf(filename, "\"%s\\test file.shlexec\"", tmpdir); rc=shell_execute(NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, + ok(rc > 32, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); @@ -1305,8 +1632,144 @@ } } +typedef struct +{ + const char* urlprefix; + const char* basename; + int flags; + int todo; +} fileurl_tests_t; + +#define URL_SUCCESS 0x1 +#define USE_COLON 0x2 +#define USE_BSLASH 0x4 + +static fileurl_tests_t fileurl_tests[]= +{ + /* How many slashes does it take... */ + {"file:", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://///", "%s\\test file.shlexec", 0, 0}, + + /* Test with Windows-style paths */ + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0}, + + /* Check handling of hostnames */ + {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://localhost:80/", "%s\\test file.shlexec", 0, 0}, + {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0}, + {"file://::1/", "%s\\test file.shlexec", 0, 0}, + {"file://notahost/", "%s\\test file.shlexec", 0, 0}, + + /* Environment variables are not expanded in URLs */ + {"%urlprefix%", "%s\\test file.shlexec", 0, 0x1}, + {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, + + /* Test shortcuts vs. URLs */ + {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, + + {NULL, NULL, 0, 0} +}; + +static void test_fileurls(void) +{ + char filename[MAX_PATH], fileurl[MAX_PATH], longtmpdir[MAX_PATH]; + char command[MAX_PATH]; + const fileurl_tests_t* test; + char *s; + INT_PTR rc; + + rc = (INT_PTR)ShellExecute(NULL, NULL, "file:///nosuchfile.shlexec", NULL, NULL, SW_SHOWNORMAL); + if (rc > 32) + { + win_skip("shell32 is too old (likely < 4.72). Skipping the file URL tests\n"); + return; + } + + get_long_path_name(tmpdir, longtmpdir, sizeof(longtmpdir)/sizeof(*longtmpdir)); + SetEnvironmentVariable("urlprefix", "file:///"); + + test=fileurl_tests; + while (test->basename) + { + /* Build the file URL */ + sprintf(filename, test->basename, longtmpdir); + strcpy(fileurl, test->urlprefix); + strcat(fileurl, filename); + s = fileurl + strlen(test->urlprefix); + while (*s) + { + if (!(test->flags & USE_COLON) && *s == ':') + *s = '|'; + else if (!(test->flags & USE_BSLASH) && *s == '\\') + *s = '/'; + s++; + } + + /* Test it first with FindExecutable() */ + rc = (INT_PTR)FindExecutableA(fileurl, NULL, command); + ok(rc == SE_ERR_FNF, "FindExecutable(%s) failed: bad rc=%lu\n", fileurl, rc); + + /* Then ShellExecute() */ + if ((test->todo & 0x10) == 0) + rc = shell_execute(NULL, fileurl, NULL, NULL); + else todo_wait + rc = shell_execute(NULL, fileurl, NULL, NULL); + if (bad_shellexecute) + { + win_skip("shell32 is too old (likely 4.72). Skipping the file URL tests\n"); + break; + } + if (test->flags & URL_SUCCESS) + { + if ((test->todo & 0x1) == 0) + ok(rc > 32, "%s failed: bad rc=%lu\n", shell_call, rc); + else todo_wine + ok(rc > 32, "%s failed: bad rc=%lu\n", shell_call, rc); + } + else + { + if ((test->todo & 0x1) == 0) + ok(rc == SE_ERR_FNF || rc == SE_ERR_PNF || + broken(rc == SE_ERR_ACCESSDENIED) /* win2000 */, + "%s failed: bad rc=%lu\n", shell_call, rc); + else todo_wine + ok(rc == SE_ERR_FNF || rc == SE_ERR_PNF || + broken(rc == SE_ERR_ACCESSDENIED) /* win2000 */, + "%s failed: bad rc=%lu\n", shell_call, rc); + } + if (rc == 33) + { + if ((test->todo & 0x2) == 0) + okChildInt("argcA", 5); + else todo_wine + okChildInt("argcA", 5); + + if ((test->todo & 0x4) == 0) + okChildString("argvA3", "Open"); + else todo_wine + okChildString("argvA3", "Open"); + + if ((test->todo & 0x8) == 0) + okChildPath("argvA4", filename); + else todo_wine + okChildPath("argvA4", filename); + } + test++; + } + + SetEnvironmentVariable("urlprefix", NULL); +} + static void test_find_executable(void) { + char notepad_path[MAX_PATH]; char filename[MAX_PATH]; char command[MAX_PATH]; const filename_tests_t* test; @@ -1328,6 +1791,21 @@ ok(rc == SE_ERR_FNF || rc > 32 /* nt4 */, "FindExecutable(NULL) returned %ld\n", rc); ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); } + + GetSystemDirectoryA( notepad_path, MAX_PATH ); + strcat( notepad_path, "\\notepad.exe" ); + + /* Search for something that should be in the system-wide search path (no default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", NULL, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); + + /* Search for something that should be in the system-wide search path (with default directory) */ + strcpy(command, "your word"); + rc=(INT_PTR)FindExecutableA("notepad.exe", tmpdir, command); + ok(rc > 32, "FindExecutable(%s) returned %ld\n", "notepad.exe", rc); + ok(strcasecmp(command, notepad_path) == 0, "FindExecutable(%s) returned command=[%s]\n", "notepad.exe", command); strcpy(command, "your word"); rc=(INT_PTR)FindExecutableA(tmpdir, NULL, command); @@ -1448,22 +1926,36 @@ char filename[MAX_PATH]; char params[MAX_PATH]; const filename_tests_t* test; - int rc; - + INT_PTR rc; + + /* Should open through our association */ sprintf(filename, "%s\\test_shortcut_shlexec.lnk", tmpdir); - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, - GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); sprintf(params, "%s\\test file.shlexec", tmpdir); get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); + todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "Open"); + sprintf(params, "%s\\test file.shlexec", tmpdir); + get_long_path_name(params, filename, sizeof(filename)); + todo_wine okChildPath("argvA4", filename); + + /* Should just run our executable */ sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, - GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 4); + okChildString("argvA3", "Lnk"); + + /* Lnk's ContextMenuHandler has priority over an explicit class */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec"); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); @@ -1481,8 +1973,8 @@ *c='/'; c++; } - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); @@ -1496,17 +1988,17 @@ sprintf(params+1, test->basename, tmpdir); strcat(params,"\""); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, params, - NULL); + NULL, NULL); if (rc > 32) rc=33; if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); } if (rc==0) @@ -1546,14 +2038,14 @@ { char filename[MAX_PATH]; char params[1024]; - int rc; + INT_PTR rc; sprintf(params, "shlexec \"%s\" Exec", child_file); /* We need NOZONECHECKS on Win2003 to block a dialog */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL); - ok(rc > 32, "%s returned %d\n", shell_call, rc); + NULL, NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec"); @@ -1564,45 +2056,7 @@ { rc=shell_execute(NULL, filename, params, NULL); todo_wine { - ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%d\n", shell_call, rc); - } - } - } - else - { - win_skip("Skipping shellexecute of file with unassociated extension\n"); - } -} - -static void test_exes_long(void) -{ - char filename[MAX_PATH]; - char params[2024]; - char longparam[MAX_PATH]; - int rc; - - for (rc = 0; rc < MAX_PATH; rc++) - longparam[rc]='a'+rc%26; - longparam[MAX_PATH-1]=0; - - - sprintf(params, "shlexec \"%s\" %s", child_file,longparam); - - /* We need NOZONECHECKS on Win2003 to block a dialog */ - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL); - ok(rc > 32, "%s returned %d\n", shell_call, rc); - okChildInt("argcA", 4); - okChildString("argvA3", longparam); - - if (! skip_noassoc_tests) - { - sprintf(filename, "%s\\test file.noassoc", tmpdir); - if (CopyFile(argv0, filename, FALSE)) - { - rc=shell_execute(NULL, filename, params, NULL); - todo_wine { - ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%d\n", shell_call, rc); + ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%lu\n", shell_call, rc); } } } @@ -1624,7 +2078,7 @@ int todo; } dde_tests_t; -#if BUG_7233_IS_FIXED +#if CORE_6559_IS_FIXED static dde_tests_t dde_tests[] = { /* Test passing and not passing command-line @@ -1667,7 +2121,7 @@ * by changing the entry for WaitForInputIdle() in the shell32 import address * table. */ -static void hook_WaitForInputIdle(void *new_func) +static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) { char *base; PIMAGE_NT_HEADERS nt_headers; @@ -1728,11 +2182,11 @@ char filename[MAX_PATH], defApplication[MAX_PATH]; const dde_tests_t* test; char params[1024]; - int rc; + INT_PTR rc; HANDLE map; char *shared_block; - hook_WaitForInputIdle((void *) hooked_WaitForInputIdle); + hook_WaitForInputIdle(hooked_WaitForInputIdle); sprintf(filename, "%s\\test file.sde", tmpdir); @@ -1768,16 +2222,16 @@ ddeExec[0] = 0; dde_ready_event = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); - rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL); + rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL, NULL); CloseHandle(dde_ready_event); if ((test->todo & 0x1)==0) { - ok(32 < rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(32 < rc, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(32 < rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(32 < rc, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); } if (32 < rc) @@ -1832,7 +2286,7 @@ int rc[DDE_DEFAULT_APP_VARIANTS]; } dde_default_app_tests_t; -#if BUG_7233_IS_FIXED +#if CORE_6559_IS_FIXED static dde_default_app_tests_t dde_default_app_tests[] = { /* Windows XP and 98 handle default DDE app names in different ways. @@ -1887,7 +2341,7 @@ assert(info && info->filename); PostThreadMessage(info->threadIdParent, WM_QUIT, - shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, info->filename, NULL, NULL), + shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, info->filename, NULL, NULL, NULL), 0L); ExitThread(0); } @@ -1901,7 +2355,8 @@ char params[1024]; DWORD threadId; MSG msg; - int rc, which = 0; + INT_PTR rc; + int which = 0; post_quit_on_execute = FALSE; ddeInst = 0; @@ -1958,12 +2413,12 @@ if ((test->todo & 0x1)==0) { - ok(rc==test->rc[which], "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc[which], "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc[which], "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc[which], "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); } if (rc == 33) @@ -2039,6 +2494,9 @@ DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + /* Set %TMPDIR% for the tests */ + SetEnvironmentVariableA("TMPDIR", tmpdir); + rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); assert(rc != 0); init_event(child_file); @@ -2054,7 +2512,7 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hfile==INVALID_HANDLE_VALUE) { - trace("unable to create '%s': err=%d\n", filename, GetLastError()); + trace("unable to create '%s': err=%u\n", filename, GetLastError()); assert(0); } CloseHandle(hfile); @@ -2102,15 +2560,6 @@ create_test_verb(".shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\""); create_test_verb(".shlexec", "UpperL", 0, "UpperL %L"); create_test_verb(".shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); - - create_test_verb(".shlexec", "NoQuotesParam2", 0, "NoQuotesParam2 %2"); - create_test_verb(".shlexec", "QuotedParam2", 0, "QuotedParam2 \"%2\""); - - create_test_verb(".shlexec", "NoQuotesAllParams", 0, "NoQuotesAllParams %*"); - create_test_verb(".shlexec", "QuotedAllParams", 0, "QuotedAllParams \"%*\""); - - create_test_verb(".shlexec", "NoQuotesParams345etc", 0, "NoQuotesParams345etc %~3"); - create_test_verb(".shlexec", "QuotedParams345etc", 0, "QuotedParams345etc \"%~3\""); } static void cleanup_test(void) @@ -2139,128 +2588,57 @@ CoUninitialize(); } -static void test_commandline(void) -{ - static const WCHAR one[] = {'o','n','e',0}; - static const WCHAR two[] = {'t','w','o',0}; - static const WCHAR three[] = {'t','h','r','e','e',0}; - static const WCHAR four[] = {'f','o','u','r',0}; - - static const WCHAR fmt1[] = {'%','s',' ','%','s',' ','%','s',' ','%','s',0}; - static const WCHAR fmt2[] = {' ','%','s',' ','%','s',' ','%','s',' ','%','s',0}; - static const WCHAR fmt3[] = {'%','s','=','%','s',' ','%','s','=','\"','%','s','\"',0}; - static const WCHAR fmt4[] = {'\"','%','s','\"',' ','\"','%','s',' ','%','s','\"',' ','%','s',0}; - static const WCHAR fmt5[] = {'\\','\"','%','s','\"',' ','%','s','=','\"','%','s','\\','\"',' ','\"','%','s','\\','\"',0}; - static const WCHAR fmt6[] = {0}; - - static const WCHAR chkfmt1[] = {'%','s','=','%','s',0}; - static const WCHAR chkfmt2[] = {'%','s',' ','%','s',0}; - static const WCHAR chkfmt3[] = {'\\','\"','%','s','\"',0}; - static const WCHAR chkfmt4[] = {'%','s','=','%','s','\"',' ','%','s','\"',0}; - WCHAR cmdline[255]; - LPWSTR *args = (LPWSTR*)0xdeadcafe, pbuf; - INT numargs = -1; - size_t buflen; - DWORD lerror; - - wsprintfW(cmdline,fmt1,one,two,three,four); - args=CommandLineToArgvW(cmdline,&numargs); - if (args == NULL && numargs == -1) - { - win_skip("CommandLineToArgvW not implemented, skipping\n"); - return; - } - ok(numargs == 4, "expected 4 args, got %i\n",numargs); - ok(lstrcmpW(args[0],one)==0,"arg0 is not as expected\n"); - ok(lstrcmpW(args[1],two)==0,"arg1 is not as expected\n"); - ok(lstrcmpW(args[2],three)==0,"arg2 is not as expected\n"); - ok(lstrcmpW(args[3],four)==0,"arg3 is not as expected\n"); - - SetLastError(0xdeadbeef); - args=CommandLineToArgvW(cmdline,NULL); - lerror=GetLastError(); - ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); - SetLastError(0xdeadbeef); - args=CommandLineToArgvW(NULL,NULL); - lerror=GetLastError(); - ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); - - wsprintfW(cmdline,fmt2,one,two,three,four); - args=CommandLineToArgvW(cmdline,&numargs); - ok(numargs == 5, "expected 5 args, got %i\n",numargs); - ok(args[0][0]==0,"arg0 is not as expected\n"); - ok(lstrcmpW(args[1],one)==0,"arg1 is not as expected\n"); - ok(lstrcmpW(args[2],two)==0,"arg2 is not as expected\n"); - ok(lstrcmpW(args[3],three)==0,"arg3 is not as expected\n"); - ok(lstrcmpW(args[4],four)==0,"arg4 is not as expected\n"); - - wsprintfW(cmdline,fmt3,one,two,three,four); - args=CommandLineToArgvW(cmdline,&numargs); - ok(numargs == 2, "expected 2 args, got %i\n",numargs); - wsprintfW(cmdline,chkfmt1,one,two); - ok(lstrcmpW(args[0],cmdline)==0,"arg0 is not as expected\n"); - wsprintfW(cmdline,chkfmt1,three,four); - ok(lstrcmpW(args[1],cmdline)==0,"arg1 is not as expected\n"); - - wsprintfW(cmdline,fmt4,one,two,three,four); - args=CommandLineToArgvW(cmdline,&numargs); - ok(numargs == 3, "expected 3 args, got %i\n",numargs); - ok(lstrcmpW(args[0],one)==0,"arg0 is not as expected\n"); - wsprintfW(cmdline,chkfmt2,two,three); - ok(lstrcmpW(args[1],cmdline)==0,"arg1 is not as expected\n"); - ok(lstrcmpW(args[2],four)==0,"arg2 is not as expected\n"); - - wsprintfW(cmdline,fmt5,one,two,three,four); - args=CommandLineToArgvW(cmdline,&numargs); - ok(numargs == 2, "expected 2 args, got %i\n",numargs); - wsprintfW(cmdline,chkfmt3,one); - todo_wine ok(lstrcmpW(args[0],cmdline)==0,"arg0 is not as expected\n"); - wsprintfW(cmdline,chkfmt4,two,three,four); - todo_wine ok(lstrcmpW(args[1],cmdline)==0,"arg1 is not as expected\n"); - - wsprintfW(cmdline,fmt6); - args=CommandLineToArgvW(cmdline,&numargs); - ok(numargs == 1, "expected 1 args, got %i\n",numargs); - if (numargs == 1) { - buflen = max(lstrlenW(args[0])+1,256); - pbuf = HeapAlloc(GetProcessHeap(), 0, buflen*sizeof(pbuf[0])); - GetModuleFileNameW(NULL, pbuf, buflen); - pbuf[buflen-1] = 0; - /* check args[0] is module file name */ - ok(lstrcmpW(args[0],pbuf)==0, "wrong path to the current executable\n"); - HeapFree(GetProcessHeap(), 0, pbuf); - } -} - static void test_directory(void) { - char path[MAX_PATH], newdir[MAX_PATH]; - char params[1024]; - int rc; - - /* copy this executable to a new folder and cd to it */ - sprintf(newdir, "%s\\newfolder", tmpdir); - rc = CreateDirectoryA( newdir, NULL ); - ok( rc, "failed to create %s err %u\n", newdir, GetLastError() ); - sprintf(path, "%s\\%s", newdir, path_find_file_name(argv0)); + char path[MAX_PATH], curdir[MAX_PATH]; + char params[1024], dirpath[1024]; + INT_PTR rc; + + sprintf(path, "%s\\test2.exe", tmpdir); CopyFileA(argv0, path, FALSE); - SetCurrentDirectory(tmpdir); sprintf(params, "shlexec \"%s\" Exec", child_file); + /* Test with the current directory */ + GetCurrentDirectoryA(sizeof(curdir), curdir); + SetCurrentDirectoryA(tmpdir); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, NULL); - todo_wine ok(rc == SE_ERR_FNF, "%s returned %d\n", shell_call, rc); - - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, newdir); - ok(rc > 32, "%s returned %d\n", shell_call, rc); + NULL, "test2.exe", params, NULL, NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec"); todo_wine okChildPath("longPath", path); - - DeleteFile(path); - RemoveDirectoryA(newdir); + SetCurrentDirectoryA(curdir); + + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, NULL, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + + /* Explicitly specify the directory to use */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, tmpdir, NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + + /* Specify it through an environment variable */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, "%TMPDIR%", NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + + rc=shell_execute_ex(SEE_MASK_DOENVSUBST|SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, "%TMPDIR%", NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + + /* Not a colon-separated directory list */ + sprintf(dirpath, "%s:%s", curdir, tmpdir); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, dirpath, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); } START_TEST(shlexec) @@ -2275,20 +2653,20 @@ init_test(); + test_commandline2argv(); test_argify(); test_lpFile_parsed(); test_filename(); + test_fileurls(); test_find_executable(); test_lnks(); test_exes(); - test_exes_long(); -#if BUG_7233_IS_FIXED +#if CORE_6559_IS_FIXED test_dde(); test_dde_default_app(); #endif - win_skip("Skipping test_dde() until we have a sane DDE implementation. Bug 7233.\n"); - win_skip("Skipping test_dde_default_app() until we have a sane DDE implementation. Bug 7233.\n"); - test_commandline(); + win_skip("Skipping test_dde() until we have a sane DDE implementation. CORE-6559.\n"); + win_skip("Skipping test_dde_default_app() until we have a sane DDE implementation. CORE-6559.\n"); test_directory(); cleanup_test(); Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -995,7 +995,11 @@ shfo.fFlags |= FOF_NOERRORUI; set_curr_dir_path(from, "test1.txt\0test2.txt\0"); set_curr_dir_path(to, "test3.txt\0"); - retval = SHFileOperation(&shfo); + shfo.fAnyOperationsAborted = 0xdeadbeef; + retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (retval == DE_FLDDESTISFILE || /* Vista and W2K8 */ retval == DE_INVALIDFILES) /* Win7 */ { @@ -1012,8 +1016,11 @@ /* try to copy many files to nonexistent directory */ DeleteFile(to); shfo.fFlags &= ~FOF_NOERRORUI; - shfo.fAnyOperationsAborted = FALSE; - retval = SHFileOperation(&shfo); + shfo.fAnyOperationsAborted = 0xdeadbeef; + retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(DeleteFile("test3.txt\\test1.txt"), "Expected test3.txt\\test1.txt to exist\n"); ok(DeleteFile("test3.txt\\test2.txt"), "Expected test3.txt\\test1.txt to exist\n"); @@ -1024,11 +1031,16 @@ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0testdir2\\d.txt\0"; shfo.fFlags |= FOF_NOERRORUI | FOF_MULTIDESTFILES; - retval = SHFileOperation(&shfo); + shfo.fAnyOperationsAborted = 0xdeadbeef; + retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("testdir2\\a.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("testdir2\\a.txt\\test1.txt"), "Expected testdir2\\a.txt\\test1.txt to exist\n"); RemoveDirectory("testdir2\\a.txt"); ok(DeleteFile("testdir2\\b.txt\\test2.txt"), "Expected testdir2\\b.txt\\test2.txt to exist\n"); @@ -1049,11 +1061,15 @@ /* send in FOF_MULTIDESTFILES with too many destination files */ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "e.txt\0f.txt\0"; - shfo.fAnyOperationsAborted = FALSE; - retval = SHFileOperation(&shfo); + shfo.fAnyOperationsAborted = 0xdeadbeef; + retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("e.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(retval == DE_SAMEFILE, "Expected DE_SAMEFILE, got %d\n", retval); ok(DeleteFile("e.txt\\test1.txt"), "Expected e.txt\\test1.txt to exist\n"); RemoveDirectory("e.txt"); @@ -1072,8 +1088,11 @@ /* use FOF_MULTIDESTFILES with files and a source directory */ shfo.pFrom = "test1.txt\0test2.txt\0test4.txt\0"; shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; - retval = SHFileOperation(&shfo); + shfo.fAnyOperationsAborted = 0xdeadbeef; + retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); ok(retval == ERROR_SUCCESS || broken(retval == 0x100a1), /* WinMe */ "Expected ERROR_SUCCESS, got %d\n", retval); @@ -1085,13 +1104,17 @@ /* try many dest files without FOF_MULTIDESTFILES flag */ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; shfo.pTo = "a.txt\0b.txt\0c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; shfo.fFlags &= ~FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); + ok(shfo.fAnyOperationsAborted != 0xdeadbeef || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Expected TRUE/FALSE fAnyOperationsAborted not 0xdeadbeef\n"); if (dir_exists("a.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("a.txt\\test1.txt"), "Expected a.txt\\test1.txt to exist\n"); ok(DeleteFile("a.txt\\test2.txt"), "Expected a.txt\\test2.txt to exist\n"); ok(DeleteFile("a.txt\\test3.txt"), "Expected a.txt\\test3.txt to exist\n"); @@ -1099,7 +1122,11 @@ } else { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(shfo.fAnyOperationsAborted || + broken(!shfo.fAnyOperationsAborted), /* NT4 */ + "Expected aborted operations\n"); ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); } @@ -1157,8 +1184,11 @@ init_shfo_tests(); shfo.pFrom = "test1.txt\0"; shfo.pTo = "b.txt\0c.txt\0"; - shfo.fAnyOperationsAborted = FALSE; - retval = SHFileOperation(&shfo); + shfo.fAnyOperationsAborted = 0xdeadbeef; + retval = SHFileOperation(&shfo); + ok(!shfo.fAnyOperationsAborted || + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ + "Didn't expect aborted operations\n"); if (retval == DE_OPCANCELLED) { /* NT4 fails and doesn't copy any files */ @@ -1177,11 +1207,13 @@ /* copy two file to three others, all fail */ shfo.pFrom = "test1.txt\0test2.txt\0"; shfo.pTo = "b.txt\0c.txt\0d.txt\0"; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); if (dir_exists("b.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("b.txt\\test1.txt"), "Expected b.txt\\test1.txt to exist\n"); RemoveDirectory("b.txt"); ok(DeleteFile("c.txt\\test2.txt"), "Expected c.txt\\test2.txt to exist\n"); @@ -1191,7 +1223,7 @@ { expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted || - broken(!shfo.fAnyOperationsAborted), /* NT4 */ + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ "Expected aborted operations\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); } @@ -1199,12 +1231,13 @@ /* copy one file and one directory to three others */ shfo.pFrom = "test1.txt\0test4.txt\0"; shfo.pTo = "b.txt\0c.txt\0d.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; retval = SHFileOperation(&shfo); if (dir_exists("b.txt")) { /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(DeleteFile("b.txt\\test1.txt"), "Expected b.txt\\test1.txt to exist\n"); RemoveDirectory("b.txt"); ok(RemoveDirectory("c.txt\\test4.txt"), "Expected c.txt\\test4.txt to exist\n"); @@ -1214,7 +1247,7 @@ { expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(shfo.fAnyOperationsAborted || - broken(!shfo.fAnyOperationsAborted), /* NT4 */ + broken(shfo.fAnyOperationsAborted == 0xdeadbeef), /* NT4 */ "Expected aborted operations\n"); ok(!DeleteFile("b.txt"), "Expected b.txt to not exist\n"); ok(!DeleteFile("c.txt"), "Expected c.txt to not exist\n"); @@ -1383,10 +1416,11 @@ shfo.fFlags = FOF_NOCONFIRMATION; shfo.pFrom = "test1.txt\0"; shfo.pTo = "test2.txt\0"; - shfo.fAnyOperationsAborted = FALSE; + shfo.fAnyOperationsAborted = 0xdeadbeef; /* without FOF_NOCONFIRMATION the confirmation is Yes/No */ retval = SHFileOperation(&shfo); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); ok(file_has_content("test2.txt", "test1.txt\n"), "The file was not copied\n"); shfo.pFrom = "test3.txt\0test1.txt\0"; Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -73,6 +73,18 @@ static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static WCHAR *make_wstr(const char *str) { WCHAR *ret; @@ -566,7 +578,9 @@ CLSID id; hr = IPersist_GetClassID(pp, &id); ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(IsEqualIID(&id, &CLSID_ShellDocObjView), "Unexpected classid\n"); + /* CLSID_ShellFSFolder on some w2k systems */ + ok(IsEqualIID(&id, &CLSID_ShellDocObjView) || broken(IsEqualIID(&id, &CLSID_ShellFSFolder)), + "Unexpected classid %s\n", debugstr_guid(&id)); IPersist_Release(pp); } @@ -782,7 +796,7 @@ broken(hr == S_OK), /* Win9x, W2K */ "hr = %08x\n", hr); if (hr == S_OK) { - IShellFolder_Release(psfFile); + IUnknown_Release(psfFile); } if (!pSHBindToParent) Modified: trunk/rostests/winetests/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlview… ============================================================================== --- trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlview.c [iso-8859-1] Sun Dec 9 22:05:54 2012 @@ -170,7 +170,7 @@ if(*ppvObj) { - IUnknown_AddRef(iface); + IDataObject_AddRef(iface); return S_OK; } @@ -302,7 +302,7 @@ if(*ppvObj) { - IUnknown_AddRef(iface); + IShellBrowser_AddRef(iface); return S_OK; }

11 years, 9 months

[akhaldi] 57857: [PSDK] * Update some shell related headers. [UUID] * Add some GUIDs to shguids.c. [MAIN.CPL] * Remove initguid.h inclusion and link to uuid.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 9 22:04:46 2012 New Revision: 57857 URL: http://svn.reactos.org/svn/reactos?rev=57857&view=rev Log: [PSDK] * Update some shell related headers. [UUID] * Add some GUIDs to shguids.c. [MAIN.CPL] * Remove initguid.h inclusion and link to uuid. Modified: trunk/reactos/dll/cpl/main/CMakeLists.txt trunk/reactos/dll/cpl/main/main.h trunk/reactos/include/psdk/shellapi.h trunk/reactos/include/psdk/shlguid.h trunk/reactos/lib/sdk/uuid/shguids.c Modified: trunk/reactos/dll/cpl/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/CMakeLists.txt [iso-8859-1] Sun Dec 9 22:04:46 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() spec2def(main.cpl main.spec) @@ -11,6 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/main.def) set_module_type(main cpl UNICODE) +target_link_libraries(main uuid) add_importlibs(main msvcrt Modified: trunk/reactos/dll/cpl/main/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.h?rev=57… ============================================================================== --- trunk/reactos/dll/cpl/main/main.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/main.h [iso-8859-1] Sun Dec 9 22:04:46 2012 @@ -1,5 +1,4 @@ #include <windows.h> -#include <initguid.h> #include <cplext.h> #include <winuser.h> #include <tchar.h> Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Sun Dec 9 22:04:46 2012 @@ -391,6 +391,18 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD); BOOL WINAPI SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW); +DWORD +WINAPI +DoEnvironmentSubstA( + _Inout_updates_(cchSrc) LPSTR pszSrc, + UINT cchSrc); + +DWORD +WINAPI +DoEnvironmentSubstW( + _Inout_updates_(cchSrc) LPWSTR pszSrc, + UINT cchSrc); + #ifdef UNICODE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE @@ -417,6 +429,7 @@ #define SHQueryRecycleBin SHQueryRecycleBinW #define SHEmptyRecycleBin SHEmptyRecycleBinW #define SHGetNewLinkInfo SHGetNewLinkInfoW +#define DoEnvironmentSubst DoEnvironmentSubstW #else #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE @@ -444,6 +457,7 @@ #define SHQueryRecycleBin SHQueryRecycleBinA #define SHEmptyRecycleBin SHEmptyRecycleBinA #define SHGetNewLinkInfo SHGetNewLinkInfoA +#define DoEnvironmentSubst DoEnvironmentSubstA #endif #if !defined(_WIN64) Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Sun Dec 9 22:04:46 2012 @@ -19,63 +19,74 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); - -DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); -DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); -DEFINE_OLEGUID(CATID_DeskBand, 0x00021492L, 0, 0); -DEFINE_OLEGUID(CATID_InfoBand, 0x00021493L, 0, 0); -DEFINE_OLEGUID(CATID_CommBand, 0x00021494L, 0, 0); +DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400, 0, 0); + +DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490, 0, 0); +DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491, 0, 0); +DEFINE_OLEGUID(CATID_DeskBand, 0x00021492, 0, 0); +DEFINE_OLEGUID(CATID_InfoBand, 0x00021493, 0, 0); +DEFINE_OLEGUID(CATID_CommBand, 0x00021494, 0, 0); /* shell32 formatids */ -DEFINE_OLEGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); -DEFINE_OLEGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); +DEFINE_OLEGUID(FMTID_Intshcut, 0x000214A0, 0, 0); +DEFINE_OLEGUID(FMTID_InternetSite, 0x000214A1, 0, 0); /* command group ids */ -DEFINE_OLEGUID(CGID_Explorer, 0x000214D0L, 0, 0); -DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); -DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); -DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); +DEFINE_OLEGUID(CGID_Explorer, 0x000214D0, 0, 0); +DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1, 0, 0); +DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2, 0, 0); +DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3, 0, 0); /*DEFINE_OLEGUID(IID_IShellIcon, 0x000214E5L, 0, 0);*/ -DEFINE_OLEGUID(IID_IShellDetails, 0x000214ECL, 0, 0); -DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); -DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); -DEFINE_OLEGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); -DEFINE_OLEGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); -DEFINE_OLEGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); -DEFINE_OLEGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); -DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); -DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); -DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500L, 0, 0); - -DEFINE_GUID(IID_IACList, 0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); -DEFINE_GUID(IID_IACList2, 0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); -DEFINE_GUID(IID_IObjMgr, 0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); - -DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); +DEFINE_OLEGUID(IID_IShellDetails, 0x000214EC, 0, 0); +DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214ED, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EF, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerA, 0x000214F0, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerSite, 0x000214F3, 0, 0); +DEFINE_OLEGUID(IID_IPropSheetPage, 0x000214F6, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerW, 0x000214F8, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FC, 0, 0); +DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FE, 0, 0); +DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500, 0, 0); /* avoid duplicate definitions with shobjidl.h (FIXME) */ /* DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); */ -/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ -/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ -/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ -/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EB, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FA, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4, 0, 0); */ +/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8, 0, 0); */ +/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EA, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EE, 0, 0); */ +/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FB, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7, 0, 0); */ + +#ifndef NO_INTSHCUT_GUIDS +#include <isguids.h> +#endif + +#ifndef NO_SHDOCVW_GUIDS +# ifndef GUID_DEFS_ONLY +# include <exdisp.h> +# include <shldisp.h> +# endif + +DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); +DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); + +DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); +#define SID_SProgressUI CLSID_ProgressDialog DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory @@ -83,16 +94,23 @@ DEFINE_GUID(CLSID_CURLSearchHook, 0xcfbfae00, 0x17a6, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); + +DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); + +#define SID_SInternetExplorer IID_IWebBrowserApp +#define SID_SWebBrowserApp IID_IWebBrowserApp +#define SID_SWebBrowserEventsService IID_IWebBrowserEventsService + +#endif /* NO_SHDOCVW_GUIDS */ + DEFINE_GUID(SID_STopWindow, 0x49e1b500, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); #define SID_LinkSite IID_IShellLinkW #define SID_SShellBrowser IID_IShellBrowser #define SID_SShellDesktop CLSID_ShellDesktop -#define SID_SInternetExplorer IID_IWebBrowserApp -#define SID_SWebBrowserApp IID_IWebBrowserApp -#define SID_SWebBrowserEventsService IID_IWebBrowserEventsService - #define IID_IFileViewer WINELIB_NAME_AW(IID_IFileViewer) #define IID_IShellLink WINELIB_NAME_AW(IID_IShellLink) #define IID_IExtractIcon WINELIB_NAME_AW(IID_IExtractIcon) @@ -100,9 +118,9 @@ #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) -DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); -DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); -DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(IID_IInputObject, 0x68284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); +DEFINE_GUID(IID_IInputObjectSite, 0xF1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); /**************************************************************************** * the next IID's are the namespace elements of the pidls @@ -126,11 +144,9 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); -DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); - DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); + +DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); @@ -161,6 +177,39 @@ DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, 0x4f, 0xd7, 0x06, 0xec); DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); + +#include <knownfolders.h> + +/* FOLDERTYPEID */ +DEFINE_GUID(FOLDERTYPEID_Communications, 0x91475fe5, 0x586b, 0x4eba, 0x8d, 0x75, 0xd1, 0x74, 0x34, 0xb8, 0xcd, 0xf6); +DEFINE_GUID(FOLDERTYPEID_CompressedFolder, 0x80213e82, 0xbcfd, 0x4c4f, 0x88, 0x17, 0xbb, 0x27, 0x60, 0x12, 0x67, 0xa9); +DEFINE_GUID(FOLDERTYPEID_Contacts, 0xde2b70ec, 0x9bf7, 0x4a93, 0xbd, 0x3d, 0x24, 0x3f, 0x78, 0x81, 0xd4, 0x92); +DEFINE_GUID(FOLDERTYPEID_ControlPanelCategory, 0xde4f0660, 0xfa10, 0x4b8f, 0xa4, 0x94, 0x06, 0x8b, 0x20, 0xb2, 0x23, 0x07); +DEFINE_GUID(FOLDERTYPEID_ControlPanelClassic, 0x0c3794f3, 0xb545, 0x43aa, 0xa3, 0x29, 0xc3, 0x74, 0x30, 0xc5, 0x8d, 0x2a); +DEFINE_GUID(FOLDERTYPEID_Documents, 0x7d49d726, 0x3c21, 0x4f05, 0x99, 0xaa, 0xfd, 0xc2, 0xc9, 0x47, 0x46, 0x56); +DEFINE_GUID(FOLDERTYPEID_Games, 0xb689b0d0, 0x76d3, 0x4cbb, 0x87, 0xf7, 0x58, 0x5d, 0x0e, 0x0c, 0xe0, 0x70); +DEFINE_GUID(FOLDERTYPEID_Generic, 0x5c4f28b5, 0xf869, 0x4e84, 0x8e, 0x60, 0xf1, 0x1d, 0xb9, 0x7c, 0x5c, 0xc7); +DEFINE_GUID(FOLDERTYPEID_GenericLibrary, 0x5f4eab9a, 0x6833, 0x4f61, 0x89, 0x9d, 0x31, 0xcf, 0x46, 0x97, 0x9d, 0x49); +DEFINE_GUID(FOLDERTYPEID_GenericSearchResults, 0x7fde1a1e, 0x8b31, 0x49a5, 0x93, 0xb8, 0x6b, 0xe1, 0x4c, 0xfa, 0x49, 0x43); +DEFINE_GUID(FOLDERTYPEID_Invalid, 0x57807898, 0x8c4f, 0x4462, 0xbb, 0x63, 0x71, 0x04, 0x23, 0x80, 0xb1, 0x09); +DEFINE_GUID(FOLDERTYPEID_Music, 0x94d6ddcc, 0x4a68, 0x4175, 0xa3, 0x74, 0xbd, 0x58, 0x4a, 0x51, 0x0b, 0x78); +DEFINE_GUID(FOLDERTYPEID_NetworkExplorer, 0x25cc242b, 0x9a7c, 0x4f51, 0x80, 0xe0, 0x7a, 0x29, 0x28, 0xfe, 0xbe, 0x42); +DEFINE_GUID(FOLDERTYPEID_OpenSearch, 0x8faf9629, 0x1980, 0x46ff, 0x80, 0x23, 0x9d, 0xce, 0xab, 0x9c, 0x3e, 0xe3); +DEFINE_GUID(FOLDERTYPEID_OtherUsers, 0xb337fd00, 0x9dd5, 0x4635, 0xa6, 0xd4, 0xda, 0x33, 0xfd, 0x10, 0x2b, 0x7a); +DEFINE_GUID(FOLDERTYPEID_Pictures, 0xb3690e58, 0xe961, 0x423b, 0xb6, 0x87, 0x38, 0x6e, 0xbf, 0xd8, 0x32, 0x39); +DEFINE_GUID(FOLDERTYPEID_Printers, 0x2c7bbec6, 0xc844, 0x4a0a, 0x91, 0xfa, 0xce, 0xf6, 0xf5, 0x9c, 0xfd, 0xa1); +DEFINE_GUID(FOLDERTYPEID_PublishedItems, 0x7f2f5b96, 0xff74, 0x41da, 0xaf, 0xd8, 0x1c, 0x78, 0xa5, 0xf3, 0xae, 0xa2); +DEFINE_GUID(FOLDERTYPEID_RecordedTV, 0x5557a28f, 0x5da6, 0x4f83, 0x88, 0x09, 0xc2, 0xc9, 0x8a, 0x11, 0xa6, 0xfa); +DEFINE_GUID(FOLDERTYPEID_RecycleBin, 0xd6d9e004, 0xcd87, 0x442b, 0x9d, 0x57, 0x5e, 0x0a, 0xeb, 0x4f, 0x6f, 0x72); +DEFINE_GUID(FOLDERTYPEID_SavedGames, 0xd0363307, 0x28cb, 0x4106, 0x9f, 0x23, 0x29, 0x56, 0xe3, 0xe5, 0xe0, 0xe7); +DEFINE_GUID(FOLDERTYPEID_SearchConnector, 0x982725ee, 0x6f47, 0x479e, 0xb4, 0x47, 0x81, 0x2b, 0xfa, 0x7d, 0x2e, 0x8f); +DEFINE_GUID(FOLDERTYPEID_Searches, 0x0b0ba2e3, 0x405f, 0x415e, 0xa6, 0xee, 0xca, 0xd6, 0x25, 0x20, 0x78, 0x53); +DEFINE_GUID(FOLDERTYPEID_SearchHome, 0x834d8a44, 0x0974, 0x4ed6, 0x86, 0x6e, 0xf2, 0x03, 0xd8, 0x0b, 0x38, 0x10); +DEFINE_GUID(FOLDERTYPEID_SoftwareExplorer, 0xd674391b, 0x52d9, 0x4e07, 0x83, 0x4e, 0x67, 0xc9, 0x86, 0x10, 0xf3, 0x9d); +DEFINE_GUID(FOLDERTYPEID_StartMenu, 0xef87b4cb, 0xf2ce, 0x4785, 0x86, 0x58, 0x4c, 0xa6, 0xc6, 0x3e, 0x38, 0xc6); +DEFINE_GUID(FOLDERTYPEID_UserFiles, 0xcd0fc69b, 0x71e2, 0x46e5, 0x96, 0x90, 0x5b, 0xcd, 0x9f, 0x57, 0xaa, 0xb3); +DEFINE_GUID(FOLDERTYPEID_UsersLibraries, 0xc4d98f09, 0x6124, 0x4fe0, 0x99, 0x42, 0x82, 0x64, 0x16, 0x08, 0x2d, 0xa9); +DEFINE_GUID(FOLDERTYPEID_Videos, 0x5fa96407, 0x7e77, 0x483c, 0xac, 0x93, 0x69, 0x1d, 0x05, 0x85, 0x0d, 0xe8); /* REACTOS ONLY */ DEFINE_GUID(CLSID_NewMenu, 0xd969A300, 0xe7FF, 0x11D0, 0xA9, 0x3B, 0x0, 0xA0, 0xC9, 0x0F, 0x27, 0x19); Modified: trunk/reactos/lib/sdk/uuid/shguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/shguids.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/uuid/shguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/shguids.c [iso-8859-1] Sun Dec 9 22:04:46 2012 @@ -2,6 +2,7 @@ #include <initguid.h> #include <shlguid.h> +#include <devguid.h> #include <isguids.h> //BHID_LinkTargetItem

11 years, 9 months

[hbelusca] 57856: [NTOSKRNL] Mention that the part of code related to displaying SKU-related bitmap is disabled due to CORE-6781.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 9 21:59:25 2012 New Revision: 57856 URL: http://svn.reactos.org/svn/reactos?rev=57856&view=rev Log: [NTOSKRNL] Mention that the part of code related to displaying SKU-related bitmap is disabled due to CORE-6781. Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Sun Dec 9 21:59:25 2012 @@ -63,7 +63,7 @@ static VOID NTAPI -BootImageFadeProc(VOID) +BootImageFadeIn(VOID) { UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(_MainPalette)]; PBITMAPINFOHEADER PaletteBitmap = (PBITMAPINFOHEADER)PaletteBitmapBuffer; @@ -668,7 +668,10 @@ PVOID Header, Band, Text, Screen; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; - // UCHAR Buffer[64]; + +#ifdef CORE_6781_resolved + UCHAR Buffer[64]; +#endif /* Check if the system thread has already been created */ if (SysThreadCreated) @@ -776,9 +779,9 @@ InbvSetProgressBarCoordinates(257, 352); /* Display the boot logo and fade it in */ - BootImageFadeProc(); - -#if 0 + BootImageFadeIn(); + +#ifdef CORE_6781_resolved /* Check for non-workstation products */ if (SharedUserData->NtProductType != NtProductWinNt) { @@ -793,8 +796,10 @@ #endif } +#ifdef CORE_6781_resolved /* Draw the SKU text if it exits */ -// if (Text) InbvBitBlt(Text, 180, 121); + if (Text) InbvBitBlt(Text, 180, 121); +#endif /* Draw the progress bar bit */ // if (Bar) InbvBitBlt(Bar, 0, 0);

11 years, 9 months

[hbelusca] 57855: [NTOSKRNL] Reintroduce the long-awaited boot-logo fading-in, removed since ReactOS 0.3.3 due to bootvid / inbv refactoring. Code taken from the old (ie. pre-ReactOS 0.3.3) bootvid.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 9 21:43:51 2012 New Revision: 57855 URL: http://svn.reactos.org/svn/reactos?rev=57855&view=rev Log: [NTOSKRNL] Reintroduce the long-awaited boot-logo fading-in, removed since ReactOS 0.3.3 due to bootvid / inbv refactoring. Code taken from the old (ie. pre-ReactOS 0.3.3) bootvid. Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Sun Dec 9 21:43:51 2012 @@ -24,6 +24,92 @@ ULONG PltRotBarStatus; BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; +/* FADING FUNCTION ***********************************************************/ + +/** From include/psdk/wingdi.h **/ +typedef struct tagRGBQUAD +{ + UCHAR rgbBlue; + UCHAR rgbGreen; + UCHAR rgbRed; + UCHAR rgbReserved; +} RGBQUAD,*LPRGBQUAD; +/*******************************/ + +static RGBQUAD _MainPalette[16]; + +#define PALETTE_FADE_STEPS 15 +#define PALETTE_FADE_TIME 20 * 10000 /* 20ms */ + +/** From bootvid/precomp.h **/ +// +// Bitmap Header +// +typedef struct tagBITMAPINFOHEADER +{ + ULONG biSize; + LONG biWidth; + LONG biHeight; + USHORT biPlanes; + USHORT biBitCount; + ULONG biCompression; + ULONG biSizeImage; + LONG biXPelsPerMeter; + LONG biYPelsPerMeter; + ULONG biClrUsed; + ULONG biClrImportant; +} BITMAPINFOHEADER, *PBITMAPINFOHEADER; +/****************************/ + +static VOID +NTAPI +BootImageFadeProc(VOID) +{ + UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(_MainPalette)]; + PBITMAPINFOHEADER PaletteBitmap = (PBITMAPINFOHEADER)PaletteBitmapBuffer; + LPRGBQUAD Palette = (LPRGBQUAD)(PaletteBitmapBuffer + sizeof(BITMAPINFOHEADER)); + + ULONG Iteration, Index, ClrUsed; + LARGE_INTEGER Interval; + + Interval.QuadPart = -PALETTE_FADE_TIME; + + /* + * Build a bitmap containing the fade in palette. The palette entries + * are then processed in a loop and set using VidBitBlt function. + */ + ClrUsed = sizeof(_MainPalette) / sizeof(_MainPalette[0]); + RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); + PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); + PaletteBitmap->biBitCount = 4; + PaletteBitmap->biClrUsed = ClrUsed; + + /* + * Main animation loop. + */ + for (Iteration = 0; Iteration <= PALETTE_FADE_STEPS; ++Iteration) + { + for (Index = 0; Index < ClrUsed; Index++) + { + Palette[Index].rgbRed = + _MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS; + Palette[Index].rgbGreen = + _MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS; + Palette[Index].rgbBlue = + _MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS; + } + + VidBitBlt(PaletteBitmapBuffer, 0, 0); + + /* Wait for a bit. */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + } + + /* Wait for a bit. */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); +} + + /* FUNCTIONS *****************************************************************/ PVOID @@ -267,12 +353,11 @@ if (InbvBootDriverInstalled) VidDisplayString((PUCHAR) String); /* Print the string on the EMS port */ - HeadlessDispatch( - HeadlessCmdPutString, - String, - strlen(String) + sizeof(ANSI_NULL), - NULL, - NULL); + HeadlessDispatch(HeadlessCmdPutString, + String, + strlen(String) + sizeof(ANSI_NULL), + NULL, + NULL); /* Release the lock */ InbvReleaseLock(); @@ -578,10 +663,13 @@ INIT_FUNCTION DisplayBootBitmap(IN BOOLEAN TextMode) { + PBITMAPINFOHEADER BitmapInfoHeader; + LPRGBQUAD Palette; + PVOID Header, Band, Text, Screen; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; - UCHAR Buffer[64]; - + // UCHAR Buffer[64]; + /* Check if the system thread has already been created */ if (SysThreadCreated) { @@ -665,19 +753,32 @@ /* Server product, display appropriate status bar color */ InbvGetResourceAddress(IDB_BAR_SERVER); } - + /* Make sure we had a logo */ if (Screen) { /* Choose progress bar */ TempRotBarSelection = RB_SQUARE_CELLS; + /* + * Save the main image palette and replace it with black palette, so + * we can do fade in effect later. + */ + BitmapInfoHeader = (PBITMAPINFOHEADER)Screen; + Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); + RtlCopyMemory(_MainPalette, Palette, sizeof(_MainPalette)); + RtlZeroMemory(Palette, sizeof(_MainPalette)); + /* Blit the background */ InbvBitBlt(Screen, 0, 0); /* Set progress bar coordinates and display it */ InbvSetProgressBarCoordinates(257, 352); - + + /* Display the boot logo and fade it in */ + BootImageFadeProc(); + +#if 0 /* Check for non-workstation products */ if (SharedUserData->NtProductType != NtProductWinNt) { @@ -689,16 +790,17 @@ /* In setup mode, you haven't selected a SKU yet */ if (ExpInTextModeSetup) Text = NULL; } - } - - /* Draw the SKU text if it exits */ - if (Text) InbvBitBlt(Text, 180, 121); - - /* Draw the progress bar bit */ -// if (Bar) InbvBitBlt(Bar, 0, 0); - - /* Set filter which will draw text display if needed */ - InbvInstallDisplayStringFilter(DisplayFilter); +#endif + } + + /* Draw the SKU text if it exits */ +// if (Text) InbvBitBlt(Text, 180, 121); + + /* Draw the progress bar bit */ +// if (Bar) InbvBitBlt(Bar, 0, 0); + + /* Set filter which will draw text display if needed */ + InbvInstallDisplayStringFilter(DisplayFilter); } /* Do we have a system thread? */

11 years, 9 months

[akhaldi] 57854: [NTDLL_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 9 20:47:13 2012 New Revision: 57854 URL: http://svn.reactos.org/svn/reactos?rev=57854&view=rev Log: [NTDLL_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/ntdll/directory.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/reg.c Modified: trunk/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… ============================================================================== --- trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/directory.c [iso-8859-1] Sun Dec 9 20:47:13 2012 @@ -287,6 +287,11 @@ ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)1 ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + status = pRtlWow64EnableFsRedirection( FALSE ); ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur ); Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/file.c [iso-8859-1] Sun Dec 9 20:47:13 2012 @@ -1106,6 +1106,50 @@ } } + CloseHandle( hPipeClt ); + + /* test associating a completion port with a handle after an async is queued */ + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv == INVALID_HANDLE_VALUE ) + return; + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) + { + OVERLAPPED o = {0,}; + BYTE send_buf[TEST_BUF_LEN], recv_buf[TEST_BUF_LEN]; + DWORD read; + long count; + + memset( send_buf, 0, TEST_BUF_LEN ); + memset( recv_buf, 0xde, TEST_BUF_LEN ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + ReadFile( hPipeSrv, recv_buf, TEST_BUF_LEN, &read, &o); + + U(iosb).Status = 0xdeadbeef; + res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); + ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + WriteFile( hPipeClt, send_buf, TEST_BUF_LEN, &read, NULL ); + + if (get_msg(h)) + { + ok( completionKey == CKEY_SECOND, "Invalid completion key: %lx\n", completionKey ); + ok( ioSb.Information == 3, "Invalid ioSb.Information: %ld\n", ioSb.Information ); + ok( U(ioSb).Status == STATUS_SUCCESS, "Invalid ioSb.Status: %x\n", U(ioSb).Status); + ok( completionValue == (ULONG_PTR)&o, "Invalid completion value: %lx\n", completionValue ); + ok( !memcmp( send_buf, recv_buf, TEST_BUF_LEN ), "Receive buffer (%x %x %x) did not match send buffer (%x %x %x)\n", recv_buf[0], recv_buf[1], recv_buf[2], send_buf[0], send_buf[1], send_buf[2] ); + } + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + } + + CloseHandle( hPipeSrv ); CloseHandle( hPipeClt ); } Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/info.c [iso-8859-1] Sun Dec 9 20:47:13 2012 @@ -23,6 +23,7 @@ #include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); @@ -33,7 +34,8 @@ static NTSTATUS (WINAPI * pNtMapViewOfSection)(HANDLE,HANDLE,PVOID*,ULONG,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); static NTSTATUS (WINAPI * pNtUnmapViewOfSection)(HANDLE,PVOID); static NTSTATUS (WINAPI * pNtClose)(HANDLE); -static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); +static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL is_wow64; @@ -61,6 +63,7 @@ } NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); NTDLL_GET_PROC(NtQueryInformationThread); NTDLL_GET_PROC(NtSetInformationProcess); @@ -72,6 +75,9 @@ NTDLL_GET_PROC(NtMapViewOfSection); NTDLL_GET_PROC(NtUnmapViewOfSection); + /* not present before XP */ + pNtGetCurrentProcessorNumber = (void *) GetProcAddress(hntdll, "NtGetCurrentProcessorNumber"); + pIsWow64Process = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; return TRUE; @@ -180,7 +186,7 @@ LARGE_INTEGER liExpTimeZoneBias; ULONG uCurrentTimeZoneId; DWORD dwUnknown1[5]; - } SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE, *PSYSTEM_TIMEOFDAY_INFORMATION_PRIVATE; + } SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE; SYSTEM_TIMEOFDAY_INFORMATION_PRIVATE sti; @@ -274,13 +280,19 @@ VM_COUNTERS vmCounters; IO_COUNTERS ioCounters; SYSTEM_THREAD_INFORMATION ti[1]; - } SYSTEM_PROCESS_INFORMATION_PRIVATE, *PSYSTEM_PROCESS_INFORMATION_PRIVATE; + } SYSTEM_PROCESS_INFORMATION_PRIVATE; ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); - /* Only W2K3 returns the needed length, the rest returns 0, so we have to loop */ - + /* test ReturnLength */ + ReturnLength = 0; + status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status); + ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, + "Expected a ReturnLength to show the needed length\n"); + + /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ for (;;) { status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength); @@ -572,6 +584,126 @@ ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); } +static void test_query_logicalproc(void) +{ + NTSTATUS status; + ULONG len, i, proc_no; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *slpi; + SYSTEM_INFO si; + + GetSystemInfo(&si); + + status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, NULL, 0, &len); + if(status == STATUS_INVALID_INFO_CLASS) + { + win_skip("SystemLogicalProcessorInformation is not supported\n"); + return; + } + if(status == STATUS_NOT_IMPLEMENTED) + { + todo_wine ok(0, "SystemLogicalProcessorInformation is not implemented\n"); + return; + } + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len); + + slpi = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, slpi, len, &len); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + proc_no = 0; + for(i=0; i<len/sizeof(*slpi); i++) { + switch(slpi[i].Relationship) { + case RelationProcessorCore: + /* Get number of logical processors */ + for(; slpi[i].ProcessorMask; slpi[i].ProcessorMask /= 2) + proc_no += slpi[i].ProcessorMask%2; + break; + default: + break; + } + } + ok(proc_no > 0, "No processors were found\n"); + if(si.dwNumberOfProcessors <= 32) + ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %d, expected %d\n", + proc_no, si.dwNumberOfProcessors); + + HeapFree(GetProcessHeap(), 0, slpi); +} + +static void test_query_processor_power_info(void) +{ + NTSTATUS status; + PROCESSOR_POWER_INFORMATION* ppi; + ULONG size; + SYSTEM_INFO si; + int i; + + GetSystemInfo(&si); + size = si.dwNumberOfProcessors * sizeof(PROCESSOR_POWER_INFORMATION); + ppi = HeapAlloc(GetProcessHeap(), 0, size); + + /* If size < (sizeof(PROCESSOR_POWER_INFORMATION) * NumberOfProcessors), Win7 returns + * STATUS_BUFFER_TOO_SMALL. WinXP returns STATUS_SUCCESS for any value of size. It copies as + * many whole PROCESSOR_POWER_INFORMATION structures that there is room for. Even if there is + * not enough room for one structure, WinXP still returns STATUS_SUCCESS having done nothing. + * + * If ppi == NULL, Win7 returns STATUS_INVALID_PARAMETER while WinXP returns STATUS_SUCCESS + * and does nothing. + * + * The same behavior is seen with CallNtPowerInformation (in powrprof.dll). + */ + + if (si.dwNumberOfProcessors > 1) + { + for(i = 0; i < si.dwNumberOfProcessors; i++) + ppi[i].Number = 0xDEADBEEF; + + /* Call with a buffer size that is large enough to hold at least one but not large + * enough to hold them all. This will be STATUS_SUCCESS on WinXP but not on Win7 */ + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, size - sizeof(PROCESSOR_POWER_INFORMATION)); + if (status == STATUS_SUCCESS) + { + /* lax version found on older Windows like WinXP */ + ok( (ppi[si.dwNumberOfProcessors - 2].Number != 0xDEADBEEF) && + (ppi[si.dwNumberOfProcessors - 1].Number == 0xDEADBEEF), + "Expected all but the last record to be overwritten.\n"); + + status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + for(i = 0; i < si.dwNumberOfProcessors; i++) + ppi[i].Number = 0xDEADBEEF; + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, sizeof(PROCESSOR_POWER_INFORMATION) - 1); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + for(i = 0; i < si.dwNumberOfProcessors; i++) + if (ppi[i].Number != 0xDEADBEEF) break; + ok( i == si.dwNumberOfProcessors, "Expected untouched buffer\n"); + } + else + { + /* picky version found on newer Windows like Win7 */ + ok( ppi[1].Number == 0xDEADBEEF, "Expected untouched buffer.\n"); + ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + + status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size); + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status); + + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, 0); + ok( status == STATUS_BUFFER_TOO_SMALL || status == STATUS_INVALID_PARAMETER, "Got %08x\n", status); + } + } + else + { + skip("Test needs more than one processor.\n"); + } + + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, size); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + HeapFree(GetProcessHeap(), 0, ppi); +} + static void test_query_process_basic(void) { NTSTATUS status; @@ -584,7 +716,7 @@ DWORD_PTR BasePriority; ULONG_PTR UniqueProcessId; ULONG_PTR InheritedFromUniqueProcessId; - } PROCESS_BASIC_INFORMATION_PRIVATE, *PPROCESS_BASIC_INFORMATION_PRIVATE; + } PROCESS_BASIC_INFORMATION_PRIVATE; PROCESS_BASIC_INFORMATION_PRIVATE pbi; @@ -1204,7 +1336,7 @@ status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); - ok(info.Protect == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); + ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); status = pNtUnmapViewOfSection (GetCurrentProcess(), addr); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -1391,6 +1523,62 @@ "Unexpected thread affinity\n" ); } +static void test_NtGetCurrentProcessorNumber(void) +{ + NTSTATUS status; + SYSTEM_INFO si; + PROCESS_BASIC_INFORMATION pbi; + THREAD_BASIC_INFORMATION tbi; + DWORD_PTR old_process_mask; + DWORD_PTR old_thread_mask; + DWORD_PTR new_mask; + ULONG current_cpu; + ULONG i; + + if (!pNtGetCurrentProcessorNumber) { + win_skip("NtGetCurrentProcessorNumber not available\n"); + return; + } + + GetSystemInfo(&si); + current_cpu = pNtGetCurrentProcessorNumber(); + trace("dwNumberOfProcessors: %d, current processor: %d\n", si.dwNumberOfProcessors, current_cpu); + + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL); + old_process_mask = (DWORD_PTR)pbi.Reserved2[0]; + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + old_thread_mask = tbi.AffinityMask; + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + /* allow the test to run on all processors */ + new_mask = (1 << si.dwNumberOfProcessors) - 1; + status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &new_mask, sizeof(new_mask)); + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + for (i = 0; i < si.dwNumberOfProcessors; i++) + { + new_mask = 1 << i; + status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &new_mask, sizeof(new_mask)); + ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status); + + status = pNtQueryInformationThread(GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status); + + current_cpu = pNtGetCurrentProcessorNumber(); + ok((current_cpu == i), "%d (new_mask 0x%lx): running on processor %d (AffinityMask: 0x%lx)\n", + i, new_mask, current_cpu, tbi.AffinityMask); + } + + /* restore old values */ + status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &old_process_mask, sizeof(old_process_mask)); + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &old_thread_mask, sizeof(old_thread_mask)); + ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); +} + START_TEST(info) { char **argv; @@ -1452,6 +1640,16 @@ trace("Starting test_query_regquota()\n"); test_query_regquota(); + /* 0x49 SystemLogicalProcessorInformation */ + trace("Starting test_query_logicalproc()\n"); + test_query_logicalproc(); + + /* NtPowerInformation */ + + /* 0xb ProcessorInformation */ + trace("Starting test_query_processor_power_info()\n"); + test_query_processor_power_info(); + /* NtQueryInformationProcess */ /* 0x0 ProcessBasicInformation */ @@ -1502,4 +1700,5 @@ trace("Starting test_affinity()\n"); test_affinity(); -} + test_NtGetCurrentProcessorNumber(); +} Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… ============================================================================== --- trunk/rostests/winetests/ntdll/om.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/om.c [iso-8859-1] Sun Dec 9 20:47:13 2012 @@ -143,7 +143,8 @@ status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE || - status == STATUS_OBJECT_NAME_INVALID, /* vista */ + status == STATUS_OBJECT_NAME_INVALID || /* vista */ + status == STATUS_OBJECT_NAME_NOT_FOUND, /* win8 */ "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); pRtlInitUnicodeString(&str, buffer4); Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] Sun Dec 9 20:47:13 2012 @@ -124,7 +124,6 @@ static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); -static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, @@ -143,7 +142,6 @@ static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); -static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(ACCESS_MASK,HANDLE*); static HMODULE hntdll = 0; static int CurrentTest = 0; @@ -208,7 +206,7 @@ ValName = pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); - WideCharToMultiByte(0, 0, ValueName, ValueNameLength+1,ValName, ValueNameLength, 0, 0); + WideCharToMultiByte(CP_ACP, 0, ValueName, ValueNameLength+1, ValName, ValueNameLength, NULL, NULL); trace("ValueName: %s\n", ValName); }

11 years, 9 months

[akhaldi] 57853: [KERNEL32_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 9 20:39:13 2012 New Revision: 57853 URL: http://svn.reactos.org/svn/reactos?rev=57853&view=rev Log: [KERNEL32_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/module.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/timer.c trunk/rostests/winetests/kernel32/version.c trunk/rostests/winetests/kernel32/virtual.c trunk/rostests/winetests/kernel32/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/module… Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/timer.… Modified: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/versio… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… Modified: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume…

11 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2012