Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 33866: - Update many parts of CRT, and misc cleanup. - Largely based on the patch by Samuel Serapion. - Include file.c from Wine's msvcrt, but exclude its contents from the build process for now.
by fireball＠svn.reactos.org 06 Jun '08

06 Jun '08

Author: fireball Date: Fri Jun 6 12:49:24 2008 New Revision: 33866 URL: http://svn.reactos.org/svn/reactos?rev=33866&view=rev Log: - Update many parts of CRT, and misc cleanup. - Largely based on the patch by Samuel Serapion. - Include file.c from Wine's msvcrt, but exclude its contents from the build process for now. Added: trunk/reactos/lib/sdk/crt/io/creat.c - copied, changed from r33863, trunk/reactos/lib/sdk/crt/io/create.c trunk/reactos/lib/sdk/crt/io/wcreat.c - copied, changed from r33863, trunk/reactos/lib/sdk/crt/io/wcreate.c trunk/reactos/lib/sdk/crt/stdio/file.c (with props) Removed: trunk/reactos/dll/win32/msvcrt/stubs.c trunk/reactos/lib/sdk/crt/include/internal/debug.h trunk/reactos/lib/sdk/crt/io/create.c trunk/reactos/lib/sdk/crt/io/wcreate.c Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/crtdll/dllmain.c trunk/reactos/dll/win32/msvcrt/dllmain.c trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/direct/chdrive.c trunk/reactos/lib/sdk/crt/direct/getdcwd.c trunk/reactos/lib/sdk/crt/except/matherr.c trunk/reactos/lib/sdk/crt/except/xcptfil.c trunk/reactos/lib/sdk/crt/float/fpreset.c trunk/reactos/lib/sdk/crt/float/i386/clearfp.c trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c trunk/reactos/lib/sdk/crt/float/i386/statfp.c trunk/reactos/lib/sdk/crt/float/nafter.c trunk/reactos/lib/sdk/crt/include/float.h trunk/reactos/lib/sdk/crt/include/internal/mbstring.h trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h trunk/reactos/lib/sdk/crt/io/access.c trunk/reactos/lib/sdk/crt/io/chmod.c trunk/reactos/lib/sdk/crt/io/chsize.c trunk/reactos/lib/sdk/crt/io/close.c trunk/reactos/lib/sdk/crt/io/isatty.c trunk/reactos/lib/sdk/crt/io/mktemp.c trunk/reactos/lib/sdk/crt/io/open.c trunk/reactos/lib/sdk/crt/io/pipe.c trunk/reactos/lib/sdk/crt/io/read.c trunk/reactos/lib/sdk/crt/io/setmode.c trunk/reactos/lib/sdk/crt/io/sopen.c trunk/reactos/lib/sdk/crt/io/unlink.c trunk/reactos/lib/sdk/crt/io/wmktemp.c trunk/reactos/lib/sdk/crt/io/wopen.c trunk/reactos/lib/sdk/crt/io/write.c trunk/reactos/lib/sdk/crt/io/wunlink.c trunk/reactos/lib/sdk/crt/locale/locale.c trunk/reactos/lib/sdk/crt/math/stubs.c trunk/reactos/lib/sdk/crt/mbstring/ischira.c trunk/reactos/lib/sdk/crt/mbstring/iskana.c trunk/reactos/lib/sdk/crt/mbstring/iskmoji.c trunk/reactos/lib/sdk/crt/mbstring/iskpun.c trunk/reactos/lib/sdk/crt/mbstring/islead.c trunk/reactos/lib/sdk/crt/mbstring/islwr.c trunk/reactos/lib/sdk/crt/mbstring/ismbaln.c trunk/reactos/lib/sdk/crt/mbstring/ismbc.c trunk/reactos/lib/sdk/crt/mbstring/ismbkaln.c trunk/reactos/lib/sdk/crt/mbstring/ismblead.c trunk/reactos/lib/sdk/crt/mbstring/ismbpun.c trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c trunk/reactos/lib/sdk/crt/mbstring/isuppr.c trunk/reactos/lib/sdk/crt/mbstring/jistojms.c trunk/reactos/lib/sdk/crt/mbstring/mbscspn.c trunk/reactos/lib/sdk/crt/mbstring/mbsicmp.c trunk/reactos/lib/sdk/crt/mbstring/mbslwr.c trunk/reactos/lib/sdk/crt/mbstring/mbsncat.c trunk/reactos/lib/sdk/crt/mbstring/mbsnextc.c trunk/reactos/lib/sdk/crt/mbstring/mbsnicoll.c trunk/reactos/lib/sdk/crt/mbstring/mbsspn.c trunk/reactos/lib/sdk/crt/mbstring/mbsspnp.c trunk/reactos/lib/sdk/crt/mbstring/mbsupr.c trunk/reactos/lib/sdk/crt/misc/crtmain.c trunk/reactos/lib/sdk/crt/misc/environ.c trunk/reactos/lib/sdk/crt/misc/getargs.c trunk/reactos/lib/sdk/crt/misc/lock.c trunk/reactos/lib/sdk/crt/misc/stubs.c trunk/reactos/lib/sdk/crt/precomp.h trunk/reactos/lib/sdk/crt/process/_system.c trunk/reactos/lib/sdk/crt/process/process.c trunk/reactos/lib/sdk/crt/process/thread.c trunk/reactos/lib/sdk/crt/stdio/fwrite.c trunk/reactos/lib/sdk/crt/stdio/popen.c trunk/reactos/lib/sdk/crt/stdio/remove.c trunk/reactos/lib/sdk/crt/stdlib/errno.c trunk/reactos/lib/sdk/crt/stdlib/getenv.c trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c trunk/reactos/lib/sdk/crt/stdlib/mbtowc.c trunk/reactos/lib/sdk/crt/stdlib/putenv.c trunk/reactos/lib/sdk/crt/stdlib/senv.c trunk/reactos/lib/sdk/crt/stdlib/wputenv.c trunk/reactos/lib/sdk/crt/string/scanf.c trunk/reactos/lib/sdk/crt/string/wcstom.c trunk/reactos/lib/sdk/crt/string/wctomb.c trunk/reactos/lib/sdk/crt/sys_stat/fstati64.c trunk/reactos/lib/sdk/crt/sys_stat/stat.c trunk/reactos/lib/sdk/crt/time/ctime.c trunk/reactos/lib/sdk/crt/wine/heap.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… Modified: trunk/reactos/dll/win32/crtdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/dllmain.c… Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/dllmain.c… Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… Removed: trunk/reactos/dll/win32/msvcrt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/stubs.c?r… Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… Modified: trunk/reactos/lib/sdk/crt/direct/chdrive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/direct/chdrive… Modified: trunk/reactos/lib/sdk/crt/direct/getdcwd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/direct/getdcwd… Modified: trunk/reactos/lib/sdk/crt/except/matherr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/matherr… Modified: trunk/reactos/lib/sdk/crt/except/xcptfil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/xcptfil… Modified: trunk/reactos/lib/sdk/crt/float/fpreset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpreset.… Modified: trunk/reactos/lib/sdk/crt/float/i386/clearfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cle… Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cnt… Modified: trunk/reactos/lib/sdk/crt/float/i386/statfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/sta… Modified: trunk/reactos/lib/sdk/crt/float/nafter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/nafter.c… Modified: trunk/reactos/lib/sdk/crt/include/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/float.… Removed: trunk/reactos/lib/sdk/crt/include/internal/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… Modified: trunk/reactos/lib/sdk/crt/include/internal/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… Modified: trunk/reactos/lib/sdk/crt/io/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/access.c?re… Modified: trunk/reactos/lib/sdk/crt/io/chmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/chmod.c?rev… Modified: trunk/reactos/lib/sdk/crt/io/chsize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/chsize.c?re… Modified: trunk/reactos/lib/sdk/crt/io/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/close.c?rev… Copied: trunk/reactos/lib/sdk/crt/io/creat.c (from r33863, trunk/reactos/lib/sdk/crt/io/create.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/creat.c?p2=… Removed: trunk/reactos/lib/sdk/crt/io/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/create.c?re… Modified: trunk/reactos/lib/sdk/crt/io/isatty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/isatty.c?re… Modified: trunk/reactos/lib/sdk/crt/io/mktemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/mktemp.c?re… Modified: trunk/reactos/lib/sdk/crt/io/open.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/open.c?rev=… Modified: trunk/reactos/lib/sdk/crt/io/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/pipe.c?rev=… Modified: trunk/reactos/lib/sdk/crt/io/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/read.c?rev=… Modified: trunk/reactos/lib/sdk/crt/io/setmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/setmode.c?r… Modified: trunk/reactos/lib/sdk/crt/io/sopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/sopen.c?rev… Modified: trunk/reactos/lib/sdk/crt/io/unlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/unlink.c?re… Copied: trunk/reactos/lib/sdk/crt/io/wcreat.c (from r33863, trunk/reactos/lib/sdk/crt/io/wcreate.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/wcreat.c?p2… Removed: trunk/reactos/lib/sdk/crt/io/wcreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/wcreate.c?r… Modified: trunk/reactos/lib/sdk/crt/io/wmktemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/wmktemp.c?r… Modified: trunk/reactos/lib/sdk/crt/io/wopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/wopen.c?rev… Modified: trunk/reactos/lib/sdk/crt/io/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/write.c?rev… Modified: trunk/reactos/lib/sdk/crt/io/wunlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/io/wunlink.c?r… Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… Modified: trunk/reactos/lib/sdk/crt/math/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/stubs.c?r… Modified: trunk/reactos/lib/sdk/crt/mbstring/ischira.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ischi… Modified: trunk/reactos/lib/sdk/crt/mbstring/iskana.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/iskan… Modified: trunk/reactos/lib/sdk/crt/mbstring/iskmoji.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/iskmo… Modified: trunk/reactos/lib/sdk/crt/mbstring/iskpun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/iskpu… Modified: trunk/reactos/lib/sdk/crt/mbstring/islead.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/islea… Modified: trunk/reactos/lib/sdk/crt/mbstring/islwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/islwr… Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbaln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismba… Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbc… Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbkaln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbk… Modified: trunk/reactos/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbl… Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbpun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbp… Modified: trunk/reactos/lib/sdk/crt/mbstring/ismbtrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/ismbt… Modified: trunk/reactos/lib/sdk/crt/mbstring/isuppr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/isupp… Modified: trunk/reactos/lib/sdk/crt/mbstring/jistojms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/jisto… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbscspn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbscs… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsicmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsic… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbslwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbslw… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsncat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsnc… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsnextc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsne… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsnicoll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsni… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsspn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbssp… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsspnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbssp… Modified: trunk/reactos/lib/sdk/crt/mbstring/mbsupr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbsup… Modified: trunk/reactos/lib/sdk/crt/misc/crtmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/crtmain.c… Modified: trunk/reactos/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/environ.c… Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… Modified: trunk/reactos/lib/sdk/crt/misc/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/lock.c?re… Modified: trunk/reactos/lib/sdk/crt/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/stubs.c?r… Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… Modified: trunk/reactos/lib/sdk/crt/process/_system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/_syste… Modified: trunk/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… Modified: trunk/reactos/lib/sdk/crt/process/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/thread… Added: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… Modified: trunk/reactos/lib/sdk/crt/stdio/fwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/fwrite.c… Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… Modified: trunk/reactos/lib/sdk/crt/stdio/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/remove.c… Modified: trunk/reactos/lib/sdk/crt/stdlib/errno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/errno.c… Modified: trunk/reactos/lib/sdk/crt/stdlib/getenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/getenv.… Modified: trunk/reactos/lib/sdk/crt/stdlib/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/mbstowc… Modified: trunk/reactos/lib/sdk/crt/stdlib/mbtowc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/mbtowc.… Modified: trunk/reactos/lib/sdk/crt/stdlib/putenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/putenv.… Modified: trunk/reactos/lib/sdk/crt/stdlib/senv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/senv.c?… Modified: trunk/reactos/lib/sdk/crt/stdlib/wputenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/wputenv… Modified: trunk/reactos/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.c… Modified: trunk/reactos/lib/sdk/crt/string/wcstom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstom.… Modified: trunk/reactos/lib/sdk/crt/string/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wctomb.… Modified: trunk/reactos/lib/sdk/crt/sys_stat/fstati64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/sys_stat/fstat… Modified: trunk/reactos/lib/sdk/crt/sys_stat/stat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/sys_stat/stat.… Modified: trunk/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… Modified: trunk/reactos/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/heap.c?re…

