Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 30167: - disable insert & insert link option when no file is currently been copied / moved
by janderwald＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: janderwald Date: Mon Nov 5 14:50:28 2007 New Revision: 30167 URL: http://svn.reactos.org/svn/reactos?rev=30167&view=rev Log: - disable insert & insert link option when no file is currently been copied / moved Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Mon Nov 5 14:50:28 2007 @@ -536,6 +536,32 @@ DrawTextW(drawItem->hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &drawItem->rcItem, 0); return S_OK; } +BOOL +HasClipboardData() +{ + BOOL ret = FALSE; + IDataObject * pda; + + if(SUCCEEDED(OleGetClipboard(&pda))) + { + STGMEDIUM medium; + FORMATETC formatetc; + + TRACE("pda=%p\n", pda); + + /* Set the FORMATETC structure*/ + InitFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) + { + ret = TRUE; + } + + IDataObject_Release(pda); + ReleaseStgMedium(&medium); + } + + return ret; +} /************************************************************************** @@ -673,13 +699,23 @@ { InsertShellNewItems(mii.hSubMenu, 0x6000, 0x6000, This); } + + if (!HasClipboardData()) + { + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DISABLED; + mii.fType = 0; + SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERT, FALSE, &mii)); + SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERTLINK, FALSE, &mii)); + } + if (This->bDesktop) { /* desktop menu has no view option */ DeleteMenu(hMenu, 0, MF_BYPOSITION); DeleteMenu(hMenu, 0, MF_BYPOSITION); } - TRACE("(%p)->returning 0x%x\n",This,hr); return hr; }

1 0

[cfinck] 30166: Fix bootcd build for real now
by cfinck＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: cfinck Date: Mon Nov 5 14:41:33 2007 New Revision: 30166 URL: http://svn.reactos.org/svn/reactos?rev=30166&view=rev Log: Fix bootcd build for real now Modified: trunk/reactos/tools/cabman/cabman.mak Modified: trunk/reactos/tools/cabman/cabman.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.mak?re… ============================================================================== --- trunk/reactos/tools/cabman/cabman.mak (original) +++ trunk/reactos/tools/cabman/cabman.mak Mon Nov 5 14:41:33 2007 @@ -29,7 +29,7 @@ CABMAN_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o)) -CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CPPFLAGS) +CABMAN_HOST_CXXFLAGS = -Iinclude -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CPPFLAGS) CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET)

1 0

[cfinck] 30165: Attempt to fix build Still not the perfect solution as it might be better to use the host/typedefs.h also for Windows hosts, but at least the code works without the obsolete typedefs64.h now.
by cfinck＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: cfinck Date: Mon Nov 5 14:26:20 2007 New Revision: 30165 URL: http://svn.reactos.org/svn/reactos?rev=30165&view=rev Log: Attempt to fix build Still not the perfect solution as it might be better to use the host/typedefs.h also for Windows hosts, but at least the code works without the obsolete typedefs64.h now. Modified: trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/rbuild/pch.h trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Mon Nov 5 14:26:20 2007 @@ -14,8 +14,7 @@ #include <fcntl.h> #include <sys/types.h> #include <time.h> -#include <typedefs64.h> -typedef unsigned short USHORT, *PUSHORT; +#include <host/typedefs.h> #include <unistd.h> #ifndef MAX_PATH #define MAX_PATH 260 Modified: trunk/reactos/tools/rbuild/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/pch.h?rev=301… ============================================================================== --- trunk/reactos/tools/rbuild/pch.h (original) +++ trunk/reactos/tools/rbuild/pch.h Mon Nov 5 14:26:20 2007 @@ -34,12 +34,7 @@ #endif//MAX_PATH #else #include <unistd.h> - -typedef char CHAR, *PCHAR; -typedef unsigned char UCHAR, *PUCHAR; -typedef void VOID, *PVOID; -typedef UCHAR BOOLEAN, *PBOOLEAN; -#include <typedefs64.h> +#include <host/typedefs.h> typedef LONG *PLONG; #endif//WIN32 Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Mon Nov 5 14:26:20 2007 @@ -356,7 +356,7 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS) -RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude/reactos +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[hpoussin] 30164: Remove useless file
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 14:12:33 2007 New Revision: 30164 URL: http://svn.reactos.org/svn/reactos?rev=30164&view=rev Log: Remove useless file Removed: trunk/reactos/include/reactos/typedefs64.h Removed: trunk/reactos/include/reactos/typedefs64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs64… ============================================================================== --- trunk/reactos/include/reactos/typedefs64.h (original) +++ trunk/reactos/include/reactos/typedefs64.h (removed) @@ -1,39 +1,0 @@ -/* - PROJECT: ReactOS - LICENSE: GPL v2 or any later version - FILE: include/reactos/typedefs64.h - PURPOSE: Type definitions for host tools, which are built on 64-bit systems - COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> -*/ - -#ifndef _TYPEDEFS64_H -#define _TYPEDEFS64_H - -#ifndef DWORD_DEFINED -#define DWORD_DEFINED - typedef unsigned int DWORD; -#endif - -#ifndef LONG_DEFINED -#define LONG_DEFINED - typedef int LONG; - typedef unsigned int ULONG,*PULONG; -#endif - -#ifndef LONG_PTR_DEFINED -#define LONG_PTR_DEFINED - typedef int LONG_PTR, *PLONG_PTR; - typedef unsigned int ULONG_PTR, *PULONG_PTR; -#endif - -#ifndef HANDLE_PTR_DEFINED -#define HANDLE_PTR_DEFINED - typedef unsigned int HANDLE_PTR; -#endif - -#ifndef _ERROR_STATUS_T_DEFINED -#define _ERROR_STATUS_T_DEFINED - typedef unsigned int error_status_t; -#endif - -#endif

