Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29455: Fix rgenstat compilation
by hpoussin＠svn.reactos.org 08 Oct '07

08 Oct '07

Author: hpoussin Date: Mon Oct 8 15:19:46 2007 New Revision: 29455 URL: http://svn.reactos.org/svn/reactos?rev=29455&view=rev Log: Fix rgenstat compilation Modified: trunk/reactos/tools/rgenstat/rgenstat.mak Modified: trunk/reactos/tools/rgenstat/rgenstat.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.ma… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.mak (original) +++ trunk/reactos/tools/rgenstat/rgenstat.mak Mon Oct 8 15:19:46 2007 @@ -26,9 +26,9 @@ RGENSTAT_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RGENSTAT_SOURCES:.c=.o)) -RGENSTAT_HOST_CFLAGS = -g -Werror -Wall +RGENSTAT_HOST_CFLAGS = -g -Werror -Wall $(TOOLS_CFLAGS) -RGENSTAT_HOST_LFLAGS = -g +RGENSTAT_HOST_LFLAGS = $(TOOLS_LFLAGS) -g $(RGENSTAT_TARGET): $(RGENSTAT_OBJECTS) | $(RGENSTAT_OUT) $(ECHO_LD)

1 0

[janderwald] 29454: - fix linux compilation
by janderwald＠svn.reactos.org 08 Oct '07

08 Oct '07

Author: janderwald Date: Mon Oct 8 13:28:04 2007 New Revision: 29454 URL: http://svn.reactos.org/svn/reactos?rev=29454&view=rev Log: - fix linux compilation Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Oct 8 13:28:04 2007 @@ -27,7 +27,7 @@ #include <assert.h> #include <math.h> #include <signal.h> -#include <io.h> +//#include <io.h> namespace Sysreg_ { @@ -283,7 +283,7 @@ #ifdef __LINUX__ - if (_mktemp(pipename)) + if (mktemp(pipename)) { string temp = pipename; m_Src = "/tmp/" + temp;

1 0

[janderwald] 29453: - randomize named pipe name - remove hardcoded path in named pipe reader class
by janderwald＠svn.reactos.org 08 Oct '07

08 Oct '07

Author: janderwald Date: Mon Oct 8 13:01:33 2007 New Revision: 29453 URL: http://svn.reactos.org/svn/reactos?rev=29453&view=rev Log: - randomize named pipe name - remove hardcoded path in named pipe reader class Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Oct 8 13:01:33 2007 @@ -50,7 +50,7 @@ return false; } #ifndef __LINUX__ - h_Pipe = CreateFile("\\\\.\\pipe\\qemu", //PipeCmd.c_str(), + h_Pipe = CreateFile(PipeCmd.c_str(), GENERIC_WRITE | GENERIC_READ, 0, NULL, @@ -139,7 +139,7 @@ long offset = 0; size_t start_size = vect.size (); char * start = buffer; - buffer[cbRead] = _T('\0'); + buffer[cbRead] = '\0'; char * end = strstr(buffer, s_LineBreak); //cout << "extractLines entered with append_line: " << append_line << " cbRead: " << cbRead << "buffer: " << buffer << endl; @@ -148,7 +148,7 @@ { if (end) { - end[0] = _T('\0'); + end[0] = '\0'; string line = start; end += (sizeof(s_LineBreak) / sizeof(char)); start = end; Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Oct 8 13:01:33 2007 @@ -27,7 +27,8 @@ #include <assert.h> #include <math.h> #include <signal.h> - +#include <io.h> + namespace Sysreg_ { using std::vector; @@ -273,7 +274,7 @@ { string pipe; string qemudir; - + char pipename[] = "qemuXXXXXX"; if (m_MaxMem.length() == 0) { /* set default memory size to 64M */ @@ -281,14 +282,35 @@ } #ifdef __LINUX__ - pipe = "pipe:/tmp/qemu"; - m_Src = "/tmp/qemu"; + + if (_mktemp(pipename)) + { + string temp = pipename; + m_Src = "/tmp/" + temp; + pipe = "pipe:" + m_Src; + } + else + { + pipe = "pipe:/tmp/qemu"; + m_Src = "/tmp/qemu"; + } + qemudir = "/usr/share/qemu"; m_DebugPort = "pipe"; #else - pipe = "pipe:qemu"; - m_Src = "\\\\.\\pipe\\qemu"; + if (_mktemp(pipename)) + { + string temp = pipename; + pipe = "pipe:" + temp; + m_Src = "\\\\.\\pipe\\" + temp; + } + else + { + pipe = "pipe:qemu"; + m_Src = "\\\\.\\pipe\\qemu"; + } m_DebugPort = "pipe"; + if (!getQemuDir(qemudir)) { return false;

1 0

[janderwald] 29452: - forgot one thing
by janderwald＠svn.reactos.org 08 Oct '07

08 Oct '07

Author: janderwald Date: Mon Oct 8 12:17:43 2007 New Revision: 29452 URL: http://svn.reactos.org/svn/reactos?rev=29452&view=rev Log: - forgot one thing Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Mon Oct 8 12:17:43 2007 @@ -59,7 +59,7 @@ if (value[value.length () -1] == 0xA) { // remove newline char - value[value.length ()-1] = _T('\0'); + value[value.length ()-1] = '\0'; } */ // cerr << "name: "<< name << "value: "<< value << "|" << endl; Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Oct 8 12:17:43 2007 @@ -191,7 +191,7 @@ "create", "-f", #ifdef __LINUX__ - _T("raw"), + "raw", #else "vmdk", #endif

1 0

[janderwald] 29451: - remove non required specialization
by janderwald＠svn.reactos.org 08 Oct '07

08 Oct '07

Author: janderwald Date: Mon Oct 8 04:22:39 2007 New Revision: 29451 URL: http://svn.reactos.org/svn/reactos?rev=29451&view=rev Log: - remove non required specialization Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Oct 8 04:22:39 2007 @@ -128,16 +128,6 @@ //--------------------------------------------------------------------------------------- void RosBootTest::getDefaultHDDImage(string & img) { -#ifndef __LINUX__ - char buffer[MAX_PATH]; - if (GetCurrentDirectory(MAX_PATH, buffer)) - { - img = buffer; - img += "\\output-i386"; - - } - else -#endif img = "output-i386"; EnvironmentVariable::getValue("ROS_OUTPUT", img);

1 0

[janderwald] 29450: - remove unicode support (it was mess, a few places only accepting char and then another using wchar compatibel) - rewrite line extraction (currently if'0) - add Wine gettimeofday implementation (currently if'0) - apply sources changes to SymbolFile class - remove unicode support class - fix a bug in the createProcess version for windows hosts which randomly led to invalid boot hdd error messages
by janderwald＠svn.reactos.org 08 Oct '07

08 Oct '07