1 0

[fireball] 33865: - Move scanf.c into strings, it belongs there. - Move thread.c to process, and remove outdated/duplicated copy. - Sync threadx with Wine. - Update README.WINE accordingly.
by fireball＠svn.reactos.org 06 Jun '08

06 Jun '08

Author: fireball Date: Fri Jun 6 07:20:28 2008 New Revision: 33865 URL: http://svn.reactos.org/svn/reactos?rev=33865&view=rev Log: - Move scanf.c into strings, it belongs there. - Move thread.c to process, and remove outdated/duplicated copy. - Sync threadx with Wine. - Update README.WINE accordingly. Added: trunk/reactos/lib/sdk/crt/process/thread.c - copied, changed from r33859, trunk/reactos/lib/sdk/crt/wine/thread.c trunk/reactos/lib/sdk/crt/string/scanf.c - copied unchanged from r33859, trunk/reactos/lib/sdk/crt/wine/scanf.c trunk/reactos/lib/sdk/crt/string/scanf.h - copied unchanged from r33859, trunk/reactos/lib/sdk/crt/wine/scanf.h Removed: trunk/reactos/lib/sdk/crt/wine/scanf.c trunk/reactos/lib/sdk/crt/wine/scanf.h trunk/reactos/lib/sdk/crt/wine/thread.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/process/threadx.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Fri Jun 6 07:20:28 2008 @@ -421,6 +421,7 @@ <file>atof.c</file> <file>ctype.c</file> <file>lasttok.c</file> + <file>scanf.c</file> <file>strcoll.c</file> <file>strdup.c</file> <file>strerror.c</file> @@ -484,8 +485,6 @@ </directory> <directory name="wine"> <file>heap.c</file> - <file>scanf.c</file> - <file>thread.c</file> <file>undname.c</file> </directory> </module> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Fri Jun 6 07:20:28 2008 @@ -131,6 +131,7 @@ <file>wcsrchr.c</file> </ifnot> <file>ctype.c</file> + <file>scanf.c</file> <file>strcspn.c</file> <file>stricmp.c</file> <file>strnicmp.c</file> @@ -159,10 +160,6 @@ <file>wtol.c</file> </directory> - <directory name="wine"> - <file>scanf.c</file> - </directory> - <directory name="wstring"> <file>wcsicmp.c</file> <file>wcslwr.c</file> Copied: trunk/reactos/lib/sdk/crt/process/thread.c (from r33859, trunk/reactos/lib/sdk/crt/wine/thread.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/thread… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/thread.c [iso-8859-1] Fri Jun 6 07:20:28 2008 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <precomp.h> @@ -53,15 +53,14 @@ if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) { if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); + _amsg_exit( _RT_THREAD ); + if (!TlsSetValue( MSVCRT_tls_index, ptr )) _amsg_exit( _RT_THREAD ); + ptr->random_seed = 1; } SetLastError( err ); return ptr; } + /********************************************************************* * _beginthread_trampoline @@ -104,3 +103,15 @@ return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, trampoline, 0, NULL); } + +/********************************************************************* + * _endthread (MSVCRT.@) + */ +void CDECL _endthread(void) +{ + DPRINT("(void)\n"); + + /* FIXME */ + ExitThread(0); +} + Modified: trunk/reactos/lib/sdk/crt/process/threadx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/thread… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/threadx.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/threadx.c [iso-8859-1] Fri Jun 6 07:20:28 2008 @@ -3,7 +3,7 @@ /* * @unimplemented */ -unsigned long _beginthreadex( +unsigned long CDECL _beginthreadex( void* security, unsigned stack_size, unsigned (__stdcall *start_address)(void*), @@ -32,7 +32,7 @@ /* * @implemented */ -void _endthreadex(unsigned retval) +void CDECL _endthreadex(unsigned retval) { /* * Just call the API function. Any CRT specific processing is done in Removed: trunk/reactos/lib/sdk/crt/wine/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/scanf.c (removed) @@ -1,196 +1,0 @@ -/* - * general implementation of scanf used by scanf, sscanf, fscanf, - * _cscanf, wscanf, swscanf and fwscanf - * - * Copyright 1996,1998 Marcus Meissner - * Copyright 1996 Jukka Iivonen - * Copyright 1997,2000 Uwe Bonnes - * Copyright 2000 Jon Griffiths - * Copyright 2002 Daniel Gudbjartsson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <precomp.h> - -#include <wchar.h> -#include <ctype.h> - -#define NDEBUG -#include <internal/debug.h> - -#define WARN DPRINT1 - -extern FILE _iob[]; - -/* helper function for *scanf. Returns the value of character c in the - * given base, or -1 if the given character is not a digit of the base. - */ -static int char2digit(char c, int base) { - if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0'); - if (base<=10) return -1; - if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10); - if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10); - return -1; -} - -/* helper function for *wscanf. Returns the value of character c in the - * given base, or -1 if the given character is not a digit of the base. - */ -static int wchar2digit(wchar_t c, int base) { - if ((c>=L'0') && (c<=L'9') && (c<=L'0'+base-1)) return (c-L'0'); - if (base<=10) return -1; - if ((c>=L'A') && (c<=L'Z') && (c<=L'A'+base-11)) return (c-L'A'+10); - if ((c>=L'a') && (c<=L'z') && (c<=L'a'+base-11)) return (c-L'a'+10); - return -1; -} - -#ifndef _LIBCNT_ -/* vfscanf */ -#undef WIDE_SCANF -#undef CONSOLE -#undef STRING -#include "scanf.h" - -/* vfwscanf */ -#define WIDE_SCANF 1 -#undef CONSOLE -#undef STRING -#include "scanf.h" -#endif - -/* vsscanf */ -#undef WIDE_SCANF -#undef CONSOLE -#define STRING 1 -#include "scanf.h" - -/* vswscanf */ -#define WIDE_SCANF 1 -#undef CONSOLE -#define STRING 1 -#include "scanf.h" - -#ifndef _LIBCNT_ -/* vcscanf */ -#undef WIDE_SCANF -#define CONSOLE 1 -#undef STRING -#include "scanf.h" - - -/********************************************************************* - * fscanf (MSVCRT.@) - */ -int fscanf(FILE *file, const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfscanf(file, format, valist); - va_end(valist); - return res; -} - -/********************************************************************* - * scanf (MSVCRT.@) - */ -int scanf(const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfscanf(stdin, format, valist); - va_end(valist); - return res; -} - -/********************************************************************* - * fwscanf (MSVCRT.@) - */ -int fwscanf(FILE *file, const wchar_t *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfwscanf(file, format, valist); - va_end(valist); - return res; -} - - -/********************************************************************* - * wscanf (MSVCRT.@) - */ -int wscanf(const wchar_t *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vfwscanf(stdin, format, valist); - va_end(valist); - return res; -} -#endif - - -/********************************************************************* - * sscanf (MSVCRT.@) - */ -int sscanf(const char *str, const char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vsscanf(str, format, valist); - va_end(valist); - return res; -} - - -/********************************************************************* - * swscanf (MSVCRT.@) - */ -int swscanf(const wchar_t *str, const wchar_t *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vswscanf(str, format, valist); - va_end(valist); - return res; -} - -#ifndef _LIBCNT_ -/********************************************************************* - * _cscanf (MSVCRT.@) - */ -int _cscanf(/*const*/ char *format, ...) -{ - va_list valist; - int res; - - va_start(valist, format); - res = vcscanf(format, valist); - va_end(valist); - return res; -} -#endif Removed: trunk/reactos/lib/sdk/crt/wine/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.h?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/scanf.h (removed) @@ -1,539 +1,0 @@ -/* - * general implementation of scanf used by scanf, sscanf, fscanf, - * _cscanf, wscanf, swscanf and fwscanf - * - * Copyright 1996,1998 Marcus Meissner - * Copyright 1996 Jukka Iivonen - * Copyright 1997,2000, 2003 Uwe Bonnes - * Copyright 2000 Jon Griffiths - * Copyright 2002 Daniel Gudbjartsson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifdef WIDE_SCANF -#define _CHAR_ wchar_t -#define _EOF_ WEOF -#define _EOF_RET WEOF -#define _ISSPACE_(c) iswspace(c) -#define _ISDIGIT_(c) iswdigit(c) -#define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */ -#define _CHAR2SUPPORTED_(c) c /* FIXME: convert char to wide char */ -#define _CHAR2DIGIT_(c, base) wchar2digit((c), (base)) -#define _BITMAPSIZE_ 256*256 -#else /* WIDE_SCANF */ -#define _CHAR_ char -#define _EOF_ EOF -#define _EOF_RET EOF -#define _ISSPACE_(c) isspace(c) -#define _ISDIGIT_(c) isdigit(c) -#define _WIDE2SUPPORTED_(c) c /* FIXME: convert wide char to char */ -#define _CHAR2SUPPORTED_(c) c /* No conversion needed (char to char) */ -#define _CHAR2DIGIT_(c, base) char2digit((c), (base)) -#define _BITMAPSIZE_ 256 -#endif /* WIDE_SCANF */ - -#ifdef CONSOLE -#define _GETC_(file) (consumed++, _getch()) -#define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) -#define _FUNCTION_ int vcscanf(const char *format, va_list ap) -#else -#ifdef STRING -#undef _EOF_ -#define _EOF_ 0 -#define _GETC_(file) (consumed++, *file++) -#define _UNGETC_(nch, file) do { file--; consumed--; } while(0) -#ifdef WIDE_SCANF -#define _FUNCTION_ int vswscanf(const wchar_t *file, const wchar_t *format, va_list ap) -#else /* WIDE_SCANF */ -#define _FUNCTION_ int vsscanf(const char *file, const char *format, va_list ap) -#endif /* WIDE_SCANF */ -#else /* STRING */ -#ifdef WIDE_SCANF -#define _GETC_(file) (consumed++, fgetwc(file)) -#define _UNGETC_(nch, file) do { ungetwc(nch, file); consumed--; } while(0) -#define _FUNCTION_ int vfwscanf(FILE* file, const wchar_t *format, va_list ap) -#else /* WIDE_SCANF */ -#define _GETC_(file) (consumed++, fgetc(file)) -#define _UNGETC_(nch, file) do { ungetc(nch, file); consumed--; } while(0) -#define _FUNCTION_ int vfscanf(FILE* file, const char *format, va_list ap) -#endif /* WIDE_SCANF */ -#endif /* STRING */ -#endif /* CONSOLE */ - -_FUNCTION_ { - int rd = 0, consumed = 0; - int nch; - if (!*format) return 0; -#ifndef WIDE_SCANF -#ifdef CONSOLE - TRACE("(%s): \n", debugstr_a(format)); -#else /* CONSOLE */ -#ifdef STRING - TRACE("%s (%s)\n", file, debugstr_a(format)); -#else /* STRING */ - TRACE("%p (%s)\n", file, debugstr_a(format)); -#endif /* STRING */ -#endif /* CONSOLE */ -#endif /* WIDE_SCANF */ - nch = _GETC_(file); - if (nch == _EOF_) return _EOF_RET; - - while (*format) { - /* a whitespace character in the format string causes scanf to read, - * but not store, all consecutive white-space characters in the input - * up to the next non-white-space character. One white space character - * in the input matches any number (including zero) and combination of - * white-space characters in the input. */ - if (_ISSPACE_(*format)) { - /* skip whitespace */ - while ((nch!=_EOF_) && _ISSPACE_(nch)) - nch = _GETC_(file); - } - /* a format specification causes scanf to read and convert characters - * in the input into values of a specified type. The value is assigned - * to an argument in the argument list. Format specifications have - * the form %[*][width][{h | l | I64 | L}]type */ - else if (*format == '%') { - int st = 0; int suppress = 0; int width = 0; - int base; - int h_prefix = 0; - int l_prefix = 0; - int L_prefix = 0; - int w_prefix = 0; - int prefix_finished = 0; - int I64_prefix = 0; - format++; - /* look for leading asterisk, which means 'suppress assignment of - * this field'. */ - if (*format=='*') { - format++; - suppress=1; - } - /* look for width specification */ - while (_ISDIGIT_(*format)) { - width*=10; - width+=*format++ - '0'; - } - if (width==0) width=-1; /* no width spec seen */ - /* read prefix (if any) */ - while (!prefix_finished) { - switch(*format) { - case 'h': h_prefix = 1; break; - case 'l': l_prefix = 1; break; - case 'w': w_prefix = 1; break; - case 'L': L_prefix = 1; break; - case 'I': - if (*(format + 1) == '6' && - *(format + 2) == '4') { - I64_prefix = 1; - format += 2; - } - break; - default: - prefix_finished = 1; - } - if (!prefix_finished) format++; - } - /* read type */ - switch(*format) { - case 'x': - case 'X': /* hexadecimal integer. */ - base = 16; - goto number; - case 'o': /* octal integer */ - base = 8; - goto number; - case 'u': /* unsigned decimal integer */ - base = 10; - goto number; - case 'd': /* signed decimal integer */ - base = 10; - goto number; - case 'i': /* generic integer */ - base = 0; - number: { - /* read an integer */ - ULONGLONG cur = 0; - int negative = 0; - int seendigit=0; - /* skip initial whitespace */ - while ((nch!=_EOF_) && _ISSPACE_(nch)) - nch = _GETC_(file); - /* get sign */ - if (nch == '-' || nch == '+') { - negative = (nch=='-'); - nch = _GETC_(file); - if (width>0) width--; - } - /* look for leading indication of base */ - if (width!=0 && nch == '0') { - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - if (width!=0 && (nch=='x' || nch=='X')) { - if (base==0) - base=16; - if (base==16) { - nch = _GETC_(file); - if (width>0) width--; - seendigit=0; - } - } else if (base==0) - base = 8; - } - /* format %i without indication of base */ - if (base==0) - base = 10; - /* throw away leading zeros */ - while (width!=0 && nch=='0') { - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } - if (width!=0 && _CHAR2DIGIT_(nch, base)!=-1) { - cur = _CHAR2DIGIT_(nch, base); - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } - /* read until no more digits */ - while (width!=0 && (nch!=_EOF_) && _CHAR2DIGIT_(nch, base)!=-1) { - cur = cur*base + _CHAR2DIGIT_(nch, base); - nch = _GETC_(file); - if (width>0) width--; - seendigit=1; - } - /* okay, done! */ - if (!seendigit) break; /* not a valid number */ - st = 1; - if (!suppress) { -#define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur - if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); - else if (h_prefix) _SET_NUMBER_(short int); - else _SET_NUMBER_(int); - } - } - break; - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': { /* read a float */ - long double cur = 0; - int negative = 0; - /* skip initial whitespace */ - while ((nch!=_EOF_) && _ISSPACE_(nch)) - nch = _GETC_(file); - /* get sign. */ - if (nch == '-' || nch == '+') { - negative = (nch=='-'); - if (width>0) width--; - if (width==0) break; - nch = _GETC_(file); - } - /* get first digit. */ - if ('.' != nch) { - if (!_ISDIGIT_(nch)) break; - cur = (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - /* read until no more digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - cur = cur*10 + (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - } - } else { - cur = 0; /* MaxPayneDemo Fix: .8 -> 0.8 */ - } - /* handle decimals */ - if (width!=0 && nch == '.') { - float dec = 1; - nch = _GETC_(file); - if (width>0) width--; - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - dec /= 10; - cur += dec * (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - } - } - /* handle exponent */ - if (width!=0 && (nch == 'e' || nch == 'E')) { - int exponent = 0, negexp = 0; - float expcnt; - nch = _GETC_(file); - if (width>0) width--; - /* possible sign on the exponent */ - if (width!=0 && (nch=='+' || nch=='-')) { - negexp = (nch=='-'); - nch = _GETC_(file); - if (width>0) width--; - } - /* exponent digits */ - while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) { - exponent *= 10; - exponent += (nch - '0'); - nch = _GETC_(file); - if (width>0) width--; - } - /* update 'cur' with this exponent. */ - expcnt = negexp ? .1 : 10; - while (exponent!=0) { - if (exponent&1) - cur*=expcnt; - exponent/=2; - expcnt=expcnt*expcnt; - } - } - st = 1; - if (!suppress) { - if (L_prefix) _SET_NUMBER_(long double); - else if (l_prefix) _SET_NUMBER_(double); - else _SET_NUMBER_(float); - } - } - break; - /* According to msdn, - * 's' reads a character string in a call to fscanf - * and 'S' a wide character string and vice versa in a - * call to fwscanf. The 'h', 'w' and 'l' prefixes override - * this behaviour. 'h' forces reading char * but 'l' and 'w' - * force reading WCHAR. */ - case 's': - if (w_prefix || l_prefix) goto widecharstring; - else if (h_prefix) goto charstring; -#ifdef WIDE_SCANF - else goto widecharstring; -#else /* WIDE_SCANF */ - else goto charstring; -#endif /* WIDE_SCANF */ - case 'S': - if (w_prefix || l_prefix) goto widecharstring; - else if (h_prefix) goto charstring; -#ifdef WIDE_SCANF - else goto charstring; -#else /* WIDE_SCANF */ - else goto widecharstring; -#endif /* WIDE_SCANF */ - charstring: { /* read a word into a char */ - char *sptr = suppress ? NULL : va_arg(ap, char*); - /* skip initial whitespace */ - while ((nch!=_EOF_) && _ISSPACE_(nch)) - nch = _GETC_(file); - /* read until whitespace */ - while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - st++; - nch = _GETC_(file); - if (width>0) width--; - } - /* terminate */ - if (!suppress) *sptr = 0; - } - break; - widecharstring: { /* read a word into a wchar_t* */ - wchar_t *sptr = suppress ? NULL : va_arg(ap, wchar_t*); - /* skip initial whitespace */ - while ((nch!=_EOF_) && _ISSPACE_(nch)) - nch = _GETC_(file); - /* read until whitespace */ - while (width!=0 && (nch!=_EOF_) && !_ISSPACE_(nch)) { - if (!suppress) *sptr++ = _WIDE2SUPPORTED_(nch); - st++; - nch = _GETC_(file); - if (width>0) width--; - } - /* terminate */ - if (!suppress) *sptr = 0; - } - break; - /* 'c' and 'C work analogously to 's' and 'S' as described - * above */ - case 'c': - if (w_prefix || l_prefix) goto widecharacter; - else if (h_prefix) goto character; -#ifdef WIDE_SCANF - else goto widecharacter; -#else /* WIDE_SCANF */ - else goto character; -#endif /* WIDE_SCANF */ - case 'C': - if (w_prefix || l_prefix) goto widecharacter; - else if (h_prefix) goto character; -#ifdef WIDE_SCANF - else goto character; -#else /* WIDE_SCANF */ - else goto widecharacter; -#endif /* WIDE_SCANF */ - character: { /* read single character into char */ - char *str = suppress ? NULL : va_arg(ap, char*); - if (width == -1) width = 1; - while ((width != 0) && (nch != _EOF_)) - { - if (!suppress) *str++ = _CHAR2SUPPORTED_(nch); - st++; - width--; - nch = _GETC_(file); - } - } - break; - widecharacter: { /* read single character into a wchar_t */ - wchar_t *str = suppress ? NULL : va_arg(ap, wchar_t*); - if (width == -1) width = 1; - while ((width != 0) && (nch != _EOF_)) - { - if (!suppress) *str++ = _WIDE2SUPPORTED_(nch); - st++; - width--; - nch = _GETC_(file); - } - } - break; - case 'n': { - if (!suppress) { - int*n = va_arg(ap, int*); - *n = consumed - 1; - } - /* This is an odd one: according to the standard, - * "Execution of a %n directive does not increment the - * assignment count returned at the completion of - * execution" even if it wasn't suppressed with the - * '*' flag. The Corrigendum to the standard seems - * to contradict this (comment out the assignment to - * suppress below if you want to implement these - * alternate semantics) but the windows program I'm - * looking at expects the behavior I've coded here - * (which happens to be what glibc does as well). - */ - suppress = 1; - st = 1; - } - break; - case '[': { - _CHAR_ *str = suppress ? NULL : va_arg(ap, _CHAR_*); - _CHAR_ *sptr = str; - RTL_BITMAP bitMask; - ULONG *Mask; - int invert = 0; /* Set if we are NOT to find the chars */ - - /* Init our bitmap */ -#ifdef _LIBCNT_ - Mask = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); -#else - Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8); -#endif - RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_); - - /* Read the format */ - format++; - if(*format == '^') { - invert = 1; - format++; - } - if(*format == ']') { - RtlSetBits(&bitMask, ']', 1); - format++; - } - while(*format && (*format != ']')) { - /* According to msdn: - * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ - if((*format == '-') && (*(format + 1) != ']')) { - if ((*(format - 1)) < *(format + 1)) - RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); - else - RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); - format++; - } else - RtlSetBits(&bitMask, *format, 1); - format++; - } - /* read until char is not suitable */ - while ((width != 0) && (nch != _EOF_)) { - if(!invert) { - if(RtlAreBitsSet(&bitMask, nch, 1)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - } else - break; - } else { - if(RtlAreBitsClear(&bitMask, nch, 1)) { - if (!suppress) *sptr++ = _CHAR2SUPPORTED_(nch); - } else - break; - } - st++; - nch = _GETC_(file); - if (width>0) width--; - } - /* terminate */ - if (!suppress) *sptr = 0; -#ifdef _LIBCNT_ - RtlFreeHeap(RtlGetProcessHeap(), 0, Mask); -#else - HeapFree(GetProcessHeap(), 0, Mask); -#endif - } - break; - default: - /* From spec: "if a percent sign is followed by a character - * that has no meaning as a format-control character, that - * character and the following characters are treated as - * an ordinary sequence of characters, that is, a sequence - * of characters that must match the input. For example, - * to specify that a percent-sign character is to be input, - * use %%." */ - while ((nch!=_EOF_) && _ISSPACE_(nch)) - nch = _GETC_(file); - if (nch==*format) { - suppress = 1; /* whoops no field to be read */ - st = 1; /* but we got what we expected */ - nch = _GETC_(file); - } - break; - } - if (st && !suppress) rd++; - else if (!st) break; - } - /* a non-white-space character causes scanf to read, but not store, - * a matching non-white-space character. */ - else { - /* check for character match */ - if (nch == *format) { - nch = _GETC_(file); - } else break; - } - format++; - } - if (nch!=_EOF_) { - _UNGETC_(nch, file); - } - TRACE("returning %d\n", rd); - return rd; -} - -#undef _CHAR_ -#undef _EOF_ -#undef _EOF_RET -#undef _ISSPACE_ -#undef _ISDIGIT_ -#undef _CHAR2SUPPORTED_ -#undef _WIDE2SUPPORTED_ -#undef _CHAR2DIGIT_ -#undef _GETC_ -#undef _UNGETC_ -#undef _FUNCTION_ -#undef _BITMAPSIZE_ Removed: trunk/reactos/lib/sdk/crt/wine/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/thread.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/thread.c (removed) @@ -1,106 +1,0 @@ -/* - * msvcrt.dll thread functions - * - * Copyright 2000 Jon Griffiths - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <precomp.h> -#include <internal/wine/msvcrt.h> - -#include <malloc.h> -#include <process.h> - -#include <debug.h> - -void _amsg_exit (int errnum); -/* Index to TLS */ -DWORD MSVCRT_tls_index; - -typedef void (*_beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); - -/********************************************************************/ - -typedef struct { - _beginthread_start_routine_t start_address; - void *arglist; -} _beginthread_trampoline_t; - -/********************************************************************* - * msvcrt_get_thread_data - * - * Return the thread local storage structure. - */ -MSVCRT_thread_data *msvcrt_get_thread_data(void) -{ - MSVCRT_thread_data *ptr; - DWORD err = GetLastError(); /* need to preserve last error */ - - if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) - { - if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); - } - SetLastError( err ); - return ptr; -} - -/********************************************************************* - * _beginthread_trampoline - */ -static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) -{ - _beginthread_trampoline_t local_trampoline; - - /* Maybe it's just being paranoid, but freeing arg right - * away seems safer. - */ - memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - free(arg); - - local_trampoline.start_address(local_trampoline.arglist); - return 0; -} - -/********************************************************************* - * _beginthread (MSVCRT.@) - */ -unsigned long _beginthread( - _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ - unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - void *arglist) /* [in] Argument list to be passed to new thread or NULL */ -{ - _beginthread_trampoline_t* trampoline; - - DPRINT("(%p, %d, %p)\n", start_address, stack_size, arglist); - - /* Allocate the trampoline here so that it is still valid when the thread - * starts... typically after this function has returned. - * _beginthread_trampoline is responsible for freeing the trampoline - */ - trampoline=malloc(sizeof(*trampoline)); - trampoline->start_address = start_address; - trampoline->arglist = arglist; - - /* FIXME */ - return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, - trampoline, 0, NULL); -} 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] Fri Jun 6 07:20:28 2008 @@ -143,10 +143,12 @@ reactos/dll/win32/kernel32/misc/lcformat.c # Out of sync msvcrt - - reactos/dll/win32/msvcrt/wine/*.c # Out of sync reactos/lib/sdk/crt/cpp.c # Synced at 20071111 reactos/lib/sdk/crt/cppexcept.c # Synced at 20071111 + reactos/lib/sdk/crt/strings/scanf.c/h # Synced at 20080604 + reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 reactos/lib/sdk/crt/wine # Synced at XXXXXXXX + reactos/lib/sdk/crt/thread/thread.c # Synced at 20080604 User32 - reactos/dll/win32/user32/controls/button.c # Synced at 20071022

