Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 28902: - Shutdown services when the SCM is terminated - Add basic code for shutting down of the SCM - Fix the headers
by gedmurphy＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: gedmurphy Date: Thu Sep 6 18:51:38 2007 New Revision: 28902 URL: http://svn.reactos.org/svn/reactos?rev=28902&view=rev Log: - Shutdown services when the SCM is terminated - Add basic code for shutting down of the SCM - Fix the headers Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/driver.c trunk/reactos/base/system/services/groupdb.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c (original) +++ trunk/reactos/base/system/services/config.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,10 @@ /* - * config.c + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/config.c + * PURPOSE: Service configuration interface + * COPYRIGHT: Copyright 2005 Eric Kohl + * */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Thu Sep 6 18:51:38 2007 @@ -1,25 +1,11 @@ /* - * - * service control manager - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/database.c + * PURPOSE: Database control interface + * COPYRIGHT: Copyright 2002-2006 Eric Kohl + * Copyright 2006 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -439,6 +425,18 @@ } +VOID +ScmShutdownServiceDatabase(VOID) +{ + DPRINT("ScmShutdownServiceDatabase() called\n"); + + ScmDeleteMarkedServices(); + RtlDeleteResource(&DatabaseLock); + + DPRINT("ScmShutdownServiceDatabase() done\n"); +} + + static NTSTATUS ScmCheckDriver(PSERVICE Service) { @@ -1000,4 +998,32 @@ } } + +VOID +ScmAutoShutdownServices(VOID) +{ + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + SERVICE_STATUS ServiceStatus; + + DPRINT("ScmAutoShutdownServices() called\n"); + + ServiceEntry = ServiceListHead.Flink; + while (ServiceEntry != &ServiceListHead) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); + + if (CurrentService->Status.dwCurrentState == SERVICE_RUNNING || + CurrentService->Status.dwCurrentState == SERVICE_START_PENDING) + { + /* shutdown service */ + ScmControlService(CurrentService, SERVICE_CONTROL_STOP, &ServiceStatus); + } + + ServiceEntry = ServiceEntry->Flink; + } + + DPRINT("ScmGetBootAndSystemDriverState() done\n"); +} + /* EOF */ Modified: trunk/reactos/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/drive… ============================================================================== --- trunk/reactos/base/system/services/driver.c (original) +++ trunk/reactos/base/system/services/driver.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,10 @@ /* - * driver.c + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/driver.c + * PURPOSE: Driver control interface + * COPYRIGHT: Copyright 2005-2006 Eric Kohl + * */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/group… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c (original) +++ trunk/reactos/base/system/services/groupdb.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,10 @@ /* - * groupdb.c + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/groupdb.c + * PURPOSE: Service group control interface + * COPYRIGHT: Copyright 2005 Eric Kohl + * */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Thu Sep 6 18:51:38 2007 @@ -1,5 +1,12 @@ /* - + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/rpcserver.c + * PURPOSE: RPC server interface for the advapi32 calls + * COPYRIGHT: Copyright 2005-2006 Eric Kohl + * Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> + * */ /* INCLUDES ****************************************************************/ Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c (original) +++ trunk/reactos/base/system/services/services.c Thu Sep 6 18:51:38 2007 @@ -1,24 +1,10 @@ /* - * service control manager - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This software is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This software 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING.LIB. If not, write - * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - * MA 02139, USA. + * PROJECT: ReactOS Service Control Manager + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/services/services.c + * PURPOSE: Main SCM controller + * COPYRIGHT: Copyright 2001-2005 Eric Kohl + * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -298,7 +284,8 @@ DPRINT1("Shutdown event received!\n"); ScmShutdown = TRUE; - /* FIXME: Shut all services down */ + ScmAutoShutdownServices(); + ScmShutdownServiceDatabase(); } return TRUE; @@ -378,6 +365,8 @@ } #endif + CloseHandle(hScmStartEvent); + DPRINT("SERVICES: Finished.\n"); ExitThread(0); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Thu Sep 6 18:51:38 2007 @@ -94,8 +94,10 @@ /* database.c */ DWORD ScmCreateServiceDatabase(VOID); +VOID ScmShutdownServiceDatabase(VOID); VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID); +VOID ScmAutoShutdownServices(VOID); DWORD ScmStartService(PSERVICE Service, LPWSTR lpArgs);

1 0

[janderwald] 28901: - end the configuration commit war
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Thu Sep 6 17:57:55 2007 New Revision: 28901 URL: http://svn.reactos.org/svn/reactos?rev=28901&view=rev Log: - end the configuration commit war Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Sep 6 17:57:55 2007 @@ -49,7 +49,6 @@ string RosBootTest::ROS_EMU_TYPE= _T("ROS_EMU_TYPE"); string RosBootTest::EMU_TYPE_QEMU = _T("qemu"); string RosBootTest::EMU_TYPE_VMWARE = _T("vmware"); - string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH"); string RosBootTest::ROS_HDD_IMAGE= _T("ROS_HDD_IMAGE"); string RosBootTest::ROS_CD_IMAGE = _T("ROS_CD_IMAGE"); string RosBootTest::ROS_MAX_TIME = _T("ROS_MAX_TIME"); @@ -61,6 +60,12 @@ string RosBootTest::ROS_EMU_KILL = _T("ROS_EMU_KILL"); string RosBootTest::ROS_EMU_MEM = _T("ROS_EMU_MEM"); string RosBootTest::ROS_BOOT_CMD = _T("ROS_BOOT_CMD"); + +#ifdef __LINUX__ + string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_LIN"); +#else + string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_WIN"); +#endif //--------------------------------------------------------------------------------------- RosBootTest::RosBootTest() : m_MaxTime(0.0), m_DelayRead(0) Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Thu Sep 6 17:57:55 2007 @@ -6,12 +6,12 @@ ROS_EMU_TYPE=qemu -; ROS_EMU_PATH +; ROS_EMU_PATH[LIN|WIN] ; ; This variable sets the path to the emulator ; -;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe -ROS_EMU_PATH=/usr/bin/qemu +ROS_EMU_PATH_WIN=E:\reactos\qemu\qemu.exe +ROS_EMU_PATH_LIN=/usr/bin/qemu ; ROS_HDD_IMAGE ;

1 0

[tkreuzer] 28900: - add the missing macro What the last change does and I missed last commit: - use individual pool tags for each gdi object type - allow object allocation w/o lookaside list - don't search for the lookaside list/cleanup proc, the index into the lists is now calculated from type
by tkreuzer＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: tkreuzer Date: Thu Sep 6 17:14:21 2007 New Revision: 28900 URL: http://svn.reactos.org/svn/reactos?rev=28900&view=rev Log: - add the missing macro What the last change does and I missed last commit: - use individual pool tags for each gdi object type - allow object allocation w/o lookaside list - don't search for the lookaside list/cleanup proc, the index into the lists is now calculated from type Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Sep 6 17:14:21 2007 @@ -28,6 +28,7 @@ #define GDI_HANDLE_REUSE_MASK 0xff000000 #define GDI_HANDLE_UPPER_MASK (GDI_HANDLE_TYPE_MASK|GDI_HANDLE_STOCK_MASK|GDI_HANDLE_REUSE_MASK) #define GDI_HANDLE_REUSECNT_SHIFT 24 +#define GDI_HANDLE_BASETYPE_SHIFT 16 #define GDI_ENTRY_STOCK_MASK 0x00000080 #define GDI_ENTRY_REUSE_MASK 0x0000ff00 @@ -116,6 +117,9 @@ #define GDI_ENTRY_GET_REUSECNT(e) \ ((((ULONG_PTR)(e)) & GDI_ENTRY_REUSE_MASK) >> GDI_ENTRY_REUSECNT_SHIFT) + +#define GDI_OBJECT_GET_TYPE_INDEX(t) \ + ((t & GDI_HANDLE_BASETYPE_MASK) >> GDI_HANDLE_BASETYPE_SHIFT) /* DC OBJ Types */ #define DC_TYPE_DIRECT 0 // normal device context Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Sep 6 17:14:21 2007 @@ -364,7 +364,7 @@ ASSERT(ObjectType != GDI_OBJECT_TYPE_DONTCARE); - TypeIndex = 0; //GDI_OBJECT_GET_TYPE_INDEX(ObjectType); + TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(ObjectType); if (ObjTypeInfo[TypeIndex].bUseLookaside) { LookasideList = FindLookasideList(HandleTable, TypeIndex); @@ -583,7 +583,7 @@ } /* call the cleanup routine. */ - TypeIndex = 0; //GDI_OBJECT_GET_TYPE_INDEX(HandleType); + TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(HandleType); Ret = RunCleanupCallback(GDIHdrToBdy(GdiHdr), TypeIndex); /* Now it's time to free the memory */

1 0

