Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[royce] 12824: allow for other build systems
by royce＠svn.reactos.com 05 Jan '05

05 Jan '05

allow for other build systems Modified: branches/xmlbuildsystem/reactos/ReactOS.xml _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-05 18:16:55 UTC (rev 12823) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-05 18:48:45 UTC (rev 12824) @@ -1,4 +1,4 @@ -<project name="ReactOS" output="Makefile.auto"> +<project name="ReactOS" makefile="Makefile.auto"> <directory name="tools"> <module name="depends" type="buildtool"> <file>depends.c</file>

1 0

[royce] 12823: specify output filename
by royce＠svn.reactos.com 05 Jan '05

05 Jan '05

specify output filename Modified: branches/xmlbuildsystem/reactos/ReactOS.xml _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-05 18:13:56 UTC (rev 12822) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-05 18:16:55 UTC (rev 12823) @@ -1,4 +1,4 @@ -<project name="ReactOS"> +<project name="ReactOS" output="Makefile.auto"> <directory name="tools"> <module name="depends" type="buildtool"> <file>depends.c</file>

1 0

[royce] 12822: assume HOST is set to mingw32-windows until someone who knows how can have make fail when HOST isn't set
by royce＠svn.reactos.com 05 Jan '05

05 Jan '05

assume HOST is set to mingw32-windows until someone who knows how can have make fail when HOST isn't set Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-05 17:59:08 UTC (rev 12821) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-05 18:13:56 UTC (rev 12822) @@ -34,14 +34,16 @@ rbuild$(EXE_POSTFIX): $(OBJECTS) $(HOST_CXX) $(OBJECTS) $(HOST_LFLAGS) -o rbuild$(EXE_POSTFIX) +ifeq ($(HOST),"") +echo Please set HOST variable to mingw32-windows or mingw32-linux +endif ifeq ($(HOST),mingw32-linux) clean: -rm -f *.o -rm -f rbuild$(EXE_POSTFIX) -rm -f tests/*.o -rm -f rbuild_tests$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) +else clean: -del *.o -del rbuild$(EXE_POSTFIX)

1 0

[royce] 12821: small XMLFile cleanup
by royce＠svn.reactos.com 05 Jan '05

05 Jan '05

small XMLFile cleanup Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-05 15:16:10 UTC (rev 12820) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-05 17:59:08 UTC (rev 12821) @@ -191,11 +191,6 @@ void XMLFile::close() { - while ( _f.size() ) - { - fclose ( _f.back() ); - _f.pop_back(); - } _buf.resize(0); _p = _end = NULL; } @@ -210,9 +205,9 @@ unsigned long len = (unsigned long)filelen(f); _buf.resize ( len ); fread ( &_buf[0], 1, len, f ); + fclose ( f ); _p = _buf.c_str(); _end = _p + len; - _f.push_back ( f ); next_token(); return true; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-05 15:16:10 UTC (rev 12820) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-05 17:59:08 UTC (rev 12821) @@ -36,7 +36,6 @@ bool get_token(std::string& token); private: - std::vector<FILE*> _f; std::string _buf; const char *_p, *_end;

1 0

[ion] 12820: Remove ROS-specific File Object Flags
by ion＠svn.reactos.com 05 Jan '05

05 Jan '05