Author: janderwald Date: Mon Oct 8 04:18:01 2007 New Revision: 29450 URL: http://svn.reactos.org/svn/reactos?rev=29450&view=rev Log: - remove unicode support (it was mess, a few places only accepting char and then another using wchar compatibel) - rewrite line extraction (currently if'0) - add Wine gettimeofday implementation (currently if'0) - apply sources changes to SymbolFile class - remove unicode support class - fix a bug in the createProcess version for windows hosts which randomly led to invalid boot hdd error messages Removed: trunk/reactos/tools/sysreg/unicode.cpp trunk/reactos/tools/sysreg/unicode.h Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/conf_parser.h trunk/reactos/tools/sysreg/env_var.cpp trunk/reactos/tools/sysreg/file_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.cpp trunk/reactos/tools/sysreg/namedpipe_reader.h trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/sym_file.cpp trunk/reactos/tools/sysreg/sysreg.cpp trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/sysreg/user_types.h Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Mon Oct 8 04:18:01 2007 @@ -29,14 +29,9 @@ } //--------------------------------------------------------------------------------------- - bool ConfigParser::parseFile(TCHAR * FileName) + bool ConfigParser::parseFile(char * FileName) { - FILE * file; -#ifdef UNICODE - file = _tfopen(FileName, _T("rt,ccs=UNICODE")); -#else - file = fopen(FileName, "rt"); -#endif + FILE * file = fopen(FileName, "rt"); if (!file) { cerr << "Error: ConfigParser::parseFile failed to open configuration file " << FileName << endl; @@ -45,16 +40,16 @@ bool ret = false; while (!feof(file)) { - TCHAR buffer[500]; - TCHAR * buf; + char buffer[500]; + char * buf; - buf = _fgetts(buffer, sizeof(buffer) / sizeof(TCHAR), file); + buf = fgets(buffer, sizeof(buffer) / sizeof(char), file); if (buf) { - if (buffer[0] != _T(';')) + if (buffer[0] != ';') { string s_buffer = string(buffer); - string::size_type ws_pos = s_buffer.find_first_of (_T("=")); + string::size_type ws_pos = s_buffer.find_first_of ("="); if (ws_pos != string::npos && ws_pos > 0 && ws_pos < s_buffer.size()) { @@ -101,7 +96,7 @@ return false; } - ConfValue = _tcstod(it->second.c_str(), NULL); + ConfValue = strtod(it->second.c_str(), NULL); return true; } //----------------------------------------------------------------------------------------- @@ -114,7 +109,7 @@ return false; } - ConfValue = _tcstol(it->second.c_str(), NULL, 10); + ConfValue = strtol(it->second.c_str(), NULL, 10); return true; } Modified: trunk/reactos/tools/sysreg/conf_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.h… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.h (original) +++ trunk/reactos/tools/sysreg/conf_parser.h Mon Oct 8 04:18:01 2007 @@ -62,7 +62,7 @@ /// @param FileName path to configuration file /// @return bool - bool parseFile(TCHAR * FileName); + bool parseFile(char * FileName); //-------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/env_var.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/env_var.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/env_var.cpp (original) +++ trunk/reactos/tools/sysreg/env_var.cpp Mon Oct 8 04:18:01 2007 @@ -39,7 +39,7 @@ return true; } - TCHAR * value = _tgetenv(EnvName.c_str ()); + char * value = getenv(EnvName.c_str ()); if (!value) { @@ -47,7 +47,7 @@ return false; } - if (!_tcslen(value)) + if (!strlen(value)) { cerr << "EnvironmentVariable::getValue found no value for " << EnvName << endl; return false; Modified: trunk/reactos/tools/sysreg/file_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/file_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/file_reader.cpp (original) +++ trunk/reactos/tools/sysreg/file_reader.cpp Mon Oct 8 04:18:01 2007 @@ -23,11 +23,7 @@ //--------------------------------------------------------------------------------------- bool FileReader::openSource(const string & filename) { -#ifdef UNICODE - m_File = (FILE*)_tfopen(filename.c_str(), _T("rb,ccs=UNICODE")); -#else m_File = fopen((char*)filename.c_str(), (char*)"rb"); -#endif if (m_File) { @@ -69,34 +65,18 @@ char szBuffer[256]; int readoffset = 0; -#ifdef UNICODE - wchar_t wbuf[512]; - int wbuf_offset = 0; - - if (m_BufferedLines.length ()) - { - wcscpy(wbuf, m_BufferedLines.c_str ()); - wbuf_offset = m_BufferedLines.length (); - } -#else if (m_BufferedLines.length()) { strcpy(szBuffer, m_BufferedLines.c_str()); readoffset = m_BufferedLines.length(); } -#endif do { if (total_length < num) { -#ifdef UNICODE - memmove(wbuf, &wbuf[total_length], (num - total_length) * sizeof(wchar_t)); - wbuf_offset = num - total_length; -#else memmove(szBuffer, &szBuffer[total_length], num - total_length); readoffset = num - total_length; -#endif } num = fread(&szBuffer[readoffset], @@ -113,32 +93,16 @@ } break; } - TCHAR * ptr; -#ifdef UNICODE - int i = 0; - int conv; - while((conv = mbtowc(&wbuf[wbuf_offset+i], &szBuffer[i], num))) - { - i += conv; - if (i == num) - break; + char * ptr; + char * offset = szBuffer; - assert(wbuf_offset + i < 512); - } - wbuf[wbuf_offset + num] = L'\0'; - - TCHAR * offset = wbuf; -#else - - TCHAR * offset = szBuffer; -#endif total_length = 0; - while((ptr = _tcsstr(offset, _T("\x0D\x0A"))) != NULL) + while((ptr = strstr(offset, "\x0D\x0A")) != NULL) { long length = ((long )ptr - (long)offset); - length /= sizeof(TCHAR); + length /= sizeof(char); - offset[length] = _T('\0'); + offset[length] = '\0'; string line = offset; lines.push_back (line); @@ -155,11 +119,7 @@ if (total_length < num) { -#ifdef UNICODE - m_BufferedLines = &wbuf[total_length]; -#else - m_BufferedLines = &szBuffer[total_length]; -#endif + m_BufferedLines = &szBuffer[total_length]; } return ret; Modified: trunk/reactos/tools/sysreg/namedpipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.cpp Mon Oct 8 04:18:01 2007 @@ -9,7 +9,6 @@ */ #include "namedpipe_reader.h" -#include "unicode.h" #include <iostream> #include <assert.h> @@ -18,13 +17,15 @@ { #define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#ifdef __LINUX__ + const char * NamedPipeReader::s_LineBreak = "\x0A\0"; +#else + const char * NamedPipeReader::s_LineBreak = "\x0D\x0A\0"; +#endif using std::vector; //--------------------------------------------------------------------------------------- NamedPipeReader::NamedPipeReader() : DataSource(), h_Pipe(NULLVAL), m_Buffer(0) { -#ifdef UNICODE - m_WBuffer = 0; -#endif } //--------------------------------------------------------------------------------------- @@ -32,10 +33,6 @@ { if (m_Buffer) free(m_Buffer); -#ifdef UNICODE - if (m_WBuffer) - free(m_WBuffer); -#endif } bool NamedPipeReader::isSourceOpen() @@ -76,14 +73,7 @@ m_BufferLength = 100; m_Buffer = (char*)malloc(sizeof(char) * m_BufferLength); } - -#ifdef UNICODE - if (!m_WBuffer) - { - m_WBuffer = (WCHAR*)malloc(sizeof(WCHAR) * m_BufferLength); - } -#endif - ConnectNamedPipe(h_Pipe, + ConnectNamedPipe(h_Pipe, 0); return true; } @@ -112,6 +102,7 @@ bool NamedPipeReader::closeSource() { + cerr << "NamedPipeReader::closePipe> entered" << endl; if (h_Pipe == NULLVAL) { cerr << "NamedPipeReader::closePipe> pipe is not open" << endl; @@ -127,19 +118,87 @@ return true; } //--------------------------------------------------------------------------------------- - void NamedPipeReader::extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead) - { - TCHAR * offset = _tcschr(buffer, _T('\x0D')); - DWORD buf_offset = 0; + void NamedPipeReader::insertLine(std::vector<string> & vect, string line, bool append_line) + { + if (append_line && vect.size ()) + { + string prev = vect[vect.size () - 1]; + prev += line; + vect[vect.size () - 1] = prev; + } + else + { + vect.push_back (line); + } + + } +//--------------------------------------------------------------------------------------- + void NamedPipeReader::extractLines(char * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead) + { +#if 0 + long offset = 0; + size_t start_size = vect.size (); + char * start = buffer; + buffer[cbRead] = _T('\0'); + char * end = strstr(buffer, s_LineBreak); + + //cout << "extractLines entered with append_line: " << append_line << " cbRead: " << cbRead << "buffer: " << buffer << endl; + + do + { + if (end) + { + end[0] = _T('\0'); + string line = start; + end += (sizeof(s_LineBreak) / sizeof(char)); + start = end; + offset += line.length() + (sizeof(s_LineBreak) / sizeof(char)); + + // cout << "Offset: "<< offset << "cbRead: " << cbRead << "line: " << line << endl; + insertLine(vect, line, append_line); + if (append_line) + { + append_line = false; + } + } + else + { + string line = start; +// cout << "inserting line start_size: " << start_size << "current: " << vect.size () << "line length: "<< line.length () << endl; + if (!line.length ()) + { + if (start_size == vect.size ()) + append_line = true; + break; + } + if (start_size == vect.size ()) + { + insertLine(vect, line, true); + } + else + { + insertLine(vect, line, false); + } + append_line = true; + break; + } + + end = strstr(end, s_LineBreak); + + }while(append_line); + +#else + DWORD buf_offset = 0; + char * offset = strchr(buffer, '\x0D'); while(offset) { /// /// HACKHACK - /// due to some mysterious reason, _tcschr / _tcsstr sometimes returns + /// 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] == _T('\x0A')) + if (offset[0] == '\x0A') { if (buf_offset) { @@ -152,10 +211,10 @@ } } - if (offset[0] == _T('\x0D')) + if (offset[0] == '\x0D') { buf_offset += 2; - offset[0] = _T('\0'); + offset[0] = '\0'; offset +=2; } else @@ -188,11 +247,11 @@ } buffer = offset; - offset = _tcsstr(buffer, _T("\n")); + offset = strstr(buffer, "\n"); } if (buf_offset < cbRead) { - buffer[cbRead - buf_offset] = _T('\0'); + buffer[cbRead - buf_offset] = '\0'; string line = buffer; if (append_line) { @@ -212,6 +271,7 @@ { append_line = false; } +#endif } //--------------------------------------------------------------------------------------- bool NamedPipeReader::readPipe(char * buffer, int bufferlength, long & bytesread) @@ -254,32 +314,16 @@ return false; } -#ifdef UNICODE - if (!m_WBuffer) - { - cerr << "Error: no memory" << endl; - return false; - } -#endif - bool append_line = false; do { memset(m_Buffer, 0x0, m_BufferLength * sizeof(char)); long cbRead = 0; - + if (!readPipe(m_Buffer, m_BufferLength-1, cbRead)) break; -#ifdef UNICODE - memset(m_WBuffer, 0x0, m_BufferLength * sizeof(WCHAR)); - if (!UnicodeConverter::ansi2Unicode(m_Buffer, m_WBuffer, cbRead)) - break; - extractLines(m_WBuffer, vect, append_line, cbRead); -#else extractLines(m_Buffer, vect, append_line, cbRead); -#endif - }while (append_line); return (vect.size () - lines); Modified: trunk/reactos/tools/sysreg/namedpipe_reader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/namedpipe_rea… ============================================================================== --- trunk/reactos/tools/sysreg/namedpipe_reader.h (original) +++ trunk/reactos/tools/sysreg/namedpipe_reader.h Mon Oct 8 04:18:01 2007 @@ -118,7 +118,8 @@ /// @param vect vector storing the extracted lines /// @param append_line if the line isnt fully read, the line is appended - void extractLines(TCHAR * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead); + void extractLines(char * buffer, std::vector<string> & vect, bool & append_line, unsigned long cbRead); + void insertLine(std::vector<string> & vect, string line, bool append_line); bool readPipe(char * buffer, int bufferlength, long & read); @@ -130,6 +131,7 @@ WCHAR * m_WBuffer; #endif + static const char * s_LineBreak; }; // end of class NamedPipeReader } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Mon Oct 8 04:18:01 2007 @@ -14,11 +14,15 @@ OsSupport::TimeEntryVector OsSupport::s_Entries; + //int gettimeofday(struct timeval *tv, void * tz); + void OsSupport::checkAlarms() { struct timeval tm; size_t i; - gettimeofday(&tm, 0); +#if 0 +// gettimeofday(&tm, 0); +#endif for (i = 0; i < s_Entries.size(); i++) { long diffsec = s_Entries[i]->tm.tv_sec - tm.tv_sec; @@ -67,6 +71,40 @@ HANDLE OsSupport::s_hThread = 0; static HANDLE hTimer; +#if 0 +__inline int gettimeofday(struct timeval *tv, struct timezone *tz) +{ + FILETIME ft; + LARGE_INTEGER li; + __int64 t; + static int tzflag; + + if (tv) + { + GetSystemTimeAsFileTime(&ft); + li.LowPart = ft.dwLowDateTime; + li.HighPart = ft.dwHighDateTime; + t = li.QuadPart; /* In 100-nanosecond intervals */ + t -= EPOCHFILETIME; /* Offset to the Epoch time */ + t /= 10; /* In microseconds */ + tv->tv_sec = (long)(t / 1000000); + tv->tv_usec = (long)(t % 1000000); + } + + if (tz) + { + if (!tzflag) + { + _tzset(); + tzflag++; + } + tz->tz_minuteswest = _timezone / 60; + tz->tz_dsttime = _daylight; + } + + return 0; +} +#endif bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) { HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); @@ -80,14 +118,14 @@ return ret; } - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool wait) + OsSupport::ProcessID OsSupport::createProcess(char *procname, int procargsnum, char **procargs, bool wait) { STARTUPINFO siStartInfo; PROCESS_INFORMATION piProcInfo; OsSupport::ProcessID pid; DWORD length = 0; - TCHAR * szBuffer; - TCHAR * cmd; + char * szBuffer; + char * cmd; ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); @@ -99,29 +137,36 @@ { for (int i = 1; i < procargsnum; i++) { - length += _tcslen(procargs[i]); + length += strlen(procargs[i]); } length += procargsnum; - szBuffer = (TCHAR*)malloc(length * sizeof(TCHAR)); + szBuffer = (char*)malloc(length * sizeof(char)); length = 0; for (int i = 1; i < procargsnum; i++) { - _tcscpy(&szBuffer[length], procargs[i]); - length += _tcslen(procargs[i]); - szBuffer[length] = _T(' '); + strcpy(&szBuffer[length], procargs[i]); + length += strlen(procargs[i]); + if (i + 1 < procargsnum) + { + szBuffer[length] = ' '; + } + else + { + szBuffer[length] = '\0'; + } length++; } - length = _tcslen(procname) + _tcslen(szBuffer) + 2; - cmd = (TCHAR*)malloc(length * sizeof(TCHAR)); - _tcscpy(cmd, procname); - _tcscat(cmd, _T(" ")); - _tcscat(cmd, szBuffer); + length = strlen(procname) + strlen(szBuffer) + 2; + cmd = (char*)malloc(length * sizeof(char)); + strcpy(cmd, procname); + strcat(cmd, " "); + strcat(cmd, szBuffer); free(szBuffer); } else { - cmd = _tcsdup(procname); + cmd = _strdup(procname); } if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) @@ -151,7 +196,7 @@ { LARGE_INTEGER liDueTime; - hTimer = CreateWaitableTimer(NULL, TRUE, _T("SysRegTimer")); + hTimer = CreateWaitableTimer(NULL, TRUE, "SysRegTimer"); if (!hTimer) { return 0; @@ -168,13 +213,16 @@ void OsSupport::setAlarm(long secs, OsSupport::ProcessID pid) { - + return; PTIME_ENTRY entry = (PTIME_ENTRY) malloc(sizeof(TIME_ENTRY)); if (entry) { cout << "secs: " << secs << endl; struct timeval tm; +#if 0 gettimeofday(&tm, 0); +#else +#endif tm.tv_sec += secs; entry->tm = tm; @@ -194,7 +242,7 @@ struct sigaction OsSupport::s_sact; - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool bWait) + OsSupport::ProcessID OsSupport::createProcess(char *procname, int procargsnum, char **procargs, bool bWait) { ProcessID pid; Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Mon Oct 8 04:18:01 2007 @@ -22,7 +22,10 @@ #include "user_types.h" #include <ctime> #include <vector> + +#ifndef _MSC_VER #include <sys/time.h> +#endif #define MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -66,7 +69,7 @@ /// /// - static ProcessID createProcess(TCHAR * procname, int procargsnum, TCHAR ** procargs, bool wait); + static ProcessID createProcess(char * procname, int procargsnum, char ** procargs, bool wait); //--------------------------------------------------------------------------------------- /// Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Mon Oct 8 04:18:01 2007 @@ -83,12 +83,12 @@ bool PipeReader::readSource(vector<string> & lines) { - TCHAR * buf = (TCHAR*)malloc(100 * sizeof(TCHAR)); + char * buf = (char*)malloc(100 * sizeof(char)); //#ifdef NDEBUG - memset(buf, 0x0, sizeof(TCHAR) * 100); + memset(buf, 0x0, sizeof(char) * 100); //#endif - TCHAR * res = _fgetts(buf, 100, m_File); + char * res = fgets(buf, 100, m_File); if (!res) { //cerr << "Error: PipeReader::readPipe failed" << endl; Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Mon Oct 8 04:18:01 2007 @@ -45,25 +45,25 @@ using std::ofstream; #endif - string RosBootTest::ROS_EMU_TYPE= _T("ROS_EMU_TYPE"); - string RosBootTest::EMU_TYPE_QEMU = _T("qemu"); - string RosBootTest::EMU_TYPE_VMWARE = _T("vmware"); - string RosBootTest::ROS_HDD_IMAGE= _T("ROS_HDD_IMAGE"); - string RosBootTest::ROS_CD_IMAGE = _T("ROS_CD_IMAGE"); - string RosBootTest::ROS_MAX_TIME = _T("ROS_MAX_TIME"); - string RosBootTest::ROS_LOG_FILE = _T("ROS_LOG_FILE"); - string RosBootTest::ROS_SYM_DIR = _T("ROS_SYM_DIR"); - string RosBootTest::ROS_DELAY_READ = _T("ROS_DELAY_READ"); - string RosBootTest::ROS_SYSREG_CHECKPOINT = _T("SYSREG_CHECKPOINT:"); - string RosBootTest::ROS_CRITICAL_IMAGE = _T("ROS_CRITICAL_IMAGE"); - string RosBootTest::ROS_EMU_KILL = _T("ROS_EMU_KILL"); - string RosBootTest::ROS_EMU_MEM = _T("ROS_EMU_MEM"); - string RosBootTest::ROS_BOOT_CMD = _T("ROS_BOOT_CMD"); - -#ifdef __LINUX__ - string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_LIN"); + string RosBootTest::ROS_EMU_TYPE= "ROS_EMU_TYPE"; + string RosBootTest::EMU_TYPE_QEMU = "qemu"; + string RosBootTest::EMU_TYPE_VMWARE = "vmware"; + string RosBootTest::ROS_HDD_IMAGE= "ROS_HDD_IMAGE"; + string RosBootTest::ROS_CD_IMAGE = "ROS_CD_IMAGE"; + string RosBootTest::ROS_MAX_TIME = "ROS_MAX_TIME"; + string RosBootTest::ROS_LOG_FILE = "ROS_LOG_FILE"; + string RosBootTest::ROS_SYM_DIR = "ROS_SYM_DIR"; + string RosBootTest::ROS_DELAY_READ = "ROS_DELAY_READ"; + string RosBootTest::ROS_SYSREG_CHECKPOINT = "SYSREG_CHECKPOINT:"; + string RosBootTest::ROS_CRITICAL_IMAGE = "ROS_CRITICAL_IMAGE"; + string RosBootTest::ROS_EMU_KILL = "ROS_EMU_KILL"; + string RosBootTest::ROS_EMU_MEM = "ROS_EMU_MEM"; + string RosBootTest::ROS_BOOT_CMD = "ROS_BOOT_CMD"; + +#ifdef __LINUX__ + string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_LIN"; #else - string RosBootTest::ROS_EMU_PATH = _T("ROS_EMU_PATH_WIN"); + string RosBootTest::ROS_EMU_PATH = "ROS_EMU_PATH_WIN"; #endif //--------------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ pBuf = (char*)m_BootCmd.c_str (); if (pBuf) { - pBuf = strtok(pBuf, _T(" ")); + pBuf = strtok(pBuf, " "); while(pBuf != NULL) { if (!numargs) @@ -96,7 +96,7 @@ args[numargs] = pBuf; numargs++; - pBuf = _tcstok(NULL, _T(" ")); + pBuf = strtok(NULL, " "); } args[numargs++] = 0; } @@ -128,20 +128,30 @@ //--------------------------------------------------------------------------------------- void RosBootTest::getDefaultHDDImage(string & img) { +#ifndef __LINUX__ + char buffer[MAX_PATH]; + if (GetCurrentDirectory(MAX_PATH, buffer)) + { + img = buffer; + img += "\\output-i386"; + + } + else +#endif img = "output-i386"; - EnvironmentVariable::getValue(_T("ROS_OUTPUT"), img); -#ifdef __LINUX__ - img += _T("/ros.hd"); + EnvironmentVariable::getValue("ROS_OUTPUT", img); +#ifdef __LINUX__ + img += "/ros.hd"; #else - img += _T("\\ros.hd"); + img += "\\ros.hd"; #endif } //--------------------------------------------------------------------------------------- bool RosBootTest::isFileExisting(string output) { FILE * file; - file = _tfopen(output.c_str(), _T("r")); + file = fopen(output.c_str(), "r"); if (file) { @@ -174,38 +184,38 @@ #ifdef __LINUX__ - qemuimgdir += _T("/qemu-img"); + qemuimgdir += "/qemu-img"; #else - qemuimgdir += _T("\\qemu-img.exe"); + qemuimgdir += "\\qemu-img.exe"; #endif if (!isFileExisting(qemuimgdir)) { - cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img " << qemuimgdir << endl; - return false; - } - _tremove(image.c_str ()); - - TCHAR * options[] = {NULL, - _T("create"), - _T("-f"), + cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img " << qemuimgdir << endl; + return false; + } + remove(image.c_str ()); + + char * options[] = {NULL, + "create", + "-f", #ifdef __LINUX__ _T("raw"), #else - _T("vmdk"), + "vmdk", #endif NULL, - _T("100M"), + "100M", NULL }; - options[0] = (TCHAR*)qemuimgdir.c_str(); - options[4] = (TCHAR*)image.c_str(); + options[0] = (char*)qemuimgdir.c_str(); + options[4] = (char*)image.c_str(); cerr << "Creating HDD Image ..." << image << endl; - OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 6, options, true); + OsSupport::createProcess ((char*)qemuimgdir.c_str(), 6, options, true); if (isFileExisting(image)) { m_HDDImage = image; @@ -223,7 +233,7 @@ /* the boot cmd is already provided * check if path to qemu is valid */ - string::size_type pos = m_BootCmd.find_first_of(_T(" ")); + string::size_type pos = m_BootCmd.find_first_of(" "); if (pos == string::npos) { /* the bootcmd is certainly not valid */ @@ -256,9 +266,9 @@ string::size_type pos; #ifdef __LINUX__ - pos = m_EmuPath.find_last_of(_T("/")); + pos = m_EmuPath.find_last_of("/"); #else - pos = m_EmuPath.find_last_of(_T("\\")); + pos = m_EmuPath.find_last_of("\\"); #endif if (pos == string::npos) { @@ -281,14 +291,14 @@ } #ifdef __LINUX__ - pipe = _T("pipe:/tmp/qemu"); - m_Src = _T("/tmp/qemu"); - qemudir = _T("/usr/share/qemu"); - m_DebugPort = _T("pipe"); + pipe = "pipe:/tmp/qemu"; + m_Src = "/tmp/qemu"; + qemudir = "/usr/share/qemu"; + m_DebugPort = "pipe"; #else - pipe = _T("pipe:qemu"); - m_Src = _T("\\\\.\\pipe\\qemu"); - m_DebugPort = _T("pipe"); + pipe = "pipe:qemu"; + m_Src = "\\\\.\\pipe\\qemu"; + m_DebugPort = "pipe"; if (!getQemuDir(qemudir)) { return false; @@ -296,24 +306,24 @@ #endif - m_BootCmd = m_EmuPath + _T(" -L ") + qemudir + _T(" -m ") + m_MaxMem + _T(" -serial ") + pipe; + m_BootCmd = m_EmuPath + " -L " + qemudir + " -m " + m_MaxMem + " -serial " + pipe; if (m_CDImage.length()) { /* boot from cdrom */ - m_BootCmd += _T(" -boot d -cdrom ") + m_CDImage; + m_BootCmd += " -boot d -cdrom " + m_CDImage; if (m_HDDImage.length ()) { /* add disk when specified */ - m_BootCmd += _T(" -hda ") + m_HDDImage; + m_BootCmd += " -hda " + m_HDDImage; } } else if (m_HDDImage.length ()) { /* boot from hdd */ - m_BootCmd += _T(" -boot c -hda ") + m_HDDImage; + m_BootCmd += " -boot c -hda " + m_HDDImage; } else { @@ -329,17 +339,17 @@ * to terminate the emulator in case of errors * on windows we can get pid as return of CreateProcess */ - m_PidFile = _T("output-i386"); - EnvironmentVariable::getValue(_T("ROS_OUTPUT"), m_PidFile); - m_PidFile += _T("/pid.txt"); - m_BootCmd += _T(" -pidfile "); + m_PidFile = "output-i386"; + EnvironmentVariable::getValue("ROS_OUTPUT", m_PidFile); + m_PidFile += "/pid.txt"; + m_BootCmd += " -pidfile "; m_BootCmd += m_PidFile; - m_BootCmd += _T(" -vnc :0"); + m_BootCmd += " -vnc :0"; #else if (hasQemuNoRebootOption()) { - m_BootCmd += _T(" -no-reboot "); + m_BootCmd += " -no-reboot "; } #endif return true; @@ -347,7 +357,7 @@ //---------------------------------------------------------------------------------------- bool RosBootTest::extractPipeFromBootCmd() { - string::size_type pos = m_BootCmd.find(_T("-serial")); + string::size_type pos = m_BootCmd.find("-serial"); if (pos == string::npos) { /* no debug options provided */ @@ -355,11 +365,11 @@ } string pipe = m_BootCmd.substr(pos + 7, m_BootCmd.size() - pos -7); - pos = pipe.find(_T("pipe:")); + pos = pipe.find("pipe:"); if (pos == 0) { pipe = pipe.substr(pos + 5, pipe.size() - pos - 5); - pos = pipe.find(_T(" ")); + pos = pipe.find(" "); if (pos != string::npos) { pipe = pipe.substr(0, pos); @@ -367,17 +377,17 @@ #ifdef __LINUX__ m_Src = pipe; #else - m_Src = _T("\\\\.\\pipe\\") + pipe.substr(0, pos); -#endif - m_DebugPort = _T("pipe"); + m_Src = "\\\\.\\pipe\\" + pipe.substr(0, pos); +#endif + m_DebugPort = "pipe"; return true; } - pos = pipe.find(_T("stdio")); + pos = pipe.find("stdio"); if (pos == 0) { #ifdef __LINUX__ m_Src = m_BootCmd; - m_DebugPort = _T("stdio"); + m_DebugPort = "stdio"; return true; #else cerr << "Error: reading from stdio is not supported for windows hosts - use pipes" << endl; @@ -433,13 +443,13 @@ */ bool hdaboot = false; - string::size_type pos = m_BootCmd.find (_T("-boot c")); + string::size_type pos = m_BootCmd.find ("-boot c"); if (pos != string::npos) { hdaboot = true; } - pos = m_BootCmd.find(_T("-hda ")); + pos = m_BootCmd.find("-hda "); if (pos != string::npos) { string hdd = m_BootCmd.substr(pos + 5, m_BootCmd.length() - pos - 5); @@ -486,18 +496,18 @@ return true; } } - if (isFileExisting(_T("ReactOS-RegTest.iso"))) - { - m_CDImage = _T("ReactOS-RegTest.iso"); + if (isFileExisting("ReactOS-RegTest.iso")) + { + m_CDImage = "ReactOS-RegTest.iso"; cerr << "Falling back to default CDROM image " << m_CDImage << endl; return true; } cerr << "No CDROM image found, boot device is HDD" << endl; - m_CDImage = _T(""); + m_CDImage = ""; return true; } - string::size_type pos = m_BootCmd.find(_T("-boot ")); + string::size_type pos = m_BootCmd.find("-boot "); if (pos == string::npos) { /* ROS_BOOT_CMD must provide a boot parameter*/ @@ -512,19 +522,19 @@ cerr << "Error: ROS_BOOT_CMD misses boot parameter" << endl; return false; } - if (rest[0] != _T('c') && rest[0] != _T('d')) + if (rest[0] != 'c' && rest[0] != 'd') { cerr << "Error: ROS_BOOT_CMD has invalid boot parameter" << endl; return false; } - if (rest[0] == _T('c')) + if (rest[0] == 'c') { /* ROS_BOOT_CMD boots from hdd */ return true; } - pos = m_BootCmd.find(_T("-cdrom ")); + pos = m_BootCmd.find("-cdrom "); if (pos == string::npos) { cerr << "Error: ROS_BOOT_CMD misses cdrom parameter" << endl; @@ -536,7 +546,7 @@ cerr << "Error: ROS_BOOT_CMD misses cdrom parameter" << endl; return false; } - pos = rest.find(_T(" ")); + pos = rest.find(" "); if (pos != string::npos) { rest = rest.substr(0, pos); @@ -591,7 +601,7 @@ if (m_PidFile.length () && isFileExisting(m_PidFile)) { cerr << "Deleting pid file " << m_PidFile << endl; - _tremove(m_PidFile.c_str ()); + remove(m_PidFile.c_str ()); } cerr << "Opening Data Source:" << m_BootCmd << endl; @@ -638,7 +648,7 @@ conf_parser.getStringValue (RosBootTest::ROS_CD_IMAGE, m_CDImage); } /* reset boot cmd */ - m_BootCmd = _T(""); + m_BootCmd = ""; conf_parser.getIntValue (RosBootTest::ROS_MAX_TIME, m_MaxTime); @@ -668,7 +678,7 @@ if (m_PidFile.length ()) { - _tremove(m_PidFile.c_str ()); + remove(m_PidFile.c_str ()); } } @@ -797,7 +807,7 @@ { line.erase (0, line.find (RosBootTest::ROS_SYSREG_CHECKPOINT) + RosBootTest::ROS_SYSREG_CHECKPOINT.length ()); - if (!_tcsncmp(line.c_str (), m_Checkpoint.c_str (), m_Checkpoint.length ())) + if (!strncmp(line.c_str (), m_Checkpoint.c_str (), m_Checkpoint.length ())) { state = DebugStateCPReached; break; @@ -806,7 +816,7 @@ } - if (line.find (_T("*** Fatal System Error")) != string::npos) + if (line.find ("*** Fatal System Error") != string::npos) { cerr << "Blue Screen of Death detected" <<endl; if (m_Checkpoints.size ()) @@ -818,7 +828,7 @@ m_Checkpoints.erase (m_Checkpoints.begin ()); cerr << cp << endl; }while(m_Checkpoints.size ()); - cerr << _T("----------------------------------") << endl; + cerr << "----------------------------------" << endl; } if (i + 1 < debug_data.size () ) { @@ -829,14 +839,14 @@ cerr << data << endl; i++; } - cerr << _T("----------------------------------") << endl; + cerr << "----------------------------------" << endl; } state = DebugStateBSODDetected; break; } - else if (line.find (_T("Unhandled exception")) != string::npos) + else if (line.find ("Unhandled exception") != string::npos) { - if (m_CriticalImage == _T("IGNORE")) + if (m_CriticalImage == "IGNORE") { /// /// ignoring all user-mode exceptions @@ -859,7 +869,7 @@ /// string address = debug_data[i+2]; - string::size_type pos = address.find_last_of (_T(" ")); + string::size_type pos = address.find_last_of (" "); if (pos == string::npos) { cerr << "Error: trace is not available (corrupted debug info" << endl; @@ -874,7 +884,7 @@ /// string modulename = debug_data[i+3]; - pos = modulename.find_last_of (_T("\\")); + pos = modulename.find_last_of ("\\"); if (pos == string::npos) { cerr << "Error: trace is not available (corrupted debug info" << endl; @@ -891,7 +901,7 @@ continue; } - pos = appname.find_last_of (_T(".")); + pos = appname.find_last_of ("."); if (pos == string::npos) { cerr << "Error: trace is not available (corrupted debug info" << endl; @@ -940,7 +950,7 @@ if (m_DebugFile.length ()) { - _tremove(m_DebugFile.c_str ()); + remove(m_DebugFile.c_str ()); file.open (m_DebugFile.c_str ()); } @@ -973,7 +983,6 @@ } lines += (vect.size() -prev_count); //WTF? } - m_DataSource->closeSource(); if (write_log) { file.close(); Modified: trunk/reactos/tools/sysreg/sym_file.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sym_file.cpp?… ============================================================================== --- trunk/reactos/tools/sysreg/sym_file.cpp (original) +++ trunk/reactos/tools/sysreg/sym_file.cpp Mon Oct 8 04:18:01 2007 @@ -27,10 +27,10 @@ { using std::vector; - string SymbolFile::VAR_ROS_OUTPUT = _T("ROS_OUTPUT"); - string SymbolFile::ROS_ADDR2LINE = _T("ROS_ADDR2LINE"); - string SymbolFile::m_SymbolPath= _T(""); - string SymbolFile::m_SymResolver= _T(""); + string SymbolFile::VAR_ROS_OUTPUT = "ROS_OUTPUT"; + string SymbolFile::ROS_ADDR2LINE = "ROS_ADDR2LINE"; + string SymbolFile::m_SymbolPath= ""; + string SymbolFile::m_SymResolver= ""; SymbolFile::SymbolMap SymbolFile::m_Map; //--------------------------------------------------------------------------------------- @@ -51,9 +51,9 @@ vector<string> vect; string current_dir; - if (Path == _T("")) + if (Path == "") { - current_dir = _T("output-i386"); + current_dir = "output-i386"; EnvironmentVariable::getValue(SymbolFile::VAR_ROS_OUTPUT, current_dir); } else @@ -70,10 +70,10 @@ } string val = current_dir; - val.insert (val.length()-1, _T("\\*")); + val.insert (val.length()-1, "\\*"); - struct _tfinddatai64_t c_file; - intptr_t hFile = _tfindfirsti64(val.c_str(), &c_file); + struct _finddatai64_t c_file; + intptr_t hFile = _findfirsti64(val.c_str(), &c_file); if (hFile == -1L) { @@ -86,16 +86,16 @@ do { - TCHAR * pos; - if ((pos = _tcsstr(c_file.name, _T(".nostrip.")))) + char * pos; + if ((pos = strstr(c_file.name, ".nostrip."))) { - size_t len = _tcslen(pos); + size_t len = strlen(pos); string modulename = c_file.name; string filename = modulename; modulename.erase(modulename.length() - len, len); string path = current_dir; - path.insert (path.length () -1, _T("\\")); + path.insert (path.length () -1, "\\"); path.insert (path.length () -1, filename); #ifdef NDEBUG cerr << "Module Name " << modulename << endl << "File Name " << path << endl; @@ -109,7 +109,7 @@ if (c_file.name[0] != _T('.')) { string path = current_dir; - path.insert (path.length ()-1, _T("\\")); + path.insert (path.length ()-1, "\\"); path.insert (path.length ()-1, c_file.name); vect.push_back (path); } @@ -125,7 +125,7 @@ current_dir = vect.front (); vect.erase (vect.begin()); val = current_dir; - val.insert (val.length() -1, _T("\\*")); + val.insert (val.length() -1, "\\*"); hFile = _tfindfirsti64(val.c_str(), &c_file); if (hFile != -1L) { @@ -149,32 +149,27 @@ { SymbolMap::const_iterator it = m_Map.find (module_name); - if (it == m_Map.end () || m_SymResolver == _T("")) + if (it == m_Map.end () || m_SymResolver == "") { cerr << "SymbolFile::resolveAddress> no symbol file or ROS_ADDR2LINE not set" << endl; return false; } - TCHAR szCmd[300]; + char szCmd[300]; - _stprintf(szCmd, _T("%s %s %s"), m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); + sprintf(szCmd, "%s %s %s", m_SymResolver.c_str (), it->second.c_str (), module_address.c_str()); string pipe_cmd(szCmd); - + vector<string> vect; PipeReader pipe_reader; - if (!pipe_reader.openPipe (pipe_cmd)) + if (!pipe_reader.openSource(pipe_cmd)) { cerr << "SymbolFile::resolveAddress> failed to open pipe" <<pipe_cmd <<endl; return false; } - if (Buffer.capacity () < 100) - { - Buffer.reserve (500); - } - - bool ret = pipe_reader.readPipe (Buffer); - pipe_reader.closePipe (); + bool ret = pipe_reader.readSource (vect); + pipe_reader.closeSource (); return ret; } Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Mon Oct 8 04:18:01 2007 @@ -22,17 +22,17 @@ using System_::SymbolFile; #endif -static const TCHAR USAGE[] = -_T("sysreg.exe [conf_file]\nconfiguration file (default: sysreg.cfg)"); +static const char USAGE[] = +"sysreg.exe [conf_file]\nconfiguration file (default: sysreg.cfg)"; -int _tmain(int argc, TCHAR * argv[]) +int main(int argc, char * argv[]) { ConfigParser config; - TCHAR DefaultConfig[] = _T("sysreg.cfg"); - TCHAR *ConfigFile; + char DefaultConfig[] = "sysreg.cfg"; + char *ConfigFile; if ((argc > 2)) { @@ -65,7 +65,7 @@ } string envvar; - string ros = _T("ROS_OUTPUT"); + string ros = "ROS_OUTPUT"; config.getStringValue (ros, envvar); #if 0 SymbolFile::initialize (config, envvar); Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Mon Oct 8 04:18:01 2007 @@ -26,7 +26,6 @@ sysreg.cpp \ file_reader.cpp \ os_support.cpp \ - unicode.cpp \ ) SYSREGBUILD_OBJECTS = \ @@ -85,10 +84,6 @@ $(ECHO_CC) ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ -$(SYSREGBUILD_INT_)unicode.o: $(SYSREGBUILD_BASE_)unicode.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - .PHONY: sysregbuild_clean sysreg_clean: -@$(rm) $(SYSREGBUILD_TARGET) $(SYSREGBUILD_OBJECTS) 2>$(NUL) Removed: trunk/reactos/tools/sysreg/unicode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/unicode.cpp?r… ============================================================================== --- trunk/reactos/tools/sysreg/unicode.cpp (original) +++ trunk/reactos/tools/sysreg/unicode.cpp (removed) @@ -1,31 +1,0 @@ -#include "unicode.h" - -#include <stdlib.h> -#include <stdio.h> - -namespace System_ -{ -//--------------------------------------------------------------------------------------- - bool UnicodeConverter::ansi2Unicode(char * abuf, wchar_t *outbuf, size_t length) - { - size_t i = 0; - int conv; - - while((conv = mbtowc(&outbuf[i], &abuf[i], length - i))) - { - i += conv; - if (i == length) - break; - } - outbuf[i] = L'\0'; - - if (i) - { - return true; - } - else - { - return false; - } - } -} // end of namespace System_ Removed: trunk/reactos/tools/sysreg/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/unicode.h?rev… ============================================================================== --- trunk/reactos/tools/sysreg/unicode.h (original) +++ trunk/reactos/tools/sysreg/unicode.h (removed) @@ -1,55 +1,0 @@ -#ifndef UNICODE_H__ -#define UNICODE_H__ // unicode.h - -#include "user_types.h" - -namespace System_ -{ - - class UnicodeConverter - { - public: -//--------------------------------------------------------------------------------------- -/// -/// UnicodeConverter -/// -/// Description: destructor of class UnicodeConverter - - virtual ~UnicodeConverter() - {} - -//--------------------------------------------------------------------------------------- -/// -/// UnicodeConverter -/// -/// Description: converts an ANSI buffer to wide character buffer -/// using standard c routines -/// -/// Note: make sure before calling that outbuf is big enough to receive the result -/// -/// @param abuf ansi buffer used a source -/// @param outbuf wide character buffer receives result -/// @param length length of abuf -/// -/// @return bool - - static bool ansi2Unicode(char * abuf, wchar_t * outbuf, size_t length); - - - protected: -//--------------------------------------------------------------------------------------- -/// -/// UnicodeConverter -/// -/// Description: constructor of class UnicodeConverter - - UnicodeConverter() - {} - - }; // end of class UnicodeConverter - - - -} // end of namespace System_ - -#endif /* end of UNICODE_H__ */ Modified: trunk/reactos/tools/sysreg/user_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/user_types.h?… ============================================================================== --- trunk/reactos/tools/sysreg/user_types.h (original) +++ trunk/reactos/tools/sysreg/user_types.h Mon Oct 8 04:18:01 2007 @@ -14,32 +14,12 @@ #include <iostream> #ifndef __LINUX__ - #include <tchar.h> -#else - #define TCHAR char - #define tstrcpy strcpy - #define _tcstok strtok - #define _tcschr strchr - #define _tcscat strcat - #define _tcscpy(str1, str2) strcpy(str1, str2) - #define _tcslen(str1) strlen(str1) - #define _tcstod strtod - #define _tcscmp strcmp - #define _tcstoul strtoul - #define _tcsncmp strncmp - #define _tremove remove - #define _ttoi atoi - #define _T(x) x - #define _tfopen fopen - #define _tcsstr strstr - #define _fgetts fgets - #define _tgetenv getenv - #define _tmain main - #define _tcstol strtol +#define popen _popen +#define pclose _pclose #endif - typedef std::basic_string<TCHAR> string; - typedef std::basic_istringstream<TCHAR> istringstream; + typedef std::basic_string<char> string; + typedef std::basic_istringstream<char> istringstream; #ifdef UNICODE