1 0

[fireball] 33864: - Fix a typo.
by fireball＠svn.reactos.org 06 Jun '08

06 Jun '08

Author: fireball Date: Fri Jun 6 06:26:14 2008 New Revision: 33864 URL: http://svn.reactos.org/svn/reactos?rev=33864&view=rev Log: - Fix a typo. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Fri Jun 6 06:26:14 2008 @@ -112,7 +112,7 @@ __crtCompareStringA=kernel32.CompareStringA @105 __crtCompareStringW=kernel32.CompareStringW @106 __crtGetLocaleInfoW=kernel32.GetLocaleInfo @107 - __crtGetStringTypeW=kernel32.GeStringTypeW @108 + __crtGetStringTypeW=kernel32.GetStringTypeW @108 __crtLCMapStringA @109 ; __crtLCMapStringW @110 __dllonexit @111

1 0

[jimtabor] 33863: Attempt to fix bug 3259. Use IntGdiCleanDC for error checking.
by jimtabor＠svn.reactos.org 06 Jun '08

06 Jun '08

Author: jimtabor Date: Thu Jun 5 21:59:12 2008 New Revision: 33863 URL: http://svn.reactos.org/svn/reactos?rev=33863&view=rev Log: Attempt to fix bug 3259. Use IntGdiCleanDC for error checking. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Jun 5 21:59:12 2008 @@ -261,6 +261,8 @@ #define DC_UnlockDc(pDC) \ GDIOBJ_UnlockObjByPtr ((POBJ)pDC) +extern PDC defaultDCstate; + NTSTATUS FASTCALL InitDcImpl(VOID); PGDIDEVICE FASTCALL IntEnumHDev(VOID); HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Thu Jun 5 21:59:12 2008 @@ -19,7 +19,6 @@ /* NOTE - I think we should store this per window station (including gdi objects) */ static PDCE FirstDce = NULL; -static PDC defaultDCstate = NULL; //static INT DCECount = 0; // Count of DCE in system. #define DCX_CACHECOMPAREMASK (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | \ @@ -228,13 +227,11 @@ { if (!(dce->DCXFlags & DCX_NORESETATTRS)) { - PDC dc; /* make the DC clean so that SetDCState doesn't try to update the vis rgn */ IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); - dc = DC_LockDc ( dce->hDC ); // Clean the DC - IntGdiCopyFromSaveState(dc, defaultDCstate, dce->hDC ); // Was SetDCState. + if (!IntGdiCleanDC(dce->hDC)) return 0; dce->DCXFlags &= ~DCX_DCEBUSY; if (dce->DCXFlags & DCX_DCEDIRTY) Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Jun 5 21:59:12 2008 @@ -33,7 +33,7 @@ PGDIDEVICE pPrimarySurface = &PrimarySurface; static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverPrepared; -static PDC defaultDCstate = NULL; +PDC defaultDCstate = NULL; NTSTATUS FASTCALL @@ -952,10 +952,11 @@ IntGdiCleanDC(HDC hDC) { PDC dc; + if (!hDC) return FALSE; dc = DC_LockDc ( hDC ); + if (!dc) return FALSE; // Clean the DC if (defaultDCstate) IntGdiCopyFromSaveState(dc, defaultDCstate, hDC ); - DC_UnlockDc(dc); return TRUE; }

