Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[cfinck] 38054: - Remove wrong uses of addslashes() from getbuilds. These calls are not needed anymore since r32649. - Remove an unused style selector from "menu.css".

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Dec 13 15:37:42 2008 New Revision: 38054 URL: http://svn.reactos.org/svn/reactos?rev=38054&view=rev Log: - Remove wrong uses of addslashes() from getbuilds. These calls are not needed anymore since r32649. - Remove an unused style selector from "menu.css". Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php trunk/web/reactos.org/htdocs/shared/css/menu.css Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/index.php [iso-8859-1] Sat Dec 13 15:37:42 2008 @@ -110,19 +110,19 @@ <div id="js_stuff"> <table id="showrev" cellspacing="0" cellpadding="5"> <tr> - <td><?php echo addslashes($getbuilds_langres["showrevfiles"]); ?>: </td> + <td><?php echo $getbuilds_langres["showrevfiles"]; ?>: </td> <td> <span id="revcontrols"> - <img src="images/leftarrow.gif" alt="<" title="<?php echo addslashes($getbuilds_langres["prevrev"]); ?>" onclick="PrevRev();"> + <img src="images/leftarrow.gif" alt="<" title="<?php echo $getbuilds_langres["prevrev"]; ?>" onclick="PrevRev();"> <input type="text" id="revnum" value="<?php echo $rev; ?>" size="12" onkeyup="CheckRevNum(this);"> - <img src="images/rightarrow.gif" alt=">" title="<?php echo addslashes($getbuilds_langres["nextrev"]); ?>" onclick="NextRev();"><br> + <img src="images/rightarrow.gif" alt=">" title="<?php echo $getbuilds_langres["nextrev"]; ?>" onclick="NextRev();"><br> </span> - <img src="images/info.gif" alt="INFO:"> <?php printf(addslashes($getbuilds_langres["rangeinfo"]), $rev, ($rev - 50), $rev); ?> + <img src="images/info.gif" alt="INFO:"> <?php printf($getbuilds_langres["rangeinfo"], $rev, ($rev - 50), $rev); ?> </td> </tr> <tr> - <td><?php echo addslashes($getbuilds_langres["isotype"]); ?>: </td> + <td><?php echo $getbuilds_langres["isotype"]; ?>: </td> <td> <input type="checkbox" id="bootcd-dbg" checked="checked"> Debug Boot CDs <input type="checkbox" id="livecd-dbg" checked="checked"> Debug Live CDs @@ -133,10 +133,10 @@ </table> <div id="controlbox"> - <input type="button" onclick="ShowRev();" value="<?php echo addslashes($getbuilds_langres["showrev"]); ?>" /> + <input type="button" onclick="ShowRev();" value="<?php echo $getbuilds_langres["showrev"]; ?>" /> <span id="ajax_loading"> - <img src="../shared/images/ajax_loading.gif" alt=""> <?php echo addslashes($getbuilds_langres["gettinglist"]); ?>... + <img src="../shared/images/ajax_loading.gif" alt=""> <?php echo $getbuilds_langres["gettinglist"]; ?>... </span> </div> @@ -144,14 +144,14 @@ <table class="datatable" cellspacing="0" cellpadding="1"> <thead> <tr class="head"> - <th class="fname"><?php echo addslashes($getbuilds_langres["filename"]); ?></th> - <th class="fsize"><?php echo addslashes($getbuilds_langres["filesize"]); ?></th> - <th class="fdate"><?php echo addslashes($getbuilds_langres["filedate"]); ?></th> + <th class="fname"><?php echo $getbuilds_langres["filename"]; ?></th> + <th class="fsize"><?php echo $getbuilds_langres["filesize"]; ?></th> + <th class="fdate"><?php echo $getbuilds_langres["filedate"]; ?></th> </tr> </thead> <tbody> <tr class="odd"> - <td><?php echo addslashes($getbuilds_langres["pleasewait"]); ?>...</td> + <td><?php echo $getbuilds_langres["pleasewait"]; ?>...</td> <td> </td> <td> </td> </tr> Modified: trunk/web/reactos.org/htdocs/shared/css/menu.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/css/… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/css/menu.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/css/menu.css [iso-8859-1] Sat Dec 13 15:37:42 2008 @@ -13,15 +13,6 @@ background-color: #5984C3; padding: 0px 0px 1px 10px; margin-top: 0; -} - -.contentSmallTitle { - font-size: 14px; - font-weight: bold; - color: white; - background-color: #5984C3; - padding: 0px 0px 1px 10px; - margin-bottom: 3px; } h1 a {

15 years, 9 months

[tkreuzer] 38053: Add _setjmp / longjmp to libcntpr, so we don't need to reimplement it in ntoskrnl. Should probably be done for x86, too.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 15:35:24 2008 New Revision: 38053 URL: http://svn.reactos.org/svn/reactos?rev=38053&view=rev Log: Add _setjmp / longjmp to libcntpr, so we don't need to reimplement it in ntoskrnl. Should probably be done for x86, too. Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Sat Dec 13 15:35:24 2008 @@ -83,6 +83,14 @@ <directory name="search"> <file>bsearch.c</file> <file>lfind.c</file> + </directory> + + <directory name="setjmp"> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>setjmp.s</file> + </directory> + </if> </directory> <directory name="stdlib">

15 years, 9 months

