Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[turner] 19412: don't skip whitespace in echo command. patch by irc:ravelo. bug #1042.

by turner＠svn.reactos.com

don't skip whitespace in echo command. patch by irc:ravelo. bug #1042. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-21 18:02:28 UTC (rev 19411) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-21 18:10:55 UTC (rev 19412) @@ -597,9 +597,12 @@ } */ - /* Skip over whitespace to rest of line */ - while (_istspace (*rest)) + /* Skip over whitespace to rest of line, exclude 'echo' command */ + if (_tcsicmp (com, _T("echo"))) + { + while (_istspace (*rest)) rest++; + } /* Scan internal command table */ for (cmdptr = cmds;; cmdptr++)

18 years, 10 months

[chorns] 19411: Parse <compilationunit>

by chorns＠svn.reactos.com

Parse <compilationunit> Added: trunk/reactos/tools/rbuild/compilationunit.cpp Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt Added: trunk/reactos/tools/rbuild/global.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/test.h Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp Added: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Added: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml Modified: trunk/reactos/tools/tools.mak _____ Added: trunk/reactos/tools/rbuild/compilationunit.cpp --- trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/compilationunit.cpp 2005-11-21 18:02:28 UTC (rev 19411) @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; +using std::vector; + +CompilationUnit::CompilationUnit ( const Project& project, + const Module* module, + const XMLElement& node ) + : project(project), + module(module), + node(node) +{ +} + +CompilationUnit::~CompilationUnit () +{ +} + +void +CompilationUnit::ProcessXML () +{ +} Property changes on: trunk/reactos/tools/rbuild/compilationunit.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt --- trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/doc/rbuild.txt 2005-11-21 18:02:28 UTC (rev 19411) @@ -129,7 +129,7 @@ None. Elements: - bootstrap, component, define, dependency, directory, file, if, importlibrary, include, invoke, library, linkerscript, property. + bootstrap, component, compilationunit, define, dependency, directory, file, if, importlibrary, include, invoke, library, linkerscript, property. Module types @@ -190,6 +190,25 @@ None. +CompilationUnit element +----------------------- +A compilationunit element specifies that one or more source code files are to be compiled as a single compilation unit. + +Syntax: + <compilationunit> + ... + </compilationunit> + +Attributes: + None. + +Value: + None. + +Elements: + directory, file, if. + + Component element ----------------- A component element specifies that imports from a library are to be stubbed so tests can be run without actually calling the functions in the library. This element can only be used for modules of type test. @@ -313,7 +332,7 @@ None. Elements: - compilerflag, define, directory, file, if, include, property. + compilationunit, compilerflag, define, directory, file, if, include, property. Importlibrary element _____ Added: trunk/reactos/tools/rbuild/global.cpp --- trunk/reactos/tools/rbuild/global.cpp 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/global.cpp 2005-11-21 18:02:28 UTC (rev 19411) @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "rbuild.h" + +using std::string; +using std::vector; + +string ExePrefix; +string ExePostfix; +string sSep; +string sBadSep; +char cSep; +char cBadSep; + + +VOID +InitializeEnvironment () +{ + char *SepValue, *ExePostfixValue, *ExePrefixValue;; + + SepValue = getenv ( "SEP" ); + if ( SepValue && ( 0 == strcmp ( SepValue, DEF_SSEP ) || 0 == strcmp ( SepValue, DEF_SBAD_SEP ) ) ) + { + cSep = SepValue[0]; + sSep = SepValue; + } + else + { + cSep = DEF_CSEP; + sSep = DEF_SSEP; + } + if ( cSep == DEF_CSEP ) + { + cBadSep = DEF_CBAD_SEP; + sBadSep = DEF_SBAD_SEP; + } + else + { + cBadSep = DEF_CSEP; + sBadSep = DEF_SSEP; + } + ExePostfixValue = getenv ( "EXEPOSTFIX" ); + ExePrefixValue = getenv ( "EXEPREFIX" ); + if ( ( ExePostfixValue == NULL || 0 == strlen ( ExePostfixValue ) ) && + ( ExePrefixValue == NULL || 0 == strlen ( ExePrefixValue ) ) ) + { + ExePostfix = DEF_EXEPOSTFIX; + ExePrefix = DEF_EXEPREFIX; + } + else + { + ExePostfix = ExePostfixValue ? ExePostfixValue : ""; + ExePrefix = ExePrefixValue ? ExePrefixValue : ""; + } +} Property changes on: trunk/reactos/tools/rbuild/global.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-21 18:02:28 UTC (rev 19411) @@ -182,20 +182,22 @@ IfableData::~IfableData() { size_t i; - for ( i = 0; i < files.size(); i++ ) + for ( i = 0; i < files.size (); i++ ) delete files[i]; - for ( i = 0; i < includes.size(); i++ ) + for ( i = 0; i < includes.size (); i++ ) delete includes[i]; - for ( i = 0; i < defines.size(); i++ ) + for ( i = 0; i < defines.size (); i++ ) delete defines[i]; - for ( i = 0; i < libraries.size(); i++ ) + for ( i = 0; i < libraries.size (); i++ ) delete libraries[i]; - for ( i = 0; i < properties.size(); i++ ) + for ( i = 0; i < properties.size (); i++ ) delete properties[i]; - for ( i = 0; i < compilerFlags.size(); i++ ) + for ( i = 0; i < compilerFlags.size (); i++ ) delete compilerFlags[i]; - for ( i = 0; i < ifs.size(); i++ ) + for ( i = 0; i < ifs.size (); i++ ) delete ifs[i]; + for ( i = 0; i < compilationUnits.size (); i++ ) + delete compilationUnits[i]; } void IfableData::ProcessXML () @@ -215,6 +217,8 @@ compilerFlags[i]->ProcessXML (); for ( i = 0; i < ifs.size (); i++ ) ifs[i]->ProcessXML (); + for ( i = 0; i < compilationUnits.size (); i++ ) + compilationUnits[i]->ProcessXML (); } Module::Module ( const Project& project, @@ -413,7 +417,10 @@ size_t i; for ( i = 0; i < node.subElements.size(); i++ ) - ProcessXMLSubElement ( *node.subElements[i], path ); + { + ParseContext parseContext; + ProcessXMLSubElement ( *node.subElements[i], path, parseContext ); + } for ( i = 0; i < invocations.size(); i++ ) invocations[i]->ProcessXML (); for ( i = 0; i < dependencies.size(); i++ ) @@ -434,7 +441,7 @@ void Module::ProcessXMLSubElement ( const XMLElement& e, const string& path, - If* pIf /*= NULL*/ ) + ParseContext& parseContext ) { bool subs_invalid = false; string subpath ( path ); @@ -470,17 +477,19 @@ first, switches, false ); - if ( pIf ) - pIf->data.files.push_back ( pFile ); + if ( parseContext.ifData ) + parseContext.ifData->data.files.push_back ( pFile ); else non_if_data.files.push_back ( pFile ); + if ( parseContext.compilationUnit ) + parseContext.compilationUnit->files.push_back ( pFile ); subs_invalid = true; } else if ( e.name == "library" && e.value.size () ) { Library* pLibrary = new Library ( e, *this, e.value ); - if ( pIf ) - pIf->data.libraries.push_back ( pLibrary ); + if ( parseContext.ifData ) + parseContext.ifData->data.libraries.push_back ( pLibrary ); else non_if_data.libraries.push_back ( pLibrary ); subs_invalid = true; @@ -494,8 +503,8 @@ else if ( e.name == "include" ) { Include* include = new Include ( project, this, &e ); - if ( pIf ) - pIf->data.includes.push_back ( include ); + if ( parseContext.ifData ) + parseContext.ifData->data.includes.push_back ( include ); else non_if_data.includes.push_back ( include ); subs_invalid = true; @@ -503,15 +512,15 @@ else if ( e.name == "define" ) { Define* pDefine = new Define ( project, this, e ); - if ( pIf ) - pIf->data.defines.push_back ( pDefine ); + if ( parseContext.ifData ) + parseContext.ifData->data.defines.push_back ( pDefine ); else non_if_data.defines.push_back ( pDefine ); subs_invalid = true; } else if ( e.name == "invoke" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<invoke> is not a valid sub-element of <if>" ); @@ -520,7 +529,7 @@ } else if ( e.name == "dependency" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<dependency> is not a valid sub-element of <if>" ); @@ -529,7 +538,7 @@ } else if ( e.name == "importlibrary" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<importlibrary> is not a valid sub-element of <if>" ); @@ -542,29 +551,29 @@ } else if ( e.name == "if" ) { - If* pOldIf = pIf; - pIf = new If ( e, project, this ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, project, this ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "ifnot" ) { - If* pOldIf = pIf; - pIf = new If ( e, project, this, true ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, project, this, true ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( project, this, e ); - if ( pIf ) - pIf->data.compilerFlags.push_back ( pCompilerFlag ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); else non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; @@ -601,7 +610,7 @@ } else if ( e.name == "pch" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<pch> is not a valid sub-element of <if>" ); @@ -613,13 +622,23 @@ e, *this, File ( FixSeparator ( path + cSep + e.value ), false, "", true ) ); subs_invalid = true; } + else if ( e.name == "compilationunit" ) + { + CompilationUnit* pCompilationUnit = new CompilationUnit ( project, this, e ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + parseContext.compilationUnit = pCompilationUnit; + subs_invalid = false; + } if ( subs_invalid && e.subElements.size() > 0 ) throw InvalidBuildFileException ( e.location, "<%s> cannot have sub-elements", e.name.c_str() ); for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, pIf ); + ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); } ModuleType _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-21 18:02:28 UTC (rev 19411) @@ -66,6 +66,11 @@ "reactos" ); } +ParseContext::ParseContext () + : ifData (NULL), + compilationUnit (NULL) +{ +} Project::Project ( const string& filename ) : xmlfile (filename), @@ -254,7 +259,10 @@ size_t i; for ( i = 0; i < node->subElements.size (); i++ ) - ProcessXMLSubElement ( *node->subElements[i], path ); + { + ParseContext parseContext; + ProcessXMLSubElement ( *node->subElements[i], path, parseContext ); + } for ( i = 0; i < modules.size (); i++ ) modules[i]->ProcessXML (); for ( i = 0; i < linkerFlags.size (); i++ ) @@ -269,13 +277,13 @@ void Project::ProcessXMLSubElement ( const XMLElement& e, const string& path, - If* pIf ) + ParseContext& parseContext ) { bool subs_invalid = false; string subpath(path); if ( e.name == "module" ) { - if ( pIf ) + if ( parseContext.ifData ) throw InvalidBuildFileException ( e.location, "<module> is not a valid sub-element of <if>" ); @@ -310,8 +318,8 @@ else if ( e.name == "include" ) { Include* include = new Include ( *this, &e ); - if ( pIf ) - pIf->data.includes.push_back ( include ); + if ( parseContext.ifData ) + parseContext.ifData->data.includes.push_back ( include ); else non_if_data.includes.push_back ( include ); subs_invalid = true; @@ -319,8 +327,8 @@ else if ( e.name == "define" ) { Define* define = new Define ( *this, e ); - if ( pIf ) - pIf->data.defines.push_back ( define ); + if ( parseContext.ifData ) + parseContext.ifData->data.defines.push_back ( define ); else non_if_data.defines.push_back ( define ); subs_invalid = true; @@ -328,8 +336,8 @@ else if ( e.name == "compilerflag" ) { CompilerFlag* pCompilerFlag = new CompilerFlag ( *this, e ); - if ( pIf ) - pIf->data.compilerFlags.push_back ( pCompilerFlag ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilerFlags.push_back ( pCompilerFlag ); else non_if_data.compilerFlags.push_back ( pCompilerFlag ); subs_invalid = true; @@ -341,29 +349,29 @@ } else if ( e.name == "if" ) { - If* pOldIf = pIf; - pIf = new If ( e, *this, NULL ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, *this, NULL ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "ifnot" ) { - If* pOldIf = pIf; - pIf = new If ( e, *this, NULL, true ); + If* pOldIf = parseContext.ifData; + parseContext.ifData = new If ( e, *this, NULL, true ); if ( pOldIf ) - pOldIf->data.ifs.push_back ( pIf ); + pOldIf->data.ifs.push_back ( parseContext.ifData ); else - non_if_data.ifs.push_back ( pIf ); + non_if_data.ifs.push_back ( parseContext.ifData ); subs_invalid = false; } else if ( e.name == "property" ) { Property* property = new Property ( e, *this, NULL ); - if ( pIf ) - pIf->data.properties.push_back ( property ); + if ( parseContext.ifData ) + parseContext.ifData->data.properties.push_back ( property ); else non_if_data.properties.push_back ( property ); } @@ -373,7 +381,7 @@ "<%s> cannot have sub-elements", e.name.c_str() ); for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, pIf ); + ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); } Module* @@ -405,5 +413,3 @@ { return xmlfile; } - - _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-21 18:02:28 UTC (rev 19411) @@ -35,13 +35,6 @@ static string RootXmlFile = "ReactOS.xml"; static Configuration configuration; -string ExePrefix; -string ExePostfix; -string sSep; -string sBadSep; -char cSep; -char cBadSep; - bool ParseAutomaticDependencySwitch ( char switchChar2, char* switchStart ) @@ -193,43 +186,8 @@ int main ( int argc, char** argv ) { - char *SepValue, *ExePostfixValue, *ExePrefixValue;; + InitializeEnvironment (); - SepValue = getenv("SEP"); - if (SepValue && (0 == strcmp(SepValue, DEF_SSEP) || 0 == strcmp(SepValue, DEF_SBAD_SEP))) - { - cSep = SepValue[0]; - sSep = SepValue; - } - else - { - cSep = DEF_CSEP; - sSep = DEF_SSEP; - } - if (cSep == DEF_CSEP) - { - cBadSep = DEF_CBAD_SEP; - sBadSep = DEF_SBAD_SEP; - } - else - { - cBadSep = DEF_CSEP; - sBadSep = DEF_SSEP; - } - ExePostfixValue = getenv("EXEPOSTFIX"); - ExePrefixValue = getenv("EXEPREFIX"); - if ((ExePostfixValue == NULL || 0 == strlen(ExePostfixValue)) && - (ExePrefixValue == NULL || 0 == strlen(ExePrefixValue))) - { - ExePostfix = DEF_EXEPOSTFIX; - ExePrefix = DEF_EXEPREFIX; - } - else - { - ExePostfix = ExePostfixValue ? ExePostfixValue : ""; - ExePrefix = ExePrefixValue ? ExePrefixValue : ""; - } - if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-21 18:02:28 UTC (rev 19411) @@ -91,6 +91,7 @@ class PchFile; class StubbedComponent; class StubbedSymbol; +class CompilationUnit; class SourceFileTest; @@ -121,6 +122,7 @@ const std::string& defaultValue ); }; + class FileSupportCode { public: @@ -128,9 +130,20 @@ std::string filename ); }; + +class ParseContext +{ +public: + If* ifData; + CompilationUnit* compilationUnit; + ParseContext (); +}; + + class IfableData { public: + std::vector<CompilationUnit*> compilationUnits; std::vector<File*> files; std::vector<Include*> includes; std::vector<Define*> defines; @@ -177,7 +190,7 @@ void ReadXml (); void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, - If* pIf = NULL ); + ParseContext& parseContext ); // disable copy semantics Project ( const Project& ); @@ -277,7 +290,7 @@ std::string GetDefaultModuleBaseaddress () const; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, - If* pIf = NULL ); + ParseContext& parseContext ); }; @@ -771,6 +784,26 @@ std::string StripSymbol ( std::string symbol ); }; + +class CompilationUnit +{ +public: + const Project& project; + const Module* module; + const XMLElement& node; + std::vector<File*> files; + + CompilationUnit ( const Project& project, + const Module* module, + const XMLElement& node ); + ~CompilationUnit (); + void ProcessXML(); +}; + + +extern VOID +InitializeEnvironment (); + extern std::string Right ( const std::string& s, size_t n ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-11-21 18:02:28 UTC (rev 19411) @@ -152,9 +152,11 @@ RBUILD_COMMON_SOURCES = \ $(RBUILD_BACKEND_SOURCES) \ $(addprefix $(RBUILD_BASE_), \ + global.cpp \ automaticdependency.cpp \ bootstrap.cpp \ cdfile.cpp \ + compilationunit.cpp \ compilerflag.cpp \ configuration.cpp \ define.cpp \ @@ -219,6 +221,7 @@ RBUILD_TESTS = \ tests$(SEP)cdfiletest.cpp \ + tests$(SEP)compilationunittest.cpp \ tests$(SEP)definetest.cpp \ tests$(SEP)functiontest.cpp \ tests$(SEP)iftest.cpp \ @@ -256,6 +259,10 @@ $(ECHO_LD) ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@ +$(RBUILD_INT_)global.o: $(RBUILD_BASE_)global.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -268,6 +275,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)compilationunit.o: $(RBUILD_BASE_)compilationunit.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ @@ -380,6 +391,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_TESTS_INT_)compilationunittest.o: $(RBUILD_TESTS_BASE_)compilationunittest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ _____ Modified: trunk/reactos/tools/rbuild/test.h --- trunk/reactos/tools/rbuild/test.h 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/test.h 2005-11-21 18:02:28 UTC (rev 19411) @@ -21,6 +21,8 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" +#define SSEP DEF_SSEP + #define RBUILD_BASE "tools" SSEP "rbuild" SSEP class BaseTest @@ -153,4 +155,10 @@ void Run (); }; +class CompilationUnitTest : public BaseTest +{ +public: + void Run (); +}; + #endif /* __TEST_H */ _____ Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp --- trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-11-21 18:02:28 UTC (rev 19411) @@ -196,6 +196,7 @@ tests.push_back(new SourceFileTest()); tests.push_back(new CDFileTest()); tests.push_back(new SymbolTest()); + tests.push_back(new CompilationUnitTest()); } }; @@ -203,6 +204,7 @@ int main(int argc, char** argv) { + InitializeEnvironment (); TestDispatcher testDispatcher; testDispatcher.Run(); return 0; _____ Added: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp --- trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-21 18:02:28 UTC (rev 19411) @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "test.h" + +using std::string; + +void CompilationUnitTest::Run() +{ + string projectFilename ( RBUILD_BASE "tests/data/compilationunit.xml" ); + Project project ( projectFilename ); + ARE_EQUAL ( 1, project.modules.size () ); + + Module& module1 = *project.modules[0]; + IS_TRUE ( module1.type == BuildTool ); + + ARE_EQUAL ( 2, module1.non_if_data.files.size()); + ARE_EQUAL ( 1, module1.non_if_data.compilationUnits.size () ); + + CompilationUnit& compilationUnit1 = *module1.non_if_data.compilationUnits[0]; + ARE_EQUAL ( 2, compilationUnit1.files.size () ); +} Property changes on: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml --- trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-21 18:02:28 UTC (rev 19411) @@ -0,0 +1,11 @@ +<?xml version="1.0" ?> +<project name="Project" makefile="Makefile"> + <directory name="dir1"> + <module name="module1" type="buildtool"> + <compilationunit> + <file>file1.c</file> + <file>file2.c</file> + </compilationunit> + </module> + </directory> +</project> Property changes on: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2005-11-21 17:53:11 UTC (rev 19410) +++ trunk/reactos/tools/tools.mak 2005-11-21 18:02:28 UTC (rev 19411) @@ -5,9 +5,9 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = -Wall -Wpointer-arith -TOOLS_LFLAGS = +TOOLS_CFLAGS = $(CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing +TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith +TOOLS_LFLAGS = $(LFLAGS) $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

