Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[hbelusca] 60671: [NTOS:HEADLESS]: Code formatting + s/tabs/spaces/

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 14 20:17:17 2013 New Revision: 60671 URL: http://svn.reactos.org/svn/reactos?rev=60671&view=rev Log: [NTOS:HEADLESS]: Code formatting + s/tabs/spaces/ Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Mon Oct 14 20:17:17 2013 @@ -6,16 +6,16 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #include <debug.h> -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ PHEADLESS_GLOBALS HeadlessGlobals; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ FORCEINLINE KIRQL @@ -185,69 +185,69 @@ NTAPI HdlspPutString(IN PUCHAR String) { - PUCHAR Dest = HeadlessGlobals->TmpBuffer; - UCHAR Char = 0; - - /* Scan each character */ - while (*String != ANSI_NULL) - { - /* Check for rotate, send existing buffer and restart from where we are */ - if (Dest >= &HeadlessGlobals->TmpBuffer[79]) - { - HeadlessGlobals->TmpBuffer[79] = ANSI_NULL; - HdlspSendStringAtBaud(HeadlessGlobals->TmpBuffer); - Dest = HeadlessGlobals->TmpBuffer; - } - else - { - /* Get the current character and check for special graphical chars */ - Char = *String; - if (Char & 0x80) - { - switch (Char) - { - case 0xB0: case 0xB3: case 0xBA: - Char = '|'; - break; - case 0xB1: case 0xDC: case 0xDD: case 0xDE: case 0xDF: - Char = '%'; - break; - case 0xB2: case 0xDB: - Char = '#'; - break; - case 0xA9: case 0xAA: case 0xBB: case 0xBC: case 0xBF: - case 0xC0: case 0xC8: case 0xC9: case 0xD9: case 0xDA: - Char = '+'; - break; - case 0xC4: - Char = '-'; - break; - case 0xCD: - Char = '='; - break; - } - } - - /* Anything else must be Unicode */ - if (Char & 0x80) - { - /* Can't do Unicode yet */ - UNIMPLEMENTED; - } - else - { - /* Add the modified char to the temporary buffer */ - *Dest++ = Char; - } - - /* Check the next char */ - String++; - } - } - - /* Finish and send */ - *Dest = ANSI_NULL; - HdlspSendStringAtBaud(HeadlessGlobals->TmpBuffer); + PUCHAR Dest = HeadlessGlobals->TmpBuffer; + UCHAR Char = 0; + + /* Scan each character */ + while (*String != ANSI_NULL) + { + /* Check for rotate, send existing buffer and restart from where we are */ + if (Dest >= &HeadlessGlobals->TmpBuffer[79]) + { + HeadlessGlobals->TmpBuffer[79] = ANSI_NULL; + HdlspSendStringAtBaud(HeadlessGlobals->TmpBuffer); + Dest = HeadlessGlobals->TmpBuffer; + } + else + { + /* Get the current character and check for special graphical chars */ + Char = *String; + if (Char & 0x80) + { + switch (Char) + { + case 0xB0: case 0xB3: case 0xBA: + Char = '|'; + break; + case 0xB1: case 0xDC: case 0xDD: case 0xDE: case 0xDF: + Char = '%'; + break; + case 0xB2: case 0xDB: + Char = '#'; + break; + case 0xA9: case 0xAA: case 0xBB: case 0xBC: case 0xBF: + case 0xC0: case 0xC8: case 0xC9: case 0xD9: case 0xDA: + Char = '+'; + break; + case 0xC4: + Char = '-'; + break; + case 0xCD: + Char = '='; + break; + } + } + + /* Anything else must be Unicode */ + if (Char & 0x80) + { + /* Can't do Unicode yet */ + UNIMPLEMENTED; + } + else + { + /* Add the modified char to the temporary buffer */ + *Dest++ = Char; + } + + /* Check the next char */ + String++; + } + } + + /* Finish and send */ + *Dest = ANSI_NULL; + HdlspSendStringAtBaud(HeadlessGlobals->TmpBuffer); } NTSTATUS @@ -265,7 +265,7 @@ PHEADLESS_RSP_GET_BYTE GetByte; NTSTATUS Status = STATUS_NOT_IMPLEMENTED; ASSERT(HeadlessGlobals != NULL); -// ASSERT(HeadlessGlobals->PageLockHandle != NULL); + // ASSERT(HeadlessGlobals->PageLockHandle != NULL); /* Ignore non-reentrant commands */ if ((Command != HeadlessCmdAddLogEntry) && @@ -290,7 +290,7 @@ switch (Command) { case HeadlessCmdEnableTerminal: - + { /* Make sure the caller passed valid data */ if (!(InputBuffer) || (InputBufferSize != sizeof(*EnableTerminal))) @@ -304,12 +304,13 @@ EnableTerminal = InputBuffer; Status = HdlspEnableTerminal(EnableTerminal->Enable); break; - - case HeadlessCmdCheckForReboot: - break; - - case HeadlessCmdPutString: - + } + + case HeadlessCmdCheckForReboot: + break; + + case HeadlessCmdPutString: + { /* Validate the existence of an input buffer */ if (!InputBuffer) { @@ -328,9 +329,10 @@ /* Return success either way */ Status = STATUS_SUCCESS; break; + } case HeadlessCmdClearDisplay: - + { /* Send the VT100 clear screen command if the terminal is enabled */ if (HeadlessGlobals->TerminalEnabled) { @@ -340,24 +342,25 @@ /* Return success either way */ Status = STATUS_SUCCESS; break; - - case HeadlessCmdClearToEndOfDisplay: - break; - case HeadlessCmdClearToEndOfLine: - break; - case HeadlessCmdDisplayAttributesOff: - break; - case HeadlessCmdDisplayInverseVideo: - break; - case HeadlessCmdSetColor: - break; - case HeadlessCmdPositionCursor: - break; - case HeadlessCmdTerminalPoll: - break; + } + + case HeadlessCmdClearToEndOfDisplay: + break; + case HeadlessCmdClearToEndOfLine: + break; + case HeadlessCmdDisplayAttributesOff: + break; + case HeadlessCmdDisplayInverseVideo: + break; + case HeadlessCmdSetColor: + break; + case HeadlessCmdPositionCursor: + break; + case HeadlessCmdTerminalPoll: + break; case HeadlessCmdGetByte: - + { /* Make sure the caller passed valid data */ if (!(OutputBuffer) || !(OutputBufferSize) || @@ -394,15 +397,17 @@ /* Return success either way */ Status = STATUS_SUCCESS; break; - - case HeadlessCmdGetLine: - break; - case HeadlessCmdStartBugCheck: - break; - case HeadlessCmdDoBugCheckProcessing: - break; - case HeadlessCmdQueryInformation: - + } + + case HeadlessCmdGetLine: + break; + case HeadlessCmdStartBugCheck: + break; + case HeadlessCmdDoBugCheckProcessing: + break; + + case HeadlessCmdQueryInformation: + { /* Make sure the caller passed valid data */ if (!(OutputBuffer) || !(OutputBufferSize) || @@ -441,12 +446,15 @@ /* All done */ Status = STATUS_SUCCESS; break; - case HeadlessCmdAddLogEntry: - break; - case HeadlessCmdDisplayLog: - break; + } + + case HeadlessCmdAddLogEntry: + break; + case HeadlessCmdDisplayLog: + break; + case HeadlessCmdSetBlueScreenData: - + { /* Validate the existence of an input buffer */ if (!InputBuffer) { @@ -458,12 +466,15 @@ UNIMPLEMENTED; Status = STATUS_SUCCESS; break; - case HeadlessCmdSendBlueScreenData: - break; - case HeadlessCmdQueryGUID: - break; - case HeadlessCmdPutData: - + } + + case HeadlessCmdSendBlueScreenData: + break; + case HeadlessCmdQueryGUID: + break; + + case HeadlessCmdPutData: + { /* Validate the existence of an input buffer */ if (!(InputBuffer) || !(InputBufferSize)) { @@ -482,6 +493,7 @@ /* Return success either way */ Status = STATUS_SUCCESS; break; + } default: break; @@ -532,6 +544,7 @@ RtlZeroMemory(OutputBuffer, *OutputBufferSize); } + return STATUS_SUCCESS; }