[tkreuzer] 38052: Update crt headers and mingw lib from mingw64. Update crt a bit. 4 msvcrt time tests fixed.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 15:28:05 2008 New Revision: 38052 URL: http://svn.reactos.org/svn/reactos?rev=38052&view=rev Log: Update crt headers and mingw lib from mingw64. Update crt a bit. 4 msvcrt time tests fixed. Added: trunk/reactos/include/crt/mingw32/crtdbg.h (with props) trunk/reactos/include/crt/mingw32/vadefs.h (with props) trunk/reactos/include/crt/sec_api/ trunk/reactos/include/crt/sec_api/conio_s.h (with props) trunk/reactos/include/crt/sec_api/crtdbg_s.h (with props) trunk/reactos/include/crt/sec_api/io_s.h (with props) trunk/reactos/include/crt/sec_api/mbstring_s.h (with props) trunk/reactos/include/crt/sec_api/search_s.h (with props) trunk/reactos/include/crt/sec_api/stdio_s.h (with props) trunk/reactos/include/crt/sec_api/stdlib_s.h (with props) trunk/reactos/include/crt/sec_api/stralign_s.h (with props) trunk/reactos/include/crt/sec_api/string_s.h (with props) trunk/reactos/include/crt/sec_api/sys/ trunk/reactos/include/crt/sec_api/sys/timeb_s.h (with props) trunk/reactos/include/crt/sec_api/tchar_s.h (with props) trunk/reactos/include/crt/sec_api/time_s.h (with props) trunk/reactos/include/crt/sec_api/wchar_s.h (with props) trunk/reactos/include/crt/sys/cdefs.h (with props) trunk/reactos/include/crt/sys/ioctl.h (with props) trunk/reactos/include/crt/tchar.h (with props) trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c (with props) trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c (with props) trunk/reactos/lib/3rdparty/mingw/_newmode.c (with props) trunk/reactos/lib/3rdparty/mingw/argv.c (with props) trunk/reactos/lib/3rdparty/mingw/atonexit.c (with props) trunk/reactos/lib/3rdparty/mingw/charmax.c (with props) trunk/reactos/lib/3rdparty/mingw/cinitexe.c (with props) trunk/reactos/lib/3rdparty/mingw/crt0_c.c (with props) trunk/reactos/lib/3rdparty/mingw/crt0_w.c (with props) trunk/reactos/lib/3rdparty/mingw/crtdll.c (with props) trunk/reactos/lib/3rdparty/mingw/crtexe.c (with props) trunk/reactos/lib/3rdparty/mingw/dllargv.c (with props) trunk/reactos/lib/3rdparty/mingw/dllentry.c (with props) trunk/reactos/lib/3rdparty/mingw/dllmain.c (with props) trunk/reactos/lib/3rdparty/mingw/gs_support.c (with props) trunk/reactos/lib/3rdparty/mingw/internal.h (with props) trunk/reactos/lib/3rdparty/mingw/merr.c (with props) trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c (with props) trunk/reactos/lib/3rdparty/mingw/natstart.c (with props) trunk/reactos/lib/3rdparty/mingw/oscalls.h (with props) trunk/reactos/lib/3rdparty/mingw/pesect.c (with props) trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c (with props) trunk/reactos/lib/3rdparty/mingw/tlssup.c (with props) trunk/reactos/lib/3rdparty/mingw/wildcard.c (with props) trunk/reactos/lib/3rdparty/mingw/xncommod.c (with props) trunk/reactos/lib/3rdparty/mingw/xthdloc.c (with props) trunk/reactos/lib/3rdparty/mingw/xtxtmode.c (with props) trunk/reactos/lib/sdk/crt/stdio/find64.c (with props) trunk/reactos/lib/sdk/crt/stdio/findgen.c (with props) trunk/reactos/lib/sdk/crt/stdio/findi64.c (with props) trunk/reactos/lib/sdk/crt/stdio/stat.c (with props) trunk/reactos/lib/sdk/crt/stdio/stat64.c (with props) trunk/reactos/lib/sdk/crt/stdio/wfind64.c (with props) trunk/reactos/lib/sdk/crt/stdio/wfindi64.c (with props) trunk/reactos/lib/sdk/crt/stdio/wstat.c (with props) trunk/reactos/lib/sdk/crt/stdio/wstat64.c (with props) Removed: trunk/reactos/include/psdk/tchar.h Modified: trunk/reactos/base/applications/network/ftp/fake.c trunk/reactos/base/applications/network/ftp/fake.h trunk/reactos/base/applications/network/ftp/ftp_var.h trunk/reactos/base/shell/explorer/shell/fatfs.cpp trunk/reactos/base/shell/explorer/shell/fatfs.h trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/assert.h trunk/reactos/include/crt/complex.h trunk/reactos/include/crt/conio.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/direct.h trunk/reactos/include/crt/dirent.h trunk/reactos/include/crt/dos.h trunk/reactos/include/crt/errno.h trunk/reactos/include/crt/excpt.h trunk/reactos/include/crt/fcntl.h trunk/reactos/include/crt/fenv.h trunk/reactos/include/crt/float.h trunk/reactos/include/crt/inttypes.h trunk/reactos/include/crt/io.h trunk/reactos/include/crt/limits.h trunk/reactos/include/crt/locale.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/mbctype.h trunk/reactos/include/crt/mbstring.h trunk/reactos/include/crt/mem.h trunk/reactos/include/crt/memory.h trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/mingw32/stdarg.h trunk/reactos/include/crt/mingw32/stddef.h trunk/reactos/include/crt/process.h trunk/reactos/include/crt/search.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/share.h trunk/reactos/include/crt/signal.h trunk/reactos/include/crt/stdint.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/strings.h trunk/reactos/include/crt/sys/fcntl.h trunk/reactos/include/crt/sys/file.h trunk/reactos/include/crt/sys/locking.h trunk/reactos/include/crt/sys/param.h trunk/reactos/include/crt/sys/stat.h trunk/reactos/include/crt/sys/time.h trunk/reactos/include/crt/sys/timeb.h trunk/reactos/include/crt/sys/types.h trunk/reactos/include/crt/sys/unistd.h trunk/reactos/include/crt/sys/utime.h trunk/reactos/include/crt/time.h trunk/reactos/include/crt/unistd.h trunk/reactos/include/crt/utime.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/crt/wctype.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/3rdparty/mingw/binmode.c trunk/reactos/lib/3rdparty/mingw/gccmain.c trunk/reactos/lib/3rdparty/mingw/getopt.c trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c trunk/reactos/lib/inflib/builddep.h trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/process/process.c trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/stdio/find.c trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c trunk/reactos/lib/sdk/crt/stdio/wfind.c trunk/reactos/lib/sdk/crt/stdlib/errno.c trunk/reactos/lib/sdk/crt/stdlib/getenv.c trunk/reactos/lib/sdk/crt/stdlib/rot.c trunk/reactos/lib/sdk/crt/stdlib/swab.c trunk/reactos/lib/sdk/crt/string/atol.c trunk/reactos/lib/sdk/crt/string/ctype.c trunk/reactos/lib/sdk/crt/string/scanf.c trunk/reactos/lib/sdk/crt/string/tcsnlen.h trunk/reactos/lib/sdk/crt/time/ctime.c trunk/reactos/lib/sdk/crt/time/difftime.c trunk/reactos/lib/sdk/crt/time/ftime.c trunk/reactos/lib/sdk/crt/time/strdate.c trunk/reactos/lib/sdk/crt/time/strtime.c trunk/reactos/lib/sdk/crt/time/wstrdate.c trunk/reactos/lib/sdk/crt/time/wstrtime.c trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/network/ftp/fake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ftp/fake.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/shell/explorer/shell/fatfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… Modified: trunk/reactos/base/shell/explorer/shell/fatfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… 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/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4… Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3… Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=3… Modified: trunk/reactos/include/crt/complex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/complex.h?rev=… Modified: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=38… Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=38… Modified: trunk/reactos/include/crt/direct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/direct.h?rev=3… Modified: trunk/reactos/include/crt/dirent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dirent.h?rev=3… Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=3805… Modified: trunk/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/errno.h?rev=38… Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=38… Modified: trunk/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fcntl.h?rev=38… Modified: trunk/reactos/include/crt/fenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fenv.h?rev=380… Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=38… Modified: trunk/reactos/include/crt/inttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/inttypes.h?rev… Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=38052… Modified: trunk/reactos/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/limits.h?rev=3… Modified: trunk/reactos/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/locale.h?rev=3… Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=3… Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=380… Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… Modified: trunk/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbstring.h?rev… Modified: trunk/reactos/include/crt/mem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mem.h?rev=3805… Modified: trunk/reactos/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/memory.h?rev=3… Added: trunk/reactos/include/crt/mingw32/crtdbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/crtdbg… Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… Modified: trunk/reactos/include/crt/mingw32/stdarg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/stdarg… Modified: trunk/reactos/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/stddef… Added: trunk/reactos/include/crt/mingw32/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/vadefs… Modified: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… Modified: trunk/reactos/include/crt/search.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/search.h?rev=3… Added: trunk/reactos/include/crt/sec_api/conio_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/conio_… Added: trunk/reactos/include/crt/sec_api/crtdbg_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/crtdbg… Added: trunk/reactos/include/crt/sec_api/io_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/io_s.h… Added: trunk/reactos/include/crt/sec_api/mbstring_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/mbstri… Added: trunk/reactos/include/crt/sec_api/search_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/search… Added: trunk/reactos/include/crt/sec_api/stdio_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/stdio_… Added: trunk/reactos/include/crt/sec_api/stdlib_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/stdlib… Added: trunk/reactos/include/crt/sec_api/stralign_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/strali… Added: trunk/reactos/include/crt/sec_api/string_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/string… Added: trunk/reactos/include/crt/sec_api/sys/timeb_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/sys/ti… Added: trunk/reactos/include/crt/sec_api/tchar_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/tchar_… Added: trunk/reactos/include/crt/sec_api/time_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/time_s… Added: trunk/reactos/include/crt/sec_api/wchar_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/wchar_… Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=3… Modified: trunk/reactos/include/crt/share.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/share.h?rev=38… Modified: trunk/reactos/include/crt/signal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/signal.h?rev=3… Modified: trunk/reactos/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdint.h?rev=3… Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=38… Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=3… Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=3… Modified: trunk/reactos/include/crt/strings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/strings.h?rev=… Added: trunk/reactos/include/crt/sys/cdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/cdefs.h?re… Modified: trunk/reactos/include/crt/sys/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/fcntl.h?re… Modified: trunk/reactos/include/crt/sys/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/file.h?rev… Added: trunk/reactos/include/crt/sys/ioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/ioctl.h?re… Modified: trunk/reactos/include/crt/sys/locking.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/locking.h?… Modified: trunk/reactos/include/crt/sys/param.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/param.h?re… Modified: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… Modified: trunk/reactos/include/crt/sys/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/time.h?rev… Modified: trunk/reactos/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/timeb.h?re… Modified: trunk/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/types.h?re… Modified: trunk/reactos/include/crt/sys/unistd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/unistd.h?r… Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… Added: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=38… Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=380… Modified: trunk/reactos/include/crt/unistd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/unistd.h?rev=3… Modified: trunk/reactos/include/crt/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/utime.h?rev=38… Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=38… Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3… Removed: trunk/reactos/include/psdk/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tchar.h?rev=3… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… Added: trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp1… Added: trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp8… Added: trunk/reactos/lib/3rdparty/mingw/_newmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/_newmod… Added: trunk/reactos/lib/3rdparty/mingw/argv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/argv.c?… Added: trunk/reactos/lib/3rdparty/mingw/atonexit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/atonexi… Modified: trunk/reactos/lib/3rdparty/mingw/binmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/binmode… Added: trunk/reactos/lib/3rdparty/mingw/charmax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/charmax… Added: trunk/reactos/lib/3rdparty/mingw/cinitexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/cinitex… Added: trunk/reactos/lib/3rdparty/mingw/crt0_c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_c.… Added: trunk/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_w.… Added: trunk/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtdll.… Added: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… Added: trunk/reactos/lib/3rdparty/mingw/dllargv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllargv… Added: trunk/reactos/lib/3rdparty/mingw/dllentry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllentr… Added: trunk/reactos/lib/3rdparty/mingw/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllmain… Modified: trunk/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gccmain… Modified: trunk/reactos/lib/3rdparty/mingw/getopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/getopt.… Added: trunk/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gs_supp… Added: trunk/reactos/lib/3rdparty/mingw/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/interna… Added: trunk/reactos/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/merr.c?… Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… Added: trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw_h… Modified: trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/moldnam… Added: trunk/reactos/lib/3rdparty/mingw/natstart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/natstar… Added: trunk/reactos/lib/3rdparty/mingw/oscalls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/oscalls… Added: trunk/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pesect.… Added: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-… Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-… Added: trunk/reactos/lib/3rdparty/mingw/tlssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlssup.… Added: trunk/reactos/lib/3rdparty/mingw/wildcard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wildcar… Added: trunk/reactos/lib/3rdparty/mingw/xncommod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xncommo… Added: trunk/reactos/lib/3rdparty/mingw/xthdloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xthdloc… Added: trunk/reactos/lib/3rdparty/mingw/xtxtmode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xtxtmod… Modified: trunk/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/builddep.h?rev=… 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/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… Modified: 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/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/find.c?r… Added: trunk/reactos/lib/sdk/crt/stdio/find64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/find64.c… Added: trunk/reactos/lib/sdk/crt/stdio/findgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/findgen.… Added: trunk/reactos/lib/sdk/crt/stdio/findi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/findi64.… Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… Added: trunk/reactos/lib/sdk/crt/stdio/stat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat.c?r… Added: trunk/reactos/lib/sdk/crt/stdio/stat64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat64.c… Modified: trunk/reactos/lib/sdk/crt/stdio/wfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/wfind.c?… Added: trunk/reactos/lib/sdk/crt/stdio/wfind64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/wfind64.… Added: trunk/reactos/lib/sdk/crt/stdio/wfindi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/wfindi64… Added: trunk/reactos/lib/sdk/crt/stdio/wstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/wstat.c?… Added: trunk/reactos/lib/sdk/crt/stdio/wstat64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/wstat64.… 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/rot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/rot.c?r… Modified: trunk/reactos/lib/sdk/crt/stdlib/swab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/swab.c?… Modified: trunk/reactos/lib/sdk/crt/string/atol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atol.c?… Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… 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/tcsnlen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcsnlen… 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/time/difftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/difftime.… Modified: trunk/reactos/lib/sdk/crt/time/ftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ftime.c?r… Modified: trunk/reactos/lib/sdk/crt/time/strdate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/strdate.c… Modified: trunk/reactos/lib/sdk/crt/time/strtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/strtime.c… Modified: trunk/reactos/lib/sdk/crt/time/wstrdate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/wstrdate.… Modified: trunk/reactos/lib/sdk/crt/time/wstrtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/wstrtime.… Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…

