Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[cwittich] 43579: lowercase the set command (to match RosBE coding style)
by cwittich＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: cwittich Date: Sun Oct 18 23:06:36 2009 New Revision: 43579 URL: http://svn.reactos.org/svn/reactos?rev=43579&view=rev Log: lowercase the set command (to match RosBE coding style) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd 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] Sun Oct 18 23:06:36 2009 @@ -43,7 +43,7 @@ set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) -SET BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison +set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison :: Get the number of CPUs in the system so we know how many jobs to execute. :: To modify the number used, see the cpucount usage for getting to know about the possible options

1 0

[cwittich] 43578: redirect stderr to /NUL as well
by cwittich＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: cwittich Date: Sun Oct 18 22:47:50 2009 New Revision: 43578 URL: http://svn.reactos.org/svn/reactos?rev=43578&view=rev Log: redirect stderr to /NUL as well Modified: trunk/tools/RosBE/RosBE-Windows/regtest/regtest.cmd Modified: trunk/tools/RosBE/RosBE-Windows/regtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/regtest/… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/regtest/regtest.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/regtest/regtest.cmd [iso-8859-1] Sun Oct 18 22:47:50 2009 @@ -10,7 +10,7 @@ if %ERRORLEVEL% == 1 ( start /min bison parser.y -p parser_ -d -o parser.tab.c choice /C:AB /T 3 /D A > NUL - taskkill /f /im "bison.exe" > NUL + taskkill /f /im "bison.exe" > NUL 2> NUL if !ERRORLEVEL! == 0 ( echo [broken] ) else (

1 0

[cwittich] 43577: fix Bison
by cwittich＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: cwittich Date: Sun Oct 18 22:43:54 2009 New Revision: 43577 URL: http://svn.reactos.org/svn/reactos?rev=43577&view=rev Log: fix Bison Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd 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] Sun Oct 18 22:43:54 2009 @@ -41,6 +41,9 @@ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_HOST_MINGWPATH%\bin;%PATH% set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe + +:: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) +SET BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison :: Get the number of CPUs in the system so we know how many jobs to execute. :: To modify the number used, see the cpucount usage for getting to know about the possible options

1 0

[hpoussin] 43576: Ok, reverting r43565. Someone will have to tell me why it works for me but not for buildbot
by hpoussin＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: hpoussin Date: Sun Oct 18 22:06:09 2009 New Revision: 43576 URL: http://svn.reactos.org/svn/reactos?rev=43576&view=rev Log: Ok, reverting r43565. Someone will have to tell me why it works for me but not for buildbot Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Oct 18 22:06:09 2009 @@ -467,7 +467,7 @@ { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); UCHAR* Ptr = (UCHAR*)Buffer; - ULONG i, Length, Sectors; + ULONG i, Length; BOOLEAN ret; *Count = 0; @@ -475,13 +475,12 @@ while (N > 0) { Length = N; - if (Length > DISKREADBUFFER_SIZE) - Length = DISKREADBUFFER_SIZE; - Sectors = (Length + Context->SectorSize - 1) / Context->SectorSize; + if (Length > Context->SectorSize) + Length = Context->SectorSize; ret = MachDiskReadLogicalSectors( Context->DriveNumber, Context->SectorNumber + Context->SectorOffset + i, - Sectors, + 1, (PVOID)DISKREADBUFFER); if (!ret) return EIO; @@ -489,7 +488,7 @@ Ptr += Length; *Count += Length; N -= Length; - i += Sectors; + i++; } return ESUCCESS;

1 0

