Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37064: - MmMapViewOfSection: Don't forget to unlock the address space before returning -- fixes a bugcheck revealed by kernel32 Winetest "virtual"
by sginsberg＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: sginsberg Date: Wed Oct 29 11:10:20 2008 New Revision: 37064 URL: http://svn.reactos.org/svn/reactos?rev=37064&view=rev Log: - MmMapViewOfSection: Don't forget to unlock the address space before returning -- fixes a bugcheck revealed by kernel32 Winetest "virtual" Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Oct 29 11:10:20 2008 @@ -4642,18 +4642,21 @@ if ((Protect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) && !(Section->SectionPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; } /* check for read access */ if ((Protect & (PAGE_READONLY|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; } /* check for execute access */ if ((Protect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) && !(Section->SectionPageProtection & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) { + MmUnlockAddressSpace(AddressSpace); return STATUS_SECTION_PROTECTION; }

1 0

[janderwald] 37063: * Try to invoke items by executing the default context menu action * Fixes executing of items like network connections folder whose items are no file system objects * Colin's wish list (1/2) :)
by janderwald＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: janderwald Date: Wed Oct 29 11:00:28 2008 New Revision: 37063 URL: http://svn.reactos.org/svn/reactos?rev=37063&view=rev Log: * Try to invoke items by executing the default context menu action * Fixes executing of items like network connections folder whose items are no file system objects * Colin's wish list (1/2) :) Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Wed Oct 29 11:00:28 2008 @@ -835,6 +835,8 @@ static UINT CF_IDLIST = 0; HRESULT hr; IDataObject* selection; + IContextMenu * cm; + HMENU hmenu; FORMATETC fetc; STGMEDIUM stgm; LPIDA pIDList; @@ -843,14 +845,68 @@ LPCWSTR parent_dir = NULL; SFGAOF attribs; int i; + CMINVOKECOMMANDINFOEX ici; + MENUITEMINFOW info; if (0 == ShellView_GetSelections(This)) { return S_OK; } + + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, + (LPCITEMIDLIST*)This->apidl, &IID_IContextMenu, + 0, (LPVOID *)&cm); + + if (SUCCEEDED(hr)) + { + hmenu = CreatePopupMenu(); + if (hmenu) + { + if (SUCCEEDED(IContextMenu_QueryContextMenu( cm, hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY))) + { + INT def = -1, n = GetMenuItemCount(hmenu); + + for ( i = 0; i < n; i++ ) + { + memset( &info, 0, sizeof info ); + info.cbSize = sizeof info; + info.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID; + if (GetMenuItemInfoW( hmenu, i, TRUE, &info)) + { + if (info.fState & MFS_DEFAULT) + { + def = info.wID; + break; + } + } + } + if (def != -1) + { + memset( &ici, 0, sizeof ici ); + ici.cbSize = sizeof ici; + ici.lpVerb = MAKEINTRESOURCEA( def ); + ici.hwnd = This->hWnd; + + IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ); + IContextMenu_Release(cm); + DestroyMenu( hmenu ); + return S_OK; + } + + } + DestroyMenu( hmenu ); + } + IContextMenu_Release(cm); + } + + + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject, 0, (LPVOID *)&selection); + + + if (FAILED(hr)) return hr;

1 0

[cfinck] 37062: Rebranch 0.3.7 from trunk
by cfinck＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: cfinck Date: Wed Oct 29 10:45:08 2008 New Revision: 37062 URL: http://svn.reactos.org/svn/reactos?rev=37062&view=rev Log: Rebranch 0.3.7 from trunk Added: branches/ros-branch-0_3_7/ - copied from r37061, trunk/

1 0

[cfinck] 37061: Delete the 0.3.7 branch, it will be rebranched from trunk
by cfinck＠svn.reactos.org 29 Oct '08

29 Oct '08

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/

1 0

[hyperion] 37060: Daily merge from trunk (36960-37059). You guys sure commit a lot
by hyperion＠svn.reactos.org 29 Oct '08

29 Oct '08

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…

1 0

[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 29 Oct '08

29 Oct '08

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

1 0

[janderwald] 37058: - Only display the default gateway when there is actually a gateway set
by janderwald＠svn.reactos.org 29 Oct '08

29 Oct '08

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

1 0

[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 29 Oct '08

29 Oct '08

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

1 0

[janderwald] 37056: - Only display a gateway address when there is one
by janderwald＠svn.reactos.org 29 Oct '08

29 Oct '08

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)

1 0

[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 29 Oct '08

29 Oct '08

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs