Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 37971: implement hex value support for ParseAccessMaskString sync ComputeStringSidSize with wine
by cwittich＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: cwittich Date: Tue Dec 9 10:39:03 2008 New Revision: 37971 URL: http://svn.reactos.org/svn/reactos?rev=37971&view=rev Log: implement hex value support for ParseAccessMaskString sync ComputeStringSidSize with wine Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec 9 10:39:03 2008 @@ -452,10 +452,35 @@ OUT DWORD* pAccessMask, OUT SIZE_T* pLength) { - /* FIXME: Allow hexadecimal string for access rights! */ - - return ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength); -} + LPCWSTR szAcl = Buffer; + BOOL RetVal = FALSE; + LPCWSTR ptr; + + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) + { + LPCWSTR p = szAcl; + + while (*p && *p != ';') + p++; + + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) + { + *pAccessMask = strtoulW(szAcl, NULL, 16); + ptr = wcschr(Buffer, SDDL_SEPERATORC); + if (ptr) + { + *pLength = ptr - Buffer; + RetVal = TRUE; + } + } + } + else + { + RetVal = ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength); + } + + return RetVal; + } static BOOL ParseGuidString( @@ -1664,12 +1689,9 @@ /****************************************************************************** * ComputeStringSidSize */ -static DWORD -ComputeStringSidSize(LPCWSTR StringSid) -{ - DWORD size = sizeof(SID); - - if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ +static DWORD ComputeStringSidSize(LPCWSTR StringSid) +{ + if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I(-S)+ */ { int ctok = 0; while (*StringSid) @@ -1679,8 +1701,8 @@ StringSid++; } - if (ctok > 3) - size += (ctok - 3) * sizeof(DWORD); + if (ctok >= 3) + return GetSidLengthRequired(ctok - 2); } else /* String constant format - Only available in winxp and above */ { @@ -1688,10 +1710,10 @@ for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) - size += (WellKnownSids[i].Sid.SubAuthorityCount - 1) * sizeof(DWORD); - } - - return size; + return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); + } + + return GetSidLengthRequired(0); } static const RECORD SidTable[] =

1 0

[dgorbachev] 37970: Fix IntIsValidSBCSMapping(). Bug #3903.
by dgorbachev＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: dgorbachev Date: Tue Dec 9 10:13:51 2008 New Revision: 37970 URL: http://svn.reactos.org/svn/reactos?rev=37970&view=rev Log: Fix IntIsValidSBCSMapping(). Bug #3903. Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Tue Dec 9 10:13:51 2008 @@ -740,7 +740,7 @@ { /* If the WC_NO_BEST_FIT_CHARS flag has been specified, the characters need to match exactly. */ if (Flags & WC_NO_BEST_FIT_CHARS) - return (CodePageTable->MultiByteTable[ch] != wch); + return (CodePageTable->MultiByteTable[ch] == wch); /* By default, all characters except TransDefaultChar apply as a valid mapping for ch (so also "nearest" characters) */

1 0

[tkreuzer] 37969: fix Ke386SetCr2
by tkreuzer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: tkreuzer Date: Tue Dec 9 09:50:10 2008 New Revision: 37969 URL: http://svn.reactos.org/svn/reactos?rev=37969&view=rev Log: fix Ke386SetCr2 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Tue Dec 9 09:50:10 2008 @@ -106,7 +106,7 @@ // // CR Macros // -#define Ke386SetCr2(X) __asm__ __volatile__("movl %0,%%cr2" : :"r" (X)); +#define Ke386SetCr2(X) __asm__ __volatile__("movq %0,%%cr2" : :"r" ((void*)X)); // // DR Macros

1 0

[tkreuzer] 37968: Make PsNtosImageBase an ULONG_PTR
by tkreuzer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: tkreuzer Date: Tue Dec 9 09:46:57 2008 New Revision: 37968 URL: http://svn.reactos.org/svn/reactos?rev=37968&view=rev Log: Make PsNtosImageBase an ULONG_PTR Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Tue Dec 9 09:46:57 2008 @@ -423,7 +423,7 @@ extern LARGE_INTEGER ShortPsLockDelay; extern UNICODE_STRING PsNtDllPathName; extern LIST_ENTRY PsLoadedModuleList; -extern ULONG PsNtosImageBase; +extern ULONG_PTR PsNtosImageBase; // // Inlined Functions Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Tue Dec 9 09:46:57 2008 @@ -28,7 +28,7 @@ LIST_ENTRY PsLoadedModuleList; KSPIN_LOCK PsLoadedModuleSpinLock; -ULONG PsNtosImageBase; +ULONG_PTR PsNtosImageBase; KMUTANT MmSystemLoadLock; extern ULONG NtGlobalFlag;

1 0

