Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cfinck] 37061: Delete the 0.3.7 branch, it will be rebranched from trunk

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Oct 29 10:43:10 2008 New Revision: 37061 URL: http://svn.reactos.org/svn/reactos?rev=37061&view=rev Log: Delete the 0.3.7 branch, it will be rebranched from trunk Removed: branches/ros-branch-0_3_7/

16 years, 1 month

[hyperion] 37060: Daily merge from trunk (36960-37059). You guys sure commit a lot

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 09:36:57 2008 New Revision: 37060 URL: http://svn.reactos.org/svn/reactos?rev=37060&view=rev Log: Daily merge from trunk (36960-37059). You guys sure commit a lot Removed: branches/the-real-msvc/include/reactos/config.h branches/the-real-msvc/lib/rtl/rtl-common.rbuild branches/the-real-msvc/subsystems/win32/win32k/win32k.def Modified: branches/the-real-msvc/ReactOS-arm.rbuild branches/the-real-msvc/ReactOS-generic.rbuild branches/the-real-msvc/ReactOS-i386.rbuild branches/the-real-msvc/base/applications/cmdutils/xcopy/rsrc.rc branches/the-real-msvc/base/applications/network/ipconfig/ipconfig.c branches/the-real-msvc/base/applications/winhlp32/winhlp32.rbuild branches/the-real-msvc/base/applications/wordpad/Ko.rc branches/the-real-msvc/base/applications/wordpad/Nl.rc branches/the-real-msvc/base/applications/wordpad/registry.c branches/the-real-msvc/base/applications/wordpad/rsrc.rc branches/the-real-msvc/base/applications/wordpad/wordpad.c branches/the-real-msvc/base/services/dhcp/dhclient.c branches/the-real-msvc/base/services/umpnpmgr/umpnpmgr.c branches/the-real-msvc/base/system/services/rpcserver.c branches/the-real-msvc/boot/bootdata/packages/reactos.dff branches/the-real-msvc/boot/freeldr/freeldr/freeldr.rbuild branches/the-real-msvc/boot/freeldr/freeldr/setupldr.rbuild branches/the-real-msvc/dll/directx/ddraw/Surface/createsurface.c branches/the-real-msvc/dll/directx/quartz/quartz.rbuild branches/the-real-msvc/dll/ntdll/ntdll.rbuild branches/the-real-msvc/dll/win32/advapi32/reg/reg.c branches/the-real-msvc/dll/win32/advapi32/sec/lsa.c branches/the-real-msvc/dll/win32/advapi32/sec/misc.c branches/the-real-msvc/dll/win32/advapi32/sec/sec.c branches/the-real-msvc/dll/win32/advapi32/sec/sid.c branches/the-real-msvc/dll/win32/advapi32/service/scm.c branches/the-real-msvc/dll/win32/advapi32/service/sctrl.c branches/the-real-msvc/dll/win32/gdi32/misc/hacks.c branches/the-real-msvc/dll/win32/gdi32/objects/coord.c branches/the-real-msvc/dll/win32/iphlpapi/iphlpapi_main.c branches/the-real-msvc/dll/win32/iphlpapi/resinfo.h branches/the-real-msvc/dll/win32/iphlpapi/resinfo_reactos.c branches/the-real-msvc/dll/win32/kernel32/thread/i386/fiber.S branches/the-real-msvc/dll/win32/lsasrv/lsarpc.c branches/the-real-msvc/dll/win32/netcfgx/inetcfgcomp_iface.c branches/the-real-msvc/dll/win32/netcfgx/netcfg_iface.c branches/the-real-msvc/dll/win32/netcfgx/netcfgx.rbuild branches/the-real-msvc/dll/win32/netcfgx/precomp.h branches/the-real-msvc/dll/win32/netcfgx/tcpipconf_notify.c branches/the-real-msvc/dll/win32/netshell/lang/bg-BG.rc branches/the-real-msvc/dll/win32/netshell/lang/cs-CZ.rc branches/the-real-msvc/dll/win32/netshell/lang/da-DK.rc branches/the-real-msvc/dll/win32/netshell/lang/de-DE.rc branches/the-real-msvc/dll/win32/netshell/lang/el-GR.rc branches/the-real-msvc/dll/win32/netshell/lang/en-US.rc branches/the-real-msvc/dll/win32/netshell/lang/es-ES.rc branches/the-real-msvc/dll/win32/netshell/lang/fr-FR.rc branches/the-real-msvc/dll/win32/netshell/lang/hu-HU.rc branches/the-real-msvc/dll/win32/netshell/lang/id-ID.rc branches/the-real-msvc/dll/win32/netshell/lang/it-IT.rc branches/the-real-msvc/dll/win32/netshell/lang/ja-JP.rc branches/the-real-msvc/dll/win32/netshell/lang/nl-NL.rc branches/the-real-msvc/dll/win32/netshell/lang/no-NO.rc branches/the-real-msvc/dll/win32/netshell/lang/pl-PL.rc branches/the-real-msvc/dll/win32/netshell/lang/ru-RU.rc branches/the-real-msvc/dll/win32/netshell/lang/sk-SK.rc branches/the-real-msvc/dll/win32/netshell/lang/sv-SE.rc branches/the-real-msvc/dll/win32/netshell/lang/uk-UA.rc branches/the-real-msvc/dll/win32/netshell/lang/zh-CN.rc branches/the-real-msvc/dll/win32/netshell/lanstatusui.c branches/the-real-msvc/dll/win32/netshell/precomp.h branches/the-real-msvc/dll/win32/ole32/moniker.c branches/the-real-msvc/dll/win32/ole32/ole32.rbuild branches/the-real-msvc/dll/win32/riched20/editor.c branches/the-real-msvc/dll/win32/riched20/editstr.h branches/the-real-msvc/dll/win32/riched20/paint.c branches/the-real-msvc/dll/win32/riched20/para.c branches/the-real-msvc/dll/win32/riched20/reader.c branches/the-real-msvc/dll/win32/riched20/string.c branches/the-real-msvc/dll/win32/riched20/table.c branches/the-real-msvc/dll/win32/riched20/txtsrv.c branches/the-real-msvc/dll/win32/riched20/undo.c branches/the-real-msvc/dll/win32/riched20/wrap.c branches/the-real-msvc/dll/win32/riched20/writer.c branches/the-real-msvc/dll/win32/setupapi/cfgmgr.c branches/the-real-msvc/dll/win32/shell32/systray.c branches/the-real-msvc/dll/win32/syssetup/wizard.c branches/the-real-msvc/dll/win32/user32/misc/dde.c branches/the-real-msvc/dll/win32/winspool/info.c branches/the-real-msvc/dll/win32/winspool/stubs.c branches/the-real-msvc/dll/win32/winspool/winspool.rbuild branches/the-real-msvc/drivers/filesystems/npfs/rw.c branches/the-real-msvc/drivers/network/afd/afd/main.c branches/the-real-msvc/drivers/network/tcpip/datalink/lan.c branches/the-real-msvc/drivers/network/tcpip/include/ports.h branches/the-real-msvc/drivers/network/tcpip/tcpip/fileobjs.c branches/the-real-msvc/include/ndk/asm.h branches/the-real-msvc/include/psdk/winnt.h branches/the-real-msvc/include/psdk/winspool.h branches/the-real-msvc/include/psdk/winsvc.h branches/the-real-msvc/include/reactos/idl/lsa.idl branches/the-real-msvc/include/reactos/idl/svcctl.idl branches/the-real-msvc/include/reactos/win32k/ntuser.h branches/the-real-msvc/lib/cmlib/cmlib.rbuild branches/the-real-msvc/lib/drivers/ip/network/neighbor.c branches/the-real-msvc/lib/drivers/ip/network/ports.c branches/the-real-msvc/lib/drivers/ip/transport/rawip/rawip.c branches/the-real-msvc/lib/drivers/ip/transport/tcp/accept.c branches/the-real-msvc/lib/drivers/ip/transport/tcp/tcp.c branches/the-real-msvc/lib/drivers/ip/transport/udp/udp.c branches/the-real-msvc/lib/host/wcsfuncs/wcsfuncs.rbuild branches/the-real-msvc/lib/inflib/inflib.rbuild branches/the-real-msvc/lib/rtl/rtl.rbuild branches/the-real-msvc/ntoskrnl/ntoskrnl-generic.rbuild branches/the-real-msvc/ntoskrnl/vdm/vdmmain.c branches/the-real-msvc/subsystems/win32/win32k/dib/dib16bpp.c branches/the-real-msvc/subsystems/win32/win32k/dib/dib24bpp.c branches/the-real-msvc/subsystems/win32/win32k/dib/dib32bpp.c branches/the-real-msvc/subsystems/win32/win32k/dib/dib8bpp.c branches/the-real-msvc/subsystems/win32/win32k/ntuser/cursoricon.c branches/the-real-msvc/subsystems/win32/win32k/ntuser/message.c branches/the-real-msvc/subsystems/win32/win32k/objects/coord.c branches/the-real-msvc/subsystems/win32/win32k/objects/pen.c branches/the-real-msvc/subsystems/win32/win32k/stubs/stubs.c branches/the-real-msvc/subsystems/win32/win32k/win32k.rbuild branches/the-real-msvc/tools/cabman/cabman.rbuild branches/the-real-msvc/tools/mkhive/mkhive.rbuild branches/the-real-msvc/tools/rbuild/project.cpp branches/the-real-msvc/tools/rbuild/rbuild.h branches/the-real-msvc/tools/unicode/unicode.rbuild branches/the-real-msvc/tools/widl/header.c branches/the-real-msvc/tools/widl/proxy.c branches/the-real-msvc/tools/widl/widl.rbuild branches/the-real-msvc/tools/winebuild/main.c branches/the-real-msvc/tools/winebuild/winebuild.rbuild branches/the-real-msvc/tools/wmc/wmc.rbuild branches/the-real-msvc/tools/wpp/wpp.rbuild branches/the-real-msvc/tools/wrc/wrc.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/the-real-msvc/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ReactOS-arm.rbuil… Modified: branches/the-real-msvc/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ReactOS-generic.r… Modified: branches/the-real-msvc/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ReactOS-i386.rbui… Modified: branches/the-real-msvc/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/applications… Modified: branches/the-real-msvc/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/services/dhc… Modified: branches/the-real-msvc/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/services/ump… Modified: branches/the-real-msvc/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/system/servi… Modified: branches/the-real-msvc/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/boot/bootdata/pac… Modified: branches/the-real-msvc/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/boot/freeldr/free… Modified: branches/the-real-msvc/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/boot/freeldr/free… Modified: branches/the-real-msvc/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/directx/ddraw… Modified: branches/the-real-msvc/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/directx/quart… Modified: branches/the-real-msvc/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/ntdll/ntdll.r… Modified: branches/the-real-msvc/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3… Modified: branches/the-real-msvc/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3… Modified: branches/the-real-msvc/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3… Modified: branches/the-real-msvc/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3… Modified: branches/the-real-msvc/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3… Modified: branches/the-real-msvc/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3… Modified: branches/the-real-msvc/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/advapi3… Modified: branches/the-real-msvc/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/gdi32/m… Modified: branches/the-real-msvc/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/gdi32/o… Modified: branches/the-real-msvc/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/iphlpap… Modified: branches/the-real-msvc/dll/win32/iphlpapi/resinfo.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/iphlpap… Modified: branches/the-real-msvc/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/iphlpap… Modified: branches/the-real-msvc/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/kernel3… Modified: branches/the-real-msvc/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/lsasrv/… Modified: branches/the-real-msvc/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netcfgx… Modified: branches/the-real-msvc/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netcfgx… Modified: branches/the-real-msvc/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netcfgx… Modified: branches/the-real-msvc/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netcfgx… Modified: branches/the-real-msvc/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netcfgx… Modified: branches/the-real-msvc/dll/win32/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/netshel… Modified: branches/the-real-msvc/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/ole32/m… Modified: branches/the-real-msvc/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/ole32/o… Modified: branches/the-real-msvc/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/riched2… Modified: branches/the-real-msvc/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/setupap… Modified: branches/the-real-msvc/dll/win32/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/shell32… Modified: branches/the-real-msvc/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/syssetu… Modified: branches/the-real-msvc/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/user32/… Modified: branches/the-real-msvc/dll/win32/winspool/info.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/winspoo… Modified: branches/the-real-msvc/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/winspoo… Modified: branches/the-real-msvc/dll/win32/winspool/winspool.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/winspoo… Modified: branches/the-real-msvc/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/filesyste… Modified: branches/the-real-msvc/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/network/a… Modified: branches/the-real-msvc/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/network/t… Modified: branches/the-real-msvc/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/network/t… Modified: branches/the-real-msvc/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/network/t… Modified: branches/the-real-msvc/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/ndk/asm.h… Modified: branches/the-real-msvc/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/winn… Modified: branches/the-real-msvc/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/wins… Modified: branches/the-real-msvc/include/psdk/winsvc.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/wins… Removed: branches/the-real-msvc/include/reactos/config.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/c… Modified: branches/the-real-msvc/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/i… Modified: branches/the-real-msvc/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/i… Modified: branches/the-real-msvc/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… Modified: branches/the-real-msvc/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/cmlib/cmlib.r… Modified: branches/the-real-msvc/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/drivers/ip/ne… Modified: branches/the-real-msvc/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/drivers/ip/ne… Modified: branches/the-real-msvc/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/drivers/ip/tr… Modified: branches/the-real-msvc/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/drivers/ip/tr… Modified: branches/the-real-msvc/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/drivers/ip/tr… Modified: branches/the-real-msvc/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/drivers/ip/tr… Modified: branches/the-real-msvc/lib/host/wcsfuncs/wcsfuncs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/host/wcsfuncs… Modified: branches/the-real-msvc/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/inflib/inflib… Removed: branches/the-real-msvc/lib/rtl/rtl-common.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/rtl-commo… Modified: branches/the-real-msvc/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/rtl.rbuil… Modified: branches/the-real-msvc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/ntoskrnl… Modified: branches/the-real-msvc/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ntoskrnl/vdm/vdmm… Modified: branches/the-real-msvc/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Removed: branches/the-real-msvc/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/subsystems/win32/… Modified: branches/the-real-msvc/tools/cabman/cabman.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/cabman/cabm… Modified: branches/the-real-msvc/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/mkhive/mkhi… Modified: branches/the-real-msvc/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/proj… Modified: branches/the-real-msvc/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/rbui… Modified: branches/the-real-msvc/tools/unicode/unicode.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/unicode/uni… Modified: branches/the-real-msvc/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/widl/header… Modified: branches/the-real-msvc/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/widl/proxy.… Modified: branches/the-real-msvc/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/widl/widl.r… Modified: branches/the-real-msvc/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/winebuild/m… Modified: branches/the-real-msvc/tools/winebuild/winebuild.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/winebuild/w… Modified: branches/the-real-msvc/tools/wmc/wmc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/wmc/wmc.rbu… Modified: branches/the-real-msvc/tools/wpp/wpp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/wpp/wpp.rbu… Modified: branches/the-real-msvc/tools/wrc/wrc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/wrc/wrc.rbu…

16 years, 1 month

[janderwald] 37059: - Delete Gateway Address from TcpipSettings when the gateway has been removed - Correctly check if there is Gateway set when initializing - Delete all old routes when applying changes - Add new gateway when applying changes

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 29 09:12:29 2008 New Revision: 37059 URL: http://svn.reactos.org/svn/reactos?rev=37059&view=rev Log: - Delete Gateway Address from TcpipSettings when the gateway has been removed - Correctly check if there is Gateway set when initializing - Delete all old routes when applying changes - Add new gateway when applying changes Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Wed Oct 29 09:12:29 2008 @@ -2174,6 +2174,15 @@ /* store default gateway */ This->pCurrentConfig->Gw->IpAddress = dwIpAddr; } + else + { + if (This->pCurrentConfig->Gw) + { + IP_ADDR * pNextGw = This->pCurrentConfig->Gw->Next; + CoTaskMemFree(This->pCurrentConfig->Gw); + This->pCurrentConfig->Gw = pNextGw; + } + } } else { @@ -2304,7 +2313,7 @@ /* set current hostmask */ SendDlgItemMessageA(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ip->u.Subnetmask); } - if (pCurSettings->Gw->IpAddress) + if (pCurSettings->Gw && pCurSettings->Gw->IpAddress) { /* set current gateway */ SendDlgItemMessageA(hwndDlg, IDC_DEFGATEWAY, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Gw->IpAddress); @@ -3211,38 +3220,82 @@ } } - pStr = CreateMultiSzString(pCurrentConfig->Gw, IPADDR, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - - pStr = CreateMultiSzString(pCurrentConfig->Gw, METRIC, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - } - - if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive) - { - RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); - } - else - { - pStr = CreateMultiSzString(pCurrentConfig->Ns, IPADDR, &dwSize, TRUE); - if(pStr) - { - RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize); - RegDeleteValueW(hKey, L"DhcpNameServer"); - CoTaskMemFree(pStr); - } - } - RegCloseKey(hKey); - } - + if (pOldConfig->Gw) + { + dwSize = 0; + if (GetIpForwardTable(NULL, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) + { + DWORD Index; + PMIB_IPFORWARDTABLE pIpForwardTable = (PMIB_IPFORWARDTABLE)CoTaskMemAlloc(dwSize); + if (pIpForwardTable) + { + if (GetIpForwardTable(pIpForwardTable, &dwSize, FALSE) == NO_ERROR) + { + for (Index = 0; Index < pIpForwardTable->dwNumEntries; Index++) + { + if (pIpForwardTable->table[Index].dwForwardIfIndex == pOldConfig->Index) + { + DeleteIpForwardEntry(&pIpForwardTable->table[Index]); + } + } + } + CoTaskMemFree(pIpForwardTable); + } + } + } + + if (pCurrentConfig->Gw) + { + MIB_IPFORWARDROW RouterMib; + ZeroMemory(&RouterMib, sizeof(MIB_IPFORWARDROW)); + + RouterMib.dwForwardMetric1 = 1; + RouterMib.dwForwardIfIndex = pOldConfig->Index; + RouterMib.dwForwardNextHop = htonl(pCurrentConfig->Gw->IpAddress); + + //TODO + // add multiple gw addresses when required + + if (CreateIpForwardEntry(&RouterMib) == NO_ERROR) + { + pStr = CreateMultiSzString(pCurrentConfig->Gw, IPADDR, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + + pStr = CreateMultiSzString(pCurrentConfig->Gw, METRIC, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + } + } + else + { + RegSetValueExW(hKey, L"DefaultGateway", 0, REG_MULTI_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); + RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", sizeof(WCHAR) * 2); + } + + if (!pCurrentConfig->Ns || pCurrentConfig->AutoconfigActive) + { + RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)L"", 1 * sizeof(WCHAR)); + } + else + { + pStr = CreateMultiSzString(pCurrentConfig->Ns, IPADDR, &dwSize, TRUE); + if(pStr) + { + RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize); + RegDeleteValueW(hKey, L"DhcpNameServer"); + CoTaskMemFree(pStr); + } + } + RegCloseKey(hKey); + } + } return S_OK; }

16 years, 1 month

[janderwald] 37058: - Only display the default gateway when there is actually a gateway set

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 29 08:49:10 2008 New Revision: 37058 URL: http://svn.reactos.org/svn/reactos?rev=37058&view=rev Log: - Only display the default gateway when there is actually a gateway set Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Wed Oct 29 08:49:10 2008 @@ -454,7 +454,10 @@ _tprintf(_T("\tIP Address. . . . . . . . . . . . : %s\n"), pAdapter->IpAddressList.IpAddress.String); _tprintf(_T("\tSubnet Mask . . . . . . . . . . . : %s\n"), pAdapter->IpAddressList.IpMask.String); - _tprintf(_T("\tDefault Gateway . . . . . . . . . : %s\n"), pAdapter->GatewayList.IpAddress.String); + if (pAdapter->GatewayList.IpAddress.String[0] != '0') + _tprintf(_T("\tDefault Gateway . . . . . . . . . : %s\n"), pAdapter->GatewayList.IpAddress.String); + else + _tprintf(_T("\tDefault Gateway . . . . . . . . . :\n")); if (bAll) {

16 years, 1 month

[hyperion] 37057: added include/crt/mingw32/intrin.h added include/crt/mingw32/intrin_arm.h added include/crt/mingw32/intrin_ppc.h added include/crt/mingw32/intrin_x86.h added include/crt/mingw32/intrin_x86_64.h deleted include/psdk/intrin.h.bak deleted include/psdk/intrin_arm.h deleted include/psdk/intrin_ppc.h deleted include/psdk/intrin_x86.h deleted include/psdk/intrin_x86_64.h Moved <intrin.h> from PSDK to MinGW backend, where it belongs modified ReactOS-generic.rbuild modified tools/rbuild

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 08:43:31 2008 New Revision: 37057 URL: http://svn.reactos.org/svn/reactos?rev=37057&view=rev Log: added include/crt/mingw32/intrin.h added include/crt/mingw32/intrin_arm.h added include/crt/mingw32/intrin_ppc.h added include/crt/mingw32/intrin_x86.h added include/crt/mingw32/intrin_x86_64.h deleted include/psdk/intrin.h.bak deleted include/psdk/intrin_arm.h deleted include/psdk/intrin_ppc.h deleted include/psdk/intrin_x86.h deleted include/psdk/intrin_x86_64.h Moved <intrin.h> from PSDK to MinGW backend, where it belongs modified ReactOS-generic.rbuild modified tools/rbuild/backend/mingw/modulehandler.cpp Don't compile against an external CRT, it's just not worth it ReactOS is compiled with MinGW: to support new compilers, port MinGW modified tools/rbuild/backend/mingw/mingw.cpp Disable more warnings. This should really go in a standard header file or a response file Added: branches/the-real-msvc/include/crt/mingw32/intrin.h (props changed) - copied unchanged from r36960, branches/the-real-msvc/include/psdk/intrin.h branches/the-real-msvc/include/crt/mingw32/intrin_arm.h (props changed) - copied unchanged from r36960, branches/the-real-msvc/include/psdk/intrin_arm.h branches/the-real-msvc/include/crt/mingw32/intrin_ppc.h (props changed) - copied unchanged from r36960, branches/the-real-msvc/include/psdk/intrin_ppc.h branches/the-real-msvc/include/crt/mingw32/intrin_x86.h (props changed) - copied unchanged from r36960, branches/the-real-msvc/include/psdk/intrin_x86.h branches/the-real-msvc/include/crt/mingw32/intrin_x86_64.h (props changed) - copied unchanged from r36960, branches/the-real-msvc/include/psdk/intrin_x86_64.h Removed: branches/the-real-msvc/include/psdk/intrin.h.bak branches/the-real-msvc/include/psdk/intrin_arm.h branches/the-real-msvc/include/psdk/intrin_ppc.h branches/the-real-msvc/include/psdk/intrin_x86.h branches/the-real-msvc/include/psdk/intrin_x86_64.h Modified: branches/the-real-msvc/ReactOS-generic.rbuild branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/the-real-msvc/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ReactOS-generic.r… ============================================================================== --- branches/the-real-msvc/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/the-real-msvc/ReactOS-generic.rbuild [iso-8859-1] Wed Oct 29 08:43:31 2008 @@ -64,8 +64,8 @@ <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> <include root="intermediate">include/dxsdk</include> -  -  + <include>include/crt</include> + <include>include/crt/msc</include> <include>include/ddk</include> <include>include/GL</include> <include>include/ndk</include> Propchange: branches/the-real-msvc/include/crt/mingw32/intrin.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/mingw32/intrin.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_arm.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_arm.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_arm.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_ppc.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_ppc.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_x86.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_x86.h ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_x86_64.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/mingw32/intrin_x86_64.h ------------------------------------------------------------------------------ svn:mergeinfo = Removed: branches/the-real-msvc/include/psdk/intrin.h.bak URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/intr… ============================================================================== --- branches/the-real-msvc/include/psdk/intrin.h.bak [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/intrin.h.bak (removed) @@ -1,96 +1,0 @@ -/* - Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic - Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) - projects. - - Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#ifndef KJK_INTRIN_H_ -#define KJK_INTRIN_H_ - -#ifndef __GNUC__ -#error Unsupported compiler -#endif - -/* - FIXME: review all "memory" clobbers, add/remove to match Visual C++ - behavior: some "obvious" memory barriers are not present in the Visual C++ - implementation - e.g. __stosX; on the other hand, some memory barriers that - *are* present could have been missed -*/ - -/* - NOTE: this is a *compatibility* header. Some functions may look wrong at - first, but they're only "as wrong" as they would be on Visual C++. Our - priority is compatibility - - NOTE: unlike most people who write inline asm for GCC, I didn't pull the - constraints and the uses of __volatile__ out of my... hat. Do not touch - them. I hate cargo cult programming - - NOTE: be very careful with declaring "memory" clobbers. Some "obvious" - barriers aren't there in Visual C++ (e.g. __stosX) - - NOTE: review all intrinsics with a return value, add/remove __volatile__ - where necessary. If an intrinsic whose value is ignored generates a no-op - under Visual C++, __volatile__ must be omitted; if it always generates code - (for example, if it has side effects), __volatile__ must be specified. GCC - will only optimize out non-volatile asm blocks with outputs, so input-only - blocks are safe. Oddities such as the non-volatile 'rdmsr' are intentional - and follow Visual C++ behavior - - NOTE: on GCC 4.1.0, please use the __sync_* built-ins for barriers and - atomic operations. Test the version like this: - - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 - ... - - Pay attention to the type of barrier. Make it match with what Visual C++ - would use in the same case -*/ - -#if defined(__i386__) -#include "intrin_x86.h" -#elif defined(_PPC_) -#include "intrin_ppc.h" -#elif defined(_MIPS_) -#include "intrin_mips.h" -#elif defined(_M_ARM) -#include "intrin_arm.h" -#elif defined(__x86_64__) -/* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ -#include "intrin_x86.h" -#else -#error Unsupported architecture -#endif - - -/*** Miscellaneous ***/ -/* BUGBUG: only good for use in macros. Cannot be taken the address of */ -#define __noop(...) ((void)0) - -/* TODO: __assume. GCC only supports the weaker __builtin_expect */ - -#endif - -/* EOF */ Removed: branches/the-real-msvc/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/intr… ============================================================================== --- branches/the-real-msvc/include/psdk/intrin_arm.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/intrin_arm.h (removed) @@ -1,315 +1,0 @@ -/* - Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic - Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) - projects. - - Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#ifndef KJK_INTRIN_ARM_H_ -#define KJK_INTRIN_ARM_H_ - -#ifndef __GNUC__ -#error Unsupported compiler -#endif - -#define _ReadWriteBarrier() __sync_synchronize() - -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const dest, const long exch, const long comp) -{ - long a, b; - - __asm__ __volatile__ ( "0:\n\t" - "ldr %1, [%2]\n\t" - "cmp %1, %4\n\t" - "bne 1f\n\t" - "swp %0, %3, [%2]\n\t" - "cmp %0, %1\n\t" - "swpne %3, %0, [%2]\n\t" - "bne 0b\n\t" - "1:" - : "=&r" (a), "=&r" (b) - : "r" (dest), "r" (exch), "r" (comp) - : "cc", "memory"); - - return a; -} - -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const dest, const long long exch, const long long comp) -{ - // - // FIXME - // - long long result; - result = *dest; - if (*dest == comp) *dest = exch; - return result; -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - return (void*)_InterlockedCompareExchange((volatile long* const)Destination, (const long)Exchange, (const long)Comperand); -} - - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const dest, const long add) -{ - long a, b, c; - - __asm__ __volatile__ ( "0:\n\t" - "ldr %0, [%3]\n\t" - "add %1, %0, %4\n\t" - "swp %2, %1, [%3]\n\t" - "cmp %0, %2\n\t" - "swpne %1, %2, [%3]\n\t" - "bne 0b" - : "=&r" (a), "=&r" (b), "=&r" (c) - : "r" (dest), "r" (add) - : "cc", "memory"); - - return a; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const dest, const long exch) -{ - long a; - - __asm__ __volatile__ ( "swp %0, %2, [%1]" - : "=&r" (a) - : "r" (dest), "r" (exch)); - - return a; -} - - -static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - return _InterlockedExchange(Target, Value); -} - -static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, -1) - 1; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedIncrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, 1) + 1; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedDecrement16(volatile short * const lpAddend) -{ - return _InterlockedExchangeAdd16(lpAddend, -1) - 1; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedIncrement16(volatile short * const lpAddend) -{ - return _InterlockedExchangeAdd16(lpAddend, 1) + 1; -} - -static __inline__ __attribute__((always_inline)) void _disable(void) -{ - __asm__ __volatile__ - ( - "mrs r1, cpsr;" - "orr r1, r1, #0x80;" - "msr cpsr, r1;" - ); -} - -static __inline__ __attribute__((always_inline)) void _enable(void) -{ - __asm__ __volatile__ - ( - "mrs r1, cpsr;" - "bic r1, r1, #0x80;" - "msr cpsr, r1;" - ); -} - -#ifndef __MSVCRT__ -static __inline__ __attribute__((always_inline)) unsigned long _rotl(const unsigned long value, const unsigned char shift) -{ - return (((value) << ((int)(shift))) | ((value) >> (32 - (int)(shift)))); -} -#endif - -#define _clz(a) \ -({ ULONG __value, __arg = (a); \ -asm ("clz\t%0, %1": "=r" (__value): "r" (__arg)); \ -__value; }) - -#endif -/* EOF */ Removed: branches/the-real-msvc/include/psdk/intrin_ppc.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/intr… ============================================================================== --- branches/the-real-msvc/include/psdk/intrin_ppc.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/intrin_ppc.h (removed) @@ -1,791 +1,0 @@ -/* - Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic - Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) - projects. - - Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#ifndef KJK_INTRIN_PPC_H_ -#define KJK_INTRIN_PPC_H_ - -//#define PPC_QUAL static __inline__ __attribute__((always_inline)) -#define PPC_QUAL extern __inline__ - -#ifndef __GNUC__ -#error Unsupported compiler -#endif - -/*** Stack frame juggling ***/ -#define _ReturnAddress() (__builtin_return_address(0)) -#define _AddressOfReturnAddress() (&(((void **)(__builtin_frame_address(0)))[1])) -/* TODO: __getcallerseflags but how??? */ - - -/*** Atomic operations ***/ -/* TODO: _ReadBarrier */ -/* TODO: _WriteBarrier */ - -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 -#define _ReadWriteBarrier() __sync_synchronize() -#else -/* TODO: _ReadWriteBarrier() */ -#endif - -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 - -PPC_QUAL char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -PPC_QUAL short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -PPC_QUAL long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -PPC_QUAL long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -PPC_QUAL void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -PPC_QUAL long _InterlockedExchange(volatile long * const Target, const long Value) -{ - /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -PPC_QUAL void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - /* NOTE: ditto */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -PPC_QUAL long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -PPC_QUAL char _InterlockedAnd8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_and(value, mask); -} - -PPC_QUAL short _InterlockedAnd16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_and(value, mask); -} - -PPC_QUAL long _InterlockedAnd(volatile long * const value, const long mask) -{ - return __sync_fetch_and_and(value, mask); -} - -PPC_QUAL char _InterlockedOr8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_or(value, mask); -} - -PPC_QUAL short _InterlockedOr16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_or(value, mask); -} - -PPC_QUAL long _InterlockedOr(volatile long * const value, const long mask) -{ - return __sync_fetch_and_or(value, mask); -} - -PPC_QUAL char _InterlockedXor8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -PPC_QUAL short _InterlockedXor16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -PPC_QUAL long _InterlockedXor(volatile long * const value, const long mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -#else - -PPC_QUAL char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - volatile long retval __asm__("r8") = 0; - __asm__ __volatile__ ( - "sync\n" - "1: lbarx %0,0,%1\n" - : "=r" (retval) : "r" (Destination)); - __asm__ __volatile__ ( - " cmpw %3,%1\n" - " bne- 2f\n" - " stbcx. %2,0,%0\n" - " bne- 1b\n" - "2: isync" - : - : "r" (Destination), "r" (Comperand), "r" (Exchange), "r" (retval)); - return retval; -} - -PPC_QUAL short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - volatile long retval __asm__("r8") = 0; - __asm__ __volatile__ ( - "sync\n" - "1: lharx %0,0,%1\n" - : "=&r" (retval) : "r" (Destination)); - __asm__ __volatile__ ( - " cmpw %3,%1\n" - " bne- 2f\n" - " sthcx. %2,0,%0\n" - " bne- 1b\n" - "2: isync" - : - : "r" (Destination), "r" (Comperand), "r" (Exchange), "r" (retval)); - return retval; -} - -PPC_QUAL long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - volatile long retval __asm__("r8") = 0; - __asm__ __volatile__ ( - "sync\n" - "1: lwarx %0,0,%1\n" - : "=&r" (retval) : "r" (Destination)); - __asm__ __volatile__ ( - " cmpw %3,%1\n" - " bne- 2f\n" - " stwcx. %2,0,%0\n" - " bne- 1b\n" - "2: isync" - : - : "r" (Destination), "r" (Comperand), "r" (Exchange), "r" (retval)); - return retval; -} - -PPC_QUAL long long _InterlockedCompareExchange64(volatile long long * const Target, const long long Exchange, const long long Comperand) -{ - long long capture = *Target; - if (*Target == Comperand) *Target = Exchange; - return capture; -} - -PPC_QUAL void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - return (void *)_InterlockedCompareExchange - ((long *)Destination, (long) Exchange, (long) Comperand); -} - -PPC_QUAL long _InterlockedExchange(volatile long * const Target, const long Value) -{ - long retval __asm__("r8"); - __asm__ __volatile__ ( - "sync\n" - "1: lwarx 8,0,3\n" - " stwcx. 4,0,3\n" - " bne- 1b\n" - " mr 3,8\n" - : "=b" (retval) - : "b" (Target), "b" (Value) - : "cr0", "memory"); - return retval; -} - -PPC_QUAL void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - return (void *)_InterlockedExchange((long *)Target, (long)Value); -} - -#define PPC_MakeInterlockedFunction(type,name,op,proto) \ -PPC_QUAL type name proto \ -{ \ - long addend, y; \ - do \ - { \ - addend = *value; \ - y = _InterlockedCompareExchange(value, addend op modify, addend); \ - } \ - while(y != addend); \ - \ - return y; \ -} - -PPC_QUAL unsigned char _interlockedbittestandreset(volatile long * const a, const long b) -{ - long x; - long y; - long mask = ~(1<<b); - - do - { - x = *a; - y = _InterlockedCompareExchange(a, x & mask, x); - } - while(y != x); - - return (y & ~mask) != 0; -} - -PPC_MakeInterlockedFunction(long,_InterlockedExchangeAdd,+,(volatile long * const value, const long modify)) -PPC_MakeInterlockedFunction(char,_InterlockedAnd8,&,(volatile char * const value, const char modify)) -PPC_MakeInterlockedFunction(short,_InterlockedAnd16,&,(volatile short * const value, const short modify)) -PPC_MakeInterlockedFunction(long,_InterlockedAnd,&,(volatile long * const value, const long modify)) -PPC_MakeInterlockedFunction(char,_InterlockedOr8,|,(volatile char * const value, const char modify)) -PPC_MakeInterlockedFunction(short,_InterlockedOr16,|,(volatile short * const value, const short modify)) -PPC_MakeInterlockedFunction(long,_InterlockedOr,|,(volatile long * const value, const long modify)) -PPC_MakeInterlockedFunction(char,_InterlockedXor8,^,(volatile char * const value, const char modify)) -PPC_MakeInterlockedFunction(short,_InterlockedXor16,^,(volatile short * const value, const short modify)) -PPC_MakeInterlockedFunction(long,_InterlockedXor,^,(volatile long * const value, const long modify)) - -PPC_QUAL unsigned char _interlockedbittestandset(volatile long * const a, const long b) -{ - long x; - long y; - long mask = 1<<b; - - do - { - x = *a; - y = _InterlockedCompareExchange(a, x | mask, x); - } - while(y != x); - - return (y & ~mask) != 0; -} -#endif - -PPC_QUAL long _InterlockedDecrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, -1) - 1; -} - -PPC_QUAL long _InterlockedIncrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, 1) + 1; -} - -/*** String operations ***/ -/* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ -/* Note that the PPC store multiple operations may raise an exception in LE - * mode */ -PPC_QUAL void __stosb(unsigned char * Dest, const unsigned char Data, unsigned long Count) -{ - memset(Dest, Data, Count); -} - -PPC_QUAL void __stosw(unsigned short * Dest, const unsigned short Data, unsigned long Count) -{ - while(Count--) - *Dest++ = Data; -} - -PPC_QUAL void __stosd(unsigned long * Dest, const unsigned long Data, unsigned long Count) -{ - while(Count--) - *Dest++ = Data; -} - -PPC_QUAL void __movsb(unsigned char * Destination, const unsigned char * Source, unsigned long Count) -{ - memcpy(Destination, Source, Count); -} - -PPC_QUAL void __movsw(unsigned short * Destination, const unsigned short * Source, unsigned long Count) -{ - memcpy(Destination, Source, Count * sizeof(*Source)); -} - -PPC_QUAL void __movsd(unsigned long * Destination, const unsigned long * Source, unsigned long Count) -{ - memcpy(Destination, Source, Count * sizeof(*Source)); -} - - -/*** FS segment addressing ***/ -/* On PowerPC, r13 points to TLS data, including the TEB at 0(r13) from what I - * can tell */ -PPC_QUAL void __writefsbyte(const unsigned long Offset, const unsigned char Data) -{ - char *addr; - __asm__("\tadd %0,13,%1\n\tstb %2,0(%0)" : "=r" (addr) : "r" (Offset), "r" (Data)); -} - -PPC_QUAL void __writefsword(const unsigned long Offset, const unsigned short Data) -{ - char *addr; - __asm__("\tadd %0,13,%1\n\tsth %2,0(%0)" : "=r" (addr) : "r" (Offset), "r" (Data)); -} - -PPC_QUAL void __writefsdword(const unsigned long Offset, const unsigned long Data) -{ - char *addr; - __asm__("\tadd %0,13,%1\n\tstw %2,0(%0)" : "=r" (addr) : "r" (Offset), "r" (Data)); -} - -PPC_QUAL unsigned char __readfsbyte(const unsigned long Offset) -{ - unsigned short result; - __asm__("\tadd 7,13,%1\n" - "\tlbz %0,0(7)\n" - : "=r" (result) - : "r" (Offset) - : "r7"); - return result; -} - -PPC_QUAL unsigned short __readfsword(const unsigned long Offset) -{ - unsigned short result; - __asm__("\tadd 7,13,%1\n" - "\tlhz %0,0(7)\n" - : "=r" (result) - : "r" (Offset) - : "r7"); - return result; -} - -PPC_QUAL unsigned long __readfsdword(const unsigned long Offset) -{ - unsigned long result; - __asm__("\tadd 7,13,%1\n" - "\tlwz %0,0(7)\n" - : "=r" (result) - : "r" (Offset) - : "r7"); - return result; -} - -PPC_QUAL void __incfsbyte(const unsigned long Offset) -{ - __writefsbyte(Offset, __readfsbyte(Offset)+1); -} - -PPC_QUAL void __incfsword(const unsigned long Offset) -{ - __writefsword(Offset, __readfsword(Offset)+1); -} - -PPC_QUAL void __incfsdword(const unsigned long Offset) -{ - __writefsdword(Offset, __readfsdword(Offset)+1); -} - -/* NOTE: the bizarre implementation of __addfsxxx mimics the broken Visual C++ behavior */ -/* PPC Note: Not sure about the bizarre behavior. We'll try to emulate it later */ -PPC_QUAL void __addfsbyte(const unsigned long Offset, const unsigned char Data) -{ - __writefsbyte(Offset, __readfsbyte(Offset) + Data); -} - -PPC_QUAL void __addfsword(const unsigned long Offset, const unsigned short Data) -{ - __writefsword(Offset, __readfsword(Offset) + Data); -} - -PPC_QUAL void __addfsdword(const unsigned long Offset, const unsigned int Data) -{ - __writefsdword(Offset, __readfsdword(Offset) + Data); -} - - -/*** Bit manipulation ***/ -PPC_QUAL unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask) -{ - if(Mask == 0) return 0; - else { - unsigned long mask = Mask; - mask &= -mask; - *Index = - ((mask & 0xffff0000) ? 16 : 0) + - ((mask & 0xff00ff00) ? 8 : 0) + - ((mask & 0xf0f0f0f0) ? 4 : 0) + - ((mask & 0xcccccccc) ? 2 : 0) + - ((mask & 0xaaaaaaaa) ? 1 : 0); - return 1; - } -} - -/* Thanks http://www.jjj.de/bitwizardry/files/bithigh.h */ -PPC_QUAL unsigned char _BitScanReverse(unsigned long * const Index, const unsigned long Mask) -{ - unsigned long check = 16, checkmask; - if(Mask == 0) return 0; - else { - unsigned long mask = Mask; - *Index = 0; - while(check) { - checkmask = ((1<<check)-1) << check; - if( mask & checkmask ) { - mask >>= check; - *Index += check; - } - check >>= 1; - } - return 1; - } -} - -/* NOTE: again, the bizarre implementation follows Visual C++ */ -PPC_QUAL unsigned char _bittest(const long * const a, const long b) -{ - return ((*a) & (1<<b)) != 0; -} - -PPC_QUAL unsigned char _bittestandcomplement(long * const a, const long b) -{ - unsigned char ret = ((*a) & (1<<b)) != 0; - (*a) ^= (1<<b); - return ret; -} - -PPC_QUAL unsigned char _bittestandreset(long * const a, const long b) -{ - unsigned char ret = ((*a) & (1<<b)) != 0; - (*a) &= ~(1<<b); - return ret; -} - -PPC_QUAL unsigned char _bittestandset(long * const a, const long b) -{ - unsigned char ret = ((*a) & (1<<b)) != 0; - (*a) |= (1<<b); - return ret; -} - -PPC_QUAL unsigned char _rotl8(const unsigned char value, const unsigned char shift) -{ - return (value << shift) | (value >> (8-shift)); -} - -PPC_QUAL unsigned short _rotl16(const unsigned short value, const unsigned char shift) -{ - return (value << shift) | (value >> (16-shift)); -} - -PPC_QUAL unsigned char _rotr8(const unsigned char value, const unsigned char shift) -{ - return (value >> shift) | (value << (8-shift)); -} - -PPC_QUAL unsigned short _rotr16(const unsigned short value, const unsigned char shift) -{ - return (value >> shift) | (value << (16-shift)); -} - -PPC_QUAL unsigned long long __ll_lshift(const unsigned long long Mask, int Bit) -{ - return Mask << Bit; -} - -PPC_QUAL long long __ll_rshift(const long long Mask, const int Bit) -{ - return Mask >> Bit; -} - -PPC_QUAL unsigned long long __ull_rshift(const unsigned long long Mask, int Bit) -{ - return Mask >> Bit; -} - - -/*** 64-bit math ***/ -PPC_QUAL long long __emul(const int a, const int b) -{ - return a * b; -} - -PPC_QUAL unsigned long long __emulu(const unsigned int a, const unsigned int b) -{ - return a * b; -} - - -/*** Port I/O ***/ -PPC_QUAL unsigned char __inbyte(const unsigned long Port) -{ - int ret; - __asm__( - "mfmsr 5\n\t" - "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ - "mtmsr 6\n\t" - "isync\n\t" - "sync\n\t" - "lbz %0,0(%1)\n\t" /* Get actual value at phys addr r3 */ - "mtmsr 5\n\t" : "=r" (ret) : "b" (Port) - ); - return ret; -} - -PPC_QUAL unsigned short __inword(const unsigned long Port) -{ - int ret; - __asm__( - "mfmsr 5\n\t" - "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ - "mtmsr 6\n\t" - "isync\n\t" - "sync\n\t" - "lhz %0,0(%1)\n\t" /* Get actual value at phys addr r3 */ - "mtmsr 5\n\t" : "=r" (ret) : "b" (Port) - ); - return ret; -} - -PPC_QUAL unsigned long __indword(const unsigned long Port) -{ - int ret; - __asm__( - "mfmsr 5\n\t" - "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ - "mtmsr 6\n\t" - "isync\n\t" - "sync\n\t" - "lwz %0,0(%1)\n\t" /* Get actual value at phys addr r3 */ - "mtmsr 5\n\t" : "=r" (ret) : "b" (Port) - ); - return ret; -} - -PPC_QUAL void __inbytestring(unsigned long Port, unsigned char * Buffer, unsigned long Count) -{ - while(Count--) { - *Buffer++ = __inbyte(Port); - } -} - -PPC_QUAL void __inwordstring(unsigned long Port, unsigned short * Buffer, unsigned long Count) -{ - while(Count--) { - *Buffer++ = __inword(Port); - } -} - -PPC_QUAL void __indwordstring(unsigned long Port, unsigned long * Buffer, unsigned long Count) -{ - while(Count--) { - *Buffer++ = __indword(Port); - } -} - -PPC_QUAL void __outbyte(unsigned long const Port, const unsigned char Data) -{ - __asm__( - "mfmsr 5\n\t" - "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ - "mtmsr 6\n\t" - "sync\n\t" - "eieio\n\t" - "stb %1,0(%0)\n\t" /* Set actual value at phys addr r3 */ - "dcbst 0,%1\n\t" - "mtmsr 5\n\t" - "sync\n\t" - "eieio\n\t" : : "b" (Port), "r" (Data) - ); -} - -PPC_QUAL void __outword(unsigned long const Port, const unsigned short Data) -{ - __asm__( - "mfmsr 5\n\t" - "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ - "mtmsr 6\n\t" - "sync\n\t" - "eieio\n\t" - "sth %1,0(%0)\n\t" /* Set actual value at phys addr r3 */ - "dcbst 0,%1\n\t" - "mtmsr 5\n\t" - "sync\n\t" - "eieio\n\t" : : "b" (Port), "b" (Data) - ); -} - -PPC_QUAL void __outdword(unsigned long const Port, const unsigned long Data) -{ - __asm__( - "mfmsr 5\n\t" - "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ - "mtmsr 6\n\t" - "sync\n\t" - "eieio\n\t" - "stw %1,0(%0)\n\t" /* Set actual value at phys addr r3 */ - "dcbst 0,%1\n\t" - "mtmsr 5\n\t" - "sync\n\t" - "eieio\n\t" : : "b" (Port), "b" (Data) - ); -} - -PPC_QUAL void __outbytestring(unsigned long const Port, const unsigned char * const Buffer, const unsigned long Count) -{ - unsigned long count = Count; - const unsigned char *buffer = Buffer; - while(count--) { - __outbyte(Port, *buffer++); - } -} - -PPC_QUAL void __outwordstring(unsigned long const Port, const unsigned short * const Buffer, const unsigned long Count) -{ - unsigned long count = Count; - const unsigned short *buffer = Buffer; - while(count--) { - __outword(Port, *buffer++); - } -} - -PPC_QUAL void __outdwordstring(unsigned long const Port, const unsigned long * const Buffer, const unsigned long Count) -{ - unsigned long count = Count; - const unsigned long *buffer = Buffer; - while(count--) { - __outdword(Port, *buffer++); - } -} - - -/*** System information ***/ -PPC_QUAL void __cpuid(int CPUInfo[], const int InfoType) -{ - unsigned long lo32; - __asm__("mfpvr" : "=b" (lo32)); -} - -PPC_QUAL unsigned long long __rdtsc(void) -{ - unsigned long lo32; - __asm__("mfdec %0" : "=b" (lo32)); - return -lo32; -} - - -/*** Interrupts ***/ -/* Finally decided to do this by enabling single step trap */ -PPC_QUAL void __debugbreak(void) -{ - -} - -PPC_QUAL void __int2c(void) -{ - /* Not sure yet */ -} - -#ifndef _ENABLE_DISABLE_DEFINED -#define _ENABLE_DISABLE_DEFINED -PPC_QUAL void _disable(void) -{ - __asm__ __volatile__("mfmsr 0\n\t" \ - "li 8,0x7fff\n\t" \ - "and 0,8,0\n\t" \ - "mtmsr 0\n\t"); -} - -PPC_QUAL void _enable(void) -{ - __asm__ __volatile__("mfmsr 8\n\t" \ - "ori 8,8,0x8000\n\t" \ - "mtmsr 8\n\t"); -} - -/*** Protected memory management ***/ -PPC_QUAL unsigned long __readsdr1(void) -{ - unsigned long value; - __asm__("mfsdr1 %0" : "=b" (value)); - return value; -} - -PPC_QUAL void __writesdr1(const unsigned long long Data) -{ - __asm__("mtsdr1 %0" : : "b" (Data)); -} - -/*** System operations ***/ -/* This likely has a different meaning from the X86 equivalent. We'll keep - * the name cause it fits */ -PPC_QUAL unsigned long long __readmsr() -{ - unsigned long temp; - __asm__("mfmsr %0" : "=b" (temp)); - return temp; -} - -PPC_QUAL void __writemsr(const unsigned long Value) -{ - __asm__("mtmsr %0" : : "b" (Value)); -} - -/* We'll make sure of the following: - * IO operations have completed - * Write operations through cache have completed - * We've reloaded anything in the data or instruction cache that might have - * changed in real ram. - */ -PPC_QUAL void __wbinvd(void) -{ - __asm__("eieio\n\t" - "dcs\n\t" - "sync\n\t" - "isync\n\t"); -} -#endif - -PPC_QUAL long _InterlockedAddLargeStatistic(volatile long long * const Addend, const long Value) -{ -#if 0 - __asm__ - ( - "lock; add %[Value], %[Lo32];" - "jae LABEL%=;" - "lock; adc $0, %[Hi32];" - "LABEL%=:;" : - [Lo32] "=m" (*((volatile long *)(Addend) + 0)), [Hi32] "=m" (*((volatile long *)(Addend) + 1)) : - [Value] "ir" (Value) - ); -#endif - return Value; -} - -/*** Miscellaneous ***/ -/* BUGBUG: only good for use in macros. Cannot be taken the address of */ -#define __noop(...) ((void)0) - -/* TODO: __assume. GCC only supports the weaker __builtin_expect */ - -#endif -/* EOF */ Removed: branches/the-real-msvc/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/intr… ============================================================================== --- branches/the-real-msvc/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/intrin_x86.h (removed) @@ -1,1284 +1,0 @@ -/* - Compatibility <intrin_x86.h> header for GCC -- GCC equivalents of intrinsic - Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) - projects. - - Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#ifndef KJK_INTRIN_X86_H_ -#define KJK_INTRIN_X86_H_ - -/* - FIXME: review all "memory" clobbers, add/remove to match Visual C++ - behavior: some "obvious" memory barriers are not present in the Visual C++ - implementation - e.g. __stosX; on the other hand, some memory barriers that - *are* present could have been missed -*/ - -/* - NOTE: this is a *compatibility* header. Some functions may look wrong at - first, but they're only "as wrong" as they would be on Visual C++. Our - priority is compatibility - - NOTE: unlike most people who write inline asm for GCC, I didn't pull the - constraints and the uses of __volatile__ out of my... hat. Do not touch - them. I hate cargo cult programming - - NOTE: be very careful with declaring "memory" clobbers. Some "obvious" - barriers aren't there in Visual C++ (e.g. __stosX) - - NOTE: review all intrinsics with a return value, add/remove __volatile__ - where necessary. If an intrinsic whose value is ignored generates a no-op - under Visual C++, __volatile__ must be omitted; if it always generates code - (for example, if it has side effects), __volatile__ must be specified. GCC - will only optimize out non-volatile asm blocks with outputs, so input-only - blocks are safe. Oddities such as the non-volatile 'rdmsr' are intentional - and follow Visual C++ behavior - - NOTE: on GCC 4.1.0, please use the __sync_* built-ins for barriers and - atomic operations. Test the version like this: - - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 - ... - - Pay attention to the type of barrier. Make it match with what Visual C++ - would use in the same case -*/ - -/*** Stack frame juggling ***/ -#define _ReturnAddress() (__builtin_return_address(0)) -#define _AddressOfReturnAddress() (&(((void **)(__builtin_frame_address(0)))[1])) -/* TODO: __getcallerseflags but how??? */ - - -/*** Atomic operations ***/ - -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 -#define _ReadWriteBarrier() __sync_synchronize() -#else -static void __inline__ __attribute__((always_inline)) _MemoryBarrier(void) -{ - __asm__ __volatile__("" : : : "memory"); -} -#define _ReadWriteBarrier() _MemoryBarrier() -#endif - -/* BUGBUG: GCC only supports full barriers */ -#define _ReadBarrier _ReadWriteBarrier -#define _WriteBarrier _ReadWriteBarrier - -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 - -static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) -{ - /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -#if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long long _InterlockedExchange64(volatile long long * const Target, const long long Value) -{ - /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} -#endif - -static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - /* NOTE: ditto */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -#if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long long _InterlockedExchangeAdd64(volatile long long * const Addend, const long long Value) -{ - return __sync_fetch_and_add(Addend, Value); -} -#endif - -static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_and(value, mask); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_and(value, mask); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) -{ - return __sync_fetch_and_and(value, mask); -} - -#if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long _InterlockedAnd64(volatile long long * const value, const long long mask) -{ - return __sync_fetch_and_and(value, mask); -} -#endif - -static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_or(value, mask); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_or(value, mask); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) -{ - return __sync_fetch_and_or(value, mask); -} - -#if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long _InterlockedOr64(volatile long long * const value, const long long mask) -{ - return __sync_fetch_and_or(value, mask); -} -#endif - -static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -#else - -static __inline__ __attribute__((always_inline)) char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - char retval = Comperand; - __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - short retval = Comperand; - __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - long retval = Comperand; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - void * retval = (void *)Comperand; - __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "=a" (retval) : "[retval]" (retval), [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const Target, const long Value) -{ - long retval = Value; - __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - void * retval = Value; - __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) -{ - long retval = Value; - __asm__("lock; xaddw %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) -{ - long retval = Value; - __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); - return retval; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x & mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x | mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) -{ - char x; - char y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange8(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) -{ - short x; - short y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange16(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) -{ - long x; - long y; - - y = *value; - - do - { - x = y; - y = _InterlockedCompareExchange(value, x ^ mask, x); - } - while(y != x); - - return y; -} - -#endif - -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) - -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -#else - -static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - long long retval = Comperand; - - __asm__ - ( - "lock; cmpxchg8b %[Destination]" : - [retval] "+A" (retval) : - [Destination] "m" (*Destination), - "b" ((unsigned long)((Exchange >> 0) & 0xFFFFFFFF)), - "c" ((unsigned long)((Exchange >> 32) & 0xFFFFFFFF)) : - "memory" - ); - - return retval; -} - -#endif - -static __inline__ __attribute__((always_inline)) long _InterlockedAddLargeStatistic(volatile long long * const Addend, const long Value) -{ - __asm__ - ( - "lock; add %[Value], %[Lo32];" - "jae LABEL%=;" - "lock; adc $0, %[Hi32];" - "LABEL%=:;" : - [Lo32] "=m" (*((volatile long *)(Addend) + 0)), [Hi32] "=m" (*((volatile long *)(Addend) + 1)) : - [Value] "ir" (Value) - ); - - return Value; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, -1) - 1; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedIncrement(volatile long * const lpAddend) -{ - return _InterlockedExchangeAdd(lpAddend, 1) + 1; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedDecrement16(volatile short * const lpAddend) -{ - return _InterlockedExchangeAdd16(lpAddend, -1) - 1; -} - -static __inline__ __attribute__((always_inline)) long _InterlockedIncrement16(volatile short * const lpAddend) -{ - return _InterlockedExchangeAdd16(lpAddend, 1) + 1; -} - -#if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) long long _InterlockedDecrement64(volatile long long * const lpAddend) -{ - return _InterlockedExchangeAdd64(lpAddend, -1) - 1; -} - -static __inline__ __attribute__((always_inline)) long long _InterlockedIncrement64(volatile long long * const lpAddend) -{ - return _InterlockedExchangeAdd64(lpAddend, 1) + 1; -} -#endif - -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * a, const long b) -{ - unsigned char retval; - __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); - return retval; -} - -#if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset64(volatile long long * a, const long long b) -{ - unsigned char retval; - __asm__("lock; btrq %[b], %[a]; setb %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); - return retval; -} -#endif - -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset(volatile long * a, const long b) -{ - unsigned char retval; - __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); - return retval; -} - -#if defined(_M_AMD64) -static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandset64(volatile long long * a, const long long b) -{ - unsigned char retval; - __asm__("lock; btsq %[b], %[a]; setc %b[retval]" : [retval] "=r" (retval), [a] "=m" (*a) : [b] "Ir" (b) : "memory"); - return retval; -} -#endif - -/*** String operations ***/ -/* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ -static __inline__ __attribute__((always_inline)) void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; stosb" : - [Dest] "=D" (Dest), [Count] "=c" (Count) : - "[Dest]" (Dest), "a" (Data), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __stosw(unsigned short * Dest, const unsigned short Data, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; stosw" : - [Dest] "=D" (Dest), [Count] "=c" (Count) : - "[Dest]" (Dest), "a" (Data), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __stosd(unsigned long * Dest, const unsigned long Data, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; stosl" : - [Dest] "=D" (Dest), [Count] "=c" (Count) : - "[Dest]" (Dest), "a" (Data), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __movsb(unsigned char * Destination, const unsigned char * Source, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; movsb" : - [Destination] "=D" (Destination), [Source] "=S" (Source), [Count] "=c" (Count) : - "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __movsw(unsigned short * Destination, const unsigned short * Source, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; movsw" : - [Destination] "=D" (Destination), [Source] "=S" (Source), [Count] "=c" (Count) : - "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) - ); -} - -static __inline__ __attribute__((always_inline)) void __movsd(unsigned long * Destination, const unsigned long * Source, size_t Count) -{ - __asm__ __volatile__ - ( - "rep; movsd" : - [Destination] "=D" (Destination), [Source] "=S" (Source), [Count] "=c" (Count) : - "[Destination]" (Destination), "[Source]" (Source), "[Count]" (Count) - ); -} - -#if defined(_M_AMD64) -/*** GS segment addressing ***/ - -static __inline__ __attribute__((always_inline)) void __writegsbyte(const unsigned long Offset, const unsigned char Data) -{ - __asm__ __volatile__("movb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writegsword(const unsigned long Offset, const unsigned short Data) -{ - __asm__ __volatile__("movw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writegsdword(const unsigned long Offset, const unsigned long Data) -{ - __asm__ __volatile__("movl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writegsqword(const unsigned long Offset, const unsigned __int64 Data) -{ - __asm__ __volatile__("movq %q[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) unsigned char __readgsbyte(const unsigned long Offset) -{ - unsigned char value; - __asm__ __volatile__("movb %%gs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned short __readgsword(const unsigned long Offset) -{ - unsigned short value; - __asm__ __volatile__("movw %%gs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readgsdword(const unsigned long Offset) -{ - unsigned long value; - __asm__ __volatile__("movl %%gs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned __int64 __readgsqword(const unsigned long Offset) -{ - unsigned __int64 value; - __asm__ __volatile__("movq %%gs:%a[Offset], %q[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) void __incgsbyte(const unsigned long Offset) -{ - __asm__ __volatile__("incb %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __incgsword(const unsigned long Offset) -{ - __asm__ __volatile__("incw %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __incgsdword(const unsigned long Offset) -{ - __asm__ __volatile__("incl %%gs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); -} - -/* NOTE: the bizarre implementation of __addgsxxx mimics the broken Visual C++ behavior */ -static __inline__ __attribute__((always_inline)) void __addgsbyte(const unsigned long Offset, const unsigned char Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addb %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addb %b[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __addgsword(const unsigned long Offset, const unsigned short Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addw %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __addgsdword(const unsigned long Offset, const unsigned int Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addl %k[Offset], %%gs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -#else -/*** FS segment addressing ***/ -static __inline__ __attribute__((always_inline)) void __writefsbyte(const unsigned long Offset, const unsigned char Data) -{ - __asm__ __volatile__("movb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writefsword(const unsigned long Offset, const unsigned short Data) -{ - __asm__ __volatile__("movw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writefsdword(const unsigned long Offset, const unsigned long Data) -{ - __asm__ __volatile__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) unsigned char __readfsbyte(const unsigned long Offset) -{ - unsigned char value; - __asm__ __volatile__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "irm" (Offset) : "memory"); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned short __readfsword(const unsigned long Offset) -{ - unsigned short value; - __asm__ __volatile__("movw %%fs:%a[Offset], %w[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned long __readfsdword(const unsigned long Offset) -{ - unsigned long value; - __asm__ __volatile__("movl %%fs:%a[Offset], %k[value]" : [value] "=q" (value) : [Offset] "irm" (Offset)); - return value; -} - -static __inline__ __attribute__((always_inline)) void __incfsbyte(const unsigned long Offset) -{ - __asm__ __volatile__("incb %%fs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __incfsword(const unsigned long Offset) -{ - __asm__ __volatile__("incw %%fs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __incfsdword(const unsigned long Offset) -{ - __asm__ __volatile__("incl %%fs:%a[Offset]" : : [Offset] "ir" (Offset) : "memory"); -} - -/* NOTE: the bizarre implementation of __addfsxxx mimics the broken Visual C++ behavior */ -static __inline__ __attribute__((always_inline)) void __addfsbyte(const unsigned long Offset, const unsigned char Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addb %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addb %b[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __addfsword(const unsigned long Offset, const unsigned short Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addw %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addw %w[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __addfsdword(const unsigned long Offset, const unsigned int Data) -{ - if(!__builtin_constant_p(Offset)) - __asm__ __volatile__("addl %k[Offset], %%fs:%a[Offset]" : : [Offset] "r" (Offset) : "memory"); - else - __asm__ __volatile__("addl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "iq" (Data) : "memory"); -} -#endif - - -/*** Bit manipulation ***/ -static __inline__ __attribute__((always_inline)) unsigned char _BitScanForward(unsigned long * const Index, const unsigned long Mask) -{ - __asm__("bsfl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); - return Mask ? 1 : 0; -} - -static __inline__ __attribute__((always_inline)) unsigned char _BitScanReverse(unsigned long * const Index, const unsigned long Mask) -{ - __asm__("bsrl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); - return Mask ? 1 : 0; -} - -/* NOTE: again, the bizarre implementation follows Visual C++ */ -static __inline__ __attribute__((always_inline)) unsigned char _bittest(const long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _bittestandcomplement(long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("btc %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("btc %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _bittestandreset(long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("btr %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("btr %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _bittestandset(long * const a, const long b) -{ - unsigned char retval; - - if(__builtin_constant_p(b)) - __asm__("bts %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); - else - __asm__("bts %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned char _rotl8(const unsigned char value, const unsigned char shift) -{ - unsigned char retval; - __asm__("rolb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned short _rotl16(const unsigned short value, const unsigned char shift) -{ - unsigned short retval; - __asm__("rolw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -#ifndef __MSVCRT__ -static __inline__ __attribute__((always_inline)) unsigned int _rotl(const unsigned int value, const int shift) -{ - unsigned long retval; - __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned long _rotr(const unsigned int value, const unsigned char shift) -{ - unsigned long retval; - __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} -#endif - -static __inline__ __attribute__((always_inline)) unsigned char _rotr8(const unsigned char value, const unsigned char shift) -{ - unsigned char retval; - __asm__("rorb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned short _rotr16(const unsigned short value, const unsigned char shift) -{ - unsigned short retval; - __asm__("rorw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); - return retval; -} - -/* - NOTE: in __ll_lshift, __ll_rshift and __ull_rshift we use the "A" - constraint (edx:eax) for the Mask argument, because it's the only way GCC - can pass 64-bit operands around - passing the two 32 bit parts separately - just confuses it. Also we declare Bit as an int and then truncate it to - match Visual C++ behavior -*/ -static __inline__ __attribute__((always_inline)) unsigned long long __ll_lshift(const unsigned long long Mask, const int Bit) -{ - unsigned long long retval = Mask; - - __asm__ - ( - "shldl %b[Bit], %%eax, %%edx; sall %b[Bit], %%eax" : - "+A" (retval) : - [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) - ); - - return retval; -} - -static __inline__ __attribute__((always_inline)) long long __ll_rshift(const long long Mask, const int Bit) -{ - unsigned long long retval = Mask; - - __asm__ - ( - "shldl %b[Bit], %%eax, %%edx; sarl %b[Bit], %%eax" : - "+A" (retval) : - [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) - ); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned long long __ull_rshift(const unsigned long long Mask, int Bit) -{ - unsigned long long retval = Mask; - - __asm__ - ( - "shrdl %b[Bit], %%eax, %%edx; shrl %b[Bit], %%eax" : - "+A" (retval) : - [Bit] "Nc" ((unsigned char)((unsigned long)Bit) & 0xFF) - ); - - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned short _byteswap_ushort(unsigned short value) -{ - unsigned short retval; - __asm__("rorw $8, %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned long _byteswap_ulong(unsigned long value) -{ - unsigned long retval; - __asm__("bswapl %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); - return retval; -} - -#ifdef _M_AMD64 -static __inline__ __attribute__((always_inline)) unsigned __int64 _byteswap_uint64(unsigned __int64 value) -{ - unsigned __int64 retval; - __asm__("bswapq %[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); - return retval; -} -#else -static __inline__ __attribute__((always_inline)) unsigned __int64 _byteswap_uint64(unsigned __int64 value) -{ - union { - __int64 int64part; - struct { - unsigned long lowpart; - unsigned long hipart; - }; - } retval; - retval.int64part = value; - __asm__("bswapl %[lowpart]\n" - "bswapl %[hipart]\n" - : [lowpart] "=rm" (retval.hipart), [hipart] "=rm" (retval.lowpart) : "[lowpart]" (retval.lowpart), "[hipart]" (retval.hipart) ); - return retval.int64part; -} -#endif - -/*** 64-bit math ***/ -static __inline__ __attribute__((always_inline)) long long __emul(const int a, const int b) -{ - long long retval; - __asm__("imull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); - return retval; -} - -static __inline__ __attribute__((always_inline)) unsigned long long __emulu(const unsigned int a, const unsigned int b) -{ - unsigned long long retval; - __asm__("mull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); - return retval; -} - - -/*** Port I/O ***/ -static __inline__ __attribute__((always_inline)) unsigned char __inbyte(const unsigned short Port) -{ - unsigned char byte; - __asm__ __volatile__("inb %w[Port], %b[byte]" : [byte] "=a" (byte) : [Port] "Nd" (Port)); - return byte; -} - -static __inline__ __attribute__((always_inline)) unsigned short __inword(const unsigned short Port) -{ - unsigned short word; - __asm__ __volatile__("inw %w[Port], %w[word]" : [word] "=a" (word) : [Port] "Nd" (Port)); - return word; -} - -static __inline__ __attribute__((always_inline)) unsigned long __indword(const unsigned short Port) -{ - unsigned long dword; - __asm__ __volatile__("inl %w[Port], %k[dword]" : [dword] "=a" (dword) : [Port] "Nd" (Port)); - return dword; -} - -static __inline__ __attribute__((always_inline)) void __inbytestring(unsigned short Port, unsigned char * Buffer, unsigned long Count) -{ - __asm__ __volatile__ - ( - "rep; insb" : - [Buffer] "=D" (Buffer), [Count] "=c" (Count) : - "d" (Port), "[Buffer]" (Buffer), "[Count]" (Count) : - "memory" - ); -} - -static __inline__ __attribute__((always_inline)) void __inwordstring(unsigned short Port, unsigned short * Buffer, unsigned long Count) -{ - __asm__ __volatile__ - ( - "rep; insw" : - [Buffer] "=D" (Buffer), [Count] "=c" (Count) : - "d" (Port), "[Buffer]" (Buffer), "[Count]" (Count) : - "memory" - ); -} - -static __inline__ __attribute__((always_inline)) void __indwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count) -{ - __asm__ __volatile__ - ( - "rep; insl" : - [Buffer] "=D" (Buffer), [Count] "=c" (Count) : - "d" (Port), "[Buffer]" (Buffer), "[Count]" (Count) : - "memory" - ); -} - -static __inline__ __attribute__((always_inline)) void __outbyte(unsigned short const Port, const unsigned char Data) -{ - __asm__ __volatile__("outb %b[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __outword(unsigned short const Port, const unsigned short Data) -{ - __asm__ __volatile__("outw %w[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __outdword(unsigned short const Port, const unsigned long Data) -{ - __asm__ __volatile__("outl %k[Data], %w[Port]" : : [Port] "Nd" (Port), [Data] "a" (Data)); -} - -static __inline__ __attribute__((always_inline)) void __outbytestring(unsigned short const Port, const unsigned char * const Buffer, const unsigned long Count) -{ - __asm__ __volatile__("rep; outsb" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); -} - -static __inline__ __attribute__((always_inline)) void __outwordstring(unsigned short const Port, const unsigned short * const Buffer, const unsigned long Count) -{ - __asm__ __volatile__("rep; outsw" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); -} - -static __inline__ __attribute__((always_inline)) void __outdwordstring(unsigned short const Port, const unsigned long * const Buffer, const unsigned long Count) -{ - __asm__ __volatile__("rep; outsl" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); -} - - -/*** System information ***/ -static __inline__ __attribute__((always_inline)) void __cpuid(int CPUInfo[], const int InfoType) -{ - __asm__ __volatile__("cpuid" : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (InfoType)); -} - -static __inline__ __attribute__((always_inline)) unsigned long long __rdtsc(void) -{ - unsigned long long retval; - __asm__ __volatile__("rdtsc" : "=A"(retval)); - return retval; -} - - -/*** Interrupts ***/ -static __inline__ __attribute__((always_inline)) void __debugbreak(void) -{ - __asm__("int $3"); -} - -static __inline__ __attribute__((always_inline)) void __int2c(void) -{ - __asm__("int $0x2c"); -} - -static __inline__ __attribute__((always_inline)) void _disable(void) -{ - __asm__("cli"); -} - -static __inline__ __attribute__((always_inline)) void _enable(void) -{ - __asm__("sti"); -} - - -/*** Protected memory management ***/ - -static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned __int64 Data) -{ - __asm__("mov %[Data], %%cr0" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned __int64 Data) -{ - __asm__("mov %[Data], %%cr3" : : [Data] "q" (Data) : "memory"); -} - -static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned __int64 Data) -{ - __asm__("mov %[Data], %%cr4" : : [Data] "q" (Data) : "memory"); -} - -#ifdef _M_AMD64 -static __inline__ __attribute__((always_inline)) void __writecr8(const unsigned __int64 Data) -{ - __asm__("mov %[Data], %%cr8" : : [Data] "q" (Data) : "memory"); -} -#endif - -static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr0(void) -{ - unsigned __int64 value; - __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr2(void) -{ - unsigned __int64 value; - __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr3(void) -{ - unsigned __int64 value; - __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); - return value; -} - -static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr4(void) -{ - unsigned __int64 value; - __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); - return value; -} - -#ifdef _M_AMD64 -static __inline__ __attribute__((always_inline)) unsigned __int64 __readcr8(void) -{ - unsigned __int64 value; - __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=q" (value)); - return value; -} -#endif - -#ifdef _M_AMD64 -static __inline__ __attribute__((always_inline)) unsigned __int64 __readdr(unsigned int reg) -{ - unsigned __int64 value; - switch (reg) - { - case 0: - __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); - break; - case 1: - __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); - break; - case 2: - __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); - break; - case 3: - __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); - break; - case 4: - __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); - break; - case 5: - __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); - break; - case 6: - __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); - break; - case 7: - __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); - break; - } - return value; -} - -static __inline__ __attribute__((always_inline)) void __writedr(unsigned reg, unsigned __int64 value) -{ - switch (reg) - { - case 0: - __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); - break; - case 1: - __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); - break; - case 2: - __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); - break; - case 3: - __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); - break; - case 4: - __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); - break; - case 5: - __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); - break; - case 6: - __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); - break; - case 7: - __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); - break; - } -} -#endif - -static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address) -{ - __asm__("invlpg %[Address]" : : [Address] "m" (*((unsigned char *)(Address)))); -} - - -/*** System operations ***/ -static __inline__ __attribute__((always_inline)) unsigned long long __readmsr(const int reg) -{ -#ifdef _M_AMD64 - unsigned long low, high; - __asm__ __volatile__("rdmsr" : "=a" (low), "=d" (high) : "c" (reg)); - return (high << 32) | low; -#else - unsigned long long retval; - __asm__ __volatile__("rdmsr" : "=A" (retval) : "c" (reg)); - return retval; -#endif -} - -static __inline__ __attribute__((always_inline)) void __writemsr(const unsigned long Register, const unsigned long long Value) -{ -#ifdef _M_AMD64 - __asm__ __volatile__("wrmsr" : : "a" (Value), "d" (Value >> 32), "c" (Register)); -#else - __asm__ __volatile__("wrmsr" : : "A" (Value), "c" (Register)); -#endif -} - -static __inline__ __attribute__((always_inline)) unsigned long long __readpmc(const int counter) -{ - unsigned long long retval; - __asm__ __volatile__("rdpmc" : "=A" (retval) : "c" (counter)); - return retval; -} - -/* NOTE: an immediate value for 'a' will raise an ICE in Visual C++ */ -static __inline__ __attribute__((always_inline)) unsigned long __segmentlimit(const unsigned long a) -{ - unsigned long retval; - __asm__ __volatile__("lsl %[a], %[retval]" : [retval] "=r" (retval) : [a] "rm" (a)); - return retval; -} - -static __inline__ __attribute__((always_inline)) void __wbinvd(void) -{ - __asm__ __volatile__("wbinvd"); -} - -static __inline__ __attribute__((always_inline)) void __lidt(void *Source) -{ - __asm__ __volatile__("lidt %0" : : "m"(*(short*)Source)); -} - -static __inline__ __attribute__((always_inline)) void __sidt(void *Destination) -{ - __asm__ __volatile__("sidt %0" : : "m"(*(short*)Destination) : "memory"); -} - -#endif /* KJK_INTRIN_X86_H_ */ - -/* EOF */ Removed: branches/the-real-msvc/include/psdk/intrin_x86_64.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/intr… ============================================================================== --- branches/the-real-msvc/include/psdk/intrin_x86_64.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/intrin_x86_64.h (removed) @@ -1,1 +1,0 @@ - Modified: branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… ============================================================================== --- branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Oct 29 08:43:31 2008 @@ -497,7 +497,7 @@ fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); //~ fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall -W4 -wd4820 -wd4214 -wd4201 -wd4668 -wd4255 -wd4005 -wd4127 -wd4710 -wd4711 -wd4100 -wd4738 -wd4706\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall -W4 -wd4820 -wd4214 -wd4201 -wd4668 -wd4255 -wd4005 -wd4127 -wd4710 -wd4711 -wd4100 -wd4738 -wd4706 -wd4245 -wd4242 -wd4244 -wd4152 -wd4717 -wd4273 -wd4018 -wd4204 -wd4054 -wd4055 -wd4514\n" ); //~ fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); //~ fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); //~ fprintf ( fMakefile, "endif\n" ); Modified: branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… ============================================================================== --- branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed Oct 29 08:43:31 2008 @@ -1904,8 +1904,8 @@ if ( !module.allowWarnings ) globalCflags += " -WX"; - globalCflags += " -Zl -MD"; - globalCflags += " -D__MSVCRT__ -D__MINGW_IMPORT=__declspec(dllimport)"; + globalCflags += " -X -Zl -MT"; + globalCflags += " -D__MSVCRT__ -D__MINGW_IMPORT=__declspec(dllimport) -Dinline=__inline"; globalCflags += " -D_CRT_SECURE_NO_WARNINGS"; globalCflags += " -D_CRT_NON_CONFORMING_SWPRINTFS"; }