18 years, 10 months

[turner] 19410: update todo with things i have finished.

by turner＠svn.reactos.com

update todo with things i have finished. Modified: trunk/reactos/subsys/system/cmd/todo.txt _____ Modified: trunk/reactos/subsys/system/cmd/todo.txt --- trunk/reactos/subsys/system/cmd/todo.txt 2005-11-21 17:50:05 UTC (rev 19409) +++ trunk/reactos/subsys/system/cmd/todo.txt 2005-11-21 17:53:11 UTC (rev 19410) @@ -20,14 +20,5 @@ && runs the 2nd command only if the first was a success Not sure where to put this code even -*mkdir needs recurvisly create folders -When doing "mkdir c:\windows\foo\bar\foofoo" where foo, bar, and foofoo are not folders, it will create all the folders to that a vaild path - -*Correct Error checking -A lot of commands on failure just spit out GetLastError instead of looking for the real cause. It should give a better output to give at least some kinda clue what is wrong. - *Reg Testing -We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. - -*Add Breaker -THere is partly code in place for this already. However it is broken and not finished. PocketCMD which is open source and based off ros cmd does do this correctly though. So there is something to look at and see how it can be done. though it is hard to find where they are doing it even though they are based on eachother they look pretty different now a days. \ No newline at end of file +We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. \ No newline at end of file

18 years, 10 months

[turner] 19409: Make all directories in a path that do not already exist. Code in MakeFullPath() based on WINE code.

by turner＠svn.reactos.com