[tkreuzer] 37967: fix ULONG/ULONG_PTR isuue
by tkreuzer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: tkreuzer Date: Tue Dec 9 09:45:54 2008 New Revision: 37967 URL: http://svn.reactos.org/svn/reactos?rev=37967&view=rev Log: fix ULONG/ULONG_PTR isuue Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Tue Dec 9 09:45:54 2008 @@ -1065,7 +1065,7 @@ /* Check if we need to save the context for KD */ #ifdef _WINKD_ - if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG)&Context; + if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG_PTR)&Context; #endif /* Check if a debugger is connected */

1 0

[tkreuzer] 37966: Make IMAGE_ORDINAL_FLAG64 an ULONGLONG
by tkreuzer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: tkreuzer Date: Tue Dec 9 09:37:05 2008 New Revision: 37966 URL: http://svn.reactos.org/svn/reactos?rev=37966&view=rev Log: Make IMAGE_ORDINAL_FLAG64 an ULONGLONG Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h [iso-8859-1] Tue Dec 9 09:37:05 2008 @@ -470,7 +470,7 @@ } u1; } IMAGE_THUNK_DATA32, *PIMAGE_THUNK_DATA32; -#define IMAGE_ORDINAL_FLAG64 0x8000000000000000 +#define IMAGE_ORDINAL_FLAG64 0x8000000000000000ULL #define IMAGE_ORDINAL_FLAG32 0x80000000 #define IMAGE_ORDINAL64(Ordinal) (Ordinal & 0xffff) #define IMAGE_ORDINAL32(Ordinal) (Ordinal & 0xffff)

1 0

[dgorbachev] 37965: Provide memcmp() for GCC 4.4.0.
by dgorbachev＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: dgorbachev Date: Tue Dec 9 09:05:02 2008 New Revision: 37965 URL: http://svn.reactos.org/svn/reactos?rev=37965&view=rev Log: Provide memcmp() for GCC 4.4.0. Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] Tue Dec 9 09:05:02 2008 @@ -194,3 +194,7 @@ return RtlCompareMemory(b1, b2, len); } +int memcmp(const void *b1, const void *b2, size_t len) +{ + return RtlCompareMemory(b1, b2, len); +}

1 0

[jimtabor] 37952: - Add CP_UNIXCP for CP_ACP, this will help cross tests.
by jimtabor＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: jimtabor Date: Mon Dec 8 23:58:23 2008 New Revision: 37952 URL: http://svn.reactos.org/svn/reactos?rev=37952&view=rev Log: - Add CP_UNIXCP for CP_ACP, this will help cross tests. Added: trunk/reactos/include/reactos/wine/winnls.h (with props) Added: trunk/reactos/include/reactos/wine/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnl… ============================================================================== --- trunk/reactos/include/reactos/wine/winnls.h (added) +++ trunk/reactos/include/reactos/wine/winnls.h [iso-8859-1] Mon Dec 8 23:58:23 2008 @@ -1,0 +1,25 @@ +/* + * Copyright (C) the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINNLS_H +#define __WINE_WINNLS_H + +#define CP_UNIXCP CP_ACP + + +#endif /* __WINE_WINNLS_H */ Propchange: trunk/reactos/include/reactos/wine/winnls.h ------------------------------------------------------------------------------ svn:eol-style = native

2 1

[khornicek] 37964: - merge r37917, r37835 from trunk
by khornicek＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: khornicek Date: Tue Dec 9 08:05:35 2008 New Revision: 37964 URL: http://svn.reactos.org/svn/reactos?rev=37964&view=rev Log: - merge r37917, r37835 from trunk Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c branches/reactx/reactos/dll/directx/ddraw/startup.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Tue Dec 9 08:05:35 2008 @@ -590,7 +590,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP)) { return DDERR_GENERIC; } Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Tue Dec 9 08:05:35 2008 @@ -136,7 +136,7 @@ { DX_STUB_str("Got iface\n"); - if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK); + if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK) { /* RtlZeroMemory(&wnd_class, sizeof(wnd_class));

1 0

[dreimer] 37963: Some more tidy up work. As side effect RosBE does support even more Target Compilers.
by dreimer＠svn.reactos.org 09 Dec '08

09 Dec '08