1 0

[greatlrd] 33862: commit 33747 did remove almost all redirect to ntdll and to some internal functions, I re add thuse redirect also by mistake _seh_longjmp_unwind was not longer redirected to seh_longjmp_unwind it is now again thx irc nick : Goplat to notice this.
by greatlrd＠svn.reactos.org 05 Jun '08

05 Jun '08

Author: greatlrd Date: Thu Jun 5 18:51:27 2008 New Revision: 33862 URL: http://svn.reactos.org/svn/reactos?rev=33862&view=rev Log: commit 33747 did remove almost all redirect to ntdll and to some internal functions, I re add thuse redirect also by mistake _seh_longjmp_unwind was not longer redirected to seh_longjmp_unwind it is now again thx irc nick : Goplat to notice this. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Thu Jun 5 18:51:27 2008 @@ -121,9 +121,9 @@ __getmainargs @114 __initenv @115 ; __iob_func @116 - __isascii @117 - __iscsym @118 - __iscsymf @119 + __isascii=ntdll.__isascii @117 + __iscsym=ntdll.__iscsym @118 + __iscsymf=ntdll.__iscsymf @119 __lc_codepage @120 DATA __lc_collate_cp @121 DATA __lc_handle @122 DATA @@ -167,7 +167,7 @@ __setusermatherr @160 __threadhandle @161 __threadid @162 - __toascii @163 + __toascii=ntdll.__toascii @163 __unDName @164 __unDNameEx @165 ; __uncaught_exception @166 @@ -291,7 +291,7 @@ _fstati64 @284 _ftime @285 ; _ftime64 @286 - _ftol @287 + _ftol=ntdll._ftol @287 _fullpath @288 _futime @289 ; _futime64 @290 @@ -306,10 +306,10 @@ _getdiskfree @299 _getdllprocaddr @300 _getdrive @301 - _getdrives @302 + _getdrives=kernel32.GetLogicalDrives @302 _getmaxstdio @303 _getmbcp @304 - _getpid @305 + _getpid=kernel32.GetCurrentProcessId @305 _getsystime @306 _getw @307 ; _getwch @308 @@ -485,7 +485,7 @@ ; _scprintf @478 ; _scwprintf @479 _searchenv @480 -; _seh_longjmp_unwind @481 + _seh_longjmp_unwind=_seh_longjmp_unwind@4 @481 ; _set_SSE2_enable @482 _set_error_mode @483 _set_sbh_threshold @484 @@ -497,9 +497,9 @@ _setmode @490 _setsystime @491 _sleep @492 - _snprintf @493 + _snprintf=crt__snprintf @493 ; _snscanf @494 - _snwprintf @495 + _snwprintf=crt__snwprintf @495 ; _snwscanf @496 _sopen @497 _spawnl @498 @@ -540,8 +540,8 @@ _tempnam @533 ; _time64 @534 _timezone @535 DATA - _tolower @536 - _toupper @537 + _tolower=ntdll._tolower @536 + _toupper=ntdll._toupper @537 _tzname @538 DATA _tzset @539 _ui64toa=ntdll._ui64toa @540 @@ -656,7 +656,7 @@ acos @649 asctime @650 asin @651 - atan @652 + atan=ntdll.atan @652 atan2 @653 atexit @654 atof @655 @@ -664,17 +664,17 @@ atol=ntdll.atol @657 bsearch=ntdll.bsearch @658 calloc @659 - ceil @660 + ceil=ntdll.ceil @660 clearerr @661 clock @662 - cos @663 + cos=ntdll.cos @663 cosh @664 ctime @665 difftime @666 div @667 exit @668 exp @669 - fabs @670 + fabs=ntdll.fabs @670 fclose @671 feof @672 ferror @673 @@ -684,7 +684,7 @@ fgets @677 fgetwc @678 fgetws @679 - floor @680 + floor=ntdll.floor @680 fmod @681 fopen @682 fprintf @683 @@ -711,37 +711,37 @@ getwchar @704 gmtime @705 is_wctype=ntdll.iswctype @706 - isalnum @707 - isalpha @708 - iscntrl @709 - isdigit @710 - isgraph @711 + isalnum=ntdll.isalnum @707 + isalpha=ntdll.isalpha @708 + iscntrl=ntdll.iscntrl @709 + isdigit=ntdll.isdigit @710 + isgraph=ntdll.isgraph @711 isleadbyte @712 - islower @713 - isprint @714 - ispunct @715 - isspace @716 - isupper @717 + islower=ntdll.islower @713 + isprint=ntdll.isprint @714 + ispunct=ntdll.ispunct @715 + isspace=ntdll.isspace @716 + isupper=ntdll.isupper @717 iswalnum @718 iswalpha=ntdll.iswalpha @719 iswascii @720 iswcntrl @721 iswctype=ntdll.iswctype @722 - iswdigit @723 + iswdigit=ntdll.iswdigit @723 iswgraph @724 - iswlower @725 + iswlower=ntdll.iswlower @725 iswprint @726 iswpunct @727 - iswspace @728 + iswspace=ntdll.iswspace @728 iswupper @729 - iswxdigit @730 - isxdigit @731 + iswxdigit=ntdll.iswxdigit @730 + isxdigit=ntdll.isxdigit @731 labs=ntdll.labs @732 ldexp @733 ldiv @734 localeconv @735 localtime @736 - log @737 + log=ntdll.log @737 log10 @738 longjmp @739 malloc @740 @@ -756,7 +756,7 @@ mktime @749 modf @750 perror @751 - pow @752 + pow=ntdll.pow @752 printf @753 putc @754 putchar @755 @@ -775,10 +775,10 @@ setlocale @768 setvbuf @769 signal @770 - sin @771 + sin=ntdll.sin @771 sinh @772 - sprintf @773 - sqrt @774 + sprintf=crt_sprintf @773 + sqrt=ntdll.sqrt @774 srand @775 sscanf @776 strcat=ntdll.strcat @777 @@ -802,10 +802,10 @@ strtol=ntdll.strtol @795 strtoul=ntdll.strtoul @796 strxfrm @797 - swprintf @798 + swprintf=crt_swprintf @798 swscanf @799 system @800 - tan @801 + tan=ntdll.tan @801 tanh @802 time @803 tmpfile @804

