Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[cfinck] 32688: Aaand yet another one, including fixed indentation for the whole file (sorry for the commit spam, but I'm trying to solve the building problems of a user over IRC :D)
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:44:07 2008 New Revision: 32688 URL: http://svn.reactos.org/svn/reactos?rev=3D32688&view=3Drev Log: Aaand yet another one, including fixed indentation for the whole file (sorry for the commit spam, but I'm trying to solve the building problems o= f a user over IRC :D) Modified: trunk/reactos/tools/sysreg/os_support.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_suppo= rt.cpp?rev=3D32688&r1=3D32687&r2=3D32688&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Fri Mar 14 19:44:07 2008 @@ -8,6 +8,7 @@ */ = #include "os_support.h" +#include <cstdlib> = namespace System_ { @@ -19,7 +20,7 @@ void OsSupport::checkAlarms() { struct timeval tm; - size_t i; + size_t i; #if 0 // gettimeofday(&tm, 0); #endif @@ -109,33 +110,33 @@ return 0; } #endif - bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) - { - HANDLE hProcess =3D OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if (!hProcess) - { - return false; - } - - bool ret =3D TerminateProcess(hProcess, exitcode); - CloseHandle(hProcess); - return ret; - } - - OsSupport::ProcessID OsSupport::createProcess(const char *procname, int p= rocargsnum, const char **procargs, bool wait) - { - STARTUPINFO siStartInfo; - PROCESS_INFORMATION piProcInfo; - OsSupport::ProcessID pid; + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcod= e) + { + HANDLE hProcess =3D OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!hProcess) + { + return false; + } + + bool ret =3D TerminateProcess(hProcess, exitcode); + CloseHandle(hProcess); + return ret; + } + + OsSupport::ProcessID OsSupport::createProcess(const char *procname, in= t procargsnum, const char **procargs, bool wait) + { + STARTUPINFO siStartInfo; + PROCESS_INFORMATION piProcInfo; + OsSupport::ProcessID pid; DWORD length =3D 0; char * szBuffer; char * cmd; - ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); - ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); - - siStartInfo.cb =3D sizeof(STARTUPINFO); - siStartInfo.wShowWindow =3D SW_SHOWNORMAL; - siStartInfo.dwFlags =3D STARTF_USESHOWWINDOW; + ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); + ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); + + siStartInfo.cb =3D sizeof(STARTUPINFO); + siStartInfo.wShowWindow =3D SW_SHOWNORMAL; + siStartInfo.dwFlags =3D STARTF_USESHOWWINDOW; = if (procargsnum) { @@ -173,27 +174,27 @@ cmd =3D _strdup(procname); = } - if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, = NULL, NULL, &siStartInfo, &piProcInfo)) - { + if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, NORMAL_PRIORITY_C= LASS, NULL, NULL, &siStartInfo, &piProcInfo)) + { cerr << "Error: CreateProcess failed " << cmd << endl; - pid =3D 0; - } - else - { - pid =3D piProcInfo.dwProcessId; + pid =3D 0; + } + else + { + pid =3D piProcInfo.dwProcessId; if (wait) { WaitForSingleObject(piProcInfo.hThread, INFINITE); } - CloseHandle(piProcInfo.hProcess); - CloseHandle(piProcInfo.hThread); - } - free(cmd); - return pid; - } - void OsSupport::delayExecution(long value) - { - Sleep(value * 1000); + CloseHandle(piProcInfo.hProcess); + CloseHandle(piProcInfo.hThread); + } + free(cmd); + return pid; + } + void OsSupport::delayExecution(long value) + { + Sleep(value * 1000); } = DWORD WINAPI AlarmThread(LPVOID param) @@ -243,23 +244,23 @@ /*************************************************************************= *******************************************/ = = - struct sigaction OsSupport::s_sact; - - - OsSupport::ProcessID OsSupport::createProcess(const char *procname, int p= rocargsnum, const char **procargs, bool bWait) - { - ProcessID pid; - - if ((pid =3D fork()) < 0) - { - cerr << "OsSupport::createProcess> fork failed" << endl; - return 0; - } - if (pid =3D=3D 0) - { - execv(procname, (char* const*)procargs); - return 0; - } + struct sigaction OsSupport::s_sact; + + + OsSupport::ProcessID OsSupport::createProcess(const char *procname, in= t procargsnum, const char **procargs, bool bWait) + { + ProcessID pid; + + if ((pid =3D fork()) < 0) + { + cerr << "OsSupport::createProcess> fork failed" << endl; + return 0; + } + if (pid =3D=3D 0) + { + execv(procname, (char* const*)procargs); + return 0; + } else { /* parent process */ @@ -268,14 +269,14 @@ waitpid(pid, NULL, 0); } } - return pid; - } - - bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) - { - kill(pid, SIGKILL); - return true; - } + return pid; + } + + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcod= e) + { + kill(pid, SIGKILL); + return true; + } = void OsSupport::delayExecution(long value) {

1 0

[cfinck] 32687: Add yet another missing include
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:38:42 2008 New Revision: 32687 URL: http://svn.reactos.org/svn/reactos?rev=3D32687&view=3Drev Log: Add yet another missing include Modified: trunk/reactos/tools/sysreg/file_reader.cpp Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_rea= der.cpp?rev=3D32687&r1=3D32686&r2=3D32687&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Fri Mar 14 19:38:42 2008 @@ -8,8 +8,10 @@ */ = #include "file_reader.h" -#include <assert.h> +#include <cassert> #include <cstdio> +#include <cstring> + namespace System_ { //------------------------------------------------------------------------= ---------------

1 0

[cfinck] 32686: - Add <cstring> for "memset", "strchr" and "strstr" - Use the C++ wrapper headers consistently - Fix indentation
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:35:48 2008 New Revision: 32686 URL: http://svn.reactos.org/svn/reactos?rev=3D32686&view=3Drev Log: - Add <cstring> for "memset", "strchr" and "strstr" - Use the C++ wrapper headers consistently - Fix indentation Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpip= e_reader.cpp?rev=3D32686&r1=3D32685&r2=3D32686&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Fri Mar 14 19:35:48 2008 @@ -11,7 +11,8 @@ #include "namedpipe_reader.h" = #include <iostream> -#include <assert.h> +#include <cassert> +#include <cstring> = namespace System_ { @@ -22,51 +23,51 @@ #else const char * NamedPipeReader::s_LineBreak =3D "\x0D\x0A\0"; #endif - using std::vector; + using std::vector; //------------------------------------------------------------------------= --------------- NamedPipeReader::NamedPipeReader() : DataSource(), h_Pipe(NULLVAL), m_= Buffer(0) - { - } - -//------------------------------------------------------------------------= --------------- - NamedPipeReader::~NamedPipeReader() - { + { + } + +//------------------------------------------------------------------------= --------------- + NamedPipeReader::~NamedPipeReader() + { if (m_Buffer) free(m_Buffer); - } - - bool NamedPipeReader::isSourceOpen() - { - return true; - } - -//------------------------------------------------------------------------= --------------- - - bool NamedPipeReader::openSource(const string & PipeCmd) - { - if (h_Pipe !=3D NULLVAL) - { - cerr << "NamedPipeReader::openPipe> pipe already open" << endl; - return false; - } + } + + bool NamedPipeReader::isSourceOpen() + { + return true; + } + +//------------------------------------------------------------------------= --------------- + + bool NamedPipeReader::openSource(const string & PipeCmd) + { + if (h_Pipe !=3D NULLVAL) + { + cerr << "NamedPipeReader::openPipe> pipe already open" << endl; + return false; + } #ifndef __LINUX__ - h_Pipe =3D CreateFile(PipeCmd.c_str(), - GENERIC_WRITE | GENERIC_READ, - 0, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - (HANDLE) - NULL); - - if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { + h_Pipe =3D CreateFile(PipeCmd.c_str(), + GENERIC_WRITE | GENERIC_READ, + 0, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + (HANDLE) + NULL); + + if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { cerr << "NamedPipeReader::openPipe> failed to open pipe " << P= ipeCmd << " Error:" << GetLastError() << endl; - h_Pipe =3D NULLVAL; - return false; - } - else - { - cout << "NamedPipeReader::openPipe> successfully opened pipe" << endl; + h_Pipe =3D NULLVAL; + return false; + } + else + { + cout << "NamedPipeReader::openPipe> successfully opened pipe" = << endl; = if (!m_Buffer) { @@ -74,49 +75,49 @@ m_Buffer =3D (char*)malloc(sizeof(char) * m_BufferLength); } ConnectNamedPipe(h_Pipe, - 0); + 0); return true; - } -#else - h_Pipe =3D open(PipeCmd.c_str(), O_RDONLY); - - if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { - cerr << "NamedPipeReader::openPipe> failed to open pipe " << PipeCmd <<= endl; - h_Pipe =3D NULLVAL; - return false; - } - else - { + } +#else + h_Pipe =3D open(PipeCmd.c_str(), O_RDONLY); + + if(INVALID_HANDLE_VALUE =3D=3D h_Pipe) { + cerr << "NamedPipeReader::openPipe> failed to open pipe " << P= ipeCmd << endl; + h_Pipe =3D NULLVAL; + return false; + } + else + { cout << "NamedPipeReader::openPipe> successfully opened pipe h= andle: "<< h_Pipe << endl << "Src: " << PipeCmd << endl; if (!m_Buffer) { m_BufferLength =3D 100; m_Buffer =3D (char*)malloc(sizeof(char) * m_BufferLength); } - return true; - } -#endif - } - -//------------------------------------------------------------------------= --------------- - - bool NamedPipeReader::closeSource() = - { + return true; + } +#endif + } + +//------------------------------------------------------------------------= --------------- + + bool NamedPipeReader::closeSource() = + { cerr << "NamedPipeReader::closePipe> entered" << endl; - if (h_Pipe =3D=3D NULLVAL) - { - cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; - return false; - } + if (h_Pipe =3D=3D NULLVAL) + { + cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; + return false; + } #ifdef __LINUX__ close(h_Pipe); #else - DisconnectNamedPipe(h_Pipe); - CloseHandle(h_Pipe); -#endif - h_Pipe =3D NULLVAL; - return true; - } + DisconnectNamedPipe(h_Pipe); + CloseHandle(h_Pipe); +#endif + h_Pipe =3D NULLVAL; + return true; + } //------------------------------------------------------------------------= --------------- void NamedPipeReader::insertLine(std::vector<string> & vect, string li= ne, bool append_line) { @@ -133,14 +134,14 @@ = } //------------------------------------------------------------------------= --------------- - void NamedPipeReader::extractLines(char * buffer, std::vector<string> & v= ect, bool & append_line, unsigned long cbRead) - { + void NamedPipeReader::extractLines(char * buffer, std::vector<string> = & vect, bool & append_line, unsigned long cbRead) + { #if 0 long offset =3D 0; size_t start_size =3D vect.size (); char * start =3D buffer; buffer[cbRead] =3D '\0'; - char * end =3D strstr(buffer, s_LineBreak); + char * end =3D strstr(buffer, s_LineBreak); = //cout << "extractLines entered with append_line: " << append_line= << " cbRead: " << cbRead << "buffer: " << buffer << endl; = @@ -189,90 +190,90 @@ = #else DWORD buf_offset =3D 0; - char * offset =3D strchr(buffer, '\x0D'); - while(offset) - { - /// - /// HACKHACK - /// due to some mysterious reason, strchr / strstr sometimes returns - /// not always the offset to the CR character but to the next LF - /// in MSVC 2005 (Debug Modus) - - if (offset[0] =3D=3D '\x0A') - { - if (buf_offset) - { - offset--; - } - else - { - //TODO - // implement me special case - } - } - - if (offset[0] =3D=3D '\x0D') - { - buf_offset +=3D 2; - offset[0] =3D '\0'; - offset +=3D2; - } - else - { - /// - /// BUG detected in parsing code - /// - abort(); - } - - string line =3D buffer; - if (append_line) - { - assert(vect.empty () =3D=3D false); - string prev_line =3D vect[vect.size () -1]; - prev_line +=3D line; - vect.pop_back (); - vect.push_back (prev_line); - append_line =3D false; - } - else - { - vect.push_back (line); - } - - buf_offset +=3D line.length(); - if (buf_offset >=3D cbRead) - { - break; - } - buffer =3D offset; - - offset =3D strstr(buffer, "\n"); - } - if (buf_offset < cbRead) - { - buffer[cbRead - buf_offset] =3D '\0'; - string line =3D buffer; - if (append_line) - { - assert(vect.empty () =3D=3D false); - string prev_line =3D vect[vect.size () -1]; - vect.pop_back (); - prev_line +=3D line; - vect.push_back (prev_line); - } - else - { - vect.push_back (line); - append_line =3D true; - } - } - else - { - append_line =3D false; - } -#endif - } + char * offset =3D strchr(buffer, '\x0D'); + while(offset) + { + /// + /// HACKHACK + /// due to some mysterious reason, strchr / strstr sometimes r= eturns + /// not always the offset to the CR character but to the next = LF + /// in MSVC 2005 (Debug Modus) + + if (offset[0] =3D=3D '\x0A') + { + if (buf_offset) + { + offset--; + } + else + { + //TODO + // implement me special case + } + } + + if (offset[0] =3D=3D '\x0D') + { + buf_offset +=3D 2; + offset[0] =3D '\0'; + offset +=3D2; + } + else + { + /// + /// BUG detected in parsing code + /// + abort(); + } + + string line =3D buffer; + if (append_line) + { + assert(vect.empty () =3D=3D false); + string prev_line =3D vect[vect.size () -1]; + prev_line +=3D line; + vect.pop_back (); + vect.push_back (prev_line); + append_line =3D false; + } + else + { + vect.push_back (line); + } + + buf_offset +=3D line.length(); + if (buf_offset >=3D cbRead) + { + break; + } + buffer =3D offset; + + offset =3D strstr(buffer, "\n"); + } + if (buf_offset < cbRead) + { + buffer[cbRead - buf_offset] =3D '\0'; + string line =3D buffer; + if (append_line) + { + assert(vect.empty () =3D=3D false); + string prev_line =3D vect[vect.size () -1]; + vect.pop_back (); + prev_line +=3D line; + vect.push_back (prev_line); + } + else + { + vect.push_back (line); + append_line =3D true; + } + } + else + { + append_line =3D false; + } +#endif + } //------------------------------------------------------------------------= --------------- bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long &= bytesread) { @@ -284,12 +285,12 @@ #else DWORD cbRead =3D 0; BOOL fSuccess =3D ReadFile(h_Pipe, - buffer, - (bufferlength-1) * sizeof(char), - &cbRead, - NULL); - = - if (!fSuccess && GetLastError() !=3D ERROR_MORE_DATA) + buffer, + (bufferlength-1) * sizeof(char), + &cbRead, + NULL); + = + if (!fSuccess && GetLastError() !=3D ERROR_MORE_DATA) return false; #endif = @@ -298,9 +299,9 @@ } //------------------------------------------------------------------------= --------------- = - bool NamedPipeReader::readSource(vector<string> & vect) - { - size_t lines =3D vect.size (); + bool NamedPipeReader::readSource(vector<string> & vect) + { + size_t lines =3D vect.size (); = if (h_Pipe =3D=3D NULLVAL) { @@ -314,9 +315,9 @@ return false; } = - bool append_line =3D false; - do - { + bool append_line =3D false; + do + { memset(m_Buffer, 0x0, m_BufferLength * sizeof(char)); long cbRead =3D 0; =

1 0

[cfinck] 32685: - Consistently use the C++ wrapper headers (cstdio, cstdlib, ...) around the standard C headers and also add <cstring> for "strtok", "strcpy" and "strncmp" - Remove a useless typedef, which causes a warning with newer GCC's
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:23:40 2008 New Revision: 32685 URL: http://svn.reactos.org/svn/reactos?rev=3D32685&view=3Drev Log: - Consistently use the C++ wrapper headers (cstdio, cstdlib, ...) around th= e standard C headers and also add <cstring> for "strtok", "strcpy" and "str= ncmp" - Remove a useless typedef, which causes a warning with newer GCC's Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_= test.cpp?rev=3D32685&r1=3D32684&r2=3D32685&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Mar 14 19:23:40 2008 @@ -20,13 +20,14 @@ #include <iostream> #include <vector> #include <fstream> -#include <time.h> -#include <float.h> -#include <stdio.h> -#include <stdlib.h> -#include <assert.h> -#include <math.h> -#include <signal.h> +#include <cassert> +#include <cfloat> +#include <cmath> +#include <csignal> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> #ifndef __LINUX__ #include <io.h> #include <errno.h> Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_= test.h?rev=3D32685&r1=3D32684&r2=3D32685&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Fri Mar 14 19:23:40 2008 @@ -117,7 +117,7 @@ = void dumpCheckpoints(); = -typedef enum DebugState +enum DebugState { DebugStateContinue =3D 1, /* continue debugging */ DebugStateBSODDetected, /* bsod detected */

1 0

[tkreuzer] 32684: enable a additional GDI_DEBUG backtraces
by tkreuzer＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: tkreuzer Date: Fri Mar 14 19:10:27 2008 New Revision: 32684 URL: http://svn.reactos.org/svn/reactos?rev=3D32684&view=3Drev Log: enable a additional GDI_DEBUG backtraces 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/win3= 2k/objects/gdiobj.c?rev=3D32684&r1=3D32683&r2=3D32684&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Mar 14 19:10= :27 2008 @@ -313,12 +313,12 @@ #define GDIDBG_TRACECALLER() \ DPRINT1("-> called from:\n"); \ KeRosDumpStackFrames(NULL, 20); -#define GDIDBG_TRACEALLOCATOR(index) -// DPRINT1("-> allocated from:\n"); -// KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); -#define GDIDBG_TRACELOCKER(index) -// DPRINT1("-> locked from:\n"); -// KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); +#define GDIDBG_TRACEALLOCATOR(index) \ + DPRINT1("-> allocated from:\n"); \ + KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); +#define GDIDBG_TRACELOCKER(index) \ + DPRINT1("-> locked from:\n"); \ + KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); #define GDIDBG_CAPTUREALLOCATOR(index) \ CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS= ); #define GDIDBG_CAPTURELOCKER(index) \

1 0

[cfinck] 32683: Include <cstdlib> and <cstring> for "getenv" and "strlen"
by cfinck＠svn.reactos.org 15 Mar '08

15 Mar '08

Author: cfinck Date: Fri Mar 14 19:04:43 2008 New Revision: 32683 URL: http://svn.reactos.org/svn/reactos?rev=3D32683&view=3Drev Log: Include <cstdlib> and <cstring> for "getenv" and "strlen" Modified: trunk/reactos/tools/sysreg/env_var.cpp Modified: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.= cpp?rev=3D32683&r1=3D32682&r2=3D32683&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/env_var.cpp (original) +++ trunk/reactos/tools/sysreg/env_var.cpp Fri Mar 14 19:04:43 2008 @@ -10,6 +10,8 @@ = #include "env_var.h" #include <iostream> +#include <cstdlib> +#include <cstring> = namespace System_ {

1 0

[cfinck] 32682: Include <cstdlib> for "strtod" and "strtol"
by cfinck＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: cfinck Date: Fri Mar 14 18:59:55 2008 New Revision: 32682 URL: http://svn.reactos.org/svn/reactos?rev=3D32682&view=3Drev Log: Include <cstdlib> for "strtod" and "strtol" Modified: trunk/reactos/tools/sysreg/conf_parser.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_par= ser.cpp?rev=3D32682&r1=3D32681&r2=3D32682&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Fri Mar 14 18:59:55 2008 @@ -12,6 +12,7 @@ #include <sstream> #include <fstream> #include <cstdio> +#include <cstdlib> = namespace Sysreg_ {

1 0

[cfinck] 32681: Change, simplify and document the conditions for the include files. Fix two build problems in Fedora 8 and probably other hosts with a newer C library (reported by Dosadi on #reactos)
by cfinck＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: cfinck Date: Fri Mar 14 18:55:32 2008 New Revision: 32681 URL: http://svn.reactos.org/svn/reactos?rev=3D32681&view=3Drev Log: Change, simplify and document the conditions for the include files. Fix two build problems in Fedora 8 and probably other hosts with a newer C = library (reported by Dosadi on #reactos) Modified: trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/ssprintf.cpp trunk/reactos/tools/xml.cpp Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?= rev=3D32681&r1=3D32680&r2=3D32681&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Fri Mar 14 18:55:32 2008 @@ -1373,9 +1373,9 @@ return; } i =3D 0; - while (((CurrentChar + i < LineLength) && + while ((CurrentChar + i < LineLength) && (((ch =3D Line[CurrentChar + i]) >=3D 'a') && (ch <=3D 'z'= )) || - ((ch >=3D 'A') && (ch <=3D 'Z')) || (ch =3D=3D '_'))) + ((ch >=3D 'A') && (ch <=3D 'Z')) || (ch =3D=3D '_')) { CurrentString[i] =3D ch; i++; Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?re= v=3D32681&r1=3D32680&r2=3D32681&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/ssprintf.cpp (original) +++ trunk/reactos/tools/ssprintf.cpp Fri Mar 14 18:55:32 2008 @@ -14,20 +14,25 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ = -#if defined(__FreeBSD__) || defined(__APPLE__) -# include <stdlib.h> -#else -# include <malloc.h> -#endif // __FreeBSD__ +// For character conversion functions like "wctomb" and "alloca" under Unix +#include <stdlib.h> + +#if defined(WIN32) + // Under Win32 hosts, "alloca" is not defined by stdlib.h, but by mall= oc.h + // On the other hand, malloc.h is deprecated under some Unix hosts, so= only include it for Win32 hosts. + #include <malloc.h> +#endif + +#include <ctype.h> #include <math.h> #include <float.h> #include <assert.h> #include "ssprintf.h" = #ifndef WIN32 -#include <ctype.h> #define _finite __finite #define _isnan __isnan +#endif = #ifndef __APPLE__ inline int iswdigit ( wchar_t c ) @@ -35,7 +40,6 @@ return ( c >=3D L'0' && c <=3D L'9' ); } #endif -#endif//WIN32 = #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__CYGWIN__) # define __isnan isnan Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=3D3= 2681&r1=3D32680&r2=3D32681&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/xml.cpp (original) +++ trunk/reactos/tools/xml.cpp Fri Mar 14 18:55:32 2008 @@ -21,15 +21,23 @@ #endif//_MSC_VER = #ifdef WIN32 -# include <direct.h> -# include <io.h> + #include <direct.h> + #include <io.h> #else -# include <sys/stat.h> -# include <unistd.h> -# include <ctype.h> -# define MAX_PATH PATH_MAX + #include <sys/stat.h> + #include <unistd.h> + + // Some hosts don't define PATH_MAX in unistd.h + #if !defined(PATH_MAX) + #include <limits.h> + #endif + + #define MAX_PATH PATH_MAX #endif + #include <assert.h> +#include <ctype.h> +#include <string.h> = #include "xml.h" #include "ssprintf.h"

1 0

[tkreuzer] 32680: - modify the way the way the Frames parameter in KeRosDumpStackFrames() is handled, wasn't used so far - remove some code duplication
by tkreuzer＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: tkreuzer Date: Fri Mar 14 18:51:27 2008 New Revision: 32680 URL: http://svn.reactos.org/svn/reactos?rev=3D32680&view=3Drev Log: - modify the way the way the Frames parameter in KeRosDumpStackFrames() is = handled, wasn't used so far - remove some code duplication Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev= =3D32680&r1=3D32679&r2=3D32680&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Fri Mar 14 18:51:27 2008 @@ -227,41 +227,39 @@ return (USHORT)i; } = + VOID -NTAPI -KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, - IN ULONG FrameCount OPTIONAL) -{ - ULONG Frames[32]; +FASTCALL +KeRosDumpStackFrameArray(IN PULONG Frames, + IN ULONG FrameCount) +{ ULONG i, Addr; BOOLEAN InSystem; + PVOID p; PLDR_DATA_TABLE_ENTRY LdrEntry; = - /* If the caller didn't ask, assume 32 frames */ - if (!FrameCount || FrameCount > 32) FrameCount =3D 32; - - /* Get the current frames */ - FrameCount =3D RtlCaptureStackBackTrace(2, FrameCount, (PVOID*)Frames,= NULL); - - /* Now loop them (skip the two. One for the dumper, one for the caller= ) */ + /* Loop them */ for (i =3D 0; i < FrameCount; i++) { /* Get the EIP */ Addr =3D Frames[i]; - - /* If we had a custom frame, make sure we've reached it first */ - if ((Frame) && (Frame[1] =3D=3D Addr)) - { - Frame =3D NULL; - } - else if (Frame) - { - /* Skip this entry */ - continue; + if (!Addr) + { + break; } = /* Get the base for this file */ - if (KiPcToFileHeader((PVOID)Addr, &LdrEntry, FALSE, &InSystem)) + if (Addr > (ULONG_PTR)MmHighestUserAddress) + { + /* We are in kernel */ + p =3D KiPcToFileHeader((PVOID)Addr, &LdrEntry, FALSE, &InSyste= m); + } + else + { + /* We are in user land */ + p =3D KiRosPcToUserFileHeader((PVOID)Addr, &LdrEntry); + } + if (p) { #ifdef KDBG if (!KdbSymPrintAddress((PVOID)Addr)) @@ -269,53 +267,54 @@ { /* Print out the module name */ Addr -=3D (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); - } - } - else if (Addr) + DbgPrint("<%wZ: %x>\n", &LdrEntry->FullDllName, Addr); + } + } + else { /* Print only the address */ - DbgPrint("<%x>", Addr); + DbgPrint("<%x>\n", Addr); } = /* Go to the next frame */ DbgPrint("\n"); } - - /* Get the current frames */ - FrameCount =3D KeRosCaptureUserStackBackTrace(-1, 32, (PVOID*)Frames, = NULL); - - /* Now loop them */ - for (i =3D 0; i < FrameCount; i++) - { - /* Get the EIP */ - Addr =3D Frames[i]; - - /* Get the base for this file */ - if (KiRosPcToUserFileHeader((PVOID)Addr, &LdrEntry)) - { - /* Print out the module name */ -#ifdef KDBG - if (!KdbSymPrintAddress((PVOID)Addr)) -#endif - { - /* Fall back to usual printing */ - Addr -=3D (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); - } - } - else if (Addr) - { - /* Print only the address */ - DbgPrint("<%x>", Addr); - } - - /* Go to the next frame */ - DbgPrint("\n"); - } - - /* Finish the output */ - DbgPrint("\n"); +} + +VOID +NTAPI +KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, + IN ULONG FrameCount OPTIONAL) +{ + ULONG Frames[32]; + ULONG RealFrameCount; + + /* If the caller didn't ask, assume 32 frames */ + if (!FrameCount || FrameCount > 32) FrameCount =3D 32; + + if (Frame) + { + /* Dump them */ + KeRosDumpStackFrameArray(Frame, FrameCount); + } + else + { + /* Get the current frames (skip the two. One for the dumper, one f= or the caller) */ + RealFrameCount =3D RtlCaptureStackBackTrace(2, FrameCount, (PVOID*= )Frames, NULL); + + /* Dump them */ + KeRosDumpStackFrameArray(Frames, RealFrameCount); + + /* Count left for user mode? */ + if (FrameCount - RealFrameCount > 0) + { + /* Get the current frames */ + RealFrameCount =3D KeRosCaptureUserStackBackTrace(-1, FrameCou= nt - RealFrameCount, (PVOID*)Frames, NULL); + + /* Dump them */ + KeRosDumpStackFrameArray(Frames, RealFrameCount); + } + } } = VOID

1 0

[fireball] 32679: - Merge 32177 (We now only compile the ELF loader if _ELF_ is defined (both because this isn't a standard Windows feature, and because the current code is completely not portable with ARM)).
by fireball＠svn.reactos.org 14 Mar '08

14 Mar '08

Author: fireball Date: Fri Mar 14 07:56:58 2008 New Revision: 32679 URL: http://svn.reactos.org/svn/reactos?rev=3D32679&view=3Drev Log: - Merge 32177 (We now only compile the ELF loader if _ELF_ is defined (both= because this isn't a standard Windows feature, and because the current cod= e is completely not portable with ARM)). Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/s= ection.c?rev=3D32679&r1=3D32678&r2=3D32679&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Fri Mar 14 07:56:58 2008 @@ -3647,7 +3647,9 @@ static PEXEFMT_LOADER ExeFmtpLoaders[] =3D { PeFmtCreateSection, +#ifdef __ELF ElfFmtCreateSection +#endif }; = static

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
27
Older →

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 March 2008