[hpoussin] 43575: [freeldr] Limit disk read buffer size to 512 bytes
by hpoussin＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: hpoussin Date: Sun Oct 18 21:53:12 2009 New Revision: 43575 URL: http://svn.reactos.org/svn/reactos?rev=43575&view=rev Log: [freeldr] Limit disk read buffer size to 512 bytes Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] Sun Oct 18 21:53:12 2009 @@ -46,7 +46,7 @@ #define BIOSCALLBUFOFFSET 0x0000 /* Buffer to store temporary data for any Int386() call */ #define FILESYSBUFFER 0x80000 /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER 0x90000 /* Buffer to store data read in from the disk via the BIOS */ -#define DISKREADBUFFER_SIZE 0x10000 +#define DISKREADBUFFER_SIZE 512 #elif defined(_M_PPC) || defined(_M_MIPS) || defined(_M_ARM) #define DISKREADBUFFER 0x80000000 #define FILESYSBUFFER 0x80000000

1 0

[tkreuzer] 43574: enable winldr style boot
by tkreuzer＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: tkreuzer Date: Sun Oct 18 20:54:40 2009 New Revision: 43574 URL: http://svn.reactos.org/svn/reactos?rev=43574&view=rev Log: enable winldr style boot Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Oct 18 20:54:40 2009 @@ -143,13 +143,11 @@ // to have different install methods, etc. LoadReactOSSetup(); } -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) else if (_stricmp(SettingValue, "ReactOSSetup2") == 0) { -#ifdef __i386__ // WinLdr-style boot LoadReactOSSetup2(); -#endif } #endif #endif Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Sun Oct 18 20:54:40 2009 @@ -20,8 +20,13 @@ <file>setupldr.c</file> </directory> <if property="ARCH" value="i386"> - <directory name="windows"> - <file>setupldr2.c</file> - </directory> - </if> + <directory name="windows"> + <file>setupldr2.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="windows"> + <file>setupldr2.c</file> + </directory> + </if> </module>

1 0

[dgorbachev] 43573: [HAL, WIN32K] Add typedef.
by dgorbachev＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: dgorbachev Date: Sun Oct 18 20:53:13 2009 New Revision: 43573 URL: http://svn.reactos.org/svn/reactos?rev=43573&view=rev Log: [HAL, WIN32K] Add typedef. Modified: trunk/reactos/hal/halppc/include/haldma.h trunk/reactos/hal/halx86/include/haldma.h trunk/reactos/subsystems/win32/win32k/include/sysparams.h Modified: trunk/reactos/hal/halppc/include/haldma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/include/haldma.… ============================================================================== --- trunk/reactos/hal/halppc/include/haldma.h [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/include/haldma.h [iso-8859-1] Sun Oct 18 20:53:13 2009 @@ -317,7 +317,7 @@ ULONG Counter; } ROS_MAP_REGISTER_ENTRY, *PROS_MAP_REGISTER_ENTRY; -struct _ADAPTER_OBJECT { +typedef struct _ADAPTER_OBJECT { /* * New style DMA object definition. The fact that it is at the beginning * of the ADAPTER_OBJECT structure allows us to easily implement the Modified: trunk/reactos/hal/halx86/include/haldma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/haldma.… ============================================================================== --- trunk/reactos/hal/halx86/include/haldma.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/haldma.h [iso-8859-1] Sun Oct 18 20:53:13 2009 @@ -317,7 +317,7 @@ ULONG Counter; } ROS_MAP_REGISTER_ENTRY, *PROS_MAP_REGISTER_ENTRY; -struct _ADAPTER_OBJECT { +typedef struct _ADAPTER_OBJECT { /* * New style DMA object definition. The fact that it is at the beginning * of the ADAPTER_OBJECT structure allows us to easily implement the Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] Sun Oct 18 20:53:13 2009 @@ -15,7 +15,7 @@ #define SPIF_PROTECT 0x80000 -enum +typedef enum _USERPREFMASKS { UPM_ACTIVEWINDOWTRACKING = 0x01, UPM_MENUANIMATION = 0x02,

1 0