Make all directories in a path that do not already exist. Code in MakeFullPath() based on WINE code. Modified: trunk/reactos/subsys/system/cmd/internal.c _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-11-21 17:44:57 UTC (rev 19408) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-11-21 17:50:05 UTC (rev 19409) @@ -423,6 +423,36 @@ #ifdef INCLUDE_CMD_MKDIR + +/* Helper funtion for mkdir to make directories in a path. +Dont use the api to decrease depence on libs */ +BOOL +MakeFullPath(TCHAR * DirPath) +{ + TCHAR path[MAX_PATH]; + TCHAR *p = DirPath; + INT n; + + if (p[0] && p[1] == _T(':')) + p += 2; + while (*p == _T('\\')) + p++; /* skip drive root */ + while ((p = _tcschr(p, _T('\\'))) != NULL) + { + n = p - DirPath + 1; + memcpy(path, DirPath, n); + path[n] = _T('\0'); + if( !CreateDirectory(path, NULL) && + (GetLastError() != ERROR_ALREADY_EXISTS)) + return FALSE; + p++; + } + if (GetLastError() == ERROR_ALREADY_EXISTS) + SetLastError(ERROR_SUCCESS); + + return TRUE; +} + /* * MD / MKDIR * @@ -478,28 +508,24 @@ return 1; } - /* remove trailing \ if any, but ONLY if dir is not the root dir */ - if (_tcslen (dir) >= 2 && dir[_tcslen (dir) - 1] == _T('\\')) - dir[_tcslen(dir) - 1] = _T('\0'); + /* Add a \ at the end of the path is there isnt on already */ + if (dir[_tcslen (dir) - 1] != _T('\\')) + _tcscat(dir,_T("\\")); - if (!CreateDirectory (dir, NULL)) - { - if(GetLastError() == ERROR_ALREADY_EXISTS) - { - ConErrResPuts(STRING_MD_ERROR); - } - else if(GetLastError() == ERROR_PATH_NOT_FOUND) - { - ConErrResPuts(STRING_MD_ERROR2); - } - else - { - ErrorMessage (GetLastError(), _T("MD")); - } - nErrorLevel = 1; - freep (p); - return 1; - } + if (!MakeFullPath(dir)) + { + if(GetLastError() == ERROR_PATH_NOT_FOUND) + { + ConErrResPuts(STRING_MD_ERROR2); + } + else + { + ErrorMessage (GetLastError(), _T("MD")); + } + nErrorLevel = 1; + freep (p); + return 1; + } freep (p);

18 years, 10 months

[greatlrd] 19408: implement some part of waveopen

by greatlrd＠svn.reactos.com

implement some part of waveopen Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 13:46:20 UTC (rev 19407) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 17:44:57 UTC (rev 19408) @@ -17,6 +17,8 @@ #define NDEBUG #include <debug.h> +PWAVEALLOC WaveLists; + /* ============================ * INTERNAL * functions start here @@ -61,9 +63,6 @@ &BytesReturned, NULL) ? MMSYSERR_NOERROR : TranslateStatus(); } - - - // Close the handle and return the result code CloseHandle(DeviceHandle); @@ -78,17 +77,141 @@ { // TODO: Implement PWAVEALLOC pClient = (PWAVEALLOC)dwUser; - //MMRESULT mResult; - //BOOL Result; - //DWORD BytesReturned; + MMRESULT mResult; + BOOL Result; + DWORD BytesReturned; LPWAVEFORMATEX pFormats; + PWAVEALLOC *pUserHandle; + HANDLE hDevice; pFormats = (LPWAVEFORMATEX)((LPWAVEOPENDESC)dwParam1)->lpFormat; + if (dwParam2 & WAVE_FORMAT_QUERY) + { + mResult = OpenDevice(DeviceType, id, &hDevice, GENERIC_READ); + if (mResult != MMSYSERR_NOERROR) + return mResult; + + Result = DeviceIoControl(hDevice, IOCTL_WAVE_QUERY_FORMAT, (PVOID)pFormats, + pFormats->wFormatTag == WAVE_FORMAT_PCM ? + sizeof(PCMWAVEFORMAT) : sizeof(WAVEFORMATEX) + pFormats->cbSize, + NULL, 0, &BytesReturned, NULL); + CloseHandle(hDevice); + return Result ? MMSYSERR_NOERROR : GetLastError() == ERROR_NOT_SUPPORTED ? WAVERR_BADFORMAT : TranslateStatus(); + } + EnterCriticalSection(&CS); + + for (pClient = WaveLists; pClient != NULL; pClient = pClient->Next) + { + if (pClient->DeviceNumber == id && pClient->DeviceType == DeviceType) + { + if (pClient->hDev != INVALID_HANDLE_VALUE) + { + LeaveCriticalSection(&CS); + return MMSYSERR_ALLOCATED; + } + break; + } + } + + if (pClient == NULL) + { + pClient = (PWAVEALLOC)HeapAlloc(Heap, HEAP_ZERO_MEMORY, sizeof(WAVEALLOC)); + if (pClient == NULL) + { + LeaveCriticalSection(&CS); + return MMSYSERR_NOMEM; + } + + pClient->DeviceNumber = id; + pClient->Next = WaveLists; + pClient->DeviceType = DeviceType; + + WaveLists = pClient; + } + + pClient->hWave = ((LPWAVEOPENDESC)dwParam1)->hWave; + pClient->dwInstance = ((LPWAVEOPENDESC)dwParam1)->dwInstance; + pClient->dwFlags = dwParam2; + pClient->dwCallback = ((LPWAVEOPENDESC)dwParam1)->dwCallback; + pClient->hDev = INVALID_HANDLE_VALUE; + pClient->NextBuffer = NULL; + pClient->DeviceQueue = NULL; + pClient->LoopHead = NULL; + pClient->LoopCount = 0; + pClient->BytesOutstanding = 0; + pClient->BufferPosition = 0; - mmTaskCreate((LPTASKCALLBACK)waveThread, &pClient->ThreadHandle, (DWORD)pClient); + + + mResult = OpenDevice(DeviceType, id, &pClient->hDev, (GENERIC_READ | GENERIC_WRITE)); + + if (mResult != MMSYSERR_NOERROR) + { + LeaveCriticalSection(&CS); + return mResult; + } + + if (!DeviceIoControl(pClient->hDev,IOCTL_WAVE_SET_FORMAT, (PVOID)pFormats, + pFormats->wFormatTag == WAVE_FORMAT_PCM ? + sizeof(PCMWAVEFORMAT) : sizeof(WAVEFORMATEX) + pFormats->cbSize, + NULL, 0, &BytesReturned, NULL)) + { + CloseHandle(pClient->hDev); + pClient->hDev = INVALID_HANDLE_VALUE; + LeaveCriticalSection(&CS); + return GetLastError() == ERROR_NOT_SUPPORTED ? WAVERR_BADFORMAT : TranslateStatus(); + } + + LeaveCriticalSection(&CS); + + if (!pClient->Event) + { + pClient->Event = CreateEvent(NULL, FALSE, FALSE, NULL); + if (pClient->Event == NULL) + { + // Cleanup + return MMSYSERR_NOMEM; + } + + pClient->AuxEvent1 = CreateEvent(NULL, FALSE, FALSE, NULL); + if (!pClient->AuxEvent1) + { + // Cleanup + return MMSYSERR_NOMEM; + } + + pClient->AuxEvent2 = CreateEvent(NULL, FALSE, FALSE, NULL); + if (!pClient->AuxEvent2) + { + // Cleanup + return MMSYSERR_NOMEM; + } + + + mResult = mmTaskCreate((LPTASKCALLBACK)waveThread, &pClient->ThreadHandle, (DWORD)pClient); + if ( mResult != MMSYSERR_NOERROR) + { + // Cleanup + return MMSYSERR_NOMEM; + } + + WaitForSingleObject(pClient->AuxEvent2, INFINITE); + } + + *pUserHandle = pClient; + pUserHandle = (PWAVEALLOC *)dwUser; + + + if (pClient->dwCallback) + { + DriverCallback(pClient->dwCallback, HIWORD(pClient->dwFlags), + (HDRVR)pClient->hWave, DeviceType == WaveOutDevice ? WOM_OPEN : WIM_OPEN, + pClient->dwInstance, 0L, 0L); + } + return MMSYSERR_NOERROR; }

18 years, 10 months

[weiden] 19407: Patch by Michael Fritscher <michael@fritscher.net>

by weiden＠svn.reactos.com