1 0

[tkreuzer] 33861: patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat): fix coordinate transformation for NtGdiSetDIBitsToDevice, fixes bug 3200 See issue #3294 for more details.
by tkreuzer＠svn.reactos.org 05 Jun '08

05 Jun '08

Author: tkreuzer Date: Thu Jun 5 17:23:19 2008 New Revision: 33861 URL: http://svn.reactos.org/svn/reactos?rev=33861&view=rev Log: patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat): fix coordinate transformation for NtGdiSetDIBitsToDevice, fixes bug 3200 See issue #3294 for more details. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Thu Jun 5 17:23:19 2008 @@ -447,8 +447,9 @@ ColorUse, lpbmi->bmiHeader.biSizeImage, lpbmi->bmiHeader.biSize, - FALSE, + TRUE, NULL); } + Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Jun 5 17:23:19 2008 @@ -372,8 +372,14 @@ rcDest.left = XDest; rcDest.top = YDest; - rcDest.right = XDest + Width; - rcDest.bottom = YDest + Height; + if (bTransformCoordinates) + { + CoordLPtoDP(pDC, (LPPOINT)&rcDest); + } + rcDest.left += pDC->ptlDCOrig.x; + rcDest.top += pDC->ptlDCOrig.y; + rcDest.right = rcDest.left + Width; + rcDest.bottom = rcDest.top + Height; ptSource.x = XSrc; ptSource.y = YSrc;