15 years, 9 months

[gschneider] 38051: Update RtlIsTextUnicode, ntdll rtlstr winetest failure down by 10, one remaining

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Dec 13 15:22:07 2008 New Revision: 38051 URL: http://svn.reactos.org/svn/reactos?rev=38051&view=rev Log: Update RtlIsTextUnicode, ntdll rtlstr winetest failure down by 10, one remaining Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=3805… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sat Dec 13 15:22:07 2008 @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> + +#include <wine/unicode.h> /* GLOBALS *******************************************************************/ @@ -1059,10 +1061,12 @@ NTAPI RtlIsTextUnicode( PVOID buf, INT len, INT *pf ) { + static const WCHAR std_control_chars[] = {'\r','\n','\t',' ',0x3000,0}; + static const WCHAR byterev_control_chars[] = {0x0d00,0x0a00,0x0900,0x2000,0}; const WCHAR *s = buf; int i; unsigned int flags = ~0U, out_flags = 0; - + if (len < sizeof(WCHAR)) { /* FIXME: MSDN documents IS_TEXT_UNICODE_BUFFER_TOO_SMALL but there is no such thing... */ @@ -1077,21 +1081,21 @@ * the output flags. But some of the tests are mutually * exclusive, so I don't see how you could pass all tests ... */ - + /* Check for an odd length ... pass if even. */ if (len & 1) out_flags |= IS_TEXT_UNICODE_ODD_LENGTH; - + if (((char *)buf)[len - 1] == 0) len--; /* Windows seems to do something like that to avoid e.g. false IS_TEXT_UNICODE_NULL_BYTES */ - + len /= sizeof(WCHAR); /* Windows only checks the first 256 characters */ if (len > 256) len = 256; - + /* Check for the special byte order unicode marks. */ if (*s == 0xFEFF) out_flags |= IS_TEXT_UNICODE_SIGNATURE; if (*s == 0xFFFE) out_flags |= IS_TEXT_UNICODE_REVERSE_SIGNATURE; - + /* apply some statistical analysis */ if (flags & IS_TEXT_UNICODE_STATISTICS) { @@ -1104,7 +1108,7 @@ if (stats > len / 2) out_flags |= IS_TEXT_UNICODE_STATISTICS; } - + /* Check for unicode NULL chars */ if (flags & IS_TEXT_UNICODE_NULL_BYTES) { @@ -1117,7 +1121,31 @@ } } } - + + if (flags & IS_TEXT_UNICODE_CONTROLS) + { + for (i = 0; i < len; i++) + { + if (strchrW(std_control_chars, s[i])) + { + out_flags |= IS_TEXT_UNICODE_CONTROLS; + break; + } + } + } + + if (flags & IS_TEXT_UNICODE_REVERSE_CONTROLS) + { + for (i = 0; i < len; i++) + { + if (strchrW(byterev_control_chars, s[i])) + { + out_flags |= IS_TEXT_UNICODE_REVERSE_CONTROLS; + break; + } + } + } + if (pf) { out_flags &= *pf;

