Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57867: [CONSRV] However here, we must keep the incrementation at the end of the loop, because of a possible corner case (a loop-break which takes place when we reach the last element of ...
by hbelusca＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: hbelusca Date: Tue Dec 11 01:45:49 2012 New Revision: 57867 URL: http://svn.reactos.org/svn/reactos?rev=57867&view=rev Log: [CONSRV] However here, we must keep the incrementation at the end of the loop, because of a possible corner case (a loop-break which takes place when we reach the last element of the list, but NextEntry already points to its head because of the cyclicity of the list) with the following 'if'-test made just after the loop. Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Tue Dec 11 01:45:49 2012 @@ -1118,7 +1118,7 @@ CsrLockedReferenceProcess(CurrentProcess); *CsrProcess = CurrentProcess; } - + /* Return the result */ return Status; } Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Tue Dec 11 01:45:49 2012 @@ -970,9 +970,6 @@ /* Get the Process */ CurrentThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); - /* Move to the next entry */ - NextEntry = NextEntry->Flink; - /* Check for PID Match */ if ((CurrentThread->ClientId.UniqueThread == Tid) && !(CurrentThread->Flags & CsrThreadTerminated)) @@ -980,6 +977,9 @@ /* Get out of here */ break; } + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; } /* Nothing found if we got back to the list */

1 0

[hbelusca] 57866: [CONSRV] Put the "Move to the next entry" code just after retrieving list record, because it is less bug-prone. Indeed correct a bug in CsrDestroyProcess where we were doing an in...
by hbelusca＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: hbelusca Date: Tue Dec 11 01:25:57 2012 New Revision: 57866 URL: http://svn.reactos.org/svn/reactos?rev=57866&view=rev Log: [CONSRV] Put the "Move to the next entry" code just after retrieving list record, because it is less bug-prone. Indeed correct a bug in CsrDestroyProcess where we were doing an infinite loop when trying to notify existing CSR waits, because NextEntry was set to the CsrProcess->ThreadList.Flink element (head) of the list. Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Tue Dec 11 01:25:57 2012 @@ -854,10 +854,13 @@ /* Get the current thread entry */ CsrThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + /* Make sure the thread isn't already dead */ if (CsrThread->Flags & CsrThreadTerminated) { - NextEntry = NextEntry->Flink; + /* Go the the next thread */ continue; } @@ -884,7 +887,6 @@ /* Dereference the thread */ CsrLockedDereferenceThread(CsrThread); - NextEntry = CsrProcess->ThreadList.Flink; } /* Release the Process Lock and return success */ @@ -1100,7 +1102,7 @@ break; } - /* Next entry */ + /* Move to the next entry */ NextEntry = NextEntry->Flink; } while (NextEntry != &CsrRootProcess->ListLink); @@ -1279,12 +1281,12 @@ /* Get the Process */ CsrProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); - /* Remove the skip flag, set shutdown flags to 0*/ + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + + /* Remove the skip flag, set shutdown flags to 0 */ CsrProcess->Flags &= ~CsrProcessSkipShutdown; CsrProcess->ShutdownFlags = 0; - - /* Move to the next */ - NextEntry = NextEntry->Flink; } /* Set shudown Priority */ @@ -1394,12 +1396,12 @@ /* Get the Process */ CsrProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); - /* Remove the skip flag, set shutdown flags to 0*/ + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + + /* Remove the skip flag, set shutdown flags to 0 */ CsrProcess->Flags &= ~CsrProcessSkipShutdown; CsrProcess->ShutdownFlags = 0; - - /* Move to the next */ - NextEntry = NextEntry->Flink; } /* Set shudown Priority */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Tue Dec 11 01:25:57 2012 @@ -201,6 +201,9 @@ /* Get the thread */ FoundThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + /* Compare the CID */ // FIXME: if (*(PULONGLONG)&FoundThread->ClientId == *(PULONGLONG)ClientId) if (FoundThread->ClientId.UniqueThread == ClientId->UniqueThread) @@ -212,9 +215,6 @@ // DPRINT1("Found: %p %p\n", FoundThread, FoundThread->Process); return FoundThread; } - - /* Next */ - NextEntry = NextEntry->Flink; } /* Nothing found */ @@ -267,7 +267,7 @@ /* Check for TID Match */ if (FoundThread->ClientId.UniqueThread == Cid->UniqueThread) break; - /* Next entry */ + /* Move to the next entry */ NextEntry = NextEntry->Flink; } @@ -970,6 +970,9 @@ /* Get the Process */ CurrentThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + /* Check for PID Match */ if ((CurrentThread->ClientId.UniqueThread == Tid) && !(CurrentThread->Flags & CsrThreadTerminated)) @@ -977,9 +980,6 @@ /* Get out of here */ break; } - - /* Next entry */ - NextEntry = NextEntry->Flink; } /* Nothing found if we got back to the list */

1 0

[hbelusca] 57865: - Synchronize up to trunk's revision r57864. - [CONSRV/WINSRV] Add langage definition support.
by hbelusca＠svn.reactos.org 10 Dec '12

10 Dec '12

Author: hbelusca Date: Mon Dec 10 23:01:20 2012 New Revision: 57865 URL: http://svn.reactos.org/svn/reactos?rev=57865&view=rev Log: - Synchronize up to trunk's revision r57864. - [CONSRV/WINSRV] Add langage definition support. Added: branches/ros-csrss/include/reactos/wine/ddk/ntddcdvd.h - copied unchanged from r57864, trunk/reactos/include/reactos/wine/ddk/ntddcdvd.h branches/ros-csrss/lib/sdk/crt/include/internal/locale.h - copied unchanged from r57864, trunk/reactos/lib/sdk/crt/include/internal/locale.h branches/ros-csrss/lib/sdk/crt/mbstring/_setmbcp.c - copied unchanged from r57864, trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/games/spider/spigame.cpp branches/ros-csrss/base/setup/usetup/lang/fr-FR.h branches/ros-csrss/base/setup/usetup/lang/it-IT.h branches/ros-csrss/boot/bootdata/bootcd.ini branches/ros-csrss/boot/bootdata/livecd.ini branches/ros-csrss/boot/freeldr/FREELDR.INI (props changed) branches/ros-csrss/boot/freeldr/bootsect/dosmbr.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/ext2.S (props changed) branches/ros-csrss/boot/freeldr/bootsect/ext2.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/fat.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/fat32.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/isoboot.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/win2k.asm (props changed) branches/ros-csrss/boot/freeldr/bootsect/wxpfat16.asm (props changed) branches/ros-csrss/boot/freeldr/fdebug/fdebug.c (props changed) branches/ros-csrss/boot/freeldr/fdebug/fdebug.rc (props changed) branches/ros-csrss/boot/freeldr/fdebug/lang/tr-TR.rc (props changed) branches/ros-csrss/boot/freeldr/fdebug/resource.h (props changed) branches/ros-csrss/boot/freeldr/fdebug/rs232.c (props changed) branches/ros-csrss/boot/freeldr/fdebug/rs232.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/CHANGELOG (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/archmach.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/custom.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/drivemap.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/drvmap.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/entry.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hardware.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hwacpi.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hwapm.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hwpci.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386disk.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386rtl.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386trap.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/i386vid.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machpc.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machxbox.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/mb.S (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/miscboot.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pccons.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcdisk.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcmem.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcrtc.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcvideo.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxcons.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxdisk.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxfont.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxhw.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxi2c.c branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxmem.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxrtc.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxvideo.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/bootmgr.c branches/ros-csrss/boot/freeldr/freeldr/cache/blocklist.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/cache/cache.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/cmdline.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/comm/rs232.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/debug.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/disk/disk.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/disk/partition.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/ext2.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/fat.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/fs.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/iso.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/fs/ntfs.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/custom.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/drivemap.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/i386.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/machxbox.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/miscboot.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/hardware.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/machpc.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/cache.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/cmdline.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/comm.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/debug.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/disk.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/freeldr.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/ext2.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/fat.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/iso.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/fs/ntfs.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/inffile.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/inifile.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/keycodes.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/linux.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/machine.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/mm.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/multiboot.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/options.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/oslist.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/reactos.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/registry.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/ui.h (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/include/ui/noui.h branches/ros-csrss/boot/freeldr/freeldr/include/ui/tui.h branches/ros-csrss/boot/freeldr/freeldr/include/ver.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/include/video.h (props changed) branches/ros-csrss/boot/freeldr/freeldr/inffile/inffile.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/inifile/ini_init.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/inifile/inifile.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/inifile/parse.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/linuxboot.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/machine.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/mm/meminit.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/mm/mm.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/options.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/oslist.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/reactos/arcname.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/reactos/binhive.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/reactos/registry.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/directui.c branches/ros-csrss/boot/freeldr/freeldr/ui/gui.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/minitui.c branches/ros-csrss/boot/freeldr/freeldr/ui/noui.c branches/ros-csrss/boot/freeldr/freeldr/ui/tui.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/tuimenu.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/ui/ui.c (contents, props changed) branches/ros-csrss/boot/freeldr/freeldr/version.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/video/fade.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/video/palette.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/video/video.c (props changed) branches/ros-csrss/boot/freeldr/freeldr/windows/setupldr.c branches/ros-csrss/boot/freeldr/install/install.c (props changed) branches/ros-csrss/boot/freeldr/install/install.h (props changed) branches/ros-csrss/boot/freeldr/install/linux/finstext2.c (props changed) branches/ros-csrss/boot/freeldr/install/linux/finstext2.h (props changed) branches/ros-csrss/boot/freeldr/install/volume.c (props changed) branches/ros-csrss/boot/freeldr/install/volume.h (props changed) branches/ros-csrss/boot/freeldr/notes.txt (props changed) branches/ros-csrss/boot/freeldr/tools/deptool.c (props changed) branches/ros-csrss/boot/freeldr/tools/hosttype.c (props changed) branches/ros-csrss/boot/freeldr/tools/rcopy.c (props changed) branches/ros-csrss/boot/freeldr/tools/rdel.c (contents, props changed) branches/ros-csrss/boot/freeldr/tools/rmkdir.c (props changed) branches/ros-csrss/boot/freeldr/tools/rrmdir.c (contents, props changed) branches/ros-csrss/dll/cpl/main/CMakeLists.txt branches/ros-csrss/dll/cpl/main/main.h branches/ros-csrss/dll/win32/advpack/CMakeLists.txt branches/ros-csrss/dll/win32/advpack/advpack_private.h branches/ros-csrss/dll/win32/advpack/files.c branches/ros-csrss/dll/win32/kernel32/client/file/copy.c branches/ros-csrss/dll/win32/lsasrv/database.c branches/ros-csrss/dll/win32/lsasrv/lsarpc.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/lsasrv/policy.c branches/ros-csrss/dll/win32/msi/action.c branches/ros-csrss/dll/win32/msi/appsearch.c branches/ros-csrss/dll/win32/msi/automation.c branches/ros-csrss/dll/win32/msi/custom.c branches/ros-csrss/dll/win32/msi/database.c branches/ros-csrss/dll/win32/msi/dialog.c branches/ros-csrss/dll/win32/msi/events.c branches/ros-csrss/dll/win32/msi/files.c branches/ros-csrss/dll/win32/msi/format.c branches/ros-csrss/dll/win32/msi/install.c branches/ros-csrss/dll/win32/msi/msi.c branches/ros-csrss/dll/win32/msi/msi_main.c branches/ros-csrss/dll/win32/msi/msipriv.h branches/ros-csrss/dll/win32/msi/msiquery.c branches/ros-csrss/dll/win32/msi/package.c branches/ros-csrss/dll/win32/msi/patch.c branches/ros-csrss/dll/win32/msi/record.c branches/ros-csrss/dll/win32/msi/registry.c branches/ros-csrss/dll/win32/msi/script.c branches/ros-csrss/dll/win32/msi/select.c branches/ros-csrss/dll/win32/msi/source.c branches/ros-csrss/dll/win32/msi/storages.c branches/ros-csrss/dll/win32/msi/streams.c branches/ros-csrss/dll/win32/msi/string.c branches/ros-csrss/dll/win32/msi/table.c branches/ros-csrss/dll/win32/msi/tokenize.c branches/ros-csrss/dll/win32/msi/upgrade.c branches/ros-csrss/dll/win32/msi/where.c branches/ros-csrss/dll/win32/msvcrt/dllmain.c branches/ros-csrss/dll/win32/msvcrt/msvcrt.spec branches/ros-csrss/dll/win32/msvcrt/precomp.h branches/ros-csrss/dll/win32/msvcrt20/msvcrt20.c branches/ros-csrss/dll/win32/msvcrt40/msvcrt40.c branches/ros-csrss/dll/win32/shell32/control.cpp branches/ros-csrss/dll/win32/userenv/directory.c branches/ros-csrss/drivers/filesystems/cdfs/dirctl.c branches/ros-csrss/drivers/filesystems/fastfat/dir.c branches/ros-csrss/drivers/filesystems/fastfat/fcb.c branches/ros-csrss/drivers/hid/hidclass/fdo.c branches/ros-csrss/drivers/hid/hidusb/ (props changed) branches/ros-csrss/drivers/hid/hidusb/hidusb.c branches/ros-csrss/drivers/network/ndis/ndis/config.c branches/ros-csrss/drivers/network/ndis/ndis/misc.c branches/ros-csrss/drivers/usb/usbccgp/descriptor.c branches/ros-csrss/drivers/usb/usbccgp/usbccgp.h branches/ros-csrss/drivers/usb/usbd/usbd.spec branches/ros-csrss/drivers/usb/usbhub/ (props changed) branches/ros-csrss/drivers/usb/usbhub/fdo.c branches/ros-csrss/drivers/usb/usbuhci/usb_request.cpp branches/ros-csrss/include/crt/crtdefs.h branches/ros-csrss/include/crt/float.h branches/ros-csrss/include/psdk/shellapi.h branches/ros-csrss/include/psdk/shlguid.h branches/ros-csrss/include/psdk/winbase.h branches/ros-csrss/include/psdk/wincred.h branches/ros-csrss/include/psdk/winnt.h branches/ros-csrss/include/psdk/winsvc.h branches/ros-csrss/include/psdk/winternl.h branches/ros-csrss/include/reactos/idl/svcctl.idl branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/usb_device.cpp (contents, props changed) branches/ros-csrss/lib/sdk/crt/crt.cmake branches/ros-csrss/lib/sdk/crt/float/i386/cntrlfp.c branches/ros-csrss/lib/sdk/crt/include/internal/mbstring.h branches/ros-csrss/lib/sdk/crt/include/internal/tls.h branches/ros-csrss/lib/sdk/crt/locale/locale.c branches/ros-csrss/lib/sdk/crt/mbstring/iskana.c branches/ros-csrss/lib/sdk/crt/mbstring/ismbkaln.c branches/ros-csrss/lib/sdk/crt/mbstring/ismblead.c branches/ros-csrss/lib/sdk/crt/mbstring/ismbpun.c branches/ros-csrss/lib/sdk/crt/mbstring/ismbtrl.c branches/ros-csrss/lib/sdk/crt/mbstring/mbsncpy.c branches/ros-csrss/lib/sdk/crt/misc/environ.c branches/ros-csrss/lib/sdk/crt/misc/tls.c branches/ros-csrss/lib/sdk/crt/precomp.h branches/ros-csrss/lib/sdk/crt/string/ctype.c branches/ros-csrss/lib/sdk/crt/string/wcs.c branches/ros-csrss/lib/sdk/crt/time/strftime.c branches/ros-csrss/lib/sdk/uuid/shguids.c branches/ros-csrss/media/doc/README.WINE branches/ros-csrss/media/drivers/etc/services (props changed) branches/ros-csrss/ntoskrnl/fsrtl/dbcsname.c branches/ros-csrss/ntoskrnl/fsrtl/filelock.c branches/ros-csrss/ntoskrnl/fsrtl/name.c branches/ros-csrss/ntoskrnl/inbv/inbv.c branches/ros-csrss/ntoskrnl/kdbg/kdb.c branches/ros-csrss/win32ss/drivers/miniport/vga/initvga.c branches/ros-csrss/win32ss/drivers/miniport/vga_new/vbemodes.c branches/ros-csrss/win32ss/user/consrv/rsrc.rc branches/ros-csrss/win32ss/user/winsrv/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/gam… Modified: branches/ros-csrss/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/setup/usetup/lan… Modified: branches/ros-csrss/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/setup/usetup/lan… Modified: branches/ros-csrss/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/bootcd.… Modified: branches/ros-csrss/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/livecd.… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/archmach.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/custom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pccons.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcrtc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxcons.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxfont.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxi2c.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxrtc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/xboxvideo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/cmdline.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui/noui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui/tui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/tools/rdel.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/tools/rd… Modified: branches/ros-csrss/boot/freeldr/tools/rrmdir.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/tools/rr… Modified: branches/ros-csrss/dll/cpl/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/main/CMakeLis… Modified: branches/ros-csrss/dll/cpl/main/main.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/cpl/main/main.h?r… Modified: branches/ros-csrss/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advpack/CMa… Modified: branches/ros-csrss/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advpack/adv… Modified: branches/ros-csrss/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/advpack/fil… Modified: branches/ros-csrss/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/data… Modified: branches/ros-csrss/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsar… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/poli… Modified: branches/ros-csrss/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/action.… Modified: branches/ros-csrss/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/appsear… Modified: branches/ros-csrss/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/automat… Modified: branches/ros-csrss/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/custom.… Modified: branches/ros-csrss/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/databas… Modified: branches/ros-csrss/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/dialog.… Modified: branches/ros-csrss/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/events.… Modified: branches/ros-csrss/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/files.c… Modified: branches/ros-csrss/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/format.… Modified: branches/ros-csrss/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/install… Modified: branches/ros-csrss/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msi.c?r… Modified: branches/ros-csrss/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msi_mai… Modified: branches/ros-csrss/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msipriv… Modified: branches/ros-csrss/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msiquer… Modified: branches/ros-csrss/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/package… Modified: branches/ros-csrss/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/patch.c… Modified: branches/ros-csrss/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/record.… Modified: branches/ros-csrss/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/registr… Modified: branches/ros-csrss/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/script.… Modified: branches/ros-csrss/dll/win32/msi/select.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/select.… Modified: branches/ros-csrss/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/source.… Modified: branches/ros-csrss/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/storage… Modified: branches/ros-csrss/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/streams… Modified: branches/ros-csrss/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/string.… Modified: branches/ros-csrss/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/table.c… Modified: branches/ros-csrss/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/tokeniz… Modified: branches/ros-csrss/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/upgrade… Modified: branches/ros-csrss/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/where.c… Modified: branches/ros-csrss/dll/win32/msvcrt/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt/dllm… Modified: branches/ros-csrss/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt/msvc… Modified: branches/ros-csrss/dll/win32/msvcrt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt/prec… Modified: branches/ros-csrss/dll/win32/msvcrt20/msvcrt20.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt20/ms… Modified: branches/ros-csrss/dll/win32/msvcrt40/msvcrt40.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msvcrt40/ms… Modified: branches/ros-csrss/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/con… Modified: branches/ros-csrss/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/userenv/dir… Modified: branches/ros-csrss/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/c… Modified: branches/ros-csrss/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/f… Modified: branches/ros-csrss/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/f… Modified: branches/ros-csrss/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/hidclass/… Modified: branches/ros-csrss/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/hid/hidusb/hi… Modified: branches/ros-csrss/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/network/ndis/… Modified: branches/ros-csrss/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/network/ndis/… Modified: branches/ros-csrss/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbccgp/d… Modified: branches/ros-csrss/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbccgp/u… Modified: branches/ros-csrss/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbd/usbd… Modified: branches/ros-csrss/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbhub/fd… Modified: branches/ros-csrss/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbuhci/u… Modified: branches/ros-csrss/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/crtdefs.h… Modified: branches/ros-csrss/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/crt/float.h?r… Modified: branches/ros-csrss/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/shellapi… Modified: branches/ros-csrss/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/shlguid.… Modified: branches/ros-csrss/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winbase.… Modified: branches/ros-csrss/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/wincred.… Modified: branches/ros-csrss/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winnt.h?… Modified: branches/ros-csrss/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winsvc.h… Modified: branches/ros-csrss/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winternl… Modified: branches/ros-csrss/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/idl/s… Modified: branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hu… Modified: branches/ros-csrss/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/us… Modified: branches/ros-csrss/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/crt.cmake… Modified: branches/ros-csrss/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/float/i38… Modified: branches/ros-csrss/lib/sdk/crt/include/internal/mbstring.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/include/i… Modified: branches/ros-csrss/lib/sdk/crt/include/internal/tls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/include/i… Modified: branches/ros-csrss/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/locale/lo… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/iskana.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismbkaln.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismbpun.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/ismbtrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/mbsncpy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/misc/envi… Modified: branches/ros-csrss/lib/sdk/crt/misc/tls.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/misc/tls.… Modified: branches/ros-csrss/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/precomp.h… Modified: branches/ros-csrss/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/string/ct… Modified: branches/ros-csrss/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/string/wc… Modified: branches/ros-csrss/lib/sdk/crt/time/strftime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/time/strf… Modified: branches/ros-csrss/lib/sdk/uuid/shguids.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/uuid/shguids.… Modified: branches/ros-csrss/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/doc/README.WINE… Modified: branches/ros-csrss/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/fsrtl/dbcsna… Modified: branches/ros-csrss/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/fsrtl/filelo… Modified: branches/ros-csrss/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/fsrtl/name.c… Modified: branches/ros-csrss/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/inbv/inbv.c?… Modified: branches/ros-csrss/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kdbg/kdb.c?r… Modified: branches/ros-csrss/win32ss/drivers/miniport/vga/initvga.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/drivers/minip… Modified: branches/ros-csrss/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/drivers/minip… Modified: branches/ros-csrss/win32ss/user/consrv/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/r… Modified: branches/ros-csrss/win32ss/user/winsrv/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/r…

1 0

[akhaldi] 57864: [ADVAPI32_WINETEST]: Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 10 Dec '12

10 Dec '12

Author: akhaldi Date: Mon Dec 10 14:54:40 2012 New Revision: 57864 URL: http://svn.reactos.org/svn/reactos?rev=57864&view=rev Log: [ADVAPI32_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/advapi32/cred.c trunk/rostests/winetests/advapi32/crypt.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/cred.c… ============================================================================== --- trunk/rostests/winetests/advapi32/cred.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/cred.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -35,7 +35,9 @@ static BOOL (WINAPI *pCredRenameA)(LPCSTR,LPCSTR,DWORD,DWORD); static BOOL (WINAPI *pCredWriteA)(PCREDENTIALA,DWORD); static BOOL (WINAPI *pCredReadDomainCredentialsA)(PCREDENTIAL_TARGET_INFORMATIONA,DWORD,DWORD*,PCREDENTIALA**); - +static BOOL (WINAPI *pCredMarshalCredentialA)(CRED_MARSHAL_TYPE,PVOID,LPSTR *); +static BOOL (WINAPI *pCredUnmarshalCredentialA)(LPCSTR,PCRED_MARSHAL_TYPE,PVOID); +static BOOL (WINAPI *pCredIsMarshaledCredentialA)(LPCSTR); #define TEST_TARGET_NAME "credtest.winehq.org" #define TEST_TARGET_NAME2 "credtest2.winehq.org" @@ -119,6 +121,47 @@ ok(!ret && GetLastError() == ERROR_BAD_USERNAME, "CredWriteA with NULL username should have failed with ERROR_BAD_USERNAME instead of %d\n", GetLastError()); + + new_cred.UserName = (char *)"winetest"; + new_cred.Persist = CRED_PERSIST_LOCAL_MACHINE; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Type = CRED_TYPE_GENERIC; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.Persist = CRED_PERSIST_SESSION; + ret = pCredWriteA(&new_cred, 0); + ok(ret, "CredWriteA failed with error %u\n", GetLastError()); + + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_GENERIC, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + + new_cred.Type = CRED_TYPE_DOMAIN_PASSWORD; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(ret || broken(!ret), "CredWriteA failed with error %u\n", GetLastError()); + if (ret) + { + ret = pCredDeleteA(TEST_TARGET_NAME, CRED_TYPE_DOMAIN_PASSWORD, 0); + ok(ret, "CredDeleteA failed with error %u\n", GetLastError()); + } + new_cred.UserName = NULL; + SetLastError(0xdeadbeef); + ret = pCredWriteA(&new_cred, 0); + ok(!ret, "CredWriteA succeeded\n"); + ok(GetLastError() == ERROR_BAD_USERNAME, "got %u\n", GetLastError()); } static void test_CredDeleteA(void) @@ -336,6 +379,368 @@ ok(ret, "CredDeleteA failed with error %d\n", GetLastError()); } +static void test_CredMarshalCredentialA(void) +{ + static WCHAR emptyW[] = {0}; + static WCHAR tW[] = {'t',0}; + static WCHAR teW[] = {'t','e',0}; + static WCHAR tesW[] = {'t','e','s',0}; + static WCHAR testW[] = {'t','e','s','t',0}; + static WCHAR test1W[] = {'t','e','s','t','1',0}; + CERT_CREDENTIAL_INFO cert; + USERNAME_TARGET_CREDENTIAL_INFO username; + DWORD error; + char *str; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( 0, NULL, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + memset( cert.rgbHashOfCert, 0, sizeof(cert.rgbHashOfCert) ); + cert.cbSize = sizeof(cert); + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( 0, &cert, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( 0, &cert, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( CertCredential, NULL, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + if (0) { /* crash */ + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( CertCredential, &cert, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + } + + cert.cbSize = 0; + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + cert.cbSize = sizeof(cert) + 4; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.cbSize = sizeof(cert); + cert.rgbHashOfCert[0] = 2; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BCAAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.rgbHashOfCert[0] = 255; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@B-DAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.rgbHashOfCert[0] = 1; + cert.rgbHashOfCert[1] = 1; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BBEAAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + cert.rgbHashOfCert[0] = 1; + cert.rgbHashOfCert[1] = 1; + cert.rgbHashOfCert[2] = 1; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BBEQAAAAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + memset( cert.rgbHashOfCert, 0, sizeof(cert.rgbHashOfCert) ); + cert.rgbHashOfCert[0] = 'W'; + cert.rgbHashOfCert[1] = 'i'; + cert.rgbHashOfCert[2] = 'n'; + cert.rgbHashOfCert[3] = 'e'; + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA" ), "got %s\n", str ); + pCredFree( str ); + + memset( cert.rgbHashOfCert, 0xff, sizeof(cert.rgbHashOfCert) ); + str = NULL; + ret = pCredMarshalCredentialA( CertCredential, &cert, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@B--------------------------P" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = NULL; + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + username.UserName = emptyW; + str = (char *)0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( str == (char *)0xdeadbeef, "got %p\n", str ); + + username.UserName = tW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CCAAAAA0BA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = teW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CEAAAAA0BQZAA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = tesW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CGAAAAA0BQZAMHA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = testW; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CIAAAAA0BQZAMHA0BA" ), "got %s\n", str ); + pCredFree( str ); + + username.UserName = test1W; + str = NULL; + ret = pCredMarshalCredentialA( UsernameTargetCredential, &username, &str ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( str != NULL, "str not set\n" ); + ok( !lstrcmpA( str, "@@CKAAAAA0BQZAMHA0BQMAA" ), "got %s\n", str ); + pCredFree( str ); +} + +static void test_CredUnmarshalCredentialA(void) +{ + static WCHAR tW[] = {'t',0}; + static WCHAR testW[] = {'t','e','s','t',0}; + CERT_CREDENTIAL_INFO *cert; + USERNAME_TARGET_CREDENTIAL_INFO *username; + CRED_MARSHAL_TYPE type; + unsigned int i; + DWORD error; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( NULL, NULL, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + cert = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( NULL, NULL, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + type = 0; + cert = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( NULL, &type, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + type = 0; + cert = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "", &type, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + if (0) { /* crash */ + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", NULL, (void **)&cert ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + } + + type = 0; + cert = NULL; + ret = pCredUnmarshalCredentialA( "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == CertCredential, "got %u\n", type ); + ok( cert != NULL, "cert is NULL\n" ); + ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); + for (i = 0; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); + pCredFree( cert ); + + type = 0; + cert = NULL; + ret = pCredUnmarshalCredentialA( "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", &type, (void **)&cert ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == CertCredential, "got %u\n", type ); + ok( cert != NULL, "cert is NULL\n" ); + ok( cert->cbSize == sizeof(*cert), "wrong size %u\n", cert->cbSize ); + ok( cert->rgbHashOfCert[0] == 'W', "wrong data)\n" ); + ok( cert->rgbHashOfCert[1] == 'i', "wrong data\n" ); + ok( cert->rgbHashOfCert[2] == 'n', "wrong data\n" ); + ok( cert->rgbHashOfCert[3] == 'e', "wrong data\n" ); + for (i = 4; i < sizeof(cert->rgbHashOfCert); i++) ok( !cert->rgbHashOfCert[i], "wrong data\n" ); + pCredFree( cert ); + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CAAAAAA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CAAAAAA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + type = 0; + username = NULL; + ret = pCredUnmarshalCredentialA( "@@CCAAAAA0BA", &type, (void **)&username ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == UsernameTargetCredential, "got %u\n", type ); + ok( username != NULL, "username is NULL\n" ); + ok( username->UserName != NULL, "UserName is NULL\n" ); + ok( !lstrcmpW( username->UserName, tW ), "got %s\n", wine_dbgstr_w(username->UserName) ); + pCredFree( username ); + + type = 0; + username = NULL; + ret = pCredUnmarshalCredentialA( "@@CIAAAAA0BQZAMHA0BA", &type, (void **)&username ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( type == UsernameTargetCredential, "got %u\n", type ); + ok( username != NULL, "username is NULL\n" ); + ok( username->UserName != NULL, "UserName is NULL\n" ); + ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); + pCredFree( username ); + + type = 0; + username = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); +} + +static void test_CredIsMarshaledCredentialA(void) +{ + int i; + BOOL res; + BOOL expected = TRUE; + + const char * ptr[] = { + /* CertCredential */ + "@@BXlmblBAAAAAAAAAAAAAAAAAAAAA", /* hash for 'W','i','n','e' */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* hash for all 0 */ + + /* UsernameTargetCredential */ + "@@CCAAAAA0BA", /* "t" */ + "@@CIAAAAA0BQZAMHA0BA", /* "test" */ + + /* todo: BinaryBlobCredential */ + + /* not marshaled names return always FALSE */ + "winetest", + "", + "@@", + "@@A", + "@@AA", + "@@AAA", + "@@B", + "@@BB", + "@@BBB", + + /* CertCredential */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to long */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA", /* to short */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA+", /* bad char */ + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA:", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA>", + "@@BAAAAAAAAAAAAAAAAAAAAAAAAAA<", + + "@@C", + "@@CC", + "@@CCC", + "@@D", + "@@DD", + "@@DDD", + NULL}; + + for (i = 0; ptr[i]; i++) + { + if (*ptr[i] != '@') + expected = FALSE; + + SetLastError(0xdeadbeef); + res = pCredIsMarshaledCredentialA(ptr[i]); + if (expected) + ok(res != FALSE, "%d: got %d and %u for %s (expected TRUE)\n", i, res, GetLastError(), ptr[i]); + else + { + /* Windows returns ERROR_INVALID_PARAMETER here, but that's not documented */ + ok(!res, "%d: got %d and %u for %s (expected FALSE)\n", i, res, GetLastError(), ptr[i]); + } + } +} + START_TEST(cred) { DWORD persists[CRED_TYPE_MAXIMUM]; @@ -348,9 +753,11 @@ pCredReadA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredReadA"); pCredRenameA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredRenameA"); pCredReadDomainCredentialsA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredReadDomainCredentialsA"); - - if (!pCredEnumerateA || !pCredFree || !pCredWriteA || !pCredDeleteA || - !pCredReadA) + pCredMarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredMarshalCredentialA"); + pCredUnmarshalCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredUnmarshalCredentialA"); + pCredIsMarshaledCredentialA = (void *)GetProcAddress(GetModuleHandle("advapi32.dll"), "CredIsMarshaledCredentialA"); + + if (!pCredEnumerateA || !pCredFree || !pCredWriteA || !pCredDeleteA || !pCredReadA) { win_skip("credentials functions not present in advapi32.dll\n"); return; @@ -392,4 +799,8 @@ skip("CRED_TYPE_DOMAIN_VISIBLE_PASSWORD credentials are not supported or are disabled. Skipping\n"); else test_domain_password(CRED_TYPE_DOMAIN_VISIBLE_PASSWORD); -} + + test_CredMarshalCredentialA(); + test_CredUnmarshalCredentialA(); + test_CredIsMarshaledCredentialA(); +} Modified: trunk/rostests/winetests/advapi32/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt.… ============================================================================== --- trunk/rostests/winetests/advapi32/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/crypt.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -237,6 +237,9 @@ ok (result, "%d\n", GetLastError()); if (!result) return; pCryptDestroyHash(hHash); + + result = pCryptCreateHash(0, CALG_SHA, 0, 0, &hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = pCryptGenKey(0, CALG_RC4, 0, &hKey); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -448,7 +451,9 @@ "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(hash, bogus, sizeof(bogus), key, NULL, 0); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + broken(GetLastError() == NTE_BAD_HASH_STATE /* older NT4 */)), "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); pCryptDestroyKey(key); pCryptDestroyHash(hash); @@ -619,9 +624,6 @@ (*pdwIndex)++; } - - if (!ret) - LocalFree(*pszTypeName); RegCloseKey(hSubKey); LocalFree(szName); Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -346,6 +346,9 @@ /* Crashes on NT4, Windows 2000 and XP SP1 */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, NULL, 0); ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + + RegSetValueExA(hkey_main, name2A, 0, REG_SZ, (const BYTE *)1, 1); + RegSetValueExA(hkey_main, name2A, 0, REG_DWORD, (const BYTE *)1, 1); } ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, sizeof(string1W)); @@ -353,7 +356,12 @@ test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); - /* RegSetValueA ignores the size passed in */ + ret = RegSetValueW(hkey_main, name1W, REG_SZ, string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); + + /* RegSetValueW ignores the size passed in */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, 4 * sizeof(string1W[0])); ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); @@ -390,6 +398,12 @@ ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(name2A, string2A, sizeof(string2A)); test_hkey_main_Value_W(name2W, string2W, sizeof(string2W)); + + /* test RegSetValueExW with data = 1 */ + ret = RegSetValueExW(hkey_main, name2W, 0, REG_SZ, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); } static void create_test_entries(void) Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -33,7 +33,16 @@ #include "ntsecapi.h" #include "lmcons.h" +#include <winsvc.h> + #include "wine/test.h" + +/* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) + +#ifndef EVENT_QUERY_STATE +#define EVENT_QUERY_STATE 0x0001 +#endif /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { @@ -58,7 +67,7 @@ LARGE_INTEGER CreateTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; -#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } +#define expect_eq(expr, value, type, format) { type ret_ = expr; ok((value) == ret_, #expr " expected " format " got " format "\n", (value), (ret_)); } static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); static BOOL (WINAPI *pAddAccessDeniedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); @@ -94,6 +103,8 @@ static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetNamedSecurityInfoA)(LPTSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static PDWORD (WINAPI *pGetSidSubAuthority)(PSID, DWORD); static PUCHAR (WINAPI *pGetSidSubAuthorityCount)(PSID); static BOOL (WINAPI *pIsValidSid)(PSID); @@ -113,14 +124,26 @@ SECURITY_DESCRIPTOR_CONTROL); static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static NTSTATUS (WINAPI *pNtAccessCheck)(PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, PULONG, NTSTATUS*); static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); +static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); static HMODULE hmod; static int myARGC; static char** myARGV; + +struct strsid_entry +{ + const char *str; + DWORD flags; +}; +#define STRSID_OK 0 +#define STRSID_OPT 1 struct sidRef { @@ -151,6 +174,7 @@ pSetFileSecurityA = (void *)GetProcAddress(hmod, "SetFileSecurityA" ); pCreateWellKnownSid = (void *)GetProcAddress( hmod, "CreateWellKnownSid" ); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); + pSetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "SetNamedSecurityInfoA"); pGetSidSubAuthority = (void *)GetProcAddress(hmod, "GetSidSubAuthority"); pGetSidSubAuthorityCount = (void *)GetProcAddress(hmod, "GetSidSubAuthorityCount"); pIsValidSid = (void *)GetProcAddress(hmod, "IsValidSid"); @@ -159,32 +183,14 @@ pSetEntriesInAclA = (void *)GetProcAddress(hmod, "SetEntriesInAclA"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); + pSetSecurityInfo = (void *)GetProcAddress(hmod, "SetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); + pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); + pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); + pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); + pGetAce = (void *)GetProcAddress(hmod, "GetAce"); myARGC = winetest_get_mainargs( &myARGV ); -} - -static void test_str_sid(const char *str_sid) -{ - PSID psid; - char *temp; - - if (pConvertStringSidToSidA(str_sid, &psid)) - { - if (pConvertSidToStringSidA(psid, &temp)) - { - trace(" %s: %s\n", str_sid, temp); - LocalFree(temp); - } - LocalFree(psid); - } - else - { - if (GetLastError() != ERROR_INVALID_SID) - trace(" %s: couldn't be converted, returned %d\n", str_sid, GetLastError()); - else - trace(" %s: couldn't be converted\n", str_sid); - } } static void test_sid(void) @@ -197,6 +203,18 @@ { { {0x00,0x00,0x00,0x00,0x00,0x02} }, "S-1-2-1" }, { { {0x00,0x00,0x00,0x00,0x00,0x0c} }, "S-1-12-1" }, }; + struct strsid_entry strsid_table[] = { + {"AO", STRSID_OK}, {"RU", STRSID_OK}, {"AN", STRSID_OK}, {"AU", STRSID_OK}, + {"BA", STRSID_OK}, {"BG", STRSID_OK}, {"BO", STRSID_OK}, {"BU", STRSID_OK}, + {"CA", STRSID_OPT}, {"CG", STRSID_OK}, {"CO", STRSID_OK}, {"DA", STRSID_OPT}, + {"DC", STRSID_OPT}, {"DD", STRSID_OPT}, {"DG", STRSID_OPT}, {"DU", STRSID_OPT}, + {"EA", STRSID_OPT}, {"ED", STRSID_OK}, {"WD", STRSID_OK}, {"PA", STRSID_OPT}, + {"IU", STRSID_OK}, {"LA", STRSID_OK}, {"LG", STRSID_OK}, {"LS", STRSID_OK}, + {"SY", STRSID_OK}, {"NU", STRSID_OK}, {"NO", STRSID_OK}, {"NS", STRSID_OK}, + {"PO", STRSID_OK}, {"PS", STRSID_OK}, {"PU", STRSID_OK}, {"RS", STRSID_OPT}, + {"RD", STRSID_OK}, {"RE", STRSID_OK}, {"RC", STRSID_OK}, {"SA", STRSID_OPT}, + {"SO", STRSID_OK}, {"SU", STRSID_OK}}; + const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; @@ -204,12 +222,11 @@ BOOL r; LPSTR str = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress( hmod, "ConvertSidToStringSidA" ); - if( !pConvertSidToStringSidA ) - return; - pConvertStringSidToSidA = (void *)GetProcAddress( hmod, "ConvertStringSidToSidA" ); - if( !pConvertStringSidToSidA ) - return; + if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) + { + win_skip("ConvertSidToStringSidA or ConvertStringSidToSidA not available\n"); + return; + } r = pConvertStringSidToSidA( NULL, NULL ); ok( !r, "expected failure with NULL parameters\n" ); @@ -246,8 +263,6 @@ for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) { - PISID pisid; - r = AllocateAndInitializeSid( &refs[i].auth, 1,1,0,0,0,0,0,0,0, &psid ); ok( r, "failed to allocate sid\n" ); @@ -284,45 +299,44 @@ LocalFree( psid ); } - trace("String SIDs:\n"); - test_str_sid("AO"); - test_str_sid("RU"); - test_str_sid("AN"); - test_str_sid("AU"); - test_str_sid("BA"); - test_str_sid("BG"); - test_str_sid("BO"); - test_str_sid("BU"); - test_str_sid("CA"); - test_str_sid("CG"); - test_str_sid("CO"); - test_str_sid("DA"); - test_str_sid("DC"); - test_str_sid("DD"); - test_str_sid("DG"); - test_str_sid("DU"); - test_str_sid("EA"); - test_str_sid("ED"); - test_str_sid("WD"); - test_str_sid("PA"); - test_str_sid("IU"); - test_str_sid("LA"); - test_str_sid("LG"); - test_str_sid("LS"); - test_str_sid("SY"); - test_str_sid("NU"); - test_str_sid("NO"); - test_str_sid("NS"); - test_str_sid("PO"); - test_str_sid("PS"); - test_str_sid("PU"); - test_str_sid("RS"); - test_str_sid("RD"); - test_str_sid("RE"); - test_str_sid("RC"); - test_str_sid("SA"); - test_str_sid("SO"); - test_str_sid("SU"); + /* string constant format not supported before XP */ + r = pConvertStringSidToSidA(strsid_table[0].str, &psid); + if(!r) + { + win_skip("String constant format not supported\n"); + return; + } + LocalFree(psid); + + for(i = 0; i < sizeof(strsid_table) / sizeof(strsid_table[0]); i++) + { + char *temp; + + SetLastError(0xdeadbeef); + r = pConvertStringSidToSidA(strsid_table[i].str, &psid); + + if (!(strsid_table[i].flags & STRSID_OPT)) + { + ok(r, "%s: got %u\n", strsid_table[i].str, GetLastError()); + } + + if (r) + { + if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp))) + { + trace(" %s: %s\n", strsid_table[i].str, temp); + LocalFree(temp); + } + LocalFree(psid); + } + else + { + if (GetLastError() != ERROR_INVALID_SID) + trace(" %s: couldn't be converted, returned %d\n", strsid_table[i].str, GetLastError()); + else + trace(" %s: couldn't be converted\n", strsid_table[i].str); + } + } } static void test_trustee(void) @@ -1455,9 +1469,11 @@ Size = 0; ret = GetTokenInformation(Token, TokenGroups, Groups, Size2, &Size); ok(Size > 1, "got %d\n", Size); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + ok((!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) || broken(ret) /* wow64 */, "%d with error %d\n", ret, GetLastError()); - ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + if(!ret) + ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + HeapFree(GetProcessHeap(), 0, Groups); SetLastError(0xdeadbeef); @@ -1646,7 +1662,8 @@ /* 66 */ {TRUE, "S-1-16-4096"}, {TRUE, "S-1-16-8192"}, {TRUE, "S-1-16-12288"}, /* 69 */ {TRUE, "S-1-16-16384"}, {TRUE, "S-1-5-33"}, {TRUE, "S-1-3-4"}, /* 72 */ {FALSE, "S-1-5-21-12-23-34-45-56-571"}, {FALSE, "S-1-5-21-12-23-34-45-56-572"}, -/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"} +/* 74 */ {TRUE, "S-1-5-22"}, {FALSE, "S-1-5-21-12-23-34-45-56-521"}, {TRUE, "S-1-5-32-573"}, +/* 77 */ {FALSE, "S-1-5-21-12-23-34-45-56-498"}, {TRUE, "S-1-5-32-574"}, {TRUE, "S-1-16-8448"} }; static void test_CreateWellKnownSid(void) @@ -1711,7 +1728,7 @@ expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(IsValidSid(sid_buffer), "The sid is not valid\n"); ok(pConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); - ok(strcmp(str, value->sid_string) == 0, "SID mismatch - expected %s, got %s\n", + ok(strcmp(str, value->sid_string) == 0, "%d: SID mismatch - expected %s, got %s\n", i, value->sid_string, str); LocalFree(str); @@ -2420,15 +2437,15 @@ #define CHECK_SET_SECURITY(o,i,e) \ do{ \ - BOOL res; \ + BOOL res_; \ DWORD err; \ SetLastError( 0xdeadbeef ); \ - res = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \ + res_ = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \ err = GetLastError(); \ if (e == ERROR_SUCCESS) \ - ok(res, "SetKernelObjectSecurity failed with %d\n", err); \ + ok(res_, "SetKernelObjectSecurity failed with %d\n", err); \ else \ - ok(!res && err == e, "SetKernelObjectSecurity should have failed " \ + ok(!res_ && err == e, "SetKernelObjectSecurity should have failed " \ "with %s, instead of %d\n", #e, err); \ }while(0) @@ -2543,7 +2560,7 @@ /* Doesn't matter what ACL say we should get full access for ourselves */ res = CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info ); ok(res, "CreateProcess with err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); @@ -2595,7 +2612,7 @@ ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS ); ok(ret, "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); CloseHandle( handle ); @@ -2604,7 +2621,7 @@ ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), &handle, PROCESS_ALL_ACCESS, TRUE, 0 ); ok(ret, "duplicating handle err:%d\n", GetLastError()); - TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, + TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS_NT4, PROCESS_ALL_ACCESS | PROCESS_QUERY_LIMITED_INFORMATION ); ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle1, PROCESS_VM_READ, TRUE, 0 ); @@ -2990,40 +3007,67 @@ static void test_GetNamedSecurityInfoA(void) { - PSECURITY_DESCRIPTOR pSecDesc; - DWORD revision; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100], *user; + DWORD sid_size = sizeof(admin_ptr), user_size; + char invalid_path[] = "/an invalid file path"; + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR_CONTROL control; - PSID owner; - PSID group; - PACL dacl; + ACL_SIZE_INFORMATION acl_size; + CHAR windows_dir[MAX_PATH]; + PSECURITY_DESCRIPTOR pSD; + ACCESS_ALLOWED_ACE *ace; + BOOL bret = TRUE, isNT4; + char tmpfile[MAX_PATH]; + DWORD error, revision; BOOL owner_defaulted; BOOL group_defaulted; - DWORD error; - BOOL ret, isNT4; - CHAR windows_dir[MAX_PATH]; - - if (!pGetNamedSecurityInfoA) - { - win_skip("GetNamedSecurityInfoA is not available\n"); - return; - } - - ret = GetWindowsDirectoryA(windows_dir, MAX_PATH); - ok(ret, "GetWindowsDirectory failed with error %d\n", GetLastError()); + HANDLE token, hTemp; + PSID owner, group; + PACL pDacl; + + if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) + { + win_skip("Required functions are not available\n"); + return; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + bret = GetTokenInformation(token, TokenUser, NULL, 0, &user_size); + ok(!bret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + user = HeapAlloc(GetProcessHeap(), 0, user_size); + bret = GetTokenInformation(token, TokenUser, user, user_size, &user_size); + ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)user)->User.Sid; + + bret = GetWindowsDirectoryA(windows_dir, MAX_PATH); + ok(bret, "GetWindowsDirectory failed with error %d\n", GetLastError()); SetLastError(0xdeadbeef); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, - NULL, NULL, NULL, NULL, &pSecDesc); + NULL, NULL, NULL, NULL, &pSD); if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); return; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - ret = GetSecurityDescriptorControl(pSecDesc, &control, &revision); - ok(ret, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorControl(pSD, &control, &revision); + ok(bret, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); ok((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == (SE_SELF_RELATIVE|SE_DACL_PRESENT) || broken((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == SE_DACL_PRESENT), /* NT4 */ "control (0x%x) doesn't have (SE_SELF_RELATIVE|SE_DACL_PRESENT) flags set\n", control); @@ -3031,20 +3075,21 @@ isNT4 = (control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == SE_DACL_PRESENT; - ret = GetSecurityDescriptorOwner(pSecDesc, &owner, &owner_defaulted); - ok(ret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); + ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); ok(owner != NULL, "owner should not be NULL\n"); - ret = GetSecurityDescriptorGroup(pSecDesc, &group, &group_defaulted); - ok(ret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); + ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); - LocalFree(pSecDesc); + LocalFree(pSD); /* NULL descriptor tests */ if(isNT4) { win_skip("NT4 does not support GetNamedSecutityInfo with a NULL descriptor\n"); + HeapFree(GetProcessHeap(), 0, user); return; } @@ -3053,13 +3098,85 @@ ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,DACL_SECURITY_INFORMATION, - NULL, NULL, &dacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, NULL); ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - ok(dacl != NULL, "dacl should not be NULL\n"); + ok(pDacl != NULL, "DACL should not be NULL\n"); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,OWNER_SECURITY_INFORMATION, - NULL, NULL, &dacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, NULL); ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); + + /* Test behavior of SetNamedSecurityInfo with an invalid path */ + SetLastError(0xdeadbeef); + error = pSetNamedSecurityInfoA(invalid_path, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL); + ok(error == ERROR_FILE_NOT_FOUND, "Unexpected error returned: 0x%x\n", error); + ok(GetLastError() == 0xdeadbeef, "Expected last error to remain unchanged.\n"); + + /* Create security descriptor information and test that it comes back the same */ + pSD = &sd; + pDacl = (PACL)&dacl; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + HeapFree(GetProcessHeap(), 0, user); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + GetTempFileNameA(".", "foo", 0, tmpfile); + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, + FILE_FLAG_DELETE_ON_CLOSE, NULL); + SetLastError(0xdeadbeef); + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, + NULL, pDacl, NULL); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("SetNamedSecurityInfoA is not implemented\n"); + CloseHandle(hTemp); + return; + } + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + SetLastError(0xdeadbeef); + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("GetNamedSecurityInfoA is not implemented\n"); + return; + } + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret || broken(!bret) /* win2k */, + "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, + "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + LocalFree(pSD); + CloseHandle(hTemp); } static void test_ConvertStringSecurityDescriptor(void) @@ -3523,20 +3640,42 @@ static void test_GetSecurityInfo(void) { - HANDLE obj; - PSECURITY_DESCRIPTOR sd; + char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + ACL_SIZE_INFORMATION acl_size; + PSECURITY_DESCRIPTOR pSD; + ACCESS_ALLOWED_ACE *ace; + HANDLE token, obj; PSID owner, group; - PACL dacl; + BOOL bret = TRUE; + PACL pDacl; DWORD ret; - if (!pGetSecurityInfo) - { - win_skip("GetSecurityInfo is not available\n"); - return; - } + if (!pGetSecurityInfo || !pSetSecurityInfo) + { + win_skip("[Get|Set]SecurityInfo is not available\n"); + return; + } + + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + GetTokenInformation(token, TokenUser, b, l, &l); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)b)->User.Sid; /* Create something. Files have lots of associated security info. */ - obj = CreateFile(myARGV[0], GENERIC_READ, FILE_SHARE_READ, NULL, + obj = CreateFile(myARGV[0], GENERIC_READ|WRITE_DAC, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (obj == INVALID_HANDLE_VALUE) { @@ -3546,7 +3685,7 @@ ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, &sd); + &owner, &group, &pDacl, NULL, &pSD); if (ret == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetSecurityInfo is not implemented\n"); @@ -3554,15 +3693,15 @@ return; } ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); - ok(sd != NULL, "GetSecurityInfo\n"); + ok(pSD != NULL, "GetSecurityInfo\n"); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); - LocalFree(sd); + LocalFree(pSD); if (!pCreateWellKnownSid) { @@ -3575,15 +3714,59 @@ the other stuff, leaving us no way to free it. */ ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, NULL); + &owner, &group, &pDacl, NULL, NULL); ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); + /* Create security descriptor information and test that it comes back the same */ + pSD = &sd; + pDacl = (PACL)&dacl; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + ret = pSetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, pDacl, NULL); + ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret); + ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, NULL); + ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityInfo returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } CloseHandle(obj); } @@ -3981,6 +4164,339 @@ CloseHandle(process_token); } +static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) +{ + BOOL ret, present, defaulted; + ACL *acl; + void *sid; + + ret = IsValidSecurityDescriptor(sd); + ok(ret, "security descriptor is not valid\n"); + + present = -1; + defaulted = -1; + acl = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl error %d\n", GetLastError()); +todo_wine + ok(present == 1, "acl is not present\n"); +todo_wine + ok(acl != (void *)0xdeadbeef && acl != NULL, "acl pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); + + defaulted = -1; + sid = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorOwner(sd, &sid, &defaulted); + ok(ret, "GetSecurityDescriptorOwner error %d\n", GetLastError()); +todo_wine + ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); + + defaulted = -1; + sid = (void *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetSecurityDescriptorGroup(sd, &sid, &defaulted); + ok(ret, "GetSecurityDescriptorGroup error %d\n", GetLastError()); +todo_wine + ok(sid != (void *)0xdeadbeef && sid != NULL, "sid pointer is not set\n"); + ok(defaulted == 0, "defaulted is set to TRUE\n"); +} + +static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MAPPING *mapping) +{ + DWORD ret, length, needed, granted, priv_set_len; + BOOL status; + PRIVILEGE_SET priv_set; + SECURITY_DESCRIPTOR *sd; + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, 0, &needed); + ok(!ret, "GetKernelObjectSecurity should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); + + length = needed; + sd = HeapAlloc(GetProcessHeap(), 0, length); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + sd, length, &needed); + ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); + ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + + validate_default_security_descriptor(sd); + + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, MAXIMUM_ALLOWED, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericAll, "expected all access %#x, got %#x\n", mapping->GenericAll, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, 0, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0 || broken(status == 1) /* NT4 */, "expected 0, got %d\n", status); + ok(granted == 0 || broken(granted == mapping->GenericRead) /* NT4 */, "expected 0, got %#x\n", granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, ACCESS_SYSTEM_SECURITY, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 0, "expected 0, got %d\n", status); + ok(granted == 0, "expected 0, got %#x\n", granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericRead, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericRead, "expected read access %#x, got %#x\n", mapping->GenericRead, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericWrite, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericWrite, "expected write access %#x, got %#x\n", mapping->GenericWrite, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericExecute, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericExecute, "expected execute access %#x, got %#x\n", mapping->GenericExecute, granted); +} + HeapFree(GetProcessHeap(), 0, sd); +} + +static void test_mutex_security(HANDLE token) +{ + HANDLE mutex; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + mutex = OpenMutex(0, FALSE, "WineTestMutex"); + ok(!mutex, "mutex should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + mutex = CreateMutex(NULL, FALSE, "WineTestMutex"); + ok(mutex != 0, "CreateMutex error %d\n", GetLastError()); + + test_default_handle_security(token, mutex, &mapping); + + CloseHandle (mutex); +} + +static void test_event_security(HANDLE token) +{ + HANDLE event; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + event = OpenEvent(0, FALSE, "WineTestEvent"); + ok(!event, "event should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + event = CreateEvent(NULL, FALSE, FALSE, "WineTestEvent"); + ok(event != 0, "CreateEvent error %d\n", GetLastError()); + + test_default_handle_security(token, event, &mapping); + + CloseHandle(event); +} + +#define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" +static void test_named_pipe_security(HANDLE token) +{ + HANDLE pipe, file; + GENERIC_MAPPING mapping = { FILE_GENERIC_READ, + FILE_GENERIC_WRITE, + FILE_GENERIC_EXECUTE, + STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + pipe = CreateNamedPipe(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, + PIPE_TYPE_BYTE | PIPE_NOWAIT, PIPE_UNLIMITED_INSTANCES, + 0, 0, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe error %d\n", GetLastError()); + + test_default_handle_security(token, pipe, &mapping); + + SetLastError(0xdeadbeef); + file = CreateFile(WINE_TEST_PIPE, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); + + CloseHandle(pipe); + + SetLastError(0xdeadbeef); + file = CreateFile("\\\\.\\pipe\\", FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE || broken(file == INVALID_HANDLE_VALUE) /* before Vista */, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); +} + +static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) +{ + DWORD ret, needed; + TOKEN_TYPE type; + SECURITY_IMPERSONATION_LEVEL sil; + + type = 0xdeadbeef; + needed = 0; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenType, &type, sizeof(type), &needed); + ok(ret, "GetTokenInformation error %d\n", GetLastError()); + ok(needed == sizeof(type), "GetTokenInformation should return required buffer length\n"); + ok(type == TokenPrimary || type == TokenImpersonation, "expected TokenPrimary or TokenImpersonation, got %d\n", type); + + *token_type = type; + if (type != TokenImpersonation) return FALSE; + + needed = 0; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenImpersonationLevel, &sil, sizeof(sil), &needed); + ok(ret, "GetTokenInformation error %d\n", GetLastError()); + ok(needed == sizeof(sil), "GetTokenInformation should return required buffer length\n"); + ok(sil == SecurityImpersonation, "expected SecurityImpersonation, got %d\n", sil); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenDefaultDacl, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_DEFAULT_DACL), "GetTokenInformation returned empty default DACL\n"); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenOwner, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_OWNER), "GetTokenInformation returned empty token owner\n"); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetTokenInformation(token, TokenPrimaryGroup, NULL, 0, &needed); + ok(!ret, "GetTokenInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed != 0xdeadbeef, "GetTokenInformation should return required buffer length\n"); + ok(needed > sizeof(TOKEN_PRIMARY_GROUP), "GetTokenInformation returned empty token primary group\n"); + + return TRUE; +} + +static void test_kernel_objects_security(void) +{ + HANDLE token, process_token; + DWORD ret, token_type; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &process_token); + ok(ret, "OpenProcessToken error %d\n", GetLastError()); + + ret = validate_impersonation_token(process_token, &token_type); + ok(token_type == TokenPrimary, "expected TokenPrimary, got %d\n", token_type); + ok(!ret, "access token should not be an impersonation token\n"); + + ret = DuplicateToken(process_token, SecurityImpersonation, &token); + ok(ret, "DuplicateToken error %d\n", GetLastError()); + + ret = validate_impersonation_token(token, &token_type); + ok(ret, "access token should be a valid impersonation token\n"); + ok(token_type == TokenImpersonation, "expected TokenImpersonation, got %d\n", token_type); + + test_mutex_security(token); + test_event_security(token); + test_named_pipe_security(token); + /* FIXME: test other kernel object types */ + + CloseHandle(process_token); + CloseHandle(token); +} + +static void test_TokenIntegrityLevel(void) +{ + TOKEN_MANDATORY_LABEL *tml; + BYTE buffer[64]; /* using max. 28 byte in win7 x64 */ + HANDLE token; + DWORD size; + DWORD res; + char *sidname = NULL; + static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_MEDIUM_RID}}; + + SetLastError(0xdeadbeef); + res = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = GetTokenInformation(token, TokenIntegrityLevel, buffer, sizeof(buffer), &size); + + /* not supported before Vista */ + if (!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || GetLastError() == ERROR_INVALID_FUNCTION)) + { + win_skip("TokenIntegrityLevel not supported\n"); + CloseHandle(token); + return; + } + + ok(res, "got %u with %u (expected TRUE)\n", res, GetLastError()); + if (!res) + { + CloseHandle(token); + return; + } + + tml = (TOKEN_MANDATORY_LABEL*) buffer; + ok(tml->Label.Attributes == (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED), + "got 0x%x (expected 0x%x)\n", tml->Label.Attributes, (SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED)); + + SetLastError(0xdeadbeef); + res = pConvertSidToStringSidA(tml->Label.Sid, &sidname); + ok(res, "got %u and %u\n", res, GetLastError()); + + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "got %s (expected 'S-1-16-8192' or 'S-1-16-12288')\n", sidname); + + LocalFree(sidname); + CloseHandle(token); +} + START_TEST(security) { init(); @@ -3991,6 +4507,7 @@ test_process_security_child(); return; } + test_kernel_objects_security(); test_sid(); test_trustee(); test_luid(); @@ -4017,4 +4534,5 @@ test_GetUserNameA(); test_GetUserNameW(); test_CreateRestrictedToken(); -} + test_TokenIntegrityLevel(); +} Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Mon Dec 10 14:54:40 2012 @@ -1896,6 +1896,7 @@ DWORD expected, needed; BYTE buffer[MAX_PATH]; LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; + SERVICE_PRESHUTDOWN_INFO preshutdown_info; static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -2062,6 +2063,33 @@ ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); ok(ret, "expected QueryServiceConfig2W to succeed\n"); + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); + if(!ret && GetLastError()==ERROR_INVALID_LEVEL) + { + /* Win2k3 and older */ + win_skip("SERVICE_CONFIG_PRESHUTDOWN_INFO not supported\n"); + goto cleanup; + } + ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError()); + ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed); + ok(preshutdown_info.dwPreshutdownTimeout == 180000, "Default PreshutdownTimeout = %d\n", + preshutdown_info.dwPreshutdownTimeout); + + SetLastError(0xdeadbeef); + preshutdown_info.dwPreshutdownTimeout = -1; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPVOID)&preshutdown_info); + ok(ret, "expected ChangeServiceConfig2A to succeed (%d)\n", GetLastError()); + + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); + ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError()); + ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed); + ok(preshutdown_info.dwPreshutdownTimeout == -1, "New PreshutdownTimeout = %d\n", + preshutdown_info.dwPreshutdownTimeout); + cleanup: DeleteService(svc_handle); @@ -2178,7 +2206,7 @@ if (!winetest_interactive) { - skip("reactos bug 6646: Skipping service start timeout tests!\n"); + skip("ROSTESTS-56: Skipping service start timeout tests!\n"); goto cleanup; }

1 0

[akhaldi] 57863: [PSDK] * Update some headers.
by akhaldi＠svn.reactos.org 10 Dec '12

10 Dec '12

Author: akhaldi Date: Mon Dec 10 14:54:25 2012 New Revision: 57863 URL: http://svn.reactos.org/svn/reactos?rev=57863&view=rev Log: [PSDK] * Update some headers. Modified: trunk/reactos/include/psdk/wincred.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winsvc.h trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincred.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wincred.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincred.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -23,6 +23,12 @@ extern "C" { #endif +#ifdef _ADVAPI32_ +#define WINADVAPI +#else +#define WINADVAPI DECLSPEC_IMPORT +#endif + #ifndef __SECHANDLE_DEFINED__ #define __SECHANDLE_DEFINED__ typedef struct _SecHandle @@ -32,8 +38,11 @@ } SecHandle, *PSecHandle; #endif +#ifndef __WINE_CTXTHANDLE_DEFINED__ +#define __WINE_CTXTHANDLE_DEFINED__ typedef SecHandle CtxtHandle; typedef PSecHandle PCtxtHandle; +#endif typedef struct _CREDENTIAL_ATTRIBUTEA { @@ -89,30 +98,8 @@ DECL_WINELIB_TYPE_AW(CREDENTIAL) DECL_WINELIB_TYPE_AW(PCREDENTIAL) -typedef struct _CREDUI_INFOA -{ - DWORD cbSize; - HWND hwndParent; - PCSTR pszMessageText; - PCSTR pszCaptionText; - HBITMAP hbmBanner; -} CREDUI_INFOA, *PCREDUI_INFOA; - -typedef struct _CREDUI_INFOW -{ - DWORD cbSize; - HWND hwndParent; - PCWSTR pszMessageText; - PCWSTR pszCaptionText; - HBITMAP hbmBanner; -} CREDUI_INFOW, *PCREDUI_INFOW; - -typedef enum _CRED_MARSHAL_TYPE { - CertCredential = 1, - UsernameTargetCredential -} CRED_MARSHAL_TYPE, *PCRED_MARSHAL_TYPE; - -typedef struct _CREDENTIAL_TARGET_INFORMATIONA { +typedef struct _CREDENTIAL_TARGET_INFORMATIONA +{ LPSTR TargetName; LPSTR NetbiosServerName; LPSTR DnsServerName; @@ -120,12 +107,13 @@ LPSTR DnsDomainName; LPSTR DnsTreeName; LPSTR PackageName; - ULONG Flags; + DWORD Flags; DWORD CredTypeCount; LPDWORD CredTypes; } CREDENTIAL_TARGET_INFORMATIONA, *PCREDENTIAL_TARGET_INFORMATIONA; -typedef struct _CREDENTIAL_TARGET_INFORMATIONW { +typedef struct _CREDENTIAL_TARGET_INFORMATIONW +{ LPWSTR TargetName; LPWSTR NetbiosServerName; LPWSTR DnsServerName; @@ -133,21 +121,60 @@ LPWSTR DnsDomainName; LPWSTR DnsTreeName; LPWSTR PackageName; - ULONG Flags; + DWORD Flags; DWORD CredTypeCount; LPDWORD CredTypes; } CREDENTIAL_TARGET_INFORMATIONW, *PCREDENTIAL_TARGET_INFORMATIONW; -#ifdef UNICODE -typedef CREDENTIAL_TARGET_INFORMATIONW CREDENTIAL_TARGET_INFORMATION; -typedef PCREDENTIAL_TARGET_INFORMATIONW PCREDENTIAL_TARGET_INFORMATION; -#else -typedef CREDENTIAL_TARGET_INFORMATIONA CREDENTIAL_TARGET_INFORMATION; -typedef PCREDENTIAL_TARGET_INFORMATIONA PCREDENTIAL_TARGET_INFORMATION; -#endif /* UNICODE */ +DECL_WINELIB_TYPE_AW(CREDENTIAL_TARGET_INFORMATION) +DECL_WINELIB_TYPE_AW(PCREDENTIAL_TARGET_INFORMATION) + +typedef struct _CREDUI_INFOA +{ + DWORD cbSize; + HWND hwndParent; + PCSTR pszMessageText; + PCSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOA, *PCREDUI_INFOA; + +typedef struct _CREDUI_INFOW +{ + DWORD cbSize; + HWND hwndParent; + PCWSTR pszMessageText; + PCWSTR pszCaptionText; + HBITMAP hbmBanner; +} CREDUI_INFOW, *PCREDUI_INFOW; DECL_WINELIB_TYPE_AW(CREDUI_INFO) DECL_WINELIB_TYPE_AW(PCREDUI_INFO) + +typedef enum _CRED_MARSHAL_TYPE +{ + CertCredential = 1, + UsernameTargetCredential, + BinaryBlobCredential +} CRED_MARSHAL_TYPE, *PCRED_MARSHAL_TYPE; + +#define CERT_HASH_LENGTH 20 + +typedef struct _CERT_CREDENTIAL_INFO +{ + ULONG cbSize; + UCHAR rgbHashOfCert[CERT_HASH_LENGTH]; +} CERT_CREDENTIAL_INFO, *PCERT_CREDENTIAL_INFO; + +typedef struct _USERNAME_TARGET_CREDENTIAL_INFO +{ + LPWSTR UserName; +} USERNAME_TARGET_CREDENTIAL_INFO; + +typedef struct _BINARY_BLOB_CREDENTIAL_INFO +{ + ULONG cbBlob; + LPBYTE pbBlob; +} BINARY_BLOB_CREDENTIAL_INFO, *PBINARY_BLOB_CREDENTIAL_INFO; #define CRED_MAX_STRING_LENGTH 256 #define CRED_MAX_USERNAME_LENGTH 513 @@ -177,13 +204,20 @@ #define CRED_TYPE_DOMAIN_PASSWORD 2 #define CRED_TYPE_DOMAIN_CERTIFICATE 3 #define CRED_TYPE_DOMAIN_VISIBLE_PASSWORD 4 -#define CRED_TYPE_MAXIMUM 5 +#define CRED_TYPE_GENERIC_CERTIFICATE 5 +#define CRED_TYPE_MAXIMUM 6 +#define CRED_TYPE_MAXIMUM_EX (CRED_TYPE_MAXIMUM+1000) /* values for CREDENTIAL::Persist */ #define CRED_PERSIST_NONE 0 #define CRED_PERSIST_SESSION 1 #define CRED_PERSIST_LOCAL_MACHINE 2 #define CRED_PERSIST_ENTERPRISE 3 + +/* values for CREDENTIAL_TARGET_INFORMATION::Flags */ +#define CRED_TI_SERVER_FORMAT_UNKNOWN 1 +#define CRED_TI_DOMAIN_FORMAT_UNKNOWN 2 +#define CRED_TI_ONLY_PASSWORD_REQUIRED 4 #define CREDUI_FLAGS_INCORRECT_PASSWORD 0x00000001 #define CREDUI_FLAGS_DO_NOT_PERSIST 0x00000002 @@ -206,22 +240,35 @@ /* flags for CredWrite and CredWriteDomainCredentials */ #define CRED_PRESERVE_CREDENTIAL_BLOB 0x00000001 -BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); -BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); -#define CredDelete WINELIB_NAME_AW(CredDelete) -BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); -BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); -#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) -VOID WINAPI CredFree(PVOID); -BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); -BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); -#define CredRead WINELIB_NAME_AW(CredRead) -BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); -BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); -#define CredRename WINELIB_NAME_AW(CredRename) -BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); -BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); -#define CredWrite WINELIB_NAME_AW(CredWrite) +WINADVAPI BOOL WINAPI CredDeleteA(LPCSTR,DWORD,DWORD); +WINADVAPI BOOL WINAPI CredDeleteW(LPCWSTR,DWORD,DWORD); +#define CredDelete WINELIB_NAME_AW(CredDelete) +WINADVAPI BOOL WINAPI CredEnumerateA(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); +WINADVAPI BOOL WINAPI CredEnumerateW(LPCWSTR,DWORD,DWORD *,PCREDENTIALW **); +#define CredEnumerate WINELIB_NAME_AW(CredEnumerate) +WINADVAPI VOID WINAPI CredFree(PVOID); +WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD,LPDWORD); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialA(LPCSTR); +WINADVAPI BOOL WINAPI CredIsMarshaledCredentialW(LPCWSTR); +#define CredIsMarshaledCredential WINELIB_NAME_AW(CredIsMarshaledCredential) +WINADVAPI BOOL WINAPI CredMarshalCredentialA(CRED_MARSHAL_TYPE,PVOID,LPSTR *); +WINADVAPI BOOL WINAPI CredMarshalCredentialW(CRED_MARSHAL_TYPE,PVOID,LPWSTR *); +#define CredMarshalCredential WINELIB_NAME_AW(CredMarshalCredential) +WINADVAPI BOOL WINAPI CredReadA(LPCSTR,DWORD,DWORD,PCREDENTIALA *); +WINADVAPI BOOL WINAPI CredReadW(LPCWSTR,DWORD,DWORD,PCREDENTIALW *); +#define CredRead WINELIB_NAME_AW(CredRead) +WINADVAPI BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA,DWORD,DWORD *,PCREDENTIALA **); +WINADVAPI BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW,DWORD,DWORD *,PCREDENTIALW **); +#define CredReadDomainCredentials WINELIB_NAME_AW(CredReadDomainCredentials) +WINADVAPI BOOL WINAPI CredRenameA(LPCSTR,LPCSTR,DWORD,DWORD); +WINADVAPI BOOL WINAPI CredRenameW(LPCWSTR,LPCWSTR,DWORD,DWORD); +#define CredRename WINELIB_NAME_AW(CredRename) +WINADVAPI BOOL WINAPI CredUnmarshalCredentialA(LPCSTR,PCRED_MARSHAL_TYPE,PVOID *); +WINADVAPI BOOL WINAPI CredUnmarshalCredentialW(LPCWSTR,PCRED_MARSHAL_TYPE,PVOID *); +#define CredUnmarshalCredential WINELIB_NAME_AW(CredUnmarshalCredential) +WINADVAPI BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); +WINADVAPI BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); +#define CredWrite WINELIB_NAME_AW(CredWrite) DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); @@ -240,23 +287,6 @@ DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); /* Note: no CredUIReadSSOCredA in PSDK header */ -BOOL WINAPI CredReadDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALW **Credential); -BOOL WINAPI CredReadDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, DWORD Flags, DWORD *Count, PCREDENTIALA **Credential); -BOOL WINAPI CredWriteDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, PCREDENTIALW Credential, DWORD Flags); -BOOL WINAPI CredWriteDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, PCREDENTIALA Credential, DWORD Flags); -BOOL WINAPI CredUnmarshalCredentialW(LPCWSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); -BOOL WINAPI CredUnmarshalCredentialA(LPCSTR MarshaledCredential, PCRED_MARSHAL_TYPE CredType, PVOID *Credential); - -#ifdef UNICODE -#define CredReadDomainCredentials CredReadDomainCredentialsW -#define CredWriteDomainCredentials CredWriteDomainCredentialsW -#define CredUnmarshalCredential CredUnmarshalCredentialW -#else -#define CredReadDomainCredentials CredReadDomainCredentialsA -#define CredWriteDomainCredentials CredWriteDomainCredentialsA -#define CredUnmarshalCredential CredUnmarshalCredentialA -#endif /* UNICODE */ - #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -931,13 +931,17 @@ #define SE_MANAGE_VOLUME_NAME TEXT("SeManageVolumePrivilege") #define SE_IMPERSONATE_NAME TEXT("SeImpersonatePrivilege") #define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege") -#define SE_GROUP_MANDATORY 1 -#define SE_GROUP_ENABLED_BY_DEFAULT 2 -#define SE_GROUP_ENABLED 4 -#define SE_GROUP_OWNER 8 -#define SE_GROUP_USE_FOR_DENY_ONLY 16 -#define SE_GROUP_LOGON_ID 3221225472U -#define SE_GROUP_RESOURCE 536870912 + +#define SE_GROUP_MANDATORY 0x00000001 +#define SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 +#define SE_GROUP_ENABLED 0x00000004 +#define SE_GROUP_OWNER 0x00000008 +#define SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 +#define SE_GROUP_INTEGRITY 0x00000020 +#define SE_GROUP_INTEGRITY_ENABLED 0x00000040 +#define SE_GROUP_LOGON_ID 0xC0000000 +#define SE_GROUP_RESOURCE 0x20000000 +#define SE_GROUP_VALID_ATTRIBUTES 0xE000007F /* * Product types @@ -3481,6 +3485,10 @@ TokenElevationTypeLimited, } TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; +typedef struct _TOKEN_MANDATORY_LABEL { + SID_AND_ATTRIBUTES Label; +} TOKEN_MANDATORY_LABEL, * PTOKEN_MANDATORY_LABEL; + #include <pshpack4.h> typedef struct _TOKEN_STATISTICS { LUID TokenId; Modified: trunk/reactos/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsvc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsvc.h [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -61,8 +61,24 @@ #define SERVICE_USER_DEFINED_CONTROL 256 #define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL) #define SERVICE_RUNS_IN_SYSTEM_PROCESS 1 -#define SERVICE_CONFIG_DESCRIPTION 1 -#define SERVICE_CONFIG_FAILURE_ACTIONS 2 + +#define SERVICE_CONFIG_DESCRIPTION 1 +#define SERVICE_CONFIG_FAILURE_ACTIONS 2 +#define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 +#define SERVICE_CONFIG_FAILURE_ACTIONS_FLAG 4 +#define SERVICE_CONFIG_SERVICE_SID_INFO 5 +#define SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO 6 +#define SERVICE_CONFIG_PRESHUTDOWN_INFO 7 +#define SERVICE_CONFIG_TRIGGER_INFO 8 +#define SERVICE_CONFIG_PREFERRED_NODE 9 +#define SERVICE_CONFIG_RUNLEVEL_INFO 10 + +#ifndef _SERVICE_PRESHUTDOWN_INFO_DEFINED_ +#define _SERVICE_PRESHUTDOWN_INFO_DEFINED_ +typedef struct _SERVICE_PRESHUTDOWN_INFO { + DWORD dwPreshutdownTimeout; +} SERVICE_PRESHUTDOWN_INFO, *LPSERVICE_PRESHUTDOWN_INFO; +#endif typedef struct _SERVICE_STATUS { DWORD dwServiceType; Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Mon Dec 10 14:54:25 2012 @@ -174,9 +174,12 @@ [size_is(cbRequiredPrivileges)] PBYTE pRequiredPrivileges; } SERVICE_RPC_REQUIRED_PRIVILEGES_INFO, *LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO; +cpp_quote("#ifndef _SERVICE_PRESHUTDOWN_INFO_DEFINED_") +cpp_quote("#define _SERVICE_PRESHUTDOWN_INFO_DEFINED_") typedef struct _SERVICE_PRESHUTDOWN_INFO { DWORD dwPreshutdownTimeout; } SERVICE_PRESHUTDOWN_INFO, *LPSERVICE_PRESHUTDOWN_INFO; +cpp_quote("#endif") typedef struct _SC_RPC_CONFIG_INFOA { DWORD dwInfoLevel;

1 0

[akhaldi] 57862: [ADVPACK_WINETEST]: Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 10 Dec '12

10 Dec '12

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);

1 0

[akhaldi] 57861: [ADVPACK]: Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 10 Dec '12

10 Dec '12

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

1 0

[janderwald] 57860: [USBCCGP] - Fix bug in the debugging code CORE-6574
by janderwald＠svn.reactos.org 10 Dec '12

10 Dec '12

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));

1 0

[hbelusca] 57859: [NTOSKRNL] Do the fading if we are in a valid state.
by hbelusca＠svn.reactos.org 09 Dec '12

09 Dec '12

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 *****************************************************************/

1 0

[akhaldi] 57858: [SHELL32_WINETEST]: Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 09 Dec '12

09 Dec '12

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; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs