Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 58527: Remove the unneeded $Id$ blabla from the source code. (Part 8/8) Done !!
by hbelusca＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: hbelusca Date: Sat Mar 16 20:48:10 2013 New Revision: 58527 URL: http://svn.reactos.org/svn/reactos?rev=58527&view=rev Log: Remove the unneeded $Id$ blabla from the source code. (Part 8/8) Done !! Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/dosdev.c trunk/reactos/dll/win32/kernel32/client/environ.c trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/dll/win32/kernel32/client/file/backup.c trunk/reactos/dll/win32/kernel32/client/file/cnotify.c trunk/reactos/dll/win32/kernel32/client/file/console.c trunk/reactos/dll/win32/kernel32/client/file/copy.c trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/file/delete.c trunk/reactos/dll/win32/kernel32/client/file/dir.c trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c trunk/reactos/dll/win32/kernel32/client/file/filename.c trunk/reactos/dll/win32/kernel32/client/file/hardlink.c trunk/reactos/dll/win32/kernel32/client/file/iocompl.c trunk/reactos/dll/win32/kernel32/client/file/lfile.c trunk/reactos/dll/win32/kernel32/client/file/lock.c trunk/reactos/dll/win32/kernel32/client/file/mailslot.c trunk/reactos/dll/win32/kernel32/client/file/move.c trunk/reactos/dll/win32/kernel32/client/file/rw.c trunk/reactos/dll/win32/kernel32/client/file/tape.c trunk/reactos/dll/win32/kernel32/client/file/volume.c trunk/reactos/dll/win32/kernel32/client/job.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/time.c trunk/reactos/dll/win32/kernel32/client/toolhelp.c trunk/reactos/dll/win32/kernel32/wine/lzexpand.c trunk/reactos/dll/win32/kernel32/wine/muldiv.c trunk/reactos/dll/win32/kernel32/wine/timezone.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: dllmain.c 56414 2012-04-25 10:17:29Z tfaber $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: dosdev.c 54326 2011-11-07 00:18:13Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/dosdev.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: environ.c 54459 2011-11-20 17:00:39Z pschweitzer $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/env.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: except.c 57269 2012-09-11 03:50:20Z mnordell $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/except.c Modified: trunk/reactos/dll/win32/kernel32/client/file/backup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/backup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/backup.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: backup.c 48475 2010-08-07 05:02:58Z sir_richard $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/backup.c Modified: trunk/reactos/dll/win32/kernel32/client/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/cnotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/cnotify.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: cnotify.c 55801 2012-02-21 23:27:45Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/find.c Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: console.c 55081 2012-01-22 22:27:08Z gadamopoulos $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/client/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/copy.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: copy.c 55885 2012-02-27 17:10:44Z sir_richard $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/copy.c Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: create.c 54326 2011-11-07 00:18:13Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/create.c Modified: trunk/reactos/dll/win32/kernel32/client/file/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/delete.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: delete.c 56650 2012-05-23 16:51:22Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/delete.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: dir.c 55866 2012-02-25 21:09:28Z khornicek $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/client/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/fileinfo.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: fileinfo.c 54326 2011-11-07 00:18:13Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: file.c 54310 2011-11-06 04:13:21Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/client/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: hardlink.c 55790 2012-02-21 19:18:57Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/client/file/hardlink.c Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: iocompl.c 55793 2012-02-21 21:31:01Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/iocompl.c Modified: trunk/reactos/dll/win32/kernel32/client/file/lfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/lfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/lfile.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: lfile.c 48475 2010-08-07 05:02:58Z sir_richard $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/lfile.c Modified: trunk/reactos/dll/win32/kernel32/client/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/lock.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/lock.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: lock.c 55795 2012-02-21 21:38:08Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/file/lock.c Modified: trunk/reactos/dll/win32/kernel32/client/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: mailslot.c 55791 2012-02-21 19:19:44Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/mailslot.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: move.c 54326 2011-11-07 00:18:13Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: rw.c 54326 2011-11-07 00:18:13Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/rw.c Modified: trunk/reactos/dll/win32/kernel32/client/file/tape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/tape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/tape.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: tape.c 54334 2011-11-07 07:41:52Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/tape.c Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: volume.c 52819 2011-07-23 18:54:29Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: job.c 54306 2011-11-06 00:09:33Z pschweitzer $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/process/job.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: proc.c 57086 2012-08-16 15:39:40Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/proc/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: time.c 52770 2011-07-22 02:13:57Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/time.c Modified: trunk/reactos/dll/win32/kernel32/client/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/toolhelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/toolhelp.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: toolhelp.c 54071 2011-10-10 12:14:12Z tfaber $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/misc/toolhelp.c Modified: trunk/reactos/dll/win32/kernel32/wine/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/lz… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/lzexpand.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/lzexpand.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: lzexpand.c 52854 2011-07-24 23:42:09Z ion $ - * +/* * LZ Decompression functions * * Copyright 1996 Marcus Meissner Modified: trunk/reactos/dll/win32/kernel32/wine/muldiv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/mu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/muldiv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/muldiv.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: muldiv.c 37829 2008-12-03 17:33:13Z dgorbachev $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/misc/muldiv.c Modified: trunk/reactos/dll/win32/kernel32/wine/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/timezone.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/timezone.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: timezone.c 52819 2011-07-23 18:54:29Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/time.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sat Mar 16 20:48:10 2013 @@ -1,5 +1,4 @@ -/* $Id: nls.c 52854 2011-07-24 23:42:09Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/misc/nls.c

1 0

[hbelusca] 58526: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 7/8)
by hbelusca＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: hbelusca Date: Sat Mar 16 20:41:13 2013 New Revision: 58526 URL: http://svn.reactos.org/svn/reactos?rev=58526&view=rev Log: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 7/8) Modified: trunk/reactos/dll/win32/aclui/aclui.c trunk/reactos/dll/win32/aclui/checklist.c trunk/reactos/dll/win32/aclui/misc.c trunk/reactos/dll/win32/aclui/sidcache.c trunk/reactos/dll/win32/advapi32/misc/dllmain.c trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/audit.c trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/sec/trustee.c trunk/reactos/dll/win32/advapi32/token/privilege.c trunk/reactos/dll/win32/devmgr/devprblm.c trunk/reactos/dll/win32/devmgr/hwpage.c trunk/reactos/dll/win32/devmgr/misc.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c trunk/reactos/dll/win32/hid/hid.c trunk/reactos/dll/win32/hid/stubs.c trunk/reactos/dll/win32/iprtprio/iprtprio.rc trunk/reactos/dll/win32/msgina/stubs.c trunk/reactos/dll/win32/mswsock/extensions.c trunk/reactos/dll/win32/mswsock/stubs.c trunk/reactos/dll/win32/ntmarta/ntmarta.c trunk/reactos/dll/win32/psapi/internal.h trunk/reactos/dll/win32/psapi/malloc.c trunk/reactos/dll/win32/psapi/psapi.c trunk/reactos/dll/win32/samlib/dllmain.c trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/secur32/dllmain.c trunk/reactos/dll/win32/smdll/dllmain.c trunk/reactos/dll/win32/smdll/query.c trunk/reactos/dll/win32/smdll/readme.txt trunk/reactos/dll/win32/syssetup/dllmain.c trunk/reactos/dll/win32/userenv/desktop.c trunk/reactos/dll/win32/userenv/directory.c trunk/reactos/dll/win32/userenv/environment.c trunk/reactos/dll/win32/userenv/internal.h trunk/reactos/dll/win32/userenv/misc.c trunk/reactos/dll/win32/userenv/registry.c trunk/reactos/dll/win32/userenv/resources.h trunk/reactos/dll/win32/userenv/setup.c trunk/reactos/dll/win32/userenv/userenv.c trunk/reactos/dll/win32/winfax/winfax.c trunk/reactos/dll/win32/winscard/winscard.c trunk/reactos/dll/win32/winscard/winscard.rc trunk/reactos/dll/win32/winspool/stubs.c trunk/reactos/dll/win32/wsock32/stubs.c Modified: trunk/reactos/dll/win32/aclui/aclui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.c?re… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: aclui.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * PROJECT: ReactOS Access Control List Editor * FILE: lib/aclui/aclui.c * PURPOSE: Access Control List Editor Modified: trunk/reactos/dll/win32/aclui/checklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/checklist.… ============================================================================== --- trunk/reactos/dll/win32/aclui/checklist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/checklist.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: checklist.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * PROJECT: ReactOS Access Control List Editor * FILE: lib/aclui/checklist.c * PURPOSE: Access Control List Editor Modified: trunk/reactos/dll/win32/aclui/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/misc.c?rev… ============================================================================== --- trunk/reactos/dll/win32/aclui/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/misc.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * PROJECT: ReactOS Access Control List Editor * FILE: lib/aclui/misc.c * PURPOSE: Access Control List Editor Modified: trunk/reactos/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/sidcache.c… ============================================================================== --- trunk/reactos/dll/win32/aclui/sidcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/sidcache.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: aclui.c 19715 2005-11-28 01:10:49Z weiden $ - * +/* * PROJECT: ReactOS Access Control List Editor * FILE: lib/aclui/sidcache.c * PURPOSE: Access Control List Editor Modified: trunk/reactos/dll/win32/advapi32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: dllmain.c 53225 2011-08-14 11:31:23Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/misc/dllmain.c Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: ac.c 57331 2012-09-19 02:32:58Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/ac.c Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/aud… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/audit.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: audit.c 56877 2012-07-12 19:48:30Z tfaber $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/audit.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: sec.c 56451 2012-04-29 21:39:32Z ekohl $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/sec.c Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/tru… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/trustee.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: trustee.c 53225 2011-08-14 11:31:23Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/sec/trustee.c Modified: trunk/reactos/dll/win32/advapi32/token/privilege.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/p… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/privilege.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/privilege.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: privilege.c 37763 2008-11-30 11:42:05Z sginsberg $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/token/privilege.c Modified: trunk/reactos/dll/win32/devmgr/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devprblm.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: hwpage.c 19599 2005-11-26 02:12:58Z weiden $ - * +/* * PROJECT: ReactOS devmgr.dll * FILE: lib/devmgr/devprblm.c * PURPOSE: ReactOS Device Manager Modified: trunk/reactos/dll/win32/devmgr/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwpage.c?… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: hwpage.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * PROJECT: ReactOS devmgr.dll * FILE: lib/devmgr/hwpage.c * PURPOSE: ReactOS Device Manager Modified: trunk/reactos/dll/win32/devmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/misc.c?re… ============================================================================== --- trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/misc.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: devmgr.c 12852 2005-01-06 13:58:04Z mf $ - * +/* * PROJECT: ReactOS devmgr.dll * FILE: lib/devmgr/misc.c * PURPOSE: ReactOS Device Manager Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ap… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/api.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: subsys/system/dhcp/api.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/pi… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: subsys/system/dhcp/pipe.c Modified: trunk/reactos/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.c?rev=58… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: hid.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * PROJECT: ReactOS Hid User Library * FILE: lib/hid/hid.c * PURPOSE: ReactOS Hid User Library Modified: trunk/reactos/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/stubs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/stubs.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Hid User Library * FILE: lib/hid/stubs.c Modified: trunk/reactos/dll/win32/iprtprio/iprtprio.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iprtprio/iprtpri… ============================================================================== --- trunk/reactos/dll/win32/iprtprio/iprtprio.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iprtprio/iprtprio.rc [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,4 +1,3 @@ -/* $Id: iprtprio.rc 23585 2006-08-14 21:48:55Z gedmurphy $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS IP Route Priority API DLL\0" Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: stubs.c 58363 2013-02-24 19:44:41Z ekohl $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS msgina.dll * FILE: lib/msgina/stubs.c Modified: trunk/reactos/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/extensio… ============================================================================== --- trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,10 +1,9 @@ -/* $Id: stubs.c 12852 2005-01-06 13:58:04Z mf $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock DLL - * FILE: stubs.c - * PURPOSE: WSAIoctl wrappers for Microsoft extensions to Winsock - * PROGRAMMERS: KJK::Hyperion <hackbunny(a)reactos.com> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock DLL + * FILE: stubs.c + * PURPOSE: WSAIoctl wrappers for Microsoft extensions to Winsock + * PROGRAMMERS: KJK::Hyperion <hackbunny(a)reactos.com> * REVISIONS: */ Modified: trunk/reactos/dll/win32/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,10 +1,9 @@ -/* $Id: stubs.c 53180 2011-08-11 15:07:19Z akhaldi $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS WinSock DLL - * FILE: stubs.c - * PURPOSE: Stub functions - * PROGRAMMERS: Ge van Geldorp (ge(a)gse.nl) +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock DLL + * FILE: stubs.c + * PURPOSE: Stub functions + * PROGRAMMERS: Ge van Geldorp (ge(a)gse.nl) * REVISIONS: */ Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: ntmarta.c 31176 2007-12-12 07:04:12Z weiden $ - * +/* * PROJECT: ReactOS MARTA provider * FILE: lib/ntmarta/ntmarta.c * PURPOSE: ReactOS MARTA provider Modified: trunk/reactos/dll/win32/psapi/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/internal.h… ============================================================================== --- trunk/reactos/dll/win32/psapi/internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/internal.h [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,3 @@ -/* $Id: internal.h 21298 2006-03-12 00:08:41Z jimtabor $ -*/ /* * epsapi.h * Modified: trunk/reactos/dll/win32/psapi/malloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/malloc.c?r… ============================================================================== --- trunk/reactos/dll/win32/psapi/malloc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/malloc.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,3 @@ -/* $Id: malloc.c 37763 2008-11-30 11:42:05Z sginsberg $ - */ /* * COPYRIGHT: None * LICENSE: Public domain Modified: trunk/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.c?re… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,3 @@ -/* $Id: psapi.c 44602 2009-12-15 15:16:01Z tkreuzer $ - */ /* * COPYRIGHT: See COPYING in the top level directory * LICENSE: See LGPL.txt in the top level directory Modified: trunk/reactos/dll/win32/samlib/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: dllmain.c 56648 2012-05-21 13:38:32Z ekohl $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: SAM interface library Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: samlib.c 58259 2013-02-01 22:18:28Z ekohl $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: SAM interface library Modified: trunk/reactos/dll/win32/secur32/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/dllmain.… ============================================================================== --- trunk/reactos/dll/win32/secur32/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/dllmain.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: dllmain.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/secur32/lsa.c Modified: trunk/reactos/dll/win32/smdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/dllmain.c?… ============================================================================== --- trunk/reactos/dll/win32/smdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/dllmain.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: dllmain.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS * FILE: lib/smdll/dllmain.c Modified: trunk/reactos/dll/win32/smdll/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/query.c?re… ============================================================================== --- trunk/reactos/dll/win32/smdll/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/query.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: query.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/smdll/query.c Modified: trunk/reactos/dll/win32/smdll/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/readme.txt… ============================================================================== --- trunk/reactos/dll/win32/smdll/readme.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/smdll/readme.txt [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,4 +1,3 @@ -$Id: readme.txt 58335 2013-02-17 15:06:22Z tkreuzer $ This is SMDLL: a helper library to talk to the ReactOS session manager (SM). Modified: trunk/reactos/dll/win32/syssetup/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/dllmain… ============================================================================== --- trunk/reactos/dll/win32/syssetup/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/dllmain.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: dllmain.c 54383 2011-11-15 08:44:37Z rharabien $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Main file Modified: trunk/reactos/dll/win32/userenv/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/desktop.… ============================================================================== --- trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: desktop.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/desktop.c Modified: trunk/reactos/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/director… ============================================================================== --- trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: directory.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/directory.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: environment.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/internal… ============================================================================== --- trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: internal.h 43790 2009-10-27 10:34:16Z dgorbachev $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/internal.h Modified: trunk/reactos/dll/win32/userenv/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/misc.c?r… ============================================================================== --- trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/misc.c Modified: trunk/reactos/dll/win32/userenv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/registry… ============================================================================== --- trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: registry.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/registry.c Modified: trunk/reactos/dll/win32/userenv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/resource… ============================================================================== --- trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: resources.h 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/resource.h Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: setup.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/setup.c Modified: trunk/reactos/dll/win32/userenv/userenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: userenv.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/userenv/userenv.c Modified: trunk/reactos/dll/win32/winfax/winfax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winfax/winfax.c?… ============================================================================== --- trunk/reactos/dll/win32/winfax/winfax.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winfax/winfax.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: winfax.c 43790 2009-10-27 10:34:16Z dgorbachev $ - * +/* * PROJECT: ReactOS FAX API Support * FILE: lib/winfax/winfax.c * PURPOSE: ReactOS FAX API Support Modified: trunk/reactos/dll/win32/winscard/winscard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/winscar… ============================================================================== --- trunk/reactos/dll/win32/winscard/winscard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winscard/winscard.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: winscard.c 43790 2009-10-27 10:34:16Z dgorbachev $ - * +/* * PROJECT: ReactOS SmartCard API * FILE: lib/winscard/winscard.c * PURPOSE: ReactOS SmartCard API Modified: trunk/reactos/dll/win32/winscard/winscard.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/winscar… ============================================================================== --- trunk/reactos/dll/win32/winscard/winscard.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winscard/winscard.rc [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,4 +1,3 @@ -/* $Id: winscard.rc 22413 2006-06-19 12:43:39Z gedmurphy $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS SmartCard API\0" Modified: trunk/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS winspool DRV * FILE: stubs.c Modified: trunk/reactos/dll/win32/wsock32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/wsock32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/stubs.c [iso-8859-1] Sat Mar 16 20:41:13 2013 @@ -1,5 +1,4 @@ -/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock DLL * FILE: stubs.c

1 0

[hbelusca] 58525: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 6/8) (N == 8)
by hbelusca＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: hbelusca Date: Sat Mar 16 20:25:38 2013 New Revision: 58525 URL: http://svn.reactos.org/svn/reactos?rev=58525&view=rev Log: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 6/8) (N == 8) Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c trunk/reactos/dll/cpl/appwiz/createlink.c trunk/reactos/dll/cpl/console/lang/bg-BG.rc trunk/reactos/dll/cpl/console/lang/de-DE.rc trunk/reactos/dll/cpl/console/lang/en-US.rc trunk/reactos/dll/cpl/console/lang/it-IT.rc trunk/reactos/dll/cpl/console/lang/no-NO.rc trunk/reactos/dll/cpl/console/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/dibitmap.c trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/inplocale.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/numbers.c trunk/reactos/dll/cpl/intl/sort.c trunk/reactos/dll/cpl/liccpa/liccpa.c trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/keyboard.c trunk/reactos/dll/cpl/main/main.c trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/mmsys/sounds.c trunk/reactos/dll/cpl/mmsys/volume.c trunk/reactos/dll/cpl/odbccp32/odbccp32.c trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/hibernate.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powershemes.c trunk/reactos/dll/cpl/usrmgr/extra.c trunk/reactos/dll/cpl/usrmgr/usrmgr.c trunk/reactos/dll/directx/d3d8/d3d8.rc trunk/reactos/dll/directx/d3d9/d3d9.rc trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c trunk/reactos/dll/directx/ddraw/Color/color_stubs.c trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c trunk/reactos/dll/directx/ddraw/Palette/createpalette.c trunk/reactos/dll/directx/ddraw/Palette/palette.c trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c trunk/reactos/dll/directx/ddraw/cleanup.c trunk/reactos/dll/directx/ddraw/ddraw.rc trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c trunk/reactos/dll/shellext/slayer/slayer.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/access.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: access.c 29112 2007-09-19 21:31:49Z ekohl $ - * +/* * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/access.c Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/display.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: display.c 29112 2007-09-19 21:31:49Z ekohl $ - * +/* * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/display.c Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/general.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: general.c 29112 2007-09-19 21:31:49Z ekohl $ - * +/* * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/general.c Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/keyboard.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: keyboard.c 29170 2007-09-23 22:59:00Z ekohl $ - * +/* * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/keyboard.c Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: mouse.c 29112 2007-09-19 21:31:49Z ekohl $ - * +/* * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/mouse.c Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/sound.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: sound.c 29112 2007-09-19 21:31:49Z ekohl $ - * +/* * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,11 +1,10 @@ -/* $Id: appwiz.c 29364 2007-10-02 23:34:00Z janderwald $ - * - * PROJECT: ReactOS Software Control Panel - * FILE: dll/cpl/appwiz/createlink.c - * PURPOSE: ReactOS Software Control Panel - * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) - * Dmitry Chapyshev (lentind(a)yandex.ru) - * Johannes Anderwald +/* + * PROJECT: ReactOS Software Control Panel + * FILE: dll/cpl/appwiz/createlink.c + * PURPOSE: ReactOS Software Control Panel + * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) + * Dmitry Chapyshev (lentind(a)yandex.ru) + * Johannes Anderwald * UPDATE HISTORY: * 06-17-2004 Created */ Modified: trunk/reactos/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/bg-BG… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: en-US.rc 49139 2010-10-13 21:23:48Z dreimer $ - * +/* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/console/lang/en-US.rc Modified: trunk/reactos/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/de-DE… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ - * +/* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/console/de-DE.rc Modified: trunk/reactos/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/en-US… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/en-US.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: en-US.rc 49139 2010-10-13 21:23:48Z dreimer $ - * +/* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/console/lang/en-US.rc Modified: trunk/reactos/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/it-IT… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: en-US.rc 29690 2007-10-19 23:21:45Z dreimer $ - * +/* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/console/it-IT.rc Modified: trunk/reactos/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/no-NO… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: en-US.rc 31950 2008-01-22 19:08:51Z dreimer $ - * +/* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/console/lang/en-US.rc Modified: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ // Russian language resource file (Dmitry Chapyshev, 2007-06-11) -/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ */ #include <commctrl.h> Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: advappdlg.c 24836 2007-02-12 03:12:56Z tkreuzer $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: dll/cpl/desk/advappdlg.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: background.c 55583 2012-02-13 20:52:20Z rharabien $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: desk.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: dll/cpl/desk/desk.c Modified: trunk/reactos/dll/cpl/desk/dibitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/dibitmap.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/dibitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/dibitmap.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: dibitmap.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: dll/cpl/desk/dibitmap.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: currency.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS International Control Panel * FILE: dll/cpl/intl/currency.c * PURPOSE: Currency property page Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: date.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS International Control Panel * FILE: dll/cpl/intl/date.c * PURPOSE: Date property page Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: generalp.c 56849 2012-07-07 23:02:14Z fireball $ - * +/* * PROJECT: ReactOS International Control Panel * FILE: dll/cpl/intl/generalp.c * PURPOSE: General property page Modified: trunk/reactos/dll/cpl/intl/inplocale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/inplocale.c?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/inplocale.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/inplocale.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: inplocale.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS International Control Panel * FILE: dll/cpl/intl/inplocale.c * PURPOSE: Input Locale property page Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: intl.c 54972 2012-01-15 13:37:25Z rharabien $ - * +/* * PROJECT: ReactOS International Control Panel * FILE: dll/cpl/intl/intl.c * PURPOSE: Property sheet code Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: numbers.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS International Control Panel * FILE: dll/cpl/intl/numbers.c * PURPOSE: Numbers property page Modified: trunk/reactos/dll/cpl/intl/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sort.c?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/intl/sort.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/sort.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: sort.c 52956 2011-07-28 14:54:48Z akhaldi $ - * +/* * PROJECT: ReactOS International Control Panel * FILE: dll/cpl/intl/sort.c * PURPOSE: Sorting property page Modified: trunk/reactos/dll/cpl/liccpa/liccpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.c?re… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: appearance.c 13406 2005-02-04 20:39:10Z weiden $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS License Manager * FILE: dll/cpl/liccpa/liccpa.c Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,4 +1,3 @@ -/* $Id: cplsample.rc 12852 2005-01-06 13:58:04Z mf $ */ #include <windows.h> #include "resource.h" Modified: trunk/reactos/dll/cpl/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/keyboard.c?re… ============================================================================== --- trunk/reactos/dll/cpl/main/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/keyboard.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: keyboard.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS Main Control Panel * FILE: dll/cpl/main/keyboard.c * PURPOSE: Keyboard Control Panel Modified: trunk/reactos/dll/cpl/main/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.c?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/main/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/main.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: main.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS Sample Control Panel * FILE: dll/cpl/main/main.c * PURPOSE: ReactOS Main Control Panel Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=5… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: mouse.c 56254 2012-03-28 07:09:53Z tkreuzer $ - * +/* * PROJECT: ReactOS Main Control Panel * FILE: dll/cpl/main/mouse.c * PURPOSE: Mouse Control Panel Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ - * +/* * PROJECT: ReactOS Multimedia Control Panel * FILE: dll/cpl/mmsys/mmsys.c * PURPOSE: ReactOS Multimedia Control Panel Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ - * +/* * PROJECT: ReactOS Multimedia Control Panel * FILE: dll/cpl/mmsys/mmsys.c * PURPOSE: ReactOS Multimedia Control Panel Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: odbccp32.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS ODBC Control Panel Applet * FILE: dll/cpl/main/main.c * PURPOSE: applet initialization Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: advanced.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS Power Configuration Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/powercfg/advanced.c Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: alarms.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS Power Configuration Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/powercfg/alarms.c Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/hibernate.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/hibernate.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: hibernate.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS Power Configuration Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/powercfg/hibernate.c Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: powercfg.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS Power Configuration Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: powershemes.c 54535 2011-11-29 14:55:58Z dgorbachev $ - * +/* * PROJECT: ReactOS Power Configuration Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/usrmgr/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/extra.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/extra.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/extra.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS User Manager Control Panel * FILE: dll/cpl/usrmgr/extra.c Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS User Manager Control Panel * FILE: dll/cpl/usrmgr/usrmgr.c Modified: trunk/reactos/dll/directx/d3d8/d3d8.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.rc?r… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,4 +1,3 @@ -/* $Id: d3d8.rc 33008 2008-04-17 19:15:43Z greatlrd $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Direct3D\0" Modified: trunk/reactos/dll/directx/d3d9/d3d9.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rc?r… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,4 +1,3 @@ -/* $Id: d3d9.rc 33008 2008-04-17 19:15:43Z greatlrd $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Direct3D\0" Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: clipper_main.c 36519 2008-09-25 19:26:09Z tkreuzer $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/clipper/clipper_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: clipper.c 24690 2006-11-05 21:19:53Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/clipper/clipper_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Color/color_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Color/co… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Color/color_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Color/color_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: color.c 24690 2006-11-05 21:19:53Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/color/color.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: GetCaps.c 37776 2008-11-30 19:28:11Z hyperion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/ddraw/GetCaps.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: GetDeviceIdentifier.c 37776 2008-11-30 19:28:11Z hyperion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/ddraw/GetDeviceIdentifier.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/ddraw/callbacks_dd_hel.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: ddraw_displaymode.c 37776 2008-11-30 19:28:11Z hyperion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: ddraw_main.c 49872 2010-11-30 16:29:49Z fireball $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: ddraw_setcooperativelevel.c 40864 2009-05-09 12:27:40Z dchapyshev $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: ddraw_stubs.c 49872 2010-11-30 16:29:49Z fireball $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/ddraw/ddraw_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Gamma/ga… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: gamma.c 24690 2006-11-05 21:19:53Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/gamma/gamma_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Kernel/k… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: kernel.c 24690 2006-11-05 21:19:53Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/kernel/kernel_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Palette/createpalette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/createpalette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Palette/createpalette.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Palette/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Palette/palette.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: palette.c $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/Palette/palette.c Modified: trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: palette.c 24690 2006-11-05 21:19:53Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/palette/palette_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/surface/callbacks_surf_hel.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: surface_main.c 49872 2010-11-30 16:29:49Z fireball $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/surface/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: surface_stubs.c 37917 2008-12-07 21:48:44Z dgorbachev $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/surface/surface_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Videopor… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: videoport.c 22739 2006-07-01 12:08:35Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX * FILE: ddraw/videoport/videoport_stubs.c Modified: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/cleanup.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ddraw/ddraw.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rc… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rc [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,4 +1,3 @@ -/* $Id: ddraw.rc 33008 2008-04-17 19:15:43Z greatlrd $ */ #include "resource.h" Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/main.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,6 +1,4 @@ - -/* $Id: main.c 37776 2008-11-30 19:28:11Z hyperion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ddraw/ddraw.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -1,5 +1,4 @@ -/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ddraw/ddraw.c Modified: trunk/reactos/dll/shellext/slayer/slayer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.c [iso-8859-1] Sat Mar 16 20:25:38 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: slayer.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * PROJECT: ReactOS Compatibility Layer Shell Extension * FILE: lib/shellext/cplsample/cplsample.c * PURPOSE: ReactOS Compatibility Layer Shell Extension

1 0

[hbelusca] 58524: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 5/N) The only thing remaining is to remove $Id$ in /dll/
by hbelusca＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: hbelusca Date: Sat Mar 16 20:08:56 2013 New Revision: 58524 URL: http://svn.reactos.org/svn/reactos?rev=58524&view=rev Log: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 5/N) The only thing remaining is to remove $Id$ in /dll/ Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c trunk/reactos/base/applications/cmdutils/hostname/hostname.c trunk/reactos/base/applications/sndvol32/misc.c trunk/reactos/base/applications/sndvol32/mixer.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/usetup/bootsup.h trunk/reactos/base/setup/usetup/drivesup.c trunk/reactos/base/setup/usetup/drivesup.h trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/filequeue.h trunk/reactos/base/setup/usetup/filesup.h trunk/reactos/base/setup/usetup/format.h trunk/reactos/base/setup/usetup/genlist.h trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/progress.h trunk/reactos/base/setup/usetup/registry.h trunk/reactos/base/setup/usetup/settings.h trunk/reactos/base/setup/welcome/lang/ru-RU.rc trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/shell/cmd/window.c trunk/reactos/base/system/winlogon/setup.h Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -1,5 +1,4 @@ -/* $Id: dbgprint.c 24720 2006-11-11 16:07:35Z janderwald $ - * +/* * PROJECT: ReactOS DbgPrint Utility * LICENSE: GPL - See COPYING in the top level directory * FILE: tools/dbgprint/dbgprint.c Modified: trunk/reactos/base/applications/cmdutils/hostname/hostname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/hostname.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/hostname.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: hostname.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT : See COPYING in the top level directory * PROJECT : ReactOS/Win32 get host name * FILE : subsys/system/hostname/hostname.c Modified: trunk/reactos/base/applications/sndvol32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/misc.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Sound Volume Control * FILE: subsys/system/sndvol32/misc.c Modified: trunk/reactos/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: mixer.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Sound Volume Control * FILE: subsys/system/sndvol32/mixer.c Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: sndvol32.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Sound Volume Control * FILE: subsys/system/sndvol32/sndvol32.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: reactos.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: bootsup.h 48703 2010-09-05 17:09:18Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/bootsup.h Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/drivesup.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: drivesup.c 47686 2010-06-07 21:38:49Z spetreolle $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/drivesup.c Modified: trunk/reactos/base/setup/usetup/drivesup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/drivesup.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: drivesup.h 45685 2010-02-26 11:43:19Z gedmurphy $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/drivesup.h Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: registry.h 21704 2006-04-22 13:55:01Z tretiakov $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/errcode.h Modified: trunk/reactos/base/setup/usetup/filequeue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filequeue.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: filequeue.h 45685 2010-02-26 11:43:19Z gedmurphy $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/filequeue.h Modified: trunk/reactos/base/setup/usetup/filesup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: filesup.h 45685 2010-02-26 11:43:19Z gedmurphy $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/filesup.h Modified: trunk/reactos/base/setup/usetup/format.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.h… ============================================================================== --- trunk/reactos/base/setup/usetup/format.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/format.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: format.h 45685 2010-02-26 11:43:19Z gedmurphy $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/format.h Modified: trunk/reactos/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: genlist.h 45685 2010-02-26 11:43:19Z gedmurphy $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/genlist.h Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: inicache.c 47686 2010-06-07 21:38:49Z spetreolle $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/inicache.c Modified: trunk/reactos/base/setup/usetup/progress.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/progress.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: progress.h 52467 2011-06-26 10:08:31Z rharabien $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: registry.h 47037 2010-04-26 15:10:23Z ekohl $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/registry.h Modified: trunk/reactos/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: settings.h 45685 2010-02-26 11:43:19Z gedmurphy $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/settings.h Modified: trunk/reactos/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ru… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/ru-RU.rc [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -1,4 +1,3 @@ -/* $Id: En.rc 21257 2006-03-08 23:07:09Z audit $ */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: welcome.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS welcome/autorun application * FILE: subsys/system/welcome/welcome.c Modified: trunk/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/window.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/window.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/window.c [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -1,5 +1,4 @@ -/* $Id: window.c 58214 2013-01-24 23:00:42Z akhaldi $ - * +/* * WINDOW.C - activate & window internal commands. * * clone from 4nt activate command Modified: trunk/reactos/base/system/winlogon/setup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/setup.h [iso-8859-1] Sat Mar 16 20:08:56 2013 @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: setup.h 45685 2010-02-26 11:43:19Z gedmurphy $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS winlogon * FILE: subsys/system/winlogon/setup.h

1 0

[hbelusca] 58523: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 4/N)
by hbelusca＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: hbelusca Date: Sat Mar 16 19:49:08 2013 New Revision: 58523 URL: http://svn.reactos.org/svn/reactos?rev=58523&view=rev Log: Remove the unneeded $Id$ blabla from the source code, but not in 3rd party code. (Part 4/N) Modified: trunk/reactos/drivers/base/beep/beep.rc trunk/reactos/drivers/base/bootvid/bootvid.rc trunk/reactos/drivers/base/kdcom/kdcom.rc trunk/reactos/drivers/base/null/null.rc trunk/reactos/drivers/bus/acpi/acpi.rc trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/drivers/bus/isapnp/isapnp.rc trunk/reactos/drivers/bus/pci/pci.rc trunk/reactos/drivers/bus/pci/pcidef.h trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.rc trunk/reactos/drivers/filesystems/cdfs/cleanup.c trunk/reactos/drivers/filesystems/cdfs/close.c trunk/reactos/drivers/filesystems/cdfs/common.c trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/cdfs/misc.c trunk/reactos/drivers/filesystems/cdfs/rw.c trunk/reactos/drivers/filesystems/cdfs/volinfo.c trunk/reactos/drivers/filesystems/ext2/ext2fs.rc trunk/reactos/drivers/filesystems/msfs/msfs.rc trunk/reactos/drivers/filesystems/mup/create.c trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/drivers/filesystems/mup/mup.rc trunk/reactos/drivers/input/kbdclass/kbdclass.rc trunk/reactos/drivers/input/mouclass/mouclass.rc trunk/reactos/drivers/input/sermouse/sermouse.rc trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc trunk/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc trunk/reactos/drivers/multimedia/audio/sound/sb16.c trunk/reactos/drivers/multimedia/audio/sound/sb16.rc trunk/reactos/drivers/network/afd/afd.rc trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/dd/ne2000/ne2000.rc trunk/reactos/drivers/network/dd/pcnet/pcnet.rc trunk/reactos/drivers/network/lan/lan.rc trunk/reactos/drivers/network/ndis/ndis.rc trunk/reactos/drivers/network/tdi/cte/string.c trunk/reactos/drivers/network/tdi/misc/tdi.rc trunk/reactos/drivers/network/tdi/tdi/handler.c trunk/reactos/drivers/network/tdi/tdi/obsolete.c trunk/reactos/drivers/network/tdi/tdi/stubs.c trunk/reactos/drivers/parallel/parallel/parallel.c trunk/reactos/drivers/parallel/parallel/parallel.rc trunk/reactos/drivers/serial/serenum/serenum.rc trunk/reactos/drivers/serial/serial/serial.rc trunk/reactos/drivers/setup/blue/blue.rc trunk/reactos/drivers/storage/class/cdrom/cdrom.rc trunk/reactos/drivers/storage/class/class2/class2.rc trunk/reactos/drivers/storage/class/disk/disk.rc trunk/reactos/drivers/storage/class/include/class2.h trunk/reactos/drivers/storage/floppy/floppy.rc trunk/reactos/drivers/storage/ide/atapi/atapi.rc trunk/reactos/drivers/wmi/wmilib.rc trunk/reactos/include/psdk/ddkernel.h trunk/reactos/include/psdk/dmemmgr.h trunk/reactos/include/psdk/dvp.h trunk/reactos/include/psdk/objerror.h trunk/reactos/include/psdk/polarity.h trunk/reactos/include/reactos/libs/epsapi/epsapi.h trunk/reactos/include/reactos/libs/syssetup/syssetup.h trunk/reactos/include/reactos/subsys/lsass/lsass.h trunk/reactos/include/reactos/subsys/sm/helper.h trunk/reactos/include/reactos/subsys/sm/ns.h trunk/reactos/include/reactos/winlogon.h Modified: trunk/reactos/drivers/base/beep/beep.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.rc?… ============================================================================== --- trunk/reactos/drivers/base/beep/beep.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/beep.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: beep.rc 21705 2006-04-22 13:58:53Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "PC Speaker Device Driver\0" Modified: trunk/reactos/drivers/base/bootvid/bootvid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: bootvid.rc 31840 2008-01-17 14:50:36Z cfinck $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VGA Boot Driver\0" Modified: trunk/reactos/drivers/base/kdcom/kdcom.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,12 +1,6 @@ -/* $Id: bootvid.rc 24464 2006-10-09 04:00:34Z ion $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS KDBG COM Library\0" #define REACTOS_STR_INTERNAL_NAME "kdcom\0" #define REACTOS_STR_ORIGINAL_FILENAME "kdcom.sys\0" #include <reactos/version.rc> - -IDB_BOOTIMAGE BITMAP DISCARDABLE "bootimage.bmp" -IDB_BAR BITMAP DISCARDABLE "bar.bmp" - - Modified: trunk/reactos/drivers/base/null/null.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/null/null.rc?… ============================================================================== --- trunk/reactos/drivers/base/null/null.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/base/null/null.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: null.rc 21842 2006-05-07 19:16:11Z ion $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Null Device Driver\0" Modified: trunk/reactos/drivers/bus/acpi/acpi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rc?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpi.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpi.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: acpi.rc 21698 2006-04-22 05:55:17Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS ACPI Driver\0" Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: acpienum.c 21698 2006-04-22 05:55:17Z tretiakov $ - * +/* * PROJECT: ReactOS ACPI bus driver * FILE: acpi/ospm/acpienum.c * PURPOSE: ACPI namespace enumerator Modified: trunk/reactos/drivers/bus/isapnp/isapnp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: isapnp.rc 27431 2007-07-06 20:18:43Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ISA Plug And Play Bus Driver\0" Modified: trunk/reactos/drivers/bus/pci/pci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.rc?rev… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: pci.rc 27432 2007-07-06 20:24:15Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "PCI Bus Driver\0" Modified: trunk/reactos/drivers/bus/pci/pcidef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pcidef.h?r… ============================================================================== --- trunk/reactos/drivers/bus/pci/pcidef.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pcidef.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,6 +1,4 @@ /* - * $Id: pcidef.h 45685 2010-02-26 11:43:19Z gedmurphy $ - * * PCI defines and function prototypes * Copyright 1994, Drew Eckhardt * Copyright 1997--1999 Martin Mares <mj(a)suse.cz> Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2003 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: cdfs.c 48654 2010-08-30 11:51:17Z mjmartin $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: drivers/fs/cdfs/cdfs.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -*/ + * ReactOS kernel + * Copyright (C) 2002, 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/fs/cdfs/cdfs.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * Eric Kohl + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: cdfs.rc 21710 2006-04-22 16:36:21Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ISO9660 Driver\0" Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: cleanup.c 43790 2009-10-27 10:34:16Z dgorbachev $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/cdfs/cleanup.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: -* UPDATE HISTORY: -*/ + * ReactOS kernel + * Copyright (C) 2002 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/cdfs/cleanup.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: + * UPDATE HISTORY: + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/close.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: close.c 43790 2009-10-27 10:34:16Z dgorbachev $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/cdfs/close.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* UPDATE HISTORY: -*/ + * ReactOS kernel + * Copyright (C) 2002 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/cdfs/close.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * UPDATE HISTORY: + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2003 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: common.c 55057 2012-01-21 22:16:46Z cgutman $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: drivers/fs/cdfs/common.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -*/ + * ReactOS kernel + * Copyright (C) 2002, 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/fs/cdfs/common.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * Eric Kohl + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2003, 2004 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: create.c 52546 2011-07-05 13:55:39Z rharabien $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/cdfs/cdfs.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -*/ + * ReactOS kernel + * Copyright (C) 2002, 2003, 2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/cdfs/cdfs.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * Eric Kohl + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,31 +1,30 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2004 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: dirctl.c 57791 2012-12-02 21:04:31Z pschweitzer $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/cdfs/dirctl.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -* UPDATE HISTORY: -*/ + * ReactOS kernel + * Copyright (C) 2002, 2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/cdfs/dirctl.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * Eric Kohl + * UPDATE HISTORY: + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2004 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: fcb.c 48654 2010-08-30 11:51:17Z mjmartin $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/cdfs/fcb.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* UPDATE HISTORY: -*/ + * ReactOS kernel + * Copyright (C) 2002, 2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/cdfs/fcb.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * UPDATE HISTORY: + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,31 +1,30 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2004 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: finfo.c 53676 2011-09-10 21:31:09Z akhaldi $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/cdfs/finfo.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -* UPDATE HISTORY: -*/ + * ReactOS kernel + * Copyright (C) 2002, 2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/cdfs/finfo.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * Eric Kohl + * UPDATE HISTORY: + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2004 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: misc.c 48494 2010-08-09 20:38:12Z fireball $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/cdfs/misc.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Eric Kohl -* UPDATE HISTORY: -*/ + * ReactOS kernel + * Copyright (C) 2002, 2004 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/cdfs/misc.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Eric Kohl + * UPDATE HISTORY: + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2003 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: rw.c 54273 2011-10-30 00:58:21Z jgardou $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: drivers/fs/cdfs/rw.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -*/ + * ReactOS kernel + * Copyright (C) 2002, 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/fs/cdfs/rw.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * Eric Kohl + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,30 +1,29 @@ /* -* ReactOS kernel -* Copyright (C) 2002, 2003 ReactOS Team -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -/* $Id: volinfo.c 44442 2009-12-06 18:49:19Z spetreolle $ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* FILE: services/fs/vfat/volume.c -* PURPOSE: CDROM (ISO 9660) filesystem driver -* PROGRAMMER: Art Yerkes -* Eric Kohl -*/ + * ReactOS kernel + * Copyright (C) 2002, 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/fs/vfat/volume.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Art Yerkes + * Eric Kohl + */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/ext2/ext2fs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2fs.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2fs.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: ext2fs.rc 12852 2005-01-06 13:58:04Z mf $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Linux ext2 IFS Driver\0" Modified: trunk/reactos/drivers/filesystems/msfs/msfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: msfs.rc 21716 2006-04-23 08:56:14Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Mailslot IFS Driver\0" Modified: trunk/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/cr… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/create.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: create.c 53683 2011-09-11 08:52:59Z ekohl $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/mup/create.c Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -16,8 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* $Id: mup.c 53683 2011-09-11 08:52:59Z ekohl $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/mup/mup.c Modified: trunk/reactos/drivers/filesystems/mup/mup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: mup.rc 21385 2006-03-25 01:39:22Z peterw $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Multi UNC Provider\0" Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: kbdclass.rc 21598 2006-04-16 07:11:56Z hpoussin $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Keyboard Device Driver\0" Modified: trunk/reactos/drivers/input/mouclass/mouclass.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: mouclass.rc 21598 2006-04-16 07:11:56Z hpoussin $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Mouse Class Device Driver\0" Modified: trunk/reactos/drivers/input/sermouse/sermouse.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id$ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Serial mouse device driver\0" Modified: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: mpu401.rc 21285 2006-03-10 23:22:58Z jimtabor $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "MPU-401 MIDI Driver\0" Modified: trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: sndblst.rc 21285 2006-03-10 23:22:58Z jimtabor $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "SoundBlaster Driver\0" Modified: trunk/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: sndblst.rc 39744 2009-02-25 09:10:46Z silverblade $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "SoundBlaster Driver\0" Modified: trunk/reactos/drivers/multimedia/audio/sound/sb16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sound/sb16.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sound/sb16.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: sb16.c 37762 2008-11-30 11:16:55Z sginsberg $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/dd/sound/sb16.c Modified: trunk/reactos/drivers/multimedia/audio/sound/sb16.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sound/sb16.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sound/sb16.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: sb16.rc 21285 2006-03-10 23:22:58Z jimtabor $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "SB16 driver\0" Modified: trunk/reactos/drivers/network/afd/afd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd.rc… ============================================================================== --- trunk/reactos/drivers/network/afd/afd.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: afd.rc 21689 2006-04-21 17:45:51Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Socket Filesystem Driver\0" Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: bind.c 57233 2012-09-04 03:01:15Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/bind.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: connect.c 57233 2012-09-04 03:01:15Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/connect.c Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: context.c 57233 2012-09-04 03:01:15Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/context.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: info.c 57233 2012-09-04 03:01:15Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/info.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: listen.c 57233 2012-09-04 03:01:15Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/listen.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: lock.c 57237 2012-09-04 07:42:21Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: main.c 57975 2012-12-23 09:53:36Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: read.c 57975 2012-12-23 09:53:36Z cgutman $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $Id: tdiconn.c 56389 2012-04-22 13:11:54Z tfaber $ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/tdiconn.c Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: afd.h 57975 2012-12-23 09:53:36Z cgutman $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/include/afd.h Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: ne2000.rc 21473 2006-04-05 16:35:30Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Novell NE2000 network driver\0" Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: pcnet.rc 30251 2007-11-07 22:59:56Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "PCNet Ethernet PCI Driver\0" Modified: trunk/reactos/drivers/network/lan/lan.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/lan.rc… ============================================================================== --- trunk/reactos/drivers/network/lan/lan.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/lan/lan.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: lan.rc 21693 2006-04-22 04:56:37Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "TCP/IP protocol driver\0" Modified: trunk/reactos/drivers/network/ndis/ndis.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: ndis.rc 21293 2006-03-11 23:55:37Z jimtabor $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "NDIS Library\0" Modified: trunk/reactos/drivers/network/tdi/cte/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/cte/st… ============================================================================== --- trunk/reactos/drivers/network/tdi/cte/string.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/cte/string.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,6 +1,4 @@ -/* $Id: string.c 52934 2011-07-27 19:33:08Z akhaldi $ - * - */ + #include "precomp.h" /* Modified: trunk/reactos/drivers/network/tdi/misc/tdi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/misc/t… ============================================================================== --- trunk/reactos/drivers/network/tdi/misc/tdi.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/misc/tdi.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: tdi.rc 21695 2006-04-22 05:22:34Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "TDI wrapper kernel module\0" Modified: trunk/reactos/drivers/network/tdi/tdi/handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/ha… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/handler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/handler.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: handler.c 52934 2011-07-27 19:33:08Z akhaldi $ - * +/* * DESCRIPTION: Default TDI event handlers. */ #include "precomp.h" Modified: trunk/reactos/drivers/network/tdi/tdi/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/ob… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/obsolete.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,6 +1,3 @@ -/* $Id: obsolete.c 52934 2011-07-27 19:33:08Z akhaldi $ - * - */ #include "precomp.h" Modified: trunk/reactos/drivers/network/tdi/tdi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/st… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,7 +1,4 @@ -/* $Id: stubs.c 52934 2011-07-27 19:33:08Z akhaldi $ - * - */ #include "precomp.h" /* Modified: trunk/reactos/drivers/parallel/parallel/parallel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parallel/… ============================================================================== --- trunk/reactos/drivers/parallel/parallel/parallel.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parallel/parallel.c [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: parallel.c 54094 2011-10-12 12:24:19Z akhaldi $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/parallel/parallel.c Modified: trunk/reactos/drivers/parallel/parallel/parallel.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parallel/… ============================================================================== --- trunk/reactos/drivers/parallel/parallel/parallel.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parallel/parallel.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: parallel.rc 21498 2006-04-07 10:15:34Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Parallel Port Device Driver\0" Modified: trunk/reactos/drivers/serial/serenum/serenum.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/serenum.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: serenum.rc 21507 2006-04-07 15:34:51Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Serial port enumerator\0" Modified: trunk/reactos/drivers/serial/serial/serial.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seri… ============================================================================== --- trunk/reactos/drivers/serial/serial/serial.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/serial.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: serial.rc 22516 2006-06-22 22:14:51Z hpoussin $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Serial Port Device Driver\0" Modified: trunk/reactos/drivers/setup/blue/blue.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.rc… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: blue.rc 21706 2006-04-22 14:01:25Z tretiakov $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "HAL Console Device Driver\0" Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: cdrom.rc 26227 2007-04-01 16:29:16Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "CD-ROM Class Driver\0" Modified: trunk/reactos/drivers/storage/class/class2/class2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: class2.rc 26227 2007-04-01 16:29:16Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "SCSI Class Driver Helper\0" Modified: trunk/reactos/drivers/storage/class/disk/disk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: disk.rc 21397 2006-03-27 07:38:43Z peterw $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Disk Class Driver\0" Modified: trunk/reactos/drivers/storage/class/include/class2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/incl… ============================================================================== --- trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: class2.h 49129 2010-10-12 20:17:55Z pschweitzer $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/storage/include/class2.h Modified: trunk/reactos/drivers/storage/floppy/floppy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: floppy.rc 43790 2009-10-27 10:34:16Z dgorbachev $ - * +/* * ReactOS Floppy Driver * Copyright (C) 2004, Vizzini (vizzini(a)plasmic.com) * Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: atapi.rc 26238 2007-04-01 19:25:38Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ATAPI IDE Miniport Driver\0" Modified: trunk/reactos/drivers/wmi/wmilib.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/wmilib.rc?rev=… ============================================================================== --- trunk/reactos/drivers/wmi/wmilib.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/wmilib.rc [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,4 +1,3 @@ -/* $Id: wmilib.rc 21844 2006-05-07 19:34:23Z fireball $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "WmiLib\0" Modified: trunk/reactos/include/psdk/ddkernel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddkernel.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddkernel.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ddkernel.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel * FILE: Modified: trunk/reactos/include/psdk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dmemmgr.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dmemmgr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dmemmgr.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,6 +1,4 @@ - -/* $Id: $ - * +/* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel * FILE: Modified: trunk/reactos/include/psdk/dvp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dvp.h?rev=585… ============================================================================== --- trunk/reactos/include/psdk/dvp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dvp.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,6 +1,4 @@ - -/* $Id$ - * +/* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel * FILE: Modified: trunk/reactos/include/psdk/objerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/objerror.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objerror.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,6 +1,4 @@ - -/* $Id$ - * +/* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel * FILE: @@ -10,4 +8,3 @@ */ #include <winerror.h> - Modified: trunk/reactos/include/psdk/polarity.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/polarity.h?re… ============================================================================== --- trunk/reactos/include/psdk/polarity.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/polarity.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: This file is in the public domain. * PROJECT: ReactOS kernel * FILE: Modified: trunk/reactos/include/reactos/libs/epsapi/epsapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/epsap… ============================================================================== --- trunk/reactos/include/reactos/libs/epsapi/epsapi.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/epsapi/epsapi.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,3 @@ -/* $Id: epsapi.h 21880 2006-05-10 17:47:44Z ion $ -*/ /* * epsapi.h * Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse… ============================================================================== --- trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,3 @@ -/* $Id: syssetup.h 45020 2010-01-09 22:43:16Z ekohl $ -*/ /* * syssetup.h * Modified: trunk/reactos/include/reactos/subsys/lsass/lsass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/lsa… ============================================================================== --- trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: lsass.h 58304 2013-02-10 12:09:21Z ekohl $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: include/lsass/lsass.h Modified: trunk/reactos/include/reactos/subsys/sm/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/helper.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/helper.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -4,8 +4,6 @@ #if !defined(__SM_API_H) #include <sm/api.h> #endif - -/* $Id: helper.h 37769 2008-11-30 13:46:35Z sginsberg $ */ /* smlib/connect.c */ NTSTATUS WINAPI Modified: trunk/reactos/include/reactos/subsys/sm/ns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/ns.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/ns.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,7 +1,5 @@ #if !defined(INCLUDE_SM_NS_H) #define INCLUDE_SM_NS_H - -/* $Id: ns.h 15729 2005-06-02 13:17:37Z ea $ */ #define SM_REGISTRY_ROOT_NAME L"\\Session Manager" #define SM_REGISTRY_SUBSYSTEMS_NAME L"SubSystems" Modified: trunk/reactos/include/reactos/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winlogon.h… ============================================================================== --- trunk/reactos/include/reactos/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winlogon.h [iso-8859-1] Sat Mar 16 19:49:08 2013 @@ -1,5 +1,4 @@ -/* $Id: winlogon.h 50813 2011-02-18 20:16:43Z gadamopoulos $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: include/reactos/winlogon.h

1 0