16 years, 1 month

[janderwald] 37056: - Only display a gateway address when there is one

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 29 08:42:04 2008 New Revision: 37056 URL: http://svn.reactos.org/svn/reactos?rev=37056&view=rev Log: - Only display a gateway address when there is one Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc trunk/reactos/dll/win32/netshell/lang/da-DK.rc trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/el-GR.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/fr-FR.rc trunk/reactos/dll/win32/netshell/lang/hu-HU.rc trunk/reactos/dll/win32/netshell/lang/id-ID.rc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/ja-JP.rc trunk/reactos/dll/win32/netshell/lang/nl-NL.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc trunk/reactos/dll/win32/netshell/lang/sk-SK.rc trunk/reactos/dll/win32/netshell/lang/sv-SE.rc trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/netshell/lang/zh-CN.rc trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -63,7 +63,7 @@ RTEXT "Íåíàëè÷íî", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Ïîäðîáíîñòè...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Detaily...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/da… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -63,7 +63,7 @@ RTEXT "Nicht verfügbar", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/el… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -63,7 +63,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -57,7 +57,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 110, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 110, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 110, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 110, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 110, 62, 80, 8 PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Détails...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -63,7 +63,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/id… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Detil...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -67,7 +67,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Dettagli...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -66,7 +66,7 @@ RTEXT "Ikke tilgjengelig", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Detaljer...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -63,7 +63,7 @@ RTEXT "n/d", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Szczegó³y...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -63,7 +63,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -68,7 +68,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "Po&drobnosti...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sv… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -63,7 +63,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -65,7 +65,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Ñêëàä...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -62,7 +62,7 @@ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Wed Oct 29 08:42:04 2008 @@ -443,10 +443,11 @@ SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); li.iItem = InsertItemToListView(hDlgCtrl, IDS_DEF_GATEWAY); - if (li.iItem >= 0) + if (li.iItem >= 0 && pCurAdapter->GatewayList.IpAddress.String[0] != '0') + { if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->GatewayList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); - + } #if 0 li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_OBTAINED); li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_EXPIRES); @@ -529,10 +530,12 @@ SendDlgItemMessageW(hwndDlg, IDC_DETAILSSUBNET, WM_SETTEXT, 0, (LPARAM)szBuffer); dwIpAddr = ntohl(pContext->Gateway); - swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), - THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr)); - SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer); - + if (dwIpAddr) + { + swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr), + THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr)); + SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer); + } return TRUE; case WM_COMMAND: if (LOWORD(wParam) == IDC_DETAILS)