[amunger] 28899: Gracefully handle the case where the BIOS insists there is a floppy drive, but there is no controller. Patch by Cameron Gutman (aicommander at gmail dot com) from Bug 1508.
by amunger＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: amunger Date: Thu Sep 6 16:36:05 2007 New Revision: 28899 URL: http://svn.reactos.org/svn/reactos?rev=28899&view=rev Log: Gracefully handle the case where the BIOS insists there is a floppy drive, but there is no controller. Patch by Cameron Gutman (aicommander at gmail dot com) from Bug 1508. Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c Thu Sep 6 16:36:05 2007 @@ -687,6 +687,22 @@ return STATUS_IO_DEVICE_ERROR; } +/* Check if floppy drive exists */ + if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) + { + DPRINT("floppy: Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n"); + return STATUS_IO_DEVICE_ERROR; + } + +DPRINT("floppy: InitController: resetting the controller after floppy detection\n"); + + /* Reset the controller */ + if(HwReset(ControllerInfo) != STATUS_SUCCESS) + { + DPRINT("floppy: InitController: unable to reset controller\n"); + return STATUS_IO_DEVICE_ERROR; + } + DPRINT("floppy: InitController: setting data rate\n"); /* Set data rate */

1 0

[amunger] 28898: Remove Byte-Order-Mark from rc file. Fixes my solitaire. ; 0)
by amunger＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: amunger Date: Thu Sep 6 16:14:43 2007 New Revision: 28898 URL: http://svn.reactos.org/svn/reactos?rev=28898&view=rev Log: Remove Byte-Order-Mark from rc file. Fixes my solitaire. ;0) Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ca-CA.rc Thu Sep 6 16:14:43 2007 @@ -1,4 +1,4 @@ -ï»¿/* +/* * PROJECT: Solitaire * LICENSE: Freeware, permission to use under Public Domain * FILE: base/applications/games/solitaire/ca-CA.rc

1 0

[gedmurphy] 28897: Add a hack to fix the build. Timo, can you revert this and add the missing macro when you can please.
by gedmurphy＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: gedmurphy Date: Thu Sep 6 13:41:00 2007 New Revision: 28897 URL: http://svn.reactos.org/svn/reactos?rev=28897&view=rev Log: Add a hack to fix the build. Timo, can you revert this and add the missing macro when you can please. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Sep 6 13:41:00 2007 @@ -364,7 +364,7 @@ ASSERT(ObjectType != GDI_OBJECT_TYPE_DONTCARE); - TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(ObjectType); + TypeIndex = 0; //GDI_OBJECT_GET_TYPE_INDEX(ObjectType); if (ObjTypeInfo[TypeIndex].bUseLookaside) { LookasideList = FindLookasideList(HandleTable, TypeIndex); @@ -583,7 +583,7 @@ } /* call the cleanup routine. */ - TypeIndex = GDI_OBJECT_GET_TYPE_INDEX(HandleType); + TypeIndex = 0; //GDI_OBJECT_GET_TYPE_INDEX(HandleType); Ret = RunCleanupCallback(GDIHdrToBdy(GdiHdr), TypeIndex); /* Now it's time to free the memory */

1 0

[gedmurphy] 28896: add the account name to the QueryServiceConfig RPC call
by gedmurphy＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: gedmurphy Date: Thu Sep 6 13:18:23 2007 New Revision: 28896 URL: http://svn.reactos.org/svn/reactos?rev=28896&view=rev Log: add the account name to the QueryServiceConfig RPC call Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Thu Sep 6 13:18:23 2007 @@ -1618,6 +1618,7 @@ PSERVICE lpService = NULL; HKEY hServiceKey = NULL; LPWSTR lpImagePath = NULL; + LPWSTR lpServiceStartName = NULL; DWORD dwRequiredSize; LPQUERY_SERVICE_CONFIGW lpConfig; LPWSTR lpStr; @@ -1662,6 +1663,10 @@ if (dwError != ERROR_SUCCESS) goto Done; + ScmReadString(hServiceKey, + L"ObjectName", + &lpServiceStartName); + dwRequiredSize = sizeof(QUERY_SERVICE_CONFIGW); if (lpImagePath != NULL) @@ -1672,7 +1677,8 @@ /* FIXME: Add Dependencies length*/ - /* FIXME: Add ServiceStartName length*/ + if (lpServiceStartName != NULL) + dwRequiredSize += ((wcslen(lpServiceStartName) + 1) * sizeof(WCHAR)); if (lpService->lpDisplayName != NULL) dwRequiredSize += ((wcslen(lpService->lpDisplayName) + 1) * sizeof(WCHAR)); @@ -1716,8 +1722,16 @@ /* FIXME: Append Dependencies */ lpConfig->lpDependencies = NULL; - /* FIXME: Append ServiceStartName */ - lpConfig->lpServiceStartName = NULL; + if (lpServiceStartName != NULL) + { + wcscpy(lpStr, lpServiceStartName); + lpConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); + lpStr += (wcslen(lpServiceStartName) + 1); + } + else + { + lpConfig->lpServiceStartName = NULL; + } if (lpService->lpDisplayName != NULL) { @@ -1736,6 +1750,9 @@ Done:; if (lpImagePath != NULL) HeapFree(GetProcessHeap(), 0, lpImagePath); + + if (lpServiceStartName != NULL) + HeapFree(GetProcessHeap(), 0, lpServiceStartName); if (hServiceKey != NULL) RegCloseKey(hServiceKey);