1 0

[dreimer] 29449: Update Changelog with Pierre Schweitzer's News and cleanup the RC Files a bit.
by dreimer＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: dreimer Date: Mon Oct 8 03:44:40 2007 New Revision: 29449 URL: http://svn.reactos.org/svn/reactos?rev=29449&view=rev Log: Update Changelog with Pierre Schweitzer's News and cleanup the RC Files a bit. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Oct 8 03:44:40 2007 @@ -3,11 +3,17 @@ - Updated RosBE COnfiguration Tool. (Pierre Schweitzer) - Added French translation. - Added the possibility to choose MingW directory. + - Added check to see if MingW dir is right (look up gcc) - Added support for WinXP style. - Added the support of C99. - Fixed warnings. - Small Modification by me: added -s and went from -O3 to -O2 in Makefile. - Correct Button States and Whitespace changes. + - Save button is disabled until a parameter is changed + - Definitively fixed resources IDs + - Added check to test if log dir exists and if it doesn't, it's created + - Added check to avoid writing in a non-existant file + - Updated todo list - Added ccache 2.4 to RosBE. (Daniel Reimer) *** Sep 24th, 2007 - RosBE 0.3.8.1 Released Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Mon Oct 8 03:44:40 2007 @@ -5,7 +5,6 @@ CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - // x, pos_hight, width, hight LTEXT "Reactos Build Environment Einstellungen", 0x0, 10, 10, 140, 13 LTEXT "Hintergrundfarbe", 0x0, 10, 35, 60, 12 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Mon Oct 8 03:44:40 2007 @@ -5,7 +5,6 @@ CAPTION "RosBE Settings" FONT 8, "MS Shell Dlg" BEGIN - // x, pos_hight, width, hight LTEXT "Reactos Build Environment Settings", 0x0, 10, 10, 140, 13 LTEXT "Background Color", 0x0, 10, 35, 60, 12 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Mon Oct 8 03:44:40 2007 @@ -5,7 +5,6 @@ CAPTION "Paramètre du RosBE" FONT 8, "MS Shell Dlg" BEGIN - // x, pos_hight, width, hight LTEXT "Paramètres de l'Environnement de Compilation de ReactOS", 0x0, 10, 10, 240, 15 LTEXT "Couleur d'arrière plan", 0x0, 10, 35, 60, 17 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Mon Oct 8 03:44:40 2007 @@ -5,7 +5,6 @@ CAPTION "Óñòàíîâêè RosBE" FONT 8, "MS Shell Dlg" BEGIN - // x, pos_hight, width, hight LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 140, 13 LTEXT "Öâåò Ôîíà", 0x0, 10, 35, 60, 12 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST

1 0

[cwittich] 29448: fix building with VS2005
by cwittich＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: cwittich Date: Mon Oct 8 03:37:15 2007 New Revision: 29448 URL: http://svn.reactos.org/svn/reactos?rev=29448&view=rev Log: fix building with VS2005 Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/rbuild.sln trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Mon Oct 8 03:37:15 2007 @@ -18,6 +18,7 @@ */ #include "pch.h" #include <assert.h> +#include <algorithm> #include "rbuild.h" Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Oct 8 03:37:15 2007 @@ -26,6 +26,7 @@ #include <string> #include <vector> #include <set> +#include <algorithm> #include <stdio.h> Modified: trunk/reactos/tools/rbuild/rbuild.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.sln?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.sln (original) +++ trunk/reactos/tools/rbuild/rbuild.sln Mon Oct 8 03:37:15 2007 @@ -1,21 +1,19 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.ActiveCfg = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.Build.0 = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.ActiveCfg = Release|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.ActiveCfg = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.Build.0 = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.ActiveCfg = Release|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Mon Oct 8 03:37:15 2007 @@ -1,132 +1,196 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="8,00" Name="rbuild" - SccProjectName="" - SccLocalPath=""> + ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" + RootNamespace="rbuild" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/rbuild.tlb" + HeaderFileName="" + /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" - RuntimeLibrary="4" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Release/rbuild.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCCustomBuildTool"/> + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" OutputFile=".\Release/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" ProgramDatabaseFile=".\Release/rbuild.pdb" SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/rbuild.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/rbuild.tlb" + HeaderFileName="" + /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos" + AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" BasicRuntimeChecks="3" - RuntimeLibrary="5" - UsePrecompiledHeader="2" + RuntimeLibrary="1" + UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" - SuppressStartupBanner="TRUE" + SuppressStartupBanner="true" DebugInformationFormat="4" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" OutputFile=".\Debug/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" + SuppressStartupBanner="true" + GenerateDebugInformation="true" ProgramDatabaseFile=".\Debug/rbuild.pdb" SubSystem="1" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/rbuild.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> @@ -134,872 +198,1126 @@ <Files> <Filter Name="backends" - Filter=""> + > <Filter Name="devcpp" - Filter=""> - <File - RelativePath="backend\devcpp\devcpp.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\devcpp\devcpp.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\devcpp\devcpp.h"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\devcpp\devcpp.h" + > </File> </Filter> <Filter Name="msvc" - Filter=""> - <File - RelativePath="backend\msvc\genguid.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\msvc\genguid.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.h"> - </File> - <File - RelativePath="backend\msvc\msvcmaker.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.h" + > + </File> + <File + RelativePath="backend\msvc\msvcmaker.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\vcprojmaker.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\vcprojmaker.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="mingw" - Filter=""> - <File - RelativePath="backend\mingw\mingw.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\mingw\mingw.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\mingw.h"> - </File> - <File - RelativePath="backend\mingw\modulehandler.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\mingw.h" + > + </File> + <File + RelativePath="backend\mingw\modulehandler.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\modulehandler.h"> - </File> - <File - RelativePath="backend\mingw\pch_detection.h"> - </File> - <File - RelativePath="backend\mingw\proxymakefile.cpp"> - <FileConfiguration - Name="Release|Win32"> + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\modulehandler.h" + > + </File> + <File + RelativePath="backend\mingw\pch_detection.h" + > + </File> + <File + RelativePath="backend\mingw\proxymakefile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="backend_sources" - Filter=""> - <File - RelativePath="backend\backend.cpp"> - <FileConfiguration - Name="Release|Win32"> + > + <File + RelativePath="backend\backend.cpp" + > + <FileConfiguration + Name="Release|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="backend_headers" - Filter=""> - <File - RelativePath="backend\backend.h"> + > + <File + RelativePath="backend\backend.h" + > + </File> + </Filter> + <Filter + Name="msbuild" + > + <File + RelativePath=".\backend\msbuild\msbuild.cpp" + > + </File> + <File + RelativePath=".\backend\msbuild\msbuild.h" + > + </File> + </Filter> + <Filter + Name="codeblocks" + > + <File + RelativePath=".\backend\codeblocks\codeblocks.cpp" + > + </File> + <File + RelativePath=".\backend\codeblocks\codeblocks.h" + > + </File> + </Filter> + <Filter + Name="dependencymap" + > + <File + RelativePath=".\backend\dependencymap\dependencymap.cpp" + > + </File> + <File + RelativePath=".\backend\dependencymap\dependencymap.h" + > + </File> + </Filter> + <Filter + Name="versionreport" + > + <File + RelativePath=".\backend\versionreport\versionreport.cpp" + > + </File> + <File + RelativePath=".\backend\versionreport\versionreport.h" + > </File> </Filter> </Filter> <Filter Name="rbuild_sources" - Filter=""> - <File - RelativePath="automaticdependency.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="bootstrap.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="cdfile.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="compilationunit.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="compilationunitsupportcode.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="compilerflag.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="configuration.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="define.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="directory.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="exception.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="filesupportcode.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="global.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="include.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="installfile.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="linkerflag.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="linkerscript.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="module.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="project.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="rbuild.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="stubbedcomponent.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="syssetupgenerator.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="testsupportcode.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="wineresource.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> + > + <File + RelativePath="automaticdependency.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\autoregister.cpp" + > + </File> + <File + RelativePath="bootstrap.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="cdfile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilationunit.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilationunitsupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="compilerflag.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="configuration.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="define.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="directory.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="exception.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="filesupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="global.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="include.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="installfile.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="linkerflag.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="linkerscript.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="module.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="project.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="rbuild.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="stubbedcomponent.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="syssetupgenerator.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="testsupportcode.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="wineresource.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\xmlnode.cpp" + > </File> </Filter> <Filter Name="rbuild_headers" - Filter=""> - <File - RelativePath="exception.h"> - </File> - <File - RelativePath="pch.h"> - </File> - <File - RelativePath="rbuild.h"> - </File> - <File - RelativePath="test.h"> + > + <File + RelativePath="exception.h" + > + </File> + <File + RelativePath="pch.h" + > + </File> + <File + RelativePath="rbuild.h" + > + </File> + <File + RelativePath="test.h" + > </File> </Filter> <Filter Name="inflib" - Filter=""> - <File - RelativePath="..\..\lib\inflib\builddep.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infcommon.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infcore.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infget.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhost.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infhostgen.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostget.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostglue.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostput.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\inflib.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infpriv.h"> - </File> - <File - RelativePath="..\..\lib\inflib\infput.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> + > + <File + RelativePath="..\..\lib\inflib\builddep.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infcommon.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infcore.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infget.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhost.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infhostgen.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostget.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostput.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\inflib.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infpriv.h" + > + </File> + <File + RelativePath="..\..\lib\inflib\infput.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> </FileConfiguration> </File> </Filter> <Filter Name="tools" - Filter=""> - <File - RelativePath="..\ssprintf.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\ssprintf.h"> - </File> - <File - RelativePath="..\xml.cpp"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions=""/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3"/> - </FileConfiguration> - </File> - <File - RelativePath="..\xml.h"> + > + <File + RelativePath="..\ssprintf.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\ssprintf.h" + > + </File> + <File + RelativePath="..\xml.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\xml.h" + > </File> </Filter> </Files>