Patch by Michael Fritscher <michael(a)fritscher.net> - support for more/less lines - support page up/down and pos1/end keys - added numeration - added german translation Added: trunk/rosapps/sysutils/ctm/De.rc Modified: trunk/rosapps/sysutils/ctm/En.rc Modified: trunk/rosapps/sysutils/ctm/Fr.rc Modified: trunk/rosapps/sysutils/ctm/ctm.c Modified: trunk/rosapps/sysutils/ctm/ctm.rc Modified: trunk/rosapps/sysutils/ctm/resource.h _____ Added: trunk/rosapps/sysutils/ctm/De.rc --- trunk/rosapps/sysutils/ctm/De.rc 2005-11-21 11:20:11 UTC (rev 19406) +++ trunk/rosapps/sysutils/ctm/De.rc 2005-11-21 13:46:20 UTC (rev 19407) @@ -0,0 +1,32 @@ +// German (Germany) resources + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Console TaskManager v0.1 von Aleksey Bragin <aleksey(a)studiocerebral.com>" + + IDS_COLUMN_NUMBER "# " + IDS_COLUMN_IMAGENAME "Dateiname " + IDS_COLUMN_PID "PID " + IDS_COLUMN_CPU "CPU" + IDS_COLUMN_MEM "Speicher" + IDS_COLUMN_MEM_UNIT "KB" + IDS_COLUMN_PF "Seitenfehler" + + IDS_IDLE_PROCESS "Leerlaufprozess" + IDS_YES "J" + IDS_NO "N" + + IDS_MENU "Tasten: q - beenden, k - Prozess beenden" + IDS_MENU_QUIT "Q" + IDS_MENU_KILL_PROCESS "K" + + IDS_KILL_PROCESS "Sind Sie sicher diesen prozess beendenzu wollen (j/n)" + IDS_KILL_PROCESS_ERR1 "Fehler beim Beenden des Prozesses aufgetreten..." + IDS_KILL_PROCESS_ERR2 "Fehler beim Beenden des Prozesses %d aufgetreten (OpenProcess unm÷glich)" + + IDS_CTM_GENERAL_ERR1 "ctm: Kann die Konsole nicht verwenden." + IDS_CTM_GENERAL_ERR2 "ctm: Kann GetConsoleMode() f³r die Eingabekonsole nicht verwenden." + IDS_CTM_GENERAL_ERR3 "ctm: Kann GetConsoleMode() f³r die Ausgabekonsole nicht verwenden." +END Property changes on: trunk/rosapps/sysutils/ctm/De.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/rosapps/sysutils/ctm/En.rc --- trunk/rosapps/sysutils/ctm/En.rc 2005-11-21 11:20:11 UTC (rev 19406) +++ trunk/rosapps/sysutils/ctm/En.rc 2005-11-21 13:46:20 UTC (rev 19407) @@ -1,31 +1,32 @@ -// English (U.S.) resources - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "Console TaskManager v0.1 by Aleksey Bragin <aleksey(a)studiocerebral.com>" - - IDS_COLUMN_IMAGENAME "Image name " - IDS_COLUMN_PID "PID " - IDS_COLUMN_CPU "CPU" - IDS_COLUMN_MEM "Mem Usage" - IDS_COLUMN_MEM_UNIT "Kb" - IDS_COLUMN_PF "Page Faults" - - IDS_IDLE_PROCESS "System Idle Process" - IDS_YES "Y" - IDS_NO "N" - - IDS_MENU "Press: q - quit, k - kill process" - IDS_MENU_QUIT "Q" - IDS_MENU_KILL_PROCESS "K" - - IDS_KILL_PROCESS "Are you sure you want to kill this process? (y/n)" - IDS_KILL_PROCESS_ERR1 "Unable to terminate this process..." - IDS_KILL_PROCESS_ERR2 "Unable to terminate process %3d (unable to OpenProcess)" - - IDS_CTM_GENERAL_ERR1 "ctm: can't use console." - IDS_CTM_GENERAL_ERR2 "ctm: can't GetConsoleMode() for input console." - IDS_CTM_GENERAL_ERR3 "ctm: can't GetConsoleMode() for output console." -END +// English (U.S.) resources + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Console TaskManager v0.1 by Aleksey Bragin <aleksey(a)studiocerebral.com>" + + IDS_COLUMN_NUMBER "# " + IDS_COLUMN_IMAGENAME "Image name " + IDS_COLUMN_PID "PID " + IDS_COLUMN_CPU "CPU" + IDS_COLUMN_MEM "Mem Usage" + IDS_COLUMN_MEM_UNIT "KB" + IDS_COLUMN_PF "Page Faults" + + IDS_IDLE_PROCESS "System Idle Process" + IDS_YES "Y" + IDS_NO "N" + + IDS_MENU "Press: q - quit, k - kill process" + IDS_MENU_QUIT "Q" + IDS_MENU_KILL_PROCESS "K" + + IDS_KILL_PROCESS "Are you sure you want to kill this process? (y/n)" + IDS_KILL_PROCESS_ERR1 "Unable to terminate this process..." + IDS_KILL_PROCESS_ERR2 "Unable to terminate process %d (unable to OpenProcess)" + + IDS_CTM_GENERAL_ERR1 "ctm: can't use console." + IDS_CTM_GENERAL_ERR2 "ctm: can't GetConsoleMode() for input console." + IDS_CTM_GENERAL_ERR3 "ctm: can't GetConsoleMode() for output console." +END Property changes on: trunk/rosapps/sysutils/ctm/En.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/rosapps/sysutils/ctm/Fr.rc --- trunk/rosapps/sysutils/ctm/Fr.rc 2005-11-21 11:20:11 UTC (rev 19406) +++ trunk/rosapps/sysutils/ctm/Fr.rc 2005-11-21 13:46:20 UTC (rev 19407) @@ -1,31 +1,32 @@ -// French (France) resources - -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "Console TaskManager v0.1 par Aleksey Bragin <aleksey(a)studiocerebral.com>" - - IDS_COLUMN_IMAGENAME "Processus " - IDS_COLUMN_PID "PID " - IDS_COLUMN_CPU "CPU" - IDS_COLUMN_MEM "Util. mÚm" - IDS_COLUMN_MEM_UNIT "Ko" - IDS_COLUMN_PF "DÚfauts de page" - - IDS_IDLE_PROCESS "Processus inactif du systÞme" - IDS_YES "O" - IDS_NO "N" - - IDS_MENU "Menu: Quitter (q), Tuer processus (t)" - IDS_MENU_QUIT "Q" - IDS_MENU_KILL_PROCESS "T" - - IDS_KILL_PROCESS "Etes-vous s¹r de vouloir tuer ce processus (o/n) ?" - IDS_KILL_PROCESS_ERR1 "Impossible de terminer ce processus..." - IDS_KILL_PROCESS_ERR2 "Impossible de terminer le processus %3d (erreur lors de OpenProcess)" - - IDS_CTM_GENERAL_ERR1 "ctm: impossible d'utiliser la console." - IDS_CTM_GENERAL_ERR2 "ctm: impossible de rÚcupÚrer les paramÞtres de la console d'entrÚe." - IDS_CTM_GENERAL_ERR3 "ctm: impossible de rÚcupÚrer les paramÞtres de la console de sortie." -END +// French (France) resources + +LANGUAGE LANG_FRENCH, SUBLANG_FRENCH + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Console TaskManager v0.1 par Aleksey Bragin <aleksey(a)studiocerebral.com>" + + IDS_COLUMN_NUMBER "# " + IDS_COLUMN_IMAGENAME "Image name " + IDS_COLUMN_PID "PID " + IDS_COLUMN_CPU "CPU" + IDS_COLUMN_MEM "Util. mÚm" + IDS_COLUMN_MEM_UNIT "KO" + IDS_COLUMN_PF "DÚfauts de page" + + IDS_IDLE_PROCESS "Processus inactif du systÞme" + IDS_YES "O" + IDS_NO "N" + + IDS_MENU "Menu: Quitter (q), Tuer processus (t)" + IDS_MENU_QUIT "Q" + IDS_MENU_KILL_PROCESS "T" + + IDS_KILL_PROCESS "Etes-vous s¹r de vouloir tuer ce processus (o/n) ?" + IDS_KILL_PROCESS_ERR1 "Impossible de terminer ce processus..." + IDS_KILL_PROCESS_ERR2 "Impossible de terminer le processus %d (erreur lors de OpenProcess)" + + IDS_CTM_GENERAL_ERR1 "ctm: impossible d'utiliser la console." + IDS_CTM_GENERAL_ERR2 "ctm: impossible de rÚcupÚrer les paramÞtres de la console d'entrÚe." + IDS_CTM_GENERAL_ERR3 "ctm: impossible de rÚcupÚrer les paramÞtres de la console de sortie." +END Property changes on: trunk/rosapps/sysutils/ctm/Fr.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/rosapps/sysutils/ctm/ctm.c --- trunk/rosapps/sysutils/ctm/ctm.c 2005-11-21 11:20:11 UTC (rev 19406) +++ trunk/rosapps/sysutils/ctm/ctm.c 2005-11-21 13:46:20 UTC (rev 19407) @@ -10,7 +10,7 @@ Localization features added by HervÚ Poussineau (hpoussin(a)reactos.org) History: - 24 October 2004 - added localization features + 24 October 2004 - added localization features 09 April 2003 - v0.1, fixed bugs, added features, ported to mingw 20 March 2003 - v0.03, works good under ReactOS, and allows process killing @@ -50,7 +50,6 @@ #include "ctm.h" #include "resource.h" -#define MAX_PROC 17 #define TIMES HANDLE hStdin; @@ -73,7 +72,8 @@ TCHAR KEY_QUIT, KEY_KILL; TCHAR KEY_YES, KEY_NO; -const int ProcPerScreen = 17; // 17 processess are displayed on one page +int ProcPerScreen = 17; // 17 processess are displayed on one page +int ScreenLines=25; ULONG ProcessCountOld = 0; ULONG ProcessCount = 0; @@ -92,6 +92,7 @@ int first = 0; // first time in DisplayScreen SYSTEM_BASIC_INFORMATION SystemBasicInfo; +CONSOLE_SCREEN_BUFFER_INFO screenBufferInfo; #define NEW_CONSOLE // Functions that are needed by epsapi @@ -138,32 +139,36 @@ void DisplayScreen() { COORD pos; + COORD size; TCHAR lpStr[80]; DWORD numChars; int lines; int idx; - + GetConsoleScreenBufferInfo(hStdout,&screenBufferInfo); + size=screenBufferInfo.dwSize; + ScreenLines=size.Y; + ProcPerScreen = ScreenLines-7; if (first == 0) { // Header - pos.X = 2; pos.Y = 2; + pos.X = 1; pos.Y = 1; WriteConsoleOutputCharacter(hStdout, lpTitle, _tcslen(lpTitle), pos, &numChars); - pos.X = 2; pos.Y = 3; + pos.X = 1; pos.Y = 2; WriteConsoleOutputCharacter(hStdout, lpSeparator, _tcslen(lpSeparator), pos, &numChars); - pos.X = 2; pos.Y = 4; + pos.X = 1; pos.Y = 3; WriteConsoleOutputCharacter(hStdout, lpHeader, _tcslen(lpHeader), pos, &numChars); - pos.X = 2; pos.Y = 5; + pos.X = 1; pos.Y = 4; WriteConsoleOutputCharacter(hStdout, lpSeparator, _tcslen(lpSeparator), pos, &numChars); // Footer - pos.X = 2; pos.Y = ProcPerScreen+6; + pos.X = 1; pos.Y = ScreenLines-2; WriteConsoleOutputCharacter(hStdout, lpSeparator, _tcslen(lpSeparator), pos, &numChars); // Menu - pos.X = 2; pos.Y = ProcPerScreen+7; + pos.X = 1; pos.Y = ScreenLines-1; WriteConsoleOutputCharacter(hStdout, lpEmpty, _tcslen(lpEmpty), pos, &numChars); WriteConsoleOutputCharacter(hStdout, lpMenu, _tcslen(lpMenu), pos, &numChars); @@ -172,11 +177,12 @@ // Processess lines = ProcessCount; - if (lines > MAX_PROC) - lines = MAX_PROC; - for (idx=0; idx<MAX_PROC; idx++) + if (lines > ProcPerScreen) + lines = ProcPerScreen; + for (idx=0; idx<ProcPerScreen; idx++) { int len, i; + TCHAR lpNumber[5]; TCHAR lpPid[8]; TCHAR lpCpu[6]; TCHAR lpMemUsg[12]; @@ -189,6 +195,11 @@ // data if (idx < lines && scrolled + idx < ProcessCount) { + + // number + _stprintf(lpNumber, _T("%3d"), idx+scrolled); + _tcsncpy(&lpStr[2], lpNumber, 3); + // image name #ifdef _UNICODE len = wcslen(pPerfData[scrolled+idx].ImageName); @@ -197,45 +208,45 @@ imgName, MAX_PATH, NULL, NULL); len = strlen(imgName); #endif - if (len > columnRightPositions[0]) + if (len > columnRightPositions[1]) { - len = columnRightPositions[0]; + len = columnRightPositions[1]; } #ifdef _UNICODE - wcsncpy(&lpStr[2], pPerfData[scrolled+idx].ImageName, len); + wcsncpy(&lpStr[columnRightPositions[0]+3], pPerfData[scrolled+idx].ImageName, len); #else - strncpy(&lpStr[2], imgName, len); + strncpy(&lpStr[columnRightPositions[0]+3], imgName, len); #endif // PID - _stprintf(lpPid, _T("%6ld"), pPerfData[scrolled+idx].ProcessId); - _tcsncpy(&lpStr[columnRightPositions[1] - 6], lpPid, 6); + _stprintf(lpPid, _T("%6ld"), pPerfData[scrolled+idx].ProcessId); + _tcsncpy(&lpStr[columnRightPositions[2] - 6], lpPid, 6); #ifdef TIMES // CPU _stprintf(lpCpu, _T("%3d%%"), pPerfData[scrolled+idx].CPUUsage); - _tcsncpy(&lpStr[columnRightPositions[2] - 4], lpCpu, 4); + _tcsncpy(&lpStr[columnRightPositions[3] - 4], lpCpu, 4); #endif // Mem usage _stprintf(lpMemUsg, _T("%6ld %s"), pPerfData[scrolled+idx].WorkingSetSizeBytes / 1024, lpMemUnit); - _tcsncpy(&lpStr[columnRightPositions[3] - 9], lpMemUsg, 9); + _tcsncpy(&lpStr[columnRightPositions[4] - 9], lpMemUsg, 9); // Page Fault _stprintf(lpPageFaults, _T("%12ld"), pPerfData[scrolled+idx].PageFaultCount); - _tcsncpy(&lpStr[columnRightPositions[4] - 12], lpPageFaults, 12); + _tcsncpy(&lpStr[columnRightPositions[5] - 12], lpPageFaults, 12); } // columns lpStr[0] = _T(' '); lpStr[1] = _T('|'); - for (i = 0; i < 5; i++) + for (i = 0; i < 6; i++) lpStr[columnRightPositions[i] + 1] = _T('|'); - pos.X = 1; pos.Y = 6+idx; - WriteConsoleOutputCharacter(hStdout, lpStr, 74, pos, &numChars); + pos.X = 0; pos.Y = 5+idx; + WriteConsoleOutputCharacter(hStdout, lpStr, 80, pos, &numChars); // Attributes now... - pos.X = 3; pos.Y = 6+idx; + pos.X = columnRightPositions[0] + 1; pos.Y = 5+idx; if (selection == idx) { wColor = BACKGROUND_GREEN | @@ -254,7 +265,7 @@ FillConsoleOutputAttribute( hStdout, // screen buffer handle wColor, // color to fill with - columnRightPositions[0] - 1, // number of cells to fill + columnRightPositions[1] - 4, // number of cells to fill pos, // first cell to write to &numChars); // actual number written } @@ -279,7 +290,7 @@ COORD pos; TCHAR lpStr[100]; - pos.X = 2; pos.Y = 24; + pos.X = 1; pos.Y =ScreenLines-1; if (LoadString(hInst, IDS_KILL_PROCESS, lpStr, 100)) WriteConsoleOutputCharacter(hStdout, lpStr, _tcslen(lpStr), pos, &numChars); @@ -331,12 +342,53 @@ } else if (key == VK_DOWN) { - if ((selection < MAX_PROC-1) && (selection < ProcessCount-1)) + if ((selection < ProcPerScreen-1) && (selection < ProcessCount-1)) selection++; - else if ((selection == MAX_PROC-1) && (selection+scrolled < ProcessCount-1)) + else if ((selection == ProcPerScreen-1) && (selection+scrolled < ProcessCount-1)) scrolled++; } + else if (key == VK_PRIOR) + { + if (scrolled>ProcPerScreen-1) + scrolled-=ProcPerScreen-1; + else + { + scrolled=0; //First + selection=0; + } + //selection=0; + } + else if (key == VK_NEXT) + { + scrolled+=ProcPerScreen-1; + if (scrolled>ProcessCount-ProcPerScreen) + { + scrolled=ProcessCount-ProcPerScreen; //End + selection=ProcPerScreen-1; + } + //selection=ProcPerScreen-1; + if (ProcessCount<=ProcPerScreen) //If there are less process than fits on the screen + { + scrolled=0; + selection=(ProcessCount%ProcPerScreen)-1; + } + } + else if (key == VK_HOME) + { + selection=0; + scrolled=0; + } + else if (key == VK_END) + { + selection=ProcPerScreen-1; + scrolled=ProcessCount-ProcPerScreen; + if (ProcessCount<=ProcPerScreen) //If there are less process than fits on the screen + { + scrolled=0; + selection=(ProcessCount%ProcPerScreen)-1; + } + } return FALSE; } @@ -561,43 +613,49 @@ /* Initialize global variables */ hInst = 0 /* FIXME: which value? [used with LoadString(hInst, ..., ..., ...)] */; - if (LoadString(hInst, IDS_COLUMN_IMAGENAME, lpStr, 80)) + + if (LoadString(hInst, IDS_COLUMN_NUMBER, lpStr, 80)) { - columnRightPositions[0] = _tcslen(lpStr); + columnRightPositions[0] = _tcslen(lpStr) + 3; _tcsncpy(&lpHeader[2], lpStr, _tcslen(lpStr)); } - if (LoadString(hInst, IDS_COLUMN_PID, lpStr, 80)) + if (LoadString(hInst, IDS_COLUMN_IMAGENAME, lpStr, 80)) { columnRightPositions[1] = columnRightPositions[0] + _tcslen(lpStr) + 3; _tcsncpy(&lpHeader[columnRightPositions[0] + 2], lpStr, _tcslen(lpStr)); } - if (LoadString(hInst, IDS_COLUMN_CPU, lpStr, 80)) + if (LoadString(hInst, IDS_COLUMN_PID, lpStr, 80)) { columnRightPositions[2] = columnRightPositions[1] + _tcslen(lpStr) + 3; _tcsncpy(&lpHeader[columnRightPositions[1] + 2], lpStr, _tcslen(lpStr)); } - if (LoadString(hInst, IDS_COLUMN_MEM, lpStr, 80)) + if (LoadString(hInst, IDS_COLUMN_CPU, lpStr, 80)) { columnRightPositions[3] = columnRightPositions[2] + _tcslen(lpStr) + 3; _tcsncpy(&lpHeader[columnRightPositions[2] + 2], lpStr, _tcslen(lpStr)); } - if (LoadString(hInst, IDS_COLUMN_PF, lpStr, 80)) + if (LoadString(hInst, IDS_COLUMN_MEM, lpStr, 80)) { columnRightPositions[4] = columnRightPositions[3] + _tcslen(lpStr) + 3; _tcsncpy(&lpHeader[columnRightPositions[3] + 2], lpStr, _tcslen(lpStr)); } + if (LoadString(hInst, IDS_COLUMN_PF, lpStr, 80)) + { + columnRightPositions[5] = columnRightPositions[4] + _tcslen(lpStr) + 3; + _tcsncpy(&lpHeader[columnRightPositions[4] + 2], lpStr, _tcslen(lpStr)); + } - for (i = 0; i < columnRightPositions[4]; i++) + for (i = 0; i < columnRightPositions[5]; i++) lpSeparator[i] = _T('-'); lpHeader[0] = _T('|'); lpSeparator[0] = _T('+'); - for (i = 0; i < 5; i++) + for (i = 0; i < 6; i++) { lpHeader[columnRightPositions[i]] = _T('|'); lpSeparator[columnRightPositions[i]] = _T('+'); } - lpSeparator[columnRightPositions[4] + 1] = _T('\0'); - lpHeader[columnRightPositions[4] + 1] = _T('\0'); + lpSeparator[columnRightPositions[5] + 1] = _T('\0'); + lpHeader[columnRightPositions[5] + 1] = _T('\0'); if (!LoadString(hInst, IDS_APP_TITLE, lpTitle, 80)) _____ Modified: trunk/rosapps/sysutils/ctm/ctm.rc --- trunk/rosapps/sysutils/ctm/ctm.rc 2005-11-21 11:20:11 UTC (rev 19406) +++ trunk/rosapps/sysutils/ctm/ctm.rc 2005-11-21 13:46:20 UTC (rev 19407) @@ -11,3 +11,4 @@ #include "En.rc" #include "Fr.rc" +#include "De.rc" _____ Modified: trunk/rosapps/sysutils/ctm/resource.h --- trunk/rosapps/sysutils/ctm/resource.h 2005-11-21 11:20:11 UTC (rev 19406) +++ trunk/rosapps/sysutils/ctm/resource.h 2005-11-21 13:46:20 UTC (rev 19407) @@ -20,12 +20,13 @@ #define IDS_APP_TITLE 0 -#define IDS_COLUMN_IMAGENAME 10 -#define IDS_COLUMN_PID 11 -#define IDS_COLUMN_CPU 12 -#define IDS_COLUMN_MEM 13 -#define IDS_COLUMN_MEM_UNIT 14 -#define IDS_COLUMN_PF 15 +#define IDS_COLUMN_NUMBER 10 +#define IDS_COLUMN_IMAGENAME 11 +#define IDS_COLUMN_PID 12 +#define IDS_COLUMN_CPU 13 +#define IDS_COLUMN_MEM 14 +#define IDS_COLUMN_MEM_UNIT 15 +#define IDS_COLUMN_PF 16 #define IDS_IDLE_PROCESS 100 #define IDS_YES 101