15 years, 9 months

[gschneider] 38050: - Update _makepath and _wmakepath to allow in place operation and separated extension processing, based on wine code - Fixes all 14 msvcrt dir winetests

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Dec 13 15:06:47 2008 New Revision: 38050 URL: http://svn.reactos.org/svn/reactos?rev=38050&view=rev Log: - Update _makepath and _wmakepath to allow in place operation and separated extension processing, based on wine code - Fixes all 14 msvcrt dir winetests Modified: trunk/reactos/lib/sdk/crt/stdlib/makepath.c trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c Modified: trunk/reactos/lib/sdk/crt/stdlib/makepath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/makepat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/makepath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/makepath.c [iso-8859-1] Sat Dec 13 15:06:47 2008 @@ -1,3 +1,16 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: See COPYING in the top level directory + * FILE: lib/sdk/crt/stdlib/makepath.c + * PURPOSE: Creates a path + * PROGRAMMERS: Wine team + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * + */ + /* $Id$ */ #include <precomp.h> @@ -9,29 +22,36 @@ */ void _makepath(char* path, const char* drive, const char* dir, const char* fname, const char* ext) { - int dir_len; + char *p = path; - if ((drive != NULL) && (*drive)) { - path[0] = *drive; - path[1] = ':'; - path[2] = 0; - } else { - (*path)=0; + if ( !path ) + return; + + if (drive && drive[0]) + { + *p++ = drive[0]; + *p++ = ':'; } - - if (dir != NULL) { - strcat(path, dir); - dir_len = strlen(dir); - if (dir_len && *(dir + dir_len - 1) != '\\') - strcat(path, "\\"); + if (dir && dir[0]) + { + unsigned int len = strlen(dir); + memmove(p, dir, len); + p += len; + if (p[-1] != '/' && p[-1] != '\\') + *p++ = '\\'; } - - if (fname != NULL) { - strcat(path, fname); - if (ext != NULL && *ext != 0) { - if (*ext != '.') - strcat(path, "."); - strcat(path, ext); - } + if (fname && fname[0]) + { + unsigned int len = strlen(fname); + memmove(p, fname, len); + p += len; } + if (ext && ext[0]) + { + if (ext[0] != '.') + *p++ = '.'; + strcpy(p, ext); + } + else + *p = '\0'; } Modified: trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/wmakpat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c [iso-8859-1] Sat Dec 13 15:06:47 2008 @@ -1,11 +1,14 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown - * PROGRAMER: gdalsnes - * UPDATE HISTORY: - * 25/11/05: Added license header + * PROJECT: ReactOS CRT library + * LICENSE: See COPYING in the top level directory + * FILE: lib/sdk/crt/stdlib/wmakpath.c + * PURPOSE: Creates a unicode path + * PROGRAMMERS: Wine team + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * */ /* $Id$ @@ -17,29 +20,36 @@ */ void _wmakepath(wchar_t* path, const wchar_t* drive, const wchar_t* dir, const wchar_t* fname, const wchar_t* ext) { - int dir_len; + wchar_t *p = path; - if ((drive != NULL) && (*drive)) { - path[0] = *drive; - path[1] = L':'; - path[2] = 0; - } else { - (*path) = 0; + if ( !path ) + return; + + if (drive && drive[0]) + { + *p++ = drive[0]; + *p++ = ':'; } - - if (dir != NULL) { - wcscat(path, dir); - dir_len = wcslen(dir); - if (dir_len && *(dir + dir_len - 1) != L'\\') - wcscat(path, L"\\"); + if (dir && dir[0]) + { + unsigned int len = strlenW(dir); + memmove(p, dir, len * sizeof(wchar_t)); + p += len; + if (p[-1] != '/' && p[-1] != '\\') + *p++ = '\\'; } - - if (fname != NULL) { - wcscat(path, fname); - if (ext != NULL && *ext != 0) { - if (*ext != L'.') - wcscat(path, L"."); - wcscat(path, ext); - } + if (fname && fname[0]) + { + unsigned int len = strlenW(fname); + memmove(p, fname, len * sizeof(wchar_t)); + p += len; } + if (ext && ext[0]) + { + if (ext[0] != '.') + *p++ = '.'; + strcpyW(p, ext); + } + else + *p = '\0'; }