11 years

[akhaldi] 60670: [VENDOR] * Remove more old/unused vendor drops.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 20:02:26 2013 New Revision: 60670 URL: http://svn.reactos.org/svn/reactos?rev=60670&view=rev Log: [VENDOR] * Remove more old/unused vendor drops. Removed: vendor/mingw-w64/ vendor/rfsd/

11 years

[akhaldi] 60669: [BRANCHES] * ros-amd64-bringup: merged.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 20:00:52 2013 New Revision: 60669 URL: http://svn.reactos.org/svn/reactos?rev=60669&view=rev Log: [BRANCHES] * ros-amd64-bringup: merged. Removed: branches/ros-amd64-bringup/

11 years

[akhaldi] 60668: [BRANCHES] * tcp-rewrite-branch: superseded by the (merged) GSoC TcpIpDriver project.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 18:54:47 2013 New Revision: 60668 URL: http://svn.reactos.org/svn/reactos?rev=60668&view=rev Log: [BRANCHES] * tcp-rewrite-branch: superseded by the (merged) GSoC TcpIpDriver project. Removed: branches/tcp-rewrite-branch/

11 years

[akhaldi] 60667: [BRANCHES] * usb-bringup-trunk: merged.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 18:39:11 2013 New Revision: 60667 URL: http://svn.reactos.org/svn/reactos?rev=60667&view=rev Log: [BRANCHES] * usb-bringup-trunk: merged. Removed: branches/usb-bringup-trunk/

