Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28611: Make the cpucount utility working on Mac OS X hosts, thanks to Alex for the fix
by cfinck＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: cfinck Date: Mon Aug 27 23:00:36 2007 New Revision: 28611 URL: http://svn.reactos.org/svn/reactos?rev=28611&view=rev Log: Make the cpucount utility working on Mac OS X hosts, thanks to Alex for the fix Modified: trunk/tools/RosBE-Unix/tools/cpucount.c Modified: trunk/tools/RosBE-Unix/tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/tools/cpucount.c?… ============================================================================== --- trunk/tools/RosBE-Unix/tools/cpucount.c (original) +++ trunk/tools/RosBE-Unix/tools/cpucount.c Mon Aug 27 23:00:36 2007 @@ -5,16 +5,27 @@ Released under GNU GPL v2 or any later version. */ -#include <stdio.h> -#include <unistd.h> - -int -main(int argc, - char *argv[]) +#include <stdio.h> +#include <unistd.h> +#ifdef __APPLE__ +#include <sys/sysctl.h> +#endif + +int +main(int argc, + char *argv[]) { - printf( "%u\n", - sysconf(_SC_NPROCESSORS_ONLN) ); - - return 0; + int cpuCount = 0; + +#ifdef __APPLE__ + size_t countSize = sizeof(cpuCount); + + sysctlbyname("hw.logicalcpu", &cpuCount, &countSize, NULL, 0); +#else + cpuCount = sysconf(_SC_NPROCESSORS_ONLN); +#endif + + printf( "%u\n", cpuCount); + + return 0; } -

1 0

[janderwald] 28610: - fix typo and compilation under windows
by janderwald＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: janderwald Date: Mon Aug 27 22:53:31 2007 New Revision: 28610 URL: http://svn.reactos.org/svn/reactos?rev=28610&view=rev Log: - fix typo and compilation under windows Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp 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 Mon Aug 27 22:53:31 2007 @@ -209,7 +209,7 @@ } else { - m_Src = _T("\\\\.\\pipe\\" + pipe; + m_Src = _T("\\\\.\\pipe\\") + pipe; } #endif } @@ -221,7 +221,7 @@ #ifdef __LINUX__ m_Src = m_BootCmd; #else - cerr << "Error: sysreg doesnot support reading stdio" << endl; + cerr << "Error: sysreg does not support reading stdio" << endl; return false; #endif

1 0

[cfinck] 28609: Also add mIRC 6.21 to the "downloader.xml" in Trunk
by cfinck＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: cfinck Date: Mon Aug 27 22:50:30 2007 New Revision: 28609 URL: http://svn.reactos.org/svn/reactos?rev=28609&view=rev Log: Also add mIRC 6.21 to the "downloader.xml" in Trunk Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Mon Aug 27 22:50:30 2007 @@ -44,6 +44,13 @@ <regname>The Off By One Web Browser</regname> <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> + </application> + <application name="mIRC"> + <regname>mIRC</regname> + <licence>Shareware</licence> + <version>6.21</version> + <description>The most popular client for the Internet Relay Chat (IRC).</description> + <location>http://www.efnet.org/clients/win32/mirc/mirc621.exe</location> </application> <application name="Samba TNG"> <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description>

1 0

[cfinck] 28608: Add mIRC 6.21 to the list of apps for Downloader. It installs and runs. mIRC 6.3 doesn't install under ROS at the moment.
by cfinck＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: cfinck Date: Mon Aug 27 22:48:43 2007 New Revision: 28608 URL: http://svn.reactos.org/svn/reactos?rev=28608&view=rev Log: Add mIRC 6.21 to the list of apps for Downloader. It installs and runs. mIRC 6.3 doesn't install under ROS at the moment. Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/do… ============================================================================== --- branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml (original) +++ branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Mon Aug 27 22:48:43 2007 @@ -39,6 +39,13 @@ <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> </application> + <application name="mIRC"> + <regname>mIRC</regname> + <licence>Shareware</licence> + <version>6.21</version> + <description>The most popular client for the Internet Relay Chat (IRC).</description> + <location>http://www.efnet.org/clients/win32/mirc/mirc621.exe</location> + </application> <application name="Samba TNG"> <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> <location>http://svn.reactos.org/packages/samba-tng.exe</location>

1 0

[janderwald] 28607: - autopartition setting and DisableVmInst should not be in the GuiRunOnce section
by janderwald＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: janderwald Date: Mon Aug 27 22:48:23 2007 New Revision: 28607 URL: http://svn.reactos.org/svn/reactos?rev=28607&view=rev Log: - autopartition setting and DisableVmInst should not be in the GuiRunOnce section Modified: trunk/reactos/boot/bootdata/unattend.inf.sample Modified: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample Mon Aug 27 22:48:23 2007 @@ -35,20 +35,20 @@ ; 0 - format disabled FormatPartition=1 +; enable this setting to automatically create a partition +; during installation +; 1 - enabled +; 0 - disabled +AutoPartition = 1 + +; enable this setting to disable vmware driver install +; yes - disabled +; no - enabled +DisableVmwInst = yes + ; enable this section to automatically launch programs ; after 3rd boot ; ; [GuiRunOnce] ; %SystemRoot%\system32\cmd.exe -; enable this setting to disable vmware driver install -; yes - disabled -; no - enabled -DisableVmwInst = yes - -; enable this setting to automatically create a partition -; during installation -; 1 - enabled -; 0 - disabled -AutoPartition = 1 -