1 0

[cwittich] 29447: used autoformat in MSVC to get the code readable again
by cwittich＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: cwittich Date: Mon Oct 8 02:51:05 2007 New Revision: 29447 URL: http://svn.reactos.org/svn/reactos?rev=29447&view=rev Log: used autoformat in MSVC to get the code readable again Modified: trunk/reactos/tools/stubgen.c Modified: trunk/reactos/tools/stubgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/stubgen.c?rev=29447&… ============================================================================== --- trunk/reactos/tools/stubgen.c (original) +++ trunk/reactos/tools/stubgen.c Mon Oct 8 02:51:05 2007 @@ -9,149 +9,149 @@ #endif typedef struct _stub { - char *name; - char *origin; - struct _stub *next; + char *name; + char *origin; + struct _stub *next; } stub; void usage( char *name ) { - fprintf( stderr, - "Usage: %s [-n nm] [-m make] libs...\n" - "nm -- The command used to run nm on reactos objects\n" - "make -- The command used to build reactos\n\n" - "libs are import libraries (.a files) typically from\n" - "dk/lib/nkm and dk/lib/w32\n", - name ); + fprintf( stderr, + "Usage: %s [-n nm] [-m make] libs...\n" + "nm -- The command used to run nm on reactos objects\n" + "make -- The command used to build reactos\n\n" + "libs are import libraries (.a files) typically from\n" + "dk/lib/nkm and dk/lib/w32\n", + name ); } int main( int argc, char **argv ) { - char line[1024]; - char *make = "make"; - char *nm = "nm"; - char *origin = "unknown.a"; - stub *functions = NULL, *new_f, *imports = NULL, *search; - FILE *make_f, *nm_f; - int i, libstart = argc; - FILE *out = fopen("tests/stubs.tst","w"); + char line[1024]; + char *make = "make"; + char *nm = "nm"; + char *origin = "unknown.a"; + stub *functions = NULL, *new_f, *imports = NULL, *search; + FILE *make_f, *nm_f; + int i, libstart = argc; + FILE *out = fopen("tests/stubs.tst","w"); - if( argc == 1 ) { usage(argv[0]); return 1; } + if( argc == 1 ) { usage(argv[0]); return 1; } - if( !out ) { - fprintf( stderr, "Could not write file tests/stubs.tst\n" ); - return 1; - } - - fprintf( out, "# Automatically generated by stubgen\n" ); - - for( i = 1; i < argc; i++ ) { - if( !strcmp( argv[i], "-m" ) ) { - make = argv[i+1]; - i++; - } else if( !strcmp( argv[i], "-n" ) ) { - nm = argv[i+1]; - i++; - } else { libstart = i; break; } - } - - snprintf( line, sizeof(line), "%s test 2>&1", make ); - make_f = popen( line, "r" ); - - if( !make_f ) { - fclose( out ); - fprintf( stderr, "Could not run %s test\n", make ); - return 1; - } - - while( fgets( line, sizeof(line), make_f ) ) { - char *end_of_location; - char *begin_q, *end_q; - - if( !strstr( line, "undefined reference to" ) ) continue; - - end_of_location = strrchr( line, ':' ); - - if( !end_of_location ) continue; - - begin_q = strchr( end_of_location, '`' ); - end_q = strchr( end_of_location, '\'' ); - - if( !begin_q || !end_q ) continue; - - begin_q += 2; /* skip `_ */ - - memmove( line, begin_q, end_q - begin_q ); - line[end_q - begin_q] = 0; - - for( new_f = functions; new_f; new_f = new_f->next ) - if( !strcmp( new_f->name, line ) ) break; - - if( new_f ) continue; - - new_f = (stub *)malloc( sizeof(stub) ); - if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;} - - new_f->name = strdup( line ); - new_f->next = functions; - functions = new_f; - } - - /* Scan libraries and collect available import sections */ - for( i = libstart; i < argc; i++ ) { - snprintf( line, sizeof(line), "%s %s", nm, argv[i] ); - nm_f = popen( line, "r" ); - - for( origin = argv[i]; *argv[i]; argv[i]++ ) - if( *argv[i] == '/' || *argv[i] == '\\' ) - origin = argv[i] + 1; - - - if( !nm_f ) { - fprintf( stderr, "Could not run %s\n", line ); - continue; + if( !out ) { + fprintf( stderr, "Could not write file tests/stubs.tst\n" ); + return 1; } - while( fgets( line, sizeof(line), nm_f ) ) { - char *import_sign, *eol; + fprintf( out, "# Automatically generated by stubgen\n" ); - if( !(import_sign = strstr( line, " I " )) ) continue; - - import_sign += 3; - while( *import_sign && isspace(*import_sign) ) import_sign++; - - /* Strip ws after name */ - for( eol = import_sign; *eol && !isspace(*eol); eol++ ); - - *eol = 0; - - for( new_f = imports; new_f; new_f = new_f->next ) - if( !strcmp( new_f->name, import_sign ) ) break; - - if( new_f ) continue; - - new_f = (stub *)malloc( sizeof(stub) ); - if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;} - - new_f->name = strdup( import_sign + 1 ); - new_f->origin = origin; - new_f->next = imports; - imports = new_f; + for( i = 1; i < argc; i++ ) { + if( !strcmp( argv[i], "-m" ) ) { + make = argv[i+1]; + i++; + } else if( !strcmp( argv[i], "-n" ) ) { + nm = argv[i+1]; + i++; + } else { libstart = i; break; } } - fclose( nm_f ); - } + snprintf( line, sizeof(line), "%s test 2>&1", make ); + make_f = popen( line, "r" ); - /* Now we have a list of unique functions and a list of imports, - lookup each function and output the entry from the import list. */ - for( new_f = functions; new_f; new_f = new_f->next ) { - for( search = imports; search; search = search->next ) { - if( !strcmp( new_f->name, search->name ) ) { - fprintf( out, "%s %s\n", search->origin, search->name ); - continue; - } + if( !make_f ) { + fclose( out ); + fprintf( stderr, "Could not run %s test\n", make ); + return 1; } - } - fclose( out ); + while( fgets( line, sizeof(line), make_f ) ) { + char *end_of_location; + char *begin_q, *end_q; - return 0; + if( !strstr( line, "undefined reference to" ) ) continue; + + end_of_location = strrchr( line, ':' ); + + if( !end_of_location ) continue; + + begin_q = strchr( end_of_location, '`' ); + end_q = strchr( end_of_location, '\'' ); + + if( !begin_q || !end_q ) continue; + + begin_q += 2; /* skip `_ */ + + memmove( line, begin_q, end_q - begin_q ); + line[end_q - begin_q] = 0; + + for( new_f = functions; new_f; new_f = new_f->next ) + if( !strcmp( new_f->name, line ) ) break; + + if( new_f ) continue; + + new_f = (stub *)malloc( sizeof(stub) ); + if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;} + + new_f->name = strdup( line ); + new_f->next = functions; + functions = new_f; + } + + /* Scan libraries and collect available import sections */ + for( i = libstart; i < argc; i++ ) { + snprintf( line, sizeof(line), "%s %s", nm, argv[i] ); + nm_f = popen( line, "r" ); + + for( origin = argv[i]; *argv[i]; argv[i]++ ) + if( *argv[i] == '/' || *argv[i] == '\\' ) + origin = argv[i] + 1; + + + if( !nm_f ) { + fprintf( stderr, "Could not run %s\n", line ); + continue; + } + + while( fgets( line, sizeof(line), nm_f ) ) { + char *import_sign, *eol; + + if( !(import_sign = strstr( line, " I " )) ) continue; + + import_sign += 3; + while( *import_sign && isspace(*import_sign) ) import_sign++; + + /* Strip ws after name */ + for( eol = import_sign; *eol && !isspace(*eol); eol++ ); + + *eol = 0; + + for( new_f = imports; new_f; new_f = new_f->next ) + if( !strcmp( new_f->name, import_sign ) ) break; + + if( new_f ) continue; + + new_f = (stub *)malloc( sizeof(stub) ); + if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;} + + new_f->name = strdup( import_sign + 1 ); + new_f->origin = origin; + new_f->next = imports; + imports = new_f; + } + + fclose( nm_f ); + } + + /* Now we have a list of unique functions and a list of imports, + lookup each function and output the entry from the import list. */ + for( new_f = functions; new_f; new_f = new_f->next ) { + for( search = imports; search; search = search->next ) { + if( !strcmp( new_f->name, search->name ) ) { + fprintf( out, "%s %s\n", search->origin, search->name ); + continue; + } + } + } + + fclose( out ); + + return 0; }