11 years

[akhaldi] 60666: [REACTOS/DEBUG] * Set the assert related macros in consistency with the DDK ones, for release builds. * Improve the debug build checks here (DBG was not even considered before).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 16:39:18 2013 New Revision: 60666 URL: http://svn.reactos.org/svn/reactos?rev=60666&view=rev Log: [REACTOS/DEBUG] * Set the assert related macros in consistency with the DDK ones, for release builds. * Improve the debug build checks here (DBG was not even considered before). Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Mon Oct 14 16:39:18 2013 @@ -62,26 +62,26 @@ #endif /* !defined(_RTLFUNCS_H) && !defined(_NTDDK_) */ #ifndef assert -#ifndef NASSERT +#if DBG && !defined(NASSERT) #define assert(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } #else -#define assert(x) +#define assert(x) ((VOID) 0) #endif #endif #ifndef ASSERT -#ifndef NASSERT +#if DBG && !defined(NASSERT) #define ASSERT(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } #else -#define ASSERT(x) +#define ASSERT(x) ((VOID) 0) #endif #endif #ifndef ASSERTMSG -#ifndef NASSERT +#if DBG && !defined(NASSERT) #define ASSERTMSG(m, x) if (!(x)) { RtlAssert((PVOID)#x, __FILE__, __LINE__, m); } #else -#define ASSERTMSG(m, x) +#define ASSERTMSG(m, x) ((VOID) 0) #endif #endif

11 years

[akhaldi] 60665: [KMTEST_DRV] * Move the DeviceExtension related asserts into a DBG block.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 16:35:35 2013 New Revision: 60665 URL: http://svn.reactos.org/svn/reactos?rev=60665&view=rev Log: [KMTEST_DRV] * Move the DeviceExtension related asserts into a DBG block. Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/kmtest… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Mon Oct 14 16:35:35 2013 @@ -150,9 +150,11 @@ if (MainDeviceObject) { +#if DBG PKMT_DEVICE_EXTENSION DeviceExtension = MainDeviceObject->DeviceExtension; ASSERT(!DeviceExtension->Mdl); ASSERT(!DeviceExtension->ResultBuffer); +#endif ASSERT(!ResultBuffer); IoDeleteDevice(MainDeviceObject); }

11 years

[akhaldi] 60664: [VFATLIB] * Move readsize into a DBG block.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 16:28:14 2013 New Revision: 60664 URL: http://svn.reactos.org/svn/reactos?rev=60664&view=rev Log: [VFATLIB] * Move readsize into a DBG block. Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Mon Oct 14 16:28:14 2013 @@ -150,7 +150,9 @@ const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: const loff_t seekpos_aligned = pos - (pos % 512); // TMN: const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: +#if DBG const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: +#endif char* tmpBuf = vfalloc(readsize_aligned); // TMN: if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",pos); if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64d",size,pos);

11 years

[akhaldi] 60663: [VENDOR] * Remove some old/unused vendor drops.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 16:02:03 2013 New Revision: 60663 URL: http://svn.reactos.org/svn/reactos?rev=60663&view=rev Log: [VENDOR] * Remove some old/unused vendor drops. Removed: vendor/BIND/ vendor/CMIDriver/ vendor/Mesa3D/ vendor/STLport/ vendor/VMware/ vendor/bochs/ vendor/expat/ vendor/freetype/ vendor/icu4c/ vendor/libxml2/ vendor/mingw/ vendor/sumatrapdf/ vendor/uniata/ vendor/zlib/

11 years

[akhaldi] 60662: [EXPAT] * Remove from the codebase (it's not used anywhere).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 15:59:57 2013 New Revision: 60662 URL: http://svn.reactos.org/svn/reactos?rev=60662&view=rev Log: [EXPAT] * Remove from the codebase (it's not used anywhere). Removed: trunk/reactos/lib/3rdparty/expat/ Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] Mon Oct 14 15:59:57 2013 @@ -2,7 +2,6 @@ add_subdirectory(adns) add_subdirectory(bzip2) add_subdirectory(cardlib) -#add_subdirectory(expat) nothing seems to link to it add_subdirectory(freetype) add_subdirectory(fullfat) add_subdirectory(libmpg123)

11 years

← Newer
1
...
12
13
14
15
16
17
18
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013