[dgorbachev] 43572: [3DTEXT, FREELDR, HAL, MINGW_COMMON, MMDRV, MSGINA, NTOSKRNL] Add extern.
by dgorbachev＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: dgorbachev Date: Sun Oct 18 20:52:56 2009 New Revision: 43572 URL: http://svn.reactos.org/svn/reactos?rev=43572&view=rev Log: [3DTEXT, FREELDR, HAL, MINGW_COMMON, MMDRV, MSGINA, NTOSKRNL] Add extern. Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/dll/win32/mmdrv/mmdrv.h trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/timerobj.c trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.h [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -20,7 +20,7 @@ ////////////////////////////////////////////////////////////////// -TCHAR m_Text[MAX_PATH]; +extern TCHAR m_Text[MAX_PATH]; VOID LoadSettings(VOID); VOID SaveSettings(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -24,7 +24,7 @@ #include "mm.h" #endif -UCHAR XboxFont8x16[256 * 16]; +extern UCHAR XboxFont8x16[256 * 16]; VOID XboxMachInit(const char *CmdLine); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -25,15 +25,11 @@ extern ULONG PageDirectoryStart; extern ULONG PageDirectoryEnd; -ROS_LOADER_PARAMETER_BLOCK LoaderBlock; -char reactos_kernel_cmdline[255]; // Command line passed to kernel -LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel -char reactos_module_strings[64][256]; // Array to hold module names -reactos_mem_data_t reactos_mem_data; +extern CHAR szBootPath[255]; +extern CHAR SystemRoot[255]; +extern CHAR szHalName[255]; + extern char reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE]; -char szBootPath[256]; -char szHalName[256]; -CHAR SystemRoot[255]; extern ULONG_PTR KernelBase; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.h?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.h [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -330,8 +330,6 @@ PerformWaveIO(SessionInfo* session_info); -CRITICAL_SECTION critical_section; - - +extern CRITICAL_SECTION critical_section; #endif Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msgina); -extern HINSTANCE hDllInstance; +HINSTANCE hDllInstance; extern GINA_UI GinaGraphicalUI; extern GINA_UI GinaTextUI; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -31,7 +31,7 @@ HBITMAP hBitmap; } GINA_CONTEXT, *PGINA_CONTEXT; -HINSTANCE hDllInstance; +extern HINSTANCE hDllInstance; typedef BOOL (*PFGINA_INITIALIZE)(PGINA_CONTEXT); typedef BOOL (*PFGINA_DISPLAYSTATUSMESSAGE)(PGINA_CONTEXT, HDESK, DWORD, PWSTR, PWSTR); Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -68,7 +68,7 @@ #include <poppack.h> #endif -CHAR *APstart, *APend; +extern CHAR *APstart, *APend; #define BIOS_AREA 0x0 #define COMMON_AREA 0x2000 Modified: trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw_h… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -13,7 +13,7 @@ #include <sect_attribs.h> #include <locale.h> -const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback; +extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback; void * __cdecl _decode_pointer (void *codedptr) Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -16,7 +16,6 @@ ULONG DummyData; ULONG CmNtGlobalFlag; -ULONG CmNtCSDVersion; WCHAR CmDefaultLanguageId[12]; ULONG CmDefaultLanguageIdLength = sizeof(CmDefaultLanguageId); Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -15,7 +15,6 @@ /* GLOBALS *******************************************************************/ WORK_QUEUE_ITEM CmpDelayDerefKCBWorkItem; -LIST_ENTRY CmpFreeDelayItemsListHead; ULONG CmpDelayedCloseSize = 2048; ULONG CmpDelayedCloseElements; Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -17,8 +17,6 @@ ULONG CmpHashTableSize = 2048; PCM_KEY_HASH_TABLE_ENTRY CmpCacheTable; PCM_NAME_HASH_TABLE_ENTRY CmpNameCacheTable; - -BOOLEAN CmpHoldLazyFlush; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -23,14 +23,13 @@ PEPROCESS CmpSystemProcess; BOOLEAN HvShutdownComplete; PVOID CmpRegistryLockCallerCaller, CmpRegistryLockCaller; -BOOLEAN CmpFlushStarveWriters; BOOLEAN CmpFlushOnLockRelease; BOOLEAN CmpSpecialBootCondition; BOOLEAN CmpNoWrite; -BOOLEAN CmpForceForceFlush; BOOLEAN CmpWasSetupBoot; ULONG CmpTraceLevel = 0; +extern LONG CmpFlushStarveWriters; extern BOOLEAN CmFirstTime; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -18,9 +18,9 @@ extern LIST_ENTRY ExpFirmwareTableProviderListHead; extern BOOLEAN ExpIsWinPEMode; extern LIST_ENTRY ExpSystemResourcesList; -ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; -ULONG ExpUnicodeCaseTableDataOffset; -PVOID ExpNlsSectionPointer; +extern ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; +extern ULONG ExpUnicodeCaseTableDataOffset; +extern PVOID ExpNlsSectionPointer; extern CHAR NtBuildLab[]; extern ULONG CmNtCSDVersion; extern ULONG NtGlobalFlag; Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -16,7 +16,6 @@ BOOLEAN KdDebuggerEnabled = FALSE; BOOLEAN KdEnteredDebugger = FALSE; BOOLEAN KdDebuggerNotPresent = TRUE; -BOOLEAN KiEnableTimerWatchdog = FALSE; BOOLEAN KdBreakAfterSymbolLoad = FALSE; BOOLEAN KdpBreakPending = FALSE; BOOLEAN KdPitchDebugger = TRUE; Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -17,7 +17,7 @@ KTIMER_TABLE_ENTRY KiTimerTableListHead[TIMER_TABLE_SIZE]; LARGE_INTEGER KiTimeIncrementReciprocal; UCHAR KiTimeIncrementShiftCount; -BOOLEAN KiEnableTimerWatchdog; +BOOLEAN KiEnableTimerWatchdog = FALSE; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Sun Oct 18 20:52:56 2009 @@ -20,8 +20,8 @@ MM_DRIVER_VERIFIER_DATA MmVerifierData; LIST_ENTRY MiVerifierDriverAddedThunkListHead; -KMUTANT MmSystemLoadLock; ULONG MiActiveVerifierThunks; +extern KMUTANT MmSystemLoadLock; extern LIST_ENTRY PsLoadedModuleList; /* PRIVATE FUNCTIONS *********************************************************/