1 0

[tkreuzer] 33860: co_MsqTranslateMouseMessage: - add a comment about who removes a message from a queue - fix filter handling (typo) - correct the callers next list entry, if it might have been deleted. Yes, it's ugly, but the only way I could currently think of without rewriting everything and it was already ugly before. This fixes bug 2317 and some random crashes with FF. See issue #2317 for more details.
by tkreuzer＠svn.reactos.org 05 Jun '08

05 Jun '08

Author: tkreuzer Date: Thu Jun 5 11:57:27 2008 New Revision: 33860 URL: http://svn.reactos.org/svn/reactos?rev=33860&view=rev Log: co_MsqTranslateMouseMessage: - add a comment about who removes a message from a queue - fix filter handling (typo) - correct the callers next list entry, if it might have been deleted. Yes, it's ugly, but the only way I could currently think of without rewriting everything and it was already ugly before. This fixes bug 2317 and some random crashes with FF. See issue #2317 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Jun 5 11:57:27 2008 @@ -262,7 +262,7 @@ BOOL static STDCALL co_MsqTranslateMouseMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd, UINT FilterLow, UINT FilterHigh, PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed, - PWINDOW_OBJECT ScopeWin, PPOINT ScreenPoint, BOOL FromGlobalQueue) + PWINDOW_OBJECT ScopeWin, PPOINT ScreenPoint, BOOL FromGlobalQueue, PLIST_ENTRY *Next) { USHORT Msg = Message->Msg.message; PWINDOW_OBJECT Window = NULL; @@ -319,6 +319,7 @@ MessageQueue->MouseMoveMsg = NULL; } } + // when FromGlobalQueue is true, the caller has already removed the Message ExFreePool(Message); *Freed = TRUE; return(FALSE); @@ -386,7 +387,7 @@ *ScreenPoint = Message->Msg.pt; if((hWnd != NULL && Window->hSelf != hWnd) || - ((FilterLow != 0 || FilterLow != 0) && (Msg < FilterLow || Msg > FilterHigh))) + ((FilterLow != 0 || FilterHigh != 0) && (Msg < FilterLow || Msg > FilterHigh))) { /* Reject the message because it doesn't match the filter */ @@ -410,6 +411,11 @@ /* delete the old message */ RemoveEntryList(&Window->MessageQueue->MouseMoveMsg->ListEntry); ExFreePool(Window->MessageQueue->MouseMoveMsg); + if (!FromGlobalQueue) + { + // We might have deleted the next one in our queue, so fix next + *Next = Message->ListEntry.Flink; + } } /* always save a pointer to this WM_MOUSEMOVE message here because we're sure that the message is in the private queue */ @@ -521,7 +527,7 @@ Accept = co_MsqTranslateMouseMessage(MessageQueue, hWnd, FilterLow, FilterHigh, Current, Remove, &Freed, - DesktopWindow, &ScreenPoint, FALSE); + DesktopWindow, &ScreenPoint, FALSE, &CurrentEntry); if (Accept) { if (Remove) @@ -621,7 +627,7 @@ /* Translate the message. */ Accept = co_MsqTranslateMouseMessage(MessageQueue, hWnd, FilterLow, FilterHigh, Current, Remove, &Freed, - DesktopWindow, &ScreenPoint, TRUE); + DesktopWindow, &ScreenPoint, TRUE, NULL); if (Accept) { /* Check for no more messages in the system queue. */