16 years, 1 month

[hyperion] 37055: modified base/system/smss/smss.h Fix compilation with Visual C++ modified lib/rtl/debug.c Call va_end in debug printing macros modified lib/rtl/res.c Don't mix int and ULONG modified lib/rtl/rtl.h <intrin.h> moved from PSDK to MinGW runtime, now always safe to include

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 08:30:26 2008 New Revision: 37055 URL: http://svn.reactos.org/svn/reactos?rev=37055&view=rev Log: modified base/system/smss/smss.h Fix compilation with Visual C++ modified lib/rtl/debug.c Call va_end in debug printing macros modified lib/rtl/res.c Don't mix int and ULONG modified lib/rtl/rtl.h <intrin.h> moved from PSDK to MinGW runtime, now always safe to include Modified: branches/the-real-msvc/base/system/smss/smss.h branches/the-real-msvc/lib/rtl/debug.c branches/the-real-msvc/lib/rtl/res.c branches/the-real-msvc/lib/rtl/rtl.h Modified: branches/the-real-msvc/base/system/smss/smss.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/base/system/smss/… ============================================================================== --- branches/the-real-msvc/base/system/smss/smss.h [iso-8859-1] (original) +++ branches/the-real-msvc/base/system/smss/smss.h [iso-8859-1] Wed Oct 29 08:30:26 2008 @@ -2,6 +2,7 @@ #define _SMSS_H_INCLUDED_ #include <stdio.h> +#include <stdlib.h> #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER Modified: branches/the-real-msvc/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/debug.c?r… ============================================================================== --- branches/the-real-msvc/lib/rtl/debug.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/rtl/debug.c [iso-8859-1] Wed Oct 29 08:30:26 2008 @@ -79,7 +79,7 @@ /* Copy it */ strncpy(Buffer, Prefix, PrefixLength); - + /* Do the printf */ Length = _vsnprintf(Buffer + PrefixLength, sizeof(Buffer) - PrefixLength, @@ -109,7 +109,7 @@ /* Add the prefix */ Length += PrefixLength; } - + /* Build the string */ DebugString.Length = Length; DebugString.Buffer = Buffer; @@ -202,17 +202,19 @@ DbgPrint(PCCH Format, ...) { + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal("", + n = vDbgPrintExWithPrefixInternal("", -1, DPFLTR_ERROR_LEVEL, Format, ap, TRUE); va_end(ap); + return n; } /* @@ -225,17 +227,19 @@ IN PCCH Format, ...) { + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal("", + n = vDbgPrintExWithPrefixInternal("", ComponentId, Level, Format, ap, TRUE); va_end(ap); + return n; } /* @@ -246,16 +250,19 @@ DbgPrintReturnControlC(PCH Format, ...) { + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal("", + n = vDbgPrintExWithPrefixInternal("", -1, DPFLTR_ERROR_LEVEL, Format, ap, FALSE); + va_end(ap); + return n; } /* Modified: branches/the-real-msvc/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/res.c?rev… ============================================================================== --- branches/the-real-msvc/lib/rtl/res.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/rtl/res.c [iso-8859-1] Wed Oct 29 08:30:26 2008 @@ -60,7 +60,7 @@ */ int push_language( USHORT *list, ULONG pos, WORD lang ) { - int i; + ULONG i; for (i = 0; i < pos; i++) if (list[i] == lang) return pos; list[pos++] = lang; return pos; Modified: branches/the-real-msvc/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/rtl/rtl.h?rev… ============================================================================== --- branches/the-real-msvc/lib/rtl/rtl.h [iso-8859-1] (original) +++ branches/the-real-msvc/lib/rtl/rtl.h [iso-8859-1] Wed Oct 29 08:30:26 2008 @@ -31,9 +31,7 @@ #include <reactos/helper.h> #include <pseh/pseh.h> -#ifndef _MSC_VER #include <intrin.h> -#endif #endif /* RTL_H */

16 years, 1 month