1 0

[janderwald] 30163: - desktop background menu has no view option, this option is only available when browsing the shell
by janderwald＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: janderwald Date: Mon Nov 5 14:07:57 2007 New Revision: 30163 URL: http://svn.reactos.org/svn/reactos?rev=30163&view=rev Log: - desktop background menu has no view option, this option is only available when browsing the shell Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Mon Nov 5 14:07:57 2007 @@ -673,6 +673,12 @@ { InsertShellNewItems(mii.hSubMenu, 0x6000, 0x6000, This); } + if (This->bDesktop) + { + /* desktop menu has no view option */ + DeleteMenu(hMenu, 0, MF_BYPOSITION); + DeleteMenu(hMenu, 0, MF_BYPOSITION); + } TRACE("(%p)->returning 0x%x\n",This,hr); return hr;

1 0

[pschweitzer] 30162: Oops, forgotten a line
by pschweitzer＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: pschweitzer Date: Mon Nov 5 14:03:34 2007 New Revision: 30162 URL: http://svn.reactos.org/svn/reactos?rev=30162&view=rev Log: Oops, forgotten a line Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/fr-FR.rc Mon Nov 5 14:03:34 2007 @@ -82,7 +82,7 @@ IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Device installation" +CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Installation terminée",IDC_FINISHTITLE,120,8,195,11

1 0

[pschweitzer] 30161: Fixed details in French translation of newdev
by pschweitzer＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: pschweitzer Date: Mon Nov 5 13:58:33 2007 New Revision: 30161 URL: http://svn.reactos.org/svn/reactos?rev=30161&view=rev Log: Fixed details in French translation of newdev Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/fr-FR.rc Mon Nov 5 13:58:33 2007 @@ -11,7 +11,7 @@ IDC_STATIC,115,21,195,16 LTEXT "Cliquer sur Suivant pour continuer.",IDC_STATIC,115,169,195,17 LTEXT "MATERIEL INCONNU",IDC_DEVICE,129,36,164,11 - LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !",IDC_STATIC,105,59,210,16 + LTEXT "ATTENTION ! L'INSTALLATION D'UN PILOTE PEUT ENTRAINER LE BLOCAGE DE VOTRE ORDINATEUR OU LE RENDRE INDEMARRABLE !",IDC_STATIC,105,59,210,25 CONTROL "Installer le pilote automatiquement",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,115,112,178,13 CONTROL "Installer le pilote depuis un endroit spécifié",IDC_RADIO_MANUAL, @@ -42,7 +42,7 @@ LTEXT "L'installation a échoué",IDC_FINISHTITLE,120,8,195,24 LTEXT "Le matériel n'a pu etre installé en raison d'une erreur inattendue.", IDC_STATIC,120,40,195,19 - LTEXT "Matériel inconnu",IDC_DEVICE,134,55,164,11 + LTEXT "MATERIEL INCONNU",IDC_DEVICE,134,55,164,11 END IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 @@ -90,7 +90,7 @@ IDC_STATIC,120,32,195,19 LTEXT "Cliquer sur Terminer pour fermer l'assistant.",IDC_STATIC,120,174, 179,11 - LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 + LTEXT "MATERIEL INCONNU",IDC_DEVICE,148,53,147,12 END IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193