Author: dreimer Date: Tue Dec 9 07:51:24 2008 New Revision: 37963 URL: http://svn.reactos.org/svn/reactos?rev=37963&view=rev Log: Some more tidy up work. As side effect RosBE does support even more Target Compilers. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -142,23 +142,9 @@ if ($args -eq "oldmode") { clear-host $_ROSBE_MODE = "MinGW" - } - elseif ($args -eq "arm") { + } else { clear-host - $_ROSBE_ARCH = 1 - } - elseif ($args -eq "ppc") { - clear-host - $_ROSBE_ARCH = 2 - } - elseif ($args -eq "amd64") { - clear-host - $_ROSBE_ARCH = 3 - } - elseif ($args -ne $null) { - clear-host - "Unknown parameter specified. Exiting." - exit + $_ROSBE_ARCH = $args } } RosBE Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -32,23 +32,10 @@ } if ($_1 -eq "i386") { $_ROSBE_ARCH = $null - SYSPARAM +} else { + $_ROSBE_ARCH = $_1 } -elseif ($_1 -eq "arm") { - $_ROSBE_ARCH = 1 - SYSPARAM -} -elseif ($_1 -eq "ppc") { - $_ROSBE_ARCH = 2 - SYSPARAM -} -elseif ($_1 -eq "amd64") { - $_ROSBE_ARCH = 3 - SYSPARAM -} -else { - "Unknown parameter specified. Try 'help [COMMAND]'." -} +SYSPARAM if ($_ROSBE_VERSION -ne $null) { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -25,20 +25,27 @@ $ENV:ROS_ARCH = $null $ENV:ROS_PREFIX = $null -if ($_ROSBE_ARCH -eq 1) { - $ENV:ROS_ARCH = "arm" - $ENV:ROS_PREFIX = "arm-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\arm" -} -if ($_ROSBE_ARCH -eq 2) { - $ENV:ROS_ARCH = "ppc" - $ENV:ROS_PREFIX = "ppc-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\ppc" -} -if ($_ROSBE_ARCH -eq 3) { - $ENV:ROS_ARCH = "amd64" - $ENV:ROS_PREFIX = "x86_64-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" +if ($_ROSBE_ARCH -ne $null) { + $ENV:ROS_ARCH = $_ROSBE_ARCH + $ENV:ROS_PREFIX = "$_ROSBE_ARCH-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$_ROSBE_ARCH" + + # HAXX + + if ($_ROSBE_ARCH -eq "amd64") { + $ENV:ROS_PREFIX = "x86_64-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" + } + + # Check if existant arch + + if (Test-Path "$_ROSBE_TARGET_MINGWPATH\.") { + "Unsupported arch specified. Fallback to Default." + pause + $ENV:ROS_ARCH = $null + $ENV:ROS_PREFIX = $null + $_ROSBE_TARGET_MINGWPATH = $null + } } # Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -64,34 +64,11 @@ set _ROSBE_MODE=MinGW call :RosBE4 goto :EndCommandParse +) else ( + cls + set _ROSBE_ARCH=%1 + call :RosBE4 ) -if /i "%1" == "arm" ( - cls - set _ROSBE_ARCH=1 - call :RosBE4 - goto :EndCommandParse -) -if /i "%1" == "ppc" ( - cls - set _ROSBE_ARCH=2 - call :RosBE4 - goto :EndCommandParse -) -if /i "%1" == "amd64" ( - cls - set _ROSBE_ARCH=3 - call :RosBE4 - goto :EndCommandParse -) -if not "%1" == "" ( - cls - echo Unknown parameter specified. Exiting. - goto :EOF -) - -cls -call :RosBE4 - :: :: Load the base directory from srclist.txt and set it as the :: new source directory. Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -25,24 +25,10 @@ ) if /i "%_1%" == "i386" ( set _ROSBE_ARCH= - goto :EOA +) else ( + set _ROSBE_ARCH=%_1% ) -if /i "%_1%" == "arm" ( - set _ROSBE_ARCH=1 - goto :EOA -) -if /i "%_1%" == "ppc" ( - set _ROSBE_ARCH=2 - goto :EOA -) -if /i "%_1%" == "amd64" ( - set _ROSBE_ARCH=3 - goto :EOA -) -if not "%_1%" == "" ( - echo Unknown parameter specified. Try 'help [COMMAND]'. - goto :EOC -) +goto :EOA :: :: Refresh all needed Params by recalling the main Path setting CMD File. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Dec 9 07:51:24 2008 @@ -33,20 +33,27 @@ goto :main ) -if "%_ROSBE_ARCH%" == "1" ( - set ROS_ARCH=arm - set ROS_PREFIX=arm-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\arm -) -if "%_ROSBE_ARCH%" == "2" ( - set ROS_ARCH=ppc - set ROS_PREFIX=ppc-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\ppc -) -if "%_ROSBE_ARCH%" == "3" ( - set ROS_ARCH=amd64 - set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 +if not "%_ROSBE_ARCH%" == "" ( + set ROS_ARCH=%_ROSBE_ARCH% + set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%_ROSBE_ARCH% + + REM HAXX + + if "%_ROSBE_ARCH%" == "amd64" ( + set ROS_PREFIX=x86_64-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 + ) + + REM Check if existant arch + + if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( + echo Unsupported arch specified. Fallback to Default. + pause + set ROS_ARCH= + set ROS_PREFIX= + set _ROSBE_TARGET_MINGWPATH= + ) ) ::

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