1 0

[dgorbachev] 43571: Fix double definition of a variable, add extern.
by dgorbachev＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: dgorbachev Date: Sun Oct 18 20:52:15 2009 New Revision: 43571 URL: http://svn.reactos.org/svn/reactos?rev=43571&view=rev Log: Fix double definition of a variable, add extern. Modified: trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ftp/ftp_var.h trunk/reactos/base/applications/network/ftp/main.c Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Sun Oct 18 20:52:15 2009 @@ -1135,13 +1135,6 @@ ptransfer("received", bytes, &start, &stop); null();// (void) signal(SIGINT,oldintr); } - -/* - * Need to start a listen on the data channel - * before we send the command, otherwise the - * server's connect may fail. - */ -int sendport = -1; int initconn() Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Sun Oct 18 20:52:15 2009 @@ -101,7 +101,7 @@ extern int code; /* return/reply code for ftp command */ extern int crflag; /* if 1, strip car. rets. on ascii gets */ extern char pasv[64]; /* passive port for proxy data connection */ -extern int passivemode; /* passive mode enabled */ +extern int passivemode; /* passive mode enabled */ extern char *altarg; /* argv[1] with no shell-like preprocessing */ extern char ntin[17]; /* input translation table */ extern char ntout[17]; /* output translation table */ @@ -126,8 +126,8 @@ extern char argbuf[200]; /* argument storage buffer */ extern char *argbase; /* current storage point in arg buffer */ extern int margc; /* count of arguments on input line */ -extern const char *margv[20]; /* args parsed from input line */ -extern int cpend; /* flag: if != 0, then pending server reply */ +extern const char *margv[20]; /* args parsed from input line */ +extern int cpend; /* flag: if != 0, then pending server reply */ extern int mflag; /* flag: if != 0, then active multi command */ extern int options; /* used during socket creation */ @@ -138,21 +138,21 @@ struct cmd { const char *c_name; /* name of command */ const char *c_help; /* help string */ - char c_bell; /* give bell when command completes */ - char c_conn; /* must be connected to use command */ - char c_proxy; /* proxy server may execute */ - void (*c_handler)(); /* function to call */ + char c_bell; /* give bell when command completes */ + char c_conn; /* must be connected to use command */ + char c_proxy; /* proxy server may execute */ + void (*c_handler)(); /* function to call */ }; struct macel { - char mac_name[9]; /* macro name */ - char *mac_start; /* start of macro in macbuf */ - char *mac_end; /* end of macro in macbuf */ + char mac_name[9]; /* macro name */ + char *mac_start; /* start of macro in macbuf */ + char *mac_end; /* end of macro in macbuf */ }; -int macnum; /* number of defined macros */ -struct macel macros[16]; -char macbuf[4096]; +extern int macnum; /* number of defined macros */ +extern struct macel macros[16]; +extern char macbuf[4096]; #if defined(__ANSI__) || defined(sparc) typedef void sig_t; Modified: trunk/reactos/base/applications/network/ftp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] Sun Oct 18 20:52:15 2009 @@ -58,11 +58,11 @@ void lostpeer(); char *getlogin(); -short portnum; - -char home[128]; +short portnum; + +char home[128]; char *globerr; -int autologin; +int autologin; @@ -72,7 +72,7 @@ */ int trace; /* trace packets exchanged */ int hash; /* print # for each buffer transferred */ -int sendport; /* use PORT cmd for each data connection */ +//int sendport; /* use PORT cmd for each data connection */ int verbose; /* print messages coming back from server */ int connected; /* connected to server */ int fromatty; /* input is from a terminal */ @@ -81,7 +81,7 @@ int bell; /* ring bell on cmd completion */ int doglob; /* glob local file names */ int proxy; /* proxy server connection active */ -int passivemode; +int passivemode; int proxflag; /* proxy connection exists */ int sunique; /* store files on server with unique name */ int runique; /* store local files with unique name */ @@ -115,11 +115,22 @@ char argbuf[200]; /* argument storage buffer */ char *argbase; /* current storage point in arg buffer */ int margc; /* count of arguments on input line */ -const char *margv[20]; /* args parsed from input line */ -int cpend; /* flag: if != 0, then pending server reply */ +const char *margv[20]; /* args parsed from input line */ +int cpend; /* flag: if != 0, then pending server reply */ int mflag; /* flag: if != 0, then active multi command */ int options; /* used during socket creation */ + +int macnum; /* number of defined macros */ +struct macel macros[16]; +char macbuf[4096]; + +/* + * Need to start a listen on the data channel + * before we send the command, otherwise the + * server's connect may fail. + */ +int sendport = -1; static const char *slurpstring();

1 0

[dgorbachev] 43570: Remove a definition of a variable from a header file.
by dgorbachev＠svn.reactos.org 18 Oct '09

18 Oct '09

Author: dgorbachev Date: Sun Oct 18 20:52:12 2009 New Revision: 43570 URL: http://svn.reactos.org/svn/reactos?rev=43570&view=rev Log: Remove a definition of a variable from a header file. Modified: trunk/reactos/lib/3rdparty/adns/src/internal.h Modified: trunk/reactos/lib/3rdparty/adns/src/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/inte… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/internal.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/internal.h [iso-8859-1] Sun Oct 18 20:52:12 2009 @@ -167,7 +167,7 @@ void *p; void (*fp)(void); union maxalign *up; -} data; +}; typedef struct { void *ext;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009