1 0

[tkreuzer] 33859: IntEngGradientFill: don't assert, if no CLIPOBJ is given, instead handle this case in EngGradientFill, creating a CLIPOBJ from bounds rect.
by tkreuzer＠svn.reactos.org 05 Jun '08

05 Jun '08

Author: tkreuzer Date: Wed Jun 4 19:23:27 2008 New Revision: 33859 URL: http://svn.reactos.org/svn/reactos?rev=33859&view=rev Log: IntEngGradientFill: don't assert, if no CLIPOBJ is given, instead handle this case in EngGradientFill, creating a CLIPOBJ from bounds rect. Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Wed Jun 4 19:23:27 2008 @@ -481,6 +481,17 @@ IN ULONG ulMode) { ULONG i; + CLIPOBJ *pcoPriv = NULL; + BOOL ret = FALSE; + + if (!pco) + { + pco = pcoPriv = IntEngCreateClipRegion(0, 0, prclExtents); + if (!pco) + { + return FALSE; + } + } switch(ulMode) { @@ -493,10 +504,11 @@ if(!IntEngGradientFillRect(psoDest, pco, pxlo, pVertex, nVertex, gr, prclExtents, pptlDitherOrg, (ulMode == GRADIENT_FILL_RECT_H))) { - return FALSE; + break; } } - return TRUE; + ret = TRUE; + break; } case GRADIENT_FILL_TRIANGLE: { @@ -511,13 +523,20 @@ if(!IntEngGradientFillTriangle(psoDest, pco, pxlo, pVertex, nVertex, gt, prclExtents, pptlDitherOrg)) { - return FALSE; + break; } } - return TRUE; + ret = TRUE; + break; } } - return FALSE; + + if (pcoPriv) + { + IntEngDeleteClipRegion(pcoPriv); + } + + return ret; } BOOL STDCALL @@ -536,7 +555,6 @@ BOOL Ret; BITMAPOBJ *pboDest; ASSERT(psoDest); - ASSERT(pco); pboDest = CONTAINING_RECORD(psoDest, BITMAPOBJ, SurfObj); ASSERT(pboDest);