[akhaldi] 58522: [COMCTL32_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: akhaldi Date: Sat Mar 16 17:07:05 2013 New Revision: 58522 URL: http://svn.reactos.org/svn/reactos?rev=58522&view=rev Log: [COMCTL32_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/comctl32/comboex.c trunk/rostests/winetests/comctl32/datetime.c trunk/rostests/winetests/comctl32/dpa.c trunk/rostests/winetests/comctl32/header.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/ipaddress.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/misc.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/mru.c trunk/rostests/winetests/comctl32/msg.h trunk/rostests/winetests/comctl32/pager.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/rebar.c trunk/rostests/winetests/comctl32/rsrc.rc trunk/rostests/winetests/comctl32/status.c trunk/rostests/winetests/comctl32/syslink.c trunk/rostests/winetests/comctl32/tab.c trunk/rostests/winetests/comctl32/testlist.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/trackbar.c trunk/rostests/winetests/comctl32/treeview.c trunk/rostests/winetests/comctl32/updown.c Modified: trunk/rostests/winetests/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comboe… ============================================================================== --- trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,10 +18,14 @@ */ #include <assert.h> -#include <windows.h> +//#include <windows.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> #include <commctrl.h> -#include "wine/test.h" +//#include "wine/test.h" #include "msg.h" #define EDITBOX_SEQ_INDEX 0 Modified: trunk/rostests/winetests/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dateti… ============================================================================== --- trunk/rostests/winetests/comctl32/datetime.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/datetime.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -17,10 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +//#include <windows.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <winnls.h> #include <commctrl.h> - -#include "wine/test.h" +//#include "wine/test.h" #include "msg.h" #define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n", (EXPECTED), (GOT)) @@ -147,6 +152,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, DATETIME_SEQ_INDEX, &msg); defwndproc_counter++; Modified: trunk/rostests/winetests/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dpa.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/dpa.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -19,17 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" -#include "objidl.h" - -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <commctrl.h> +#include <objbase.h> +//#include "objidl.h" + +#include <wine/test.h> #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) Modified: trunk/rostests/winetests/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/header… ============================================================================== --- trunk/rostests/winetests/comctl32/header.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/header.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,12 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <windows.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <windows.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winnls.h> +#include <objbase.h> #include <commctrl.h> #include <assert.h> -#include "wine/test.h" +#include <wine/test.h> #include "v6util.h" #include "msg.h" @@ -409,6 +418,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, HEADER_SEQ_INDEX, &msg); defwndproc_counter++; Modified: trunk/rostests/winetests/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/imagel… ============================================================================== --- trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -21,24 +21,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define CONST_VTABLE -#include <stdarg.h> +//#include <stdarg.h> #include <stdio.h> #include <assert.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "objbase.h" -#include "commctrl.h" /* must be included after objbase.h to get ImageList_Write */ -#include "initguid.h" -#include "commoncontrols.h" -#include "shellapi.h" - -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +//#include "winuser.h" +#include <objbase.h> +#include <commctrl.h> /* must be included after objbase.h to get ImageList_Write */ +#include <initguid.h> +#include <commoncontrols.h> +#include <shellapi.h> + +#include <wine/test.h> #include "v6util.h" #undef VISIBLE @@ -492,6 +496,70 @@ DestroyWindow(hwndfortest); } +static int get_color_format(HBITMAP bmp) +{ + BITMAPINFO bmi; + HDC hdc = CreateCompatibleDC(0); + HBITMAP hOldBmp = SelectObject(hdc, bmp); + int ret; + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, bmp, 0, 0, 0, &bmi, DIB_RGB_COLORS); + ok(ret, "GetDIBits failed\n"); + + SelectObject(hdc, hOldBmp); + DeleteDC(hdc); + return bmi.bmiHeader.biBitCount; +} + +static void test_merge_colors(void) +{ + HIMAGELIST himl[8], hmerge; + int sizes[] = { ILC_COLOR, ILC_COLOR | ILC_MASK, ILC_COLOR4, ILC_COLOR8, ILC_COLOR16, ILC_COLOR24, ILC_COLOR32, ILC_COLORDDB }; + HICON hicon1; + IMAGEINFO info; + int bpp, i, j; + + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != NULL, "failed to create hicon1\n"); + + for (i = 0; i < 8; i++) + { + himl[i] = ImageList_Create(32, 32, sizes[i], 0, 3); + ok(himl[i] != NULL, "failed to create himl[%d]\n", i); + ok(0 == ImageList_AddIcon(himl[i], hicon1), "add icon1 to himl[%d] failed\n", i); + if (i == 0 || i == 1 || i == 7) + { + ImageList_GetImageInfo(himl[i], 0, &info); + sizes[i] = get_color_format(info.hbmImage); + } + } + DestroyIcon(hicon1); + for (i = 0; i < 8; i++) + for (j = 0; j < 8; j++) + { + hmerge = ImageList_Merge(himl[i], 0, himl[j], 0, 0, 0); + ok(hmerge != NULL, "merge himl[%d], himl[%d] failed\n", i, j); + + ImageList_GetImageInfo(hmerge, 0, &info); + bpp = get_color_format(info.hbmImage); + /* ILC_COLOR[X] is defined as [X] */ + if (i == 4 && j == 7) + ok(bpp == 16, /* merging ILC_COLOR16 with ILC_COLORDDB seems to be a special case */ + "wrong biBitCount %d when merging lists %d (%d) and %d (%d)\n", bpp, i, sizes[i], j, sizes[j]); + else + ok(bpp == (i > j ? sizes[i] : sizes[j]), + "wrong biBitCount %d when merging lists %d (%d) and %d (%d)\n", bpp, i, sizes[i], j, sizes[j]); + ok(info.hbmMask != 0, "Imagelist merged from %d and %d had no mask\n", i, j); + + if (hmerge) ImageList_Destroy(hmerge); + } + + for (i = 0; i < 8; i++) + ImageList_Destroy(himl[i]); +} + static void test_merge(void) { HIMAGELIST himl1, himl2, hmerge; @@ -782,22 +850,21 @@ static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment) { HDC hdc; - char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; - BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + BITMAPINFO bmi; HBITMAP hbmp, hbmp_old; HBRUSH hbrush; RECT rc = { 0, 0, cx, cy }; hdc = CreateCompatibleDC(0); - memset(bmi, 0, sizeof(*bmi)); - bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); - bmi->bmiHeader.biHeight = cx; - bmi->bmiHeader.biWidth = cy; - bmi->bmiHeader.biBitCount = 24; - bmi->bmiHeader.biPlanes = 1; - bmi->bmiHeader.biCompression = BI_RGB; - hbmp = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = cx; + bmi.bmiHeader.biWidth = cy; + bmi.bmiHeader.biBitCount = 24; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + hbmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); hbmp_old = SelectObject(hdc, hbmp); @@ -1161,6 +1228,7 @@ if (!pSHGetImageList) { win_skip("SHGetImageList not available, skipping test\n"); + FreeLibrary(hShell32); return; } @@ -1169,8 +1237,10 @@ ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); - if (hr != S_OK) + if (hr != S_OK) { + FreeLibrary(hShell32); return; + } IImageList_GetImageCount(iml, &out); ok(out > 0, "IImageList_GetImageCount returned out <= 0\n"); @@ -2015,6 +2085,7 @@ test_imagecount(); test_DrawIndirect(); test_merge(); + test_merge_colors(); test_imagelist_storage(); test_iconsize(); Modified: trunk/rostests/winetests/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/ipaddr… ============================================================================== --- trunk/rostests/winetests/comctl32/ipaddress.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/ipaddress.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -17,11 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <wine/test.h> -#include <windows.h> +//#include <windows.h> +#include <winuser.h> #include <commctrl.h> - -#include "wine/test.h" #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… ============================================================================== --- trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -3,7 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov - * Copyright 2009-2012 Nikolay Sivov + * Copyright 2009-2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <windows.h> +#include <wine/test.h> + +//#include <stdio.h> +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> -#include "wine/test.h" #include "v6util.h" #include "msg.h" @@ -52,6 +55,8 @@ static BOOL g_block_hover; /* notification data for LVN_ITEMCHANGED */ static NMLISTVIEW g_nmlistview; +/* notification data for LVN_ITEMCHANGING */ +static NMLISTVIEW g_nmlistview_changing; /* format reported to control: -1 falls to defproc, anything else returned */ static INT notifyFormat; @@ -63,6 +68,8 @@ static BOOL g_disp_A_to_W; /* dispinfo data sent with LVN_LVN_ENDLABELEDIT */ static NMLVDISPINFO g_editbox_disp_info; +/* when this is set focus will be tested on LVN_DELETEITEM */ +static BOOL g_focus_test_LVN_DELETEITEM; static HWND subclass_editbox(HWND hwndListview); @@ -207,7 +214,7 @@ { 0 } }; -static const struct message select_all_parent_seq[] = { +static const struct message change_all_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -222,6 +229,15 @@ { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message changing_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { 0 } }; @@ -243,6 +259,18 @@ static const struct message getitemposition_seq2[] = { { LVM_GETITEMPOSITION, sent|id, 0, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { 0 } +}; + +static const struct message getsubitemrect_seq[] = { + { LVM_GETSUBITEMRECT, sent|id|wparam, -1, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { LVM_GETSUBITEMRECT, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { LVM_GETSUBITEMRECT, sent|id|wparam, -10, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { LVM_GETSUBITEMRECT, sent|id|wparam, 20, 0, LISTVIEW_ID }, { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, { 0 } }; @@ -312,6 +340,41 @@ { 0 } }; +static const struct message parent_header_click_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_COLUMNCLICK }, + { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCLICKA }, + { 0 } +}; + +static const struct message parent_header_divider_dclick_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, NM_CUSTOMDRAW }, + { WM_NOTIFY, sent|id, 0, 0, NM_CUSTOMDRAW }, + { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, HDN_DIVIDERDBLCLICKA }, + { 0 } +}; + +static const struct message listview_set_imagelist[] = { + { LVM_SETIMAGELIST, sent|id, 0, 0, LISTVIEW_ID }, + { 0 } +}; + +static const struct message listview_header_set_imagelist[] = { + { LVM_SETIMAGELIST, sent|id, 0, 0, LISTVIEW_ID }, + { HDM_SETIMAGELIST, sent|id, 0, 0, HEADER_ID }, + { 0 } +}; + +static const struct message parent_insert_focused_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -388,6 +451,12 @@ trace("LVN_%sSCROLL: (%d,%d)\n", pScroll->hdr.code == LVN_BEGINSCROLL ? "BEGIN" : "END", pScroll->dx, pScroll->dy); + } + break; + case LVN_ITEMCHANGING: + { + NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; + g_nmlistview_changing = *nmlv; } break; case LVN_ITEMCHANGED: @@ -414,6 +483,16 @@ ok(dispinfo->item.cchTextMax == 260 || broken(dispinfo->item.cchTextMax == 264) /* NT4 reports aligned size */, "buffer size %d\n", dispinfo->item.cchTextMax); + } + break; + case LVN_DELETEITEM: + if (g_focus_test_LVN_DELETEITEM) + { + NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; + UINT state; + + state = SendMessageA(((NMHDR*)lParam)->hwndFrom, LVM_GETITEMSTATE, nmlv->iItem, LVIS_FOCUSED); + ok(state == 0, "got state %x\n", state); } break; case NM_HOVER: @@ -626,6 +705,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; /* all we need is sizing */ if (message == WM_WINDOWPOSCHANGING || @@ -1586,6 +1666,8 @@ rect.top = 1; rect.right = rect.bottom = -10; r = SendMessage(hList, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + /* right value contains garbage, probably because header columns are not set up */ + expect(0, rect.bottom); expect(1, r); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); @@ -1686,7 +1768,10 @@ return CDRF_NOTIFYSUBITEMDRAW; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + if (nmlvcd->iSubItem) + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + else + ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); @@ -2092,28 +2177,32 @@ hwnd = create_listview_control(LVS_REPORT); - for (i=0;i<items;i++) { - insert_item(hwnd, 0); - } + for (i = 0; i < items; i++) + insert_item(hwnd, 0); item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); - - expect(items,item_count); - - for (i=0;i<4;i++) { + expect(items, item_count); + + for (i = 0; i < 4; i++) { + LVITEMA item; + task = task_list[i]; /* deselect all items */ - ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); /* set initial position */ SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); - ListView_SetItemState(hwnd,(task.initPos == -1 ? item_count -1 : task.initPos),LVIS_SELECTED ,LVIS_SELECTED); - - selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - - ok(selected_count == 1, "There should be only one selected item at the beginning (is %d)\n",selected_count); + + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); + + selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + ok(selected_count == 1, "expected 1, got %d\n", selected_count); /* Set SHIFT key pressed */ GetKeyboardState(kstate); @@ -2151,7 +2240,9 @@ expect(FALSE, r); /* select all, check notifications */ - ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2160,14 +2251,65 @@ r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - ok_sequence(sequences, PARENT_SEQ_INDEX, select_all_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, "select all notification", FALSE); + /* select all again (all selected already) */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing)); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok(g_nmlistview_changing.uNewState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uNewState); + ok(g_nmlistview_changing.uOldState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uOldState); + ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged); + + ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, + "select all notification 2", FALSE); + /* deselect all items */ - ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + + ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, + "deselect all notification", FALSE); + + /* deselect all items again */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", FALSE); + + /* any non-zero state value does the same */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing)); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_CUT; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok(g_nmlistview_changing.uNewState == 0, "got 0x%x\n", g_nmlistview_changing.uNewState); + ok(g_nmlistview_changing.uOldState == 0, "got 0x%x\n", g_nmlistview_changing.uOldState); + ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged); + + ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, + "set state all notification 3", FALSE); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); - for (i=0;i<3;i++) { - ListView_SetItemState(hwnd, i, LVIS_SELECTED, LVIS_SELECTED); + for (i = 0; i < 3; i++) { + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); } r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); @@ -2192,7 +2334,9 @@ expect(3, r); /* select one more */ - ListView_SetItemState(hwnd, 3, LVIS_SELECTED, LVIS_SELECTED); + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); for (i=0;i<3;i++) { r = ListView_GetItemState(hwnd, i, LVIS_SELECTED); @@ -2402,7 +2546,6 @@ expect(100, rect.left); expect(250, rect.right); -todo_wine expect(3, rect.top); rect.left = LVIR_BOUNDS; @@ -2413,7 +2556,6 @@ expect(250, rect.left); expect(450, rect.right); -todo_wine expect(3, rect.top); /* item LVS_REPORT padding isn't applied to subitems */ @@ -2456,6 +2598,36 @@ expect(240, rect.right); SendMessage(hwnd, LVM_SCROLL, -10, 0); + + /* test header interaction */ + subclass_header(hwnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + expect(1, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + expect(1, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -10, (LPARAM)&rect); + expect(1, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 20, (LPARAM)&rect); + expect(1, r); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getsubitemrect_seq, "LVM_GETSUBITEMRECT negative index", FALSE); DestroyWindow(hwnd); @@ -2498,13 +2670,11 @@ rect2.top = 1; rect2.right = rect2.bottom = -1; r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 2, (LPARAM)&rect2); -todo_wine { expect(TRUE, r); expect(rect.right, rect2.right); expect(rect.left, rect2.left); expect(rect.bottom, rect2.top); ok(rect2.bottom > rect2.top, "expected not zero height\n"); -} arr[0] = 1; arr[1] = 0; arr[2] = 2; r = SendMessage(hwnd, LVM_SETCOLUMNORDERARRAY, 3, (LPARAM)arr); @@ -2956,7 +3126,7 @@ res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", FALSE); /* select one, then deselect all */ item.stateMask = LVIS_SELECTED; @@ -4434,9 +4604,7 @@ HWND hwnd; DWORD ret; INT cx, cy; - HIMAGELIST himl; - HBITMAP hbmp; - LVITEMA itema; + HIMAGELIST himl40, himl80; cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); @@ -4444,56 +4612,113 @@ /* LVS_ICON */ hwnd = create_listview_control(LVS_ICON); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + /* now try with icons */ - himl = ImageList_Create(40, 40, 0, 4, 4); - ok(himl != NULL, "failed to create imagelist\n"); - hbmp = CreateBitmap(40, 40, 1, 1, NULL); - ok(hbmp != NULL, "failed to create bitmap\n"); - ret = ImageList_Add(himl, hbmp, 0); + himl40 = ImageList_Create(40, 40, 0, 4, 4); + ok(himl40 != NULL, "failed to create imagelist\n"); + himl80 = ImageList_Create(80, 80, 0, 4, 4); + ok(himl80 != NULL, "failed to create imagelist\n"); + ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); expect(0, ret); - ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); - expect(0, ret); - - itema.mask = LVIF_IMAGE; - itema.iImage = 0; - itema.iItem = 0; - itema.iSubItem = 0; - ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema); - expect(0, ret); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret)); expect(cy + 40, HIWORD(ret)); -} + /* try changing icon size */ + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl80); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 80, LOWORD(ret)); + expect(cy + 80, HIWORD(ret)); + + /* set own icon spacing */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(100, 100)); + expect(cx + 80, LOWORD(ret)); + expect(cy + 80, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* now change image list - icon spacing should be unaffected */ + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* spacing = 0 - keep previous value */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(0, -1)); + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + expect(100, LOWORD(ret)); + + expect(0xFFFF, HIWORD(ret)); + + if (sizeof(void*) == 8) + { + /* NOTE: -1 is not treated the same as (DWORD)-1 by 64bit listview */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, (DWORD)-1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(0xFFFF, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } + else + { + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + } + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 40, LOWORD(ret)); + expect(cy + 40, HIWORD(ret)); + + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); + ImageList_Destroy(himl80); DestroyWindow(hwnd); /* LVS_SMALLICON */ hwnd = create_listview_control(LVS_SMALLICON); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + + /* spacing does not depend on selected view type */ + ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); + expect(0, ret); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* spacing + icon size returned */ + expect(cx + 40, LOWORD(ret)); + expect(cy + 40, HIWORD(ret)); + + SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); + ImageList_Destroy(himl40); DestroyWindow(hwnd); /* LVS_REPORT */ hwnd = create_listview_control(LVS_REPORT); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + DestroyWindow(hwnd); /* LVS_LIST */ hwnd = create_listview_control(LVS_LIST); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); -todo_wine { expect(cx, LOWORD(ret)); expect(cy, HIWORD(ret)); -} + DestroyWindow(hwnd); } @@ -4910,6 +5135,146 @@ DestroyWindow(list); } +static void test_header_notification2(void) +{ + static char textA[] = "newtext"; + HWND list, header; + HDITEMW itemW; + NMHEADERW nmhdr; + LVCOLUMNA col; + DWORD ret; + WCHAR buffer[100]; + struct message parent_header_notify_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, 0 }, + { 0 } + }; + + list = create_listview_control(LVS_REPORT); + ok(list != NULL, "failed to create listview window\n"); + + memset(&col, 0, sizeof(col)); + col.mask = LVCF_WIDTH | LVCF_TEXT; + col.cx = 100; + col.pszText = textA; + ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + expect(0, ret); + + header = ListView_GetHeader(list); + ok(header != 0, "No header\n"); + memset(&itemW, 0, sizeof(itemW)); + itemW.mask = HDI_WIDTH | HDI_ORDER | HDI_TEXT; + itemW.pszText = buffer; + itemW.cchTextMax = sizeof(buffer); + ret = SendMessageW(header, HDM_GETITEMW, 0, (LPARAM)&itemW); + expect(1, ret); + + nmhdr.hdr.hwndFrom = header; + nmhdr.hdr.idFrom = GetWindowLongPtr(header, GWLP_ID); + nmhdr.iItem = 0; + nmhdr.iButton = 0; + nmhdr.pitem = &itemW; + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMCHANGINGW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ITEMCHANGINGA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", TRUE); + todo_wine + ok(nmhdr.hdr.code == HDN_ITEMCHANGINGA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMCHANGEDW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ITEMCHANGEDA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", TRUE); + todo_wine + ok(nmhdr.hdr.code == HDN_ITEMCHANGEDA, "Expected ANSI notification code\n"); + /* HDN_ITEMCLICK sets focus to list, which generates messages we don't want to check */ + SetFocus(list); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMCLICKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_click_seq, + "header notify, parent", FALSE); + ok(nmhdr.hdr.code == HDN_ITEMCLICKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMDBLCLICKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + ok(nmhdr.hdr.code == HDN_ITEMDBLCLICKW, "Expected Unicode notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_DIVIDERDBLCLICKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_divider_dclick_seq, + "header notify, parent", TRUE); + ok(nmhdr.hdr.code == HDN_DIVIDERDBLCLICKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_BEGINTRACKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + ok(nmhdr.hdr.code == HDN_BEGINTRACKW, "Expected Unicode notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ENDTRACKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ENDTRACKA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", FALSE); + ok(nmhdr.hdr.code == HDN_ENDTRACKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_TRACKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_TRACKA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", FALSE); + ok(nmhdr.hdr.code == HDN_TRACKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_BEGINDRAG; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ENDDRAG; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ENDDRAG; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_FILTERCHANGE; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_FILTERCHANGE; + parent_header_notify_seq[0].flags |= optional; /* NT4 does not send this message */ + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", FALSE); + parent_header_notify_seq[0].flags &= ~optional; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_BEGINFILTEREDIT; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ENDFILTEREDIT; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMSTATEICONCLICK; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMKEYDOWN; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + DestroyWindow(list); +} + static void test_createdragimage(void) { HIMAGELIST himl; @@ -4995,6 +5360,198 @@ ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 0, (LPARAM)&item); expect(TRUE, ret); + + DestroyWindow(hwnd); +} + +static void test_imagelists(void) +{ + HWND hwnd, header; + HIMAGELIST himl1, himl2, himl3; + LRESULT ret; + + himl1 = ImageList_Create(40, 40, 0, 4, 4); + himl2 = ImageList_Create(40, 40, 0, 4, 4); + himl3 = ImageList_Create(40, 40, 0, 4, 4); + ok(himl1 != NULL, "Failed to create imagelist\n"); + ok(himl2 != NULL, "Failed to create imagelist\n"); + ok(himl3 != NULL, "Failed to create imagelist\n"); + + hwnd = create_listview_control(LVS_REPORT | LVS_SHAREIMAGELISTS); + header = subclass_header(hwnd); + + ok(header != NULL, "Expected header\n"); + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl1); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set normal image list", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl2); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set state image list", TRUE); + + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl3); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_header_set_imagelist, + "set small image list", FALSE); + + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok((HIMAGELIST)ret == himl3, "Expected imagelist %p, got %p\n", himl3, (HIMAGELIST)ret); + DestroyWindow(hwnd); + + hwnd = create_listview_control(WS_VISIBLE | LVS_ICON); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl1); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set normal image list", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl2); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set state image list", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl3); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set small image list", FALSE); + + header = ListView_GetHeader(hwnd); + ok(header == NULL, "Expected no header, got %p\n", header); + + SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | LVS_REPORT); + + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(header != NULL, "Expected header, got NULL\n"); + + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok((HIMAGELIST)ret == himl3, "Expected imagelist %p, got %p\n", himl3, (HIMAGELIST)ret); + + DestroyWindow(hwnd); +} + +static void test_deleteitem(void) +{ + LVITEMA item; + UINT state; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + + insert_item(hwnd, 0); + insert_item(hwnd, 0); + insert_item(hwnd, 0); + insert_item(hwnd, 0); + insert_item(hwnd, 0); + + g_focus_test_LVN_DELETEITEM = TRUE; + + /* delete focused item (not the last index) */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 2, (LPARAM)&item); + ok(ret == TRUE, "got %d\n", ret); + ret = SendMessageA(hwnd, LVM_DELETEITEM, 2, 0); + ok(ret == TRUE, "got %d\n", ret); + /* next item gets focus */ + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 2, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + /* focus last item and delete it */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); + ok(ret == TRUE, "got %d\n", ret); + ret = SendMessageA(hwnd, LVM_DELETEITEM, 3, 0); + ok(ret == TRUE, "got %d\n", ret); + /* new last item gets focus */ + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 2, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + /* focus first item and delete it */ + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(ret == TRUE, "got %d\n", ret); + ret = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(ret == TRUE, "got %d\n", ret); + /* new first item gets focus */ + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + g_focus_test_LVN_DELETEITEM = FALSE; + + DestroyWindow(hwnd); +} + +static void test_insertitem(void) +{ + LVITEMA item; + UINT state; + HWND hwnd; + INT ret; + + hwnd = create_listview_control(LVS_REPORT); + + /* insert item 0 focused */ + item.mask = LVIF_STATE; + item.state = LVIS_FOCUSED; + item.stateMask = LVIS_FOCUSED; + item.iItem = 0; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "got %d\n", ret); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* insert item 1, focus shift */ + item.mask = LVIF_STATE; + item.state = LVIS_FOCUSED; + item.stateMask = LVIS_FOCUSED; + item.iItem = 1; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 1, "got %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + /* insert item 2, no focus shift */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = LVIS_FOCUSED; + item.iItem = 2; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 2, "got %d\n", ret); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); DestroyWindow(hwnd); } @@ -5028,6 +5585,7 @@ g_is_below_5 = is_below_comctl_5(); test_header_notification(); + test_header_notification2(); test_images(); test_checkboxes(); test_items(); @@ -5064,6 +5622,9 @@ test_createdragimage(); test_dispinfo(); test_LVM_SETITEMTEXT(); + test_imagelists(); + test_deleteitem(); + test_insertitem(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -5093,6 +5654,9 @@ test_scrollnotify(); test_LVS_EX_TRANSPARENTBKGND(); test_LVS_EX_HEADERINALLVIEWS(); + test_deleteitem(); + test_multiselect(); + test_insertitem(); unload_v6_module(ctx_cookie, hCtx); Modified: trunk/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/misc.c… ============================================================================== --- trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <windows.h> +//#include <stdio.h> +//#include <windows.h> -#include "wine/test.h" +#include <wine/test.h> static PVOID (WINAPI * pAlloc)(LONG); static PVOID (WINAPI * pReAlloc)(PVOID, LONG); Modified: trunk/rostests/winetests/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/monthc… ============================================================================== --- trunk/rostests/winetests/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/monthcal.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -19,18 +19,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" - -#include "commctrl.h" - -#include "wine/test.h" +#include <wine/test.h> + +//#include <stdarg.h> + +//#include "windef.h" +//#include "winbase.h" +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <commctrl.h> + #include "v6util.h" -#include <assert.h> -#include <windows.h> +//#include <assert.h> +//#include <windows.h> #include "msg.h" #define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got); @@ -588,6 +590,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, MONTHCAL_SEQ_INDEX, &msg); /* some debug output for style changing */ @@ -1367,10 +1370,8 @@ hwnd = create_monthcal_control(0); - st_visible[0].wYear = 0; - st_visible[0].wMonth = 0; - st_visible[0].wDay = 0; - st_daystate[1] = st_daystate[0] = st_visible[1] = st_visible[0]; + memset(&st_visible, 0, sizeof(st_visible)); + memset(&st_daystate, 0, sizeof(st_daystate)); st.wYear = 2000; st.wMonth = 11; Modified: trunk/rostests/winetests/comctl32/mru.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/mru.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/mru.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/mru.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -19,16 +19,16 @@ */ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "commctrl.h" -#include "shlwapi.h" - -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +//#include "wingdi.h" +#include <winuser.h> +//#include "winnls.h" +#include <winreg.h> +#include <commctrl.h> +//#include "shlwapi.h" + +#include <wine/test.h> /* Keys for testing MRU functions */ #define REG_TEST_BASEKEYA "Software\\Wine" Modified: trunk/rostests/winetests/comctl32/msg.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/msg.h?… ============================================================================== --- trunk/rostests/winetests/comctl32/msg.h [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/msg.h [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -19,8 +19,8 @@ */ #include <assert.h> -#include <windows.h> -#include "wine/test.h" +//#include <windows.h> +#include <wine/test.h> /* undocumented SWP flags - from SDK 3.1 */ #define SWP_NOCLIENTSIZE 0x0800 Modified: trunk/rostests/winetests/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/pager.… ============================================================================== --- trunk/rostests/winetests/comctl32/pager.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/pager.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <wine/test.h> + +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> -#include "wine/test.h" #include "msg.h" #define NUM_MSG_SEQUENCES 1 Modified: trunk/rostests/winetests/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/propsh… ============================================================================== --- trunk/rostests/winetests/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/propsheet.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <wine/test.h> + +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> #include "msg.h" #include "resources.h" - -#include "wine/test.h" static HWND parenthwnd; static HWND sheethwnd; @@ -821,7 +823,7 @@ ok(r == 4, "got %d\n", r); /* select page that can't be created */ - ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 0); + ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 1); ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); Modified: trunk/rostests/winetests/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rebar.… ============================================================================== --- trunk/rostests/winetests/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/rebar.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -21,14 +21,16 @@ #define _WIN32_WINNT 0x500 #define _WIN32_IE 0x500 +#include <wine/test.h> + #include <assert.h> -#include <stdarg.h> - -#include <windows.h> +//#include <stdarg.h> + +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> -#include <uxtheme.h> - -#include "wine/test.h" +//#include <uxtheme.h> static RECT height_change_notify_rect; static HWND hMainWnd; Modified: trunk/rostests/winetests/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rsrc.r… ============================================================================== --- trunk/rostests/winetests/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/rsrc.rc [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" +//#include "windef.h" #include "winuser.h" #include "resources.h" Modified: trunk/rostests/winetests/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/status… ============================================================================== --- trunk/rostests/winetests/comctl32/status.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/status.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,11 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <wine/test.h> + #include <assert.h> -#include <windows.h> +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> - -#include "wine/test.h" #define SUBCLASS_NAME "MyStatusBar" @@ -492,7 +494,7 @@ expect(4, r); /* A size of 0 returns the length of the text */ r = SendMessage(hwndStatus, WM_GETTEXT, 0, 0); - expect(4, r); + ok( r == 4 || broken(r == 2) /* win8 */, "Expected 4 got %d\n", r ); /* A size of 1 only stores the NULL terminator */ buf[0] = 0xa; r = SendMessage(hwndStatus, WM_GETTEXT, 1, (LPARAM)buf); Modified: trunk/rostests/winetests/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/syslin… ============================================================================== --- trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -17,10 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <wine/test.h> + +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> -#include "wine/test.h" #include "v6util.h" #include "msg.h" @@ -155,6 +158,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, SYSLINK_SEQ_INDEX, &msg); defwndproc_counter++; Modified: trunk/rostests/winetests/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/tab.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -18,12 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <wine/test.h> + #include <assert.h> -#include <windows.h> +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> #include <stdio.h> -#include "wine/test.h" #include "msg.h" #define DEFAULT_MIN_TAB_WIDTH 54 @@ -352,6 +355,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -419,6 +423,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, TAB_SEQ_INDEX, &msg); } Modified: trunk/rostests/winetests/comctl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/testli… ============================================================================== --- trunk/rostests/winetests/comctl32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/testlist.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_comboex(void); extern void func_datetime(void); Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… ============================================================================== --- trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -17,11 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <wine/test.h> + #include <assert.h> -#include <windows.h> +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> +#include <winnls.h> #include <commctrl.h> - -#include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) Modified: trunk/rostests/winetests/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/trackb… ============================================================================== --- trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -17,11 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <wine/test.h> + +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> #include <stdio.h> -#include "wine/test.h" #include "msg.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -442,6 +445,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, TRACKBAR_SEQ_INDEX, &msg); defwndproc_counter++; Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… ============================================================================== --- trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -292,6 +292,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, TREEVIEW_SEQ_INDEX, &msg); defwndproc_counter++; @@ -1001,7 +1002,10 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + msg.id = ((NMHDR*)lParam)->code; + else + msg.id = 0; /* log system messages, except for painting */ if (message < WM_USER && @@ -1942,6 +1946,19 @@ ok(ht.hItem == hChild, "got %p, expected %p\n", ht.hItem, hChild); /* Wine returns item button here, but this item has no button */ todo_wine ok(ht.flags == TVHT_ONITEMINDENT, "got %d, expected %d\n", ht.flags, TVHT_ONITEMINDENT); + + DestroyWindow(hTree); +} + +static void test_WM_GETDLGCODE(void) +{ + DWORD code; + HWND hTree; + + hTree = create_treeview_control(0); + + code = SendMessageA(hTree, WM_GETDLGCODE, VK_TAB, 0); + ok(code == (DLGC_WANTCHARS | DLGC_WANTARROWS), "0x%08x\n", code); DestroyWindow(hTree); } @@ -2019,6 +2036,7 @@ test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); + test_WM_GETDLGCODE(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -2044,6 +2062,7 @@ /* comctl32 version 6 tests start here */ test_expandedimage(); test_htreeitem_layout(); + test_WM_GETDLGCODE(); unload_v6_module(ctx_cookie, hCtx); Modified: trunk/rostests/winetests/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/updown… ============================================================================== --- trunk/rostests/winetests/comctl32/updown.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/updown.c [iso-8859-1] Sat Mar 16 17:07:05 2013 @@ -44,11 +44,14 @@ * - more stuff to test */ -#include <windows.h> +#include <wine/test.h> + +//#include <windows.h> +#include <wingdi.h> +#include <winuser.h> #include <commctrl.h> #include <stdio.h> -#include "wine/test.h" #include "msg.h" #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) @@ -186,6 +189,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); }

1 0

[akhaldi] 58521: [COMCTL32] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: akhaldi Date: Sat Mar 16 17:06:48 2013 New Revision: 58521 URL: http://svn.reactos.org/svn/reactos?rev=58521&view=rev Log: [COMCTL32] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -147,8 +147,8 @@ * MRU-Functions {COMCTL32} * * NOTES - * The MRU-Api is a set of functions to manipulate lists of M.R.U. (Most Recently - * Used) items. It is an undocumented Api that is used (at least) by the shell + * The MRU-API is a set of functions to manipulate lists of M.R.U. (Most Recently + * Used) items. It is an undocumented API that is used (at least) by the shell * and explorer to implement their recent documents feature. * * Since these functions are undocumented, they are unsupported by MS and Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… ============================================================================== --- trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -205,16 +205,16 @@ systime->wHour, systime->wMinute, systime->wSecond); if (flag == GDT_VALID) { - if (systime->wYear == 0 || - systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDay < 1 || - systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || - systime->wHour > 23 || - systime->wMinute > 59 || - systime->wSecond > 59 || - systime->wMilliseconds > 999 - ) - return FALSE; + if (systime->wYear == 0 || + systime->wMonth < 1 || systime->wMonth > 12 || + systime->wDay < 1 || + systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || + systime->wHour > 23 || + systime->wMinute > 59 || + systime->wSecond > 59 || + systime->wMilliseconds > 999 + ) + return FALSE; /* Windows returns true if the date is valid but outside the limits set */ if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE) Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -459,7 +459,7 @@ /************************************************************************** * DPA_Clone [COMCTL32.331] * - * Copies a pointer array to an other one or creates a copy + * Copies a pointer array to another one or creates a copy * * PARAMS * hdpa [I] handle (pointer) to the existing (source) pointer array Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -118,6 +118,7 @@ { HWND hwnd; HIMAGELIST himl; + HIMAGELIST himlNoCursor; /* position of the drag image relative to the window */ INT x; INT y; @@ -130,7 +131,7 @@ HBITMAP hbmBg; } INTERNALDRAG; -static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 }; +static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, 0, FALSE, 0 }; static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); @@ -611,7 +612,7 @@ cx = himlTrack->cx; cy = himlTrack->cy; - InternalDrag.himl = ImageList_Create (cx, cy, himlTrack->flags, 1, 1); + InternalDrag.himlNoCursor = InternalDrag.himl = ImageList_Create (cx, cy, himlTrack->flags, 1, 1); if (InternalDrag.himl == NULL) { WARN("Error creating drag image list!\n"); return FALSE; @@ -1639,8 +1640,10 @@ { /* cleanup the InternalDrag struct */ InternalDrag.hwnd = 0; + if (InternalDrag.himl != InternalDrag.himlNoCursor) + ImageList_Destroy (InternalDrag.himlNoCursor); ImageList_Destroy (InternalDrag.himl); - InternalDrag.himl = 0; + InternalDrag.himlNoCursor = InternalDrag.himl = 0; InternalDrag.x= 0; InternalDrag.y= 0; InternalDrag.dxHotspot = 0; @@ -2083,6 +2086,7 @@ INT cxDst, cyDst; INT xOff1, yOff1, xOff2, yOff2; POINT pt1, pt2; + INT newFlags; TRACE("(himl1=%p i1=%d himl2=%p i2=%d dx=%d dy=%d)\n", himl1, i1, himl2, i2, dx, dy); @@ -2122,7 +2126,10 @@ yOff2 = 0; } - himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | ILC_COLOR, 1, 1); + newFlags = (himl1->flags > himl2->flags ? himl1->flags : himl2->flags) & ILC_COLORDDB; + if (newFlags == ILC_COLORDDB && (himl1->flags & ILC_COLORDDB) == ILC_COLOR16) + newFlags = ILC_COLOR16; /* this is what native (at least v5) does, don't know why */ + himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | newFlags, 1, 1); if (himlDst) { @@ -2135,8 +2142,13 @@ BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, pt1.x, pt1.y, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) { - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + if (himl2->flags & ILC_MASK) + { + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + } + else + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCCOPY); } /* copy mask */ @@ -2239,7 +2251,7 @@ void *image_bits, *mask_bits = NULL; ILHEAD ilHead; HIMAGELIST himl; - int i; + unsigned int i; TRACE("%p\n", pstm); @@ -2703,7 +2715,7 @@ visible = InternalDrag.bShow; - himlTemp = ImageList_Merge (InternalDrag.himl, 0, himlDrag, iDrag, + himlTemp = ImageList_Merge (InternalDrag.himlNoCursor, 0, himlDrag, iDrag, dxHotspot, dyHotspot); if (visible) { @@ -2717,7 +2729,8 @@ InternalDrag.hbmBg = 0; } - ImageList_Destroy (InternalDrag.himl); + if (InternalDrag.himl != InternalDrag.himlNoCursor) + ImageList_Destroy (InternalDrag.himl); InternalDrag.himl = himlTemp; if (visible) { Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -6,8 +6,9 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009-2012 Nikolay Sivov + * Copyright 2009-2013 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers + * Copyright 2012-2013 Daniel Jelinski * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,7 +55,6 @@ * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented * -- LISTVIEW_SetColumnWidth ignores header images & bitmap - * -- LISTVIEW_SetIconSpacing is incomplete * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -75,7 +75,6 @@ * States * -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0) * -- LVIS_DROPHILITED - * -- LVIS_OVERLAYMASK * * Styles * -- LVS_NOLABELWRAP @@ -99,7 +98,6 @@ * -- LVN_GETINFOTIP * -- LVN_HOTTRACK * -- LVN_SETDISPINFO - * -- LVN_BEGINRDRAG * * Messages: * -- LVM_ENABLEGROUPVIEW @@ -290,6 +288,7 @@ HIMAGELIST himlSmall; HIMAGELIST himlState; SIZE iconSize; + BOOL autoSpacing; SIZE iconSpacing; SIZE iconStateSize; POINT currIconPos; /* this is the position next icon will be placed */ @@ -326,12 +325,12 @@ /* mouse operation */ BOOL bLButtonDown; - BOOL bRButtonDown; BOOL bDragging; POINT ptClickPos; /* point where the user clicked */ INT nLButtonDownItem; /* tracks item to reset multiselection on WM_LBUTTONUP */ DWORD dwHoverTime; HCURSOR hHotCursor; + INT cWheelRemainder; /* keyboard operation */ DWORD lastKeyPressTimestamp; @@ -775,13 +774,11 @@ } /* forwards header notifications to listview parent */ -static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) -{ - NMHEADERA nmhA; - HDITEMA hditema; - HD_TEXTFILTERA textfilter; - LPSTR text = NULL, filter = NULL; +static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lpnmhW) +{ + LPCWSTR text = NULL, filter = NULL; LRESULT ret; + NMHEADERA *lpnmh = (NMHEADERA*) lpnmhW; /* on unicode format exit earlier */ if (infoPtr->notifyFormat == NFR_UNICODE) @@ -790,37 +787,38 @@ /* header always supplies unicode notifications, all we have to do is to convert strings to ANSI */ - nmhA = *(const NMHEADERA*)lpnmh; if (lpnmh->pitem) { - hditema = *(HDITEMA*)lpnmh->pitem; - nmhA.pitem = &hditema; /* convert item text */ if (lpnmh->pitem->mask & HDI_TEXT) { - hditema.pszText = NULL; - Str_SetPtrWtoA(&hditema.pszText, lpnmh->pitem->pszText); - text = hditema.pszText; + text = (LPCWSTR)lpnmh->pitem->pszText; + Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); } /* convert filter text */ if ((lpnmh->pitem->mask & HDI_FILTER) && (lpnmh->pitem->type == HDFT_ISSTRING) && lpnmh->pitem->pvFilter) { - hditema.pvFilter = &textfilter; - textfilter = *(HD_TEXTFILTERA*)(lpnmh->pitem->pvFilter); - textfilter.pszText = NULL; - Str_SetPtrWtoA(&textfilter.pszText, ((HD_TEXTFILTERW*)lpnmh->pitem->pvFilter)->pszText); - filter = textfilter.pszText; + filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; + Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); } } - nmhA.hdr.code = get_ansi_notification(lpnmh->hdr.code); - - ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhA.hdr.idFrom, - (LPARAM)&nmhA); + lpnmh->hdr.code = get_ansi_notification(lpnmh->hdr.code); + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmh->hdr.idFrom, + (LPARAM)lpnmh); /* cleanup */ - Free(text); - Free(filter); + if(text) + { + Free(lpnmh->pitem->pszText); + lpnmh->pitem->pszText = (LPSTR)text; + } + if(filter) + { + Free(((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText); + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = (LPSTR)filter; + } return ret; } @@ -888,11 +886,13 @@ return notify_hdr(infoPtr, code, (LPNMHDR)plvnm); } +/* Handles NM_DBLCLK, NM_CLICK, NM_RDBLCLK, NM_RCLICK. Only NM_RCLICK return value is used. */ static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTESTINFO *lvht) { NMITEMACTIVATE nmia; LVITEMW item; HWND hwnd = infoPtr->hwndSelf; + LRESULT ret; TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); ZeroMemory(&nmia, sizeof(nmia)); @@ -903,8 +903,8 @@ item.iItem = lvht->iItem; item.iSubItem = 0; if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmia.lParam = item.lParam; - notify_hdr(infoPtr, code, (LPNMHDR)&nmia); - return IsWindow(hwnd); + ret = notify_hdr(infoPtr, code, (NMHDR*)&nmia); + return IsWindow(hwnd) && (code == NM_RCLICK ? !ret : TRUE); } static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem) @@ -1672,6 +1672,10 @@ /* set header font */ SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, TRUE); + /* set header image list */ + if (infoPtr->himlSmall) + SendMessageW(infoPtr->hwndHeader, HDM_SETIMAGELIST, 0, (LPARAM)infoPtr->himlSmall); + LISTVIEW_UpdateSize(infoPtr); return 0; @@ -1847,9 +1851,9 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData) { WCHAR buffer[MAX_PATH]; - INT endidx, startidx; DWORD prevTime; LVITEMW item; + int startidx; INT nItem; INT diff; @@ -1889,15 +1893,16 @@ infoPtr->nSearchParamLength = 1; } - /* and search from the current position */ - nItem = -1; - endidx = infoPtr->nItemCount; - /* should start from next after focused item, so next item that matches will be selected, if there isn't any and focused matches it will be selected on second search stage from beginning of the list */ if (infoPtr->nFocusedItem >= 0 && infoPtr->nItemCount > 1) - startidx = infoPtr->nFocusedItem + 1; + { + /* with some accumulated search data available start with current focus, otherwise + it's excluded from search */ + startidx = infoPtr->nSearchParamLength > 1 ? infoPtr->nFocusedItem : infoPtr->nFocusedItem + 1; + if (startidx == infoPtr->nItemCount) startidx = 0; + } else startidx = 0; @@ -1917,7 +1922,11 @@ } else { - INT i = startidx; + int i = startidx, endidx; + + /* and search from the current position */ + nItem = -1; + endidx = infoPtr->nItemCount; /* first search in [startidx, endidx), on failure continue in [0, startidx) */ while (1) @@ -1939,12 +1948,15 @@ item.cchTextMax = MAX_PATH; if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; - if (lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength) == 0) + if (!lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) { nItem = i; break; } - else if (nItem == -1 && lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1) == 0) + /* this is used to find first char match when search string is not available yet, + otherwise every WM_CHAR will search to next item by first char, ignoring that we're + already waiting for user to complete a string */ + else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1)) { /* this would work but we must keep looking for a longer match */ nItem = i; @@ -2376,7 +2388,7 @@ Icon.top = Box.top; Icon.right = Icon.left; if (infoPtr->himlSmall && - (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) || + (!lpColumnInfo || lpLVItem->iSubItem == 0 || ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK))) Icon.right += infoPtr->iconSize.cx; Icon.bottom = Icon.top + infoPtr->iconSize.cy; @@ -2967,15 +2979,12 @@ nItemHeight = infoPtr->iconSpacing.cy; else { - nItemHeight = infoPtr->ntmHeight; - if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) - nItemHeight++; + nItemHeight = infoPtr->ntmHeight; if (infoPtr->himlState) nItemHeight = max(nItemHeight, infoPtr->iconStateSize.cy); if (infoPtr->himlSmall) nItemHeight = max(nItemHeight, infoPtr->iconSize.cy); - if (infoPtr->himlState || infoPtr->himlSmall) - nItemHeight += HEIGHT_PADDING; + nItemHeight += HEIGHT_PADDING; if (infoPtr->nMeasureItemHeight > 0) nItemHeight = infoPtr->nMeasureItemHeight; } @@ -3459,7 +3468,6 @@ return oldFocus != infoPtr->nFocusedItem; } -/* Helper function for LISTVIEW_ShiftIndices *only* */ static INT shift_item(const LISTVIEW_INFO *infoPtr, INT nShiftItem, INT nItem, INT direction) { if (nShiftItem < nItem) return nShiftItem; @@ -3469,6 +3477,24 @@ if (direction > 0) return nShiftItem + direction; return min(nShiftItem, infoPtr->nItemCount - 1); +} + +/* This function updates focus index. + +Parameters: + focus : current focus index + item : index of item to be added/removed + direction : add/remove flag +*/ +static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction) +{ + BOOL old_change = infoPtr->bDoChangeNotify; + + infoPtr->bDoChangeNotify = FALSE; + focus = shift_item(infoPtr, focus, item, direction); + if (focus != infoPtr->nFocusedItem) + LISTVIEW_SetItemFocus(infoPtr, focus); + infoPtr->bDoChangeNotify = old_change; } /** @@ -3485,30 +3511,14 @@ */ static void LISTVIEW_ShiftIndices(LISTVIEW_INFO *infoPtr, INT nItem, INT direction) { - INT nNewFocus; - BOOL bOldChange; - - /* temporarily disable change notification while shifting items */ - bOldChange = infoPtr->bDoChangeNotify; - infoPtr->bDoChangeNotify = FALSE; - - TRACE("Shifting %iu, %i steps\n", nItem, direction); + TRACE("Shifting %i, %i steps\n", nItem, direction); ranges_shift(infoPtr->selectionRanges, nItem, direction, infoPtr->nItemCount); - assert(abs(direction) == 1); - infoPtr->nSelectionMark = shift_item(infoPtr, infoPtr->nSelectionMark, nItem, direction); - nNewFocus = shift_item(infoPtr, infoPtr->nFocusedItem, nItem, direction); - if (nNewFocus != infoPtr->nFocusedItem) - LISTVIEW_SetItemFocus(infoPtr, nNewFocus); - /* But we are not supposed to modify nHotItem! */ - - infoPtr->bDoChangeNotify = bOldChange; -} - +} /** * DESCRIPTION: @@ -3550,8 +3560,8 @@ ZeroMemory(&nmlv, sizeof(nmlv)); nmlv.iFrom = nFirst; nmlv.iTo = nLast; - nmlv.uNewState = 0; - nmlv.uOldState = item.state; + nmlv.uOldState = 0; + nmlv.uNewState = item.state; notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf)) @@ -3606,9 +3616,15 @@ POINT ptItem; rcItem.left = LVIR_BOUNDS; - if (!LISTVIEW_GetItemRect(infoPtr, nItem, &rcItem)) return; + if (!LISTVIEW_GetItemRect(infoPtr, nItem, &rcItem)) { + ranges_destroy (selection); + return; + } rcSelMark.left = LVIR_BOUNDS; - if (!LISTVIEW_GetItemRect(infoPtr, infoPtr->nSelectionMark, &rcSelMark)) return; + if (!LISTVIEW_GetItemRect(infoPtr, infoPtr->nSelectionMark, &rcSelMark)) { + ranges_destroy (selection); + return; + } UnionRect(&rcSel, &rcItem, &rcSelMark); iterator_frameditems(&i, infoPtr, &rcSel); while(iterator_next(&i)) @@ -3989,17 +4005,23 @@ */ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { + LVHITTESTINFO ht; + RECT rect; + POINT pt; + if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; if (infoPtr->bLButtonDown) { - POINT tmp; - RECT rect; - LVHITTESTINFO lvHitTestInfo; - WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); - WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); - + rect.left = rect.right = infoPtr->ptClickPos.x; + rect.top = rect.bottom = infoPtr->ptClickPos.y; + + InflateRect(&rect, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG)); + } + + if (infoPtr->bLButtonDown) + { if (infoPtr->bMarqueeSelect) { POINT coords_orig; @@ -4042,22 +4064,17 @@ return 0; } - rect.left = infoPtr->ptClickPos.x - wDragWidth; - rect.right = infoPtr->ptClickPos.x + wDragWidth; - rect.top = infoPtr->ptClickPos.y - wDragHeight; - rect.bottom = infoPtr->ptClickPos.y + wDragHeight; - - tmp.x = x; - tmp.y = y; - - lvHitTestInfo.pt = tmp; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + pt.x = x; + pt.y = y; + + ht.pt = pt; + LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); /* reset item marker */ - if (infoPtr->nLButtonDownItem != lvHitTestInfo.iItem) + if (infoPtr->nLButtonDownItem != ht.iItem) infoPtr->nLButtonDownItem = -1; - if (!PtInRect(&rect, tmp)) + if (!PtInRect(&rect, pt)) { /* this path covers the following: 1. WM_LBUTTONDOWN over selected item (sets focus on it) @@ -4077,12 +4094,12 @@ if (!infoPtr->bDragging) { - lvHitTestInfo.pt = infoPtr->ptClickPos; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + ht.pt = infoPtr->ptClickPos; + LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); /* If the click is outside the range of an item, begin a highlight. If not, begin an item drag. */ - if (lvHitTestInfo.iItem == -1) + if (ht.iItem == -1) { NMHDR hdr; @@ -4107,7 +4124,7 @@ NMLISTVIEW nmlv; ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = lvHitTestInfo.iItem; + nmlv.iItem = ht.iItem; nmlv.ptAction = infoPtr->ptClickPos; notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); @@ -4158,7 +4175,7 @@ /*** * DESCRIPTION: - * Helper for LISTVIEW_SetItemT *only*: sets item attributes. + * Helper for LISTVIEW_SetItemT and LISTVIEW_InsertItemT: sets item attributes. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -4227,20 +4244,19 @@ if ((lpLVItem->mask & LVIF_TEXT) && textcmpWT(lpItem->hdr.pszText, lpLVItem->pszText, isW)) uChanged |= LVIF_TEXT; - TRACE("uChanged=0x%x\n", uChanged); - if (!uChanged) return TRUE; - *bChanged = TRUE; + TRACE("change mask=0x%x\n", uChanged); - ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); + memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; - nmlv.uChanged = uChanged; + nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - - /* send LVN_ITEMCHANGING notification, if the item is not being inserted */ - /* and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications */ - /* are enabled */ + + /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications + are enabled. Even nothing really changed we still need to send this, + in this case uChanged mask is just set to passed item mask. */ if(lpItem && !isNew && infoPtr->bDoChangeNotify) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4250,6 +4266,18 @@ if (!IsWindow(hwndSelf)) return FALSE; } + + /* When item is inserted we need to shift existing focus index if new item has lower index. */ + if (isNew && (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) && + /* this means we won't hit a focus change path later */ + ((uChanged & LVIF_STATE) == 0 || (!(lpLVItem->state & LVIS_FOCUSED) && (infoPtr->nFocusedItem != lpLVItem->iItem)))) + { + if (infoPtr->nFocusedItem != -1 && (lpLVItem->iItem <= infoPtr->nFocusedItem)) + infoPtr->nFocusedItem++; + } + + if (!uChanged) return TRUE; + *bChanged = TRUE; /* copy information */ if (lpLVItem->mask & LVIF_TEXT) @@ -4280,7 +4308,14 @@ { ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem); } - /* if we are asked to change focus, and we manage it, do it */ + /* If we are asked to change focus, and we manage it, do it. + It's important to have all new item data stored at this point, + because changing existing focus could result in a redrawing operation, + which in turn could ask for disp data, application should see all data + for inserted item when processing LVN_GETDISPINFO. + + The way this works application will see nested item change notifications - + changed item notifications interrupted by ones from item losing focus. */ if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) { if (lpLVItem->state & LVIS_FOCUSED) @@ -4312,7 +4347,7 @@ /* if we're inserting the item, we're done */ if (isNew) return TRUE; - + /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); @@ -4554,7 +4589,6 @@ NMLVCUSTOMDRAW nmlvcd; HIMAGELIST himl; LVITEMW lvItem; - HFONT hOldFont; TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); @@ -4562,7 +4596,7 @@ lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; if (nSubItem == 0) lvItem.mask |= LVIF_STATE; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; lvItem.iItem = nItem; lvItem.iSubItem = nSubItem; lvItem.state = 0; @@ -4592,7 +4626,6 @@ /* fill in the custom draw structure */ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); - hOldFont = GetCurrentObject(hdc, OBJ_FONT); if (nSubItem > 0) cdmode = infoPtr->cditemmode; if (cdmode & CDRF_SKIPDEFAULT) goto postpaint; if (cdmode & CDRF_NOTIFYITEMDRAW) @@ -4600,7 +4633,7 @@ if (nSubItem == 0) infoPtr->cditemmode = cdsubitemmode; if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; /* we have to send a CDDS_SUBITEM customdraw explicitly for subitem 0 */ - if (nSubItem == 0 && cdsubitemmode == CDRF_NOTIFYITEMDRAW) + if (nSubItem == 0 && (cdsubitemmode & CDRF_NOTIFYITEMDRAW) != 0) { cdsubitemmode = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; @@ -4610,21 +4643,25 @@ else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); - /* in full row select, subitems, will just use main item's colors */ - if (nSubItem && infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - nmlvcd.clrTextBk = CLR_NONE; - /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; - /* draw the selection background, if we're drawing the main item */ - if (nSubItem == 0) - { - /* in icon mode, the label rect is really what we want to draw the - * background for */ - if (infoPtr->uView == LV_VIEW_ICON) - rcSelect = rcLabel; - + /* in icon mode, the label rect is really what we want to draw the + * background for */ + /* in detail mode, we want to paint background for label rect when + * item is not selected or listview has full row select; otherwise paint + * background for text only */ + if (infoPtr->uView == LV_VIEW_ICON || + (infoPtr->uView == LV_VIEW_DETAILS && + (!(lvItem.state & LVIS_SELECTED) || + (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) != 0))) + rcSelect = rcLabel; + + if (nmlvcd.clrTextBk != CLR_NONE) + ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + + if(nSubItem == 0 && infoPtr->nFocusedItem == nItem) + { if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) { /* we have to update left focus bound too if item isn't in leftmost column @@ -4647,10 +4684,8 @@ rcSelect.right = rcBox.right; } - if (nmlvcd.clrTextBk != CLR_NONE) - ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); /* store new focus rectangle */ - if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; + infoPtr->rcFocus = rcSelect; } /* state icons */ @@ -4681,7 +4716,7 @@ ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, - style); + style | (lvItem.state & LVIS_OVERLAYMASK)); } /* Don't bother painting item being edited */ @@ -4719,8 +4754,6 @@ postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - if (cdsubitemmode & CDRF_NEWFONT) - SelectObject(hdc, hOldFont); return TRUE; } @@ -4847,6 +4880,7 @@ /* iterate through the invalidated rows */ while(iterator_next(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.y += Origin.y; @@ -4969,6 +5003,8 @@ SelectObject( hdc, hOldPen ); DeleteObject( hPen ); } + else + ranges_destroy(colRanges); } /*** @@ -4992,6 +5028,7 @@ while(iterator_prev(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.x += Origin.x; Position.y += Origin.y; @@ -5015,7 +5052,7 @@ */ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcErase) { - COLORREF oldTextColor = 0, oldBkColor = 0, oldClrTextBk, oldClrText; + COLORREF oldTextColor = 0, oldBkColor = 0; NMLVCUSTOMDRAW nmlvcd; HFONT hOldFont = 0; DWORD cdmode; @@ -5072,21 +5109,12 @@ hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); } - /* FIXME: Shouldn't need to do this */ - oldClrTextBk = infoPtr->clrTextBk; - oldClrText = infoPtr->clrText; - infoPtr->cditemmode = CDRF_DODEFAULT; GetClientRect(infoPtr->hwndSelf, &rcClient); customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); if (cdmode & CDRF_SKIPDEFAULT) goto enddraw; - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - - /* Use these colors to draw the items */ - infoPtr->clrTextBk = nmlvcd.clrTextBk; - infoPtr->clrText = nmlvcd.clrText; /* nothing to draw */ if(infoPtr->nItemCount == 0) goto enddraw; @@ -5139,9 +5167,6 @@ if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - infoPtr->clrTextBk = oldClrTextBk; - infoPtr->clrText = oldClrText; - if(hbmp) { BitBlt(hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, infoPtr->rcList.right - infoPtr->rcList.left, @@ -5322,6 +5347,7 @@ POINT pos; HDC hdc, hdcOrig; HBITMAP hbmp, hOldbmp; + HFONT hOldFont; HIMAGELIST dragList = 0; TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); @@ -5342,6 +5368,7 @@ hdc = CreateCompatibleDC(hdcOrig); hbmp = CreateCompatibleBitmap(hdcOrig, size.cx, size.cy); hOldbmp = SelectObject(hdc, hbmp); + hOldFont = SelectObject(hdc, infoPtr->hFont); rcItem.left = rcItem.top = 0; rcItem.right = size.cx; @@ -5358,6 +5385,7 @@ else SelectObject(hdc, hOldbmp); + SelectObject(hdc, hOldFont); DeleteObject(hbmp); DeleteDC(hdc); ReleaseDC(infoPtr->hwndSelf, hdcOrig); @@ -5642,9 +5670,8 @@ TRACE("rcScroll=%s, dx=%d\n", wine_dbgstr_rect(&rcScroll), dir * infoPtr->nItemHeight); if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList)) { - TRACE("Scrolling rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList)); - ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight, - &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE); + TRACE("Invalidating rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList)); + InvalidateRect(infoPtr->hwndSelf, &rcScroll, TRUE); } /* report has only that column, so we're done */ @@ -5657,8 +5684,7 @@ rcScroll.bottom = nPerCol * infoPtr->nItemHeight; OffsetRect(&rcScroll, Origin.x, Origin.y); if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList)) - ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight, - &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE); + InvalidateRect(infoPtr->hwndSelf, &rcScroll, TRUE); } /*** @@ -5677,6 +5703,7 @@ { LVITEMW item; const BOOL is_icon = (infoPtr->uView == LV_VIEW_SMALLICON || infoPtr->uView == LV_VIEW_ICON); + INT focus = infoPtr->nFocusedItem; TRACE("(nItem=%d)\n", nItem); @@ -5686,7 +5713,7 @@ item.state = 0; item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; LISTVIEW_SetItemState(infoPtr, nItem, &item); - + /* send LVN_DELETEITEM notification. */ if (!notify_deleteitem(infoPtr, nItem)) return FALSE; @@ -5727,6 +5754,7 @@ infoPtr->nItemCount--; LISTVIEW_ShiftIndices(infoPtr, nItem, -1); + LISTVIEW_ShiftFocus(infoPtr, focus, nItem, -1); /* now is the invalidation fun */ if (!is_icon) @@ -6554,7 +6582,7 @@ HDPA hdpaSubItems; INT isubitem; - TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); + TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iItem >= infoPtr->nItemCount) return FALSE; @@ -7045,65 +7073,61 @@ * * NOTE: for subItem = 0, we should return the bounds of the _entire_ item, * not only those of the first column. - * Fortunately, LISTVIEW_GetItemMetrics does the right thing. * * RETURN: * TRUE: success * FALSE: failure */ -static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprc) -{ - POINT Position, Origin; - LVITEMW lvItem; - INT nColumn; +static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT item, LPRECT lprc) +{ + RECT rect = { 0, 0, 0, 0 }; + POINT origin; + INT y; if (!lprc) return FALSE; - nColumn = lprc->top; - - TRACE("(nItem=%d, nSubItem=%d, type=%d)\n", nItem, lprc->top, lprc->left); - /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ + TRACE("(item=%d, subitem=%d, type=%d)\n", item, lprc->top, lprc->left); + /* Subitem of '0' means item itself, and this works for all control view modes */ if (lprc->top == 0) - return LISTVIEW_GetItemRect(infoPtr, nItem, lprc); + return LISTVIEW_GetItemRect(infoPtr, item, lprc); if (infoPtr->uView != LV_VIEW_DETAILS) return FALSE; - /* special case for header items */ - if (nItem == -1) - { - if (lprc->left != LVIR_BOUNDS) - { - FIXME("Only LVIR_BOUNDS is implemented for header, got %d\n", lprc->left); - return FALSE; - } - - if (infoPtr->hwndHeader) - return SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, lprc->top, (LPARAM)lprc); + LISTVIEW_GetOrigin(infoPtr, &origin); + /* this works for any item index, no matter if it exists or not */ + y = item * infoPtr->nItemHeight + origin.y; + + if (infoPtr->hwndHeader && SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, lprc->top, (LPARAM)&rect)) + { + rect.top = 0; + rect.bottom = infoPtr->nItemHeight; + } + else + { + /* Native implementation is broken for this case and garbage is left for left and right fields, + we zero them to get predictable output */ + lprc->left = lprc->right = lprc->top = 0; + lprc->bottom = infoPtr->nItemHeight; + OffsetRect(lprc, origin.x, y); + TRACE("return rect %s\n", wine_dbgstr_rect(lprc)); + return TRUE; + } + + switch (lprc->left) + { + case LVIR_ICON: + { + /* it doesn't matter if main item actually has an icon, if imagelist is set icon width is returned */ + if (infoPtr->himlSmall) + rect.right = rect.left + infoPtr->iconSize.cx; else - { - memset(lprc, 0, sizeof(RECT)); - return TRUE; - } - } - - if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE; - LISTVIEW_GetOrigin(infoPtr, &Origin); - - if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; - - lvItem.mask = 0; - lvItem.iItem = nItem; - lvItem.iSubItem = nColumn; - - switch(lprc->left) - { - case LVIR_ICON: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, lprc, NULL, NULL); + rect.right = rect.left; + + rect.bottom = rect.top + infoPtr->iconSize.cy; break; - + } case LVIR_LABEL: case LVIR_BOUNDS: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprc, NULL, NULL, NULL, NULL); break; default: @@ -7111,7 +7135,8 @@ return FALSE; } - OffsetRect(lprc, Origin.x, Position.y); + OffsetRect(&rect, origin.x, y); + *lprc = rect; TRACE("return rect %s\n", wine_dbgstr_rect(lprc)); return TRUE; @@ -7680,7 +7705,7 @@ LVITEMW item; HWND hwndSelf = infoPtr->hwndSelf; - TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); + TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++; @@ -7730,7 +7755,7 @@ else nItem = min(lpLVItem->iItem, infoPtr->nItemCount); - TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); + TRACE("inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; infoPtr->nItemCount++; @@ -7762,6 +7787,7 @@ item.state &= ~LVIS_STATEIMAGEMASK; item.state |= INDEXTOSTATEIMAGEMASK(1); } + if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* make room for the position, if we are in the right mode */ @@ -7775,9 +7801,9 @@ goto undo; } } - + /* send LVN_INSERTITEM notification */ - ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); + memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = nItem; nmlv.lParam = lpItem->lParam; notify_listview(infoPtr, LVN_INSERTITEM, &nmlv); @@ -7803,6 +7829,7 @@ undo: LISTVIEW_ShiftIndices(infoPtr, nItem, -1); + LISTVIEW_ShiftFocus(infoPtr, infoPtr->nFocusedItem, nItem, -1); DPA_DeletePtr(infoPtr->hdpaItems, nItem); infoPtr->nItemCount--; fail: @@ -8283,10 +8310,10 @@ lvItem.mask = LVIF_TEXT; lvItem.iItem = 0; lvItem.iSubItem = nColumn; - lvItem.pszText = szDispText; lvItem.cchTextMax = DISP_TEXT_SIZE; for (; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++) { + lvItem.pszText = szDispText; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) continue; nLabelWidth = LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE); if (max_cx < nLabelWidth) max_cx = nLabelWidth; @@ -8570,36 +8597,33 @@ */ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) { + INT iconWidth = 0, iconHeight = 0; DWORD oldspacing = MAKELONG(infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy); TRACE("requested=(%d,%d)\n", cx, cy); - - /* this is supported only for LVS_ICON style */ - if (infoPtr->uView != LV_VIEW_ICON) return oldspacing; - + /* set to defaults, if instructed to */ - if (cx == -1) cx = GetSystemMetrics(SM_CXICONSPACING); - if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING); - - /* if 0 then compute width - * FIXME: computed cx and cy is not matching native behaviour */ - if (cx == 0) { - cx = GetSystemMetrics(SM_CXICONSPACING); - if (infoPtr->iconSize.cx + ICON_LR_PADDING > cx) - cx = infoPtr->iconSize.cx + ICON_LR_PADDING; - } - - /* if 0 then compute height */ - if (cy == 0) - cy = infoPtr->iconSize.cy + 2 * infoPtr->ntmHeight + - ICON_BOTTOM_PADDING + ICON_TOP_PADDING + LABEL_VERT_PADDING; - - - infoPtr->iconSpacing.cx = cx; - infoPtr->iconSpacing.cy = cy; + if (cx == -1 && cy == -1) + { + infoPtr->autoSpacing = TRUE; + if (infoPtr->himlNormal) + ImageList_GetIconSize(infoPtr->himlNormal, &iconWidth, &iconHeight); + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + iconWidth; + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + iconHeight; + } + else + infoPtr->autoSpacing = FALSE; + + /* if 0 then keep width */ + if (cx != 0) + infoPtr->iconSpacing.cx = cx; + + /* if 0 then keep height */ + if (cy != 0) + infoPtr->iconSpacing.cy = cy; TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%d,%d), ntmH=%d\n", - LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, + LOWORD(oldspacing), HIWORD(oldspacing), infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy, infoPtr->ntmHeight); @@ -8651,13 +8675,16 @@ himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (infoPtr->uView == LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); + if (infoPtr->autoSpacing) + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); break; case LVSIL_SMALL: himlOld = infoPtr->himlSmall; infoPtr->himlSmall = himl; if (infoPtr->uView != LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, TRUE); + if (infoPtr->hwndHeader) + SendMessageW(infoPtr->hwndHeader, HDM_SETIMAGELIST, 0, (LPARAM)himl); break; case LVSIL_STATE: @@ -8854,6 +8881,10 @@ UINT oldstate = 0; BOOL notify; + /* special case optimization for recurring attempt to deselect all */ + if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr)) + return TRUE; + /* select all isn't allowed in LVS_SINGLESEL */ if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL)) return FALSE; @@ -9039,7 +9070,6 @@ */ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) { - SIZE oldIconSize = infoPtr->iconSize; HIMAGELIST himl; if (infoPtr->uView == nView) return 1; @@ -9065,14 +9095,6 @@ switch (nView) { case LV_VIEW_ICON: - if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy)) - { - TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", - oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); - } - LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); - break; case LV_VIEW_SMALLICON: LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); break; @@ -9369,11 +9391,13 @@ infoPtr->bRedraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; - infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING); - infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING); + infoPtr->autoSpacing = TRUE; + infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); + infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); infoPtr->nEditLabelItem = -1; infoPtr->nLButtonDownItem = -1; infoPtr->dwHoverTime = HOVER_DEFAULT; /* default system hover time */ + infoPtr->cWheelRemainder = 0; infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ infoPtr->itemEdit.fEnabled = FALSE; @@ -9774,13 +9798,9 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - INT gcWheelDelta = 0; - INT pulScrollLines = 3; + UINT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); - - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta -= wheelDelta; switch(infoPtr->uView) { @@ -9790,21 +9810,31 @@ * listview should be scrolled by a multiple of 37 dependently on its dimension or its visible item number * should be fixed in the future. */ - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (gcWheelDelta < 0) ? + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (wheelDelta > 0) ? -LISTVIEW_SCROLL_ICON_LINE_SIZE : LISTVIEW_SCROLL_ICON_LINE_SIZE); break; case LV_VIEW_DETAILS: - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && infoPtr->cWheelRemainder < 0) || + (wheelDelta > 0 && infoPtr->cWheelRemainder > 0)) + infoPtr->cWheelRemainder += wheelDelta; + else + infoPtr->cWheelRemainder = wheelDelta; + if (infoPtr->cWheelRemainder && pulScrollLines) { - int cLineScroll = min(LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll); + int cLineScroll; + pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); + cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA; + infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll); } break; case LV_VIEW_LIST: - LISTVIEW_HScroll(infoPtr, (gcWheelDelta < 0) ? SB_LINELEFT : SB_LINERIGHT, 0); + LISTVIEW_HScroll(infoPtr, (wheelDelta > 0) ? SB_LINELEFT : SB_LINERIGHT, 0); break; } return 0; @@ -9931,7 +9961,10 @@ { TRACE("()\n"); - /* if we did not have the focus, there's nothing to do */ + /* drop any left over scroll amount */ + infoPtr->cWheelRemainder = 0; + + /* if we did not have the focus, there's nothing more to do */ if (!infoPtr->bFocus) return 0; /* send NM_KILLFOCUS notification */ @@ -10003,6 +10036,52 @@ return 0; } + +static LRESULT LISTVIEW_TrackMouse(const LISTVIEW_INFO *infoPtr, POINT pt) +{ + MSG msg; + RECT r; + + r.top = r.bottom = pt.y; + r.left = r.right = pt.x; + + InflateRect(&r, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG)); + + SetCapture(infoPtr->hwndSelf); + + while (1) + { + if (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) + { + if (msg.message == WM_MOUSEMOVE) + { + pt.x = (short)LOWORD(msg.lParam); + pt.y = (short)HIWORD(msg.lParam); + if (PtInRect(&r, pt)) + continue; + else + { + ReleaseCapture(); + return 1; + } + } + else if (msg.message >= WM_LBUTTONDOWN && + msg.message <= WM_RBUTTONDBLCLK) + { + break; + } + + DispatchMessageW(&msg); + } + + if (GetCapture() != infoPtr->hwndSelf) + return 0; + } + + ReleaseCapture(); + return 0; +} + /*** * DESCRIPTION: @@ -10257,9 +10336,9 @@ * RETURN: * Zero */ -static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) -{ - const NMHEADERW *lpnmh; +static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr) +{ + NMHEADERW *lpnmh; TRACE("(lpnmhdr=%p)\n", lpnmhdr); @@ -10267,7 +10346,7 @@ /* remember: HDN_LAST < HDN_FIRST */ if (lpnmhdr->code > HDN_FIRST || lpnmhdr->code < HDN_LAST) return 0; - lpnmh = (const NMHEADERW *)lpnmhdr; + lpnmh = (NMHEADERW *)lpnmhdr; if (lpnmh->iItem < 0 || lpnmh->iItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0; @@ -10292,26 +10371,25 @@ LISTVIEW_GetOrigin(infoPtr, &ptOrigin); infoPtr->xTrackLine = x + ptOrigin.x; LISTVIEW_DrawTrackLine(infoPtr); - break; + return notify_forward_header(infoPtr, lpnmh); } - + case HDN_ENDTRACKA: case HDN_ENDTRACKW: /* remove the track line (if any) */ LISTVIEW_DrawTrackLine(infoPtr); infoPtr->xTrackLine = -1; - break; + return notify_forward_header(infoPtr, lpnmh); case HDN_BEGINDRAG: - notify_forward_header(infoPtr, lpnmh); - return (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0; + if ((infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0) return 1; + return notify_forward_header(infoPtr, lpnmh); case HDN_ENDDRAG: infoPtr->colRectsDirty = TRUE; LISTVIEW_InvalidateList(infoPtr); - notify_forward_header(infoPtr, lpnmh); - return FALSE; - + return notify_forward_header(infoPtr, lpnmh); + case HDN_ITEMCHANGEDW: case HDN_ITEMCHANGEDA: { @@ -10391,8 +10469,8 @@ LISTVIEW_InvalidateRect(infoPtr, &rcCol); } } - } - break; + break; + } case HDN_ITEMCLICKW: case HDN_ITEMCLICKA: @@ -10404,9 +10482,8 @@ nmlv.iItem = -1; nmlv.iSubItem = lpnmh->iItem; notify_listview(infoPtr, LVN_COLUMNCLICK, &nmlv); - notify_forward_header(infoPtr, lpnmh); + return notify_forward_header(infoPtr, lpnmh); } - break; case HDN_DIVIDERDBLCLICKW: case HDN_DIVIDERDBLCLICKA: @@ -10414,10 +10491,8 @@ we should use LVSCW_AUTOSIZE_USEHEADER, helper rework or split needed for that */ LISTVIEW_SetColumnWidth(infoPtr, lpnmh->iItem, LVSCW_AUTOSIZE); - notify_forward_header(infoPtr, lpnmh); - break; - } - + return notify_forward_header(infoPtr, lpnmh); + } return 0; } @@ -10612,93 +10687,75 @@ /*** * DESCRIPTION: - * Processes mouse down messages (right mouse button). + * Processes WM_RBUTTONDOWN message and corresponding drag operation. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] wKey : key flag - * [I] x,y : mouse coordinate + * [I] x, y : mouse coordinate * * RETURN: * Zero */ static LRESULT LISTVIEW_RButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT y) { - LVHITTESTINFO lvHitTestInfo; - INT nItem; - - TRACE("(key=%hu,X=%u,Y=%u)\n", wKey, x, y); + LVHITTESTINFO ht; + INT item; + + TRACE("(key=%hu, x=%d, y=%d)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; + /* determine the index of the selected item */ + ht.pt.x = x; + ht.pt.y = y; + item = LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); + /* make sure the listview control window has the focus */ if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); - /* set right button down flag */ - infoPtr->bRButtonDown = TRUE; - - /* determine the index of the selected item */ - lvHitTestInfo.pt.x = x; - lvHitTestInfo.pt.y = y; - nItem = LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); - - if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) - { - LISTVIEW_SetItemFocus(infoPtr, nItem); + if ((item >= 0) && (item < infoPtr->nItemCount)) + { + LISTVIEW_SetItemFocus(infoPtr, item); if (!((wKey & MK_SHIFT) || (wKey & MK_CONTROL)) && - !LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED)) - LISTVIEW_SetSelection(infoPtr, nItem); + !LISTVIEW_GetItemState(infoPtr, item, LVIS_SELECTED)) + LISTVIEW_SetSelection(infoPtr, item); } else - { LISTVIEW_DeselectAll(infoPtr); + + if (LISTVIEW_TrackMouse(infoPtr, ht.pt)) + { + if (ht.iItem != -1) + { + NMLISTVIEW nmlv; + + memset(&nmlv, 0, sizeof(nmlv)); + nmlv.iItem = ht.iItem; + nmlv.ptAction = ht.pt; + + notify_listview(infoPtr, LVN_BEGINRDRAG, &nmlv); + } + } + else + { + SetFocus(infoPtr->hwndSelf); + + ht.pt.x = x; + ht.pt.y = y; + LISTVIEW_HitTest(infoPtr, &ht, TRUE, FALSE); + + if (notify_click(infoPtr, NM_RCLICK, &ht)) + { + /* Send a WM_CONTEXTMENU message in response to the WM_RBUTTONUP */ + SendMessageW(infoPtr->hwndSelf, WM_CONTEXTMENU, + (WPARAM)infoPtr->hwndSelf, (LPARAM)GetMessagePos()); + } } return 0; } - -/*** - * DESCRIPTION: - * Processes mouse up messages (right mouse button). - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] wKey : key flag - * [I] x,y : mouse coordinate - * - * RETURN: - * Zero - */ -static LRESULT LISTVIEW_RButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT y) -{ - LVHITTESTINFO lvHitTestInfo; - POINT pt; - - TRACE("(key=%hu,X=%u,Y=%u)\n", wKey, x, y); - - if (!infoPtr->bRButtonDown) return 0; - - /* set button flag */ - infoPtr->bRButtonDown = FALSE; - - /* Send NM_RCLICK notification */ - lvHitTestInfo.pt.x = x; - lvHitTestInfo.pt.y = y; - LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE); - if (!notify_click(infoPtr, NM_RCLICK, &lvHitTestInfo)) return 0; - - /* Change to screen coordinate for WM_CONTEXTMENU */ - pt = lvHitTestInfo.pt; - ClientToScreen(infoPtr->hwndSelf, &pt); - - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ - SendMessageW(infoPtr->hwndSelf, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwndSelf, MAKELPARAM(pt.x, pt.y)); - - return 0; -} - /*** * DESCRIPTION: @@ -10782,6 +10839,7 @@ static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedraw) { HFONT oldFont = infoPtr->hFont; + INT oldHeight = infoPtr->nItemHeight; TRACE("(hfont=%p,redraw=%hu)\n", hFont, fRedraw); @@ -10790,12 +10848,16 @@ LISTVIEW_SaveTextMetrics(infoPtr); + infoPtr->nItemHeight = LISTVIEW_CalculateItemHeight(infoPtr); + if (infoPtr->uView == LV_VIEW_DETAILS) { SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(fRedraw, 0)); LISTVIEW_UpdateSize(infoPtr); LISTVIEW_UpdateScroll(infoPtr); } + else if (infoPtr->nItemHeight != oldHeight) + LISTVIEW_UpdateScroll(infoPtr); if (fRedraw) LISTVIEW_InvalidateList(infoPtr); @@ -10973,7 +11035,6 @@ if (uNewView != uOldView) { - SIZE oldIconSize = infoPtr->iconSize; HIMAGELIST himl; SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0); @@ -10984,17 +11045,8 @@ himl = (uNewView == LVS_ICON ? infoPtr->himlNormal : infoPtr->himlSmall); set_icon_size(&infoPtr->iconSize, himl, uNewView != LVS_ICON); - - if (uNewView == LVS_ICON) - { - if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy)) - { - TRACE("icon old size=(%d,%d), new size=(%d,%d)\n", - oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy); - LISTVIEW_SetIconSpacing(infoPtr, 0, 0); - } - } - else if (uNewView == LVS_REPORT) + + if (uNewView == LVS_REPORT) { HDLAYOUT hl; WINDOWPOS wp; @@ -11425,7 +11477,9 @@ return LISTVIEW_SetHoverTime(infoPtr, (DWORD)lParam); case LVM_SETICONSPACING: - return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); + if(lParam == -1) + return LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + return LISTVIEW_SetIconSpacing(infoPtr, LOWORD(lParam), HIWORD(lParam)); case LVM_SETIMAGELIST: return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam); @@ -11587,9 +11641,6 @@ case WM_RBUTTONDOWN: return LISTVIEW_RButtonDown(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); - - case WM_RBUTTONUP: - return LISTVIEW_RButtonUp(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_SETCURSOR: return LISTVIEW_SetCursor(infoPtr, wParam, lParam); Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -1076,7 +1076,8 @@ /* months before first calendar month and after last calendar month */ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - INT mask, length, index; + INT mask, index; + UINT length; SYSTEMTIME st_max, st; if (infoPtr->dwStyle & MCS_NOTRAILINGDATES) return; @@ -1116,7 +1117,8 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - INT i, j, length; + INT i, j; + UINT length; RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -168,7 +168,7 @@ int index, int skipdir, HPROPSHEETPAGE hpage); -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo); +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo, int original_index); static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID); static BOOL PROPSHEET_RemovePage(HWND hwndDlg, int index, HPROPSHEETPAGE hpage); @@ -1998,9 +1998,8 @@ HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); TRACE("index %d, skipdir %d, hpage %p\n", index, skipdir, hpage); - /* hpage takes precedence over index */ - if (hpage != NULL) - index = PROPSHEET_GetPageIndex(hpage, psInfo); + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); if (index < 0 || index >= psInfo->nPages) { @@ -2331,13 +2330,8 @@ if (!psInfo) { return FALSE; } - /* - * hpage takes precedence over index. - */ - if (hpage != 0) - { - index = PROPSHEET_GetPageIndex(hpage, psInfo); - } + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); /* Make sure that index is within range */ if (index < 0 || index >= psInfo->nPages) @@ -2575,16 +2569,11 @@ */ static LRESULT PROPSHEET_PageToIndex(HWND hwndDlg, HPROPSHEETPAGE hPage) { - int index; PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %p)\n", hwndDlg, hPage); - for (index = 0; index < psInfo->nPages; index++) - if (psInfo->proppage[index].hpage == hPage) - return index; - WARN("%p not found\n", hPage); - return -1; + return PROPSHEET_GetPageIndex(hPage, psInfo, -1); } /****************************************************************************** @@ -2660,26 +2649,20 @@ * PROPSHEET_GetPageIndex * * Given a HPROPSHEETPAGE, returns the index of the corresponding page from - * the array of PropPageInfo. - */ -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo) -{ - BOOL found = FALSE; - int index = 0; - - TRACE("hpage %p\n", hpage); - while ((index < psInfo->nPages) && (found == FALSE)) - { - if (psInfo->proppage[index].hpage == hpage) - found = TRUE; - else - index++; - } - - if (found == FALSE) - index = -1; - - return index; + * the array of PropPageInfo. If page is not found original index is used + * (page takes precedence over index). + */ +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psInfo, int original_index) +{ + int index; + + TRACE("page %p index %d\n", page, original_index); + + for (index = 0; index < psInfo->nPages; index++) + if (psInfo->proppage[index].hpage == page) + return index; + + return original_index; } /****************************************************************************** Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -1123,7 +1123,7 @@ * or infoPtr->uNumBands if none */ static int next_visible(const REBAR_INFO *infoPtr, int i) { - int n; + unsigned int n; for (n = i + 1; n < infoPtr->uNumBands; n++) if (!HIDDENBAND(REBAR_GetBand(infoPtr, n))) break; Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/status.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -285,7 +285,6 @@ static LRESULT STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) { - int i; RECT rect; HBRUSH hbrBk; HFONT hOldFont; @@ -319,6 +318,8 @@ if (infoPtr->simple) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0); } else { + unsigned int i; + for (i = 0; i < infoPtr->numParts; i++) { STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i); } @@ -336,7 +337,8 @@ static int STATUSBAR_InternalHitTest(const STATUS_INFO *infoPtr, const POINT *pt) { - int i; + unsigned int i; + if (infoPtr->simple) return 255; @@ -352,7 +354,7 @@ { STATUSWINDOWPART *part; RECT rect, *r; - int i; + UINT i; /* get our window size */ GetClientRect (infoPtr->Self, &rect); @@ -883,7 +885,7 @@ static LRESULT STATUSBAR_WMDestroy (STATUS_INFO *infoPtr) { - int i; + unsigned int i; TRACE("\n"); for (i = 0; i < infoPtr->numParts; i++) { Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -5212,9 +5212,9 @@ if (infoPtr->himlInt) ImageList_Destroy (infoPtr->himlInt); - TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); - TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); - TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); + TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); + TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); + TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); /* delete default font */ DeleteObject (infoPtr->hDefaultFont); Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -991,9 +991,17 @@ if (nTool == -1) return -1; - if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) { - if (!TOOLTIPS_IsWindowActive (GetWindow (infoPtr->hwndSelf, GW_OWNER))) - return -1; + if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) + { + TTTOOL_INFO *ti = &infoPtr->tools[nTool]; + HWND hwnd = (ti->uFlags & TTF_IDISHWND) ? (HWND)ti->uId : ti->hwnd; + + if (!TOOLTIPS_IsWindowActive(hwnd)) + { + TRACE("not active: hwnd %p, parent %p, active %p\n", + hwnd, GetParent(hwnd), GetActiveWindow()); + return -1; + } } TRACE("tool %d\n", nTool); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -102,6 +102,7 @@ BOOL insertBeforeorAfter; /* flag used by TVM_SETINSERTMARK */ HIMAGELIST dragList; /* Bitmap of dragged item */ LONG scrollX; + INT wheelRemainder; COLORREF clrBk; COLORREF clrText; COLORREF clrLine; @@ -110,6 +111,7 @@ HFONT hDefaultFont; HFONT hBoldFont; HFONT hUnderlineFont; + HFONT hBoldUnderlineFont; HCURSOR hcurHand; HWND hwndToolTip; @@ -303,11 +305,22 @@ return CreateFontIndirectW(&font); } +static HFONT +TREEVIEW_CreateBoldUnderlineFont(HFONT hfont) +{ + LOGFONTW font; + + GetObjectW(hfont, sizeof(font), &font); + font.lfWeight = FW_BOLD; + font.lfUnderline = TRUE; + return CreateFontIndirectW(&font); +} + static inline HFONT TREEVIEW_FontForItem(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (item == infoPtr->hotItem)) - return infoPtr->hUnderlineFont; + return item->state & TVIS_BOLD ? infoPtr->hBoldUnderlineFont : infoPtr->hUnderlineFont; if (item->state & TVIS_BOLD) return infoPtr->hBoldFont; return infoPtr->hFont; @@ -1562,7 +1575,7 @@ newFirstVisible = item->prevSibling; else if (item->parent != infoPtr->root) newFirstVisible = item->parent; - TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); + TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); } else newFirstVisible = infoPtr->firstVisible; @@ -1903,8 +1916,10 @@ DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); + DeleteObject(infoPtr->hBoldUnderlineFont); infoPtr->hBoldFont = TREEVIEW_CreateBoldFont(infoPtr->hFont); infoPtr->hUnderlineFont = TREEVIEW_CreateUnderlineFont(infoPtr->hFont); + infoPtr->hBoldUnderlineFont = TREEVIEW_CreateBoldUnderlineFont(infoPtr->hFont); if (!infoPtr->bHeightSet) infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr); @@ -3155,10 +3170,10 @@ { int visOrder = infoPtr->firstVisible->visibleOrder; - if (parent == infoPtr->root) - TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); - else - TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); + if (parent == infoPtr->root) + TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); + else + TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); if (TREEVIEW_IsChildOf(parent, infoPtr->firstVisible)) { @@ -4916,7 +4931,7 @@ static LRESULT TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - short gcWheelDelta; + short wheelDelta; UINT pulScrollLines = 3; if (wParam & (MK_SHIFT | MK_CONTROL)) @@ -4927,13 +4942,25 @@ SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &pulScrollLines, 0); - gcWheelDelta = -(short)HIWORD(wParam); - pulScrollLines *= (gcWheelDelta / WHEEL_DELTA); - - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) - { - int newDy = infoPtr->firstVisible->visibleOrder + pulScrollLines; - int maxDy = infoPtr->maxVisibleOrder; + wheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && infoPtr->wheelRemainder < 0) || + (wheelDelta > 0 && infoPtr->wheelRemainder > 0)) + infoPtr->wheelRemainder += wheelDelta; + else + infoPtr->wheelRemainder = wheelDelta; + + if (infoPtr->wheelRemainder && pulScrollLines) + { + int newDy; + int maxDy; + int lineScroll; + + lineScroll = pulScrollLines * (float)infoPtr->wheelRemainder / WHEEL_DELTA; + infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / (int)pulScrollLines; + + newDy = infoPtr->firstVisible->visibleOrder - lineScroll; + maxDy = infoPtr->maxVisibleOrder; if (newDy > maxDy) newDy = maxDy; @@ -5038,6 +5065,7 @@ /* dragList */ infoPtr->scrollX = 0; + infoPtr->wheelRemainder = 0; infoPtr->clrBk = CLR_NONE; /* use system color */ infoPtr->clrText = CLR_NONE; /* use system color */ @@ -5064,6 +5092,7 @@ infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW(&lf); infoPtr->hBoldFont = TREEVIEW_CreateBoldFont(infoPtr->hFont); infoPtr->hUnderlineFont = TREEVIEW_CreateUnderlineFont(infoPtr->hFont); + infoPtr->hBoldUnderlineFont = TREEVIEW_CreateBoldUnderlineFont(infoPtr->hFont); infoPtr->hcurHand = LoadCursorW(NULL, (LPWSTR)IDC_HAND); infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr); @@ -5123,6 +5152,7 @@ DeleteObject(infoPtr->hDefaultFont); DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); + DeleteObject(infoPtr->hBoldUnderlineFont); Free(infoPtr); return 0; Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/updown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/updown.c [iso-8859-1] Sat Mar 16 17:06:48 2013 @@ -1026,10 +1026,10 @@ if (TRACE_ON(updown)) { - INT i; + UINT i; for (i = 0; i < wParam; i++) - TRACE("%d: nSec %u nInc %u\n", i, + TRACE("%u: nSec %u nInc %u\n", i, infoPtr->AccelVect[i].nSec, infoPtr->AccelVect[i].nInc); } 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] Sat Mar 16 17:06:48 2013 @@ -48,7 +48,7 @@ reactos/dll/win32/cabinet # Synced to Wine-1.5.19 reactos/dll/win32/clusapi # Synced to Wine-1.5.19 reactos/dll/win32/comcat # Synced to Wine-1.5.4 -reactos/dll/win32/comctl32 # Synced to Wine 1.5.19 +reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 reactos/dll/win32/compstui # Synced to Wine-1.5.19 reactos/dll/win32/credui # Synced to Wine-1.5.4

1 0

[hbelusca] 58520: [ADVAPI32-SERVICES] Put an event name into a macro (shared between advapi32.dll and services.exe) [BOOTDATA] Remove two reactos-specific and unused values in HKLM\SOFTWARE\Microso...
by hbelusca＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: hbelusca Date: Sat Mar 16 15:39:08 2013 New Revision: 58520 URL: http://svn.reactos.org/svn/reactos?rev=58520&view=rev Log: [ADVAPI32-SERVICES] Put an event name into a macro (shared between advapi32.dll and services.exe) [BOOTDATA] Remove two reactos-specific and unused values in HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon : StartLsass and StartServices. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/include/reactos/services/services.h Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat Mar 16 15:39:08 2013 @@ -1059,14 +1059,12 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret" -;Time Zone Servers +; Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","2",0x00000000,"asia.pool.ntp.org" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","3",0x00000000,"europe.pool.ntp.org" Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Mar 16 15:39:08 2013 @@ -1675,7 +1675,7 @@ /* Try to open the existing event */ hEvent = OpenEventW(SYNCHRONIZE, FALSE, - L"SvcctrlStartEvent_A3752DX"); + SCM_START_EVENT); if (hEvent == NULL) { if (GetLastError() != ERROR_FILE_NOT_FOUND) @@ -1685,13 +1685,13 @@ hEvent = CreateEventW(NULL, TRUE, FALSE, - L"SvcctrlStartEvent_A3752DX"); + SCM_START_EVENT); if (hEvent == NULL) { /* Try to open the existing event again */ hEvent = OpenEventW(SYNCHRONIZE, FALSE, - L"SvcctrlStartEvent_A3752DX"); + SCM_START_EVENT); if (hEvent == NULL) return; } Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s… ============================================================================== --- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Sat Mar 16 15:39:08 2013 @@ -19,6 +19,12 @@ /* Start a service that runs in its own process */ #define SERVICE_CONTROL_START_OWN 81 +/* + * Start event name used by OpenSCManager + * to know whether the SCM is initialized. + */ +#define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" + typedef struct _SCM_CONTROL_PACKET { DWORD dwSize;

1 0

[akhaldi] 58519: [PSDK] * Add some missing definitions.
by akhaldi＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: akhaldi Date: Sat Mar 16 15:25:15 2013 New Revision: 58519 URL: http://svn.reactos.org/svn/reactos?rev=58519&view=rev Log: [PSDK] * Add some missing definitions. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Mar 16 15:25:15 2013 @@ -656,6 +656,10 @@ #define HDN_ENDDRAG (HDN_FIRST-11) #define HDN_FILTERCHANGE (HDN_FIRST-12) #define HDN_FILTERBTNCLICK (HDN_FIRST-13) +#define HDN_BEGINFILTEREDIT (HDN_FIRST-14) +#define HDN_ENDFILTEREDIT (HDN_FIRST-15) +#define HDN_ITEMSTATEICONCLICK (HDN_FIRST-16) +#define HDN_ITEMKEYDOWN (HDN_FIRST-17) #define HDN_ITEMCHANGING __MINGW_NAME_AW(HDN_ITEMCHANGING) #define HDN_ITEMCHANGED __MINGW_NAME_AW(HDN_ITEMCHANGED)

1 0

[akhaldi] 58518: [GDI32_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 16 Mar '13

16 Mar '13

Author: akhaldi Date: Sat Mar 16 15:01:33 2013 New Revision: 58518 URL: http://svn.reactos.org/svn/reactos?rev=58518&view=rev Log: [GDI32_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/clipping.c trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/dib.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/gdiobj.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/wine_test.sfd trunk/rostests/winetests/gdi32/wine_test.ttf Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -1,7 +1,7 @@ add_definitions( -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__WINESRC__) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) @@ -22,9 +22,7 @@ pen.c testlist.c) -add_executable(gdi32_winetest - ${SOURCE} - resource.rc) +add_executable(gdi32_winetest ${SOURCE} resource.rc) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… ============================================================================== --- trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -339,16 +339,18 @@ ok(ret == 0, "%d != 0\n", ret); } -#define test_color(hdc, color, exp) \ -{ \ - COLORREF c; \ - c = SetPixel(hdc, 0, 0, color); \ - ok(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ - c = GetPixel(hdc, 0, 0); \ - ok(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ - c = GetNearestColor(hdc, color); \ - ok(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ +static void _test_color( int line, HDC hdc, COLORREF color, COLORREF exp ) +{ + COLORREF c; + c = SetPixel(hdc, 0, 0, color); + ok_(__FILE__, line)(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, exp); + c = GetPixel(hdc, 0, 0); + ok_(__FILE__, line)(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, exp); + c = GetNearestColor(hdc, color); + ok_(__FILE__, line)(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, exp); } +#define test_color(hdc, color, exp) _test_color( __LINE__, hdc, color, exp ) + static void test_dib_bits_access( HBITMAP hdib, void *bits ) { @@ -892,7 +894,7 @@ memset( data, 0xaa, sizeof(data) ); -#if 0 // FIXME: ReactOS Bug 6527 +#if 0 // FIXME: CORE-5922 for (bpp = 0; bpp <= 64; bpp++) { for (planes = 0; planes <= 64; planes++) @@ -1514,6 +1516,189 @@ DeleteObject(hbmp); DeleteDC(hdc); +} + +static COLORREF get_nearest( int r, int g, int b ) +{ + return (r*r + g*g + b*b < (255-r)*(255-r) + (255-g)*(255-g) + (255-b)*(255-b)) ? 0x000000 : 0xffffff; +} + +static int is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) +{ + if (fg == 0 || bg == 0xffffff) return RGB(r,g,b) != 0xffffff && RGB(r,g,b) != bg; + return RGB(r,g,b) == 0x000000 || RGB(r,g,b) == bg; +} + +static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, int b ) +{ + static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + BITMAPINFO *info; + RGBQUAD *colors; + WORD bits[16]; + void *bits_ptr; + COLORREF res; + HBRUSH old_brush; + HPEN old_pen; + HBITMAP bitmap; + HDC memdc; + + res = SetPixel( hdc, 0, 0, RGB(r,g,b) ); + ok( res == get_nearest( r, g, b ), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + res = GetPixel( hdc, 0, 0 ); + ok( res == get_nearest( r, g, b ), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + res = GetNearestColor( hdc, RGB(r,g,b) ); + ok( res == get_nearest( r, g, b ), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + + /* solid pen */ + old_pen = SelectObject( hdc, CreatePen( PS_SOLID, 1, RGB(r,g,b) )); + MoveToEx( hdc, 0, 0, NULL ); + LineTo( hdc, 16, 0 ); + res = GetPixel( hdc, 0, 0 ); + ok( res == (is_black_pen( fg, bg, r, g, b ) ? 0 : 0xffffff), + "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == (is_black_pen( fg, bg, r, g, b ) ? 0x00 : 0xffff), + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + DeleteObject( SelectObject( hdc, old_pen )); + + /* mono DDB pattern brush */ + bitmap = CreateBitmap( 16, 8, 1, 1, pattern_bits ); + old_brush = SelectObject( hdc, CreatePatternBrush( bitmap )); + PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + DeleteObject( SelectObject( hdc, old_brush )); + + /* mono DDB bitmap */ + memdc = CreateCompatibleDC( hdc ); + SelectObject( memdc, bitmap ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + SetTextColor( memdc, RGB(255,255,255) ); + SetBkColor( memdc, RGB(0,0,0) ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + /* mono DIB section */ + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); + colors = info->bmiColors; + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biHeight = -16; + info->bmiHeader.biWidth = 16; + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biCompression = BI_RGB; + colors[0].rgbRed = 0xff; + colors[0].rgbGreen = 0xff; + colors[0].rgbBlue = 0xf0; + colors[1].rgbRed = 0x20; + colors[1].rgbGreen = 0x0; + colors[1].rgbBlue = 0x0; + bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits_ptr, NULL, 0 ); + memset( bits_ptr, 0x55, 64 ); + DeleteObject( SelectObject( memdc, bitmap )); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + colors[0].rgbRed = 0x0; + colors[0].rgbGreen = 0x0; + colors[0].rgbBlue = 0x10; + colors[1].rgbRed = 0xff; + colors[1].rgbGreen = 0xf0; + colors[1].rgbBlue = 0xff; + bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits_ptr, NULL, 0 ); + memset( bits_ptr, 0x55, 64 ); + DeleteObject( SelectObject( memdc, bitmap )); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0xaaaa, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + SetTextColor( memdc, RGB(0,20,0) ); + SetBkColor( memdc, RGB(240,240,240) ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0x5555, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + + SetTextColor( memdc, RGB(250,250,250) ); + SetBkColor( memdc, RGB(10,10,10) ); + BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY ); + GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); + ok( bits[0] == 0xaaaa, + "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); + DeleteDC( memdc ); + DeleteObject( bitmap ); + HeapFree( GetProcessHeap(), 0, info ); +} + +static void test_mono_bitmap(void) +{ + static const COLORREF colors[][2] = + { + { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff) }, + { RGB(0xff,0xff,0xff), RGB(0x00,0x00,0x00) }, + { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xfe) }, + { RGB(0x00,0x01,0x00), RGB(0xff,0xff,0xff) }, + { RGB(0x00,0x00,0x00), RGB(0x80,0x80,0x80) }, + { RGB(0x80,0x80,0x80), RGB(0xff,0xff,0xff) }, + { RGB(0x30,0x40,0x50), RGB(0x60,0x70,0x80) }, + { RGB(0xa0,0xa0,0xa0), RGB(0x20,0x30,0x10) }, + { PALETTEINDEX(0), PALETTEINDEX(255) }, + { PALETTEINDEX(1), PALETTEINDEX(2) }, + }; + + HBITMAP hbmp; + HDC hdc; + DWORD col; + int i, r, g, b; + + if (!winetest_interactive) + { + skip("test_mono_bitmap skipped, CORE-5922\n"); + return; + } + + hdc = CreateCompatibleDC(0); + assert(hdc != 0); + + hbmp = CreateBitmap(16, 16, 1, 1, NULL); + assert(hbmp != NULL); + + SelectObject( hdc, hbmp ); + + for (col = 0; col < sizeof(colors) / sizeof(colors[0]); col++) + { + SetTextColor( hdc, colors[col][0] ); + SetBkColor( hdc, colors[col][1] ); + + for (i = 0; i < 256; i++) + { + HPALETTE pal = GetCurrentObject( hdc, OBJ_PAL ); + PALETTEENTRY ent; + + if (!GetPaletteEntries( pal, i, 1, &ent )) GetPaletteEntries( pal, 0, 1, &ent ); + test_color( hdc, PALETTEINDEX(i), get_nearest( ent.peRed, ent.peGreen, ent.peBlue )); + test_color( hdc, DIBINDEX(i), (i == 1) ? 0xffffff : 0x000000 ); + } + for (r = 0; r < 256; r += 15) + for (g = 0; g < 256; g += 15) + for (b = 0; b < 256; b += 15) + test_bitmap_colors( hdc, colors[col][0], colors[col][1], r, g, b ); + } + + DeleteDC(hdc); + DeleteObject(hbmp); } static void test_bmBits(void) @@ -3176,12 +3361,13 @@ dwRop, expected, *dstBuffer, line); } -static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, +static INT check_StretchDIBits_stretch( HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, UINT32 expected[4], int line) { BITMAPINFO bitmapInfo; + INT ret; memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3192,9 +3378,9 @@ bitmapInfo.bmiHeader.biCompression = BI_RGB; memset(dstBuffer, 0, 16); - StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, - nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, - srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); + ret = StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); ok(memcmp(dstBuffer, expected, 16) == 0, "StretchDIBits expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X } " "stretching { %d, %d, %d, %d } to { %d, %d, %d, %d } from line %d\n", @@ -3202,6 +3388,7 @@ dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3], nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, line); + return ret; } static void test_StretchDIBits(void) @@ -3213,6 +3400,7 @@ HBRUSH hBrush, hOldBrush; BITMAPINFO biDst; UINT32 expected[4]; + INT ret; memset(&biDst, 0, sizeof(BITMAPINFO)); biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3258,43 +3446,63 @@ expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; expected[2] = 0xFEDCBA98, expected[3] = 0x76543210; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0xCAFED00D, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); + todo_wine ok( ret == 1, "got ret %d\n", ret ); expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98; expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0x42441000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0xCAFED00D; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 2, 2, 4, 4, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + -4, -4, 4, 4, 0, 0, 4, 4, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); @@ -3323,7 +3531,6 @@ HDC hdcNull; HDC hdcDst; HBITMAP bmpDst; - HBITMAP oldDst; BITMAPINFO *bmi; HDC hdcSrc; HBITMAP bmpSrc; @@ -3353,7 +3560,7 @@ bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); - oldDst = SelectObject(hdcDst, bmpDst); + SelectObject(hdcDst, bmpDst); oldSrc = SelectObject(hdcSrc, bmpSrc); blend.BlendOp = AC_SRC_OVER; @@ -3399,6 +3606,7 @@ SetViewportExtEx(hdcDst, -1, -1, NULL); SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend); + todo_wine ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend); @@ -3535,15 +3743,13 @@ ok( !ret, "GdiAlphaBlend succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); - SelectObject(hdcDst, oldDst); - SelectObject(hdcSrc, oldSrc); + DeleteDC(hdcDst); + DeleteDC(hdcSrc); DeleteObject(bmpSrc); DeleteObject(bmpDst); - DeleteDC(hdcDst); - DeleteDC(hdcSrc); ReleaseDC(NULL, hdcNull); - + HeapFree(GetProcessHeap(), 0, bmi); } static void test_GdiGradientFill(void) @@ -3656,6 +3862,7 @@ DeleteDC( hdc ); DeleteObject( bmp ); + HeapFree(GetProcessHeap(), 0, bmi); } static void test_clipping(void) @@ -5388,6 +5595,7 @@ test_dib_formats(); test_mono_dibsection(); test_bitmap(); + test_mono_bitmap(); test_bmBits(); test_GetDIBits_selected_DIB(1); test_GetDIBits_selected_DIB(4); Modified: trunk/rostests/winetests/gdi32/clipping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/clipping.… ============================================================================== --- trunk/rostests/winetests/gdi32/clipping.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/clipping.c [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -401,6 +401,14 @@ ok(rc.left == 0 && rc.top == 0 && rc.right == 100 && rc.bottom == 100, "expected 0,0-100,100, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + SetRect( &rc, 10, 10, 20, 20 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + + SetRect( &rc, 20, 20, 10, 10 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + DeleteDC(hdc); DeleteObject(hrgn); DeleteObject(hrgn_empty); @@ -446,6 +454,14 @@ "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, rc.left, rc.top, rc.right, rc.bottom); + SetRect( &rc, 10, 10, 20, 20 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + + SetRect( &rc, 20, 20, 10, 10 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "expected SIMPLEREGION, got %d\n", ret); Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… ============================================================================== --- trunk/rostests/winetests/gdi32/dc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dc.c [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -19,7 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #define WINVER 0x0501 /* request latest DEVMODE */ +#define NONAMELESSSTRUCT +#define NONAMELESSUNION #include <assert.h> #include <stdio.h> @@ -30,6 +33,10 @@ #include "winuser.h" #include "winspool.h" #include "winerror.h" + +#ifndef LAYOUT_LTR +#define LAYOUT_LTR 0 +#endif static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); @@ -58,6 +65,7 @@ { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; + int extra; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -86,6 +94,18 @@ color = GetTextColor( hdc ); ok( color == 0, "wrong color %08x\n", color ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 0, "initial extra %d\n", extra ); + SetTextCharacterExtra( hdc, 123 ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + SetMapMode( hdc, MM_LOMETRIC ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + SetMapMode( hdc, MM_TEXT ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + DeleteDC( hdc ); } @@ -124,10 +144,7 @@ rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); ret = SaveDC(hdc); -todo_wine -{ ok(ret == 1, "ret = %d\n", ret); -} ret = IntersectClipRect(hdc, 0, 0, 50, 50); if (ret == COMPLEXREGION) @@ -298,7 +315,7 @@ HeapFree(GetProcessHeap(), 0, dmW); } -static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) +static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale ) { static const int caps[] = { @@ -374,27 +391,59 @@ else { for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) - ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), - "mismatched caps on %s for %u: %u/%u\n", descr, caps[i], - GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); + { + INT precision = 0; + INT hdc_caps = GetDeviceCaps( hdc, caps[i] ); + + switch (caps[i]) + { + case HORZSIZE: + case VERTSIZE: + hdc_caps /= scale; + precision = 1; + break; + case LOGPIXELSX: + case LOGPIXELSY: + hdc_caps *= scale; + break; + } + + ok( abs(hdc_caps - GetDeviceCaps( ref_dc, caps[i] )) <= precision, + "mismatched caps on %s for %u: %u/%u (scale %d)\n", descr, caps[i], + hdc_caps, GetDeviceCaps( ref_dc, caps[i] ), scale ); + } SetLastError( 0xdeadbeef ); ret = GetDeviceGammaRamp( hdc, &ramp ); - ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); + if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + { + ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ + "wrong error %u on %s\n", GetLastError(), descr ); + } + else + ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); type = GetClipBox( hdc, &rect ); if (GetObjectType( hdc ) == OBJ_ENHMETADC) todo_wine ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); else ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + type = GetBoundsRect( hdc, &rect, 0 ); + ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, + "GetBoundsRect returned type %x for %s\n", type, descr ); + if (type == DCB_RESET) + ok( rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0, + "GetBoundsRect returned %d,%d,%d,%d type %x for %s\n", + rect.left, rect.top, rect.right, rect.bottom, type, descr ); type = SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); - ok( type == (DCB_RESET | DCB_DISABLE), "SetBoundsRect returned %x\n", type ); + ok( type == (DCB_RESET | DCB_DISABLE) || broken(type == (DCB_SET | DCB_ENABLE)) /* XP */, + "SetBoundsRect returned %x for %s (hdc type %d)\n", type, descr, GetObjectType( hdc ) ); + SetMapMode( hdc, MM_TEXT ); Rectangle( hdc, 2, 2, 4, 4 ); type = GetBoundsRect( hdc, &rect, DCB_RESET ); - if (GetObjectType( hdc ) == OBJ_ENHMETADC) + if (GetObjectType( hdc ) == OBJ_ENHMETADC || (GetObjectType( hdc ) == OBJ_DC && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER)) todo_wine ok( rect.left == 2 && rect.top == 2 && rect.right == 4 && rect.bottom == 4 && type == DCB_SET, "GetBoundsRect returned %d,%d,%d,%d type %x for %s\n", @@ -406,7 +455,7 @@ } type = GetClipBox( ref_dc, &rect ); - if (type != COMPLEXREGION) /* region can be complex on multi-monitor setups */ + if (type != COMPLEXREGION && type != ERROR) /* region can be complex on multi-monitor setups */ { ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); ok( rect.left == 0 && rect.top == 0 && @@ -470,6 +519,10 @@ SelectObject( hdc, old ); DeleteObject( dib ); } + + /* restore hdc state */ + SetBoundsRect( hdc, NULL, DCB_RESET | DCB_DISABLE ); + SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE ); } static void test_CreateCompatibleDC(void) @@ -478,9 +531,21 @@ HDC hdc, hNewDC, hdcMetafile, screen_dc; HBITMAP bitmap; INT caps; + DEVMODE dm; + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + + bRet = EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(bRet, "EnumDisplaySettingsEx failed\n"); + dm.u1.s1.dmScale = 200; + dm.dmFields |= DM_SCALE; + hdc = CreateDC( "DISPLAY", NULL, NULL, &dm ); screen_dc = CreateDC( "DISPLAY", NULL, NULL, NULL ); - bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + test_device_caps( hdc, screen_dc, "display dc", 1 ); + ResetDC( hdc, &dm ); + test_device_caps( hdc, screen_dc, "display dc", 1 ); + DeleteDC( hdc ); /* Create a DC compatible with the screen */ hdc = CreateCompatibleDC(NULL); @@ -489,7 +554,7 @@ caps = GetDeviceCaps( hdc, TECHNOLOGY ); ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); - test_device_caps( hdc, screen_dc, "display dc" ); + test_device_caps( hdc, screen_dc, "display dc", 1 ); /* Delete this DC, this should succeed */ bRet = DeleteDC(hdc); @@ -507,7 +572,9 @@ ok( SelectObject( hNewDC, bitmap ) != 0, "SelectObject failed\n" ); caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); - test_device_caps( hdcMetafile, hdc, "enhmetafile dc" ); + test_device_caps( hdcMetafile, hdc, "enhmetafile dc", 1 ); + ResetDC( hdcMetafile, &dm ); + test_device_caps( hdcMetafile, hdc, "enhmetafile dc", 1 ); DeleteDC( hNewDC ); DeleteEnhMetaFile( CloseEnhMetaFile( hdcMetafile )); ReleaseDC( 0, hdc ); @@ -518,7 +585,9 @@ ok(hNewDC == NULL, "CreateCompatibleDC succeeded\n"); caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_METAFILE, "wrong caps %u\n", caps ); - test_device_caps( hdcMetafile, screen_dc, "metafile dc" ); + test_device_caps( hdcMetafile, screen_dc, "metafile dc", 1 ); + ResetDC( hdcMetafile, &dm ); + test_device_caps( hdcMetafile, screen_dc, "metafile dc", 1 ); DeleteMetaFile( CloseMetaFile( hdcMetafile )); DeleteObject( bitmap ); @@ -1139,7 +1208,17 @@ ReleaseDC(NULL, hdc); } -static HDC create_printer_dc(void) +static BOOL is_postscript_printer(HDC hdc) +{ + char tech[256]; + + if (ExtEscape(hdc, GETTECHNOLOGY, 0, NULL, sizeof(tech), tech) > 0) + return strcmp(tech, "PostScript") == 0; + + return FALSE; +} + +static HDC create_printer_dc(int scale, BOOL reset) { char buffer[260]; DWORD len; @@ -1175,9 +1254,15 @@ dbuf = HeapAlloc( GetProcessHeap(), 0, len ); if (!pGetPrinterDriverA( hprn, NULL, 3, (LPBYTE)dbuf, len, &len )) goto done; + pbuf->pDevMode->u1.s1.dmScale = scale; + pbuf->pDevMode->dmFields |= DM_SCALE; + hdc = CreateDCA( dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode ); - trace( "hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, - dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName ); + trace( "hdc %p for driver '%s' printer '%s' port '%s' is %sPostScript\n", hdc, + dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, + is_postscript_printer(hdc) ? "" : "NOT " ); + + if (reset) ResetDC( hdc, pbuf->pDevMode ); done: HeapFree( GetProcessHeap(), 0, dbuf ); HeapFree( GetProcessHeap(), 0, pbuf ); @@ -1192,9 +1277,19 @@ HDC memdc, display_memdc, enhmf_dc; HBITMAP orig, bmp; DWORD ret; - HDC hdc = create_printer_dc(); - - if (!hdc) return; + HDC hdc, hdc_200; + + hdc = create_printer_dc(100, FALSE); + hdc_200 = create_printer_dc(200, FALSE); + + if (!hdc || !hdc_200) return; + + test_device_caps( hdc, hdc_200, "printer dc", is_postscript_printer(hdc) ? 2 : 1 ); + DeleteDC( hdc_200 ); + + hdc_200 = create_printer_dc(200, TRUE); + test_device_caps( hdc, hdc_200, "printer dc", is_postscript_printer(hdc) ? 2 : 1 ); + DeleteDC( hdc_200 ); memdc = CreateCompatibleDC( hdc ); display_memdc = CreateCompatibleDC( 0 ); @@ -1216,7 +1311,7 @@ ok( orig != NULL, "SelectObject failed\n" ); ok( BitBlt( hdc, 10, 10, 20, 20, memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" ); - test_device_caps( memdc, hdc, "printer dc" ); + test_device_caps( memdc, hdc, "printer dc", 1 ); ok( !SelectObject( display_memdc, bmp ), "SelectObject succeeded\n" ); SelectObject( memdc, orig ); @@ -1235,7 +1330,12 @@ enhmf_dc = CreateEnhMetaFileA( hdc, NULL, NULL, NULL ); ok(enhmf_dc != 0, "CreateEnhMetaFileA failed\n"); - test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc" ); + test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc", 1 ); + DeleteEnhMetaFile( CloseEnhMetaFile( enhmf_dc )); + + enhmf_dc = CreateEnhMetaFileA( hdc, NULL, NULL, NULL ); + ok(enhmf_dc != 0, "CreateEnhMetaFileA failed\n"); + test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc", 1 ); DeleteEnhMetaFile( CloseEnhMetaFile( enhmf_dc )); DeleteDC( memdc ); Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -1312,6 +1312,7 @@ if(current_sha1[i] == NULL) { ok(current_sha1[i] != NULL, "missing hash, got \"%s\",\n", hash); + HeapFree(GetProcessHeap(), 0, hash); return; } } @@ -1908,6 +1909,7 @@ DeleteObject(bmp); SelectObject(hdc, orig_brush); + DeleteObject( dib_brush ); SetBrushOrgEx(hdc, 0, 0, NULL); SetTextColor(hdc, old_text); SetBkColor(hdc, old_bkgnd); @@ -2660,7 +2662,6 @@ SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); - DeleteObject(dib_brush); DeleteObject(solid_brush); DeleteObject(wide_pen); DeleteObject(dashed_pen); Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -45,6 +45,8 @@ static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); +static BOOL (WINAPI *pGetTextExtentExPointI)(HDC hdc, const WORD *indices, INT count, INT max_ext, + LPINT nfit, LPINT dxs, LPSIZE size ); static BOOL (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *); static HFONT (WINAPI *pCreateFontIndirectExA)(const ENUMLOGFONTEXDV *); static HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *); @@ -54,6 +56,7 @@ static HMODULE hgdi32 = 0; static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; +static WORD system_lang_id; static void init(void) { @@ -68,12 +71,15 @@ pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); + pGetTextExtentExPointI = (void *)GetProcAddress(hgdi32, "GetTextExtentExPointI"); pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo"); pCreateFontIndirectExA = (void *)GetProcAddress(hgdi32, "CreateFontIndirectExA"); pAddFontMemResourceEx = (void *)GetProcAddress(hgdi32, "AddFontMemResourceEx"); pRemoveFontMemResourceEx = (void *)GetProcAddress(hgdi32, "RemoveFontMemResourceEx"); pAddFontResourceExA = (void *)GetProcAddress(hgdi32, "AddFontResourceExA"); pRemoveFontResourceExA = (void *)GetProcAddress(hgdi32, "RemoveFontResourceExA"); + + system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) @@ -680,6 +686,11 @@ return 1; /* continue enumeration */ } +static BOOL is_CJK(void) +{ + return (system_lang_id == LANG_CHINESE || system_lang_id == LANG_JAPANESE || system_lang_id == LANG_KOREAN); +} + #define FH_SCALE 0x80000000 static void test_bitmap_font_metrics(void) { @@ -694,15 +705,15 @@ int scaled_height; } fd[] = { - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 }, - { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 }, + { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 16 }, { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 13, 3, 3, 0, 7, 14, 120, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 }, @@ -786,32 +797,32 @@ { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 14, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 17, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0, 0, 0, 0, FS_ARABIC }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC }, @@ -828,7 +839,7 @@ { "Fixedsys", FW_NORMAL, 15, 12, 3, 3, 0, 8, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 }, { "Fixedsys", FW_NORMAL, 16, 12, 4, 3, 0, 8, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC }, - { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, 96, 0, 0, 0, 0, FS_JISJAPAN }, + { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, 96, 0x20, 0xff, 0xa0, 0x20, FS_JISJAPAN }, { "Fixedsys", FW_NORMAL, 20, 16, 4, 2, 0, 10, 10, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC } @@ -840,11 +851,9 @@ HFONT hfont, old_hfont; TEXTMETRIC tm; INT ret, i, expected_cs, screen_log_pixels, diff, font_res; - WORD system_lang_id; char face_name[LF_FACESIZE]; CHARSETINFO csi; - system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); trace("system language id %04x\n", system_lang_id); expected_cs = GetACP(); @@ -888,6 +897,7 @@ for(bit = 0; bit < 32; bit++) { + GLYPHMETRICS gm; DWORD fs[2]; BOOL bRet; @@ -916,15 +926,10 @@ hfont = create_font(lf.lfFaceName, &lf); old_hfont = SelectObject(hdc, hfont); - bRet = GetTextMetrics(hdc, &tm); - ok(bRet, "GetTextMetrics error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetTextFace(hdc, sizeof(face_name), face_name); ok(ret, "GetTextFace error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = GetTextCharset(hdc); if (lstrcmp(face_name, fd[i].face_name) != 0) { @@ -936,7 +941,23 @@ continue; } - ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); + memset(&gm, 0, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutline(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + todo_wine { + ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); + ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); + } + + bRet = GetTextMetrics(hdc, &tm); + ok(bRet, "GetTextMetrics error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetTextCharset(hdc); + if (is_CJK() && lf.lfCharSet == ANSI_CHARSET) + ok(ret == ANSI_CHARSET, "got charset %d, expected ANSI_CHARSETd\n", ret); + else + ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX); trace("expected %s, height %d scaled_hight %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi); @@ -1288,20 +1309,20 @@ fit1 = fit2 = -215; ret = GetTextExtentExPointA(hdc, "One", 3, -1, &fit1, NULL, &sz); ok(ret == TRUE, "got %d\n", ret); - todo_wine ok(fit1 == 3, "fit = %d\n", fit1); + ok(fit1 == 3, "fit = %d\n", fit1); ret = GetTextExtentExPointW(hdc, wt, 3, -1, &fit2, NULL, &sz); ok(ret == TRUE, "got %d\n", ret); - todo_wine ok(fit2 == 3, "fit = %d\n", fit2); + ok(fit2 == 3, "fit = %d\n", fit2); /* max_extent = -2 is interpreted similarly, but the Ansi version * rejects it while the Unicode one accepts it */ fit1 = fit2 = -215; ret = GetTextExtentExPointA(hdc, "One", 3, -2, &fit1, NULL, &sz); - todo_wine ok(ret == FALSE, "got %d\n", ret); - todo_wine ok(fit1 == -215, "fit = %d\n", fit1); + ok(ret == FALSE, "got %d\n", ret); + ok(fit1 == -215, "fit = %d\n", fit1); ret = GetTextExtentExPointW(hdc, wt, 3, -2, &fit2, NULL, &sz); ok(ret == TRUE, "got %d\n", ret); - todo_wine ok(fit2 == 3, "fit = %d\n", fit2); + ok(fit2 == 3, "fit = %d\n", fit2); hfont = SelectObject(hdc, hfont); DeleteObject(hfont); @@ -1747,18 +1768,17 @@ { INT y, breakCount, - justifiedWidth = 0, /* to test GetTextExtentExPointW() */ areaWidth = clientArea->right - clientArea->left, nErrors = 0, e; - BOOL lastExtent = FALSE; PSTR pFirstChar, pLastChar; SIZE size; TEXTMETRICA tm; struct err { - char extent[100]; + char *start; + int len; int GetTextExtentExPointWWidth; - } error[10]; + } error[20]; GetTextMetricsA(hdc, &tm); y = clientArea->top; @@ -1797,18 +1817,16 @@ { SetTextJustification(hdc, areaWidth - size.cx, breakCount); GetTextExtentPoint32(hdc, pFirstChar, pLastChar - pFirstChar, &size); - justifiedWidth = size.cx; + if (size.cx != areaWidth && nErrors < sizeof(error)/sizeof(error[0]) - 1) + { + error[nErrors].start = pFirstChar; + error[nErrors].len = pLastChar - pFirstChar; + error[nErrors].GetTextExtentExPointWWidth = size.cx; + nErrors++; + } } - else lastExtent = TRUE; - - /* catch errors and report them */ - if (!lastExtent && (justifiedWidth != areaWidth)) - { - memset(error[nErrors].extent, 0, 100); - memcpy(error[nErrors].extent, pFirstChar, pLastChar - pFirstChar); - error[nErrors].GetTextExtentExPointWWidth = justifiedWidth; - nErrors++; - } + + trace( "%u %.*s\n", size.cx, (int)(pLastChar - pFirstChar), pFirstChar); y += size.cy; str = pLastChar; @@ -1819,8 +1837,8 @@ /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ ok(error[e].GetTextExtentExPointWWidth == areaWidth, - "GetTextExtentPointW() for \"%s\" should have returned a width of %d, not %d.\n", - error[e].extent, areaWidth, error[e].GetTextExtentExPointWWidth); + "GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", + error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); } } @@ -1831,6 +1849,9 @@ LOGFONTA lf; HFONT hfont; HWND hwnd; + SIZE size, expect; + int i; + WORD indices[2]; static char testText[] = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do " "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut " @@ -1856,6 +1877,74 @@ testJustification(hdc, testText, &clientArea); + if (!pGetGlyphIndicesA || !pGetTextExtentExPointI) goto done; + pGetGlyphIndicesA( hdc, "A ", 2, indices, 0 ); + + SetTextJustification(hdc, 0, 0); + GetTextExtentPoint32(hdc, " ", 1, &expect); + GetTextExtentPoint32(hdc, " ", 3, &size); + ok( size.cx == 3 * expect.cx, "wrong size %d/%d\n", size.cx, expect.cx ); + SetTextJustification(hdc, 4, 1); + GetTextExtentPoint32(hdc, " ", 1, &size); + ok( size.cx == expect.cx + 4, "wrong size %d/%d\n", size.cx, expect.cx ); + SetTextJustification(hdc, 9, 2); + GetTextExtentPoint32(hdc, " ", 2, &size); + ok( size.cx == 2 * expect.cx + 9, "wrong size %d/%d\n", size.cx, expect.cx ); + SetTextJustification(hdc, 7, 3); + GetTextExtentPoint32(hdc, " ", 3, &size); + ok( size.cx == 3 * expect.cx + 7, "wrong size %d/%d\n", size.cx, expect.cx ); + SetTextJustification(hdc, 7, 3); + SetTextCharacterExtra(hdc, 2 ); + GetTextExtentPoint32(hdc, " ", 3, &size); + ok( size.cx == 3 * (expect.cx + 2) + 7, "wrong size %d/%d\n", size.cx, expect.cx ); + SetTextJustification(hdc, 0, 0); + SetTextCharacterExtra(hdc, 0); + size.cx = size.cy = 1234; + GetTextExtentPoint32(hdc, " ", 0, &size); + ok( size.cx == 0 && size.cy == 0, "wrong size %d,%d\n", size.cx, size.cy ); + pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &expect); + SetTextJustification(hdc, 5, 1); + pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &size); + ok( size.cx == expect.cx + 5, "wrong size %d/%d\n", size.cx, expect.cx ); + SetTextJustification(hdc, 0, 0); + + SetMapMode( hdc, MM_ANISOTROPIC ); + SetWindowExtEx( hdc, 2, 2, NULL ); + GetClientRect( hwnd, &clientArea ); + DPtoLP( hdc, (POINT *)&clientArea, 2 ); + testJustification(hdc, testText, &clientArea); + + GetTextExtentPoint32(hdc, "A", 1, &expect); + for (i = 0; i < 10; i++) + { + SetTextCharacterExtra(hdc, i); + GetTextExtentPoint32(hdc, "A", 1, &size); + ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i ); + } + SetTextCharacterExtra(hdc, 0); + pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &expect); + for (i = 0; i < 10; i++) + { + SetTextCharacterExtra(hdc, i); + pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &size); + ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i ); + } + SetTextCharacterExtra(hdc, 0); + + SetViewportExtEx( hdc, 3, 3, NULL ); + GetClientRect( hwnd, &clientArea ); + DPtoLP( hdc, (POINT *)&clientArea, 2 ); + testJustification(hdc, testText, &clientArea); + + GetTextExtentPoint32(hdc, "A", 1, &expect); + for (i = 0; i < 10; i++) + { + SetTextCharacterExtra(hdc, i); + GetTextExtentPoint32(hdc, "A", 1, &size); + ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i ); + } + +done: DeleteObject(hfont); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -2006,6 +2095,90 @@ skip("Symbol or Wingdings is not installed\n"); } +static void test_GdiGetCodePage(void) +{ + static const struct _matching_data + { + UINT current_codepage; + LPCSTR lfFaceName; + UCHAR lfCharSet; + UINT expected_codepage; + } matching_data[] = { + {1251, "Arial", ANSI_CHARSET, 1252}, + {1251, "Tahoma", ANSI_CHARSET, 1252}, + + {1252, "Arial", ANSI_CHARSET, 1252}, + {1252, "Tahoma", ANSI_CHARSET, 1252}, + + {1253, "Arial", ANSI_CHARSET, 1252}, + {1253, "Tahoma", ANSI_CHARSET, 1252}, + + { 932, "Arial", ANSI_CHARSET, 1252}, /* Japanese Windows returns 1252, not 932 */ + { 932, "Tahoma", ANSI_CHARSET, 1252}, + { 932, "MS UI Gothic", ANSI_CHARSET, 1252}, + + { 936, "Arial", ANSI_CHARSET, 936}, + { 936, "Tahoma", ANSI_CHARSET, 936}, + { 936, "Simsun", ANSI_CHARSET, 936}, + + { 949, "Arial", ANSI_CHARSET, 949}, + { 949, "Tahoma", ANSI_CHARSET, 949}, + { 949, "Gulim", ANSI_CHARSET, 949}, + + { 950, "Arial", ANSI_CHARSET, 950}, + { 950, "Tahoma", ANSI_CHARSET, 950}, + { 950, "PMingLiU", ANSI_CHARSET, 950}, + }; + HDC hdc; + LOGFONT lf; + HFONT hfont; + UINT charset, acp; + DWORD codepage; + int i; + + if (!pGdiGetCodePage) + { + skip("GdiGetCodePage not available on this platform\n"); + return; + } + + acp = GetACP(); + + for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++) + { + /* only test data matched current locale codepage */ + if (matching_data[i].current_codepage != acp) + continue; + + if (!is_font_installed(matching_data[i].lfFaceName)) + { + skip("%s is not installed\n", matching_data[i].lfFaceName); + continue; + } + + hdc = GetDC(0); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -16; + lf.lfCharSet = matching_data[i].lfCharSet; + lstrcpyA(lf.lfFaceName, matching_data[i].lfFaceName); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d, expected codepage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage, matching_data[i].expected_codepage); + ok(codepage == matching_data[i].expected_codepage, + "GdiGetCodePage should have returned %d, got %d\n", matching_data[i].expected_codepage, codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + } +} + static void test_GetFontUnicodeRanges(void) { LOGFONTA lf; @@ -2057,6 +2230,12 @@ { int total; LOGFONT lf[MAX_ENUM_FONTS]; +}; + +struct enum_fullname_data +{ + int total; + ENUMLOGFONT elf[MAX_ENUM_FONTS]; }; struct enum_font_dataW @@ -2389,6 +2568,20 @@ return 1; } +static INT CALLBACK enum_fullname_data_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; + + if (type != TRUETYPE_FONTTYPE) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + static void test_EnumFontFamiliesEx_default_charset(void) { struct enum_font_data efd; @@ -2416,7 +2609,7 @@ } trace("'%s' has %d charsets.\n", gui_font.lfFaceName, efd.total); - ok(efd.lf[0].lfCharSet == gui_font.lfCharSet, + ok(efd.lf[0].lfCharSet == gui_font.lfCharSet || broken(system_lang_id == LANG_ARABIC), "(%s) got charset %d expected %d\n", efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet); @@ -2760,11 +2953,15 @@ } #define TT_PLATFORM_MICROSOFT 3 +#define TT_MS_ID_SYMBOL_CS 0 #define TT_MS_ID_UNICODE_CS 1 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 +#define TT_NAME_ID_FONT_FAMILY 1 +#define TT_NAME_ID_FONT_SUBFAMILY 2 +#define TT_NAME_ID_UNIQUE_ID 3 #define TT_NAME_ID_FULL_NAME 4 -static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, char *out_buf, SIZE_T out_size) +static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_T out_size, LCID language_id) { struct sfnt_name_header { @@ -2820,8 +3017,8 @@ for (i = 0; i < header->number_of_record; i++) { if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT || - GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS || - GET_BE_WORD(entry[i].language_id) != TT_MS_LANGID_ENGLISH_UNITED_STATES || + (GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS && GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_SYMBOL_CS) || + GET_BE_WORD(entry[i].language_id) != language_id || GET_BE_WORD(entry[i].name_id) != name_id) { continue; @@ -3451,6 +3648,38 @@ DeleteDC(hdc); } +static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, + const TEXTMETRIC *lpntme, + DWORD FontType, LPARAM lParam) +{ + const NEWTEXTMETRICEX *lpntmex = (const NEWTEXTMETRICEX *)lpntme; + CHARSETINFO csi; + LOGFONT lf = *lpelfe; + HFONT hfont; + + /* skip bitmap, proportional or vertical font */ + if ((FontType & TRUETYPE_FONTTYPE) == 0 || + (lf.lfPitchAndFamily & 0xf) != FIXED_PITCH || + lf.lfFaceName[0] == '@') + return 1; + + /* skip linked font */ + if (!TranslateCharsetInfo((DWORD*)(INT_PTR)lpelfe->lfCharSet, &csi, TCI_SRCCHARSET) || + (lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0) + return 1; + + /* test with an odd height */ + lf.lfHeight = -19; + lf.lfWidth = 0; + hfont = CreateFontIndirect(&lf); + if (hfont) + { + *(HFONT *)lParam = hfont; + return 0; + } + return 1; +} + static void test_GetGlyphOutline(void) { HDC hdc; @@ -3539,6 +3768,8 @@ for (i = 0; i < sizeof c / sizeof c[0]; ++i) { + static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}}; + lf.lfFaceName[0] = '\0'; lf.lfCharSet = c[i].cs; lf.lfPitchAndFamily = 0; @@ -3568,6 +3799,60 @@ /* expected to match wide-char version results */ ret2 = GetGlyphOutlineW(hdc, c[i].w, GGO_BITMAP, &gm2, 0, NULL, &mat); ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); + + if (EnumFontFamiliesEx(hdc, &lf, create_fixed_pitch_font_proc, (LPARAM)&hfont, 0)) + { + skip("Fixed-pitch TrueType font for charset %u is not available\n", c[i].cs); + continue; + } + DeleteObject(SelectObject(hdc, hfont)); + if (c[i].a <= 0xff) + { + DeleteObject(SelectObject(hdc, old_hfont)); + continue; + } + + ret = GetObject(hfont, sizeof lf, &lf); + ok(ret > 0, "GetObject error %u\n", GetLastError()); + + ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + trace("Tests with height=%d,half=%d,full=%d,face=%s,charset=%d\n", + -lf.lfHeight, gm.gmCellIncX, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + "expected %d, got %d (%s:%d)\n", + gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &rotate_mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncY == -lf.lfHeight, + "expected %d, got %d (%s:%d)\n", + -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet); + + lf.lfItalic = TRUE; + hfont = CreateFontIndirect(&lf); + ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); + DeleteObject(SelectObject(hdc, hfont)); + ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + "expected %d, got %d (%s:%d)\n", + gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + + lf.lfItalic = FALSE; + lf.lfEscapement = lf.lfOrientation = 2700; + hfont = CreateFontIndirect(&lf); + ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); + DeleteObject(SelectObject(hdc, hfont)); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncY == -lf.lfHeight, + "expected %d, got %d (%s:%d)\n", + -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet); hfont = SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -3980,11 +4265,13 @@ static void test_fullname(void) { static const char *TestName[] = {"Lucida Sans Demibold Roman", "Lucida Sans Italic", "Lucida Sans Regular"}; - char buf[LF_FULLFACESIZE]; + WCHAR bufW[LF_FULLFACESIZE]; + char bufA[LF_FULLFACESIZE]; HFONT hfont, of; LOGFONTA lf; HDC hdc; int i; + DWORD ret; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4011,14 +4298,196 @@ ok(hfont != 0, "CreateFontIndirectA failed\n"); of = SelectObject(hdc, hfont); - buf[0] = 0; - ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)), - "face full name could not be read\n"); - ok(!lstrcmpA(buf, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], buf); + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, sizeof(bufW), TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "face full name could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, sizeof(bufA), NULL, FALSE); + ok(!lstrcmpA(bufA, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], bufA); SelectObject(hdc, of); DeleteObject(hfont); } DeleteDC(hdc); +} + +static WCHAR *prepend_at(WCHAR *family) +{ + if (!family) + return NULL; + + memmove(family + 1, family, (lstrlenW(family) + 1) * sizeof(WCHAR)); + family[0] = '@'; + return family; +} + +static void test_fullname2_helper(const char *Family) +{ + char *FamilyName, *FaceName, *StyleName, *otmStr; + struct enum_fullname_data efnd; + WCHAR *bufW; + char *bufA; + HFONT hfont, of; + LOGFONTA lf; + HDC hdc; + int i; + DWORD otm_size, ret, buf_size; + OUTLINETEXTMETRICA *otm; + BOOL want_vertical, get_vertical; + want_vertical = ( Family[0] == '@' ); + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfHeight = 16; + lf.lfWidth = 16; + lf.lfQuality = DEFAULT_QUALITY; + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + lstrcpy(lf.lfFaceName, Family); + efnd.total = 0; + EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + if (efnd.total == 0) + skip("%s is not installed\n", lf.lfFaceName); + + for (i = 0; i < efnd.total; i++) + { + FamilyName = (char *)efnd.elf[i].elfLogFont.lfFaceName; + FaceName = (char *)efnd.elf[i].elfFullName; + StyleName = (char *)efnd.elf[i].elfStyle; + + trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName); + + get_vertical = ( FamilyName[0] == '@' ); + ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName); + + lstrcpyA(lf.lfFaceName, FaceName); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA failed\n"); + + of = SelectObject(hdc, hfont); + buf_size = GetFontData(hdc, MS_NAME_TAG, 0, NULL, 0); + ok(buf_size != GDI_ERROR, "no name table found\n"); + if (buf_size == GDI_ERROR) continue; + + bufW = HeapAlloc(GetProcessHeap(), 0, buf_size); + bufA = HeapAlloc(GetProcessHeap(), 0, buf_size); + + otm_size = GetOutlineTextMetricsA(hdc, 0, NULL); + otm = HeapAlloc(GetProcessHeap(), 0, otm_size); + memset(otm, 0, otm_size); + ret = GetOutlineTextMetrics(hdc, otm_size, otm); + ok(ret != 0, "GetOutlineTextMetrics fails!\n"); + if (ret == 0) continue; + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized FONT_FAMILY found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } + ok(ret, "FAMILY (family name) could not be read\n"); + if (want_vertical) bufW = prepend_at(bufW); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFamilyName; + ok(!lstrcmpA(FamilyName, otmStr), "FamilyName %s doesn't match otmpFamilyName %s\n", FamilyName, otmStr); + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized FULL_NAME found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } + ok(ret, "FULL_NAME (face name) could not be read\n"); + if (want_vertical) bufW = prepend_at(bufW); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; + ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized FONT_SUBFAMILY found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } + ok(ret, "SUBFAMILY (style name) could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName; + ok(!lstrcmpA(StyleName, otmStr), "StyleName %s doesn't match otmpStyleName %s\n", StyleName, otmStr); + + bufW[0] = 0; + bufA[0] = 0; + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized UNIQUE_ID found.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } + ok(ret, "UNIQUE_ID (full name) could not be read\n"); + WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); + otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; + ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + + SelectObject(hdc, of); + DeleteObject(hfont); + + HeapFree(GetProcessHeap(), 0, otm); + HeapFree(GetProcessHeap(), 0, bufW); + HeapFree(GetProcessHeap(), 0, bufA); + } + DeleteDC(hdc); +} + +static void test_fullname2(void) +{ + test_fullname2_helper("Arial"); + test_fullname2_helper("DejaVu Sans"); + test_fullname2_helper("Lucida Sans"); + test_fullname2_helper("Tahoma"); + test_fullname2_helper("Webdings"); + test_fullname2_helper("Wingdings"); + test_fullname2_helper("SimSun"); + test_fullname2_helper("NSimSun"); + test_fullname2_helper("MingLiu"); + test_fullname2_helper("PMingLiu"); + test_fullname2_helper("WenQuanYi Micro Hei"); + test_fullname2_helper("MS UI Gothic"); + test_fullname2_helper("Ume UI Gothic"); + test_fullname2_helper("MS Gothic"); + test_fullname2_helper("Ume Gothic"); + test_fullname2_helper("MS PGothic"); + test_fullname2_helper("Ume P Gothic"); + test_fullname2_helper("Gulim"); + test_fullname2_helper("Batang"); + test_fullname2_helper("UnBatang"); + test_fullname2_helper("UnDotum"); + test_fullname2_helper("@SimSun"); + test_fullname2_helper("@NSimSun"); + test_fullname2_helper("@MingLiu"); + test_fullname2_helper("@PMingLiu"); + test_fullname2_helper("@WenQuanYi Micro Hei"); + test_fullname2_helper("@MS UI Gothic"); + test_fullname2_helper("@Ume UI Gothic"); + test_fullname2_helper("@MS Gothic"); + test_fullname2_helper("@Ume Gothic"); + test_fullname2_helper("@MS PGothic"); + test_fullname2_helper("@Ume P Gothic"); + test_fullname2_helper("@Gulim"); + test_fullname2_helper("@Batang"); + test_fullname2_helper("@UnBatang"); + test_fullname2_helper("@UnDotum"); + } static BOOL write_ttf_file(const char *fontname, char *tmp_name) @@ -4063,6 +4532,46 @@ return ret; } +static void test_GetGlyphOutline_empty_contour(void) +{ + HDC hdc; + LOGFONTA lf; + HFONT hfont, hfont_prev; + TTPOLYGONHEADER *header; + GLYPHMETRICS gm; + char buf[1024]; + DWORD ret; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, 0, NULL, &mat); + ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret); + + header = (TTPOLYGONHEADER*)buf; + ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, sizeof(buf), buf, &mat); + ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret); + ok(header->cb == 36, "header->cb = %d, expected 36\n", header->cb); + ok(header->dwType == TT_POLYGON_TYPE, "header->dwType = %d, expected TT_POLYGON_TYPE\n", header->dwType); + header = (TTPOLYGONHEADER*)((char*)header+header->cb); + ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb); + header = (TTPOLYGONHEADER*)((char*)header+header->cb); + ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_CreateScalableFontResource(void) { char ttf_name[MAX_PATH]; @@ -4070,6 +4579,7 @@ char fot_name[MAX_PATH]; char *file_part; DWORD ret; + int i; if (!pAddFontResourceExA || !pRemoveFontResourceExA) { @@ -4126,7 +4636,6 @@ ok(ret, "DeleteFile() error %d\n", GetLastError()); ret = pRemoveFontResourceExA(fot_name, 0, 0); -todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); /* test public font resource */ @@ -4144,8 +4653,9 @@ ret = is_truetype_font_installed("wine_test"); ok(ret, "font wine_test should be enumerated\n"); + test_GetGlyphOutline_empty_contour(); + ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); -todo_wine ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); SetLastError(0xdeadbeef); @@ -4153,21 +4663,27 @@ ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); -todo_wine ok(!ret, "font wine_test should not be enumerated\n"); - - /* FIXME: since RemoveFontResource is a stub correct testing is impossible */ - if (ret) - { - /* remove once RemoveFontResource is implemented */ - DeleteFile(fot_name); - DeleteFile(ttf_name); - return; - } ret = pRemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); + /* test refcounting */ + for (i = 0; i < 5; i++) + { + SetLastError(0xdeadbeef); + ret = pAddFontResourceExA(fot_name, 0, 0); + ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); + } + for (i = 0; i < 5; i++) + { + SetLastError(0xdeadbeef); + ret = pRemoveFontResourceExA(fot_name, 0, 0); + ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); + } + ret = pRemoveFontResourceExA(fot_name, 0, 0); + ok(!ret, "RemoveFontResourceEx() should fail\n"); + DeleteFile(fot_name); /* test hidden font resource */ @@ -4183,6 +4699,7 @@ ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); + todo_wine ok(!ret, "font wine_test should not be enumerated\n"); /* XP allows removing a private font added with 0 flags */ @@ -4353,10 +4870,139 @@ ReleaseDC(NULL, hdc); } +static int get_font_dpi(const LOGFONT *lf) +{ + HDC hdc = CreateCompatibleDC(0); + HFONT hfont; + TEXTMETRIC tm; + int ret; + + hfont = CreateFontIndirect(lf); + ok(hfont != 0, "CreateFontIndirect failed\n"); + + SelectObject(hdc, hfont); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics failed\n"); + ret = tm.tmDigitizedAspectX; + + DeleteDC(hdc); + DeleteObject(hfont); + + return ret; +} + +static void test_stock_fonts(void) +{ + static const int font[] = + { + ANSI_FIXED_FONT, ANSI_VAR_FONT, SYSTEM_FONT, DEVICE_DEFAULT_FONT, DEFAULT_GUI_FONT + /* SYSTEM_FIXED_FONT, OEM_FIXED_FONT */ + }; + static const struct test_data + { + int charset, weight, height, dpi; + const char face_name[LF_FACESIZE]; + } td[][11] = + { + { /* ANSI_FIXED_FONT */ + { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "Courier" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "Courier" }, + { 0 } + }, + { /* ANSI_VAR_FONT */ + { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "MS Sans Serif" }, + { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "MS Sans Serif" }, + { 0 } + }, + { /* SYSTEM_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { 0 } + }, + { /* DEVICE_DEFAULT_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" }, + { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" }, + { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" }, + { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" }, + { 0 } + }, + { /* DEFAULT_GUI_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, -12, 96, "?MS UI Gothic" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -15, 120, "?MS UI Gothic" }, + { HANGEUL_CHARSET, FW_NORMAL, -12, 96, "?Gulim" }, + { HANGEUL_CHARSET, FW_NORMAL, -15, 120, "?Gulim" }, + { GB2312_CHARSET, FW_NORMAL, -12, 96, "?SimHei" }, + { GB2312_CHARSET, FW_NORMAL, -15, 120, "?SimHei" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 96, "?MingLiU" }, + { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 120, "?MingLiU" }, + { DEFAULT_CHARSET, FW_NORMAL, -11, 96, "MS Shell Dlg" }, + { DEFAULT_CHARSET, FW_NORMAL, -13, 120, "MS Shell Dlg" }, + { 0 } + } + }; + int i, j; + + for (i = 0; i < sizeof(font)/sizeof(font[0]); i++) + { + HFONT hfont; + LOGFONT lf; + int ret; + + hfont = GetStockObject(font[i]); + ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, font[i]); + + ret = GetObject(hfont, sizeof(lf), &lf); + if (ret != sizeof(lf)) + { + /* NT4 */ + win_skip("%d: GetObject returned %d instead of sizeof(LOGFONT)\n", i, ret); + continue; + } + + for (j = 0; td[i][j].face_name[0] != 0; j++) + { + if (lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) + { + continue; + } + + ret = get_font_dpi(&lf); + if (ret != td[i][j].dpi) + { + trace("%d(%d): font %s %d dpi doesn't match test data %d\n", + i, j, lf.lfFaceName, ret, td[i][j].dpi); + continue; + } + + ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); + ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight); + if (td[i][j].face_name[0] == '?') + { + /* Wine doesn't have this font, skip this case for now. + Actually, the face name is localized on Windows and varies + dpending on Windows versions (e.g. Japanese NT4 vs win2k). */ + trace("%d(%d): default gui font is %s\n", i, j, lf.lfFaceName); + } + else + { + ok(!lstrcmp(td[i][j].face_name, lf.lfFaceName), "%d(%d): expected lfFaceName %s, got %s\n", i, j, td[i][j].face_name, lf.lfFaceName); + } + break; + } + } +} + START_TEST(font) { init(); + test_stock_fonts(); test_logfont(); test_bitmap_font(); test_outline_font(); @@ -4369,6 +5015,7 @@ test_GetOutlineTextMetrics(); test_SetTextJustification(); test_font_charset(); + test_GdiGetCodePage(); test_GetFontUnicodeRanges(); test_nonexistent_font(); test_orientation(); @@ -4405,6 +5052,7 @@ test_CreateFontIndirectEx(); test_oemcharset(); test_fullname(); + test_fullname2(); test_east_asian_font_selection(); /* These tests should be last test until RemoveFontResource Modified: trunk/rostests/winetests/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdiobj.c?… ============================================================================== --- trunk/rostests/winetests/gdi32/gdiobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/gdiobj.c [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -319,10 +319,54 @@ DeleteObject(hrgn); } +static void test_handles_on_win64(void) +{ + int i; + BOOL ret; + DWORD type; + HRGN hrgn, hrgn_test; + + static const struct + { + ULONG high; + ULONG low; + BOOL ret; + } cases[] = + { + { 0x00000000, 0x00000000, TRUE }, + { 0x00000000, 0x0000ffe0, FALSE }, /* just over MAX_LARGE_HANDLES */ + { 0x00000000, 0x0000ffb0, FALSE }, /* just under MAX_LARGE_HANDLES */ + { 0xffffffff, 0xffff0000, FALSE }, + { 0xffffffff, 0x00000000, TRUE }, + { 0xdeadbeef, 0x00000000, TRUE }, + { 0xcccccccc, 0xcccccccc, FALSE } + }; + + if (sizeof(void*) != 8) + return; + + for (i = 0; i < sizeof(cases)/sizeof(cases[0]); i++) + { + hrgn = CreateRectRgn(10, 10, 20, 20); + hrgn_test = (HRGN)(ULONG_PTR)((ULONG_PTR)hrgn | ((ULONGLONG)cases[i].high << 32) | cases[i].low); + type = GetObjectType( hrgn_test ); + if (cases[i].ret) + ok( type == OBJ_REGION, "wrong type %u\n", type ); + else + ok( type == 0, "wrong type %u\n", type ); + ret = DeleteObject(hrgn_test); + ok( cases[i].ret == ret, "DeleteObject should return %s (%p)\n", + cases[i].ret ? "TRUE" : "FALSE", hrgn_test); + /* actually free it if above is expected to fail */ + if (!ret) DeleteObject(hrgn); + } +} + START_TEST(gdiobj) { test_gdi_objects(); test_thread_objects(); test_GetCurrentObject(); test_region(); -} + test_handles_on_win64(); +} Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -58,6 +58,20 @@ GDI_GET_PROC(SetRelAbs); GDI_GET_PROC(SetDCBrushColor); GDI_GET_PROC(SetDCPenColor); +} + +static DWORD rgn_rect_count(HRGN hrgn) +{ + DWORD size; + RGNDATA *data; + + if (!hrgn) return 0; + if (!(size = GetRegionData(hrgn, 0, NULL))) return 0; + if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + GetRegionData(hrgn, size, data); + size = data->rdh.nCount; + HeapFree(GetProcessHeap(), 0, data); + return size; } static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, @@ -2483,19 +2497,183 @@ SetRect(&rc_sclip, 100, 100, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); hrgn = CreateRectRgn(rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom); SelectClipRgn(hdc, hrgn); + SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); -todo_wine ok(ret == SIMPLEREGION, "got %d\n", ret); - if(ret == SIMPLEREGION) - ok(EqualRect(&rc_res, &rc_sclip), - "expected rc_res (%d, %d) - (%d, %d), got (%d, %d) - (%d, %d)\n", - rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, - rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + ok(EqualRect(&rc_res, &rc_sclip), + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + OffsetRect(&rc_sclip, -100, -100); + ret = OffsetClipRgn(hdc, -100, -100); + ok(ret == SIMPLEREGION, "got %d\n", ret); + SetRect(&rc_res, -1, -1, -1, -1); + ret = GetClipBox(hdc, &rc_res); + ok(ret == SIMPLEREGION, "got %d\n", ret); + ok(EqualRect(&rc_res, &rc_sclip), + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + ret = IntersectClipRect(hdc, 0, 0, 100, 100); + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); + if (ret == COMPLEXREGION) + { + /* XP returns COMPLEXREGION although region contains only 1 rect */ + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = rgn_rect_count(hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + } + SetRect(&rc_res, -1, -1, -1, -1); + ret = GetClipBox(hdc, &rc_res); + ok(ret == SIMPLEREGION, "got %d\n", ret); + ok(EqualRect(&rc_res, &rc), + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + SetRect(&rc_sclip, 0, 0, 100, 50); + ret = ExcludeClipRect(hdc, 0, 50, 100, 100); + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); + if (ret == COMPLEXREGION) + { + /* XP returns COMPLEXREGION although region contains only 1 rect */ + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = rgn_rect_count(hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + } + SetRect(&rc_res, -1, -1, -1, -1); + ret = GetClipBox(hdc, &rc_res); + ok(ret == SIMPLEREGION, "got %d\n", ret); + ok(EqualRect(&rc_res, &rc_sclip), + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); hemf = CloseEnhMetaFile(hdc); DeleteEnhMetaFile(hemf); DeleteObject(hrgn); - DeleteDC(hdc); +} + +static const unsigned char MF_CLIP_BITS[] = { + /* METAHEADER */ + 0x01, 0x00, /* mtType */ + 0x09, 0x00, /* mtHeaderSize */ + 0x00, 0x03, /* mtVersion */ + 0x32, 0x00, 0x00, 0x00, /* mtSize */ + 0x01, 0x00, /* mtNoObjects */ + 0x14, 0x00, 0x00, 0x00, /* mtMaxRecord (size in words of longest record) */ + 0x00, 0x00, /* reserved */ + + /* METARECORD for CreateRectRgn(0x11, 0x22, 0x33, 0x44) */ + 0x14, 0x00, 0x00, 0x00, /* rdSize in words */ + 0xff, 0x06, /* META_CREATEREGION */ + 0x00, 0x00, 0x06, 0x00, 0xf6, 0x02, 0x00, 0x00, + 0x24, 0x00, 0x01, 0x00, 0x02, 0x00, 0x11, 0x00, + 0x22, 0x00, 0x33, 0x00, 0x44, 0x00, 0x02, 0x00, + 0x22, 0x00, 0x44, 0x00, 0x11, 0x00, 0x33, 0x00, + 0x02, 0x00, + + /* METARECORD for SelectObject */ + 0x04, 0x00, 0x00, 0x00, + 0x2d, 0x01, /* META_SELECTOBJECT (not META_SELECTCLIPREGION?!) */ + 0x00, 0x00, + + /* METARECORD */ + 0x04, 0x00, 0x00, 0x00, + 0xf0, 0x01, /* META_DELETEOBJECT */ + 0x00, 0x00, + + /* METARECORD for MoveTo(1,0x30) */ + 0x05, 0x00, 0x00, 0x00, /* rdSize in words */ + 0x14, 0x02, /* META_MOVETO */ + 0x30, 0x00, /* y */ + 0x01, 0x00, /* x */ + + /* METARECORD for LineTo(0x20, 0x30) */ + 0x05, 0x00, 0x00, 0x00, /* rdSize in words */ + 0x13, 0x02, /* META_LINETO */ + 0x30, 0x00, /* y */ + 0x20, 0x00, /* x */ + + /* EOF */ + 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00 +}; + +static int clip_mf_enum_proc_seen_selectclipregion; +static int clip_mf_enum_proc_seen_selectobject; + +static int CALLBACK clip_mf_enum_proc(HDC hdc, HANDLETABLE *handle_table, + METARECORD *mr, int n_objs, LPARAM param) +{ + switch (mr->rdFunction) { + case META_SELECTCLIPREGION: + clip_mf_enum_proc_seen_selectclipregion++; + break; + case META_SELECTOBJECT: + clip_mf_enum_proc_seen_selectobject++; + break; + } + return 1; +} + +static void test_mf_clipping(void) +{ + /* left top right bottom */ + static RECT rc_clip = { 0x11, 0x22, 0x33, 0x44 }; + HWND hwnd; + HDC hdc; + HMETAFILE hmf; + HRGN hrgn; + INT ret; + + SetLastError(0xdeadbeef); + hdc = CreateMetaFileA(NULL); + ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); + + hrgn = CreateRectRgn(rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); + ret = SelectClipRgn(hdc, hrgn); + /* Seems like it should be SIMPLEREGION, but windows returns NULLREGION? */ + ok(ret == NULLREGION, "expected NULLREGION, got %d\n", ret); + + /* Draw a line that starts off left of the clip region and ends inside it */ + MoveToEx(hdc, 0x1, 0x30, NULL); + LineTo(hdc, 0x20, 0x30); + + SetLastError(0xdeadbeef); + hmf = CloseMetaFile(hdc); + ok(hmf != 0, "CloseMetaFile error %d\n", GetLastError()); + + if (compare_mf_bits(hmf, MF_CLIP_BITS, sizeof(MF_CLIP_BITS), + "mf_clipping") != 0) + { + dump_mf_bits(hmf, "mf_clipping"); + } + + DeleteObject(hrgn); + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA error %d\n", GetLastError()); + + hdc = GetDC(hwnd); + + ret = EnumMetaFile(hdc, hmf, clip_mf_enum_proc, (LPARAM)&rc_clip); + ok(ret, "EnumMetaFile error %d\n", GetLastError()); + + /* Oddly, windows doesn't seem to use META_SELECTCLIPREGION */ + ok(clip_mf_enum_proc_seen_selectclipregion == 0, + "expected 0 selectclipregion, saw %d\n", clip_mf_enum_proc_seen_selectclipregion); + ok(clip_mf_enum_proc_seen_selectobject == 1, + "expected 1 selectobject, saw %d\n", clip_mf_enum_proc_seen_selectobject); + + DeleteMetaFile(hmf); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); } static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData) @@ -3211,6 +3389,9 @@ test_SaveDC(); test_emf_BitBlt(); test_emf_DCBrush(); + test_emf_ExtTextOut_on_path(); + test_emf_clipping(); + test_emf_polybezier(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -3221,9 +3402,7 @@ test_CopyMetaFile(); test_SetMetaFileBits(); test_mf_ExtTextOut_on_path(); - test_emf_ExtTextOut_on_path(); - test_emf_clipping(); - test_emf_polybezier(); + test_mf_clipping(); /* For metafile conversions */ test_mf_conversions(); Modified: trunk/rostests/winetests/gdi32/wine_test.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test… ============================================================================== --- trunk/rostests/winetests/gdi32/wine_test.sfd [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/wine_test.sfd [iso-8859-1] Sat Mar 16 15:01:33 2013 @@ -20,7 +20,7 @@ OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1288336343 -ModificationTime: 1288336873 +ModificationTime: 1352483620 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -86,7 +86,7 @@ AntiAlias: 1 FitToEm: 1 WinInfo: 65 65 19 -BeginChars: 65539 4 +BeginChars: 65539 5 StartChar: .notdef Encoding: 65536 -1 0 @@ -176,5 +176,30 @@ Flags: W LayerCount: 2 EndChar + +StartChar: dieresis +Encoding: 168 168 0 +Width: 1000 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +620.215 824.429 m 1,0,1 + 760.84 777.554 760.84 777.554 713.965 636.929 c 1,2,-1 + 620.215 824.429 l 1,0,1 +154.883 324.971 m 0,3,-1 +254.492 773.213 m 1,4,5 + 310.707 834.805 310.707 834.805 374.609 767.354 c 1,6,7 + 410.471 728.672 410.471 728.672 374.609 691.182 c 0,8,9 + 308.375 621.934 308.375 621.934 254.492 688.252 c 0,10,11 + 216.406 735.127 216.406 735.127 254.492 773.213 c 1,4,5 +254.492 773.213 m 1,12,13 + 216.406 735.127 216.406 735.127 254.492 688.252 c 0,14,15 + 308.375 621.934 308.375 621.934 374.609 691.182 c 0,16,17 + 410.471 728.672 410.471 728.672 374.609 767.354 c 1,18,19 + 310.707 834.805 310.707 834.805 254.492 773.213 c 1,12,13 +EndSplineSet +EndChar EndChars EndSplineFont Modified: trunk/rostests/winetests/gdi32/wine_test.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test… ============================================================================== Binary files - no diff available.

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