15 years, 9 months

[tkreuzer] 38049: fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 13:47:24 2008 New Revision: 38049 URL: http://svn.reactos.org/svn/reactos?rev=38049&view=rev Log: fix build Added: trunk/rostests/apitests/user32api/tests/GetSystemMetrics.c (props changed) - copied unchanged from r38046, trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c Removed: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c Propchange: trunk/rostests/apitests/user32api/tests/GetSystemMetrics.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/user32api/tests/GetSystemMetrics.c ------------------------------------------------------------------------------ svn:mergeinfo = Removed: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c (removed) @@ -1,396 +1,0 @@ - -INT -Test_GetSystemMetrics(PTESTINFO pti) -{ - INT ret; - HDC hDC; - BOOL BoolVal; - UINT UintVal; - RECT rect; - - SetLastError(0); - hDC = GetDC(0); - - ret = GetSystemMetrics(0); - TEST(ret > 0); - - ret = GetSystemMetrics(64); - TEST(ret == 0); - ret = GetSystemMetrics(65); - TEST(ret == 0); - ret = GetSystemMetrics(66); - TEST(ret == 0); - - - ret = GetSystemMetrics(SM_CXSCREEN); - TEST(ret == GetDeviceCaps(hDC, HORZRES)); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSCREEN); - TEST(ret == GetDeviceCaps(hDC, VERTRES)); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXVSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYHSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYCAPTION); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXDLGFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYDLGFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYVTHUMB); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXHTHUMB); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXCURSOR); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYCURSOR); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMENU); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - SystemParametersInfoW(SPI_GETWORKAREA, 0, &rect, 0); - ret = GetSystemMetrics(SM_CXFULLSCREEN); - TEST(ret == rect.right); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYFULLSCREEN); - TEST(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION)); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYKANJIWINDOW); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MOUSEPRESENT); - TEST(ret == 1); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYVSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXHSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_DEBUG); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SWAPBUTTON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED1); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED2); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED3); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED4); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMIN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMIN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMINTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMINTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXDOUBLECLK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYDOUBLECLK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXICONSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYICONSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MENUDROPALIGNMENT); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_PENWINDOWS); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_DBCSENABLED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CMOUSEBUTTONS); -// TEST(ret == 0); - TEST(GetLastError() == 0); - -#if(WINVER >= 0x0400) - ret = GetSystemMetrics(SM_SECURE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXEDGE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYEDGE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMINSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMINSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXSMICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSMICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSMCAPTION); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXSMSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSMSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMENUSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMENUSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_ARRANGE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMINIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMINIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMAXTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMAXTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMAXIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMAXIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_NETWORK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CLEANBOOT); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXDRAG); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYDRAG); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SHOWSOUNDS); - SystemParametersInfoW(SPI_GETSHOWSOUNDS, 0, &BoolVal, 0); - TEST(ret == BoolVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMENUCHECK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMENUCHECK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SLOWMACHINE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MIDEASTENABLED); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) - ret = GetSystemMetrics(SM_MOUSEWHEELPRESENT); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(WINVER >= 0x0500) - ret = GetSystemMetrics(SM_XVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_YVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CMONITORS); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SAMEDISPLAYFORMAT); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(_WIN32_WINNT >= 0x0500) - ret = GetSystemMetrics(SM_IMMENABLED); - TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(_WIN32_WINNT >= 0x0501) - ret = GetSystemMetrics(SM_CXFOCUSBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYFOCUSBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_TABLETPC); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MEDIACENTER); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_STARTER); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SERVERR2); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(_WIN32_WINNT >= 0x0600) - ret = GetSystemMetrics(SM_MOUSEHORIZONTALWHEELPRESENT); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXPADDEDBORDER); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - - return APISTATUS_NORMAL; -}