[hyperion] 37054: deleted wine/mmsystem.h deleted wine/prsht.h deleted wine/winbase.h deleted wine/winnetwk.h deleted wine/winnt.h deleted wine/winuser.h Our SDK is in good enough shape to compile Wine: drop the #include_next hacks Wine compatibility fixes should go either in the SDK headers themselves or in the Wine porting SDK

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 08:19:21 2008 New Revision: 37054 URL: http://svn.reactos.org/svn/reactos?rev=37054&view=rev Log: deleted wine/mmsystem.h deleted wine/prsht.h deleted wine/winbase.h deleted wine/winnetwk.h deleted wine/winnt.h deleted wine/winuser.h Our SDK is in good enough shape to compile Wine: drop the #include_next hacks Wine compatibility fixes should go either in the SDK headers themselves or in the Wine porting SDK Removed: branches/the-real-msvc/include/reactos/wine/mmsystem.h branches/the-real-msvc/include/reactos/wine/prsht.h branches/the-real-msvc/include/reactos/wine/winbase.h branches/the-real-msvc/include/reactos/wine/winnetwk.h branches/the-real-msvc/include/reactos/wine/winnt.h branches/the-real-msvc/include/reactos/wine/winuser.h Removed: branches/the-real-msvc/include/reactos/wine/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… ============================================================================== --- branches/the-real-msvc/include/reactos/wine/mmsystem.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/reactos/wine/mmsystem.h (removed) @@ -1,58 +1,0 @@ -/* - * MMSYSTEM - Multimedia Wine Extension ... :-) - * - * Copyright (C) the Wine project - * - * 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 - */ - -#ifndef __WINE_MMSYSTEM_H -#define __WINE_MMSYSTEM_H - -#include_next <mmsystem.h> - -#define DRV_SUCCESS 0x0001 -#define DRV_FAILURE 0x0000 -#define DRV_EXITAPPLICATION 0x000C - -#define MCI_OPEN_DRIVER 0x0801 -#define MCI_CLOSE_DRIVER 0x0802 -#define MCI_SOUND 0x0812 - -#define MCI_SOUND_NAME 0x00000100L - -typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */ - -typedef struct tagMCI_SOUND_PARMSA { - DWORD_PTR dwCallback; - LPCSTR lpstrSoundName; -} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA; - -typedef struct tagMCI_SOUND_PARMSW { - DWORD_PTR dwCallback; - LPCWSTR lpstrSoundName; -} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; - -#ifdef UNICODE -typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS; -#else -typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS; -#endif - -typedef struct midievent_tag *LPMIDIEVENT; - -DWORD WINAPI GetDriverFlags(HDRVR hDriver); - -#endif /* __WINE_WINNT_H */ Removed: branches/the-real-msvc/include/reactos/wine/prsht.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… ============================================================================== --- branches/the-real-msvc/include/reactos/wine/prsht.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/reactos/wine/prsht.h (removed) @@ -1,27 +1,0 @@ -/* - * Copyright (C) the Wine project - * - * 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_next <prsht.h> - -#ifndef __WINE_PRSHT_H -#define __WINE_PRSHT_H - -#define PSH_WIZARD97_OLD 0x00002000 /* for IE < 5 */ -#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */ - -#endif /* __WINE_PRSHT_H */ Removed: branches/the-real-msvc/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… ============================================================================== --- branches/the-real-msvc/include/reactos/wine/winbase.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/reactos/wine/winbase.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINBASE_H -#define __WINE_WINBASE_H - -#include_next <winbase.h> - -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - - -#endif /* __WINE_WINBASE_H */ Removed: branches/the-real-msvc/include/reactos/wine/winnetwk.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… ============================================================================== --- branches/the-real-msvc/include/reactos/wine/winnetwk.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/reactos/wine/winnetwk.h (removed) @@ -1,31 +1,0 @@ -/* $Id: winnetwk.h 20909 2006-01-15 22:25:16Z gvg $ - * - * Compatibility header - * - * This header is wrapper to allow compilation of Wine DLLs under ReactOS - * build system. It contains definitions commonly refered to as Wineisms - * and definitions that are missing in w32api. - */ - -#include_next <winnetwk.h> - -#ifndef __WINE_WINNETWK_H -#define __WINE_WINNETWK_H - -/* WNetEnumCachedPasswords */ -typedef struct tagPASSWORD_CACHE_ENTRY -{ - WORD cbEntry; - WORD cbResource; - WORD cbPassword; - BYTE iEntry; - BYTE nType; - BYTE abResource[1]; -} PASSWORD_CACHE_ENTRY; - -typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD); -DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); -UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); -DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE ); - -#endif /* __WINE_WINNETWK_H */ Removed: branches/the-real-msvc/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… ============================================================================== --- branches/the-real-msvc/include/reactos/wine/winnt.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/reactos/wine/winnt.h (removed) @@ -1,56 +1,0 @@ -/* - * Win32 definitions for Windows NT - * - * Copyright 1996 Alexandre Julliard - * - * 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 - */ - -#ifndef __WINE_WINNT_H -#define __WINE_WINNT_H - -#include_next <winnt.h> - -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) -#else -#define __WINE_ALLOC_SIZE(x) -#endif - -/* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ESPERANTO 0x8f -#define LANG_WALON 0x90 -#define LANG_CORNISH 0x91 -#define LANG_WELSH 0x92 -#define LANG_BRETON 0x93 - -/* FIXME: these are not in the Windows header */ -#define LANG_GAELIC 0x94 -#define LANG_MALTESE 0x3a -#define LANG_ROMANSH 0x17 -#define LANG_SAAMI 0x3b -#define LANG_LOWER_SORBIAN 0x2e -#define LANG_UPPER_SORBIAN 0x2e -#define LANG_SUTU 0x30 -#define LANG_TAJIK 0x28 -#define LANG_TSONGA 0x31 -#define LANG_TSWANA 0x32 -#define LANG_VENDA 0x33 -#define LANG_XHOSA 0x34 -#define LANG_ZULU 0x35 - -#define WINE_UNUSED __attribute__((unused)) - -#endif /* __WINE_WINNT_H */ Removed: branches/the-real-msvc/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/reactos/w… ============================================================================== --- branches/the-real-msvc/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/reactos/wine/winuser.h (removed) @@ -1,48 +1,0 @@ -#ifndef __WINE_WINUSER_H -#define __WINE_WINUSER_H - -/* - * Compatibility header - */ - -#include <wingdi.h> - -#if !defined(_MSC_VER) -#include_next "winuser.h" -#endif - -#define WS_EX_TRAYWINDOW 0x80000000L -#define DCX_USESTYLE 0x00010000 -#define WS_EX_MANAGED 0x40000000L /* Window managed by the window system */ -#define LB_CARETOFF 0x01a4 - -WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); - -typedef struct tagCWPSTRUCT *LPCWPSTRUCT; - -#define WM_ALTTABACTIVE 0x0029 - -#define UNICODE_NOCHAR 0xFFFF - -#ifndef E_PROP_ID_UNSUPPORTED -#define E_PROP_ID_UNSUPPORTED ((HRESULT)0x80070490) -#endif -#ifndef E_PROP_SET_UNSUPPORTED -#define E_PROP_SET_UNSUPPORTED ((HRESULT)0x80070492) -#endif - -/* MapVirtualKey translation types */ -#if 0 -#define MAPVK_VK_TO_VSC 0 -#define MAPVK_VSC_TO_VK 1 -#define MAPVK_VK_TO_CHAR 2 -#define MAPVK_VSC_TO_VK_EX 3 -#define MAPVK_VK_TO_VSC_EX 4 -#endif -#define WM_SETVISIBLE 0x0009 - -#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) -#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) - -#endif /* __WINE_WINUSER_H */

16 years, 1 month