1 0

[cfinck] 30160: Set svn:eol-style "native" for the RosBE-Unix stuff
by cfinck＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: cfinck Date: Mon Nov 5 13:50:05 2007 New Revision: 30160 URL: http://svn.reactos.org/svn/reactos?rev=30160&view=rev Log: Set svn:eol-style "native" for the RosBE-Unix stuff Modified: trunk/tools/RosBE-Unix/README (props changed) trunk/tools/RosBE-Unix/RosBE-Builder.sh (props changed) trunk/tools/RosBE-Unix/SVN-Readme.txt (contents, props changed) trunk/tools/RosBE-Unix/scripts/RosBE-rc (props changed) trunk/tools/RosBE-Unix/scripts/RosBE.sh (props changed) trunk/tools/RosBE-Unix/scripts/build-multi.sh (props changed) trunk/tools/RosBE-Unix/scripts/build-shared.sh (props changed) trunk/tools/RosBE-Unix/scripts/build.sh (props changed) trunk/tools/RosBE-Unix/scripts/clean.sh (props changed) trunk/tools/RosBE-Unix/scripts/createshortcut.sh (props changed) trunk/tools/RosBE-Unix/scripts/help.sh (props changed) trunk/tools/RosBE-Unix/scripts/version.sh (props changed) trunk/tools/RosBE-Unix/sources/SVN-Readme.txt (contents, props changed) trunk/tools/RosBE-Unix/tools/buildtime.c (props changed) trunk/tools/RosBE-Unix/tools/cpucount.c (props changed) Propchange: trunk/tools/RosBE-Unix/README ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/RosBE-Builder.sh ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Unix/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/SVN-Readme.txt?re… ============================================================================== --- trunk/tools/RosBE-Unix/SVN-Readme.txt (original) +++ trunk/tools/RosBE-Unix/SVN-Readme.txt Mon Nov 5 13:50:05 2007 @@ -1,10 +1,10 @@ -Information ------------- - -This "RosBE-Unix" SVN directory is just for tracking changes in the script -files. -It does not contain a fully functional Build Environment as some packages are -missing in the "sources" directory. - -You can download a full RosBE-Unix package from http://reactos.colinfinck.de +Information +------------ + +This "RosBE-Unix" SVN directory is just for tracking changes in the script +files. +It does not contain a fully functional Build Environment as some packages are +missing in the "sources" directory. + +You can download a full RosBE-Unix package from http://reactos.colinfinck.de (later on it will be downloadable from the official ReactOS Website) Propchange: trunk/tools/RosBE-Unix/SVN-Readme.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/RosBE-rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/RosBE.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/build-multi.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/build-shared.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/build.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/clean.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/createshortcut.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/help.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/scripts/version.sh ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Unix/sources/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/sources/SVN-Readm… ============================================================================== --- trunk/tools/RosBE-Unix/sources/SVN-Readme.txt (original) +++ trunk/tools/RosBE-Unix/sources/SVN-Readme.txt Mon Nov 5 13:50:05 2007 @@ -1,25 +1,25 @@ -Put the following files into this directory: - -- binutils.tar.bz2 - --> containing the binutils source tree in a subdirectory "binutils" - Source is available here: http://www.gnu.org/software/binutils/ - -- gcc.tar.bz2 - --> containing the gcc source tree for C and C++ compilation in a subdirectory "gcc" - Source is available here: http://gcc.gnu.org/svn.html - -- make.tar.bz2 - --> containing the make source tree in a subdirectory "make" - Source is available here: http://savannah.gnu.org/cvs/?group=make - -- mingw-runtime.tar.bz2 - --> containing the "include" and "lib" subdirectories of the mingw-runtime package - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 - -- nasm.tar.bz2 - --> containing the nasm source tree in a subdirectory "nasm" - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=6208 - -- w32api.tar.bz2 - --> containing the "include" and "lib" subdirectories of the w32api package +Put the following files into this directory: + +- binutils.tar.bz2 + --> containing the binutils source tree in a subdirectory "binutils" + Source is available here: http://www.gnu.org/software/binutils/ + +- gcc.tar.bz2 + --> containing the gcc source tree for C and C++ compilation in a subdirectory "gcc" + Source is available here: http://gcc.gnu.org/svn.html + +- make.tar.bz2 + --> containing the make source tree in a subdirectory "make" + Source is available here: http://savannah.gnu.org/cvs/?group=make + +- mingw-runtime.tar.bz2 + --> containing the "include" and "lib" subdirectories of the mingw-runtime package + Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 + +- nasm.tar.bz2 + --> containing the nasm source tree in a subdirectory "nasm" + Source is available here: http://sourceforge.net/project/showfiles.php?group_id=6208 + +- w32api.tar.bz2 + --> containing the "include" and "lib" subdirectories of the w32api package Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 Propchange: trunk/tools/RosBE-Unix/sources/SVN-Readme.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/tools/buildtime.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE-Unix/tools/cpucount.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 30159: - fix identation - refresh shellview after success
by janderwald＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: janderwald Date: Mon Nov 5 13:50:03 2007 New Revision: 30159 URL: http://svn.reactos.org/svn/reactos?rev=30159&view=rev Log: - fix identation - refresh shellview after success Modified: trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Mon Nov 5 13:50:03 2007 @@ -722,19 +722,36 @@ static HRESULT WINAPI RecycleBin_IContextMenu_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) { + HRESULT hr; + LPSHELLBROWSER lpSB; + LPSHELLVIEW lpSV = NULL; + RecycleBin * This = impl_from_IContextMenu(iface); TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb); - if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdEmpty)) - { - // FIXME - // path & flags - return SHEmptyRecycleBinW(lpici->hwnd, L"C:\\", 0); - } - - - if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdProperties)) + if ( LOWORD(lpici->lpVerb) == This->iIdEmpty) + { + // FIXME + // path & flags + hr = SHEmptyRecycleBinW(lpici->hwnd, L"C:\\", 0); + TRACE("result %x\n", hr); + if (hr != S_OK) + { + return hr; + } + + if((lpSB = (LPSHELLBROWSER)SendMessageA(lpici->hwnd, CWM_GETISHELLBROWSER,0,0))) + { + if(SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV))) + { + IShellView_Refresh(lpSV); + } + } + } + + + if ( LOWORD(lpici->lpVerb) == This->iIdProperties) { WCHAR szDrive = 'C'; SH_ShowRecycleBinProperties(szDrive);