Remove ROS-specific File Object Flags Modified: trunk/reactos/drivers/fs/ntfs/fcb.c Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c _____ Modified: trunk/reactos/drivers/fs/ntfs/fcb.c --- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-01-05 08:16:00 UTC (rev 12819) +++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-01-05 15:16:10 UTC (rev 12820) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: fcb.c,v 1.12 2004/11/24 11:02:15 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -235,8 +235,6 @@ RtlZeroMemory(newCCB, sizeof(CCB)); - FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID | - FO_DIRECT_CACHE_PAGING_READ; FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; FileObject->FsContext = Fcb; FileObject->FsContext2 = newCCB; @@ -406,8 +404,6 @@ } memset(newCCB, 0, sizeof(CCB)); - FileObject->Flags = FileObject->Flags | FO_FCB_IS_VALID | - FO_DIRECT_CACHE_PAGING_READ; FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; FileObject->FsContext = Fcb; FileObject->FsContext2 = newCCB; _____ Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c --- trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-01-05 08:16:00 UTC (rev 12819) +++ trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-01-05 15:16:10 UTC (rev 12820) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: fsctl.c,v 1.11 2004/12/25 11:18:38 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -370,7 +370,6 @@ RtlZeroMemory(Ccb, sizeof(CCB)); - DeviceExt->StreamFileObject->Flags = DeviceExt->StreamFileObject->Flags | FO_FCB_IS_VALID | FO_DIRECT_CACHE_PAGING_READ; DeviceExt->StreamFileObject->FsContext = Fcb; DeviceExt->StreamFileObject->FsContext2 = Ccb; DeviceExt->StreamFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers;

1 0

[gvg] 12819: Neil Blackburn <neilb@iowatelecom.net>:
by gvg＠svn.reactos.com 05 Jan '05

05 Jan '05

Neil Blackburn <neilb(a)iowatelecom.net>: - Fixed a few spelling mistakes Modified: trunk/reactos/lib/cpl/access/access.rc _____ Modified: trunk/reactos/lib/cpl/access/access.rc --- trunk/reactos/lib/cpl/access/access.rc 2005-01-05 05:09:38 UTC (rev 12818) +++ trunk/reactos/lib/cpl/access/access.rc 2005-01-05 08:16:00 UTC (rev 12819) @@ -79,7 +79,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(5) - CHECKBOX "&Turn off accessbility features after idle for:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) + CHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2) //POPUP IDC_RESET_POPUP, GRAYED //{ @@ -112,5 +112,5 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" - IDS_CPLSYSTEMDESCRIPTION "Customizes accessbility features for your computer." + IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." END

1 0

[royce] 12818: pch.h can be used as pre-compiled header
by royce＠svn.reactos.com 05 Jan '05

05 Jan '05

pch.h can be used as pre-compiled header Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,8 +1,6 @@ // XML.cpp -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information -#endif//_MSC_VER +#include "pch.h" #include <direct.h> #include <io.h> @@ -51,6 +49,8 @@ Path::Path() { + if ( !working_directory.size() ) + InitWorkingDirectory(); string s ( working_directory ); const char* p = strtok ( &s[0], "/\\" ); while ( p ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,10 +1,9 @@ // XML.h -#ifndef __XML_H -#define __XML_H +#ifndef XML_H +#define XML_H -#include <string> -#include <vector> +#include "pch.h" void InitWorkingDirectory(); @@ -80,4 +79,4 @@ const Path& path, bool* pend_tag = NULL); -#endif//__XML_H +#endif//XML_H _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,7 +1,6 @@ -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information -#endif//_MSC_VER +#include "../pch.h" + #include "../Rbuild.h" #include "backend.h" _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,8 +1,6 @@ -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information -#endif//_MSC_VER -//#include <stdlib.h> // mingw proves it's insanity once again +#include "../../pch.h" + #include "mingw.h" MingwBackend::MingwBackend(Project& project) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,8 +1,6 @@ -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information -#endif//_MSC_VER -#include <stdarg.h> +#include "pch.h" + #include "rbuild.h" using std::string; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,7 +1,7 @@ #ifndef __EXCEPTION_H #define __EXCEPTION_H -#include <string> +#include "pch.h" class Exception { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,8 +1,6 @@ // module.cpp -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information -#endif//_MSC_VER +#include "pch.h" #include "rbuild.h" _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h --- branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-01-05 05:09:38 UTC (rev 12818) @@ -0,0 +1,15 @@ +// pre-compiled header stuff + +#ifndef PCH_H +#define PCH_H + +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information +#endif//_MSC_VER + +#include <string> +#include <vector> + +#include <stdarg.h> + +#endif//PCH_H _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,7 +1,6 @@ -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information -#endif//_MSC_VER +#include "pch.h" + #include "rbuild.h" using std::string; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,12 +1,11 @@ // rbuild.cpp -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information -#endif//_MSC_VER +#include "pch.h" #include <stdio.h> #include <io.h> #include <assert.h> + #include "rbuild.h" using std::string; @@ -15,8 +14,6 @@ int main ( int argc, char** argv ) { - InitWorkingDirectory(); - try { string projectFilename ( "ReactOS.xml" ); @@ -31,7 +28,8 @@ printf ( "\t%s in folder: %s\n", m.name.c_str(), m.path.c_str() ); - printf ( "\txml dependencies:\n\t\tReactOS.xml\n" ); + printf ( "\txml dependencies:\n\t\t%s\n", + projectFilename.c_str() ); const XMLElement* e = &m.node; while ( e ) { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,8 +1,8 @@ #ifndef __RBUILD_H #define __RBUILD_H -#include <string> -#include <vector> +#include "pch.h" + #include "ssprintf.h" #include "exception.h" #include "XML.h" _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-05 04:16:23 UTC (rev 12817) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-05 05:09:38 UTC (rev 12818) @@ -1,4 +1,6 @@ -#include <stdarg.h> + +#include "pch.h" + #include "rbuild.h" #include "test.h"