[hyperion] 37053: modified _mingw.h added msc added msc/_msc_float.h added msc/stdarg.h added msc/stdbool.h added msc/stddef.h Ported the MinGW runtime to Visual C++ We can now assume ReactOS is always compiled with MinGW, with one of two possible backends (GNUC/MSC) Backend headers copied from the GCC ones for now TODO: rewrite the Visual C++ intrin.h instead of using a hacked version of Visual C++'s native one (which I won't commit to avoid an obvious copyright violation) TODO: rename include/

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 08:17:12 2008 New Revision: 37053 URL: http://svn.reactos.org/svn/reactos?rev=37053&view=rev Log: modified _mingw.h added msc added msc/_msc_float.h added msc/stdarg.h added msc/stdbool.h added msc/stddef.h Ported the MinGW runtime to Visual C++ We can now assume ReactOS is always compiled with MinGW, with one of two possible backends (GNUC/MSC) Backend headers copied from the GCC ones for now TODO: rewrite the Visual C++ intrin.h instead of using a hacked version of Visual C++'s native one (which I won't commit to avoid an obvious copyright violation) TODO: rename include/crt/mingw32 to include/crt/gnuc TODO: move the GCC intrin.h to include/crt/gnuc modified assert.h modified setjmp.h modified stdio.h modified stdlib.h modified string.h Use Visual C++-compatible placement of function attributes modified float.h Use a cleaner alternative to #include_next for Visual C++ modified math.h Refactored, translated inline assembler to Visual C++ TODO: review, ensure the translation is correct, ensure the refactoring didn't break something Added: branches/the-real-msvc/include/crt/msc/ (with props) branches/the-real-msvc/include/crt/msc/_msc_float.h (props changed) - copied unchanged from r36960, branches/the-real-msvc/include/crt/mingw32/float.h branches/the-real-msvc/include/crt/msc/stdarg.h (contents, props changed) - copied, changed from r36960, branches/the-real-msvc/include/crt/mingw32/stdarg.h branches/the-real-msvc/include/crt/msc/stdbool.h (contents, props changed) - copied, changed from r36960, branches/the-real-msvc/include/crt/mingw32/stdbool.h branches/the-real-msvc/include/crt/msc/stddef.h (contents, props changed) - copied, changed from r36960, branches/the-real-msvc/include/crt/mingw32/stddef.h Modified: branches/the-real-msvc/include/crt/_mingw.h branches/the-real-msvc/include/crt/assert.h branches/the-real-msvc/include/crt/float.h branches/the-real-msvc/include/crt/math.h branches/the-real-msvc/include/crt/setjmp.h branches/the-real-msvc/include/crt/stdio.h branches/the-real-msvc/include/crt/stdlib.h branches/the-real-msvc/include/crt/string.h Modified: branches/the-real-msvc/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/_ming… ============================================================================== --- branches/the-real-msvc/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/_mingw.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -51,7 +51,7 @@ /* Try to avoid problems with outdated checks for GCC __attribute__ support. */ #undef __attribute__ -#ifndef __GNUC__ +#if defined(_MSC_VER) # ifndef __MINGW_IMPORT # define __MINGW_IMPORT __declspec(dllimport) # endif @@ -60,7 +60,8 @@ # endif # define __DECLSPEC_SUPPORTED # define __attribute__(x) /* nothing */ -#else /* __GNUC__ */ +# define __restrict__ /* nothing */ +#elif defined(__GNUC__) # ifdef __declspec # ifndef __MINGW_IMPORT /* Note the extern. This is needed to work around GCC's @@ -82,8 +83,14 @@ # define _CRTIMP # endif # endif /* __declspec */ + +/* + The next two defines can cause problems if user code adds the __cdecl attribute + like so: + void __attribute__ ((__cdecl)) foo(void); +*/ # ifndef __cdecl -# define __cdecl __attribute__ ((__cdecl__)) +# define __cdecl __attribute__ ((__cdecl__)) # endif # ifndef __stdcall # define __stdcall __attribute__ ((__stdcall__)) @@ -106,6 +113,15 @@ # ifndef __hyper # define __hyper long long # endif +#else +# ifndef __MINGW_IMPORT +# define __MINGW_IMPORT __declspec(dllimport) +# endif +# ifndef _CRTIMP +# define _CRTIMP __declspec(dllimport) +# endif +# define __DECLSPEC_SUPPORTED +# define __attribute__(x) /* nothing */ #endif /* __GNUC__ */ #if defined (__GNUC__) && defined (__GNUC_MINOR__) @@ -116,10 +132,20 @@ #define __MINGW_GNUC_PREREQ(major, minor) 0 #endif +#if defined (_MSC_VER) +#define __MINGW_MSC_PREREQ(major, minor) \ + ((_MSC_VER / 100) > (major) \ + || ((_MSC_VER / 100) == (major) && (_MSC_VER % 100) >= (minor))) +#else +#define __MINGW_MSC_PREREQ(major, minor) 0 +#endif + #ifdef __cplusplus # define __CRT_INLINE inline #else -# if __GNUC_STDC_INLINE__ +# if defined(_MSC_VER) +# define __CRT_INLINE __inline +# elif __GNUC_STDC_INLINE__ # define __CRT_INLINE extern inline __attribute__((__gnu_inline__)) # else # define __CRT_INLINE extern __inline__ @@ -139,6 +165,9 @@ #ifdef __GNUC__ #define __MINGW_ATTRIB_NORETURN __attribute__ ((__noreturn__)) #define __MINGW_ATTRIB_CONST __attribute__ ((__const__)) +#elif __MINGW_MSC_PREREQ(12, 0) +#define __MINGW_ATTRIB_NORETURN __declspec(noreturn) +#define __MINGW_ATTRIB_CONST #else #define __MINGW_ATTRIB_NORETURN #define __MINGW_ATTRIB_CONST @@ -147,6 +176,9 @@ #if __MINGW_GNUC_PREREQ (3, 0) #define __MINGW_ATTRIB_MALLOC __attribute__ ((__malloc__)) #define __MINGW_ATTRIB_PURE __attribute__ ((__pure__)) +#elif __MINGW_MSC_PREREQ (14, 0) +#define __MINGW_ATTRIB_MALLOC __declspec(noalias) __declspec(restrict) +#define __MINGW_ATTRIB_PURE #else #define __MINGW_ATTRIB_MALLOC #define __MINGW_ATTRIB_PURE @@ -163,35 +195,28 @@ #if __MINGW_GNUC_PREREQ (3, 1) #define __MINGW_ATTRIB_DEPRECATED __attribute__ ((__deprecated__)) +#elif __MINGW_MSC_PREREQ (12, 0) +#define __MINGW_ATTRIB_DEPRECATED __declspec (deprecated) #else #define __MINGW_ATTRIB_DEPRECATED -#endif /* GNUC >= 3.1 */ - +#endif + #if __MINGW_GNUC_PREREQ (3, 3) #define __MINGW_NOTHROW __attribute__ ((__nothrow__)) +#elif __MINGW_MSC_PREREQ (12, 0) && defined (__cplusplus) +#define __MINGW_NOTHROW __declspec (nothrow) #else #define __MINGW_NOTHROW -#endif /* GNUC >= 3.3 */ +#endif + +/* TODO: Mark (almost) all CRT functions as __MINGW_NOTHROW. This will +allow GCC to optimize away some EH unwind code, at least in DW2 case. */ #ifndef __MSVCRT_VERSION__ /* High byte is the major version, low byte is the minor. */ # define __MSVCRT_VERSION__ 0x0600 #endif -#ifndef _SIZE_T_DEFINED -#define _SIZE_T_DEFINED -#undef size_t -#ifdef _WIN64 -#if defined(__GNUC__) && defined(__STRICT_ANSI__) - typedef unsigned int size_t __attribute__ ((mode (DI))); -#else - typedef unsigned __int64 size_t; -#endif -#else - typedef unsigned int size_t; -#endif -#endif - #define __MINGW32_VERSION 3.13 #define __MINGW32_MAJOR_VERSION 3 #define __MINGW32_MINOR_VERSION 13 Modified: branches/the-real-msvc/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/asser… ============================================================================== --- branches/the-real-msvc/include/crt/assert.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/assert.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -35,7 +35,7 @@ * CRTDLL nicely supplies a function which does the actual output and * call to abort. */ -_CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN; +_CRTIMP __MINGW_ATTRIB_NORETURN void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int); /* * Definition of the assert macro. Modified: branches/the-real-msvc/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/float… ============================================================================== --- branches/the-real-msvc/include/crt/float.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/float.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -16,7 +16,11 @@ * */ +#if defined(__GNUC__) #include_next<float.h> +#elif defined(_MSC_VER) +#include <_msc_float.h> +#endif #ifndef _MINGW_FLOAT_H_ #define _MINGW_FLOAT_H_ Modified: branches/the-real-msvc/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/math.… ============================================================================== --- branches/the-real-msvc/include/crt/math.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/math.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -318,6 +318,20 @@ #define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) /* 0x0200 is signbit mask */ +#if defined(__GNUC__) +#define __mingw_fxam(sw, x) __asm__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)) +#elif defined(_MSC_VER) +#define __mingw_fxam(sw, x) \ + __asm { fld [x] } \ + __asm { fxam } \ + __asm { fstsw ax } \ + __asm { fstp st(0) } \ + __asm { mov [sw], ax } +#else +#error TODO +#endif + + /* We can't inline float or double, because we want to ensure truncation @@ -331,7 +345,7 @@ __CRT_INLINE int __cdecl __fpclassifyl (long double x){ unsigned short sw; - __asm__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + __mingw_fxam(sw, x); return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); } @@ -352,8 +366,7 @@ __CRT_INLINE int __cdecl __isnan (double _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __mingw_fxam(sw, _x); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -361,8 +374,7 @@ __CRT_INLINE int __cdecl __isnanf (float _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __mingw_fxam(sw, _x); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -370,8 +382,7 @@ __CRT_INLINE int __cdecl __isnanl (long double _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __mingw_fxam(sw, _x); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -387,19 +398,19 @@ /* 7.12.3.6 The signbit macro */ __CRT_INLINE int __cdecl __signbit (double x) { unsigned short stw; - __asm__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __mingw_fxam(stw, x); return (stw & 0x0200) != 0; } __CRT_INLINE int __cdecl __signbitf (float x) { unsigned short stw; - __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __mingw_fxam(stw, x); return (stw & 0x0200) != 0; } __CRT_INLINE int __cdecl __signbitl (long double x) { unsigned short stw; - __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __mingw_fxam(stw, x); return (stw & 0x0200) != 0; } @@ -518,27 +529,39 @@ /* Inline versions. GCC-4.0+ can do a better fast-math optimization with __builtins. */ #if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ ) +#if defined(__GNUC__) +#define __mingw_fxtract(res, x) \ + __asm__ ("fxtract\n\t" \ + "fstp %%st" : "=t" (res) : "0" (x)) +#elif defined(_MSC_VER) +// REVIEW is this correct? +#define __mingw_fxtract(res, x) \ + __asm { fld [x] } \ + __asm { fxtract } \ + __asm { fstp st } \ + __asm { fistp [res] } +#else +#error TODO +#endif + __CRT_INLINE double __cdecl logb (double x) { double res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __mingw_fxtract(res, x); return res; } __CRT_INLINE float __cdecl logbf (float x) { float res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __mingw_fxtract(res, x); return res; } __CRT_INLINE long double __cdecl logbl (long double x) { long double res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __mingw_fxtract(res, x); return res; } #endif /* !defined __FAST_MATH__ || !__MINGW_GNUC_PREREQ (4, 0) */ @@ -632,72 +655,105 @@ /* Inline versions of above. GCC 4.0+ can do a better fast-math job with __builtins. */ #if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ ) + +#if defined(__GNUC__) +#define __mingw_frndint(res, x) __asm__ ("frndint;": "=t" (res) : "0" (x)) +#elif defined(_MSC_VER) +// REVIEW is this correct? +#define __mingw_frndint(res, x) \ + __asm { fld [x] } \ + __asm { frndint } \ + __asm { fistp [res] } +#else +#error TODO +#endif + __CRT_INLINE double __cdecl rint (double x) { double retval; - __asm__ ("frndint;": "=t" (retval) : "0" (x)); + __mingw_frndint (retval, x); return retval; } __CRT_INLINE float __cdecl rintf (float x) { float retval; - __asm__ ("frndint;" : "=t" (retval) : "0" (x) ); + __mingw_frndint (retval, x); return retval; } __CRT_INLINE long double __cdecl rintl (long double x) { long double retval; - __asm__ ("frndint;" : "=t" (retval) : "0" (x) ); + __mingw_frndint (retval, x); return retval; } +#if defined(__GNUC__) +#define __mingw_fistpl(res, x) \ + __asm__ __volatile__ \ + ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); +#elif defined(_MSC_VER) +// REVIEW is this correct? +#define __mingw_fistpl(res, x) \ + __asm { fld [x] } \ + __asm { fistp dword ptr [res] } +#else +#error TODO +#endif + __CRT_INLINE long __cdecl lrint (double x) { long retval; - __asm__ __volatile__ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); + __mingw_fistpl(retval, x); return retval; } __CRT_INLINE long __cdecl lrintf (float x) { long retval; - __asm__ __volatile__ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); + __mingw_fistpl(retval, x); return retval; } __CRT_INLINE long __cdecl lrintl (long double x) { long retval; - __asm__ __volatile__ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); + __mingw_fistpl(retval, x); return retval; } +#if defined(__GNUC__) +#define __mingw_fistpll(res, x) \ + __asm__ __volatile__ \ + ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); +#elif defined(_MSC_VER) +// REVIEW is this correct? +#define __mingw_fistpll(res, x) \ + __asm { fld [x] } \ + __asm { fistp qword ptr [res] } +#else +#error TODO +#endif + __CRT_INLINE long long __cdecl llrint (double x) { long long retval; - __asm__ __volatile__ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); + __mingw_fistpll(retval, x); return retval; } __CRT_INLINE long long __cdecl llrintf (float x) { long long retval; - __asm__ __volatile__ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); + __mingw_fistpll(retval, x); return retval; } __CRT_INLINE long long __cdecl llrintl (long double x) { long long retval; - __asm__ __volatile__ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); + __mingw_fistpll(retval, x); return retval; } #endif /* !__FAST_MATH__ || !__MINGW_GNUC_PREREQ (4,0) */ @@ -800,7 +856,7 @@ * which always returns true: yes, (NaN != NaN) is true). */ -#if __GNUC__ >= 3 +#if __MINGW_GNUC_PREREQ(3, 0) #define isgreater(x, y) __builtin_isgreater(x, y) #define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) @@ -814,8 +870,19 @@ __CRT_INLINE int __cdecl __fp_unordered_compare (long double x, long double y){ unsigned short retval; +#if defined(__GNUC__) __asm__ ("fucom %%st(1);" "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); +#elif defined(_MSC_VER) + __asm + { + fld [y] // REVIEW is this the right order? + fld [x] + fucom st(1) + fnstsw ax + mov [retval], ax + } +#endif return retval; } Propchange: branches/the-real-msvc/include/crt/msc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 29 08:17:12 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/the-real-msvc/include/crt/msc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/the-real-msvc/include/crt/msc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/the-real-msvc/include/crt/msc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/the-real-msvc/include/crt/msc/_msc_float.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/msc/_msc_float.h ------------------------------------------------------------------------------ svn:mergeinfo = Copied: branches/the-real-msvc/include/crt/msc/stdarg.h (from r36960, branches/the-real-msvc/include/crt/mingw32/stdarg.h) URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/msc/s… ============================================================================== --- branches/the-real-msvc/include/crt/mingw32/stdarg.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/msc/stdarg.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -36,96 +36,77 @@ #endif /* not __need___va_list */ #undef __need___va_list -/* Define __gnuc_va_list. */ +/* Define __msc_va_list. */ -#ifndef __GNUC_VA_LIST -#define __GNUC_VA_LIST -typedef __builtin_va_list __gnuc_va_list; +#ifndef __MSC_VA_LIST +#define __MSC_VA_LIST +#ifdef _M_CEE_PURE +typedef System::ArgIterator __msc_va_list; +#else +typedef char * __msc_va_list; +#endif + +#ifdef __cplusplus +#define __msc_addressof(v) (&reinterpret_cast<const char &>(v)) +#else +#define __msc_addressof(v) (&(v)) +#endif + +#if defined(_M_IA64) && !defined(_M_CEE_PURE) +#define __msc_va_align 8 +#define __msc_slotsizeof(t) ((sizeof(t) + __msc_va_align - 1) & ~(__msc_va_align - 1)) + +#define __msc_va_struct_align 16 +#define __msc_alignof(ap) ((((ap)+ __msc_va_struct_align - 1) & ~(__msc_va_struct_align - 1)) - (ap)) +#define __msc_apalign(t,ap) (__alignof(t) > 8 ? __msc_alignof((unsigned __int64)ap) : 0) +#else +#define __msc_slotsizeof(t) (sizeof(t)) +#define __msc_apalign(t,ap) (__alignof(t)) +#endif + +#if defined(_M_CEE) +extern void __cdecl __va_start(va_list*, ...); +extern void * __cdecl __va_arg(va_list*, ...); +extern void __cdecl __va_end(va_list*); +#define __msc_va_start(ap,v) (__va_start(&ap, __msc_addressof(v), __msc_slotsizeof(v), __alignof(v), __msc_addressof(v))) +#define __msc_va_end(ap) (__va_end(&ap)) +#define __msc_va_arg(ap,t) (*(t *)__va_arg(&ap, __msc_slotsizeof(t), __msc_apalign(t,ap), (t *)0)) +#elif defined(_M_IA64) +#error TODO IA64 support +#elif defined(_M_AMD64) +#error TODO IA64 support +#else +#define __msc_intsizeof(n) ((sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1)) +#define __msc_va_start(ap,v) ((void)(ap = (__msc_va_list)__msc_addressof(v) + __msc_intsizeof(v))) +#define __msc_va_end(ap) ((void)(ap = (va_list)0)) +#define __msc_va_arg(ap,t) (*(t *)((ap += __msc_intsizeof(t)) - __msc_intsizeof(t))) +#endif + +#define __msc_va_copy(d,s) ((void)((d) = (s))) #endif /* Define the standard macros for the user, if this invocation was from the user program. */ #ifdef _STDARG_H -#define va_start(v,l) __builtin_va_start(v,l) -#define va_end(v) __builtin_va_end(v) -#define va_arg(v,l) __builtin_va_arg(v,l) +#define va_start(v,l) __msc_va_start(v,l) +#define va_end(v) __msc_va_end(v) +#define va_arg(v,l) __msc_va_arg(v,l) #if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L -#define va_copy(d,s) __builtin_va_copy(d,s) +#define va_copy(d,s) __msc_va_copy(d,s) #endif -#define __va_copy(d,s) __builtin_va_copy(d,s) +#define __va_copy(d,s) __msc_va_copy(d,s) -/* Define va_list, if desired, from __gnuc_va_list. */ -/* We deliberately do not define va_list when called from - stdio.h, because ANSI C says that stdio.h is not supposed to define - va_list. stdio.h needs to have access to that data type, - but must not use that name. It should use the name __gnuc_va_list, - which is safe because it is reserved for the implementation. */ +/* Define va_list, if desired, from __msc_va_list. */ -#ifdef _HIDDEN_VA_LIST /* On OSF1, this means varargs.h is "half-loaded". */ -#undef _VA_LIST +#if !defined(_VA_LIST_) && !defined(_VA_LIST) && !defined(_VA_LIST_DEFINED) && !defined(_VA_LIST_T_H) && !defined(__va_list__) +#define _VA_LIST_ +#define _VA_LIST +#define _VA_LIST_DEFINED +#define _VA_LIST_T_H +#define __va_list__ +typedef __msc_va_list va_list; #endif - -#ifdef _BSD_VA_LIST -#undef _BSD_VA_LIST -#endif - -#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST)) -/* SVR4.2 uses _VA_LIST for an internal alias for va_list, - so we must avoid testing it and setting it here. - SVR4 uses _VA_LIST as a flag in stdarg.h, but we should - have no conflict with that. */ -#ifndef _VA_LIST_ -#define _VA_LIST_ -#ifdef __i860__ -#ifndef _VA_LIST -#define _VA_LIST va_list -#endif -#endif /* __i860__ */ -typedef __gnuc_va_list va_list; -#ifdef _SCO_DS -#define __VA_LIST -#endif -#endif /* _VA_LIST_ */ -#else /* not __svr4__ || _SCO_DS */ - -/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. - But on BSD NET2 we must not test or define or undef it. - (Note that the comments in NET 2's ansi.h - are incorrect for _VA_LIST_--see stdio.h!) */ -#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT) -/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5 */ -#ifndef _VA_LIST_DEFINED -/* The macro _VA_LIST is used in SCO Unix 3.2. */ -#ifndef _VA_LIST -/* The macro _VA_LIST_T_H is used in the Bull dpx2 */ -#ifndef _VA_LIST_T_H -/* The macro __va_list__ is used by BeOS. */ -#ifndef __va_list__ -typedef __gnuc_va_list va_list; -#endif /* not __va_list__ */ -#endif /* not _VA_LIST_T_H */ -#endif /* not _VA_LIST */ -#endif /* not _VA_LIST_DEFINED */ -#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) -#define _VA_LIST_ -#endif -#ifndef _VA_LIST -#define _VA_LIST -#endif -#ifndef _VA_LIST_DEFINED -#define _VA_LIST_DEFINED -#endif -#ifndef _VA_LIST_T_H -#define _VA_LIST_T_H -#endif -#ifndef __va_list__ -#define __va_list__ -#endif - -#endif /* not _VA_LIST_, except on certain systems */ - -#endif /* not __svr4__ */ #endif /* _STDARG_H */ Propchange: branches/the-real-msvc/include/crt/msc/stdarg.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/msc/stdarg.h ------------------------------------------------------------------------------ svn:mergeinfo = Copied: branches/the-real-msvc/include/crt/msc/stdbool.h (from r36960, branches/the-real-msvc/include/crt/mingw32/stdbool.h) URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/msc/s… ============================================================================== --- branches/the-real-msvc/include/crt/mingw32/stdbool.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/msc/stdbool.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -33,7 +33,7 @@ #ifndef __cplusplus -#define bool _Bool +#define bool unsigned char #define true 1 #define false 0 Propchange: branches/the-real-msvc/include/crt/msc/stdbool.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/msc/stdbool.h ------------------------------------------------------------------------------ svn:mergeinfo = Copied: branches/the-real-msvc/include/crt/msc/stddef.h (from r36960, branches/the-real-msvc/include/crt/mingw32/stddef.h) URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/msc/s… ============================================================================== --- branches/the-real-msvc/include/crt/mingw32/stddef.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/msc/stddef.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -211,7 +211,9 @@ #define __SIZE_TYPE__ long unsigned int #endif #if !(defined (__GNUG__) && defined (size_t)) +#if !defined(__cplusplus) typedef __SIZE_TYPE__ size_t; +#endif #ifdef __BEOS__ typedef long ssize_t; #endif /* __BEOS__ */ @@ -320,7 +322,7 @@ #endif #ifndef __WCHAR_TYPE__ -#define __WCHAR_TYPE__ int +#define __WCHAR_TYPE__ unsigned short #endif #ifndef __cplusplus typedef __WCHAR_TYPE__ wchar_t; Propchange: branches/the-real-msvc/include/crt/msc/stddef.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/crt/msc/stddef.h ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/the-real-msvc/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/setjm… ============================================================================== --- branches/the-real-msvc/include/crt/setjmp.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/setjmp.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -44,7 +44,7 @@ * Return to the last setjmp call and act as if setjmp had returned * nVal (which had better be non-zero!). */ -_CRTIMP void __cdecl __MINGW_NOTHROW longjmp (jmp_buf, int) __MINGW_ATTRIB_NORETURN; +_CRTIMP __MINGW_ATTRIB_NORETURN void __cdecl __MINGW_NOTHROW longjmp (jmp_buf, int); #ifdef __cplusplus } Modified: branches/the-real-msvc/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/stdio… ============================================================================== --- branches/the-real-msvc/include/crt/stdio.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/stdio.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -166,44 +166,44 @@ /* * File Operations */ -_CRTIMP FILE* __cdecl __MINGW_NOTHROW fopen (const char*, const char*); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW freopen (const char*, const char*, FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW fflush (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW fclose (FILE*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl fopen (const char*, const char*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl freopen (const char*, const char*, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fflush (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fclose (FILE*); /* MS puts remove & rename (but not wide versions) in io.h also */ -_CRTIMP int __cdecl __MINGW_NOTHROW remove (const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW rename (const char*, const char*); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW tmpfile (void); -_CRTIMP char* __cdecl __MINGW_NOTHROW tmpnam (char*); +_CRTIMP __MINGW_NOTHROW int __cdecl remove (const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl rename (const char*, const char*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl tmpfile (void); +_CRTIMP __MINGW_NOTHROW char* __cdecl tmpnam (char*); #ifndef __STRICT_ANSI__ -_CRTIMP char* __cdecl __MINGW_NOTHROW _tempnam (const char*, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW _rmtmp(void); -_CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl _tempnam (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl _rmtmp(void); +_CRTIMP __MINGW_NOTHROW int __cdecl _unlink (const char*); #ifndef NO_OLDNAMES -_CRTIMP char* __cdecl __MINGW_NOTHROW tempnam (const char*, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW rmtmp(void); -_CRTIMP int __cdecl __MINGW_NOTHROW unlink (const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl tempnam (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl rmtmp(void); +_CRTIMP __MINGW_NOTHROW int __cdecl unlink (const char*); #endif #endif /* __STRICT_ANSI__ */ -_CRTIMP int __cdecl __MINGW_NOTHROW setvbuf (FILE*, char*, int, size_t); - -_CRTIMP void __cdecl __MINGW_NOTHROW setbuf (FILE*, char*); +_CRTIMP __MINGW_NOTHROW int __cdecl setvbuf (FILE*, char*, int, size_t); + +_CRTIMP __MINGW_NOTHROW void __cdecl setbuf (FILE*, char*); /* * Formatted Output */ -_CRTIMP int __cdecl __MINGW_NOTHROW fprintf (FILE*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW printf (const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW sprintf (char*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _snprintf (char*, size_t, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW vfprintf (FILE*, const char*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW vprintf (const char*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW vsprintf (char*, const char*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW _vsnprintf (char*, size_t, const char*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl fprintf (FILE*, const char*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl printf (const char*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl sprintf (char*, const char*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl _snprintf (char*, size_t, const char*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl vfprintf (FILE*, const char*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl vprintf (const char*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl vsprintf (char*, const char*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl _vsnprintf (char*, size_t, const char*, __VALIST); #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ int __cdecl __MINGW_NOTHROW snprintf(char *, size_t, const char *, ...); @@ -220,20 +220,20 @@ * Formatted Input */ -_CRTIMP int __cdecl __MINGW_NOTHROW fscanf (FILE*, const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW scanf (const char*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW sscanf (const char*, const char*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl fscanf (FILE*, const char*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl scanf (const char*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl sscanf (const char*, const char*, ...); /* * Character Input and Output Functions */ -_CRTIMP int __cdecl __MINGW_NOTHROW fgetc (FILE*); -_CRTIMP char* __cdecl __MINGW_NOTHROW fgets (char*, int, FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW fputc (int, FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW fputs (const char*, FILE*); -_CRTIMP char* __cdecl __MINGW_NOTHROW gets (char*); -_CRTIMP int __cdecl __MINGW_NOTHROW puts (const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW ungetc (int, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fgetc (FILE*); +_CRTIMP __MINGW_NOTHROW char* __cdecl fgets (char*, int, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fputc (int, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fputs (const char*, FILE*); +_CRTIMP __MINGW_NOTHROW char* __cdecl gets (char*); +_CRTIMP __MINGW_NOTHROW int __cdecl puts (const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl ungetc (int, FILE*); /* Traditionally, getc and putc are defined as macros. but the standard doesn't say that they must be macros. @@ -241,8 +241,8 @@ to be used in C++ with namespace qualification, eg., ::getc. _filbuf and _flsbuf are not thread-safe. */ -_CRTIMP int __cdecl __MINGW_NOTHROW _filbuf (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW _flsbuf (int, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl _filbuf (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl _flsbuf (int, FILE*); #if !defined _MT @@ -275,10 +275,10 @@ #else /* Use library functions. */ -_CRTIMP int __cdecl __MINGW_NOTHROW getc (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW putc (int, FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW getchar (void); -_CRTIMP int __cdecl __MINGW_NOTHROW putchar (int); +_CRTIMP __MINGW_NOTHROW int __cdecl getc (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl putc (int, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl getchar (void); +_CRTIMP __MINGW_NOTHROW int __cdecl putchar (int); #endif @@ -286,25 +286,25 @@ * Direct Input and Output Functions */ -_CRTIMP size_t __cdecl __MINGW_NOTHROW fread (void*, size_t, size_t, FILE*); -_CRTIMP size_t __cdecl __MINGW_NOTHROW fwrite (const void*, size_t, size_t, FILE*); +_CRTIMP __MINGW_NOTHROW size_t __cdecl fread (void*, size_t, size_t, FILE*); +_CRTIMP __MINGW_NOTHROW size_t __cdecl fwrite (const void*, size_t, size_t, FILE*); /* * File Positioning Functions */ -_CRTIMP int __cdecl __MINGW_NOTHROW fseek (FILE*, long, int); -_CRTIMP long __cdecl __MINGW_NOTHROW ftell (FILE*); -_CRTIMP void __cdecl __MINGW_NOTHROW rewind (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fseek (FILE*, long, int); +_CRTIMP __MINGW_NOTHROW long __cdecl ftell (FILE*); +_CRTIMP __MINGW_NOTHROW void __cdecl rewind (FILE*); #if __MSVCRT_VERSION__ >= 0x800 -_CRTIMP int __cdecl __MINGW_NOTHROW _fseek_nolock (FILE*, long, int); -_CRTIMP long __cdecl __MINGW_NOTHROW _ftell_nolock (FILE*); - -_CRTIMP int __cdecl __MINGW_NOTHROW _fseeki64 (FILE*, __int64, int); -_CRTIMP __int64 __cdecl __MINGW_NOTHROW _ftelli64 (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW _fseeki64_nolock (FILE*, __int64, int); -_CRTIMP __int64 __cdecl __MINGW_NOTHROW _ftelli64_nolock (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl _fseek_nolock (FILE*, long, int); +_CRTIMP __MINGW_NOTHROW long __cdecl _ftell_nolock (FILE*); + +_CRTIMP __MINGW_NOTHROW int __cdecl _fseeki64 (FILE*, __int64, int); +_CRTIMP __MINGW_NOTHROW __int64 __cdecl _ftelli64 (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl _fseeki64_nolock (FILE*, __int64, int); +_CRTIMP __MINGW_NOTHROW __int64 __cdecl _ftelli64_nolock (FILE*); #endif #ifdef __USE_MINGW_FSEEK /* These are in libmingwex.a */ @@ -334,15 +334,15 @@ typedef long fpos_t; #endif -_CRTIMP int __cdecl __MINGW_NOTHROW fgetpos (FILE*, fpos_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW fsetpos (FILE*, const fpos_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl fgetpos (FILE*, fpos_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl fsetpos (FILE*, const fpos_t*); /* * Error Functions */ -_CRTIMP int __cdecl __MINGW_NOTHROW feof (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW ferror (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl feof (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl ferror (FILE*); #ifdef __cplusplus inline int __cdecl __MINGW_NOTHROW feof (FILE* __F) @@ -354,47 +354,47 @@ #define ferror(__F) ((__F)->_flag & _IOERR) #endif -_CRTIMP void __cdecl __MINGW_NOTHROW clearerr (FILE*); -_CRTIMP void __cdecl __MINGW_NOTHROW perror (const char*); +_CRTIMP __MINGW_NOTHROW void __cdecl clearerr (FILE*); +_CRTIMP __MINGW_NOTHROW void __cdecl perror (const char*); #ifndef __STRICT_ANSI__ /* * Pipes */ -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _popen (const char*, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW _pclose (FILE*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _popen (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl _pclose (FILE*); #ifndef NO_OLDNAMES -_CRTIMP FILE* __cdecl __MINGW_NOTHROW popen (const char*, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW pclose (FILE*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl popen (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl pclose (FILE*); #endif /* * Other Non ANSI functions */ -_CRTIMP int __cdecl __MINGW_NOTHROW _flushall (void); -_CRTIMP int __cdecl __MINGW_NOTHROW _fgetchar (void); -_CRTIMP int __cdecl __MINGW_NOTHROW _fputchar (int); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _fdopen (int, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW _fileno (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW _fcloseall(void); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _fsopen(const char*, const char*, int); +_CRTIMP __MINGW_NOTHROW int __cdecl _flushall (void); +_CRTIMP __MINGW_NOTHROW int __cdecl _fgetchar (void); +_CRTIMP __MINGW_NOTHROW int __cdecl _fputchar (int); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _fdopen (int, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl _fileno (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl _fcloseall(void); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _fsopen(const char*, const char*, int); #ifdef __MSVCRT__ -_CRTIMP int __cdecl __MINGW_NOTHROW _getmaxstdio(void); -_CRTIMP int __cdecl __MINGW_NOTHROW _setmaxstdio(int); +_CRTIMP __MINGW_NOTHROW int __cdecl _getmaxstdio(void); +_CRTIMP __MINGW_NOTHROW int __cdecl _setmaxstdio(int); #endif #if __MSVCRT_VERSION__ >= 0x800 -_CRTIMP int __cdecl __MINGW_NOTHROW _set_printf_count_output(int); -_CRTIMP int __cdecl __MINGW_NOTHROW _get_printf_count_output(void); +_CRTIMP __MINGW_NOTHROW int __cdecl _set_printf_count_output(int); +_CRTIMP __MINGW_NOTHROW int __cdecl _get_printf_count_output(void); #endif #ifndef _NO_OLDNAMES -_CRTIMP int __cdecl __MINGW_NOTHROW fgetchar (void); -_CRTIMP int __cdecl __MINGW_NOTHROW fputchar (int); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW fdopen (int, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW fileno (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fgetchar (void); +_CRTIMP __MINGW_NOTHROW int __cdecl fputchar (int); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl fdopen (int, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl fileno (FILE*); #endif /* Not _NO_OLDNAMES */ #define _fileno(__F) ((__F)->_file) @@ -404,19 +404,19 @@ #if defined (__MSVCRT__) && !defined (__NO_MINGW_LFS) #include <sys/types.h> -__CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char* filename, const char* mode) +__MINGW_NOTHROW __CRT_INLINE FILE* __cdecl fopen64 (const char* filename, const char* mode) { return fopen (filename, mode); } -int __cdecl __MINGW_NOTHROW fseeko64 (FILE*, off64_t, int); +__MINGW_NOTHROW int __cdecl fseeko64 (FILE*, off64_t, int); #ifdef __USE_MINGW_FSEEK -int __cdecl __MINGW_NOTHROW __mingw_fseeko64 (FILE *, off64_t, int); +__MINGW_NOTHROW int __cdecl __mingw_fseeko64 (FILE *, off64_t, int); #define fseeko64(fp, offset, whence) __mingw_fseeko64(fp, offset, whence) #endif -__CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream) +__MINGW_NOTHROW __CRT_INLINE off64_t __cdecl ftello64 (FILE * stream) { fpos_t pos; if (fgetpos(stream, &pos)) @@ -432,40 +432,40 @@ #ifndef _WSTDIO_DEFINED /* also in wchar.h - keep in sync */ -_CRTIMP int __cdecl __MINGW_NOTHROW fwprintf (FILE*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW wprintf (const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW swprintf (wchar_t*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW _snwprintf (wchar_t*, size_t, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW vfwprintf (FILE*, const wchar_t*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW vwprintf (const wchar_t*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW vswprintf (wchar_t*, const wchar_t*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST); -_CRTIMP int __cdecl __MINGW_NOTHROW fwscanf (FILE*, const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW wscanf (const wchar_t*, ...); -_CRTIMP int __cdecl __MINGW_NOTHROW swscanf (const wchar_t*, const wchar_t*, ...); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW fgetwc (FILE*); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW fputwc (wchar_t, FILE*); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW ungetwc (wchar_t, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fwprintf (FILE*, const wchar_t*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl wprintf (const wchar_t*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl swprintf (wchar_t*, const wchar_t*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl _snwprintf (wchar_t*, size_t, const wchar_t*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl vfwprintf (FILE*, const wchar_t*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl vwprintf (const wchar_t*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl vswprintf (wchar_t*, const wchar_t*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl _vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST); +_CRTIMP __MINGW_NOTHROW int __cdecl fwscanf (FILE*, const wchar_t*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl wscanf (const wchar_t*, ...); +_CRTIMP __MINGW_NOTHROW int __cdecl swscanf (const wchar_t*, const wchar_t*, ...); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl fgetwc (FILE*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl fputwc (wchar_t, FILE*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl ungetwc (wchar_t, FILE*); #ifdef __MSVCRT__ -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW fputws (const wchar_t*, FILE*); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW getwc (FILE*); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW getwchar (void); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _getws (wchar_t*); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW putwc (wint_t, FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW _putws (const wchar_t*); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW putwchar (wint_t); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _wfdopen(int, const wchar_t *); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _wfopen (const wchar_t*, const wchar_t*); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _wfreopen (const wchar_t*, const wchar_t*, FILE*); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _wfsopen (const wchar_t*, const wchar_t*, int); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wtmpnam (wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wtempnam (const wchar_t*, const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wrename (const wchar_t*, const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wremove (const wchar_t*); -_CRTIMP void __cdecl __MINGW_NOTHROW _wperror (const wchar_t*); -_CRTIMP FILE* __cdecl __MINGW_NOTHROW _wpopen (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl fgetws (wchar_t*, int, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl fputws (const wchar_t*, FILE*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl getwc (FILE*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl getwchar (void); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _getws (wchar_t*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl putwc (wint_t, FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl _putws (const wchar_t*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl putwchar (wint_t); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _wfdopen(int, const wchar_t *); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _wfopen (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _wfreopen (const wchar_t*, const wchar_t*, FILE*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _wfsopen (const wchar_t*, const wchar_t*, int); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wtmpnam (wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wtempnam (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl _wrename (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl _wremove (const wchar_t*); +_CRTIMP __MINGW_NOTHROW void __cdecl _wperror (const wchar_t*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl _wpopen (const wchar_t*, const wchar_t*); #endif /* __MSVCRT__ */ #ifndef __NO_ISOCEXT /* externs in libmingwex.a */ @@ -486,23 +486,23 @@ #ifndef __STRICT_ANSI__ #ifdef __MSVCRT__ #ifndef NO_OLDNAMES -_CRTIMP FILE* __cdecl __MINGW_NOTHROW wpopen (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW FILE* __cdecl wpopen (const wchar_t*, const wchar_t*); #endif /* not NO_OLDNAMES */ #endif /* MSVCRT runtime */ /* * Other Non ANSI wide functions */ -_CRTIMP wint_t __cdecl __MINGW_NOTHROW _fgetwchar (void); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW _fputwchar (wint_t); -_CRTIMP int __cdecl __MINGW_NOTHROW _getw (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW _putw (int, FILE*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl _fgetwchar (void); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl _fputwchar (wint_t); +_CRTIMP __MINGW_NOTHROW int __cdecl _getw (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl _putw (int, FILE*); #ifndef _NO_OLDNAMES -_CRTIMP wint_t __cdecl __MINGW_NOTHROW fgetwchar (void); -_CRTIMP wint_t __cdecl __MINGW_NOTHROW fputwchar (wint_t); -_CRTIMP int __cdecl __MINGW_NOTHROW getw (FILE*); -_CRTIMP int __cdecl __MINGW_NOTHROW putw (int, FILE*); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl fgetwchar (void); +_CRTIMP __MINGW_NOTHROW wint_t __cdecl fputwchar (wint_t); +_CRTIMP __MINGW_NOTHROW int __cdecl getw (FILE*); +_CRTIMP __MINGW_NOTHROW int __cdecl putw (int, FILE*); #endif /* Not _NO_OLDNAMES */ #endif /* __STRICT_ANSI */ Modified: branches/the-real-msvc/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/stdli… ============================================================================== --- branches/the-real-msvc/include/crt/stdlib.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/stdlib.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -74,9 +74,9 @@ /* imports from runtime dll of the above variables */ #ifdef __MSVCRT__ -extern int* __cdecl __MINGW_NOTHROW __p___argc(void); -extern char*** __cdecl __MINGW_NOTHROW __p___argv(void); -extern wchar_t*** __cdecl __MINGW_NOTHROW __p___wargv(void); +extern __MINGW_NOTHROW int* __cdecl __p___argc(void); +extern __MINGW_NOTHROW char*** __cdecl __p___argv(void); +extern __MINGW_NOTHROW wchar_t*** __cdecl __p___wargv(void); #define __argc (*__p___argc()) #define __argv (*__p___argv()) @@ -126,28 +126,28 @@ #endif /* __DECLSPEC_SUPPORTED */ #endif /* MB_CUR_MAX */ -/* - * MS likes to declare errno in stdlib.h as well. +/* + * MS likes to declare errno in stdlib.h as well. */ #ifdef _UWIN #undef errno extern int errno; #else - _CRTIMP int* __cdecl __MINGW_NOTHROW _errno(void); + _CRTIMP __MINGW_NOTHROW int* __cdecl _errno(void); #define errno (*_errno()) #endif - _CRTIMP int* __cdecl __MINGW_NOTHROW __doserrno(void); + _CRTIMP __MINGW_NOTHROW int* __cdecl __doserrno(void); #define _doserrno (*__doserrno()) #if !defined (__STRICT_ANSI__) /* - * Use environ from the DLL, not as a global. + * Use environ from the DLL, not as a global. */ #ifdef __MSVCRT__ - extern _CRTIMP char *** __cdecl __MINGW_NOTHROW __p__environ(void); - extern _CRTIMP wchar_t *** __cdecl __MINGW_NOTHROW __p__wenviron(void); + extern _CRTIMP __MINGW_NOTHROW char *** __cdecl __p__environ(void); + extern _CRTIMP __MINGW_NOTHROW wchar_t *** __cdecl __p__wenviron(void); # define _environ (*__p__environ()) # define _wenviron (*__p__wenviron()) #else /* ! __MSVCRT__ */ @@ -206,10 +206,10 @@ #ifdef __MSVCRT__ /* msvcrtxx.dll */ -extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int* __p__osver(void); -extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int* __p__winver(void); -extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int* __p__winmajor(void); -extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int* __p__winminor(void); +extern _CRTIMP __MINGW_NOTHROW unsigned int* __cdecl __p__osver(void); +extern _CRTIMP __MINGW_NOTHROW unsigned int* __cdecl __p__winver(void); +extern _CRTIMP __MINGW_NOTHROW unsigned int* __cdecl __p__winmajor(void); +extern _CRTIMP __MINGW_NOTHROW unsigned int* __cdecl __p__winminor(void); #ifndef __DECLSPEC_SUPPORTED # define _osver (*__p__osver()) @@ -257,9 +257,9 @@ #if defined __MSVCRT__ /* although the _pgmptr is exported as DATA, * be safe and use the access function __p__pgmptr() to get it. */ -_CRTIMP char** __cdecl __MINGW_NOTHROW __p__pgmptr(void); +_CRTIMP __MINGW_NOTHROW char** __cdecl __p__pgmptr(void); #define _pgmptr (*__p__pgmptr()) -_CRTIMP wchar_t** __cdecl __MINGW_NOTHROW __p__wpgmptr(void); +_CRTIMP __MINGW_NOTHROW wchar_t** __cdecl __p__wpgmptr(void); #define _wpgmptr (*__p__wpgmptr()) #else /* ! __MSVCRT__ */ # ifndef __DECLSPEC_SUPPORTED @@ -300,74 +300,74 @@ #endif /* Not __STRICT_ANSI__ */ -_CRTIMP double __cdecl __MINGW_NOTHROW atof (const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW atoi (const char*); -_CRTIMP long __cdecl __MINGW_NOTHROW atol (const char*); +_CRTIMP __MINGW_NOTHROW double __cdecl atof (const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl atoi (const char*); +_CRTIMP __MINGW_NOTHROW long __cdecl atol (const char*); #if !defined (__STRICT_ANSI__) -_CRTIMP int __cdecl __MINGW_NOTHROW _wtoi (const wchar_t *); -_CRTIMP long __cdecl __MINGW_NOTHROW _wtol (const wchar_t *); -#endif -_CRTIMP double __cdecl __MINGW_NOTHROW strtod (const char*, char**); +_CRTIMP __MINGW_NOTHROW int __cdecl _wtoi (const wchar_t *); +_CRTIMP __MINGW_NOTHROW long __cdecl _wtol (const wchar_t *); +#endif +_CRTIMP __MINGW_NOTHROW double __cdecl strtod (const char*, char**); #if !defined __NO_ISOCEXT /* in libmingwex.a */ -float __cdecl __MINGW_NOTHROW strtof (const char * __restrict__, char ** __restrict__); -long double __cdecl __MINGW_NOTHROW strtold (const char * __restrict__, char ** __restrict__); +__MINGW_NOTHROW float __cdecl strtof (const char * __restrict__, char ** __restrict__); +__MINGW_NOTHROW long double __cdecl strtold (const char * __restrict__, char ** __restrict__); #endif /* __NO_ISOCEXT */ -_CRTIMP long __cdecl __MINGW_NOTHROW strtol (const char*, char**, int); -_CRTIMP unsigned long __cdecl __MINGW_NOTHROW strtoul (const char*, char**, int); +__MINGW_NOTHROW _CRTIMP long __cdecl strtol (const char*, char**, int); +__MINGW_NOTHROW _CRTIMP unsigned long __cdecl strtoul (const char*, char**, int); #ifndef _WSTDLIB_DEFINED /* also declared in wchar.h */ -_CRTIMP long __cdecl __MINGW_NOTHROW wcstol (const wchar_t*, wchar_t**, int); -_CRTIMP unsigned long __cdecl __MINGW_NOTHROW wcstoul (const wchar_t*, wchar_t**, int); -_CRTIMP double __cdecl __MINGW_NOTHROW wcstod (const wchar_t*, wchar_t**); +_CRTIMP __MINGW_NOTHROW long __cdecl wcstol (const wchar_t*, wchar_t**, int); +_CRTIMP __MINGW_NOTHROW unsigned long __cdecl wcstoul (const wchar_t*, wchar_t**, int); +_CRTIMP __MINGW_NOTHROW double __cdecl wcstod (const wchar_t*, wchar_t**); #if !defined __NO_ISOCEXT /* in libmingwex.a */ -float __cdecl __MINGW_NOTHROW wcstof( const wchar_t * __restrict__, wchar_t ** __restrict__); -long double __cdecl __MINGW_NOTHROW wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__); +__MINGW_NOTHROW float __cdecl wcstof( const wchar_t * __restrict__, wchar_t ** __restrict__); +__MINGW_NOTHROW long double __cdecl wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__); #endif /* __NO_ISOCEXT */ -#ifdef __MSVCRT__ -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetenv(const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wputenv(const wchar_t*); -_CRTIMP void __cdecl __MINGW_NOTHROW _wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wsystem(const wchar_t*); -_CRTIMP void __cdecl __MINGW_NOTHROW _wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*); -_CRTIMP void __cdecl __MINGW_NOTHROW _wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wfullpath (wchar_t*, const wchar_t*, size_t); +#ifdef __MSVCRT__ +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wgetenv(const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl _wputenv(const wchar_t*); +_CRTIMP __MINGW_NOTHROW void __cdecl _wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl _wsystem(const wchar_t*); +_CRTIMP __MINGW_NOTHROW void __cdecl _wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW void __cdecl _wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wfullpath (wchar_t*, const wchar_t*, size_t); #endif #define _WSTDLIB_DEFINED #endif -_CRTIMP size_t __cdecl __MINGW_NOTHROW wcstombs (char*, const wchar_t*, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW wctomb (char*, wchar_t); - -_CRTIMP int __cdecl __MINGW_NOTHROW mblen (const char*, size_t); -_CRTIMP size_t __cdecl __MINGW_NOTHROW mbstowcs (wchar_t*, const char*, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW mbtowc (wchar_t*, const char*, size_t); - -_CRTIMP int __cdecl __MINGW_NOTHROW rand (void); -_CRTIMP void __cdecl __MINGW_NOTHROW srand (unsigned int); - -_CRTIMP void* __cdecl __MINGW_NOTHROW calloc (size_t, size_t) __MINGW_ATTRIB_MALLOC; -_CRTIMP void* __cdecl __MINGW_NOTHROW malloc (size_t) __MINGW_ATTRIB_MALLOC; -_CRTIMP void* __cdecl __MINGW_NOTHROW realloc (void*, size_t); -_CRTIMP void __cdecl __MINGW_NOTHROW free (void*); -_CRTIMP void __cdecl __MINGW_NOTHROW abort (void) __MINGW_ATTRIB_NORETURN; -_CRTIMP void __cdecl __MINGW_NOTHROW exit (int) __MINGW_ATTRIB_NORETURN; +_CRTIMP __MINGW_NOTHROW size_t __cdecl wcstombs (char*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl wctomb (char*, wchar_t); + +_CRTIMP __MINGW_NOTHROW int __cdecl mblen (const char*, size_t); +_CRTIMP __MINGW_NOTHROW size_t __cdecl mbstowcs (wchar_t*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl mbtowc (wchar_t*, const char*, size_t); + +_CRTIMP __MINGW_NOTHROW int __cdecl rand (void); +_CRTIMP __MINGW_NOTHROW void __cdecl srand (unsigned int); + +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_MALLOC void* __cdecl calloc (size_t, size_t); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_MALLOC void* __cdecl malloc (size_t); +_CRTIMP __MINGW_NOTHROW void* __cdecl realloc (void*, size_t); +_CRTIMP __MINGW_NOTHROW void __cdecl free (void*); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_NORETURN void __cdecl abort (void); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_NORETURN void __cdecl exit (int); /* Note: This is in startup code, not imported directly from dll */ int __cdecl __MINGW_NOTHROW atexit (void (*)(void)); -_CRTIMP int __cdecl __MINGW_NOTHROW system (const char*); -_CRTIMP char* __cdecl __MINGW_NOTHROW getenv (const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl system (const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl getenv (const char*); /* bsearch and qsort are also in non-ANSI header search.h */ -_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t, +_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t, int (*)(const void*, const void*)); _CRTIMP void __cdecl qsort(void*, size_t, size_t, int (*)(const void*, const void*)); -_CRTIMP int __cdecl __MINGW_NOTHROW abs (int) __MINGW_ATTRIB_CONST; -_CRTIMP long __cdecl __MINGW_NOTHROW labs (long) __MINGW_ATTRIB_CONST; +_CRTIMP __MINGW_NOTHROW int __cdecl abs (int) __MINGW_ATTRIB_CONST; +_CRTIMP __MINGW_NOTHROW long __cdecl labs (long) __MINGW_ATTRIB_CONST; /* * div_t and ldiv_t are structures used to return the results of div and @@ -380,8 +380,8 @@ typedef struct { int quot, rem; } div_t; typedef struct { long quot, rem; } ldiv_t; -_CRTIMP div_t __cdecl __MINGW_NOTHROW div (int, int) __MINGW_ATTRIB_CONST; -_CRTIMP ldiv_t __cdecl __MINGW_NOTHROW ldiv (long, long) __MINGW_ATTRIB_CONST; +_CRTIMP __MINGW_NOTHROW div_t __cdecl div (int, int) __MINGW_ATTRIB_CONST; +_CRTIMP __MINGW_NOTHROW ldiv_t __cdecl ldiv (long, long) __MINGW_ATTRIB_CONST; #if !defined (__STRICT_ANSI__) @@ -389,53 +389,53 @@ * NOTE: Officially the three following functions are obsolete. The Win32 API * functions SetErrorMode, Beep and Sleep are their replacements. */ -_CRTIMP void __cdecl __MINGW_NOTHROW _beep (unsigned int, unsigned int) __MINGW_ATTRIB_DEPRECATED; +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_DEPRECATED void __cdecl _beep (unsigned int, unsigned int); /* Not to be confused with _set_error_mode (int). */ -_CRTIMP void __cdecl __MINGW_NOTHROW _seterrormode (int) __MINGW_ATTRIB_DEPRECATED; -_CRTIMP void __cdecl __MINGW_NOTHROW _sleep (unsigned long) __MINGW_ATTRIB_DEPRECATED; - -_CRTIMP void __cdecl __MINGW_NOTHROW _exit (int) __MINGW_ATTRIB_NORETURN; +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_DEPRECATED void __cdecl _seterrormode (int); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_DEPRECATED void __cdecl _sleep (unsigned long); + +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_NORETURN void __cdecl _exit (int); /* _onexit is MS extension. Use atexit for portability. */ /* Note: This is in startup code, not imported directly from dll */ typedef int (* _onexit_t)(void); _onexit_t __cdecl __MINGW_NOTHROW _onexit( _onexit_t ); -_CRTIMP int __cdecl __MINGW_NOTHROW _putenv (const char*); -_CRTIMP void __cdecl __MINGW_NOTHROW _searchenv (const char*, const char*, char*); - - -_CRTIMP char* __cdecl __MINGW_NOTHROW _ecvt (double, int, int*, int*); -_CRTIMP char* __cdecl __MINGW_NOTHROW _fcvt (double, int, int*, int*); -_CRTIMP char* __cdecl __MINGW_NOTHROW _gcvt (double, int, char*); - -_CRTIMP void __cdecl __MINGW_NOTHROW _makepath (char*, const char*, const char*, const char*, const char*); -_CRTIMP void __cdecl __MINGW_NOTHROW _splitpath (const char*, char*, char*, char*, char*); -_CRTIMP char* __cdecl __MINGW_NOTHROW _fullpath (char*, const char*, size_t); - -_CRTIMP char* __cdecl __MINGW_NOTHROW _itoa (int, char*, int); -_CRTIMP char* __cdecl __MINGW_NOTHROW _ltoa (long, char*, int); -_CRTIMP char* __cdecl __MINGW_NOTHROW _ultoa(unsigned long, char*, int); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _itow (int, wchar_t*, int); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _ltow (long, wchar_t*, int); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _ultow (unsigned long, wchar_t*, int); - -_CRTIMP __int64 __cdecl __MINGW_NOTHROW _atoi64(const char *); - +_CRTIMP __MINGW_NOTHROW int __cdecl _putenv (const char*); +_CRTIMP __MINGW_NOTHROW void __cdecl _searchenv (const char*, const char*, char*); + + +_CRTIMP __MINGW_NOTHROW char* __cdecl _ecvt (double, int, int*, int*); +_CRTIMP __MINGW_NOTHROW char* __cdecl _fcvt (double, int, int*, int*); +_CRTIMP __MINGW_NOTHROW char* __cdecl _gcvt (double, int, char*); + +_CRTIMP __MINGW_NOTHROW void __cdecl _makepath (char*, const char*, const char*, const char*, const char*); +_CRTIMP __MINGW_NOTHROW void __cdecl _splitpath (const char*, char*, char*, char*, char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl _fullpath (char*, const char*, size_t); + +_CRTIMP __MINGW_NOTHROW char* __cdecl _itoa (int, char*, int); +_CRTIMP __MINGW_NOTHROW char* __cdecl _ltoa (long, char*, int); +_CRTIMP __MINGW_NOTHROW char* __cdecl _ultoa(unsigned long, char*, int); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _itow (int, wchar_t*, int); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _ltow (long, wchar_t*, int); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _ultow (unsigned long, wchar_t*, int); + +_CRTIMP __MINGW_NOTHROW __int64 __cdecl _atoi64(const char *); + #ifdef __MSVCRT__ -_CRTIMP char* __cdecl __MINGW_NOTHROW _i64toa(__int64, char *, int); -_CRTIMP char* __cdecl __MINGW_NOTHROW _ui64toa(unsigned __int64, char *, int); -_CRTIMP __int64 __cdecl __MINGW_NOTHROW _wtoi64(const wchar_t *); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _i64tow(__int64, wchar_t *, int); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _ui64tow(unsigned __int64, wchar_t *, int); - - -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _rotl(unsigned int, int) __MINGW_ATTRIB_CONST; -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _rotr(unsigned int, int) __MINGW_ATTRIB_CONST; -_CRTIMP unsigned long __cdecl __MINGW_NOTHROW _lrotl(unsigned long, int) __MINGW_ATTRIB_CONST; -_CRTIMP unsigned long __cdecl __MINGW_NOTHROW _lrotr(unsigned long, int) __MINGW_ATTRIB_CONST; - -_CRTIMP int __cdecl __MINGW_NOTHROW _set_error_mode (int); +_CRTIMP __MINGW_NOTHROW char* __cdecl _i64toa(__int64, char *, int); +_CRTIMP __MINGW_NOTHROW char* __cdecl _ui64toa(unsigned __int64, char *, int); +_CRTIMP __MINGW_NOTHROW __int64 __cdecl _wtoi64(const wchar_t *); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _i64tow(__int64, wchar_t *, int); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _ui64tow(unsigned __int64, wchar_t *, int); + + +_CRTIMP __MINGW_NOTHROW unsigned int __cdecl _rotl(unsigned int, int) __MINGW_ATTRIB_CONST; +_CRTIMP __MINGW_NOTHROW unsigned int __cdecl _rotr(unsigned int, int) __MINGW_ATTRIB_CONST; +_CRTIMP __MINGW_NOTHROW unsigned long __cdecl _lrotl(unsigned long, int) __MINGW_ATTRIB_CONST; +_CRTIMP __MINGW_NOTHROW unsigned long __cdecl _lrotr(unsigned long, int) __MINGW_ATTRIB_CONST; + +_CRTIMP __MINGW_NOTHROW int __cdecl _set_error_mode (int); #define _OUT_TO_DEFAULT 0 #define _OUT_TO_STDERR 1 #define _OUT_TO_MSGBOX 2 @@ -450,7 +450,7 @@ typedef int intptr_t; #endif #endif -_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _set_abort_behavior (unsigned int, unsigned int); +_CRTIMP __MINGW_NOTHROW unsigned int __cdecl _set_abort_behavior (unsigned int, unsigned int); /* These masks work with msvcr80.dll version 8.0.50215.44 (a beta release). */ #define _WRITE_ABORT_MSG 1 #define _CALL_REPORTFAULT 2 @@ -466,16 +466,16 @@ #ifndef _NO_OLDNAMES -_CRTIMP int __cdecl __MINGW_NOTHROW putenv (const char*); -_CRTIMP void __cdecl __MINGW_NOTHROW searchenv (const char*, const char*, char*); - -_CRTIMP char* __cdecl __MINGW_NOTHROW itoa (int, char*, int); -_CRTIMP char* __cdecl __MINGW_NOTHROW ltoa (long, char*, int); +_CRTIMP __MINGW_NOTHROW int __cdecl putenv (const char*); +_CRTIMP __MINGW_NOTHROW void __cdecl searchenv (const char*, const char*, char*); + +_CRTIMP __MINGW_NOTHROW char* __cdecl itoa (int, char*, int); +_CRTIMP __MINGW_NOTHROW char* __cdecl ltoa (long, char*, int); #ifndef _UWIN -_CRTIMP char* __cdecl __MINGW_NOTHROW ecvt (double, int, int*, int*); -_CRTIMP char* __cdecl __MINGW_NOTHROW fcvt (double, int, int*, int*); -_CRTIMP char* __cdecl __MINGW_NOTHROW gcvt (double, int, char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl ecvt (double, int, int*, int*); +_CRTIMP __MINGW_NOTHROW char* __cdecl fcvt (double, int, int*, int*); +_CRTIMP __MINGW_NOTHROW char* __cdecl gcvt (double, int, char*); #endif /* _UWIN */ #endif /* Not _NO_OLDNAMES */ @@ -486,11 +486,11 @@ #if !defined __NO_ISOCEXT /* externs in static libmingwex.a */ /* C99 name for _exit */ -void __cdecl __MINGW_NOTHROW _Exit(int) __MINGW_ATTRIB_NORETURN; +void __MINGW_ATTRIB_NORETURN __cdecl __MINGW_NOTHROW _Exit(int); #ifndef __STRICT_ANSI__ /* inline using non-ansi functions */ __CRT_INLINE void __cdecl __MINGW_NOTHROW _Exit(int __status) { _exit (__status); } -#endif +#endif typedef struct { long long quot, rem; } lldiv_t; @@ -503,29 +503,29 @@ long long __cdecl __MINGW_NOTHROW strtoll (const char* __restrict__, char** __restrict, int); unsigned long long __cdecl __MINGW_NOTHROW strtoull (const char* __restrict__, char** __restrict__, int); -#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */ +#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */ long long __cdecl __MINGW_NOTHROW atoll (const char *); #if !defined (__STRICT_ANSI__) -long long __cdecl __MINGW_NOTHROW wtoll (const wchar_t *); -char* __cdecl __MINGW_NOTHROW lltoa (long long, char *, int); -char* __cdecl __MINGW_NOTHROW ulltoa (unsigned long long , char *, int); -wchar_t* __cdecl __MINGW_NOTHROW lltow (long long, wchar_t *, int); -wchar_t* __cdecl __MINGW_NOTHROW ulltow (unsigned long long, wchar_t *, int); +__MINGW_NOTHROW long long __cdecl wtoll (const wchar_t *); +__MINGW_NOTHROW char* __cdecl lltoa (long long, char *, int); +__MINGW_NOTHROW char* __cdecl ulltoa (unsigned long long , char *, int); +__MINGW_NOTHROW wchar_t* __cdecl lltow (long long, wchar_t *, int); +__MINGW_NOTHROW wchar_t* __cdecl ulltow (unsigned long long, wchar_t *, int); /* inline using non-ansi functions */ -__CRT_INLINE long long __cdecl __MINGW_NOTHROW atoll (const char * _c) +__CRT_INLINE __MINGW_NOTHROW long long __cdecl atoll (const char * _c) { return _atoi64 (_c); } -__CRT_INLINE char* __cdecl __MINGW_NOTHROW lltoa (long long _n, char * _c, int _i) +__CRT_INLINE __MINGW_NOTHROW char* __cdecl lltoa (long long _n, char * _c, int _i) { return _i64toa (_n, _c, _i); } -__CRT_INLINE char* __cdecl __MINGW_NOTHROW ulltoa (unsigned long long _n, char * _c, int _i) +__CRT_INLINE __MINGW_NOTHROW char* __cdecl ulltoa (unsigned long long _n, char * _c, int _i) { return _ui64toa (_n, _c, _i); } -__CRT_INLINE long long __cdecl __MINGW_NOTHROW wtoll (const wchar_t * _w) +__CRT_INLINE __MINGW_NOTHROW long long __cdecl wtoll (const wchar_t * _w) { return _wtoi64 (_w); } -__CRT_INLINE wchar_t* __cdecl __MINGW_NOTHROW lltow (long long _n, wchar_t * _w, int _i) - { return _i64tow (_n, _w, _i); } -__CRT_INLINE wchar_t* __cdecl __MINGW_NOTHROW ulltow (unsigned long long _n, wchar_t * _w, int _i) - { return _ui64tow (_n, _w, _i); } +__CRT_INLINE __MINGW_NOTHROW wchar_t* __cdecl lltow (long long _n, wchar_t * _w, int _i) + { return _i64tow (_n, _w, _i); } +__CRT_INLINE __MINGW_NOTHROW wchar_t* __cdecl ulltow (unsigned long long _n, wchar_t * _w, int _i) + { return _ui64tow (_n, _w, _i); } #endif /* (__STRICT_ANSI__) */ #endif /* __MSVCRT__ */ Modified: branches/the-real-msvc/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/crt/strin… ============================================================================== --- branches/the-real-msvc/include/crt/string.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/crt/string.h [iso-8859-1] Wed Oct 29 08:17:12 2008 @@ -33,52 +33,52 @@ /* * Prototypes of the ANSI Standard C library string functions. */ -_CRTIMP void* __cdecl __MINGW_NOTHROW memchr (const void*, int, size_t) __MINGW_ATTRIB_PURE; -_CRTIMP int __cdecl __MINGW_NOTHROW memcmp (const void*, const void*, size_t) __MINGW_ATTRIB_PURE; -_CRTIMP void* __cdecl __MINGW_NOTHROW memcpy (void*, const void*, size_t); -_CRTIMP void* __cdecl __MINGW_NOTHROW memmove (void*, const void*, size_t); -_CRTIMP void* __cdecl __MINGW_NOTHROW memset (void*, int, size_t); -_CRTIMP char* __cdecl __MINGW_NOTHROW strcat (char*, const char*); -_CRTIMP char* __cdecl __MINGW_NOTHROW strchr (const char*, int) __MINGW_ATTRIB_PURE; -_CRTIMP int __cdecl __MINGW_NOTHROW strcmp (const char*, const char*) __MINGW_ATTRIB_PURE; -_CRTIMP int __cdecl __MINGW_NOTHROW strcoll (const char*, const char*); /* Compare using locale */ -_CRTIMP char* __cdecl __MINGW_NOTHROW strcpy (char*, const char*); -_CRTIMP size_t __cdecl __MINGW_NOTHROW strcspn (const char*, const char*) __MINGW_ATTRIB_PURE; -_CRTIMP char* __cdecl __MINGW_NOTHROW strerror (int); /* NOTE: NOT an old name wrapper. */ +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE void* __cdecl memchr (const void*, int, size_t); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE int __cdecl memcmp (const void*, const void*, size_t); +_CRTIMP __MINGW_NOTHROW void* __cdecl memcpy (void*, const void*, size_t); +_CRTIMP __MINGW_NOTHROW void* __cdecl memmove (void*, const void*, size_t); +_CRTIMP __MINGW_NOTHROW void* __cdecl memset (void*, int, size_t); +_CRTIMP __MINGW_NOTHROW char* __cdecl strcat (char*, const char*); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE char* __cdecl strchr (const char*, int) ; +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE int __cdecl strcmp (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl strcoll (const char*, const char*); /* Compare using locale */ +_CRTIMP __MINGW_NOTHROW char* __cdecl strcpy (char*, const char*); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE size_t __cdecl strcspn (const char*, const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl strerror (int); /* NOTE: NOT an old name wrapper. */ -_CRTIMP size_t __cdecl __MINGW_NOTHROW strlen (const char*) __MINGW_ATTRIB_PURE; -_CRTIMP char* __cdecl __MINGW_NOTHROW strncat (char*, const char*, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW strncmp (const char*, const char*, size_t) __MINGW_ATTRIB_PURE; -_CRTIMP char* __cdecl __MINGW_NOTHROW strncpy (char*, const char*, size_t); -_CRTIMP char* __cdecl __MINGW_NOTHROW strpbrk (const char*, const char*) __MINGW_ATTRIB_PURE; -_CRTIMP char* __cdecl __MINGW_NOTHROW strrchr (const char*, int) __MINGW_ATTRIB_PURE; -_CRTIMP size_t __cdecl __MINGW_NOTHROW strspn (const char*, const char*) __MINGW_ATTRIB_PURE; -_CRTIMP char* __cdecl __MINGW_NOTHROW strstr (const char*, const char*) __MINGW_ATTRIB_PURE; -_CRTIMP char* __cdecl __MINGW_NOTHROW strtok (char*, const char*); -_CRTIMP size_t __cdecl __MINGW_NOTHROW strxfrm (char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE size_t __cdecl strlen (const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl strncat (char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE int __cdecl strncmp (const char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW char* __cdecl strncpy (char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE char* __cdecl strpbrk (const char*, const char*); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE char* __cdecl strrchr (const char*, int); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE size_t __cdecl strspn (const char*, const char*); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_PURE char* __cdecl strstr (const char*, const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl strtok (char*, const char*); +_CRTIMP __MINGW_NOTHROW size_t __cdecl strxfrm (char*, const char*, size_t); #ifndef __STRICT_ANSI__ /* * Extra non-ANSI functions provided by the CRTDLL library */ -_CRTIMP char* __cdecl __MINGW_NOTHROW _strerror (const char *); -_CRTIMP void* __cdecl __MINGW_NOTHROW _memccpy (void*, const void*, int, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW _memicmp (const void*, const void*, size_t); -_CRTIMP char* __cdecl __MINGW_NOTHROW _strdup (const char*) __MINGW_ATTRIB_MALLOC; -_CRTIMP int __cdecl __MINGW_NOTHROW _strcmpi (const char*, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW _stricmp (const char*, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW _stricoll (const char*, const char*); -_CRTIMP char* __cdecl __MINGW_NOTHROW _strlwr (char*); -_CRTIMP int __cdecl __MINGW_NOTHROW _strnicmp (const char*, const char*, size_t); -_CRTIMP char* __cdecl __MINGW_NOTHROW _strnset (char*, int, size_t); -_CRTIMP char* __cdecl __MINGW_NOTHROW _strrev (char*); -_CRTIMP char* __cdecl __MINGW_NOTHROW _strset (char*, int); -_CRTIMP char* __cdecl __MINGW_NOTHROW _strupr (char*); -_CRTIMP void __cdecl __MINGW_NOTHROW _swab (const char*, char*, size_t); +_CRTIMP __MINGW_NOTHROW char* __cdecl _strerror (const char *); +_CRTIMP __MINGW_NOTHROW void* __cdecl _memccpy (void*, const void*, int, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl _memicmp (const void*, const void*, size_t); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_MALLOC char* __cdecl _strdup (const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl _strcmpi (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl _stricmp (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl _stricoll (const char*, const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl _strlwr (char*); +_CRTIMP __MINGW_NOTHROW int __cdecl _strnicmp (const char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW char* __cdecl _strnset (char*, int, size_t); +_CRTIMP __MINGW_NOTHROW char* __cdecl _strrev (char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl _strset (char*, int); +_CRTIMP __MINGW_NOTHROW char* __cdecl _strupr (char*); +_CRTIMP __MINGW_NOTHROW void __cdecl _swab (const char*, char*, size_t); #ifdef __MSVCRT__ -_CRTIMP int __cdecl __MINGW_NOTHROW _strncoll(const char*, const char*, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW _strnicoll(const char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl _strncoll(const char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl _strnicoll(const char*, const char*, size_t); #endif #ifndef _NO_OLDNAMES @@ -87,28 +87,28 @@ * and provide a little extra portability. Also a few extra UNIX-isms like * strcasecmp. */ -_CRTIMP void* __cdecl __MINGW_NOTHROW memccpy (void*, const void*, int, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW memicmp (const void*, const void*, size_t); -_CRTIMP char* __cdecl __MINGW_NOTHROW strdup (const char*) __MINGW_ATTRIB_MALLOC; -_CRTIMP int __cdecl __MINGW_NOTHROW strcmpi (const char*, const char*); -_CRTIMP int __cdecl __MINGW_NOTHROW stricmp (const char*, const char*); +_CRTIMP __MINGW_NOTHROW void* __cdecl memccpy (void*, const void*, int, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl memicmp (const void*, const void*, size_t); +_CRTIMP __MINGW_NOTHROW __MINGW_ATTRIB_MALLOC char* __cdecl strdup (const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl strcmpi (const char*, const char*); +_CRTIMP __MINGW_NOTHROW int __cdecl stricmp (const char*, const char*); __CRT_INLINE int __cdecl __MINGW_NOTHROW strcasecmp (const char*, const char *); __CRT_INLINE int __cdecl __MINGW_NOTHROW strcasecmp (const char * __sz1, const char * __sz2) {return _stricmp (__sz1, __sz2);} -_CRTIMP int __cdecl __MINGW_NOTHROW stricoll (const char*, const char*); -_CRTIMP char* __cdecl __MINGW_NOTHROW strlwr (char*); -_CRTIMP int __cdecl __MINGW_NOTHROW strnicmp (const char*, const char*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl stricoll (const char*, const char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl strlwr (char*); +_CRTIMP __MINGW_NOTHROW int __cdecl strnicmp (const char*, const char*, size_t); __CRT_INLINE int __cdecl __MINGW_NOTHROW strncasecmp (const char *, const char *, size_t); __CRT_INLINE int __cdecl __MINGW_NOTHROW strncasecmp (const char * __sz1, const char * __sz2, size_t __sizeMaxCompare) {return _strnicmp (__sz1, __sz2, __sizeMaxCompare);} -_CRTIMP char* __cdecl __MINGW_NOTHROW strnset (char*, int, size_t); -_CRTIMP char* __cdecl __MINGW_NOTHROW strrev (char*); -_CRTIMP char* __cdecl __MINGW_NOTHROW strset (char*, int); -_CRTIMP char* __cdecl __MINGW_NOTHROW strupr (char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl strnset (char*, int, size_t); +_CRTIMP __MINGW_NOTHROW char* __cdecl strrev (char*); +_CRTIMP __MINGW_NOTHROW char* __cdecl strset (char*, int); +_CRTIMP __MINGW_NOTHROW char* __cdecl strupr (char*); #ifndef _UWIN -_CRTIMP void __cdecl __MINGW_NOTHROW swab (const char*, char*, size_t); +_CRTIMP __MINGW_NOTHROW void __cdecl swab (const char*, char*, size_t); #endif /* _UWIN */ #endif /* _NO_OLDNAMES */ @@ -119,23 +119,23 @@ * Unicode versions of the standard calls. * Also in wchar.h, where they belong according to ISO standard. */ -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcscat (wchar_t*, const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcschr (const wchar_t*, wchar_t); -_CRTIMP int __cdecl __MINGW_NOTHROW wcscmp (const wchar_t*, const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW wcscoll (const wchar_t*, const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcscpy (wchar_t*, const wchar_t*); -_CRTIMP size_t __cdecl __MINGW_NOTHROW wcscspn (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcscat (wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcschr (const wchar_t*, wchar_t); +_CRTIMP __MINGW_NOTHROW int __cdecl wcscmp (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl wcscoll (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcscpy (wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW size_t __cdecl wcscspn (const wchar_t*, const wchar_t*); /* Note: _wcserror requires __MSVCRT_VERSION__ >= 0x0700. */ -_CRTIMP size_t __cdecl __MINGW_NOTHROW wcslen (const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsncat (wchar_t*, const wchar_t*, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW wcsncmp(const wchar_t*, const wchar_t*, size_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsncpy(wchar_t*, const wchar_t*, size_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcspbrk(const wchar_t*, const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsrchr(const wchar_t*, wchar_t); -_CRTIMP size_t __cdecl __MINGW_NOTHROW wcsspn(const wchar_t*, const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsstr(const wchar_t*, const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcstok(wchar_t*, const wchar_t*); -_CRTIMP size_t __cdecl __MINGW_NOTHROW wcsxfrm(wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW size_t __cdecl wcslen (const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsncat (wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl wcsncmp(const wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsncpy(wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcspbrk(const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsrchr(const wchar_t*, wchar_t); +_CRTIMP __MINGW_NOTHROW size_t __cdecl wcsspn(const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsstr(const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcstok(wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW size_t __cdecl wcsxfrm(wchar_t*, const wchar_t*, size_t); #ifndef __STRICT_ANSI__ /* @@ -145,22 +145,22 @@ /* NOTE: _wcscmpi not provided by CRTDLL, this define is for portability */ #define _wcscmpi _wcsicmp -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsdup (const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wcsicmp (const wchar_t*, const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wcsicoll (const wchar_t*, const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcslwr (wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW _wcsnicmp (const wchar_t*, const wchar_t*, size_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsnset (wchar_t*, wchar_t, size_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsrev (wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsset (wchar_t*, wchar_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsupr (wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wcsdup (const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl _wcsicmp (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl _wcsicoll (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wcslwr (wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl _wcsnicmp (const wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wcsnset (wchar_t*, wchar_t, size_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wcsrev (wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wcsset (wchar_t*, wchar_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wcsupr (wchar_t*); #ifdef __MSVCRT__ -_CRTIMP int __cdecl __MINGW_NOTHROW _wcsncoll(const wchar_t*, const wchar_t*, size_t); -_CRTIMP int __cdecl __MINGW_NOTHROW _wcsnicoll(const wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl _wcsncoll(const wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW int __cdecl _wcsnicoll(const wchar_t*, const wchar_t*, size_t); #if __MSVCRT_VERSION__ >= 0x0700 -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcserror(int); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW __wcserror(const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl _wcserror(int); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl __wcserror(const wchar_t*); #endif #endif @@ -170,15 +170,15 @@ __CRT_INLINE int __cdecl __MINGW_NOTHROW wcscmpi (const wchar_t * __ws1, const wchar_t * __ws2) {return _wcsicmp (__ws1, __ws2);} -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsdup (const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW wcsicmp (const wchar_t*, const wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW wcsicoll (const wchar_t*, const wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcslwr (wchar_t*); -_CRTIMP int __cdecl __MINGW_NOTHROW wcsnicmp (const wchar_t*, const wchar_t*, size_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsnset (wchar_t*, wchar_t, size_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsrev (wchar_t*); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsset (wchar_t*, wchar_t); -_CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcsupr (wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsdup (const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl wcsicmp (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl wcsicoll (const wchar_t*, const wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcslwr (wchar_t*); +_CRTIMP __MINGW_NOTHROW int __cdecl wcsnicmp (const wchar_t*, const wchar_t*, size_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsnset (wchar_t*, wchar_t, size_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsrev (wchar_t*); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsset (wchar_t*, wchar_t); +_CRTIMP __MINGW_NOTHROW wchar_t* __cdecl wcsupr (wchar_t*); #endif /* Not _NO_OLDNAMES */ #endif /* Not strict ANSI */