18 years, 10 months

[weiden] 19406: fixed the ProbeForWriteLargeInteger and ProbeForWriteUlargeInteger macros

by weiden＠svn.reactos.com

fixed the ProbeForWriteLargeInteger and ProbeForWriteUlargeInteger macros Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-21 10:49:48 UTC (rev 19405) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-21 11:20:11 UTC (rev 19406) @@ -84,6 +84,8 @@ #define ExRaiseStatus RtlRaiseStatus static const UNICODE_STRING __emptyUnicodeString = {0}; +static const LARGE_INTEGER __emptyLargeInteger = {{0, 0}}; +static const ULARGE_INTEGER __emptyULargeInteger = {{0, 0}}; /* * NOTE: Alignment of the pointers is not verified! @@ -120,7 +122,7 @@ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ - *(volatile Type *)(Ptr)) + *(Type *)&(*(volatile Type *)(Ptr))) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) #define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) @@ -136,13 +138,8 @@ #define ProbeForReadPointer(Ptr) ProbeForReadGenericType(Ptr, PVOID, NULL) #define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) #define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) -#ifdef _MSC_VER -#define ProbeForReadLargeInteger(Ptr) (*(volatile LARGE_INTEGER*)ProbeForReadGenericType(&(Ptr)->QuadPart, LONGLONG, 0)) -#define ProbeForReadUlargeInteger(Ptr) (*(volatile ULARGE_INTEGER*)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) -#else -#define ProbeForReadLargeInteger(Ptr) ((LARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, LONGLONG, 0)) -#define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) -#endif +#define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType(Ptr, LARGE_INTEGER, __emptyLargeInteger) +#define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType(Ptr, ULARGE_INTEGER, __emptyULargeInteger) #define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType(Ptr, UNICODE_STRING, __emptyUnicodeString) /*

18 years, 10 months

[weiden] 19405: fixed uninitialized variables warnings by not using/returning totally random data. The code still has a lot of totally broken DWORD->Pointer casts that are going to be a problem on 64 bit architectures...

by weiden＠svn.reactos.com