1 0

[cwittich] 29446: fix some memory leaks
by cwittich＠svn.reactos.org 07 Oct '07

07 Oct '07

Author: cwittich Date: Mon Oct 8 02:43:18 2007 New Revision: 29446 URL: http://svn.reactos.org/svn/reactos?rev=29446&view=rev Log: fix some memory leaks Modified: trunk/reactos/tools/buildno/buildno.cpp trunk/reactos/tools/xml.cpp Modified: trunk/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.cpp (original) +++ trunk/reactos/tools/buildno/buildno.cpp Mon Oct 8 02:43:18 2007 @@ -260,6 +260,7 @@ if (memcmp(s1, orig, length) == 0) { fclose(h); + free(s1); return; } } @@ -273,6 +274,7 @@ "%s: can not create file \"%s\"!\n", argv0, filename); + free(s1); return; } fwrite(s1, 1, strlen(s1), h); @@ -412,6 +414,8 @@ printf ("%s: no code generated", argv [0]); } + free(kernel_version_build_type); + return EXIT_SUCCESS; } Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=29446&r1… ============================================================================== --- trunk/reactos/tools/xml.cpp (original) +++ trunk/reactos/tools/xml.cpp Mon Oct 8 02:43:18 2007 @@ -860,6 +860,7 @@ if ( !f->open ( filename ) ) { + delete f; throw XMLFileNotFoundException ( "(virtual)", filename ); return NULL; } @@ -884,6 +885,7 @@ { string location = e->location; delete e; + delete f; throw XMLException ( location, "internal tool error: xi:include doesn't have a parent" ); return NULL; } @@ -899,6 +901,7 @@ { string location = e->location; delete e; + delete f; throw XMLException ( location, "internal tool error: couldn't find xi:include in parent's sub-elements" ); return NULL; } @@ -910,6 +913,7 @@ e->attributes.resize ( 0 ); delete e; } + delete f; return head; }

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