16 years, 1 month

[hyperion] 37052: modified math/i386/ci.c Translate inline assembler to Visual C++ syntax modified string/ctype.c MinGW headers define towlower/towupper as taking & returning wint_t

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 29 08:04:45 2008 New Revision: 37052 URL: http://svn.reactos.org/svn/reactos?rev=37052&view=rev Log: modified math/i386/ci.c Translate inline assembler to Visual C++ syntax modified string/ctype.c MinGW headers define towlower/towupper as taking & returning wint_t Modified: branches/the-real-msvc/lib/sdk/crt/math/i386/ci.c branches/the-real-msvc/lib/sdk/crt/string/ctype.c Modified: branches/the-real-msvc/lib/sdk/crt/math/i386/ci.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/sdk/crt/math/… ============================================================================== --- branches/the-real-msvc/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Wed Oct 29 08:04:45 2008 @@ -1,11 +1,19 @@ #include <precomp.h> #include <math.h> +#if defined(__GNUC__) #define FPU_DOUBLE(var) double var; \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) #define FPU_DOUBLES(var1,var2) double var1,var2; \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) +#elif defined(_MSC_VER) +#define FPU_DOUBLE(var) double var; \ + __asm { fstp [var] }; __asm { fwait }; +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm { fstp [var1] }; __asm { fwait }; \ + __asm { fstp [var2] }; __asm { fwait }; +#endif /* * @implemented Modified: branches/the-real-msvc/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/sdk/crt/strin… ============================================================================== --- branches/the-real-msvc/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/sdk/crt/string/ctype.c [iso-8859-1] Wed Oct 29 08:04:45 2008 @@ -591,7 +591,7 @@ /* * @implemented */ -wchar_t towlower(wchar_t c) +wint_t towlower(wint_t c) { if (iswctype (c, _UPPER)) return (c - upalpha); @@ -601,7 +601,7 @@ /* * @implemented */ -wchar_t towupper(wchar_t c) +wint_t towupper(wint_t c) { if (iswctype (c, _LOWER)) return (c + upalpha);

16 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
...
52
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 October 2008