1 0

[janderwald] 28606: - add description for AutoPartition setting to unattend.inf.sample
by janderwald＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: janderwald Date: Mon Aug 27 22:41:53 2007 New Revision: 28606 URL: http://svn.reactos.org/svn/reactos?rev=28606&view=rev Log: - add description for AutoPartition setting to unattend.inf.sample Modified: trunk/reactos/boot/bootdata/unattend.inf.sample Modified: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample Mon Aug 27 22:41:53 2007 @@ -44,4 +44,11 @@ ; enable this setting to disable vmware driver install ; yes - disabled ; no - enabled -DisableVmwInst = yes +DisableVmwInst = yes + +; enable this setting to automatically create a partition +; during installation +; 1 - enabled +; 0 - disabled +AutoPartition = 1 +

1 0

[janderwald] 28605: - implement an AutoPartition setting in usetup (needs to be tested though yet)
by janderwald＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: janderwald Date: Mon Aug 27 22:40:02 2007 New Revision: 28605 URL: http://svn.reactos.org/svn/reactos?rev=28605&view=rev Log: - implement an AutoPartition setting in usetup (needs to be tested though yet) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Mon Aug 27 22:40:02 2007 @@ -80,6 +80,7 @@ LONG UnattendDestinationPartitionNumber; LONG UnattendMBRInstallType = -1; LONG UnattendFormatPartition = 0; +LONG AutoPartition = 0; WCHAR UnattendInstallationDirectory[MAX_PATH]; BOOLEAN RepairUpdateFlag = FALSE; @@ -578,7 +579,13 @@ UnattendFormatPartition = IntValue; } } - + if (SetupFindFirstLineW(UnattendInf, L"Unattend", L"AutoPartition", &Context)) + { + if (SetupGetIntField(&Context, 1, &IntValue)) + { + AutoPartition = IntValue; + } + } SetupCloseInfFile(UnattendInf); DPRINT("Running unattended setup\n"); @@ -1390,6 +1397,10 @@ if (SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber)) { return(SELECT_FILE_SYSTEM_PAGE); + } + else + { + return (CREATE_PARTITION_PAGE); } } @@ -1695,21 +1706,29 @@ while (TRUE) { MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */ - ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + if (!IsUnattendedSetup || !AutoPartition) + { + ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ MaxSize, InputBuffer, &Quit, &Cancel); + } + else + { + Quit = FALSE; + Cancel = FALSE; + } if (Quit == TRUE) - { - if (ConfirmQuit (Ir) == TRUE) { - return QUIT_PAGE; + if (ConfirmQuit (Ir) == TRUE) + { + return QUIT_PAGE; + } } - } else if (Cancel == TRUE) - { - return SELECT_PARTITION_PAGE; - } + { + return SELECT_PARTITION_PAGE; + } else - { + { PartSize = atoi (InputBuffer); if (PartSize < 1) {

1 0

[cfinck] 28604: Update to Bugzilla 3.0.1
by cfinck＠svn.reactos.org 27 Aug '07

27 Aug '07

1 0

[hpoussin] 28603: qsort() prototype in stdlib.h doesn't specify that callback function must be __cdecl
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 19:26:39 2007 New Revision: 28603 URL: http://svn.reactos.org/svn/reactos?rev=28603&view=rev Log: qsort() prototype in stdlib.h doesn't specify that callback function must be __cdecl Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=28603… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c (original) +++ trunk/reactos/lib/rtl/bitmap.c Mon Aug 27 19:26:39 2007 @@ -36,7 +36,6 @@ static int -__cdecl NTDLL_RunSortFn(const void *lhs, const void *rhs) {

1 0

[hpoussin] 28602: Define NTAPI and WINAPI to nothing, because host tools can use the default calling convention. This change is correct because we are *not* linking host tools with Windows/ReactOS libraries
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 18:56:14 2007 New Revision: 28602 URL: http://svn.reactos.org/svn/reactos?rev=28602&view=rev Log: Define NTAPI and WINAPI to nothing, because host tools can use the default calling convention. This change is correct because we are *not* linking host tools with Windows/ReactOS libraries Modified: trunk/reactos/include/reactos/typedefs_host.h Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Mon Aug 27 18:56:14 2007 @@ -17,8 +17,8 @@ #define DPRINT if (0) printf #define DPRINT1 printf -#define NTAPI __stdcall -#define WINAPI __stdcall +#define NTAPI +#define WINAPI #define IN #define OUT

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