1 0

[jimtabor] 33858: This should do it for pen. Tested the same with wine tests.
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Wed Jun 4 16:05:18 2008 New Revision: 33858 URL: http://svn.reactos.org/svn/reactos?rev=33858&view=rev Log: This should do it for pen. Tested the same with wine tests. Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Wed Jun 4 16:05:18 2008 @@ -177,11 +177,7 @@ ExitCleanup: SetLastWin32Error(ERROR_INVALID_PARAMETER); - if (PenObject->pStyle) - { - ExFreePool(PenObject->pStyle); - PenObject->pStyle = NULL; - } + PenObject->pStyle = NULL; PENOBJ_UnlockPen(PenObject); if (bOldStylePen) PENOBJ_FreePenByHandle(hPen); @@ -343,7 +339,10 @@ cjDIB, bOldStylePen, hBrush); - + if (!hPen && pSafeStyle) + { + ExFreePool(pSafeStyle); + } return hPen; }

1 0

[jimtabor] 33857: Sorry, I should have spotted this when I was in here.. I think this takes care of the leak and crash. Wine testing is back with the same errors. So we are good to go.
by jimtabor＠svn.reactos.org 04 Jun '08

04 Jun '08

Author: jimtabor Date: Wed Jun 4 12:45:18 2008 New Revision: 33857 URL: http://svn.reactos.org/svn/reactos?rev=33857&view=rev Log: Sorry, I should have spotted this when I was in here.. I think this takes care of the leak and crash. Wine testing is back with the same errors. So we are good to go. Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Wed Jun 4 12:45:18 2008 @@ -95,7 +95,7 @@ // If dwPenStyle is PS_COSMETIC, the width must be set to 1. if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) - goto EEXIT; + goto ExitCleanup; switch (dwPenStyle & PS_STYLE_MASK) { @@ -109,7 +109,7 @@ case PS_ALTERNATE: /* PS_ALTERNATE is applicable only for cosmetic pens */ - if ((dwPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) goto EEXIT; + if ((dwPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) goto ExitCleanup; PenObject->flAttrs |= GDIBRUSH_IS_BITMAP; PenObject->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; @@ -137,7 +137,7 @@ case PS_INSIDEFRAME: /* FIXME: does it need some additional work? */ /* PS_INSIDEFRAME is applicable only for geometric pens */ - if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) goto EEXIT; + if ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) goto ExitCleanup; PenObject->flAttrs |= (GDIBRUSH_IS_SOLID|GDIBRUSH_IS_INSIDEFRAME); break; @@ -162,7 +162,7 @@ if(all_zero || has_neg) { - goto EEXIT; + goto ExitCleanup; } } /* FIXME: what style here? */ @@ -175,8 +175,13 @@ PENOBJ_UnlockPen(PenObject); return hPen; -EEXIT: +ExitCleanup: SetLastWin32Error(ERROR_INVALID_PARAMETER); + if (PenObject->pStyle) + { + ExFreePool(PenObject->pStyle); + PenObject->pStyle = NULL; + } PENOBJ_UnlockPen(PenObject); if (bOldStylePen) PENOBJ_FreePenByHandle(hPen); @@ -339,11 +344,6 @@ bOldStylePen, hBrush); - if (!hPen && pSafeStyle) - { - ExFreePool(pSafeStyle); - } -// BRUSH_Cleanup takes care of pSafeStyle when deleteing the pen return hPen; }

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