1 0

[cfinck] 30158: Import the additional parameters from RosBE-Windows' cpucount into the Unix version
by cfinck＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: cfinck Date: Mon Nov 5 13:46:50 2007 New Revision: 30158 URL: http://svn.reactos.org/svn/reactos?rev=30158&view=rev Log: Import the additional parameters from RosBE-Windows' cpucount into the Unix version 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 Nov 5 13:46:50 2007 @@ -5,27 +5,51 @@ Released under GNU GPL v2 or any later version. */ -#include <stdio.h> -#include <unistd.h> -#ifdef __APPLE__ -#include <sys/sysctl.h> -#endif - -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[]) { 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; + + if(argc > 2) + { + fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); + return -1; + } + +#ifdef __APPLE__ + size_t countSize = sizeof(cpuCount); + + sysctlbyname("hw.logicalcpu", &cpuCount, &countSize, NULL, 0); +#else + cpuCount = sysconf(_SC_NPROCESSORS_ONLN); +#endif + + if(argc != 1) + { + if(!strncmp(argv[1], "-x1", 3)) + { + cpuCount++; + } + else if(!strncmp(argv[1], "-x2", 3)) + { + cpuCount += cpuCount; + } + else + { + printf("Usage: %s [OPTIONS]\n", argv[0]); + printf("Running cpucount without options returns the number of\n"); + printf("processors in the system.\n"); + printf("-x1 - Number of processors in the system, plus 1.\n"); + printf("-x2 - Number of processors in the system, doubled.\n"); + return 0; + } + } + + printf("%u\n", cpuCount); + return 0; }

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