15 years, 9 months

[fireball] 38048: - Add missing PSHARED_CACHE_MAP.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Dec 13 13:31:40 2008 New Revision: 38048 URL: http://svn.reactos.org/svn/reactos?rev=38048&view=rev Log: - Add missing PSHARED_CACHE_MAP. Modified: trunk/reactos/include/ndk/cctypes.h Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cctypes.h [iso-8859-1] Sat Dec 13 13:31:40 2008 @@ -129,7 +129,7 @@ KEVENT Event; EX_PUSH_LOCK VacbPushLock; PRIVATE_CACHE_MAP PrivateCacheMap; -} SHARED_CACHE_MAP; +} SHARED_CACHE_MAP, *PSHARED_CACHE_MAP; #endif /* _NTIFS_INCLUDED_ */ #endif /* NTOS_MODE_USER */

15 years, 9 months

[fireball] 38047: - Sync with Wine.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Dec 13 13:30:38 2008 New Revision: 38047 URL: http://svn.reactos.org/svn/reactos?rev=38047&view=rev Log: - Sync with Wine. Modified: trunk/reactos/include/reactos/wine/exception.h Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Sat Dec 13 13:30:38 2008 @@ -24,6 +24,10 @@ #include <setjmp.h> #include <windef.h> #include <excpt.h> + +#ifdef __cplusplus +extern "C" { +#endif /* The following definitions allow using exceptions in Wine and Winelib code * @@ -87,6 +91,12 @@ #define __attribute__(x) /* nothing */ #endif +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__REACTOS__) +#define sigjmp_buf jmp_buf +#define sigsetjmp(buf,sigs) setjmp(buf) +#define siglongjmp(buf,val) longjmp(buf,val) +#endif + #define __TRY \ do { __WINE_FRAME __f; \ int __first = 1; \ @@ -101,7 +111,7 @@ } else { \ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ - if (setjmp( __f.jmp )) { \ + if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -112,7 +122,7 @@ break; \ } else { \ __f.frame.Handler = __wine_exception_handler_page_fault; \ - if (setjmp( __f.jmp )) { \ + if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -123,7 +133,7 @@ break; \ } else { \ __f.frame.Handler = __wine_exception_handler_all; \ - if (setjmp( __f.jmp )) { \ + if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -153,9 +163,6 @@ typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); -#define WINE_EXCEPTION_FILTER(func) LONG WINAPI func( EXCEPTION_POINTERS *__eptr ) -#define WINE_FINALLY_FUNC(func) void CALLBACK func( BOOL __normal ) - #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) @@ -172,7 +179,7 @@ /* finally data */ __WINE_FINALLY finally_func; } u; - jmp_buf jmp; + sigjmp_buf jmp; /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode; const struct __tagWINE_FRAME *ExceptionRecord; @@ -180,7 +187,7 @@ #endif /* USE_COMPILER_EXCEPTIONS */ -static __inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { #if defined(__GNUC__) && defined(__i386__) EXCEPTION_REGISTRATION_RECORD *prev; @@ -191,13 +198,13 @@ return prev; #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - frame->Prev = (void *)teb->ExceptionList; - teb->ExceptionList = (void *)frame; + frame->Prev = teb->ExceptionList; + teb->ExceptionList = frame; return frame->Prev; #endif } -static __inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { #if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)" @@ -206,12 +213,55 @@ #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - teb->ExceptionList = (void *)frame->Prev; + teb->ExceptionList = frame->Prev; return frame->Prev; #endif } +/* Exception handling flags - from OS/2 2.0 exception handling */ + +/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ +#define EH_NONCONTINUABLE 0x01 +#define EH_UNWINDING 0x02 +#define EH_EXIT_UNWIND 0x04 +#define EH_STACK_INVALID 0x08 +#define EH_NESTED_CALL 0x10 + +/* Wine-specific exceptions codes */ + +#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ +#define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ + +/* unhandled return status from vm86 mode */ +#define EXCEPTION_VM86_INTx 0x80000110 +#define EXCEPTION_VM86_STI 0x80000111 +#define EXCEPTION_VM86_PICRETURN 0x80000112 + +extern void __wine_enter_vm86( CONTEXT *context ); + #ifndef USE_COMPILER_EXCEPTIONS + +/* wrapper for RtlUnwind since it clobbers registers on Windows */ +static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record ) +{ +#if defined(__GNUC__) && defined(__i386__) + int dummy1, dummy2, dummy3; + __asm__ __volatile__("pushl %%ebp\n\t" + "pushl %%ebx\n\t" + "pushl $0\n\t" + "pushl %2\n\t" + "pushl $0\n\t" + "pushl %1\n\t" + "call *%0\n\t" + "popl %%ebx\n\t" + "popl %%ebp" + : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) + : "0" (RtlUnwind), "1" (frame), "2" (record) + : "ecx", "edx", "memory" ); +#else + RtlUnwind( frame, 0, record, 0 ); +#endif +} static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame ) @@ -222,65 +272,36 @@ wine_frame->ExceptionCode = record->ExceptionCode; wine_frame->ExceptionRecord = wine_frame; -#if defined(__GNUC__) && defined(__i386__) - { - /* RtlUnwind clobbers registers on Windows */ - int dummy1, dummy2, dummy3; - __asm__ __volatile__("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl $0\n\t" - "pushl %2\n\t" - "pushl $0\n\t" - "pushl %1\n\t" - "call *%0\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) - : "0" (RtlUnwind), "1" (frame), "2" (record) - : "ecx", "edx", "memory" ); - } -#else - RtlUnwind( frame, 0, record, 0 ); -#endif + __wine_rtl_unwind( frame, record ); __wine_pop_frame( frame ); - longjmp( wine_frame->jmp, 1 ); + siglongjmp( wine_frame->jmp, 1 ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_exception_handler( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + EXCEPTION_POINTERS ptrs; if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) return ExceptionContinueSearch; - if (wine_frame->u.filter == (void *)1) /* special hack for page faults */ + ptrs.ExceptionRecord = record; + ptrs.ContextRecord = context; + switch(wine_frame->u.filter( &ptrs )) { - if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) - return ExceptionContinueSearch; - } - else if (wine_frame->u.filter) - { - EXCEPTION_POINTERS ptrs; - ptrs.ExceptionRecord = record; - ptrs.ContextRecord = context; - switch(wine_frame->u.filter( &ptrs )) - { - case EXCEPTION_CONTINUE_SEARCH: - return ExceptionContinueSearch; - case EXCEPTION_CONTINUE_EXECUTION: - return ExceptionContinueExecution; - case EXCEPTION_EXECUTE_HANDLER: - break; - default: - break; - } + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; } __wine_unwind_frame( record, frame ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_exception_handler_page_fault( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { @@ -291,7 +312,7 @@ __wine_unwind_frame( record, frame ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_exception_handler_all( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { @@ -300,7 +321,7 @@ __wine_unwind_frame( record, frame ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_finally_handler( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { @@ -314,32 +335,8 @@ #endif /* USE_COMPILER_EXCEPTIONS */ -/* Exception handling flags - from OS/2 2.0 exception handling */ - -/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 - -/* Wine-specific exceptions codes */ - -#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ -#define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ - -/* unhandled return status from vm86 mode */ -#define EXCEPTION_VM86_INTx 0x80000110 -#define EXCEPTION_VM86_STI 0x80000111 -#define EXCEPTION_VM86_PICRETURN 0x80000112 - -extern void __wine_enter_vm86( CONTEXT *context ); - -static __inline WINE_EXCEPTION_FILTER(__wine_pagefault_filter) -{ - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) - return EXCEPTION_CONTINUE_SEARCH; - return EXCEPTION_EXECUTE_HANDLER; -} +#ifdef __cplusplus +} +#endif #endif /* __WINE_WINE_EXCEPTION_H */

