Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[royce] 13995: don't end a string if the last character outputted was an escape, will cause output file to be invalid

by royce＠svn.reactos.com

don't end a string if the last character outputted was an escape, will cause output file to be invalid Modified: branches/xmlbuildsystem/reactos/tools/wmc/write.c _____ Modified: branches/xmlbuildsystem/reactos/tools/wmc/write.c --- branches/xmlbuildsystem/reactos/tools/wmc/write.c 2005-03-13 06:31:38 UTC (rev 13994) +++ branches/xmlbuildsystem/reactos/tools/wmc/write.c 2005-03-13 07:37:33 UTC (rev 13995) @@ -360,7 +360,7 @@ cptr += n; b += n; } - if(i < len-1 && b >= 72) + if(i < len-1 && b >= 72 && cptr[-1] != '\\') { *cptr++ = '"'; *cptr++ = ','; @@ -424,7 +424,7 @@ b += n; } } - if(i < len-1 && b >= 72) + if(i < len-1 && b >= 72 && cptr[-1] != '\\') { *cptr++ = '"'; *cptr++ = ','; @@ -577,7 +577,7 @@ for (lbp = lanblockhead; lbp; lbp = lbp->next) { - unsigned offs = 4 * (lbp->nblk * 3 + 1); + unsigned offs = 4 * (lbp->nblk * 3 + 1); char *cptr = NULL; for(i = 0; i < ntab; i++)

19 years, 6 months

[royce] 13994: added validation for <directory>'s name attribute

by royce＠svn.reactos.com

added validation for <directory>'s name attribute create dk/nkm/lib if it doesn't exist Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-13 05:32:52 UTC (rev 13993) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-13 06:31:38 UTC (rev 13994) @@ -100,15 +100,19 @@ endif ifneq ($(ROS_INTERMEDIATE),) -$(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) - ${nmkdir} $(ROS_INTERMEDIATE)tools -endif - -ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE): ${nmkdir} $(ROS_INTERMEDIATE) +$(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) + ${nmkdir} $@ +$(ROS_INTERMEDIATE)dk: $(ROS_INTERMEDIATE) + ${nkmdir} $@ +$(ROS_INTERMEDIATE)dk$(SEP)nkm: $(ROS_INTERMEDIATE)dk + ${nkmdir} $@ endif +$(ROS_INTERMEDIATE)dk$(SEP)nkm$(SEP)lib: $(ROS_INTERMEDIATE)dk$(SEP)nkm + ${nmkdir} $@ + 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 _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-03-13 05:32:52 UTC (rev 13993) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-03-13 06:31:38 UTC (rev 13994) @@ -179,8 +179,8 @@ vout.push_back ( vpath[i++] ); // now merge vout into a string again - string out = "."; - for ( i = 0; i < vout.size(); i++ ) + string out = vout[0]; + for ( i = 1; i < vout.size(); i++ ) { out += "/" + vout[i]; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-13 05:32:52 UTC (rev 13993) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-13 06:31:38 UTC (rev 13994) @@ -20,6 +20,25 @@ } string +GetSubPath ( + const string& location, + const string& path, + const string& att_value ) +{ + if ( !att_value.size() ) + throw InvalidBuildFileException ( + location, + "<directory> tag has empty 'name' attribute" ); + if ( strpbrk ( att_value.c_str (), "/\\?*:<>|" ) ) + throw InvalidBuildFileException ( + location, + "<directory> tag has invalid characters in 'name' attribute" ); + if ( !path.size() ) + return att_value; + return FixSeparator(path + CSEP + att_value); +} + +string GetExtension ( const string& filename ) { size_t index = filename.find_last_of ( '/' ); @@ -252,7 +271,7 @@ { const XMLAttribute* att = e.GetAttribute ( "name", true ); assert(att); - subpath = FixSeparator ( path + CSEP + att->value ); + subpath = GetSubPath ( e.location, path, att->value ); } else if ( e.name == "include" ) { @@ -508,10 +527,10 @@ { if ( HasImportLibrary () ) { - return ssprintf ( "dk%snkm%slib%slib%s.a", - SSEP, - SSEP, - SSEP, + return ssprintf ( "dk%cnkm%clib%clib%s.a", + CSEP, + CSEP, + CSEP, name.c_str () ); } else _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-13 05:32:52 UTC (rev 13993) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-13 06:31:38 UTC (rev 13994) @@ -182,7 +182,8 @@ if ( head->subElements[i]->name == "project" ) { node = head->subElements[i]; - this->ProcessXML ( "." ); + string path; + this->ProcessXML ( path ); return; } } @@ -254,7 +255,7 @@ { const XMLAttribute* att = e.GetAttribute ( "name", true ); assert(att); - subpath = path + CSEP + att->value; + subpath = GetSubPath ( e.location, path, att->value ); } else if ( e.name == "include" ) { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-13 05:32:52 UTC (rev 13993) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-13 06:31:38 UTC (rev 13994) @@ -6,15 +6,17 @@ #ifdef WIN32 #include <direct.h> #include <io.h> -#endif +#endif/*WIN32*/ #include <sys/stat.h> #include <time.h> #ifdef _MSC_VER #include <sys/utime.h> -#else +#else/*_MSC_VER*/ #include <utime.h> +#ifdef WIN32 #include <process.h> -#endif +#endif/*WIN32*/ +#endif/*_MSC_VER*/ #include "ssprintf.h" #include "exception.h" @@ -524,11 +526,16 @@ void ProcessXML(); }; - extern std::string FixSeparator ( const std::string& s ); extern std::string +GetSubPath ( + const std::string& location, + const std::string& path, + const std::string& att_value ); + +extern std::string GetExtension ( const std::string& filename ); extern std::string

19 years, 6 months

[royce] 13993: fix some dependencies

by royce＠svn.reactos.com