fixed uninitialized variables warnings by not using/returning totally random data. The code still has a lot of totally broken DWORD->Pointer casts that are going to be a problem on 64 bit architectures... Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 10:26:27 UTC (rev 19404) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 10:49:48 UTC (rev 19405) @@ -77,7 +77,7 @@ DWORD dwParam2) { // TODO: Implement - PWAVEALLOC pClient; + PWAVEALLOC pClient = (PWAVEALLOC)dwUser; //MMRESULT mResult; //BOOL Result; //DWORD BytesReturned; @@ -178,8 +178,7 @@ return OpenWaveDevice(WaveOutDevice, dwId, dwUser, dwParam1, dwParam2); case WODM_CLOSE: - { - MMRESULT Result; + { DPRINT("WODM_CLOSE"); // 1. Check if the task is ready to complete @@ -189,7 +188,7 @@ if ( pTask->AuxReturnCode != MMSYSERR_NOERROR) { - return Result; + return pTask->AuxReturnCode; } else

18 years, 10 months

[cwittich] 19404: added stubs for Wow64DisableWow64FsRedirection, Wow64RevertWow64FsRedirection

by cwittich＠svn.reactos.com

added stubs for Wow64DisableWow64FsRedirection, Wow64RevertWow64FsRedirection Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/lib/kernel32/misc/stubs.c _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-11-21 09:51:12 UTC (rev 19403) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-11-21 10:26:27 UTC (rev 19404) @@ -941,6 +941,8 @@ WaitNamedPipeW@8 WideCharToMultiByte@32 WinExec@8 +Wow64DisableWow64FsRedirection@4 +Wow64RevertWow64FsRedirection@4 WriteConsoleA@20 WriteConsoleInputA@16 WriteConsoleInputVDMA@16 _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2005-11-21 09:51:12 UTC (rev 19403) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2005-11-21 10:26:27 UTC (rev 19404) @@ -1603,3 +1603,19 @@ STUB; return 0; } + +BOOL +STDCALL +Wow64DisableWow64FsRedirection (VOID ** pv) +{ + STUB; + return FALSE; +} + +BOOL +STDCALL +Wow64RevertWow64FsRedirection (VOID * pv) +{ + STUB; + return FALSE; +}

18 years, 10 months

[cwittich] 19403: import avifil32 from WINE 0.9.1

by cwittich＠svn.reactos.com