15 years, 9 months

[tkreuzer] 38046: Add 101 tests for GetSystemMetrics

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 11:55:44 2008 New Revision: 38046 URL: http://svn.reactos.org/svn/reactos?rev=38046&view=rev Log: Add 101 tests for GetSystemMetrics Added: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c (with props) Modified: trunk/rostests/apitests/user32api/testlist.c Modified: trunk/rostests/apitests/user32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/testli… ============================================================================== --- trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] Sat Dec 13 11:55:44 2008 @@ -6,6 +6,7 @@ #include "user32api.h" /* include the tests */ +#include "tests/GetSystemMetrics.c" #include "tests/InitializeLpkHooks.c" #include "tests/ScrollDC.c" #include "tests/ScrollWindowEx.c" @@ -14,6 +15,7 @@ /* The List of tests */ TESTENTRY TestList[] = { + { L"GetSystemMetrics", Test_GetSystemMetrics }, { L"InitializeLpkHooks", Test_InitializeLpkHooks }, { L"ScrollDC", Test_ScrollDC }, { L"ScrollWindowEx", Test_ScrollWindowEx }, Added: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c (added) +++ trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c [iso-8859-1] Sat Dec 13 11:55:44 2008 @@ -1,0 +1,396 @@ + +INT +Test_GetSystemMetrics(PTESTINFO pti) +{ + INT ret; + HDC hDC; + BOOL BoolVal; + UINT UintVal; + RECT rect; + + SetLastError(0); + hDC = GetDC(0); + + ret = GetSystemMetrics(0); + TEST(ret > 0); + + ret = GetSystemMetrics(64); + TEST(ret == 0); + ret = GetSystemMetrics(65); + TEST(ret == 0); + ret = GetSystemMetrics(66); + TEST(ret == 0); + + + ret = GetSystemMetrics(SM_CXSCREEN); + TEST(ret == GetDeviceCaps(hDC, HORZRES)); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSCREEN); + TEST(ret == GetDeviceCaps(hDC, VERTRES)); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXVSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYHSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYCAPTION); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXDLGFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYDLGFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYVTHUMB); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXHTHUMB); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXCURSOR); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYCURSOR); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMENU); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + SystemParametersInfoW(SPI_GETWORKAREA, 0, &rect, 0); + ret = GetSystemMetrics(SM_CXFULLSCREEN); + TEST(ret == rect.right); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYFULLSCREEN); + TEST(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION)); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYKANJIWINDOW); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MOUSEPRESENT); + TEST(ret == 1); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYVSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXHSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_DEBUG); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SWAPBUTTON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED1); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED2); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED3); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED4); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMIN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMIN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMINTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMINTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXDOUBLECLK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYDOUBLECLK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXICONSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYICONSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MENUDROPALIGNMENT); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_PENWINDOWS); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_DBCSENABLED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CMOUSEBUTTONS); +// TEST(ret == 0); + TEST(GetLastError() == 0); + +#if(WINVER >= 0x0400) + ret = GetSystemMetrics(SM_SECURE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXEDGE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYEDGE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMINSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMINSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXSMICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSMICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSMCAPTION); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXSMSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSMSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMENUSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMENUSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_ARRANGE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMINIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMINIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMAXTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMAXTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMAXIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMAXIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_NETWORK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CLEANBOOT); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXDRAG); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYDRAG); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SHOWSOUNDS); + SystemParametersInfoW(SPI_GETSHOWSOUNDS, 0, &BoolVal, 0); + TEST(ret == BoolVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMENUCHECK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMENUCHECK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SLOWMACHINE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MIDEASTENABLED); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) + ret = GetSystemMetrics(SM_MOUSEWHEELPRESENT); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(WINVER >= 0x0500) + ret = GetSystemMetrics(SM_XVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_YVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CMONITORS); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SAMEDISPLAYFORMAT); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(_WIN32_WINNT >= 0x0500) + ret = GetSystemMetrics(SM_IMMENABLED); + TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(_WIN32_WINNT >= 0x0501) + ret = GetSystemMetrics(SM_CXFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_TABLETPC); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MEDIACENTER); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_STARTER); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SERVERR2); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(_WIN32_WINNT >= 0x0600) + ret = GetSystemMetrics(SM_MOUSEHORIZONTALWHEELPRESENT); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXPADDEDBORDER); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 9 months