fix some dependencies get rid of unnecessary phony targets eliminate unnecessary makefile.auto dependencies silence gcc when detecting pch Modified: branches/xmlbuildsystem/reactos/Makefile 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/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-13 04:25:09 UTC (rev 13992) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-13 05:32:52 UTC (rev 13993) @@ -125,10 +125,10 @@ $(BUGCODES_H) \ $(BUGCODES_RC) \ $(ERRCODES_H) \ - $(ERRCODES_RC) + $(ERRCODES_RC) \ + $(NCI_SERVICE_FILES) -makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(WRC_TARGET) \ - $(RSYM_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +makefile.auto: $(RMKDIR_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-13 04:25:09 UTC (rev 13992) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-13 05:32:52 UTC (rev 13993) @@ -230,21 +230,15 @@ void MingwBackend::GenerateInitTarget () const { + string tools = "$(ROS_INTERMEDIATE)." SSEP "tools"; fprintf ( fMakefile, - "init:"); - fprintf ( fMakefile, - " $(ROS_INTERMEDIATE)." SSEP "tools" ); - fprintf ( fMakefile, - " %s", + "INIT = %s %s\n", + tools.c_str (), GetBuildToolDependencies ().c_str () ); - fprintf ( fMakefile, - " %s", - "include" SSEP "reactos" SSEP "buildno.h" ); - fprintf ( fMakefile, - "\n\t\n\n" ); fprintf ( fMakefile, - "$(ROS_INTERMEDIATE)." SSEP "tools:\n" ); + "%s:\n", + tools.c_str () ); fprintf ( fMakefile, "ifneq ($(ROS_INTERMEDIATE),)\n" ); fprintf ( fMakefile, @@ -332,8 +326,17 @@ void MingwBackend::DetectPCHSupport() { +#ifdef WIN32 + string sNUL = "NUL"; +#else + string sNUL = "/dev/null"; +#endif string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h"; - system ( ssprintf("gcc -c %s", path.c_str()).c_str() ); + string cmd = ssprintf( + "gcc -c %s 2>%s", + path.c_str (), + sNUL.c_str () ); + system ( cmd.c_str() ); path += ".gch"; FILE* f = fopen ( path.c_str(), "rb" ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-13 04:25:09 UTC (rev 13992) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-13 05:32:52 UTC (rev 13993) @@ -65,6 +65,24 @@ return out; } +string v2s ( const vector<string>& v, int wrap_at ) +{ + if ( !v.size() ) + return ""; + string s; + int wrap_count = 0; + for ( size_t i = 0; i < v.size(); i++ ) + { + if ( !v[i].size() ) + continue; + if ( wrap_at > 0 && wrap_count++ == wrap_at ) + s += " \\\n\t\t"; + else if ( s.size() ) + s += " "; + s += v[i]; + } + return s; +} MingwModuleHandler::MingwModuleHandler ( ModuleType moduletype ) { @@ -947,15 +965,20 @@ void MingwModuleHandler::GenerateLinkerCommand ( const Module& module, + const string& target, + const string& dependencies, const string& linker, const string& linkerParameters, const string& objectsMacro, const string& libsMacro, string_list& clean_files ) const { + fprintf ( fMakefile, + "%s: %s ${RSYM_TARGET}\n", + target.c_str (), + dependencies.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); string targetName ( module.GetTargetName () ); - string target ( FixupTargetFilename ( module.GetPath () ) ); if ( module.importLibrary != NULL ) { static string ros_junk ( "$(ROS_TEMPORARY)" ); @@ -1177,9 +1200,9 @@ 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 cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); + string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); + string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" ); string cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); string nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); @@ -1299,8 +1322,7 @@ string MingwModuleHandler::GetPreconditionDependenciesName ( const Module& module ) const { - return ssprintf ( "%s_precondition", - module.name.c_str () ); + return module.name + "_precondition"; } string @@ -1312,7 +1334,7 @@ || module.name == "hostzlib" ) return "$(ROS_INTERMEDIATE)." SSEP "tools $(ROS_INTERMEDIATE)." SSEP "lib" SSEP "zlib"; else - return "init"; + return "$(INIT)"; } void @@ -1338,10 +1360,7 @@ } fprintf ( fMakefile, - ".PHONY: %s\n\n", - preconditionDependenciesName.c_str () ); - fprintf ( fMakefile, - "%s: %s\n\n", + "%s = %s\n\n", preconditionDependenciesName.c_str (), dependencies.c_str () ); const char* p = sourceFilenames.c_str(); @@ -1360,7 +1379,7 @@ p2 = end; } fprintf ( fMakefile, - "%.*s: %s\n", + "%.*s: ${%s}\n", p2-p, p, preconditionDependenciesName.c_str ()); @@ -1523,7 +1542,7 @@ GenerateImportLibraryTargetIfNeeded ( module, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", + fprintf ( fMakefile, "%s: %s %s ${RSYM_TARGET}\n", target.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str () ); @@ -1645,15 +1664,15 @@ { GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); + string dependencies = + objectsMacro + " " + linkDepsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( module, + target, + dependencies, "${gcc}", linkerParameters, objectsMacro, @@ -1708,15 +1727,15 @@ NULL, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); + string dependencies = + objectsMacro + " " + linkDepsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( module, + target, + dependencies, "${gcc}", linkerParameters, objectsMacro, @@ -1764,15 +1783,15 @@ { GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); + string dependencies = + objectsMacro + " " + linkDepsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( module, + target, + dependencies, "${gcc}", linkerParameters, objectsMacro, @@ -1824,15 +1843,15 @@ NULL, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); + string dependencies = + objectsMacro + " " + linkDepsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( module, + target, + dependencies, "${gcc}", linkerParameters, objectsMacro, @@ -1904,10 +1923,8 @@ { GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); + string dependencies = + objectsMacro + " " + linkDepsMacro; string linker; if ( module.cplusplus ) @@ -1919,6 +1936,8 @@ module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( module, + target, + dependencies, linker, linkerParameters, objectsMacro, @@ -1966,10 +1985,8 @@ { GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); + string dependencies = + objectsMacro + " " + linkDepsMacro; string linker; if ( module.cplusplus ) @@ -1981,6 +1998,8 @@ module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( module, + target, + dependencies, linker, linkerParameters, objectsMacro, @@ -2026,12 +2045,10 @@ if ( module.non_if_data.files.size () > 0 ) { - GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); + GenerateMacrosAndTargets ( module, NULL, NULL, clean_files ); - fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), - objectsMacro.c_str (), - linkDepsMacro.c_str () ); + string dependencies = + objectsMacro + " " + linkDepsMacro; string linker; if ( module.cplusplus ) @@ -2043,6 +2060,8 @@ module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( module, + target, + dependencies, linker, linkerParameters, objectsMacro, @@ -2165,8 +2184,8 @@ } void -MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( const string bootcdDirectory, - const Module& module ) const +MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( const string& bootcdDirectory, + const Module& module ) const { for ( size_t i = 0; i < module.project.modules.size (); i++ ) { @@ -2184,8 +2203,8 @@ } void -MingwIsoModuleHandler::OutputCdfileCopyCommands ( const string bootcdDirectory, - const Module& module ) const +MingwIsoModuleHandler::OutputCdfileCopyCommands ( const string& bootcdDirectory, + const Module& module ) const { for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) { @@ -2200,8 +2219,8 @@ } string -MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string bootcdDirectory, - const Module& module ) const +MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string& bootcdDirectory, + const Module& module ) const { string directories; for ( size_t i = 0; i < module.project.modules.size (); i++ ) @@ -2219,8 +2238,8 @@ } string -MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string bootcdDirectory, - const Module& module ) const +MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string& bootcdDirectory, + const Module& module ) const { string directories; for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) @@ -2235,8 +2254,8 @@ } string -MingwIsoModuleHandler::GetCdDirectories ( const string bootcdDirectory, - const Module& module ) const +MingwIsoModuleHandler::GetCdDirectories ( const string& bootcdDirectory, + const Module& module ) const { string directories = GetBootstrapCdDirectories ( bootcdDirectory, module ); @@ -2245,48 +2264,38 @@ return directories; } -string -MingwIsoModuleHandler::GetBootstrapCdFiles ( const string bootcdDirectory, - const Module& module ) const +void +MingwIsoModuleHandler::GetBootstrapCdFiles ( + vector<string>& out, + const Module& module ) const { - string cdfiles; for ( size_t i = 0; i < module.project.modules.size (); i++ ) { const Module& m = *module.project.modules[i]; if ( m.bootstrap != NULL ) - { - if ( cdfiles.size () > 0 ) - cdfiles += " "; - cdfiles += FixupTargetFilename ( m.GetPath () ); - } + out.push_back ( FixupTargetFilename ( m.GetPath () ) ); } - return cdfiles; } -string -MingwIsoModuleHandler::GetNonModuleCdFiles ( const string bootcdDirectory, - const Module& module ) const +void +MingwIsoModuleHandler::GetNonModuleCdFiles ( + vector<string>& out, + const Module& module ) const { - string cdfiles; for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) { const CDFile& cdfile = *module.project.cdfiles[i]; - if ( cdfiles.size () > 0 ) - cdfiles += " "; - cdfiles += NormalizeFilename ( cdfile.GetPath () ); + out.push_back ( NormalizeFilename ( cdfile.GetPath () ) ); } - return cdfiles; } -string -MingwIsoModuleHandler::GetCdFiles ( const string bootcdDirectory, - const Module& module ) const +void +MingwIsoModuleHandler::GetCdFiles ( + vector<string>& out, + const Module& module ) const { - string cdfiles = GetBootstrapCdFiles ( bootcdDirectory, - module ); - cdfiles += " " + GetNonModuleCdFiles ( bootcdDirectory, - module ); - return cdfiles; + GetBootstrapCdFiles ( out, module ); + GetNonModuleCdFiles ( out, module ); } void @@ -2301,13 +2310,14 @@ string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); string cdDirectories = bootcdReactos + " " + GetCdDirectories ( bootcdDirectory, module ); - string cdFiles = GetCdFiles ( bootcdDirectory, - module ); + vector<string> vCdFiles; + GetCdFiles ( vCdFiles, module ); + string cdFiles = v2s ( vCdFiles, 5 ); fprintf ( fMakefile, ".PHONY: %s\n\n", - module.name.c_str ()); + module.name.c_str ()); fprintf ( fMakefile, - "%s: all %s %s %s\n", + "%s: all %s %s %s ${CABMAN_TARGET} ${CDMAKE_TARGET}\n", module.name.c_str (), isoboot.c_str (), cdDirectories.c_str (), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-13 04:25:09 UTC (rev 13992) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-13 05:32:52 UTC (rev 13993) @@ -60,6 +60,8 @@ std::string GetLibsMacro ( const Module& module ) const; std::string GetLinkerMacro ( const Module& module ) const; void GenerateLinkerCommand ( const Module& module, + const std::string& target, + const std::string& dependencies, const std::string& linker, const std::string& linkerParameters, const std::string& objectsMacro, @@ -314,21 +316,21 @@ virtual void Process ( const Module& module, string_list& clean_files ); private: void GenerateIsoModuleTarget ( const Module& module, string_list& clean_files ); - std::string GetBootstrapCdDirectories ( const std::string bootcdDirectory, + std::string GetBootstrapCdDirectories ( const std::string& bootcdDirectory, const Module& module ) const; - std::string GetNonModuleCdDirectories ( const std::string bootcdDirectory, + std::string GetNonModuleCdDirectories ( const std::string& bootcdDirectory, const Module& module ) const; - std::string GetCdDirectories ( const std::string bootcdDirectory, + std::string GetCdDirectories ( const std::string& bootcdDirectory, const Module& module ) const; - std::string GetBootstrapCdFiles ( const std::string bootcdDirectory, - const Module& module ) const; - std::string GetNonModuleCdFiles ( const std::string bootcdDirectory, - const Module& module ) const; - std::string GetCdFiles ( const std::string bootcdDirectory, - const Module& module ) const; - void OutputBootstrapfileCopyCommands ( const std::string bootcdDirectory, + void GetBootstrapCdFiles ( std::vector<std::string>& out, + const Module& module ) const; + void GetNonModuleCdFiles ( std::vector<std::string>& out, + const Module& module ) const; + void GetCdFiles ( std::vector<std::string>& out, + const Module& module ) const; + void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory, const Module& module ) const; - void OutputCdfileCopyCommands ( const std::string bootcdDirectory, + void OutputCdfileCopyCommands ( const std::string& bootcdDirectory, const Module& module ) const; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-13 04:25:09 UTC (rev 13992) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-13 05:32:52 UTC (rev 13993) @@ -133,9 +133,9 @@ enum HostType { + HostFalse, HostDefault, - HostTrue, - HostFalse + HostTrue }; class Module

19 years, 6 months

[jimtabor] 13992: Fix up opps.

by jimtabor＠svn.reactos.com

Fix up opps. Modified: trunk/reactos/rules.mak _____ Modified: trunk/reactos/rules.mak --- trunk/reactos/rules.mak 2005-03-13 04:23:35 UTC (rev 13991) +++ trunk/reactos/rules.mak 2005-03-13 04:25:09 UTC (rev 13992) @@ -74,7 +74,7 @@ # ifeq ($(HOST),mingw32-linux) export NASM_FORMAT = win32 -export PREFIX = i386-mingw32- +export PREFIX = mingw32- export EXE_POSTFIX := export EXE_PREFIX := ./ export DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as

19 years, 6 months

[jimtabor] 13991: Fix up Linux port.

by jimtabor＠svn.reactos.com

Fix up Linux port. Modified: trunk/reactos/rules.mak _____ Modified: trunk/reactos/rules.mak --- trunk/reactos/rules.mak 2005-03-13 03:16:16 UTC (rev 13990) +++ trunk/reactos/rules.mak 2005-03-13 04:23:35 UTC (rev 13991) @@ -40,7 +40,7 @@ ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) HOST=mingw32-windows else -HOST=mingw32-linux +export HOST=mingw32-linux endif endif @@ -74,7 +74,7 @@ # ifeq ($(HOST),mingw32-linux) export NASM_FORMAT = win32 -export PREFIX = mingw32- +export PREFIX = i386-mingw32- export EXE_POSTFIX := export EXE_PREFIX := ./ export DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as

19 years, 6 months

[royce] 13990: hack fix 'hostzlib' circular dependency, added a couple more stub makefiles, added 'rbuild' phony target

by royce＠svn.reactos.com

hack fix 'hostzlib' circular dependency, added a couple more stub makefiles, added 'rbuild' phony target Modified: branches/xmlbuildsystem/reactos/Makefile Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386 Added: branches/xmlbuildsystem/reactos/ntoskrnl/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Deleted: branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in Added: branches/xmlbuildsystem/reactos/tools/unicode/makefile Deleted: branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-13 03:16:16 UTC (rev 13990) @@ -3,15 +3,10 @@ all: makefile.auto ifeq ($(HOST),) -OSDETECT=$(word 1,$(shell gcc -dumpmachine)) - -all: detect_os - -detect_os: -ifeq ($(OSDETECT),mingw32) - HOST=mingw32-windows +ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) +HOST=mingw32-windows else - HOST=mingw32-linux +HOST=mingw32-linux endif endif _____ Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile --- branches/xmlbuildsystem/reactos/ntoskrnl/Makefile 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/ntoskrnl/Makefile 2005-03-13 03:16:16 UTC (rev 13990) @@ -1,579 +0,0 @@ -preall: all - -PATH_TO_TOP := .. - -include $(PATH_TO_TOP)/config - -TARGET_REGTESTS = yes - -TARGET_TYPE = kernel - -TARGET_NAME = ntoskrnl - -TARGET_BOOTSTRAP = yes - -CONFIG := - -ifeq ($(DBG), 1) -DBG_OR_KDBG := 1 -endif -ifeq ($(KDBG), 1) -DBG_OR_KDBG := 1 -endif - -LINKER_SCRIPT := ntoskrnl.lnk -STRIP_FLAGS := -Wl,-s - -ifeq ($(KDBG), 1) -OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \ - dbg/i386/kdb_help.o \ - ../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o -CFLAGS_KDBG := -I../lib/kjs/include -preall: all - -../dk/w32/lib/libkjs.a: - $(MAKE) -C ../lib/kjs -else -OBJECTS_KDBG := -endif -ifeq ($(DBG_OR_KDBG), 1) -OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o dbg/profile.o -endif - -TARGET_ASFLAGS = -I./include -TARGET_CFLAGS = -I./include $(CFLAGS_KDBG) -Wall -Werror $(CFLAGS_OPT) - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS - -# 3GB User Mode Memory Space support -ifeq ($(3GB), 1) -TARGET_CFLAGS += -D__3GB__ -TARGET_BASE = 0xC0000000 -else -TARGET_BASE = 0x80000000 -endif - -ifneq ($(DBG), 0) -TARGET_CFLAGS += -DDBG -endif - -# enable thread event pair features (NT4 only!) -# TARGET_CFLAGS += -D_ENABLE_THRDEVTPAIR - -# -# Javascript extension for kdb -# - -OBJECTS_PATH = objects - -# -# Architecture specific Makefile -# Defines $(OBJECTS_ARCH) -# -include Makefile.$(ARCH) - -# Run-Time Library (Rtl) -OBJECTS_RTL = \ - rtl/atom.o \ - rtl/capture.o \ - rtl/ctype.o \ - rtl/handle.o \ - rtl/message.o \ - rtl/misc.o \ - rtl/purecall.o \ - rtl/regio.o \ - rtl/sprintf.o \ - rtl/stdlib.o \ - rtl/string.o \ - rtl/swprintf.o \ - rtl/wstring.o \ - rtl/nls.o \ - rtl/rangelist.o \ - rtl/libsupp.o - -OBJECTS_RTL := $(filter-out $(RTL_EXCLUDE_FILTER), $(OBJECTS_RTL)) - - -# Kernel (Ke) -OBJECTS_KE = \ - ke/apc.o \ - ke/bug.o \ - ke/catch.o \ - ke/clock.o \ - ke/critical.o \ - ke/dpc.o \ - ke/device.o \ - ke/error.o \ - ke/event.o \ - ke/kqueue.o \ - ke/kthread.o \ - ke/ipi.o \ - ke/main.o \ - ke/mutex.o \ - ke/process.o \ - ke/profile.o \ - ke/queue.o \ - ke/sem.o \ - ke/spinlock.o \ - ke/timer.o \ - ke/wait.o \ - ke/alert.o - -# Memory Manager (Mm) -OBJECTS_MM = \ - mm/anonmem.o \ - mm/aspace.o \ - mm/balance.o \ - mm/cont.o \ - mm/drvlck.o \ - mm/elf32.o \ - mm/elf64.o \ - mm/freelist.o \ - mm/iospace.o \ - mm/kmap.o \ - mm/marea.o \ - mm/mdl.o \ - mm/mm.o \ - mm/mminit.o \ - mm/mpw.o \ - mm/ncache.o \ - mm/npool.o \ - mm/pagfault.o \ - mm/pagefile.o \ - mm/pageop.o \ - mm/pager.o \ - mm/paging.o \ - mm/pe.o \ - mm/pool.o \ - mm/ppool.o \ - mm/physical.o \ - mm/region.o \ - mm/rmap.o \ - mm/section.o \ - mm/verifier.o \ - mm/virtual.o \ - mm/wset.o - -# I/O Subsystem (Io) -OBJECTS_IO = \ - io/adapter.o \ - io/arcname.o \ - io/bootlog.o \ - io/buildirp.o \ - io/cancel.o \ - io/cleanup.o \ - io/cntrller.o \ - io/create.o \ - io/device.o \ - io/deviface.o \ - io/dir.o \ - io/driver.o \ - io/efi.o \ - io/errlog.o \ - io/error.o \ - io/event.o \ - io/file.o \ - io/flush.o \ - io/fs.o \ - io/iocomp.o \ - io/ioctrl.o \ - io/iomgr.o \ - io/iowork.o \ - io/irp.o \ - io/irq.o \ - io/lock.o \ - io/mailslot.o \ - io/mdl.o \ - io/npipe.o \ - io/page.o \ - io/parttab.o \ - io/plugplay.o \ - io/process.o \ - io/pnpdma.o \ - io/pnpmgr.o \ - io/pnpnotify.o \ - io/pnpreport.o \ - io/pnproot.o \ - io/queue.o \ - io/rawfs.o \ - io/remlock.o \ - io/resource.o \ - io/rw.o \ - io/share.o \ - io/shutdown.o \ - io/symlink.o \ - io/timer.o \ - io/vpb.o \ - io/wdm.o \ - io/wmi.o \ - io/xhaldisp.o \ - io/xhaldrv.o - -# Object Manager (Ob) -OBJECTS_OB = \ - ob/dirobj.o \ - ob/handle.o \ - ob/namespc.o \ - ob/ntobj.o \ - ob/object.o \ - ob/sdcache.o \ - ob/security.o \ - ob/symlink.o - -# Process Manager (Ps) -OBJECTS_PS = \ - ps/cid.o \ - ps/create.o \ - ps/debug.o \ - ps/idle.o \ - ps/job.o \ - ps/kill.o \ - ps/locale.o \ - ps/process.o \ - ps/psmgr.o \ - ps/suspend.o \ - ps/thread.o \ - ps/tinfo.o \ - ps/win32.o \ - ps/w32call.o - -# Executive Subsystem (Ex) -OBJECTS_EX = \ - ex/btree.o \ - ex/callback.o \ - ex/event.o \ - ex/evtpair.o \ - ex/fmutex.o \ - ex/hashtab.o \ - ex/init.o \ - ex/interlck.o \ - ex/list.o \ - ex/lookas.o \ - ex/mutant.o \ - ex/napi.o \ - ex/power.o \ - ex/profile.o \ - ex/resource.o \ - ex/rundown.o \ - ex/stree.o \ - ex/sem.o \ - ex/synch.o \ - ex/sysinfo.o \ - ex/time.o \ - ex/timer.o \ - ex/util.o \ - ex/uuid.o \ - ex/win32k.o \ - ex/work.o \ - ex/zone.o \ - ex/zw.o - -# Installable File System Run-Time Library (FsRtl) -OBJECTS_FS = \ - fs/dbcsname.o \ - fs/filelock.o \ - fs/mcb.o \ - fs/mdl.o \ - fs/name.o \ - fs/notify.o \ - fs/oplock.o \ - fs/pool.o \ - fs/tunnel.o \ - fs/unc.o \ - fs/util.o - -# Security Subsystem -OBJECTS_SE = \ - se/access.o \ - se/acl.o \ - se/audit.o \ - se/lsa.o \ - se/luid.o \ - se/priv.o \ - se/sd.o \ - se/semgr.o \ - se/sid.o \ - se/token.o - -# Configuration Manager (Registry) -OBJECTS_CM = \ - cm/import.o \ - cm/ntfunc.o \ - cm/regfile.o \ - cm/registry.o \ - cm/regobj.o \ - -# Debugger Support (Dbg) -OBJECTS_DBG = \ - dbg/dbgctrl.o \ - dbg/errinfo.o \ - dbg/print.o \ - dbg/user.o \ - $(OBJECTS_KDBG) - -# Loader -OBJECTS_LDR = \ - ldr/init.o \ - ldr/loader.o \ - ldr/resource.o \ - ldr/rtl.o \ - ldr/sysdll.o \ - ldr/userldr.o - -# Local Procedure Call (Lpc) -OBJECTS_LPC = \ - lpc/close.o \ - lpc/complete.o \ - lpc/connect.o \ - lpc/create.o \ - lpc/listen.o \ - lpc/port.o \ - lpc/query.o \ - lpc/queue.o \ - lpc/receive.o \ - lpc/reply.o \ - lpc/send.o - -# Power Management (Po) -OBJECTS_PO = \ - po/power.o - -# Cache Manager (Cc) -OBJECTS_CC = \ - cc/cacheman.o \ - cc/copy.o \ - cc/fs.o \ - cc/pin.o \ - cc/mdl.o \ - cc/view.o - -# Kernel Debugger Support (Kd) -OBJECTS_KD = \ - kd/dlog.o \ - kd/gdbstub.o \ - kd/kdebug.o \ - kd/mda.o \ - kd/service.o - -# Boot video (Inbv) -OBJECTS_INBV = \ - inbv/inbv.o - -DEP_OBJECTS := $(OBJECTS_MM) $(OBJECTS_ARCH) \ - $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \ - $(OBJECTS_PS) $(OBJECTS_EX) $(OBJECTS_CC) $(OBJECTS_FS) $(OBJECTS_SE) \ - $(OBJECTS_DBG) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \ - $(OBJECTS_PO) $(OBJECTS_KD) $(OBJECTS_RTL) $(OBJECTS_INBV) - -TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(DEP_OBJECTS)))) - -TARGET_PCH = include/ntoskrnl.h - - -# Resources -OBJECTS_RESOURCE = \ - $(TARGET_NAME).coff - -$(OBJECTS_PATH): - mkdir $(OBJECTS_PATH) - -$(OBJECTS_RESOURCE): $(TARGET_NAME).rc bugcodes.rc $(PATH_TO_TOP)/include/reactos/resource.h - -# -# Build subsystem intermediate objects -# -$(OBJECTS_PATH)/arch.o: $(OBJECTS_ARCH) - $(LD) -r -o $(OBJECTS_PATH)/arch.o $(OBJECTS_ARCH) - -$(OBJECTS_PATH)/io.o: $(OBJECTS_IO) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/io.o \ - $(OBJECTS_IO) - -$(OBJECTS_PATH)/ke.o: $(OBJECTS_KE) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ke.o \ - $(OBJECTS_KE) - -$(OBJECTS_PATH)/rtl.o: $(OBJECTS_RTL) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/rtl.o \ - $(OBJECTS_RTL) - -$(OBJECTS_PATH)/mm.o: $(OBJECTS_MM) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/mm.o \ - $(OBJECTS_MM) - -$(OBJECTS_PATH)/ob.o: $(OBJECTS_OB) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ob.o \ - $(OBJECTS_OB) - -$(OBJECTS_PATH)/ps.o: $(OBJECTS_PS) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ps.o \ - $(OBJECTS_PS) - -$(OBJECTS_PATH)/ex.o: $(OBJECTS_EX) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ex.o \ - $(OBJECTS_EX) - -$(OBJECTS_PATH)/fs.o: $(OBJECTS_FS) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/fs.o \ - $(OBJECTS_FS) - -$(OBJECTS_PATH)/se.o: $(OBJECTS_SE) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/se.o \ - $(OBJECTS_SE) - -$(OBJECTS_PATH)/cm.o: $(OBJECTS_CM) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/cm.o \ - $(OBJECTS_CM) - -$(OBJECTS_PATH)/dbg.o: $(OBJECTS_DBG) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/dbg.o \ - $(OBJECTS_DBG) - -$(OBJECTS_PATH)/ldr.o: $(OBJECTS_LDR) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/ldr.o \ - $(OBJECTS_LDR) - -$(OBJECTS_PATH)/lpc.o: $(OBJECTS_LPC) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/lpc.o \ - $(OBJECTS_LPC) - -$(OBJECTS_PATH)/po.o: $(OBJECTS_PO) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/po.o \ - $(OBJECTS_PO) - -$(OBJECTS_PATH)/cc.o: $(OBJECTS_CC) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/cc.o \ - $(OBJECTS_CC) - -$(OBJECTS_PATH)/kd.o: $(OBJECTS_KD) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/kd.o \ - $(OBJECTS_KD) - -$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/inbv.o \ - $(OBJECTS_INBV) - -# Note: arch.o MUST be the first file!!! -OBJECTS := \ - $(OBJECTS_PATH)/arch.o \ - $(OBJECTS_PATH)/ke.o \ - $(OBJECTS_PATH)/cc.o \ - $(OBJECTS_PATH)/cm.o \ - $(OBJECTS_PATH)/dbg.o \ - $(OBJECTS_PATH)/ex.o \ - $(OBJECTS_PATH)/lpc.o \ - $(OBJECTS_PATH)/fs.o \ - $(OBJECTS_PATH)/io.o \ - $(OBJECTS_PATH)/kd.o \ - $(OBJECTS_PATH)/ldr.o \ - $(OBJECTS_PATH)/mm.o \ - $(OBJECTS_PATH)/ob.o \ - $(OBJECTS_PATH)/po.o \ - $(OBJECTS_PATH)/ps.o \ - $(OBJECTS_PATH)/rtl.o \ - $(OBJECTS_PATH)/se.o \ - $(OBJECTS_PATH)/inbv.o \ - $(OBJECTS_RESOURCE) - -EXTRA_OBJECTS = $(PATH_TO_TOP)/include/reactos/bugcodes.h - -TARGET_OBJECTS = $(EXTRA_OBJECTS) $(OBJECTS) - -TARGET_LIBS = \ - $(DDK_PATH_LIB)/libhal.a \ - $(SDK_PATH_LIB)/librtl.a \ - $(SDK_PATH_LIB)/librossym.a \ - $(SDK_PATH_LIB)/libstring.a \ - $(SDK_PATH_LIB)/librosrtl.a \ - $(SDK_PATH_LIB)/libpseh.a \ - $(SDK_PATH_LIB)/libwdmguid.a \ - $(PATH_TO_TOP)/drivers/lib/csq/csq.o - -TARGET_LFLAGS = \ - -Wl,-T,ntoskrnl.lnk \ - -Wl,--subsystem,native \ - -Wl,--image-base,$(TARGET_BASE) \ - -Wl,--file-alignment,0x1000 \ - -Wl,--section-alignment,0x1000 \ - -Wl,--entry,_NtProcessStartup \ - -nostdlib - -TARGET_GCCLIBS = gcc - -TAGS: $(TAG_OBJECTS) - etags $(addprefix -i , $(TAG_OBJECTS)) - -GENERATED_HEADER_FILES := $(PATH_TO_TOP)/include/reactos/bugcodes.h - -$(PATH_TO_TOP)/include/reactos/bugcodes.h bugcodes.rc: ntoskrnl.mc - $(MC) \ - -H $(PATH_TO_TOP)/include/reactos/bugcodes.h \ - -o bugcodes.rc \ - $(TARGET_NAME).mc - -TARGET_CLEAN = \ - $(PATH_TO_TOP)/include/reactos/bugcodes.h \ - $(DEP_OBJECTS) $(DEP_FILES) MSG00409.bin bugcodes.rc - -ex/napi.o: ex/zw.S $(PATH_TO_TOP)/include/ntdll/napi.h - -ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h - -$(TARGET_PCH): $(PATH_TO_TOP)/include/reactos/bugcodes.h - - -.%.TAG: %.S - etags -o $@ $< - -.%.TAG: %.s - etags -o $@ $< - -.%.TAG: %.c - etags -o $@ $^ - - -docu: - doxygen Doxyfile - -.PHONY: docu - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -include $(TOOLS_PATH)/depend.mk _____ Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386 --- branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/ntoskrnl/Makefile.i386 2005-03-13 03:16:16 UTC (rev 13990) @@ -1,62 +0,0 @@ -# -# Hardware Abstraction Layer (Hal) for x86 systems -# - -# Defines $(OBJECTS_HAL) -# include hal/x86/sources - -OBJECTS_BOOT := ke/i386/main.o - -OBJECTS_EX_I386 := \ - ex/i386/interlck.o - -OBJECTS_KE_I386 := \ - ke/i386/exp.o \ - ke/i386/irq.o \ - ke/i386/irqhand.o \ - ke/i386/thread.o \ - ke/i386/usercall.o \ - ke/i386/trap.o \ - ke/i386/bthread.o \ - ke/i386/syscall.o \ - ke/i386/tskswitch.o \ - ke/i386/v86m.o \ - ke/i386/v86m_sup.o \ - ke/i386/vdm.o \ - ke/i386/bios.o \ - ke/i386/i386-mcount.o \ - ke/i386/gdt.o \ - ke/i386/idt.o \ - ke/i386/ldt.o \ - ke/i386/brkpoint.o \ - ke/i386/kernel.o \ - ke/i386/fpu.o \ - ke/i386/tlbflush.o \ - ke/i386/tss.o \ - ke/i386/usertrap.o \ - ke/i386/stkswitch.o - -OBJECTS_MM_I386 := \ - mm/i386/memsafe.o \ - mm/i386/page.o \ - mm/i386/pfault.o - -OBJECTS_RTL_I386 := \ - rtl/i386/alldiv.o \ - rtl/i386/allmul.o \ - rtl/i386/allrem.o \ - rtl/i386/allshl.o \ - rtl/i386/allshr.o \ - rtl/i386/aulldiv.o \ - rtl/i386/aullrem.o \ - rtl/i386/aullshr.o \ - rtl/i386/exception.o \ - rtl/i386/seh.o - -OBJECTS_PS_I386 := \ - ps/i386/continue.o - -RTL_EXCLUDE_FILTER := - -OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386) \ - $(OBJECTS_RTL_I386) $(OBJECTS_PS_I386) _____ Added: branches/xmlbuildsystem/reactos/ntoskrnl/makefile --- branches/xmlbuildsystem/reactos/ntoskrnl/makefile 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/ntoskrnl/makefile 2005-03-13 03:16:16 UTC (rev 13990) @@ -0,0 +1,3 @@ +TOP = .. +DEFAULT = ntoskrnl +include $(TOP)/proxy.mak \ No newline at end of file _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-13 03:16:16 UTC (rev 13990) @@ -1307,7 +1307,9 @@ MingwModuleHandler::GetDefaultDependencies ( const Module& module ) const { /* Avoid circular dependency */ - if ( module.type == BuildTool || module.name == "zlib" ) + if ( module.type == BuildTool + || module.name == "zlib" + || module.name == "hostzlib" ) return "$(ROS_INTERMEDIATE)." SSEP "tools $(ROS_INTERMEDIATE)." SSEP "lib" SSEP "zlib"; else return "init"; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-03-13 03:16:16 UTC (rev 13990) @@ -84,6 +84,9 @@ RBUILD_HOST_LFLAGS = -g +.PHONY: rbuild +rbuild: $(RBUILD_TARGET) + $(RBUILD_TARGET): $(RBUILD_OBJECTS) $(ECHO_LD) ${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TARGET) @@ -104,6 +107,8 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + + .PHONY: rbuild_test rbuild_test: $(RBUILD_TEST_TARGET) _____ Deleted: branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in --- branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/tools/unicode/Makefile.in 2005-03-13 03:16:16 UTC (rev 13990) @@ -1,88 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -LIBRARY = wine_unicode -SOVERSION = 1 -VERSCRIPT = $(SRCDIR)/wine_unicode.map -EXTRADEFS = -D__WINESRC__ -DNO_LIBWINE_PORT -DWINE_UNICODE_API="" - -CODEPAGES = \ - 037 \ - 424 \ - 437 \ - 500 \ - 737 \ - 775 \ - 850 \ - 852 \ - 855 \ - 856 \ - 857 \ - 860 \ - 861 \ - 862 \ - 863 \ - 864 \ - 865 \ - 866 \ - 869 \ - 874 \ - 875 \ - 878 \ - 932 \ - 936 \ - 949 \ - 950 \ - 1006 \ - 1026 \ - 1250 \ - 1251 \ - 1252 \ - 1253 \ - 1254 \ - 1255 \ - 1256 \ - 1257 \ - 1258 \ - 10000 \ - 10006 \ - 10007 \ - 10029 \ - 10079 \ - 10081 \ - 20866 \ - 20932 \ - 21866 \ - 28591 \ - 28592 \ - 28593 \ - 28594 \ - 28595 \ - 28596 \ - 28597 \ - 28598 \ - 28599 \ - 28600 \ - 28603 \ - 28604 \ - 28605 \ - 28606 - -C_SRCS = \ - casemap.c \ - collation.c \ - compose.c \ - cptable.c \ - fold.c \ - mbtowc.c \ - sortkey.c \ - string.c \ - utf8.c \ - wctomb.c \ - wctype.c \ - $(CODEPAGES:%=c_%.c) - -@MAKE_LIB_RULES@ - -### Dependencies: _____ Added: branches/xmlbuildsystem/reactos/tools/unicode/makefile --- branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-03-13 03:16:16 UTC (rev 13990) @@ -0,0 +1,3 @@ +TOP = ../.. +DEFAULT = unicode +include $(TOP)/proxy.mak \ No newline at end of file _____ Deleted: branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in --- branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in 2005-03-13 01:54:53 UTC (rev 13989) +++ branches/xmlbuildsystem/reactos/tools/wpp/Makefile.in 2005-03-13 03:16:16 UTC (rev 13990) @@ -1,37 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -LEXOPT = -Cf #-w -b -YACCOPT = #-v -MODULE = libwpp.a - -C_SRCS = \ - preproc.c \ - wpp.c - -EXTRA_SRCS = ppy.y ppl.l -EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o - -all: $(MODULE) - -@MAKE_RULES@ - -$(MODULE): $(OBJS) - $(RM) $@ - $(AR) $@ $(OBJS) - $(RANLIB) $@ - -y.tab.c y.tab.h: ppy.y - $(YACC) $(YACCOPT) -ppp -d -t $(SRCDIR)/ppy.y - -# hack to allow parallel make -y.tab.h: y.tab.c -y.tab.o: y.tab.h - -@LEX_OUTPUT_ROOT@.c: ppl.l - $(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l - -@LEX_OUTPUT_ROOT@.o: y.tab.h - -### Dependencies:

19 years, 6 months

[sedwards] 13989: added winetest gui program. Does not interact with server yet and requires advapi32 and comctl32 tests to be built.

by sedwards＠svn.reactos.com

added winetest gui program. Does not interact with server yet and requires advapi32 and comctl32 tests to be built. Added: trunk/reactos/apps/utils/winetest/ Added: trunk/reactos/apps/utils/winetest/config.h Added: trunk/reactos/apps/utils/winetest/dist.rc Added: trunk/reactos/apps/utils/winetest/gui.c Added: trunk/reactos/apps/utils/winetest/main.c Added: trunk/reactos/apps/utils/winetest/makefile Added: trunk/reactos/apps/utils/winetest/port.h Added: trunk/reactos/apps/utils/winetest/resource.h Added: trunk/reactos/apps/utils/winetest/send.c Added: trunk/reactos/apps/utils/winetest/tests.rc Added: trunk/reactos/apps/utils/winetest/util.c Added: trunk/reactos/apps/utils/winetest/wine.ico Added: trunk/reactos/apps/utils/winetest/winetest.h Added: trunk/reactos/apps/utils/winetest/winetest.rc _____ Added: trunk/reactos/apps/utils/winetest/config.h --- trunk/reactos/apps/utils/winetest/config.h 2005-03-13 01:10:46 UTC (rev 13988) +++ trunk/reactos/apps/utils/winetest/config.h 2005-03-13 01:54:53 UTC (rev 13989) @@ -0,0 +1,949 @@ +/* include/config.h. Generated by configure. */ +/* include/config.h.in. Generated from configure.ac by autoheader. */ + +#define __WINE_CONFIG_H + +/* Specifies the compiler flag that forces a short wchar_t */ +#define CC_FLAG_SHORT_WCHAR "-fshort-wchar" + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define if you have ALSA 1.x including devel headers */ +/* #undef HAVE_ALSA */ + +/* Define to 1 if you have the <alsa/asoundlib.h> header file. */ +/* #undef HAVE_ALSA_ASOUNDLIB_H */ + +/* Define to 1 if you have the <arpa/inet.h> header file. */ +/* #undef HAVE_ARPA_INET_H */ + +/* Define to 1 if you have the <arpa/nameser.h> header file. */ +/* #undef HAVE_ARPA_NAMESER_H */ + +/* Define if you have ARTS sound server */ +/* #undef HAVE_ARTS */ + +/* Define if the assembler keyword .size is accepted */ +/* #undef HAVE_ASM_DOT_SIZE */ + +/* Define to 1 if you have the <audio/audiolib.h> header file. */ +/* #undef HAVE_AUDIO_AUDIOLIB_H */ + +/* Define to 1 if you have the <audio/soundlib.h> header file. */ +/* #undef HAVE_AUDIO_SOUNDLIB_H */ + +/* Define to 1 if you have the <capi20.h> header file. */ +/* #undef HAVE_CAPI20_H */ + +/* Define if you have capi4linux libs and headers */ +/* #undef HAVE_CAPI4LINUX */ + +/* Define to 1 if you have the `chsize' function. */ +#define HAVE_CHSIZE 1 + +/* Define to 1 if you have the `clone' function. */ +/* #undef HAVE_CLONE */ + +/* Define to 1 if you have the `connect' function. */ +/* #undef HAVE_CONNECT */ + +/* Define if we have linux/input.h AND it contains the INPUT event API */ +/* #undef HAVE_CORRECT_LINUXINPUT_H */ + +/* Define to 1 if you have the <cups/cups.h> header file. */ +/* #undef HAVE_CUPS_CUPS_H */ + +/* Define to 1 if you have the <curses.h> header file. */ +/* #undef HAVE_CURSES_H */ + +/* Define to 1 if you have the <direct.h> header file. */ +#define HAVE_DIRECT_H 1 + +/* Define to 1 if you have the <dlfcn.h> header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define if you have dlopen */ +/* #undef HAVE_DLOPEN */ + +/* Define to 1 if you have the <elf.h> header file. */ +/* #undef HAVE_ELF_H */ + +/* Define to 1 if you have the `epoll_create' function. */ +/* #undef HAVE_EPOLL_CREATE */ + +/* Define to 1 if you have the `ffs' function. */ +/* #undef HAVE_FFS */ + +/* Define to 1 if you have the `finite' function. */ +#define HAVE_FINITE 1 + +/* Define to 1 if you have the <float.h> header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ +/* #undef HAVE_FONTCONFIG_FONTCONFIG_H */ + +/* Define to 1 if you have the `fork' function. */ +/* #undef HAVE_FORK */ + +/* Define to 1 if you have the `fpclass' function. */ +#define HAVE_FPCLASS 1 + +/* Define if FreeType 2 is installed */ +/* #undef HAVE_FREETYPE */ + +/* Define to 1 if you have the <freetype/freetype.h> header file. */ +/* #undef HAVE_FREETYPE_FREETYPE_H */ + +/* Define to 1 if you have the <freetype/ftglyph.h> header file. */ +/* #undef HAVE_FREETYPE_FTGLYPH_H */ + +/* Define to 1 if you have the <freetype/ftnames.h> header file. */ +/* #undef HAVE_FREETYPE_FTNAMES_H */ + +/* Define to 1 if you have the <freetype/ftoutln.h> header file. */ +/* #undef HAVE_FREETYPE_FTOUTLN_H */ + +/* Define to 1 if you have the <freetype/ftsnames.h> header file. */ +/* #undef HAVE_FREETYPE_FTSNAMES_H */ + +/* Define if you have the <freetype/fttrigon.h> header file. */ +/* #undef HAVE_FREETYPE_FTTRIGON_H */ + +/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ +/* #undef HAVE_FREETYPE_FTWINFNT_H */ + +/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ +/* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ + +/* Define to 1 if you have the <freetype/ttnameid.h> header file. */ +/* #undef HAVE_FREETYPE_TTNAMEID_H */ + +/* Define to 1 if you have the <freetype/tttables.h> header file. */ +/* #undef HAVE_FREETYPE_TTTABLES_H */ + +/* Define to 1 if the system has the type `fsblkcnt_t'. */ +/* #undef HAVE_FSBLKCNT_T */ + +/* Define to 1 if the system has the type `fsfilcnt_t'. */ +/* #undef HAVE_FSFILCNT_T */ + +/* Define to 1 if you have the `fstatfs' function. */ +/* #undef HAVE_FSTATFS */ + +/* Define to 1 if you have the `fstatvfs' function. */ +/* #undef HAVE_FSTATVFS */ + +/* Define to 1 if you have the <ft2build.h> header file. */ +/* #undef HAVE_FT2BUILD_H */ + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `futimes' function. */ +/* #undef HAVE_FUTIMES */ + +/* Define to 1 if you have the `gethostbyname' function. */ +/* #undef HAVE_GETHOSTBYNAME */ + +/* Define to 1 if you have the `getnetbyname' function. */ +/* #undef HAVE_GETNETBYNAME */ + +/* Define to 1 if you have the <getopt.h> header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getprotobyname' function. */ +/* #undef HAVE_GETPROTOBYNAME */ + +/* Define to 1 if you have the `getprotobynumber' function. */ +/* #undef HAVE_GETPROTOBYNUMBER */ + +/* Define to 1 if you have the `getpwuid' function. */ +/* #undef HAVE_GETPWUID */ + +/* Define to 1 if you have the `getservbyport' function. */ +/* #undef HAVE_GETSERVBYPORT */ + +/* Define to 1 if you have the `gettid' function. */ +/* #undef HAVE_GETTID */ + +/* Define to 1 if you have the `gettimeofday' function. */ +/* #undef HAVE_GETTIMEOFDAY */ + +/* Define to 1 if you have the `getuid' function. */ +/* #undef HAVE_GETUID */ + +/* Define to 1 if you have the <gif_lib.h> header file. */ +/* #undef HAVE_GIF_LIB_H */ + +/* Define to 1 if you have the <GL/glext.h> header file. */ +/* #undef HAVE_GL_GLEXT_H */ + +/* Define to 1 if you have the <GL/glx.h> header file. */ +/* #undef HAVE_GL_GLX_H */ + +/* Define to 1 if you have the <GL/gl.h> header file. */ +/* #undef HAVE_GL_GL_H */ + +/* Define to 1 if the ICU libraries are installed */ +/* #undef HAVE_ICU */ + +/* Define to 1 if you have the <ieeefp.h> header file. */ +/* #undef HAVE_IEEEFP_H */ + +/* Define to 1 if you have the `inet_aton' function. */ +/* #undef HAVE_INET_ATON */ + +/* Define to 1 if you have the `inet_network' function. */ +/* #undef HAVE_INET_NETWORK */ + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the <io.h> header file. */ +#define HAVE_IO_H 1 + +/* Define if IPX should use netipx/ipx.h from libc */ +/* #undef HAVE_IPX_GNU */ + +/* Define if IPX includes are taken from Linux kernel */ +/* #undef HAVE_IPX_LINUX */ + +/* Define to 1 if you have the `iswalnum' function. */ +#define HAVE_ISWALNUM 1 + +/* Define to 1 if you have the <jack/jack.h> header file. */ +/* #undef HAVE_JACK_JACK_H */ + +/* Define to 1 if you have the <jpeglib.h> header file. */ +/* #undef HAVE_JPEGLIB_H */ + +/* Define to 1 if you have the <lcms.h> header file. */ +/* #undef HAVE_LCMS_H */ + +/* Define to 1 if you have the <lcms/lcms.h> header file. */ +/* #undef HAVE_LCMS_LCMS_H */ + +/* Define if you have libaudioIO */ +/* #undef HAVE_LIBAUDIOIO */ + +/* Define to 1 if you have the <libaudioio.h> header file. */ +/* #undef HAVE_LIBAUDIOIO_H */ + +/* Define if you have the curses library (-lcurses) */ +/* #undef HAVE_LIBCURSES */ + +/* Define to 1 if you have the `i386' library (-li386). */ +/* #undef HAVE_LIBI386 */ + +/* Define if you have the ncurses library (-lncurses) */ +/* #undef HAVE_LIBNCURSES */ + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +/* #undef HAVE_LIBNSL */ + +/* Define to 1 if you have the `ossaudio' library (-lossaudio). */ +/* #undef HAVE_LIBOSSAUDIO */ + +/* Define to 1 if you have the `poll' library (-lpoll). */ +/* #undef HAVE_LIBPOLL */ + +/* Define to 1 if you have the `resolv' library (-lresolv). */ +/* #undef HAVE_LIBRESOLV */ + +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define to 1 if you have the `w' library (-lw). */ +/* #undef HAVE_LIBW */ + +/* Define to 1 if you have the `xpg4' library (-lxpg4). */ +/* #undef HAVE_LIBXPG4 */ + +/* Define if you have the Xrandr library */ +/* #undef HAVE_LIBXRANDR */ + +/* Define if you have the X Shape extension */ +/* #undef HAVE_LIBXSHAPE */ + +/* Define if you have the Xxf86dga library version 2 */ +/* #undef HAVE_LIBXXF86DGA2 */ + +/* Define if you have the Xxf86vm library */ +/* #undef HAVE_LIBXXF86VM */ + +/* Define if you have the X Shm extension */ +/* #undef HAVE_LIBXXSHM */ + +/* Define to 1 if you have the <link.h> header file. */ +/* #undef HAVE_LINK_H */ + +/* Define if <linux/joystick.h> defines the Linux 2.2 joystick API */ +/* #undef HAVE_LINUX_22_JOYSTICK_API */ + +/* Define to 1 if you have the <linux/capi.h> header file. */ +/* #undef HAVE_LINUX_CAPI_H */ + +/* Define to 1 if you have the <linux/cdrom.h> header file. */ +/* #undef HAVE_LINUX_CDROM_H */ + +/* Define to 1 if you have the <linux/compiler.h> header file. */ +/* #undef HAVE_LINUX_COMPILER_H */ + +/* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ +/* #undef HAVE_LINUX_GETHOSTBYNAME_R_6 */ + +/* Define to 1 if you have the <linux/hdreg.h> header file. */ +/* #undef HAVE_LINUX_HDREG_H */ + +/* Define to 1 if you have the <linux/input.h> header file. */ +/* #undef HAVE_LINUX_INPUT_H */ + +/* Define to 1 if you have the <linux/ioctl.h> header file. */ +/* #undef HAVE_LINUX_IOCTL_H */ + +/* Define to 1 if you have the <linux/joystick.h> header file. */ +/* #undef HAVE_LINUX_JOYSTICK_H */ + +/* Define to 1 if you have the <linux/major.h> header file. */ +/* #undef HAVE_LINUX_MAJOR_H */ + +/* Define to 1 if you have the <linux/param.h> header file. */ +/* #undef HAVE_LINUX_PARAM_H */ + +/* Define to 1 if you have the <linux/serial.h> header file. */ +/* #undef HAVE_LINUX_SERIAL_H */ + +/* Define to 1 if you have the <linux/ucdrom.h> header file. */ +/* #undef HAVE_LINUX_UCDROM_H */ + +/* Define to 1 if the system has the type `long long'. */ +#define HAVE_LONG_LONG 1 + +/* Define to 1 if you have the `lstat' function. */ +/* #undef HAVE_LSTAT */ + +/* Define to 1 if you have the <machine/cpu.h> header file. */ +/* #undef HAVE_MACHINE_CPU_H */ + +/* Define to 1 if you have the <machine/soundcard.h> header file. */ +/* #undef HAVE_MACHINE_SOUNDCARD_H */ + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mmap' function. */ +/* #undef HAVE_MMAP */ + +/* Define to 1 if you have the <mntent.h> header file. */ +/* #undef HAVE_MNTENT_H */ + +/* Define to 1 if the system has the type `mode_t'. */ +#define HAVE_MODE_T 1 + +/* Define if you have NAS including devel headers */ +/* #undef HAVE_NAS */ + +/* Define to 1 if you have the <ncurses.h> header file. */ +/* #undef HAVE_NCURSES_H */ + +/* Define to 1 if you have the <netdb.h> header file. */ +/* #undef HAVE_NETDB_H */ + +/* Define to 1 if you have the <netinet/in.h> header file. */ +/* #undef HAVE_NETINET_IN_H */ + +/* Define to 1 if you have the <netinet/in_systm.h> header file. */ +/* #undef HAVE_NETINET_IN_SYSTM_H */ + +/* Define to 1 if you have the <netinet/tcp_fsm.h> header file. */ +/* #undef HAVE_NETINET_TCP_FSM_H */ + +/* Define to 1 if you have the <netinet/tcp.h> header file. */ +/* #undef HAVE_NETINET_TCP_H */ + +/* Define to 1 if you have the <net/if_arp.h> header file. */ +/* #undef HAVE_NET_IF_ARP_H */ + +/* Define to 1 if you have the <net/if_dl.h> header file. */ +/* #undef HAVE_NET_IF_DL_H */ + +/* Define to 1 if you have the <net/if.h> header file. */ +/* #undef HAVE_NET_IF_H */ + +/* Define to 1 if you have the <net/if_types.h> header file. */ +/* #undef HAVE_NET_IF_TYPES_H */ + +/* Define to 1 if you have the <net/route.h> header file. */ +/* #undef HAVE_NET_ROUTE_H */ + +/* Define to 1 if the system has the type `off_t'. */ +#define HAVE_OFF_T 1 + +/* Define if OpenGL is present on the system */ +/* #undef HAVE_OPENGL */ + +/* Define to 1 if you have the <openssl/ssl.h> header file. */ +/* #undef HAVE_OPENSSL_SSL_H */ + +/* Define if you have the Open Sound system */ +/* #undef HAVE_OSS */ + +/* Define if you have the Open Sound system (MIDI interface) */ +/* #undef HAVE_OSS_MIDI */ + +/* Define to 1 if you have the `pclose' function. */ +#define HAVE_PCLOSE 1 + +/* Define to 1 if the system has the type `pid_t'. */ +#define HAVE_PID_T 1 + +/* Define to 1 if you have the `popen' function. */ +#define HAVE_POPEN 1 + +/* Define if we can use ppdev.h for parallel port access */ +/* #undef HAVE_PPDEV */ + +/* Define to 1 if you have the `pread' function. */ +/* #undef HAVE_PREAD */ + +/* Define to 1 if you have the <process.h> header file. */ +#define HAVE_PROCESS_H 1 + +/* Define to 1 if you have the `pthread_getattr_np' function. */ +/* #undef HAVE_PTHREAD_GETATTR_NP */ + +/* Define to 1 if you have the `pthread_get_stackaddr_np' function. */ +/* #undef HAVE_PTHREAD_GET_STACKADDR_NP */ + +/* Define to 1 if you have the `pthread_get_stacksize_np' function. */ +/* #undef HAVE_PTHREAD_GET_STACKSIZE_NP */ + +/* Define to 1 if you have the <pthread.h> header file. */ +/* #undef HAVE_PTHREAD_H */ + +/* Define to 1 if the system has the type `pthread_rwlockattr_t'. */ +/* #undef HAVE_PTHREAD_RWLOCKATTR_T */ + +/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +/* #undef HAVE_PTHREAD_RWLOCK_T */ + +/* Define to 1 if you have the <pwd.h> header file. */ +/* #undef HAVE_PWD_H */ + +/* Define to 1 if you have the `pwrite' function. */ +/* #undef HAVE_PWRITE */ + +/* Define to 1 if you have the `readlink' function. */ +/* #undef HAVE_READLINK */ + +/* Define to 1 if you have the <regex.h> header file. */ +/* #undef HAVE_REGEX_H */ + +/* Define to 1 if you have the <resolv.h> header file. */ +/* #undef HAVE_RESOLV_H */ + +/* Define to 1 if you have the `rfork' function. */ +/* #undef HAVE_RFORK */ + +/* Define if we have SANE development environment */ +/* #undef HAVE_SANE */ + +/* Define to 1 if you have the <sched.h> header file. */ +/* #undef HAVE_SCHED_H */ + +/* Define to 1 if you have the `sched_yield' function. */ +/* #undef HAVE_SCHED_YIELD */ + +/* Define to 1 if you have the <scsi/scsi.h> header file. */ +/* #undef HAVE_SCSI_SCSI_H */ + +/* Define to 1 if you have the <scsi/scsi_ioctl.h> header file. */ +/* #undef HAVE_SCSI_SCSI_IOCTL_H */ + +/* Define to 1 if you have the <scsi/sg.h> header file. */ +/* #undef HAVE_SCSI_SG_H */ + +/* Define to 1 if you have the `select' function. */ +/* #undef HAVE_SELECT */ + +/* Define to 1 if you have the `sendmsg' function. */ +/* #undef HAVE_SENDMSG */ + +/* Define to 1 if you have the `settimeofday' function. */ +/* #undef HAVE_SETTIMEOFDAY */ + +/* Define if sigaddset is supported */ +/* #undef HAVE_SIGADDSET */ + +/* Define to 1 if you have the `sigaltstack' function. */ +/* #undef HAVE_SIGALTSTACK */ + +/* Define to 1 if `si_fd' is member of `siginfo_t'. */ +/* #undef HAVE_SIGINFO_T_SI_FD */ + +/* Define to 1 if you have the `sigprocmask' function. */ +/* #undef HAVE_SIGPROCMASK */ + +/* Define to 1 if you have the sigsetjmp (and siglongjmp) function */ +/* #undef HAVE_SIGSETJMP */ + +/* Define to 1 if the system has the type `sigset_t'. */ +/* #undef HAVE_SIGSET_T */ + +/* Define to 1 if the system has the type `size_t'. */ +#define HAVE_SIZE_T 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the <soundcard.h> header file. */ +/* #undef HAVE_SOUNDCARD_H */ + +/* Define to 1 if you have the `spawnvp' function. */ +#define HAVE_SPAWNVP 1 + +/* Define to 1 if the system has the type `ssize_t'. */ +#define HAVE_SSIZE_T 1 + +/* Define to 1 if you have the `statfs' function. */ +/* #undef HAVE_STATFS */ + +/* Define to 1 if you have the `statvfs' function. */ +/* #undef HAVE_STATVFS */ + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ +/* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ + +/* Define to 1 if `name' is member of `struct option'. */ +#define HAVE_STRUCT_OPTION_NAME 1 + +/* Define to 1 if `sa_len' is member of `struct sockaddr'. */ +/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */ + +/* Define to 1 if `sun_len' is member of `struct sockaddr_un'. */ +/* #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN */ + +/* Define to 1 if `f_bavail' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */ + +/* Define to 1 if `f_bfree' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_BFREE */ + +/* Define to 1 if `f_favail' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FAVAIL */ + +/* Define to 1 if `f_ffree' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FFREE */ + +/* Define to 1 if `f_frsize' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FRSIZE */ + +/* Define to 1 if `f_namelen' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_NAMELEN */ + +/* Define to 1 if `f_blocks' is member of `struct statvfs'. */ +/* #undef HAVE_STRUCT_STATVFS_F_BLOCKS */ + +/* Define to 1 if `st_blocks' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */ + +/* Define to 1 if you have the <syscall.h> header file. */ +/* #undef HAVE_SYSCALL_H */ + +/* Define to 1 if you have the <sys/asoundlib.h> header file. */ +/* #undef HAVE_SYS_ASOUNDLIB_H */ + +/* Define to 1 if you have the <sys/cdio.h> header file. */ +/* #undef HAVE_SYS_CDIO_H */ + +/* Define to 1 if you have the <sys/elf32.h> header file. */ +/* #undef HAVE_SYS_ELF32_H */ + +/* Define to 1 if you have the <sys/epoll.h> header file. */ +/* #undef HAVE_SYS_EPOLL_H */ + +/* Define to 1 if you have the <sys/errno.h> header file. */ +/* #undef HAVE_SYS_ERRNO_H */ + +/* Define to 1 if you have the <sys/exec_elf.h> header file. */ +/* #undef HAVE_SYS_EXEC_ELF_H */ + +/* Define to 1 if you have the <sys/filio.h> header file. */ +/* #undef HAVE_SYS_FILIO_H */ + +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +/* #undef HAVE_SYS_IOCTL_H */ + +/* Define to 1 if you have the <sys/ipc.h> header file. */ +/* #undef HAVE_SYS_IPC_H */ + +/* Define to 1 if you have the <sys/link.h> header file. */ +/* #undef HAVE_SYS_LINK_H */ + +/* Define to 1 if you have the <sys/lwp.h> header file. */ +/* #undef HAVE_SYS_LWP_H */ + +/* Define to 1 if you have the <sys/mman.h> header file. */ +/* #undef HAVE_SYS_MMAN_H */ + +/* Define to 1 if you have the <sys/modem.h> header file. */ +/* #undef HAVE_SYS_MODEM_H */ + +/* Define to 1 if you have the <sys/mount.h> header file. */ +/* #undef HAVE_SYS_MOUNT_H */ + +/* Define to 1 if you have the <sys/msg.h> header file. */ +/* #undef HAVE_SYS_MSG_H */ + +/* Define to 1 if you have the <sys/param.h> header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the <sys/poll.h> header file. */ +/* #undef HAVE_SYS_POLL_H */ + +/* Define to 1 if you have the <sys/ptrace.h> header file. */ +/* #undef HAVE_SYS_PTRACE_H */ + +/* Define to 1 if you have the <sys/reg.h> header file. */ +/* #undef HAVE_SYS_REG_H */ + +/* Define to 1 if you have the <sys/scsiio.h> header file. */ +/* #undef HAVE_SYS_SCSIIO_H */ + +/* Define to 1 if you have the <sys/shm.h> header file. */ +/* #undef HAVE_SYS_SHM_H */ + +/* Define to 1 if you have the <sys/signal.h> header file. */ +/* #undef HAVE_SYS_SIGNAL_H */ + +/* Define to 1 if you have the <sys/socket.h> header file. */ +/* #undef HAVE_SYS_SOCKET_H */ + +/* Define to 1 if you have the <sys/sockio.h> header file. */ +/* #undef HAVE_SYS_SOCKIO_H */ + +/* Define to 1 if you have the <sys/soundcard.h> header file. */ +/* #undef HAVE_SYS_SOUNDCARD_H */ + +/* Define to 1 if you have the <sys/statfs.h> header file. */ +/* #undef HAVE_SYS_STATFS_H */ + +/* Define to 1 if you have the <sys/statvfs.h> header file. */ +/* #undef HAVE_SYS_STATVFS_H */ + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/strtio.h> header file. */ +/* #undef HAVE_SYS_STRTIO_H */ + +/* Define to 1 if you have the <sys/syscall.h> header file. */ +/* #undef HAVE_SYS_SYSCALL_H */ + +/* Define to 1 if you have the <sys/sysctl.h> header file. */ +/* #undef HAVE_SYS_SYSCTL_H */ + +/* Define to 1 if you have the <sys/times.h> header file. */ +/* #undef HAVE_SYS_TIMES_H */ + +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the <sys/uio.h> header file. */ +/* #undef HAVE_SYS_UIO_H */ + +/* Define to 1 if you have the <sys/un.h> header file. */ +/* #undef HAVE_SYS_UN_H */ + +/* Define to 1 if you have the <sys/user.h> header file. */ +/* #undef HAVE_SYS_USER_H */ + +/* Define to 1 if you have the <sys/vfs.h> header file. */ +/* #undef HAVE_SYS_VFS_H */ + +/* Define to 1 if you have the <sys/vm86.h> header file. */ +/* #undef HAVE_SYS_VM86_H */ + +/* Define to 1 if you have the <sys/wait.h> header file. */ +/* #undef HAVE_SYS_WAIT_H */ + +/* Define to 1 if you have the `tcgetattr' function. */ +/* #undef HAVE_TCGETATTR */ + +/* Define to 1 if you have the <termios.h> header file. */ +/* #undef HAVE_TERMIOS_H */ + +/* Define to 1 if you have the `timegm' function. */ +/* #undef HAVE_TIMEGM */ + +/* Define to 1 if you have the <ucontext.h> header file. */ +/* #undef HAVE_UCONTEXT_H */ + +/* Define to 1 if you have the <unicode/ubidi.h> header file. */ +/* #undef HAVE_UNICODE_UBIDI_H */ + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `usleep' function. */ +/* #undef HAVE_USLEEP */ + +/* Define to 1 if you have the <utime.h> header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if you have the <valgrind/memcheck.h> header file. */ +/* #undef HAVE_VALGRIND_MEMCHECK_H */ + +/* Define if we have va_copy */ +#define HAVE_VA_COPY 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `wait4' function. */ +/* #undef HAVE_WAIT4 */ + +/* Define to 1 if you have the `waitpid' function. */ +/* #undef HAVE_WAITPID */ + +/* Define to 1 if you have the <X11/extensions/shape.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_SHAPE_H */ + +/* Define to 1 if you have the <X11/extensions/xf86dga.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XF86DGA_H */ + +/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XF86VMODE_H */ + +/* Define to 1 if you have the <X11/extensions/XInput.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XINPUT_H */ + +/* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XRANDR_H */ + +/* Define to 1 if you have the <X11/extensions/Xrender.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XRENDER_H */ + +/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */ +/* #undef HAVE_X11_EXTENSIONS_XSHM_H */ + +/* Define to 1 if you have the <X11/XKBlib.h> header file. */ +/* #undef HAVE_X11_XKBLIB_H */ + +/* Define to 1 if you have the <X11/Xlib.h> header file. */ +/* #undef HAVE_X11_XLIB_H */ + +/* Define to 1 if you have the <X11/Xutil.h> header file. */ +/* #undef HAVE_X11_XUTIL_H */ + +/* Define if you have the XKB extension */ +/* #undef HAVE_XKB */ + +/* Define if Xrender has the XRenderSetPictureTransform function */ +/* #undef HAVE_XRENDERSETPICTURETRANSFORM */ + +/* Define to 1 if you have the `_lwp_create' function. */ +/* #undef HAVE__LWP_CREATE */ + +/* Define to 1 if you have the `_lwp_self' function. */ +/* #undef HAVE__LWP_SELF */ + +/* Define to 1 if you have the `_pclose' function. */ +#define HAVE__PCLOSE 1 + +/* Define to 1 if you have the `_popen' function. */ +#define HAVE__POPEN 1 + +/* Define to 1 if you have the `_snprintf' function. */ +#define HAVE__SNPRINTF 1 + +/* Define to 1 if you have the `_spawnvp' function. */ +#define HAVE__SPAWNVP 1 + +/* Define to 1 if you have the `_stricmp' function. */ +#define HAVE__STRICMP 1 + +/* Define to 1 if you have the `_strnicmp' function. */ +#define HAVE__STRNICMP 1 + +/* Define to 1 if you have the `_vsnprintf' function. */ +#define HAVE__VSNPRINTF 1 + +/* Define if we have __va_copy */ +#define HAVE___VA_COPY 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "wine-devel(a)winehq.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "Wine" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "Wine 20050211" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "wine" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "20050211" + +/* Define to the soname of the libcapi20 library. */ +/* #undef SONAME_LIBCAPI20 */ + +/* Define to the soname of the libcrypto library. */ +/* #undef SONAME_LIBCRYPTO */ + +/* Define to the soname of the libcups library. */ +/* #undef SONAME_LIBCUPS */ + +/* Define to the soname of the libcurses library. */ +/* #undef SONAME_LIBCURSES */ + +/* Define to the soname of the libfontconfig library. */ +/* #undef SONAME_LIBFONTCONFIG */ + +/* Define to the soname of the libfreetype library. */ +/* #undef SONAME_LIBFREETYPE */ + +/* Define to the soname of the libgif library. */ +/* #undef SONAME_LIBGIF */ + +/* Define to the soname of the libGL library. */ +/* #undef SONAME_LIBGL */ + +/* Define to the soname of the libjack library. */ +/* #undef SONAME_LIBJACK */ + +/* Define to the soname of the libjpeg library. */ +/* #undef SONAME_LIBJPEG */ + +/* Define to the soname of the liblcms library. */ +/* #undef SONAME_LIBLCMS */ + +/* Define to the soname of the libncurses library. */ +/* #undef SONAME_LIBNCURSES */ + +/* Define to the soname of the libssl library. */ +/* #undef SONAME_LIBSSL */ + +/* Define to the soname of the libtxc_dxtn library. */ +/* #undef SONAME_LIBTXC_DXTN */ + +/* Define to the soname of the libungif library. */ +/* #undef SONAME_LIBUNGIF */ + +/* Define to the soname of the libX11 library. */ +/* #undef SONAME_LIBX11 */ + +/* Define to the soname of the libXext library. */ +/* #undef SONAME_LIBXEXT */ + +/* Define to the soname of the libXi library. */ +/* #undef SONAME_LIBXI */ + +/* Define to the soname of the libXrandr library. */ +/* #undef SONAME_LIBXRANDR */ + +/* Define to the soname of the libXrender library. */ +/* #undef SONAME_LIBXRENDER */ + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define if the struct statfs is defined by <sys/mount.h> */ +/* #undef STATFS_DEFINED_BY_SYS_MOUNT */ + +/* Define if the struct statfs is defined by <sys/statfs.h> */ +/* #undef STATFS_DEFINED_BY_SYS_STATFS */ + +/* Define if the struct statfs is defined by <sys/vfs.h> */ +/* #undef STATFS_DEFINED_BY_SYS_VFS */ + +/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if the X Window System is missing or not being used. */ +#define X_DISPLAY_MISSING 1 + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 + +/* Set this to 64 to enable 64-bit file support on Linux */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define to a macro to generate an assembly function directive */ +#define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef" + +/* Define to a macro to generate an assembly name from a C symbol */ +#define __ASM_NAME(name) "_" name + +/* Define to the assembler keyword used to specify a word value */ +#define __ASM_SHORT ".short" + +/* Define to the assembler keyword used to specify an ASCII string */ +#define __ASM_STRING ".string" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif _____ Added: trunk/reactos/apps/utils/winetest/dist.rc --- trunk/reactos/apps/utils/winetest/dist.rc 2005-03-13 01:10:46 UTC (rev 13988) +++ trunk/reactos/apps/utils/winetest/dist.rc 2005-03-13 01:54:53 UTC (rev 13989) @@ -0,0 +1,25 @@ +/* + * Resources for the binary we distribute to testers + * + * Copyright 2004 Ferenc Wagner + * + * 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 "winetest.rc" + +WINE_BUILD STRINGRES "build.id" +BUILD_INFO STRINGRES "build.nfo" +TESTS_URL STRINGRES "tests.url" _____ Added: trunk/reactos/apps/utils/winetest/gui.c --- trunk/reactos/apps/utils/winetest/gui.c 2005-03-13 01:10:46 UTC (rev 13988) +++ trunk/reactos/apps/utils/winetest/gui.c 2005-03-13 01:54:53 UTC (rev 13989) @@ -0,0 +1,473 @@ +/* + * GUI support + * + * Copyright 2004 Ferenc Wagner + * + * 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, [truncated at 1000 lines; 2234 more skipped]

19 years, 6 months

[weiden] 13977: Alex Ionescu <ionucu@videotron.ca>

by weiden＠svn.reactos.com

Alex Ionescu <ionucu(a)videotron.ca> - Clean up IO Completion Code - Properly delete an IO Completion. The IRPs were not freed, resulting in memory leaks Thomas Weidenmueller <w3seek(a)reactos.com> - Add SEH to IO Completion Code Modified: trunk/reactos/ntoskrnl/io/iocomp.c _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-03-12 19:46:27 UTC (rev 13976) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-03-12 19:58:53 UTC (rev 13977) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/iocomp.c @@ -18,372 +17,467 @@ POBJECT_TYPE ExIoCompletionType; -NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; +NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; static GENERIC_MAPPING ExIoCompletionMapping = { - STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, - STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | IO_COMPLETION_QUERY_STATE, - IO_COMPLETION_ALL_ACCESS + STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, + STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | IO_COMPLETION_QUERY_STATE, + IO_COMPLETION_ALL_ACCESS }; +static const INFORMATION_CLASS_INFO ExIoCompletionInfoClass[] = { + + /* IoCompletionBasicInformation */ + ICI_SQ_SAME( sizeof(IO_COMPLETION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), +}; + /* FUNCTIONS *****************************************************************/ -NTSTATUS +VOID STDCALL -IopCreateIoCompletion( - PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes - ) -{ - DPRINT("IopCreateIoCompletion(ObjectBody %x, Parent %x, RemainingPath %S)\n", - ObjectBody, Parent, RemainingPath); - - if (RemainingPath != NULL && wcschr(RemainingPath+1, '\\') != NULL) - { - return STATUS_UNSUCCESSFUL; - } - - return STATUS_SUCCESS; -} - -VOID STDCALL IopDeleteIoCompletion(PVOID ObjectBody) { - PKQUEUE Queue = ObjectBody; + PKQUEUE Queue = ObjectBody; + PLIST_ENTRY FirstEntry; + PLIST_ENTRY CurrentEntry; + PIO_COMPLETION_PACKET Packet; - DPRINT("IopDeleteIoCompletion()\n"); + DPRINT("IopDeleteIoCompletion()\n"); - KeRundownQueue(Queue); + /* Rundown the Queue */ + FirstEntry = KeRundownQueue(Queue); + + /* Clean up the IRPs */ + if (FirstEntry) { + + CurrentEntry = FirstEntry; + do { + + /* Get the Packet */ + Packet = CONTAINING_RECORD(CurrentEntry, IO_COMPLETION_PACKET, ListEntry); + + /* Go to next Entry */ + CurrentEntry = CurrentEntry->Flink; + + /* Free it */ + ExFreeToNPagedLookasideList(&IoCompletionPacketLookaside, Packet); + } while (FirstEntry != CurrentEntry); + } } - /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL -IoSetCompletionRoutineEx( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_COMPLETION_ROUTINE CompletionRoutine, - IN PVOID Context, - IN BOOLEAN InvokeOnSuccess, - IN BOOLEAN InvokeOnError, - IN BOOLEAN InvokeOnCancel - ) +IoSetIoCompletion(IN PVOID IoCompletion, + IN PVOID KeyContext, + IN PVOID ApcContext, + IN NTSTATUS IoStatus, + IN ULONG_PTR IoStatusInformation, + IN BOOLEAN Quota) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PKQUEUE Queue = (PKQUEUE)IoCompletion; + PIO_COMPLETION_PACKET Packet; + + /* Allocate the Packet */ + Packet = ExAllocateFromNPagedLookasideList(&IoCompletionPacketLookaside); + if (NULL == Packet) return STATUS_NO_MEMORY; + + /* Set up the Packet */ + Packet->Key = KeyContext; + Packet->Context = ApcContext; + Packet->IoStatus.Status = IoStatus; + Packet->IoStatus.Information = IoStatusInformation; + + /* Insert the Queue */ + KeInsertQueue(Queue, &Packet->ListEntry); + + /* Return Success */ + return STATUS_SUCCESS; } /* - * @implemented + * @unimplemented */ NTSTATUS STDCALL -IoSetIoCompletion ( - IN PVOID IoCompletion, - IN PVOID KeyContext, - IN PVOID ApcContext, - IN NTSTATUS IoStatus, - IN ULONG_PTR IoStatusInformation, - IN BOOLEAN Quota - ) +IoSetCompletionRoutineEx(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_COMPLETION_ROUTINE CompletionRoutine, + IN PVOID Context, + IN BOOLEAN InvokeOnSuccess, + IN BOOLEAN InvokeOnError, + IN BOOLEAN InvokeOnCancel) { - PKQUEUE Queue = (PKQUEUE) IoCompletion; - PIO_COMPLETION_PACKET Packet; - - Packet = ExAllocateFromNPagedLookasideList(&IoCompletionPacketLookaside); - if (NULL == Packet) - { - return STATUS_NO_MEMORY; - } - - Packet->Key = KeyContext; - Packet->Context = ApcContext; - Packet->IoStatus.Status = IoStatus; - Packet->IoStatus.Information = IoStatusInformation; - - KeInsertQueue(Queue, &Packet->ListEntry); - - return STATUS_SUCCESS; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } VOID FASTCALL IopInitIoCompletionImplementation(VOID) { - ExIoCompletionType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - - RtlpCreateUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion", NonPagedPool); - - ExIoCompletionType->Tag = IOC_TAG; - ExIoCompletionType->PeakObjects = 0; - ExIoCompletionType->PeakHandles = 0; - ExIoCompletionType->TotalObjects = 0; - ExIoCompletionType->TotalHandles = 0; - ExIoCompletionType->PagedPoolCharge = 0; - ExIoCompletionType->NonpagedPoolCharge = sizeof(KQUEUE); - ExIoCompletionType->Mapping = &ExIoCompletionMapping; - ExIoCompletionType->Dump = NULL; - ExIoCompletionType->Open = NULL; - ExIoCompletionType->Close = NULL; - ExIoCompletionType->Delete = IopDeleteIoCompletion; - ExIoCompletionType->Parse = NULL; - ExIoCompletionType->Security = NULL; - ExIoCompletionType->QueryName = NULL; - ExIoCompletionType->OkayToClose = NULL; - ExIoCompletionType->Create = IopCreateIoCompletion; - ExIoCompletionType->DuplicationNotify = NULL; + /* Create the IO Completion Type */ + ExIoCompletionType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + RtlInitUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion"); + ExIoCompletionType->Tag = IOC_TAG; + ExIoCompletionType->PeakObjects = 0; + ExIoCompletionType->PeakHandles = 0; + ExIoCompletionType->TotalObjects = 0; + ExIoCompletionType->TotalHandles = 0; + ExIoCompletionType->PagedPoolCharge = 0; + ExIoCompletionType->NonpagedPoolCharge = sizeof(KQUEUE); + ExIoCompletionType->Mapping = &ExIoCompletionMapping; + ExIoCompletionType->Dump = NULL; + ExIoCompletionType->Open = NULL; + ExIoCompletionType->Close = NULL; + ExIoCompletionType->Delete = IopDeleteIoCompletion; + ExIoCompletionType->Parse = NULL; + ExIoCompletionType->Security = NULL; + ExIoCompletionType->QueryName = NULL; + ExIoCompletionType->OkayToClose = NULL; + ExIoCompletionType->Create = NULL; + ExIoCompletionType->DuplicationNotify = NULL; - ExInitializeNPagedLookasideList(&IoCompletionPacketLookaside, - NULL, - NULL, - 0, - sizeof(IO_COMPLETION_PACKET), - IOC_TAG, - 0); + /* Initialize the Lookaside List we'll use for packets */ + ExInitializeNPagedLookasideList(&IoCompletionPacketLookaside, + NULL, + NULL, + 0, + sizeof(IO_COMPLETION_PACKET), + IOC_TAG, + 0); } - NTSTATUS STDCALL -NtCreateIoCompletion( - OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG NumberOfConcurrentThreads - ) +NtCreateIoCompletion(OUT PHANDLE IoCompletionHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG NumberOfConcurrentThreads) { - PKQUEUE Queue; - NTSTATUS Status; + PKQUEUE Queue; + HANDLE hIoCompletionHandle; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); - Status = ObCreateObject(ExGetPreviousMode(), - ExIoCompletionType, - ObjectAttributes, - ExGetPreviousMode(), - NULL, - sizeof(KQUEUE), - 0, - 0, - (PVOID*)&Queue); - if (!NT_SUCCESS(Status)) - { - return Status; - } + if (PreviousMode != KernelMode) { - Status = ObInsertObject ((PVOID)Queue, - NULL, - DesiredAccess, - 0, - NULL, - IoCompletionHandle); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Queue); - return Status; - } + _SEH_TRY { - KeInitializeQueue(Queue, NumberOfConcurrentThreads); - ObDereferenceObject(Queue); + ProbeForWrite(IoCompletionHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { - return STATUS_SUCCESS; - /* + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + if (!NT_SUCCESS(Status)) { - CompletionPort = NULL OR ExistingCompletionPort + return Status; + } + } - */ - + /* Create the Object */ + Status = ObCreateObject(PreviousMode, + ExIoCompletionType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(KQUEUE), + 0, + 0, + (PVOID*)&Queue); + + /* Check for success */ + if (NT_SUCCESS(Status)) { + + /* Initialize the Queue */ + KeInitializeQueue(Queue, NumberOfConcurrentThreads); -} + /* Insert it */ + Status = ObInsertObject(Queue, + NULL, + DesiredAccess, + 0, + NULL, + &hIoCompletionHandle); + ObDereferenceObject(Queue); + + if (NT_SUCCESS(Status)) { -/* -DesiredAccess: -ZERO -IO_COMPLETION_QUERY_STATE Query access -IO_COMPLETION_MODIFY_STATE Modify access -IO_COMPLETION_ALL_ACCESS All of the preceding + STANDARD_RIGHTS_ALL + _SEH_TRY { -ObjectAttributes -OBJ_OPENLINK and OBJ_PERMANENT are not valid attributes + *IoCompletionHandle = hIoCompletionHandle; + } _SEH_HANDLE { -Return Value -STATUS_SUCCESS or an error status, such as STATUS_ACCESS_DENIED or -STATUS_OBJECT_NAME_NOT_FOUND. -*/ + Status = _SEH_GetExceptionCode(); + } _SEH_END; + } + } + + /* Return Status */ + return Status; +} + NTSTATUS STDCALL -NtOpenIoCompletion( - OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes - ) +NtOpenIoCompletion(OUT PHANDLE IoCompletionHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) { - NTSTATUS Status; - - Status = ObOpenObjectByName(ObjectAttributes, - ExIoCompletionType, - NULL, - UserMode, - DesiredAccess, - NULL, - IoCompletionHandle); //<- ??? - - return Status; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + HANDLE hIoCompletionHandle; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + if(PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(IoCompletionHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + if(!NT_SUCCESS(Status)) { + + return Status; + } + } + + /* Open the Object */ + Status = ObOpenObjectByName(ObjectAttributes, + ExIoCompletionType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hIoCompletionHandle); + + if (NT_SUCCESS(Status)) { + + _SEH_TRY { + + *IoCompletionHandle = hIoCompletionHandle; + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; + } + + /* Return Status */ + return Status; } NTSTATUS STDCALL -NtQueryIoCompletion( - IN HANDLE IoCompletionHandle, - IN IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, - OUT PVOID IoCompletionInformation, - IN ULONG IoCompletionInformationLength, - OUT PULONG ResultLength OPTIONAL - ) +NtQueryIoCompletion(IN HANDLE IoCompletionHandle, + IN IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, + OUT PVOID IoCompletionInformation, + IN ULONG IoCompletionInformationLength, + OUT PULONG ResultLength OPTIONAL) { - PKQUEUE Queue; - NTSTATUS Status; + PKQUEUE Queue; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); - if (IoCompletionInformationClass != IoCompletionBasicInformation) - { - return STATUS_INVALID_INFO_CLASS; - } - if (IoCompletionInformationLength < sizeof(IO_COMPLETION_BASIC_INFORMATION)) - { - return STATUS_INFO_LENGTH_MISMATCH; - } + /* Check buffers and parameters */ + DefaultQueryInfoBufferCheck(IoCompletionInformationClass, + ExIoCompletionInfoClass, + IoCompletionInformation, + IoCompletionInformationLength, + ResultLength, + PreviousMode, + &Status); + if(!NT_SUCCESS(Status)) { - Status = ObReferenceObjectByHandle( IoCompletionHandle, + DPRINT1("NtQueryMutant() failed, Status: 0x%x\n", Status); + return Status; + } + + /* Get the Object */ + Status = ObReferenceObjectByHandle(IoCompletionHandle, IO_COMPLETION_QUERY_STATE, ExIoCompletionType, - UserMode, + PreviousMode, (PVOID*)&Queue, NULL); - if (NT_SUCCESS(Status)) - { - ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)->Depth = - Queue->Header.SignalState; + + /* Check for Success */ + if (NT_SUCCESS(Status)) { + + _SEH_TRY { - ObDereferenceObject(Queue); + /* Return Info */ + ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)->Depth = KeReadStateQueue(Queue); + ObDereferenceObject(Queue); - if (ResultLength) *ResultLength = sizeof(IO_COMPLETION_BASIC_INFORMATION); - } + /* Return Result Length if needed */ + if (ResultLength) { - return Status; + *ResultLength = sizeof(IO_COMPLETION_BASIC_INFORMATION); + } + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; + } + + /* Return Status */ + return Status; } - /* * Dequeues an I/O completion message from an I/O completion object */ NTSTATUS STDCALL -NtRemoveIoCompletion( - IN HANDLE IoCompletionHandle, - OUT PVOID *CompletionKey, - OUT PVOID *CompletionContext, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER Timeout OPTIONAL - ) +NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, + OUT PVOID *CompletionKey, + OUT PVOID *CompletionContext, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PLARGE_INTEGER Timeout OPTIONAL) { - PKQUEUE Queue; - NTSTATUS Status; - PIO_COMPLETION_PACKET Packet; - PLIST_ENTRY ListEntry; + LARGE_INTEGER SafeTimeout; + PKQUEUE Queue; + PIO_COMPLETION_PACKET Packet; + PLIST_ENTRY ListEntry; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); - Status = ObReferenceObjectByHandle( IoCompletionHandle, + if (PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(CompletionKey, + sizeof(PVOID), + sizeof(ULONG)); + ProbeForWrite(CompletionContext, + sizeof(PVOID), + sizeof(ULONG)); + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + if (Timeout != NULL) { + + ProbeForRead(Timeout, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + SafeTimeout = *Timeout; + Timeout = &SafeTimeout; + } + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + if (!NT_SUCCESS(Status)) { + + return Status; + } + } + + /* Open the Object */ + Status = ObReferenceObjectByHandle(IoCompletionHandle, IO_COMPLETION_MODIFY_STATE, ExIoCompletionType, - UserMode, + PreviousMode, (PVOID*)&Queue, NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } + + /* Check for success */ + if (NT_SUCCESS(Status)) { - /* - Try 2 remove packet from queue. Wait (optionaly) if - no packet in queue or max num of threads allready running. - */ - - do { - - ListEntry = KeRemoveQueue(Queue, UserMode, Timeout ); + /* Remove queue */ + ListEntry = KeRemoveQueue(Queue, PreviousMode, Timeout); - /* Nebbets book says nothing about NtRemoveIoCompletion returning STATUS_USER_APC, - and the umode equivalent GetQueuedCompletionStatus says nothing about this either, - so my guess it we should restart the operation. Need further investigation. -Gunnar - */ + /* If we got a timeout or user_apc back, return the status */ + if ((NTSTATUS)ListEntry == STATUS_TIMEOUT || (NTSTATUS)ListEntry == STATUS_USER_APC) { + + Status = (NTSTATUS)ListEntry; + + } else { + + /* Get the Packet Data */ + Packet = CONTAINING_RECORD(ListEntry, IO_COMPLETION_PACKET, ListEntry); + + _SEH_TRY { - } while((NTSTATUS)ListEntry == STATUS_USER_APC); + /* Return it */ + *CompletionKey = Packet->Key; + *CompletionContext = Packet->Context; + *IoStatusBlock = Packet->IoStatus; + + } _SEH_HANDLE { - ObDereferenceObject(Queue); + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + /* Free packet */ + ExFreeToNPagedLookasideList(&IoCompletionPacketLookaside, Packet); + } - if ((NTSTATUS)ListEntry == STATUS_TIMEOUT) - { - return STATUS_TIMEOUT; - } - - ASSERT(ListEntry); - - Packet = CONTAINING_RECORD(ListEntry, IO_COMPLETION_PACKET, ListEntry); - - if (CompletionKey) *CompletionKey = Packet->Key; - if (CompletionContext) *CompletionContext = Packet->Context; - if (IoStatusBlock) *IoStatusBlock = Packet->IoStatus; - - ExFreeToNPagedLookasideList(&IoCompletionPacketLookaside, Packet); - - return STATUS_SUCCESS; + /* Dereference the Object */ + ObDereferenceObject(Queue); + } + + /* Return status */ + return Status; } - /* -ASSOSIERT MED FOB's IoCompletionContext - -typedef struct _IO_COMPLETION_CONTEXT { - PVOID Port; - ULONG Key; -} IO_COMPLETION_CONTEXT, *PIO_COMPLETION_CONTEXT; - -*/ - - -/* * Queues an I/O completion message to an I/O completion object */ NTSTATUS STDCALL -NtSetIoCompletion( - IN HANDLE IoCompletionPortHandle, - IN PVOID CompletionKey, - IN PVOID CompletionContext, - IN NTSTATUS CompletionStatus, - IN ULONG CompletionInformation - ) +NtSetIoCompletion(IN HANDLE IoCompletionPortHandle, + IN PVOID CompletionKey, + IN PVOID CompletionContext, + IN NTSTATUS CompletionStatus, + IN ULONG CompletionInformation) { - NTSTATUS Status; - PKQUEUE Queue; - - Status = ObReferenceObjectByHandle( IoCompletionPortHandle, + NTSTATUS Status; + PKQUEUE Queue; + + PAGED_CODE(); + + /* Get the Object */ + Status = ObReferenceObjectByHandle(IoCompletionPortHandle, IO_COMPLETION_MODIFY_STATE, ExIoCompletionType, - UserMode, + ExGetPreviousMode(), (PVOID*)&Queue, NULL); - if (NT_SUCCESS(Status)) - { - Status = IoSetIoCompletion(Queue, CompletionKey, CompletionContext, - CompletionStatus, CompletionInformation, TRUE); - ObDereferenceObject(Queue); - } - - return Status; + + /* Check for Success */ + if (NT_SUCCESS(Status)) { + + /* Set the Completion */ + Status = IoSetIoCompletion(Queue, + CompletionKey, + CompletionContext, + CompletionStatus, + CompletionInformation, + TRUE); + ObDereferenceObject(Queue); + } + + /* Return status */ + return Status; }

19 years, 6 months

[greatlrd] 13988: getmousedevice buffer

by greatlrd＠svn.reactos.com

getmousedevice buffer UT2004 the mouse are less choopy on my computer now. and small bug fix. it maby still exists some bug left. Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/mouse.c --- trunk/reactos/lib/dinput/mouse.c 2005-03-13 00:13:07 UTC (rev 13987) +++ trunk/reactos/lib/dinput/mouse.c 2005-03-13 01:10:46 UTC (rev 13988) @@ -869,6 +869,7 @@ static int save_b[5]; static int b[5]; static POINT point; +int calc; int count_button; #endif @@ -917,14 +918,17 @@ time = GetTickCount(); if (*entries == 0) return DIERR_INVALIDPARAM; - last_event++; + for (count=0;count<*entries;count++) { if (save_point.x != point.x) { - dod[count_ent].dwOfs = DIMOFS_X; - dod[count_ent].dwData = point.x - save_point.x; - + dod[count].dwOfs = DIMOFS_X; + calc = point.x - save_point.x; + if (calc >2) dod[count].dwData = 2; + else if (calc < -2) dod[count].dwData = -2; + else dod[count].dwData = calc; + dod[count].dwTimeStamp = time +1; dod[count].dwSequence = last_event++; count_ent++; @@ -933,7 +937,10 @@ if (save_point.y != point.y) { dod[count].dwOfs = DIMOFS_Y; - dod[count].dwData = point.y - save_point.y; + calc = point.y - save_point.y; + if (calc >2) dod[count].dwData = 2; + else if (calc < -2) dod[count].dwData = -2; + else dod[count].dwData = calc; dod[count].dwTimeStamp = time +1; dod[count].dwSequence = last_event++;

19 years, 6 months

[ros-diffs] [greatlrd] 13987: Fix the mouse for Unreal tormnet 2004, it is working now

by greatlrd＠svn.reactos.com

Fix the mouse for Unreal tormnet 2004, it is working now have not test it to 100%. But hoppfull it is last fix, geting games that need dinput working now with opengl. Modified: trunk/reactos/lib/dinput/mouse.c _____ Modified: trunk/reactos/lib/dinput/mouse.c --- trunk/reactos/lib/dinput/mouse.c 2005-03-12 22:42:38 UTC (rev 13986) +++ trunk/reactos/lib/dinput/mouse.c 2005-03-13 00:13:07 UTC (rev 13987) @@ -733,7 +733,7 @@ - + if (poll_mouse==1) filp=0; if (filp==2) filp=0; if (filp==0) { @@ -865,34 +865,28 @@ int count=0; DWORD count_ent=0; static DWORD time=0; -static int save_x; -static int save_y; -static int save_z; -static int save_b0; -static int save_b1; -static int save_b2; -static int save_b3; -static int save_b4; -static int save_b5; -static int save_b6; -int calc; +static POINT save_point; +static int save_b[5]; +static int b[5]; +static POINT point; +int count_button; #endif TRACE("(%p)->(dods=%ld,entries=%ld,fl=0x%08lx)\n",This,dodsize,*entries, flags); #ifdef __REACTOS__ -save_x = This->m_state.lX; -save_y = This->m_state.lY; -save_z = This->m_state.lZ; -save_b0 = This->m_state.rgbButtons[0]; -save_b1 = This->m_state.rgbButtons[1]; -save_b2 = This->m_state.rgbButtons[2]; -save_b3 = This->m_state.rgbButtons[3]; -save_b4 = This->m_state.rgbButtons[4]; -save_b5 = This->m_state.rgbButtons[5]; -save_b6 = This->m_state.rgbButtons[6]; -getmousesvalue(iface); + +if (flags != DIGDD_PEEK) +{ +b[0] = ((GetKeyState(VK_LBUTTON) & 0x80) ? 0xFF : 0x00); +b[1] = ((GetKeyState(VK_RBUTTON) & 0x80) ? 0xFF : 0x00); +b[2] = ((GetKeyState(VK_MBUTTON) & 0x80) ? 0xFF : 0x00); +b[3] = ((GetKeyState(VK_XBUTTON1) & 0x80) ? 0xFF : 0x00); +b[4] = ((GetKeyState(VK_XBUTTON2) & 0x80) ? 0xFF : 0x00); +GetCursorPos( &point ); +} + #endif // windows does not get any data if @@ -913,103 +907,72 @@ #ifdef __REACTOS__ - FIXME("This is broken in Tribes, need right implant of the buffer!!!!!!!!\n"); + FIXME("This is broken in Tribes ??, need right implant of the buffer!!!!!!!!\n"); if (GetTickCount()-time <50) { return DI_OK; } + time = GetTickCount(); if (*entries == 0) return DIERR_INVALIDPARAM; - + last_event++; + for (count=0;count<*entries;count++) { - if (save_x != This->m_state.lX) { - dod[count].dwOfs = DIMOFS_X; - dod[count].dwData = This->m_state.lX - This->offset_array[0]; + if (save_point.x != point.x) { + dod[count_ent].dwOfs = DIMOFS_X; + dod[count_ent].dwData = point.x - save_point.x; + dod[count].dwTimeStamp = time +1; dod[count].dwSequence = last_event++; count_ent++; + save_point.x = point.x; } - if (save_y != This->m_state.lY) { + if (save_point.y != point.y) { dod[count].dwOfs = DIMOFS_Y; - dod[count].dwData = This->m_state.lY; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; - count_ent++; - } - if (save_z != This->m_state.lZ) { - dod[count].dwOfs = DIMOFS_Z; - dod[count].dwData = This->m_state.lZ; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; - count_ent++; - } - - if (save_b0 != This->m_state.rgbButtons[0]) { - dod[count].dwOfs = DIMOFS_BUTTON0; - dod[count].dwData = This->m_state.rgbButtons[0]; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; - count_ent++; - } + dod[count].dwData = point.y - save_point.y; - if (save_b1 != This->m_state.rgbButtons[1]) { - dod[count].dwOfs = DIMOFS_BUTTON1; - dod[count].dwData = This->m_state.rgbButtons[1]; dod[count].dwTimeStamp = time +1; dod[count].dwSequence = last_event++; count_ent++; + save_point.y = point.y; } + + for (count_button=0;count_button<5;count_button++) + { + if (save_b[count_button] != b[count_button]) { + if (count_button==0) { + dod[count].dwOfs = DIMOFS_BUTTON0; + } - if (save_b2 != This->m_state.rgbButtons[2]) { - dod[count].dwOfs = DIMOFS_BUTTON2; - dod[count].dwData = This->m_state.rgbButtons[2]; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; - count_ent++; - } + if (count_button==1) { + dod[count].dwOfs = DIMOFS_BUTTON1; + } + if (count_button==2) { + dod[count].dwOfs = DIMOFS_BUTTON2; + } + if (count_button==3) { + dod[count].dwOfs = DIMOFS_BUTTON3; + } + if (count_button==4) { + dod[count].dwOfs = DIMOFS_BUTTON4; + } - if (save_b3 != This->m_state.rgbButtons[3]) { - dod[count].dwOfs = DIMOFS_BUTTON3; - dod[count].dwData = This->m_state.rgbButtons[3]; + dod[count].dwData = b[count_button]; dod[count].dwTimeStamp = time +1; dod[count].dwSequence = last_event++; count_ent++; + save_b[count_button] = b[count_button]; } + } - if (save_b4 != This->m_state.rgbButtons[4]) { - dod[count].dwOfs = DIMOFS_BUTTON4; - dod[count].dwData = This->m_state.rgbButtons[4]; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; - count_ent++; - } - - if (save_b5 != This->m_state.rgbButtons[5]) { - dod[count].dwOfs = DIMOFS_BUTTON5; - dod[count].dwData = This->m_state.rgbButtons[5]; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; - count_ent++; - } - - if (save_b6 != This->m_state.rgbButtons[6]) { - dod[count].dwOfs = DIMOFS_BUTTON6; - dod[count].dwData = This->m_state.rgbButtons[6]; - dod[count].dwTimeStamp = time +1; - dod[count].dwSequence = last_event++; - count_ent++; - } - } // end for *entries = count_ent; - - #endif #ifndef __REACTOS__

19 years, 6 months

← Newer
1
...
38
39
40
41
42
43
44
...
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