1 0

[sedwards] 12817: Make NtUserSetClipboardViewer return something that applications can deal with. This makes the vncviewer qusi-work.
by sedwards＠svn.reactos.com 05 Jan '05

05 Jan '05

Make NtUserSetClipboardViewer return something that applications can deal with. This makes the vncviewer qusi-work. Modified: trunk/reactos/subsys/win32k/ntuser/clipboard.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/clipboard.c --- trunk/reactos/subsys/win32k/ntuser/clipboard.c 2005-01-05 03:47:55 UTC (rev 12816) +++ trunk/reactos/subsys/win32k/ntuser/clipboard.c 2005-01-05 04:16:23 UTC (rev 12817) @@ -308,8 +308,9 @@ HWND STDCALL NtUserSetClipboardViewer(HWND hWndNewViewer) { - UNIMPLEMENTED - return 0; + HWND hwndPrev = 0; + DbgPrint("NtUserSetClipboardViewer is UNIMPLEMENTED (%p): returning %p\n", hWndNewViewer, hwndPrev); + return hwndPrev; } /* EOF */

1 0

[royce] 12816: handle comments while parsing, instead of returning them to the user
by royce＠svn.reactos.com 05 Jan '05

05 Jan '05

handle comments while parsing, instead of returning them to the user Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-05 02:57:58 UTC (rev 12815) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-05 03:47:55 UTC (rev 12816) @@ -445,9 +445,10 @@ return NULL; bool end_tag; - while ( token[0] != '<' ) + while ( token[0] != '<' || !strncmp ( token.c_str(), "<!--", 4 ) ) { - printf ( "syntax error: expecting xml tag, not '%s'\n", token.c_str() ); + if ( token[0] != '<' ) + printf ( "syntax error: expecting xml tag, not '%s'\n", token.c_str() ); if ( !f.get_token(token) ) return NULL; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-05 02:57:58 UTC (rev 12815) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-05 03:47:55 UTC (rev 12816) @@ -34,9 +34,6 @@ if ( !head ) throw InvalidBuildFileException ( "Document contains no 'project' tag." ); - if ( head->name == "!--" ) - continue; // ignore comments - if ( head->name != "project" ) { throw InvalidBuildFileException ( "Expected 'project', got '%s'.",

1 0

[royce] 12815: don't define macros that conflict with MinGW system header files, causes very cryptic error messages
by royce＠svn.reactos.com 05 Jan '05

05 Jan '05

don't define macros that conflict with MinGW system header files, causes very cryptic error messages Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp 2005-01-05 02:57:58 UTC (rev 12815) @@ -2,8 +2,9 @@ #pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information #endif//_MSC_VER +#include "../Rbuild.h" #include "backend.h" -Backend::Backend() +Backend::Backend ( Project& project ) : ProjectNode(project) { } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h 2005-01-05 02:57:58 UTC (rev 12815) @@ -6,9 +6,9 @@ class Backend { public: - Backend(); + Backend ( Project& ); protected: - Project ProjectNode; + Project& ProjectNode; }; #endif /* __BACKEND_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-05 02:57:58 UTC (rev 12815) @@ -1,11 +1,11 @@ #ifdef _MSC_VER #pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information #endif//_MSC_VER -#if 0 + +//#include <stdlib.h> // mingw proves it's insanity once again #include "mingw.h" -MingwBackend::MingwBackend(Project project) - : ProjectNode(project) +MingwBackend::MingwBackend(Project& project) + : Backend(project) { } -#endif _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-05 02:57:58 UTC (rev 12815) @@ -1,12 +1,12 @@ -#ifndef __MINGW_H -#define __MINGW_H -#if 0 -#include "backend.h" +#ifndef MINGW_H +#define MINGW_H +#include "../backend.h" + class MingwBackend : public Backend { public: - MingwBackend(); + MingwBackend ( Project& ); }; -#endif -#endif /* __MINGW_H */ + +#endif /* MINGW_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-01-05 02:57:58 UTC (rev 12815) @@ -5,11 +5,13 @@ #include <stdarg.h> #include "rbuild.h" +using std::string; + Exception::Exception() { } -Exception::Exception(string message) +Exception::Exception(const string& message) { Message = message; } @@ -33,7 +35,7 @@ } -FileNotFoundException::FileNotFoundException(string filename) +FileNotFoundException::FileNotFoundException(const string& filename) : Exception ( "File '%s' not found.", filename.c_str() ) { Filename = filename; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.h 2005-01-05 02:57:58 UTC (rev 12815) @@ -3,15 +3,13 @@ #include <string> -using std::string; - class Exception { public: - Exception(string message); + Exception(const std::string& message); Exception(const char* format, ...); - string Message; + std::string Message; protected: Exception(); void SetMessage(const char* message, @@ -22,8 +20,8 @@ class FileNotFoundException : public Exception { public: - FileNotFoundException(string filename); - string Filename; + FileNotFoundException(const std::string& filename); + std::string Filename; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-05 02:57:58 UTC (rev 12815) @@ -11,7 +11,7 @@ { } -Project::Project(string filename) +Project::Project(const string& filename) { if ( !xmlfile.open ( filename ) ) throw FileNotFoundException ( filename ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-05 02:57:58 UTC (rev 12815) @@ -18,7 +18,7 @@ std::vector<Module*> modules; Project (); - Project ( string filename ); + Project ( const std::string& filename ); ~Project (); void ProcessXML ( const XMLElement& e, const std::string& path ); private: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-05 02:57:58 UTC (rev 12815) @@ -22,14 +22,10 @@ int actual, const char* file, int line); - void AreEqual(string expected, - string actual, + void AreEqual(const std::string& expected, + const std::string& actual, const char* file, int line); - void AreEqual(const char* expected, - string actual, - const char* file, - int line); void AreNotEqual(int expected, int actual, const char* file, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-05 02:57:58 UTC (rev 12815) @@ -61,8 +61,8 @@ } } -void BaseTest::AreEqual(string expected, - string actual, +void BaseTest::AreEqual(const std::string& expected, + const std::string& actual, const char* file, int line) { @@ -76,17 +76,6 @@ } } -void BaseTest::AreEqual(const char* expected, - string actual, - const char* file, - int line) -{ - AreEqual(string(expected), - actual, - file, - line); -} - void BaseTest::AreNotEqual(int expected, int actual, const char* file, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-05 02:57:58 UTC (rev 12815) @@ -1,5 +1,7 @@ #include "test.h" +using std::string; + void ModuleTest::Run() { string projectFilename ( "tests/data/module.xml" ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp 2005-01-05 02:50:50 UTC (rev 12814) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp 2005-01-05 02:57:58 UTC (rev 12815) @@ -1,5 +1,7 @@ #include "test.h" +using std::string; + void ProjectTest::Run() { string projectFilename ( "tests/data/project.xml" );

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005