import avifil32 from WINE 0.9.1 Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/lib/avifil32/ Added: trunk/reactos/lib/avifil32/Makefile.in Added: trunk/reactos/lib/avifil32/acmstream.c Added: trunk/reactos/lib/avifil32/api.c Added: trunk/reactos/lib/avifil32/avifil32.spec Added: trunk/reactos/lib/avifil32/avifil32.xml Added: trunk/reactos/lib/avifil32/avifile.c Added: trunk/reactos/lib/avifil32/avifile.spec Added: trunk/reactos/lib/avifil32/avifile_Cs.rc Added: trunk/reactos/lib/avifil32/avifile_De.rc Added: trunk/reactos/lib/avifil32/avifile_En.rc Added: trunk/reactos/lib/avifil32/avifile_Es.rc Added: trunk/reactos/lib/avifil32/avifile_Fr.rc Added: trunk/reactos/lib/avifil32/avifile_It.rc Added: trunk/reactos/lib/avifil32/avifile_Ja.rc Added: trunk/reactos/lib/avifil32/avifile_Nl.rc Added: trunk/reactos/lib/avifil32/avifile_No.rc Added: trunk/reactos/lib/avifil32/avifile_Pl.rc Added: trunk/reactos/lib/avifil32/avifile_Pt.rc Added: trunk/reactos/lib/avifil32/avifile_Ru.rc Added: trunk/reactos/lib/avifil32/avifile_Si.rc Added: trunk/reactos/lib/avifil32/avifile_private.h Added: trunk/reactos/lib/avifil32/editstream.c Added: trunk/reactos/lib/avifil32/extrachunk.c Added: trunk/reactos/lib/avifil32/extrachunk.h Added: trunk/reactos/lib/avifil32/factory.c Added: trunk/reactos/lib/avifil32/getframe.c Added: trunk/reactos/lib/avifil32/icmstream.c Added: trunk/reactos/lib/avifil32/regsvr.c Added: trunk/reactos/lib/avifil32/rsrc.rc Added: trunk/reactos/lib/avifil32/tmpfile.c Added: trunk/reactos/lib/avifil32/wavfile.c Modified: trunk/reactos/lib/directory.xml Modified: trunk/reactos/w32api/include/vfw.h _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-11-21 09:38:25 UTC (rev 19402) +++ trunk/reactos/baseaddress.xml 2005-11-21 09:51:12 UTC (rev 19403) @@ -51,6 +51,7 @@ <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> <property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> +<property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-11-21 09:38:25 UTC (rev 19402) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-11-21 09:51:12 UTC (rev 19403) @@ -61,6 +61,7 @@ lib\advapi32\advapi32.dll 1 lib\advpack\advpack.dll 1 lib\aclui\aclui.dll 1 +lib\avifil32\avifil32.dll 1 lib\cabinet\cabinet.dll 1 lib\cards\cards.dll 1 lib\cpl\access\access.cpl 1 _____ Added: trunk/reactos/lib/avifil32/Makefile.in --- trunk/reactos/lib/avifil32/Makefile.in 2005-11-21 09:38:25 UTC (rev 19402) +++ trunk/reactos/lib/avifil32/Makefile.in 2005-11-21 09:51:12 UTC (rev 19403) @@ -0,0 +1,30 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = avifil32.dll +IMPORTLIB = libavifil32.$(IMPLIBEXT) +IMPORTS = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32 ntdll +EXTRALIBS = -luuid + +C_SRCS = \ + acmstream.c \ + api.c \ + avifile.c \ + editstream.c \ + extrachunk.c \ + factory.c \ + getframe.c \ + icmstream.c \ + regsvr.c \ + tmpfile.c \ + wavfile.c + +SPEC_SRCS16 = avifile.spec + +RC_SRCS = \ + rsrc.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: trunk/reactos/lib/avifil32/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/avifil32/acmstream.c --- trunk/reactos/lib/avifil32/acmstream.c 2005-11-21 09:38:25 UTC (rev 19402) +++ trunk/reactos/lib/avifil32/acmstream.c 2005-11-21 09:51:12 UTC (rev 19403) @@ -0,0 +1,747 @@ +/* + * Copyright 2002 Michael G³nnewig + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define COM_NO_WINDOWS_H +#include <assert.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winerror.h" +#include "windowsx.h" +#include "mmsystem.h" +#include "vfw.h" +#include "msacm.h" + +#include "avifile_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); + +/********************************************************************** */ + +static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); +static ULONG WINAPI ACMStream_fnAddRef(IAVIStream*iface); +static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface); +static HRESULT WINAPI ACMStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); +static HRESULT WINAPI ACMStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); +static LONG WINAPI ACMStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); +static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); +static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); +static HRESULT WINAPI ACMStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); +static HRESULT WINAPI ACMStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); +static HRESULT WINAPI ACMStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); +static HRESULT WINAPI ACMStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); +static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); +static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); + +static const struct IAVIStreamVtbl iacmst = { + ACMStream_fnQueryInterface, + ACMStream_fnAddRef, + ACMStream_fnRelease, + ACMStream_fnCreate, + ACMStream_fnInfo, + ACMStream_fnFindSample, + ACMStream_fnReadFormat, + ACMStream_fnSetFormat, + ACMStream_fnRead, + ACMStream_fnWrite, + ACMStream_fnDelete, + ACMStream_fnReadData, + ACMStream_fnWriteData, + ACMStream_fnSetInfo +}; + +typedef struct _IAVIStreamImpl { + /* IUnknown stuff */ + const IAVIStreamVtbl *lpVtbl; + LONG ref; + + /* IAVIStream stuff */ + PAVISTREAM pStream; + AVISTREAMINFOW sInfo; + + HACMSTREAM has; + + LPWAVEFORMATEX lpInFormat; + LONG cbInFormat; + + LPWAVEFORMATEX lpOutFormat; + LONG cbOutFormat; + + ACMSTREAMHEADER acmStreamHdr; +} IAVIStreamImpl; + +/********************************************************************** */ + +#define CONVERT_STREAM_to_THIS(a) do { \ + DWORD __bytes; \ + acmStreamSize(This->has,*(a) * This->lpInFormat->nBlockAlign,\ + &__bytes, ACM_STREAMSIZEF_SOURCE); \ + *(a) = __bytes / This->lpOutFormat->nBlockAlign; } while(0) + +#define CONVERT_THIS_to_STREAM(a) do { \ + DWORD __bytes; \ + acmStreamSize(This->has,*(a) * This->lpOutFormat->nBlockAlign,\ + &__bytes, ACM_STREAMSIZEF_DESTINATION); \ + *(a) = __bytes / This->lpInFormat->nBlockAlign; } while(0) + +static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This); + +HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppv) +{ + IAVIStreamImpl *pstream; + HRESULT hr; + + assert(riid != NULL && ppv != NULL); + + *ppv = NULL; + + pstream = (IAVIStreamImpl*)LocalAlloc(LPTR, sizeof(IAVIStreamImpl)); + if (pstream == NULL) + return AVIERR_MEMORY; + + pstream->lpVtbl = &iacmst; + + hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv); + if (FAILED(hr)) + LocalFree((HLOCAL)pstream); + + return hr; +} + +static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface, + REFIID refiid, LPVOID *obj) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); + + if (IsEqualGUID(&IID_IUnknown, refiid) || + IsEqualGUID(&IID_IAVIStream, refiid)) { + *obj = This; + IAVIStream_AddRef(iface); + + return S_OK; + } + + return OLE_E_ENUM_NOMORE; +} + +static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) -> %ld\n", iface, ref); + + /* also add reference to the nested stream */ + if (This->pStream != NULL) + IAVIStream_AddRef(This->pStream); + + return ref; +} + +static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) -> %ld\n", iface, ref); + + if (ref == 0) { + /* destruct */ + if (This->has != NULL) { + if (This->acmStreamHdr.fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED) + acmStreamUnprepareHeader(This->has, &This->acmStreamHdr, 0); + acmStreamClose(This->has, 0); + This->has = NULL; + } + if (This->acmStreamHdr.pbSrc != NULL) { + GlobalFreePtr(This->acmStreamHdr.pbSrc); + This->acmStreamHdr.pbSrc = NULL; + } + if (This->acmStreamHdr.pbDst != NULL) { + GlobalFreePtr(This->acmStreamHdr.pbDst); + This->acmStreamHdr.pbDst = NULL; + } + if (This->lpInFormat != NULL) { + GlobalFreePtr(This->lpInFormat); + This->lpInFormat = NULL; + This->cbInFormat = 0; + } + if (This->lpOutFormat != NULL) { + GlobalFreePtr(This->lpOutFormat); + This->lpOutFormat = NULL; + This->cbOutFormat = 0; + } + if (This->pStream != NULL) { + IAVIStream_Release(This->pStream); + This->pStream = NULL; + } + LocalFree((HLOCAL)This); + + return 0; + } + + /* also release reference to the nested stream */ + if (This->pStream != NULL) + IAVIStream_Release(This->pStream); + + return ref; +} + +/* lParam1: PAVISTREAM + * lParam2: LPAVICOMPRESSOPTIONS -- even if doc's say LPWAVEFORMAT + */ +static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, + LPARAM lParam2) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2); + + /* check for swapped parameters */ + if ((LPVOID)lParam1 != NULL && + ((LPAVICOMPRESSOPTIONS)lParam1)->fccType == streamtypeAUDIO) { + register LPARAM tmp = lParam1; + + lParam1 = lParam2; + lParam2 = tmp; + } + + if ((LPVOID)lParam1 == NULL) + return AVIERR_BADPARAM; + + IAVIStream_Info((PAVISTREAM)lParam1, &This->sInfo, sizeof(This->sInfo)); + if (This->sInfo.fccType != streamtypeAUDIO) + return AVIERR_ERROR; /* error in registry or AVIMakeCompressedStream */ + + This->sInfo.fccHandler = 0; /* be paranoid */ + + /* FIXME: check ACM version? Which version does we need? */ + + if ((LPVOID)lParam2 != NULL) { + /* We only need the format from the compress-options */ + if (((LPAVICOMPRESSOPTIONS)lParam2)->fccType == streamtypeAUDIO) + lParam2 = (LPARAM)((LPAVICOMPRESSOPTIONS)lParam2)->lpFormat; + + if (((LPWAVEFORMATEX)lParam2)->wFormatTag != WAVE_FORMAT_PCM) + This->cbOutFormat = sizeof(WAVEFORMATEX) + ((LPWAVEFORMATEX)lParam2)->cbSize; + else + This->cbOutFormat = sizeof(PCMWAVEFORMAT); + + This->lpOutFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GHND, This->cbOutFormat); + if (This->lpOutFormat == NULL) + return AVIERR_MEMORY; + + memcpy(This->lpOutFormat, (LPVOID)lParam2, This->cbOutFormat); + } else { + This->lpOutFormat = NULL; + This->cbOutFormat = 0; + } + + This->pStream = (PAVISTREAM)lParam1; + IAVIStream_AddRef(This->pStream); + + return AVIERR_OK; +} + +static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, + LONG size) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,%p,%ld)\n", iface, psi, size); + + if (psi == NULL) + return AVIERR_BADPARAM; + if (size < 0) + return AVIERR_BADSIZE; + + /* Need codec to correct some values in structure */ + if (This->has == NULL) { + HRESULT hr = AVIFILE_OpenCompressor(This); + + if (FAILED(hr)) + return hr; + } + + memcpy(psi, &This->sInfo, min(size, (LONG)sizeof(This->sInfo))); + + if (size < (LONG)sizeof(This->sInfo)) + return AVIERR_BUFFERTOOSMALL; + return AVIERR_OK; +} + +static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos, + LONG flags) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags); + + if (flags & FIND_FROM_START) { + pos = This->sInfo.dwStart; + flags &= ~(FIND_FROM_START|FIND_PREV); + flags |= FIND_NEXT; + } + + /* convert pos from our 'space' to This->pStream's one */ + CONVERT_THIS_to_STREAM(&pos); + + /* ask stream */ + pos = IAVIStream_FindSample(This->pStream, pos, flags); + + if (pos != -1) { + /* convert pos back to our 'space' if it's no size or physical pos */ + if ((flags & FIND_RET) == 0) + CONVERT_STREAM_to_THIS(&pos); + } + + return pos; +} + +static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos, + LPVOID format, LONG *formatsize) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize); + + if (formatsize == NULL) + return AVIERR_BADPARAM; + + if (This->has == NULL) { + HRESULT hr = AVIFILE_OpenCompressor(This); + + if (FAILED(hr)) + return hr; + } + + /* only interested in needed buffersize? */ + if (format == NULL || *formatsize <= 0) { + *formatsize = This->cbOutFormat; + + return AVIERR_OK; + } + + /* copy initial format (only as much as will fit) */ + memcpy(format, This->lpOutFormat, min(*formatsize, This->cbOutFormat)); + if (*formatsize < This->cbOutFormat) { + *formatsize = This->cbOutFormat; + return AVIERR_BUFFERTOOSMALL; + } + + *formatsize = This->cbOutFormat; + return AVIERR_OK; +} + +static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream *iface, LONG pos, + LPVOID format, LONG formatsize) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + HRESULT hr; + + TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize); + + /* check parameters */ + if (format == NULL || formatsize <= 0) + return AVIERR_BADPARAM; + + /* Input format already known? + * Changing is unsupported, but be quiet if it's the same */ + if (This->lpInFormat != NULL) { + if (This->cbInFormat != formatsize || + memcmp(format, This->lpInFormat, formatsize) != 0) + return AVIERR_UNSUPPORTED; + + return AVIERR_OK; + } + + /* Does the nested stream support writing? */ + if ((This->sInfo.dwCaps & AVIFILECAPS_CANWRITE) == 0) + return AVIERR_READONLY; + + This->lpInFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GMEM_MOVEABLE, formatsize); + if (This->lpInFormat == NULL) + return AVIERR_MEMORY; + This->cbInFormat = formatsize; + memcpy(This->lpInFormat, format, formatsize); + + /* initialize formats and get compressor */ + hr = AVIFILE_OpenCompressor(This); + if (FAILED(hr)) + return hr; + + CONVERT_THIS_to_STREAM(&pos); + + /* tell the nested stream the new format */ + return IAVIStream_SetFormat(This->pStream, pos, This->lpOutFormat, + This->cbOutFormat); +} + +static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start, + LONG samples, LPVOID buffer, + LONG buffersize, LPLONG bytesread, + LPLONG samplesread) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + HRESULT hr; + DWORD size; + + TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer, + buffersize, bytesread, samplesread); + + /* clear return parameters if given */ + if (bytesread != NULL) + *bytesread = 0; + if (samplesread != NULL) + *samplesread = 0; + + /* Do we have our compressor? */ + if (This->has == NULL) { + hr = AVIFILE_OpenCompressor(This); + + if (FAILED(hr)) + return hr; + } + + /* only need to pass through? */ + if (This->cbInFormat == This->cbOutFormat && + memcmp(This->lpInFormat, This->lpOutFormat, This->cbInFormat) == 0) { + return IAVIStream_Read(This->pStream, start, samples, buffer, buffersize, + bytesread, samplesread); + } + + /* read as much as fit? */ + if (samples == -1) + samples = buffersize / This->lpOutFormat->nBlockAlign; + /* limit to buffersize */ + if (samples * This->lpOutFormat->nBlockAlign > buffersize) + samples = buffersize / This->lpOutFormat->nBlockAlign; + + /* only return needed size? */ + if (buffer == NULL || buffersize <= 0 || samples == 0) { + if (bytesread == NULL && samplesread == NULL) + return AVIERR_BADPARAM; + + if (bytesread != NULL) + *bytesread = samples * This->lpOutFormat->nBlockAlign; + if (samplesread != NULL) + *samplesread = samples; + + return AVIERR_OK; + } + + /* map our positions to pStream positions */ + CONVERT_THIS_to_STREAM(&start); + + /* our needed internal buffersize */ + size = samples * This->lpInFormat->nBlockAlign; + + /* Need to free destination buffer used for writing? */ + if (This->acmStreamHdr.pbDst != NULL) { + GlobalFreePtr(This->acmStreamHdr.pbDst); + This->acmStreamHdr.pbDst = NULL; + This->acmStreamHdr.dwDstUser = 0; + } + + /* need bigger source buffer? */ + if (This->acmStreamHdr.pbSrc == NULL || + This->acmStreamHdr.dwSrcUser < size) { + if (This->acmStreamHdr.pbSrc == NULL) + This->acmStreamHdr.pbSrc = GlobalAllocPtr(GMEM_MOVEABLE, size); + else + This->acmStreamHdr.pbSrc = GlobalReAllocPtr(This->acmStreamHdr.pbSrc, + size, GMEM_MOVEABLE); + if (This->acmStreamHdr.pbSrc == NULL) + return AVIERR_MEMORY; + This->acmStreamHdr.dwSrcUser = size; + } + + This->acmStreamHdr.cbStruct = sizeof(This->acmStreamHdr); + This->acmStreamHdr.cbSrcLengthUsed = 0; + This->acmStreamHdr.cbDstLengthUsed = 0; + This->acmStreamHdr.cbSrcLength = size; + + /* read source data */ + hr = IAVIStream_Read(This->pStream, start, -1, This->acmStreamHdr.pbSrc, + This->acmStreamHdr.cbSrcLength, + (LONG *)&This->acmStreamHdr.cbSrcLength, NULL); + if (FAILED(hr) || This->acmStreamHdr.cbSrcLength == 0) + return hr; + + /* need to prepare stream? */ + This->acmStreamHdr.pbDst = buffer; + This->acmStreamHdr.cbDstLength = buffersize; + if ((This->acmStreamHdr.fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED) == 0) { + if (acmStreamPrepareHeader(This->has, &This->acmStreamHdr, 0) != S_OK) { + This->acmStreamHdr.pbDst = NULL; + This->acmStreamHdr.cbDstLength = 0; + return AVIERR_COMPRESSOR; + } + } + + /* now do the conversion */ + /* FIXME: use ACM_CONVERTF_* flags */ + if (acmStreamConvert(This->has, &This->acmStreamHdr, 0) != S_OK) + hr = AVIERR_COMPRESSOR; + + This->acmStreamHdr.pbDst = NULL; + This->acmStreamHdr.cbDstLength = 0; + + /* fill out return parameters if given */ + if (bytesread != NULL) + *bytesread = This->acmStreamHdr.cbDstLengthUsed; + if (samplesread != NULL) + *samplesread = + This->acmStreamHdr.cbDstLengthUsed / This->lpOutFormat->nBlockAlign; + + return hr; +} + +static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start, + LONG samples, LPVOID buffer, + LONG buffersize, DWORD flags, + LPLONG sampwritten, + LPLONG byteswritten) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + HRESULT hr; + ULONG size; + + TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples, + buffer, buffersize, flags, sampwritten, byteswritten); + + /* clear return parameters if given */ + if (sampwritten != NULL) + *sampwritten = 0; + if (byteswritten != NULL) + *byteswritten = 0; + + /* check parameters */ + if (buffer == NULL && (buffersize > 0 || samples > 0)) + return AVIERR_BADPARAM; + + /* Have we write capability? */ + if ((This->sInfo.dwCaps & AVIFILECAPS_CANWRITE) == 0) + return AVIERR_READONLY; + + /* also need a compressor */ + if (This->has == NULL) + return AVIERR_NOCOMPRESSOR; + + /* map our sizes to pStream sizes */ + size = buffersize; + CONVERT_THIS_to_STREAM(&size); + CONVERT_THIS_to_STREAM(&start); + + /* no bytes to write? -- short circuit */ + if (size == 0) { + return IAVIStream_Write(This->pStream, -1, samples, buffer, size, + flags, sampwritten, byteswritten); + } + + /* Need to free source buffer used for reading? */ + if (This->acmStreamHdr.pbSrc != NULL) { + GlobalFreePtr(This->acmStreamHdr.pbSrc); + This->acmStreamHdr.pbSrc = NULL; + This->acmStreamHdr.dwSrcUser = 0; + } + + /* Need bigger destination buffer? */ + if (This->acmStreamHdr.pbDst == NULL || + This->acmStreamHdr.dwDstUser < size) { + if (This->acmStreamHdr.pbDst == NULL) + This->acmStreamHdr.pbDst = GlobalAllocPtr(GMEM_MOVEABLE, size); + else + This->acmStreamHdr.pbDst = GlobalReAllocPtr(This->acmStreamHdr.pbDst, + size, GMEM_MOVEABLE); + if (This->acmStreamHdr.pbDst == NULL) + return AVIERR_MEMORY; + This->acmStreamHdr.dwDstUser = size; + } + This->acmStreamHdr.cbStruct = sizeof(This->acmStreamHdr); + This->acmStreamHdr.cbSrcLengthUsed = 0; + This->acmStreamHdr.cbDstLengthUsed = 0; + This->acmStreamHdr.cbDstLength = This->acmStreamHdr.dwDstUser; + + /* need to prepare stream? */ + This->acmStreamHdr.pbSrc = buffer; + This->acmStreamHdr.cbSrcLength = buffersize; + if ((This->acmStreamHdr.fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED) == 0) { + if (acmStreamPrepareHeader(This->has, &This->acmStreamHdr, 0) != S_OK) { + This->acmStreamHdr.pbSrc = NULL; + This->acmStreamHdr.cbSrcLength = 0; + return AVIERR_COMPRESSOR; + } + } + + /* now do the conversion */ + /* FIXME: use ACM_CONVERTF_* flags */ + if (acmStreamConvert(This->has, &This->acmStreamHdr, 0) != S_OK) + hr = AVIERR_COMPRESSOR; + else + hr = AVIERR_OK; + + This->acmStreamHdr.pbSrc = NULL; + This->acmStreamHdr.cbSrcLength = 0; + + if (FAILED(hr)) + return hr; + + return IAVIStream_Write(This->pStream,-1,This->acmStreamHdr.cbDstLengthUsed / + This->lpOutFormat->nBlockAlign,This->acmStreamHdr.pbDst, + This->acmStreamHdr.cbDstLengthUsed,flags,sampwritten, + byteswritten); +} + +static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start, + LONG samples) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,%ld,%ld)\n", iface, start, samples); + + /* check parameters */ + if (start < 0 || samples < 0) + return AVIERR_BADPARAM; + + /* Delete before start of stream? */ + if ((DWORD)(start + samples) < This->sInfo.dwStart) + return AVIERR_OK; + + /* Delete after end of stream? */ + if ((DWORD)start > This->sInfo.dwLength) + return AVIERR_OK; + + /* For the rest we need write capability */ + if ((This->sInfo.dwCaps & AVIFILECAPS_CANWRITE) == 0) + return AVIERR_READONLY; + + /* A compressor is also necessary */ + if (This->has == NULL) + return AVIERR_NOCOMPRESSOR; + + /* map our positions to pStream positions */ + CONVERT_THIS_to_STREAM(&start); + CONVERT_THIS_to_STREAM(&samples); + + return IAVIStream_Delete(This->pStream, start, samples); +} + +static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc, + LPVOID lp, LPLONG lpread) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread); + + assert(This->pStream != NULL); + + return IAVIStream_ReadData(This->pStream, fcc, lp, lpread); +} + +static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc, + LPVOID lp, LONG size) +{ + IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + + TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size); + + assert(This->pStream != NULL); + + return IAVIStream_WriteData(This->pStream, fcc, lp, size); +} + +static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream *iface, + LPAVISTREAMINFOW info, LONG infolen) +{ + FIXME("(%p,%p,%ld): stub\n", iface, info, infolen); + + return E_FAIL; +} + +/********************************************************************** */ + +static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This) +{ + HRESULT hr; + + /* pre-conditions */ + assert(This != NULL); + assert(This->pStream != NULL); + + if (This->has != NULL) + return AVIERR_OK; + + if (This->lpInFormat == NULL) { + /* decode or encode the data from pStream */ + hr = AVIStreamFormatSize(This->pStream, This->sInfo.dwStart, &This->cbInFormat); + if (FAILED(hr)) + return hr; + This->lpInFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GMEM_MOVEABLE, This->cbInFormat); + if (This->lpInFormat == NULL) + return AVIERR_MEMORY; + + hr = IAVIStream_ReadFormat(This->pStream, This->sInfo.dwStart, + This->lpInFormat, &This->cbInFormat); + if (FAILED(hr)) + return hr; + + if (This->lpOutFormat == NULL) { + /* we must decode to default format */ + This->cbOutFormat = sizeof(PCMWAVEFORMAT); + This->lpOutFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GHND, This->cbOutFormat); + if (This->lpOutFormat == NULL) + return AVIERR_MEMORY; + + This->lpOutFormat->wFormatTag = WAVE_FORMAT_PCM; + if (acmFormatSuggest(NULL, This->lpInFormat, This->lpOutFormat, + This->cbOutFormat, ACM_FORMATSUGGESTF_WFORMATTAG) != S_OK) + return AVIERR_NOCOMPRESSOR; + } + } else if (This->lpOutFormat == NULL) + return AVIERR_ERROR; /* To what should I encode? */ + + if (acmStreamOpen(&This->has, NULL, This->lpInFormat, This->lpOutFormat, + NULL, 0, 0, ACM_STREAMOPENF_NONREALTIME) != S_OK) + return AVIERR_NOCOMPRESSOR; + + /* update AVISTREAMINFO structure */ + This->sInfo.dwSampleSize = This->lpOutFormat->nBlockAlign; + This->sInfo.dwScale = This->lpOutFormat->nBlockAlign; + This->sInfo.dwRate = This->lpOutFormat->nAvgBytesPerSec; + This->sInfo.dwQuality = (DWORD)ICQUALITY_DEFAULT; + SetRectEmpty(&This->sInfo.rcFrame); + + /* convert positions ansd sizes to output format */ + CONVERT_STREAM_to_THIS(&This->sInfo.dwStart); + CONVERT_STREAM_to_THIS(&This->sInfo.dwLength); + CONVERT_STREAM_to_THIS(&This->sInfo.dwSuggestedBufferSize); + + return AVIERR_OK; +} Property changes on: trunk/reactos/lib/avifil32/acmstream.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/avifil32/api.c --- trunk/reactos/lib/avifil32/api.c 2005-11-21 09:38:25 UTC (rev 19402) +++ trunk/reactos/lib/avifil32/api.c 2005-11-21 09:51:12 UTC (rev 19403) @@ -0,0 +1,2338 @@ +/* + * Copyright 1999 Marcus Meissner + * Copyright 2002-2003 Michael G³nnewig + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <assert.h> +#include <stdarg.h> + +#define COBJMACROS +#define COM_NO_WINDOWS_H + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" +#include "windowsx.h" + +#include "ole2.h" +#include "shellapi.h" +#include "shlobj.h" +#include "vfw.h" +#include "msacm.h" + +#include "avifile_private.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(avifile); + + +/********************************************************************** * + * for AVIBuildFilterW -- uses fixed size table + */ +#define MAX_FILTERS 30 /* 30 => 7kB */ + +typedef struct _AVIFilter { + WCHAR szClsid[40]; + WCHAR szExtensions[MAX_FILTERS * 7]; +} AVIFilter; + +/********************************************************************** * + * for AVISaveOptions + */ +static struct { + UINT uFlags; + INT nStreams; + PAVISTREAM *ppavis; + LPAVICOMPRESSOPTIONS *ppOptions; + INT nCurrent; +} SaveOpts; + +/********************************************************************** * + * copied from dlls/ole32/compobj.c + */ +static HRESULT AVIFILE_CLSIDFromString(LPCSTR idstr, LPCLSID id) +{ + BYTE const *s; + BYTE *p; + INT i; + BYTE table[256]; + + if (!idstr) { + memset(id, 0, sizeof(CLSID)); + return S_OK; + } + + /* validate the CLSID string */ + if (lstrlenA(idstr) != 38) + return CO_E_CLASSSTRING; + + s = (BYTE const*)idstr; + if ((s[0]!='{') || (s[9]!='-') || (s[14]!='-') || (s[19]!='-') || + (s[24]!='-') || (s[37]!='}')) + return CO_E_CLASSSTRING; + + for (i = 1; i < 37; i++) { + if ((i == 9) || (i == 14) || (i == 19) || (i == 24)) + continue; + if (!(((s[i] >= '0') && (s[i] <= '9')) || + ((s[i] >= 'a') && (s[i] <= 'f')) || + ((s[i] >= 'A') && (s[i] <= 'F'))) + ) + return CO_E_CLASSSTRING; + } + + TRACE("%s -> %p\n", s, id); + + /* quick lookup table */ + memset(table, 0, 256); + + for (i = 0; i < 10; i++) + table['0' + i] = i; + + for (i = 0; i < 6; i++) { + table['A' + i] = i+10; + table['a' + i] = i+10; + } + + /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ + p = (BYTE *) id; + + s++; /* skip leading brace */ + for (i = 0; i < 4; i++) { + p[3 - i] = table[*s]<<4 | table[*(s+1)]; + s += 2; + } + p += 4; + s++; /* skip - */ + + for (i = 0; i < 2; i++) { + p[1-i] = table[*s]<<4 | table[*(s+1)]; + s += 2; + } + p += 2; + s++; /* skip - */ + + for (i = 0; i < 2; i++) { + p[1-i] = table[*s]<<4 | table[*(s+1)]; + s += 2; + } + p += 2; + s++; /* skip - */ + + /* these are just sequential bytes */ + for (i = 0; i < 2; i++) { + *p++ = table[*s]<<4 | table[*(s+1)]; + s += 2; + } + s++; /* skip - */ + + for (i = 0; i < 6; i++) { + *p++ = table[*s]<<4 | table[*(s+1)]; + s += 2; + } + + return S_OK; +} + +static BOOL AVIFILE_GetFileHandlerByExtension(LPCWSTR szFile, LPCLSID lpclsid) +{ + CHAR szRegKey[25]; + CHAR szValue[100]; + LPWSTR szExt = strrchrW(szFile, '.'); + LONG len = sizeof(szValue) / sizeof(szValue[0]); + + if (szExt == NULL) + return FALSE; + + szExt++; + + wsprintfA(szRegKey, "AVIFile\\Extensions\\%.3ls", szExt); + if (RegQueryValueA(HKEY_CLASSES_ROOT, szRegKey, szValue, &len) != ERROR_SUCCESS) + return FALSE; + + return (AVIFILE_CLSIDFromString(szValue, lpclsid) == S_OK); +} + +/********************************************************************** * [truncated at 1000 lines; 11539 more skipped]

18 years, 10 months

← Newer
1
...
36
37
38
39
40
41
42
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005