1 0

[hpoussin] 28895: Explain why some binutils are blacklisted
by hpoussin＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: hpoussin Date: Thu Sep 6 12:25:57 2007 New Revision: 28895 URL: http://svn.reactos.org/svn/reactos?rev=28895&view=rev Log: Explain why some binutils are blacklisted Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Thu Sep 6 12:25:57 2007 @@ -890,14 +890,20 @@ MingwBackend::IsSupportedBinutilsVersion ( const string& binutilsVersion ) { if ( manualBinutilsSetting ) return true; - + /* linux */ if ( binutilsVersion.find('.') != std::string::npos ) { - /* TODO: blacklist versions on version number instead of date */ + /* TODO: blacklist versions on version number instead of date */ return true; } + /* + * - Binutils older than 2003/10/01 have broken windres which can't handle + * icons with alpha channel. + * - Binutils between 2004/09/02 and 2004/10/08 have broken handling of + * forward exports in dlltool. + */ if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) && ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) || ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) )

1 0

[hpoussin] 28894: Add method to get target arch in rbuild
by hpoussin＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: hpoussin Date: Thu Sep 6 11:46:48 2007 New Revision: 28894 URL: http://svn.reactos.org/svn/reactos?rev=28894&view=rev Log: Add method to get target arch in rbuild Modified: trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Thu Sep 6 11:46:48 2007 @@ -35,6 +35,12 @@ return ""; } +string +Environment::GetArch () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_ARCH", "i386" ); +} + /* static */ string Environment::GetEnvironmentVariablePathOrDefault ( const string& name, const string& defaultValue ) @@ -50,7 +56,7 @@ Environment::GetIntermediatePath () { string defaultIntermediate = - string( "obj-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); + string( "obj-" ) + GetArch (); return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", defaultIntermediate ); } @@ -59,7 +65,7 @@ Environment::GetOutputPath () { string defaultOutput = - string( "output-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); + string( "output-" ) + GetArch (); return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", defaultOutput ); } @@ -67,8 +73,7 @@ /* static */ string Environment::GetInstallPath () { - string defaultInstall = - string( "reactos." ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "" ); + string defaultInstall = GetCdOutputPath (); return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", defaultInstall ); } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Thu Sep 6 11:46:48 2007 @@ -153,6 +153,7 @@ { public: static std::string GetVariable ( const std::string& name ); + static std::string GetArch (); static std::string GetIntermediatePath (); static std::string GetOutputPath (); static std::string GetCdOutputPath ();

1 0

[hpoussin] 28893: As described in documentation, default TEMPORARY variable to current directory (".") instead of nothing ("") This permits TEMPORARY followed by the directory separator to be "./" instead of "/" (root dir) Spotted by Andrew Munger on IRC
by hpoussin＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: hpoussin Date: Thu Sep 6 11:17:33 2007 New Revision: 28893 URL: http://svn.reactos.org/svn/reactos?rev=28893&view=rev Log: As described in documentation, default TEMPORARY variable to current directory (".") instead of nothing ("") This permits TEMPORARY followed by the directory separator to be "./" instead of "/" (root dir) Spotted by Andrew Munger on IRC Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28893&r1=2889… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Thu Sep 6 11:17:33 2007 @@ -357,7 +357,7 @@ ifneq ($(ROS_TEMPORARY),) TEMPORARY := $(ROS_TEMPORARY) else - TEMPORARY := + TEMPORARY := . endif TEMPORARY_ := $(TEMPORARY)$(SEP)

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