[tkreuzer] 38045: Add DumpMem function to apitests lib for debugging purposes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 13 10:52:49 2008 New Revision: 38045 URL: http://svn.reactos.org/svn/reactos?rev=38045&view=rev Log: Add DumpMem function to apitests lib for debugging purposes Modified: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/apitest.h Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=38… ============================================================================== --- trunk/rostests/apitests/apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apitest.c [iso-8859-1] Sat Dec 13 10:52:49 2008 @@ -78,6 +78,36 @@ WriteFile(hFile, szLine, strlen(szLine), lpdwBytesWritten, NULL); return TRUE; +} + +static CHAR +GetDisplayChar(CHAR c) +{ + if (c < 32) return '.'; + return c; +} + +VOID +DumpMem(PVOID pData, ULONG cbSize, ULONG nWidth) +{ + ULONG cLines = (cbSize + nWidth - 1) / nWidth; + ULONG cbLastLine = cbSize % nWidth; + INT i,j; + + for (i = 0; i <= cLines; i++) + { + printf("%08lx: ", i*nWidth); + for (j = 0; j < (i == cLines? cbLastLine : nWidth); j++) + { + printf("%02x ", ((BYTE*)pData)[i*nWidth + j]); + } + printf(" "); + for (j = 0; j < (i == cLines? cbLastLine : nWidth); j++) + { + printf("%c", GetDisplayChar(((CHAR*)pData)[i*nWidth + j])); + } + printf("\n"); + } } int Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=38… ============================================================================== --- trunk/rostests/apitests/apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/apitest.h [iso-8859-1] Sat Dec 13 10:52:49 2008 @@ -91,5 +91,6 @@ extern TESTENTRY TestList[]; INT NumTests(void); BOOL IsFunctionPresent(LPWSTR lpszFunction); +VOID DumpMem(PVOID pData, ULONG cbSize, ULONG nWidth); #endif /* _APITEST_H */

15 years, 9 months

← Newer
1
...
42
43
44
45
46
47
48
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008