Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[royce] 13925: don't assume zlib's include directory will work for hostzlib library

by royce＠svn.reactos.com

don't assume zlib's include directory will work for hostzlib library Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-11 07:46:22 UTC (rev 13924) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-11 07:51:43 UTC (rev 13925) @@ -1,6 +1,6 @@ <module name="cabman" type="buildtool"> <include base="cabman">.</include> - <include base="zlib">.</include> + <include base="hostzlib">.</include> <library>hostzlib</library> <file>cabinet.cxx</file> <file>dfp.cxx</file>

19 years, 9 months

[royce] 13924: host vs target refactoring, <module> has two new attributes 'host' and 'prefix' ( this should fix sedwards' host.zlib.a issue, and also forgot to commit change to buildno's makefile in support of new macros in top-level makefile ( which should fix build bug arty experiencing re buildno.h )

by royce＠svn.reactos.com

host vs target refactoring, <module> has two new attributes 'host' and 'prefix' ( this should fix sedwards' host.zlib.a issue, and also forgot to commit change to buildno's makefile in support of new macros in top-level makefile ( which should fix build bug arty experiencing re buildno.h ) Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml Added: branches/xmlbuildsystem/reactos/lib/zlib/zlib_common.xml Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml --- branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml 2005-03-11 07:46:22 UTC (rev 13924) @@ -1,17 +1,7 @@ <module name="zlib" type="staticlibrary"> - <include base="zlib">.</include> - <file>adler32.c</file> - <file>compress.c</file> - <file>crc32.c</file> - <file>gzio.c</file> - <file>uncompr.c</file> - <file>deflate.c</file> - <file>trees.c</file> - <file>zutil.c</file> - <file>inflate.c</file> - <file>infblock.c</file> - <file>inftrees.c</file> - <file>infcodes.c</file> - <file>infutil.c</file> - <file>inffast.c</file> + <xi:include href="zlib_common.xml" /> </module> + +<module name="hostzlib" type="staticlibrary" host="true" prefix="host_"> + <xi:include href="zlib_common.xml" /> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/zlib/zlib_common.xml --- branches/xmlbuildsystem/reactos/lib/zlib/zlib_common.xml 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib_common.xml 2005-03-11 07:46:22 UTC (rev 13924) @@ -0,0 +1,16 @@ +<include base="zlib">.</include> + +<file>adler32.c</file> +<file>compress.c</file> +<file>crc32.c</file> +<file>gzio.c</file> +<file>uncompr.c</file> +<file>deflate.c</file> +<file>trees.c</file> +<file>zutil.c</file> +<file>inflate.c</file> +<file>infblock.c</file> +<file>inftrees.c</file> +<file>infcodes.c</file> +<file>infutil.c</file> +<file>inffast.c</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile --- branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-11 07:46:22 UTC (rev 13924) @@ -28,7 +28,8 @@ buildno_clean: -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) -BUILDNO_H = include$(SEP)reactos$(SEP)buildno.h +# BUILDNO_H is defined from the top-level makefile now... +#BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h $(BUILDNO_H): $(BUILDNO_TARGET) $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-11 07:46:22 UTC (rev 13924) @@ -1,10 +1,10 @@ <module name="cabman" type="buildtool"> <include base="cabman">.</include> <include base="zlib">.</include> - <library>zlib</library> + <library>hostzlib</library> <file>cabinet.cxx</file> <file>dfp.cxx</file> <file>main.cxx</file> <file>mszip.cxx</file> <file>raw.cxx</file> -</module> +</module> \ No newline at end of file _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-11 07:46:22 UTC (rev 13924) @@ -312,6 +312,11 @@ module.node.location, module.type ); MingwModuleHandler::string_list clean_files; + if ( module.host == HostDefault ) + { + module.host = h->DefaultHost(); + assert ( module.host != HostDefault ); + } h->Process ( module, clean_files ); h->GenerateCleanTarget ( module, clean_files ); h->GenerateDirectoryTargets (); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-11 07:46:22 UTC (rev 13924) @@ -31,15 +31,41 @@ const string& newExtension ) { size_t index = filename.find_last_of ( '/' ); - if (index == string::npos) index = 0; - string tmp = filename.substr( index, filename.size() - index ); + if ( index == string::npos ) + index = 0; + size_t index2 = filename.find_last_of ( '\\' ); + if ( index2 != string::npos && index2 > index ) + index = index2; + string tmp = filename.substr( index /*, filename.size() - index*/ ); size_t ext_index = tmp.find_last_of( '.' ); - if (ext_index != string::npos) + if ( ext_index != string::npos ) return filename.substr ( 0, index + ext_index ) + newExtension; return filename + newExtension; } +string +PrefixFilename ( + const string& filename, + const string& prefix ) +{ + if ( !prefix.length() ) + return filename; + string out; + const char* pfilename = filename.c_str(); + const char* p1 = strrchr ( pfilename, '/' ); + const char* p2 = strrchr ( pfilename, '\\' ); + if ( p1 || p2 ) + { + if ( p2 > p1 ) + p1 = p2; + out += string(pfilename,p1-pfilename) + CSEP; + pfilename = p1 + 1; + } + out += prefix + pfilename; + return out; +} + MingwModuleHandler::MingwModuleHandler ( ModuleType moduletype ) { if ( !ref++ ) @@ -167,22 +193,9 @@ return dependencies; } -/*string -MingwModuleHandler::GetAllDependencies ( const Module& module ) const -{ - string dependencies = GetImportMacro ( module ); - string s = GetModuleDependencies ( module ); - if ( s.length () > 0 ) - { - dependencies += " "; - dependencies += s; - } - return dependencies; -}*/ - string MingwModuleHandler::GetSourceFilenames ( const Module& module, - bool includeGeneratedFiles ) const + bool includeGeneratedFiles ) const { size_t i; @@ -229,8 +242,8 @@ false ); } -string -MingwModuleHandler::GetObjectFilename ( const string& sourceFilename ) +static string +GetObjectFilename ( const Module& module, const string& sourceFilename ) { string newExtension; string extension = GetExtension ( sourceFilename ); @@ -240,7 +253,10 @@ newExtension = ".stubs.o"; else newExtension = ".o"; - return FixupTargetFilename ( ReplaceExtension ( sourceFilename, newExtension ) ); + return FixupTargetFilename ( + ReplaceExtension ( + PrefixFilename(sourceFilename,module.prefix), + newExtension ) ); } void @@ -274,7 +290,8 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ); + objectFilenames += PassThruCacheDirectory ( + GetObjectFilename ( module, files[i]->name ) ); } return objectFilenames; } @@ -514,6 +531,7 @@ void MingwModuleHandler::GenerateMacros ( + const Module& module, const char* assignmentOperation, const IfableData& data, const vector<CompilerFlag*>* compilerFlags, @@ -580,7 +598,7 @@ "%s := %s $(%s)\n", objs_macro.c_str(), PassThruCacheDirectory ( - MingwModuleHandler::GetObjectFilename ( file.name ) ).c_str (), + GetObjectFilename ( module, file.name ) ).c_str (), objs_macro.c_str() ); } } @@ -599,7 +617,7 @@ "%s%s", ( i%10 == 9 ? "\\\n\t" : " " ), PassThruCacheDirectory ( - MingwModuleHandler::GetObjectFilename ( file.name ) ).c_str () ); + GetObjectFilename ( module, file.name ) ).c_str () ); } } fprintf ( fMakefile, "\n" ); @@ -621,6 +639,7 @@ rIf.property.c_str(), rIf.value.c_str() ); GenerateMacros ( + module, "+=", rIf.data, NULL, @@ -651,6 +670,7 @@ const string& linkdeps_macro ) const { GenerateMacros ( + module, "=", module.non_if_data, &module.compilerFlags, @@ -721,7 +741,8 @@ string deps = sourceFilename; if ( module.pch && use_pch ) deps += " " + module.pch->header + ".gch"; - string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); + string objectFilename = PassThruCacheDirectory ( + GetObjectFilename ( module, sourceFilename ) ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), @@ -741,7 +762,8 @@ const string& cc, const string& cflagsMacro ) const { - string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); + string objectFilename = PassThruCacheDirectory ( + GetObjectFilename ( module, sourceFilename ) ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), @@ -760,7 +782,8 @@ const string& sourceFilename, const string& nasmflagsMacro ) const { - string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); + string objectFilename = PassThruCacheDirectory ( + GetObjectFilename ( module, sourceFilename ) ); fprintf ( fMakefile, "%s: %s\n", objectFilename.c_str (), @@ -779,7 +802,8 @@ const string& sourceFilename, const string& windresflagsMacro ) const { - string objectFilename = PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( sourceFilename ) ); + string objectFilename = PassThruCacheDirectory ( + GetObjectFilename ( module, sourceFilename ) ); string rciFilename = ReplaceExtension ( sourceFilename, ".rci" ); string resFilename = ReplaceExtension ( sourceFilename, @@ -859,7 +883,7 @@ const string& windresflagsMacro, string_list& clean_files ) const { - CLEAN_FILE ( GetObjectFilename(sourceFilename) ); + CLEAN_FILE ( GetObjectFilename(module,sourceFilename) ); string extension = GetExtension ( sourceFilename ); if ( extension == ".c" || extension == ".C" ) { @@ -1090,22 +1114,6 @@ fprintf ( fMakefile, "\n" ); } -void -MingwModuleHandler::GetCleanTargets ( - string_list& out, - const IfableData& data ) const -{ - size_t i; - - const vector<File*>& files = data.files; - for ( i = 0; i < files.size(); i++ ) - out.push_back ( PassThruCacheDirectory ( MingwModuleHandler::GetObjectFilename ( files[i]->name ) ) ); - - const vector<If*>& ifs = data.ifs; - for ( i = 0; i < ifs.size(); i++ ) - GetCleanTargets ( out, ifs[i]->data ); -} - string MingwModuleHandler::GenerateArchiveTarget ( const Module& module, const string& ar, @@ -1165,13 +1173,14 @@ void MingwModuleHandler::GenerateMacrosAndTargets ( const Module& module, - const string& cc, - const string& cppc, - const string& ar, const string* cflags, const string* nasmflags, string_list& clean_files ) const { + string cc = ( module.host ? "${host_gcc}" : "${gcc}" ); + string cppc = ( module.host ? "${host_gpp}" : "${gpp}" ); + string ar = ( module.host ? "${host_ar}" : "${ar}" ); + string cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); string nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); string windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); @@ -1234,50 +1243,6 @@ } } -void -MingwModuleHandler::GenerateMacrosAndTargetsHost ( - const Module& module, - string_list& clean_files ) const -{ - GenerateMacrosAndTargets ( - module, - "${host_gcc}", - "${host_gpp}", - "${host_ar}", - NULL, - NULL, - clean_files ); -} - -void -MingwModuleHandler::GenerateMacrosAndTargetsTarget ( - const Module& module, - string_list& clean_files ) const -{ - GenerateMacrosAndTargetsTarget ( - module, - NULL, - NULL, - clean_files ); -} - -void -MingwModuleHandler::GenerateMacrosAndTargetsTarget ( - const Module& module, - const string* cflags, - const string* nasmflags, - string_list& clean_files ) const -{ - GenerateMacrosAndTargets ( - module, - "${gcc}", - "${gpp}", - "${ar}", - cflags, - nasmflags, - clean_files ); -} - string MingwModuleHandler::GetInvocationDependencies ( const Module& module ) const { @@ -1489,7 +1454,11 @@ string linkDepsMacro = GetLinkingDependenciesMacro ( module ); string libsMacro = GetLibsMacro ( module ); - GenerateMacrosAndTargetsHost ( module, clean_files ); + GenerateMacrosAndTargets ( + module, + NULL, + NULL, + clean_files ); string linker; if ( IsCPlusPlusModule ( module ) ) @@ -1548,7 +1517,7 @@ module.entrypoint.c_str (), module.baseaddress.c_str () ); - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); GenerateImportLibraryTargetIfNeeded ( module, clean_files ); @@ -1615,7 +1584,7 @@ void MingwStaticLibraryModuleHandler::GenerateStaticLibraryModuleTarget ( const Module& module, string_list& clean_files ) { - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); } @@ -1637,7 +1606,7 @@ void MingwObjectLibraryModuleHandler::GenerateObjectLibraryModuleTarget ( const Module& module, string_list& clean_files ) { - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); } @@ -1672,7 +1641,7 @@ if ( module.non_if_data.files.size () > 0 ) { - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -1732,10 +1701,10 @@ if ( module.non_if_data.files.size () > 0 ) { string cflags ( "-D__NTDRIVER__" ); - GenerateMacrosAndTargetsTarget ( module, - &cflags, - NULL, - clean_files); + GenerateMacrosAndTargets ( module, + &cflags, + NULL, + clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -1791,7 +1760,7 @@ if ( module.non_if_data.files.size () > 0 ) { - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -1848,10 +1817,10 @@ if ( module.non_if_data.files.size () > 0 ) { string cflags ( "-D__NTAPP__" ); - GenerateMacrosAndTargetsTarget ( module, - &cflags, - NULL, - clean_files ); + GenerateMacrosAndTargets ( module, + &cflags, + NULL, + clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -1931,7 +1900,7 @@ if ( module.non_if_data.files.size () > 0 ) { - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -1939,7 +1908,7 @@ linkDepsMacro.c_str () ); string linker; - if ( IsCPlusPlusModule ( module ) ) + if ( module.cplusplus ) linker = "${gpp}"; else linker = "${gcc}"; @@ -1993,7 +1962,7 @@ if ( module.non_if_data.files.size () > 0 ) { - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -2001,7 +1970,7 @@ linkDepsMacro.c_str () ); string linker; - if ( IsCPlusPlusModule ( module ) ) + if ( module.cplusplus ) linker = "${gpp}"; else linker = "${gcc}"; @@ -2055,7 +2024,7 @@ if ( module.non_if_data.files.size () > 0 ) { - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -2063,7 +2032,7 @@ linkDepsMacro.c_str () ); string linker; - if ( IsCPlusPlusModule ( module ) ) + if ( module.cplusplus ) linker = "${gpp}"; else linker = "${gcc}"; @@ -2118,7 +2087,7 @@ string linkDepsMacro = GetLinkingDependenciesMacro ( module ); string libsMacro = GetLibsMacro ( module ); - GenerateMacrosAndTargetsTarget ( module, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), @@ -2164,10 +2133,10 @@ string objectsMacro = GetObjectsMacro ( module ); string* nasmflags = new string ( "-f bin" ); - GenerateMacrosAndTargetsTarget ( module, - NULL, - nasmflags, - clean_files ); + GenerateMacrosAndTargets ( module, + NULL, + nasmflags, + clean_files ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-11 07:46:22 UTC (rev 13924) @@ -7,6 +7,10 @@ ReplaceExtension ( const std::string& filename, const std::string& newExtension ); +extern std::string +PrefixFilename ( + const std::string& filename, + const std::string& prefix ); class MingwModuleHandler { @@ -23,10 +27,10 @@ static void SetUsePch ( bool use_pch ); static MingwModuleHandler* LookupHandler ( const std::string& location, ModuleType moduletype_ ); + virtual HostType DefaultHost() = 0; virtual void Process ( const Module& module, string_list& clean_files ) = 0; bool IncludeDirectoryTarget ( const std::string& directory ) const; void GenerateDirectoryTargets () const; - static std::string GetObjectFilename ( const std::string& sourceFilename ); void GenerateCleanTarget ( const Module& module, const string_list& clean_files ) const; protected: @@ -45,14 +49,6 @@ std::string GetSourceFilenamesWithoutGeneratedFiles ( const Module& module ) const; std::string GetObjectFilenames ( const Module& module ) const; - void GenerateMacrosAndTargetsHost ( const Module& module, - string_list& clean_files ) const; - void GenerateMacrosAndTargetsTarget ( const Module& module, - string_list& clean_files ) const; - void GenerateMacrosAndTargetsTarget ( const Module& module, - const std::string* cflags, - const std::string* nasmflags, - string_list& clean_files ) const; std::string GetInvocationDependencies ( const Module& module ) const; void GenerateInvocations ( const Module& module ) const; @@ -69,6 +65,10 @@ const std::string& objectsMacro, const std::string& libsMacro, string_list& clean_files ) const; + void GenerateMacrosAndTargets ( const Module& module, + const std::string* clags, + const std::string* nasmflags, + string_list& clean_files ) const; void GenerateImportLibraryTargetIfNeeded ( const Module& module, string_list& clean_files ) const; std::string GetDefinitionDependencies ( const Module& module ) const; std::string GetLinkingDependencies ( const Module& module ) const; @@ -90,7 +90,9 @@ const std::string& macro, const IfableData& data, const std::vector<CompilerFlag*>* compilerFlags ) const; - void GenerateMacros ( const char* op, + void GenerateMacros ( + const Module& module, + const char* op, const IfableData& data, const std::vector<CompilerFlag*>* compilerFlags, const std::vector<LinkerFlag*>* linkerFlags, @@ -152,18 +154,9 @@ const std::string& nasmflagsMacro, const std::string& windresflagsMacro, string_list& clean_files ) const; - void GetCleanTargets ( string_list& out, - const IfableData& data ) const; std::string GenerateArchiveTarget ( const Module& module, const std::string& ar, const std::string& objs_macro ) const; - void GenerateMacrosAndTargets ( const Module& module, - const std::string& cc, - const std::string& cppc, - const std::string& ar, - const std::string* clags, - const std::string* nasmflags, - string_list& clean_files ) const; std::string GetSpecObjectDependencies ( const std::string& filename ) const; std::string GetDefaultDependencies ( const Module& module ) const; }; @@ -173,6 +166,7 @@ { public: MingwBuildToolModuleHandler (); + virtual HostType DefaultHost() { return HostTrue; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateBuildToolModuleTarget ( const Module& module, string_list& clean_files ); @@ -183,6 +177,7 @@ { public: MingwKernelModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateKernelModuleTarget ( const Module& module, string_list& clean_files ); @@ -193,6 +188,7 @@ { public: MingwStaticLibraryModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateStaticLibraryModuleTarget ( const Module& module, string_list& clean_files ); @@ -203,6 +199,7 @@ { public: MingwObjectLibraryModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateObjectLibraryModuleTarget ( const Module& module, string_list& clean_files ); @@ -213,6 +210,7 @@ { public: MingwKernelModeDLLModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateKernelModeDLLModuleTarget ( const Module& module, string_list& clean_files ); @@ -223,6 +221,7 @@ { public: MingwKernelModeDriverModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateKernelModeDriverModuleTarget ( const Module& module, string_list& clean_files ); @@ -233,6 +232,7 @@ { public: MingwNativeDLLModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateNativeDLLModuleTarget ( const Module& module, string_list& clean_files ); @@ -243,6 +243,7 @@ { public: MingwNativeCUIModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateNativeCUIModuleTarget ( const Module& module, string_list& clean_files ); @@ -253,6 +254,7 @@ { public: MingwWin32DLLModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateExtractWineDLLResourcesTarget ( const Module& module, string_list& clean_files ); @@ -264,6 +266,7 @@ { public: MingwWin32CUIModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateWin32CUIModuleTarget ( const Module& module, string_list& clean_files ); @@ -274,6 +277,7 @@ { public: MingwWin32GUIModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateWin32GUIModuleTarget ( const Module& module, string_list& clean_files ); @@ -284,6 +288,7 @@ { public: MingwBootLoaderModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateBootLoaderModuleTarget ( const Module& module, string_list& clean_files ); @@ -294,6 +299,7 @@ { public: MingwBootSectorModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateBootSectorModuleTarget ( const Module& module, string_list& clean_files ); @@ -304,6 +310,7 @@ { public: MingwIsoModuleHandler (); + virtual HostType DefaultHost() { return HostFalse; } virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateIsoModuleTarget ( const Module& module, string_list& clean_files ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-11 07:46:22 UTC (rev 13924) @@ -92,7 +92,8 @@ importLibrary (NULL), bootstrap (NULL), pch (NULL), - cplusplus (false) + cplusplus (false), + host (HostDefault) { if ( node.name != "module" ) throw Exception ( "internal tool error: Module created with non-<module> node" ); @@ -127,9 +128,43 @@ att = moduleNode.GetAttribute ( "mangledsymbols", false ); if ( att != NULL ) - mangledSymbols = att->value != "false"; + { + const char* p = att->value.c_str(); + if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + mangledSymbols = true; + else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + mangledSymbols = false; + else + { + throw InvalidAttributeValueException ( + moduleNode.location, + "mangledsymbols", + att->value ); + } + } else mangledSymbols = false; + + att = moduleNode.GetAttribute ( "host", false ); + if ( att != NULL ) + { + const char* p = att->value.c_str(); + if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) + host = HostTrue; + else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) + host = HostFalse; + else + { + throw InvalidAttributeValueException ( + moduleNode.location, + "host", + att->value ); + } + } + + att = moduleNode.GetAttribute ( "prefix", false ); + if ( att != NULL ) + prefix = att->value; } Module::~Module () _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-11 07:41:19 UTC (rev 13923) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-11 07:46:22 UTC (rev 13924) @@ -131,6 +131,12 @@ Iso }; +enum HostType +{ + HostDefault, + HostTrue, + HostFalse +}; class Module { @@ -153,6 +159,8 @@ std::vector<LinkerFlag*> linkerFlags; PchFile* pch; bool cplusplus; + std::string prefix; + HostType host; Module ( const Project& project, const XMLElement& moduleNode,

19 years, 9 months

[royce] 13923: remove unnessary @true, and create some macros to clean things up

by royce＠svn.reactos.com

remove unnessary @true, and create some macros to clean things up Modified: branches/xmlbuildsystem/reactos/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-11 07:30:17 UTC (rev 13922) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-11 07:41:19 UTC (rev 13923) @@ -30,23 +30,23 @@ ECHO_CDMAKE =@echo [CDMAKE] $@ ECHO_TEST =@echo [TEST] $@ else - ECHO_INVOKE =@true - ECHO_PCH =@true - ECHO_CC =@true - ECHO_GAS =@true - ECHO_NASM =@true - ECHO_AR =@true - ECHO_WINEBLD=@true - ECHO_WRC =@true - ECHO_BIN2RES=@true - ECHO_DLLTOOL=@true - ECHO_LD =@true - ECHO_RBUILD =@true - ECHO_RSYM =@true - ECHO_NCI =@true - ECHO_CABMAN =@true - ECHO_CDMAKE =@true - ECHO_TEST =@true + ECHO_INVOKE = + ECHO_PCH = + ECHO_CC = + ECHO_GAS = + ECHO_NASM = + ECHO_AR = + ECHO_WINEBLD= + ECHO_WRC = + ECHO_BIN2RES= + ECHO_DLLTOOL= + ECHO_LD = + ECHO_RBUILD = + ECHO_RSYM = + ECHO_NCI = + ECHO_CABMAN = + ECHO_CDMAKE = + ECHO_TEST = endif @@ -102,15 +102,23 @@ ${nmkdir} $(ROS_INTERMEDIATE) endif +NTOSKRNL_MC = .$(SEP)ntoskrnl$(SEP)ntoskrnl.mc +KERNEL32_MC = .$(SEP)lib$(SEP)kernel32$(SEP)kernel32.mc +BUILDNO_H = .$(SEP)include$(SEP)reactos$(SEP)buildno.h +BUGCODES_H = .$(SEP)include$(SEP)reactos$(SEP)bugcodes.h +BUGCODES_RC = .$(SEP)ntoskrnl$(SEP)bugcodes.rc +ERRCODES_H = .$(SEP)include$(SEP)reactos$(SEP)errcodes.h +ERRCODES_RC = .$(SEP)lib$(SEP)kernel32$(SEP)errcodes.rc + include tools/Makefile -include makefile.auto PREAUTO := \ - include$(SEP)reactos$(SEP)buildno.h \ - include$(SEP)reactos$(SEP)bugcodes.h \ - ntoskrnl$(SEP)bugcodes.rc \ - include$(SEP)reactos$(SEP)errcodes.h \ - lib$(SEP)kernel32$(SEP)errcodes.rc + $(BUILDNO_H) \ + $(BUGCODES_H) \ + $(BUGCODES_RC) \ + $(ERRCODES_H) \ + $(ERRCODES_RC) makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(WRC_TARGET) \ $(RSYM_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) @@ -118,11 +126,11 @@ $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw -include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: $(WMC_TARGET) ntoskrnl$(SEP)ntoskrnl.mc - $(WMC_TARGET) -i -H include$(SEP)reactos$(SEP)bugcodes.h -o ntoskrnl$(SEP)bugcodes.rc ntoskrnl$(SEP)ntoskrnl.mc +$(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC) + $(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) -include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: $(WMC_TARGET) lib$(SEP)kernel32$(SEP)kernel32.mc - $(WMC_TARGET) -i -H include$(SEP)reactos$(SEP)errcodes.h -o lib$(SEP)kernel32$(SEP)errcodes.rc lib$(SEP)kernel32$(SEP)kernel32.mc +$(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC) + $(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) .PHONY: makefile_auto_clean makefile_auto_clean:

19 years, 9 months

[arty] 13922: Uniform handling of stream socket reads.

by arty＠svn.reactos.com

Uniform handling of stream socket reads. Modified: trunk/reactos/drivers/net/afd/afd/main.c Modified: trunk/reactos/drivers/net/afd/afd/read.c Modified: trunk/reactos/drivers/net/afd/include/afd.h _____ Modified: trunk/reactos/drivers/net/afd/afd/main.c --- trunk/reactos/drivers/net/afd/afd/main.c 2005-03-11 02:38:55 UTC (rev 13921) +++ trunk/reactos/drivers/net/afd/afd/main.c 2005-03-11 07:30:17 UTC (rev 13922) @@ -20,8 +20,8 @@ #ifdef DBG /* See debug.h for debug/trace constants */ -//DWORD DebugTraceLevel = DEBUG_ULTRA; -DWORD DebugTraceLevel = 0; +DWORD DebugTraceLevel = DEBUG_ULTRA; +//DWORD DebugTraceLevel = 0; #endif /* DBG */ _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2005-03-11 02:38:55 UTC (rev 13921) +++ trunk/reactos/drivers/net/afd/afd/read.c 2005-03-11 07:30:17 UTC (rev 13922) @@ -26,8 +26,6 @@ #include "tdiconn.h" #include "debug.h" -static VOID ProcessClose( PAFD_FCB FCB ); - BOOLEAN CantReadMore( PAFD_FCB FCB ) { UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; @@ -106,7 +104,8 @@ if( Status == STATUS_SUCCESS ) { if( !FCB->ReceiveIrp.Iosb.Information ) { AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); - ProcessClose( FCB ); + FCB->PollState |= AFD_EVENT_DISCONNECT; + PollReeval( FCB->DeviceExt, FCB->FileObject ); } FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; } @@ -118,66 +117,40 @@ return STATUS_SUCCESS; } -static VOID ProcessClose( PAFD_FCB FCB ) { +NTSTATUS ReceiveActivity( PAFD_FCB FCB, PIRP Irp ) { PLIST_ENTRY NextIrpEntry; PIRP NextIrp; - - AFD_DbgPrint(MID_TRACE,("Socket shutdown from remote side\n")); - - /* Kill remaining recv irps */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%x)\n", - NextIrp, STATUS_END_OF_FILE)); - NextIrp->IoStatus.Status = STATUS_SUCCESS; - NextIrp->IoStatus.Information = 0; - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - - /* Handle closing signal */ - FCB->PollState |= AFD_EVENT_DISCONNECT | SOCKET_STATE_EOF_READ; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); -} - -NTSTATUS DDKAPI ReceiveComplete -( PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Context ) { - NTSTATUS Status = Irp->IoStatus.Status; - PAFD_FCB FCB = (PAFD_FCB)Context; - PLIST_ENTRY NextIrpEntry; - PIRP NextIrp; PIO_STACK_LOCATION NextIrpSp; PAFD_RECV_INFO RecvReq; UINT TotalBytesCopied = 0; + NTSTATUS Status = STATUS_SUCCESS, RetStatus = STATUS_PENDING; - AFD_DbgPrint(MID_TRACE,("Called\n")); + AFD_DbgPrint(MID_TRACE,("%x %x\n", FCB, Irp)); - ASSERT_IRQL(APC_LEVEL); - - if( !SocketAcquireStateLock( FCB ) ) return Status; - - FCB->ReceiveIrp.InFlightRequest = NULL; - FCB->Recv.Content = Irp->IoStatus.Information; - FCB->Recv.BytesUsed = 0; - - if( FCB->State == SOCKET_STATE_CLOSED ) { - AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); - SocketStateUnlock( FCB ); - DestroySocket( FCB ); - return STATUS_SUCCESS; - } else if( FCB->State == SOCKET_STATE_LISTENING ) { - AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); - SocketStateUnlock( FCB ); - return STATUS_UNSUCCESSFUL; - } - - if( NT_SUCCESS(Irp->IoStatus.Status) && - Irp->IoStatus.Information ) { + if( CantReadMore( FCB ) ) { + /* Success here means that we got an EOF. Complete a pending read + * with zero bytes if we haven't yet overread, then kill the others. + */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + Status = NextIrp->IoStatus.Status = + FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; + NextIrp->IoStatus.Information = 0; + if( NextIrp == Irp ) RetStatus = Status; + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + FCB->Overread = TRUE; + } + } else { /* Kick the user that receive would be possible now */ /* XXX Not implemented yet */ @@ -214,31 +187,10 @@ RecvReq->BufferCount, FALSE ); NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) RetStatus = Status; IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } - - Status = STATUS_SUCCESS; - } else { - /* Success here means that we got an EOF. Close all pending reads - * with EOF. Data won't have been available before. */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = - RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = - CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = 0; - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - ProcessClose( FCB ); } if( FCB->Recv.Content ) { @@ -248,10 +200,53 @@ PollReeval( FCB->DeviceExt, FCB->FileObject ); - SocketStateUnlock( FCB ); + AFD_DbgPrint(MID_TRACE,("RetStatus for irp %x is %x\n", Irp, RetStatus)); - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + return RetStatus; +} +NTSTATUS DDKAPI ReceiveComplete +( PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context ) { + NTSTATUS Status = Irp->IoStatus.Status; + PAFD_FCB FCB = (PAFD_FCB)Context; + + AFD_DbgPrint(MID_TRACE,("Called\n")); + + ASSERT_IRQL(APC_LEVEL); + + if( !SocketAcquireStateLock( FCB ) ) return Status; + + FCB->ReceiveIrp.InFlightRequest = NULL; + FCB->Recv.Content = Irp->IoStatus.Information; + FCB->Recv.BytesUsed = 0; + + if( FCB->State == SOCKET_STATE_CLOSED ) { + AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); + SocketStateUnlock( FCB ); + DestroySocket( FCB ); + return STATUS_SUCCESS; + } else if( FCB->State == SOCKET_STATE_LISTENING ) { + AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); + SocketStateUnlock( FCB ); + return STATUS_UNSUCCESSFUL; + } + + Status = FCB->ReceiveIrp.Iosb.Status; + + if( Irp->IoStatus.Status == STATUS_SUCCESS && + Irp->IoStatus.Information == 0 ) { + AFD_DbgPrint(MID_TRACE,("Looks like an EOF\n")); + FCB->PollState |= AFD_EVENT_DISCONNECT; + } + + ReceiveActivity( FCB, NULL ); + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + + SocketStateUnlock( FCB ); + AFD_DbgPrint(MID_TRACE,("Returned %x\n", Status)); return Status; @@ -274,7 +269,8 @@ FCB->State != SOCKET_STATE_CONNECTING ) { AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", FCB->State)); - return STATUS_UNSUCCESSFUL; + return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, + Irp, 0, NULL, FALSE ); } if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) @@ -291,57 +287,40 @@ return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL, FALSE ); + AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); + RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, NULL, NULL, TRUE, FALSE ); - /* Check if we're not closed down yet */ + Irp->IoStatus.Status = STATUS_PENDING; + Irp->IoStatus.Information = 0; - if( !CantReadMore(FCB) ) { - AFD_DbgPrint(MID_TRACE,("Not EOF yet\n")); - if( FCB->ReceiveIrp.InFlightRequest ) { - AFD_DbgPrint(MID_TRACE,("We're waiting on a previous irp\n")); - Status = STATUS_PENDING; - } else { - AFD_DbgPrint(MID_TRACE,("The buffer is likely not empty\n")); - Status = STATUS_SUCCESS; - } - } else { - if( FCB->PollState & SOCKET_STATE_EOF_READ ) - Status = STATUS_END_OF_FILE; - else - Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("EOF Happened already\n")); - FCB->Recv.Content = 0; - FCB->Recv.BytesUsed = 0; + InsertTailList( &FCB->PendingIrpList[FUNCTION_RECV], + &Irp->Tail.Overlay.ListEntry ); - ProcessClose( FCB ); + /************ From this point, the IRP is not ours ************/ - return UnlockAndMaybeComplete - ( FCB, Status, Irp, 0, NULL, FALSE); - } - - if( NT_SUCCESS(Status) ) { - AFD_DbgPrint(MID_TRACE,("TryToSatisfy\n")); - Status = TryToSatisfyRecvRequestFromBuffer - ( FCB, RecvReq, &TotalBytesCopied ); - } + Status = ReceiveActivity( FCB, Irp ); - if( Status != STATUS_PENDING || RecvReq->AfdFlags & AFD_IMMEDIATE ) { - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - Status = STATUS_CANT_WAIT; - TotalBytesCopied = 0; - } - UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); - return UnlockAndMaybeComplete( FCB, Status, Irp, - TotalBytesCopied, NULL, TRUE ); - } else { + if( Status == STATUS_PENDING && RecvReq->AfdFlags & AFD_IMMEDIATE ) { + AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + Status = STATUS_CANT_WAIT; + TotalBytesCopied = 0; + RemoveEntryList( &Irp->Tail.Overlay.ListEntry ); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); + return UnlockAndMaybeComplete( FCB, Status, Irp, + TotalBytesCopied, NULL, TRUE ); + } else if( Status == STATUS_PENDING ) { AFD_DbgPrint(MID_TRACE,("Leaving read irp\n")); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); + IoMarkIrpPending( Irp ); + } else { + AFD_DbgPrint(MID_TRACE,("Completed with status %x\n", Status)); } + + SocketStateUnlock( FCB ); + return Status; } _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-03-11 02:38:55 UTC (rev 13921) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-03-11 07:30:17 UTC (rev 13922) @@ -132,7 +132,7 @@ } AFD_STORED_DATAGRAM, *PAFD_STORED_DATAGRAM; typedef struct _AFD_FCB { - BOOLEAN Locked, Critical; + BOOLEAN Locked, Critical, Overread; UINT State, Flags; KIRQL OldIrql; UINT LockCount;

19 years, 9 months

[royce] 13921: turn on all warnings, and fix remaining warnings

by royce＠svn.reactos.com

turn on all warnings, and fix remaining warnings Modified: trunk/reactos/tools/unicode/Makefile Modified: trunk/reactos/tools/unicode/string.c _____ Modified: trunk/reactos/tools/unicode/Makefile --- trunk/reactos/tools/unicode/Makefile 2005-03-11 02:37:30 UTC (rev 13920) +++ trunk/reactos/tools/unicode/Makefile 2005-03-11 02:38:55 UTC (rev 13921) @@ -8,7 +8,7 @@ TARGET_CFLAGS = -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ -Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ - -I$(PATH_TO_TOP)/include/wine + -I$(PATH_TO_TOP)/include/wine -Wall -Werror CODEPAGES = \ 037 \ _____ Modified: trunk/reactos/tools/unicode/string.c --- trunk/reactos/tools/unicode/string.c 2005-03-11 02:37:30 UTC (rev 13920) +++ trunk/reactos/tools/unicode/string.c 2005-03-11 02:38:55 UTC (rev 13921) @@ -20,6 +20,7 @@ #include <limits.h> #include <stdio.h> +#include <ctype.h> #include "wine/unicode.h"

19 years, 9 months

[royce] 13920: fix gcc4 warnings

by royce＠svn.reactos.com

fix gcc4 warnings Modified: trunk/reactos/tools/unicode/mbtowc.c Modified: trunk/reactos/tools/unicode/wctomb.c _____ Modified: trunk/reactos/tools/unicode/mbtowc.c --- trunk/reactos/tools/unicode/mbtowc.c 2005-03-10 22:59:28 UTC (rev 13919) +++ trunk/reactos/tools/unicode/mbtowc.c 2005-03-11 02:37:30 UTC (rev 13920) @@ -22,6 +22,8 @@ #include "wine/unicode.h" +typedef unsigned char uchar; + /* get the decomposition of a Unicode char */ int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen ) { @@ -256,25 +258,25 @@ { if (flags & MB_ERR_INVALID_CHARS) { - if (check_invalid_chars_sbcs( &table->sbcs, src, srclen )) return -2; + if (check_invalid_chars_sbcs( &table->sbcs, (const uchar*)src, srclen )) return -2; } if (!(flags & MB_COMPOSITE)) { if (!dstlen) return srclen; - return mbstowcs_sbcs( &table->sbcs, src, srclen, dst, dstlen ); + return mbstowcs_sbcs( &table->sbcs, (const uchar*)src, srclen, dst, dstlen ); } - return mbstowcs_sbcs_decompose( &table->sbcs, src, srclen, dst, dstlen ); + return mbstowcs_sbcs_decompose( &table->sbcs, (const uchar*)src, srclen, dst, dstlen ); } else /* mbcs */ { if (flags & MB_ERR_INVALID_CHARS) { - if (check_invalid_chars_dbcs( &table->dbcs, src, srclen )) return -2; + if (check_invalid_chars_dbcs( &table->dbcs, (const uchar*)src, srclen )) return -2; } if (!(flags & MB_COMPOSITE)) - return mbstowcs_dbcs( &table->dbcs, src, srclen, dst, dstlen ); + return mbstowcs_dbcs( &table->dbcs, (const uchar*)src, srclen, dst, dstlen ); else - return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); + return mbstowcs_dbcs_decompose( &table->dbcs, (const uchar*)src, srclen, dst, dstlen ); } } _____ Modified: trunk/reactos/tools/unicode/wctomb.c --- trunk/reactos/tools/unicode/wctomb.c 2005-03-10 22:59:28 UTC (rev 13919) +++ trunk/reactos/tools/unicode/wctomb.c 2005-03-11 02:37:30 UTC (rev 13920) @@ -196,7 +196,7 @@ int tmp; WCHAR composed; - if (!defchar) defchar = &table_default; + if (!defchar) defchar = (const char*)&table_default; if (!used) used = &tmp; /* avoid checking on every char */ *used = 0;

19 years, 9 months

[gvg] 13919: Pass NameLength back to caller

by gvg＠svn.reactos.com

Pass NameLength back to caller Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-03-10 20:54:53 UTC (rev 13918) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-03-10 22:59:28 UTC (rev 13919) @@ -1285,6 +1285,7 @@ RtlCopyMemory (Name->sa_data, SocketAddress->Address[0].Address, SocketAddress->Address[0].AddressLength); + *NameLength = 2 + SocketAddress->Address[0].AddressLength; HeapFree(GlobalHeap, 0, TdiAddress); return 0; } else {

19 years, 9 months

[arty] 13918: Caps Lock fix suggested by Johannes Olofsson. We now xor the caps lock

by arty＠svn.reactos.com

Caps Lock fix suggested by Johannes Olofsson. We now xor the caps lock attribute bit with the mod bits before turning them into a column number. Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-03-10 20:34:08 UTC (rev 13917) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-03-10 20:54:53 UTC (rev 13918) @@ -216,7 +216,7 @@ PVK_TO_WCHAR_TABLE vtwTbl; PVK_TO_WCHARS10 vkPtr; size_t size_this_entry; - int nMod, shift; + int nMod; DWORD CapsMod = 0, CapsState = 0; CapsState = ModBits & ~MOD_BITS_MASK; @@ -228,8 +228,6 @@ { return FALSE; } - shift = keyLayout->pCharModifiers->ModNumber[ModBits]; - for (nMod = 0; keyLayout->pVkToWcharTable[nMod].nModifications; nMod++) { vtwTbl = &keyLayout->pVkToWcharTable[nMod]; @@ -239,9 +237,10 @@ { if( wVirtKey == (vkPtr->VirtualKey & 0xff) ) { - CapsMod = - shift | ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0); - + CapsMod = keyLayout->pCharModifiers->ModNumber + [ModBits ^ + ((CapsState & CAPITAL_BIT) ? vkPtr->Attributes : 0)]; + if( CapsMod > keyLayout->pVkToWcharTable[nMod].nModifications ) { DWORD MaxBit = 1; while( MaxBit < @@ -256,9 +255,9 @@ *pbLigature = vkPtr->wch[CapsMod] == WCH_LGTR; *pwcTranslatedChar = vkPtr->wch[CapsMod]; - DPRINT("%d %04x: CapsMod %08x CapsState %08x shift %08x Char %04x\n", + DPRINT("%d %04x: CapsMod %08x CapsState %08x Char %04x\n", nMod, wVirtKey, - CapsMod, CapsState, shift, *pwcTranslatedChar); + CapsMod, CapsState, *pwcTranslatedChar); if( *pbDead ) { @@ -269,7 +268,7 @@ DPRINT( "VK: %04x, ADDR: %08x\n", wVirtKey, (int)vkPtr ); return FALSE; } - *pwcTranslatedChar = vkPtr->wch[shift]; + *pwcTranslatedChar = vkPtr->wch[CapsMod]; } return TRUE; }

19 years, 9 months

[royce] 13917: more efficient detection of C++ modules, fixed bug in C++ pch support, always clean pch files, even if pch not being used

by royce＠svn.reactos.com

more efficient detection of C++ modules, fixed bug in C++ pch support, always clean pch files, even if pch not being used Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-10 20:07:17 UTC (rev 13916) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-10 20:34:08 UTC (rev 13917) @@ -1056,24 +1056,27 @@ const string& windresflagsMacro, string_list& clean_files ) const { - if ( module.pch && use_pch ) + if ( module.pch ) { const string& pch_file = module.pch->header; string gch_file = pch_file + ".gch"; CLEAN_FILE(gch_file); - fprintf ( - fMakefile, - "%s: %s\n", - gch_file.c_str(), - pch_file.c_str() ); - fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); - fprintf ( - fMakefile, - "\t%s -c %s -o %s %s\n\n", - cc.c_str(), - pch_file.c_str(), - gch_file.c_str(), - cflagsMacro.c_str() ); + if ( use_pch ) + { + fprintf ( + fMakefile, + "%s: %s\n", + gch_file.c_str(), + pch_file.c_str() ); + fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); + fprintf ( + fMakefile, + "\t%s -o %s %s -g %s\n\n", + ( module.cplusplus ? cppc.c_str() : cc.c_str() ), + gch_file.c_str(), + cflagsMacro.c_str(), + pch_file.c_str() ); + } } GenerateObjectFileTargets ( module, @@ -1456,18 +1459,10 @@ return dependencies; } -// TODO FIXME - check for C++ extensions when parsing XML, and set a -// bool in the Module class bool MingwModuleHandler::IsCPlusPlusModule ( const Module& module ) const { - if ( module.HasFileWithExtension ( module.non_if_data, ".cc" ) ) - return true; - if ( module.HasFileWithExtension ( module.non_if_data, ".cxx" ) ) - return true; - if ( module.HasFileWithExtension ( module.non_if_data, ".cpp" ) ) - return true; - return false; + return module.cplusplus; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-10 20:07:17 UTC (rev 13916) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-10 20:34:08 UTC (rev 13917) @@ -91,7 +91,8 @@ node (moduleNode), importLibrary (NULL), bootstrap (NULL), - pch (NULL) + pch (NULL), + cplusplus (false) { if ( node.name != "module" ) throw Exception ( "internal tool error: Module created with non-<module> node" ); @@ -185,6 +186,17 @@ e.location, "attribute 'first' of <file> element can only be 'true' or 'false'" ); } + if ( !cplusplus ) + { + // check for c++ file + string ext = GetExtension ( e.value ); + if ( !stricmp ( ext.c_str(), ".cpp" ) ) + cplusplus = true; + else if ( !stricmp ( ext.c_str(), ".cc" ) ) + cplusplus = true; + else if ( !stricmp ( ext.c_str(), ".cxx" ) ) + cplusplus = true; + } File* pFile = new File ( FixSeparator ( path + CSEP + e.value ), first ); if ( pIf ) pIf->data.files.push_back ( pFile ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-10 20:07:17 UTC (rev 13916) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-10 20:34:08 UTC (rev 13917) @@ -152,6 +152,7 @@ std::vector<CompilerFlag*> compilerFlags; std::vector<LinkerFlag*> linkerFlags; PchFile* pch; + bool cplusplus; Module ( const Project& project, const XMLElement& moduleNode,

19 years, 9 months

[ekohl] 13916: Implement '-o' option. This is equivalent to MIDLs '/oldnames' option.

by ekohl＠svn.reactos.com

Implement '-o' option. This is equivalent to MIDLs '/oldnames' option. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/widl/widl.c Modified: trunk/reactos/tools/widl/widl.h _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-10 19:56:46 UTC (rev 13915) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-10 20:07:17 UTC (rev 13916) @@ -1,5 +1,16 @@ ChangeLog +2005-03-10 ekohl + + tools/widl/client.c + tools/widl/header.c + tools/widl/server.c + tools/widl/widl.c + tools/widl/widl.h + +Implement '-o' option. This is equivalent to MIDLs '/oldnames' option. + + 2005-03-06 ekohl tools/widl/client.c @@ -20,13 +31,13 @@ tools/widl/typelib.c Merge in Winehq changes to reduce noise. - + tools/widl/server.h tools/widl/client.h tools/widl/proxy.h -Deleted unneeded headers. - +Deleted unneeded headers. + 2005-02-26 ekohl tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-03-10 19:56:46 UTC (rev 13915) +++ trunk/reactos/tools/widl/client.c 2005-03-10 20:07:17 UTC (rev 13916) @@ -672,8 +672,12 @@ print_client("0,\n"); indent--; print_client("};\n"); - print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", - iface->name, LOWORD(ver), HIWORD(ver), iface->name); + if (old_names) + print_client("RPC_IF_HANDLE %s_ClientIfHandle = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + iface->name, iface->name); + else + print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + iface->name, LOWORD(ver), HIWORD(ver), iface->name); fprintf(client, "\n"); } _____ Modified: trunk/reactos/tools/widl/header.c --- trunk/reactos/tools/widl/header.c 2005-03-10 19:56:46 UTC (rev 13915) +++ trunk/reactos/tools/widl/header.c 2005-03-10 20:07:17 UTC (rev 13916) @@ -851,8 +851,16 @@ { fprintf(header, "extern handle_t %s;\n", var); } - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + if (old_names) + { + fprintf(header, "extern RPC_IF_HANDLE %s_ClientIfHandle;\n", iface->name); + fprintf(header, "extern RPC_IF_HANDLE %s_ServerIfHandle;\n", iface->name); + } + else + { + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + } write_function_proto(iface); fprintf(header, "\n"); _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-03-10 19:56:46 UTC (rev 13915) +++ trunk/reactos/tools/widl/server.c 2005-03-10 20:07:17 UTC (rev 13916) @@ -677,8 +677,12 @@ print_server("0,\n"); indent--; print_server("};\n"); - print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", - iface->name, LOWORD(ver), HIWORD(ver), iface->name); + if (old_names) + print_server("RPC_IF_HANDLE %s_ServerIfHandle = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + iface->name, iface->name); + else + print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + iface->name, LOWORD(ver), HIWORD(ver), iface->name); fprintf(server, "\n"); } _____ Modified: trunk/reactos/tools/widl/widl.c --- trunk/reactos/tools/widl/widl.c 2005-03-10 19:56:46 UTC (rev 13915) +++ trunk/reactos/tools/widl/widl.c 2005-03-10 20:07:17 UTC (rev 13916) @@ -58,6 +58,7 @@ " -H file Name of header file (default is infile.h)\n" " -I path Set include search dir to path (multiple -I allowed)\n" " -N Do not preprocess input\n" +" -o Use old naming conventions\n" " -p Generate proxy\n" " -P file Name of proxy file (default is infile_p.c)\n" " -s Generate server stub\n" @@ -90,6 +91,7 @@ int do_client = 0; int do_server = 0; int no_preprocess = 0; +int old_names = 0; char *input_name; char *header_name; @@ -142,8 +144,8 @@ now = time(NULL); - while((optc = getopt(argc, argv, "cC:d:D:EhH:I:NpP:sS:tT:VW")) != EOF) { - switch(optc) { + while((optc = getopt(argc, argv, "cC:d:D:EhH:I:NopP:sS:tT:VW")) != EOF) { + switch (optc) { case 'c': do_everything = 0; do_client = 1; @@ -174,6 +176,9 @@ case 'N': no_preprocess = 1; break; + case 'o': + old_names = 1; + break; case 'p': do_everything = 0; do_proxies = 1; @@ -207,10 +212,10 @@ } } - if(do_everything) { + if (do_everything) { do_header = do_typelib = do_proxies = do_client = do_server = 1; } - if(optind < argc) { + if (optind < argc) { input_name = xstrdup(argv[optind]); } else { @@ -218,7 +223,7 @@ return 1; } - if(debuglevel) + if (debuglevel) { setbuf(stdout,0); setbuf(stderr,0); _____ Modified: trunk/reactos/tools/widl/widl.h --- trunk/reactos/tools/widl/widl.h 2005-03-10 19:56:46 UTC (rev 13915) +++ trunk/reactos/tools/widl/widl.h 2005-03-10 20:07:17 UTC (rev 13916) @@ -43,6 +43,7 @@ extern int do_proxies; extern int do_client; extern int do_server; +extern int old_names; extern char *input_name; extern char *header_name;

19 years, 9 months

← Newer
1
...
45
46
47
48
49
50
51
...
61
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 March 2005