Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[navaraf] 12894: Change vsprint to _vsnprintf in PrintString to prevent potential buffer overflows. Patch by Uwe Matthaeus <uwe.matthaeus@guehring.de>.

by navaraf＠svn.reactos.com

Change vsprint to _vsnprintf in PrintString to prevent potential buffer overflows. Patch by Uwe Matthaeus <uwe.matthaeus(a)guehring.de>. Modified: trunk/reactos/ntoskrnl/kd/kdebug.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-01-08 22:08:29 UTC (rev 12893) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-01-08 23:36:03 UTC (rev 12894) @@ -60,7 +60,8 @@ va_list ap; va_start(ap, fmt); - vsprintf(buffer, fmt, ap); + _vsnprintf(buffer, sizeof(buffer) - 1, fmt, ap); + buffer[sizeof(buffer) - 1] = 0; va_end(ap); HalDisplayString(buffer);

19 years, 10 months

[gvg] 12893: Change console class name for Windows compatibility.

by gvg＠svn.reactos.com

Change console class name for Windows compatibility. Thanks to tonik <spammed(a)fromru.com> for reporting and providing the correct name. Fixes bug 462. Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-01-08 21:14:54 UTC (rev 12892) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-01-08 22:08:29 UTC (rev 12893) @@ -802,7 +802,7 @@ SetWindowLongW(hWnd, GWL_USERDATA, 0); return 0; case PM_CREATE_CONSOLE: - NewWindow = CreateWindowW(L"Win32CsrConsole", + NewWindow = CreateWindowW(L"ConsoleWindowClass", Console->Title.Buffer, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, @@ -911,7 +911,7 @@ } wc.cbSize = sizeof(WNDCLASSEXW); - wc.lpszClassName = L"Win32CsrConsole"; + wc.lpszClassName = L"ConsoleWindowClass"; wc.lpfnWndProc = GuiConsoleWndProc; wc.style = 0; wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL);

19 years, 10 months

[gvg] 12892: makefile.dos is not used anymore, remove to prevent confusion

by gvg＠svn.reactos.com

makefile.dos is not used anymore, remove to prevent confusion Deleted: trunk/reactos/makefile.dos _____ Deleted: trunk/reactos/makefile.dos --- trunk/reactos/makefile.dos 2005-01-08 19:38:51 UTC (rev 12891) +++ trunk/reactos/makefile.dos 2005-01-08 21:14:54 UTC (rev 12892) @@ -1,142 +0,0 @@ -# -# Global makefile -# - -# -# Select your host -# -#HOST = mingw32-linux -#HOST = djgpp-msdos -HOST = mingw32-windows - -include rules.mak - -# -# Required to run the system -# -COMPONENTS = iface_native ntoskrnl -#DLLS = ntdll kernel32 crtdll user32 fmifs gdi32 -DLLS = ntdll kernel32 crtdll fmifs gdi32 -#DLLS = crtdll mingw32 -SUBSYS = win32k - -# -# Select the server(s) you want to build -# -SERVERS = win32 -# SERVERS = posix linux os2 - -# -# Select the loader(s) you want to build -# -LOADERS = dos -# LOADERS = boot - -# -# Select the device drivers and filesystems you want -# -DEVICE_DRIVERS = blue ide keyboard mouse null parallel serial vidport -# DEVICE_DRIVERS = beep event floppy ide_test sound test test1 -FS_DRIVERS = vfat -# FS_DRIVERS = minix ext2 template -KERNEL_SERVICES = $(DEVICE_DRIVERS) $(FS_DRIVERS) - -APPS = args hello shell test cat bench -# APPS = cmd - -all: $(COMPONENTS) $(DLLS) $(SUBSYS) $(LOADERS) $(KERNEL_SERVICES) $(APPS) -.PHONY: all - -clean: $(COMPONENTS:%=%_clean) $(DLLS:%=%_clean) $(LOADERS:%=%_clean) \ - $(KERNEL_SERVICES:%=%_clean) $(APPS:%=%_clean) -.PHONY: clean - -# -# Applications -# -$(APPS): %: - make -C apps/$* - -$(APPS:%=%_clean): %_clean: - make -C apps/$* clean - -.PHONY: $(APPS) $(APPS:%=%_clean) - -# -# Interfaces -# -iface_native: - make -C iface/native - -iface_native_clean: - make -C iface/native clean - -.PHONY: iface_native iface_native_clean - -# -# Device driver rules -# -$(DEVICE_DRIVERS): %: - make -C services/dd/$* - -$(DEVICE_DRIVERS:%=%_clean): %_clean: - make -C services/dd/$* clean - -.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_clean) - -$(FS_DRIVERS): %: - make -C services/fs/$* - -$(FS_DRIVERS:%=%_clean): %_clean: - make -C services/fs/$* clean - -.PHONY: $(FS_DRIVERS) $(FS_DRIVERS:%=%_clean) - -# -# Kernel loaders -# - -$(LOADERS): %: - make -C loaders/$* - -$(LOADERS:%=%_clean): %_clean: - make -C loaders/$* clean - -.PHONY: $(LOADERS) $(LOADERS:%=%_clean) - -# -# Required system components -# - -ntoskrnl: - make -C ntoskrnl - -ntoskrnl_clean: - make -C ntoskrnl clean - -.PHONY: ntoskrnl ntoskrnl_clean - -# -# Required DLLs -# - -$(DLLS): %: - make -C lib/$* - -$(DLLS:%=%_clean): %_clean: - make -C lib/$* clean - -.PHONY: $(DLLS) $(DLLS:%=%_clean) - -# -# Kernel Subsystems -# -$(SUBSYS): %: - make -C subsys/$* - -$(SUBSYS:%=%_clean): %_clean: - make -C lib/$* clean - -.PHONY: $(SUBSYS) $(SUBSYS:%=%_clean) - -

19 years, 10 months

[chorns] 12891: Invocation of buildtool modules.

by chorns＠svn.reactos.com

Invocation of buildtool modules. Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Modified: branches/xmlbuildsystem/reactos/ntoskrnl/module.xml 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/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/invoke.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp Added: branches/xmlbuildsystem/reactos/tools/tools.xml _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-08 19:38:51 UTC (rev 12891) @@ -1,13 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <define name="_M_IX86"></define> + <define name="_M_IX86" /> <include>include</include> <include>w32api/include</include> <directory name="tools"> - <module name="depends" type="buildtool"> - <file>depends.c</file> - </module> + <xi:include href="tools/tools.xml" /> </directory> <directory name="iface"> <directory name="native"> _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/module.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/module.xml 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/ntoskrnl/module.xml 2005-01-08 19:38:51 UTC (rev 12891) @@ -1,10 +1,11 @@ <module name="ntoskrnl" type="kernelmodedll" extension=".exe"> + <dependency>buildno</dependency> <define name="_SEH_NO_NATIVE_NLG" /> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> <define name="__3GB__" /> - <include>.</include> <include base="kjs">./include</include> + <include base="ntoskrnl">include</include> <library>kjs</library> <directory name="cc"> <file>cacheman.c</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-08 19:38:51 UTC (rev 12891) @@ -33,7 +33,7 @@ string MingwModuleHandler::GetModuleArchiveFilename ( const Module& module ) const { - return ReplaceExtension ( FixupTargetFilename(module.GetPath ()).c_str (), + return ReplaceExtension ( FixupTargetFilename ( module.GetPath () ).c_str (), ".a" ); } @@ -50,12 +50,43 @@ dependencies += " "; const Module* importedModule = module.project.LocateModule ( module.libraries[i]->name ); assert ( importedModule != NULL ); - dependencies += FixupTargetFilename(importedModule->GetPath ()).c_str (); + dependencies += FixupTargetFilename ( importedModule->GetPath () ).c_str (); } return dependencies; } string +MingwModuleHandler::GetModuleDependencies ( const Module& module ) const +{ + if ( module.dependencies.size () == 0 ) + return ""; + + string dependencies ( "" ); + for ( size_t i = 0; i < module.dependencies.size (); i++ ) + { + if ( dependencies.size () > 0 ) + dependencies += " "; + const Dependency* dependency = module.dependencies[i]; + const Module* dependencyModule = dependency->dependencyModule; + dependencies += dependencyModule->GetTargets (); + } + return dependencies; +} + +string +MingwModuleHandler::GetAllDependencies ( const Module& module ) const +{ + string dependencies = GetImportLibraryDependencies ( module ); + string s = GetModuleDependencies ( module ); + if (s.length () > 0) + { + dependencies += " "; + dependencies += s; + } + return dependencies; +} + +string MingwModuleHandler::GetSourceFilenames ( const Module& module ) const { if ( module.files.size () == 0 ) @@ -74,9 +105,8 @@ string MingwModuleHandler::GetObjectFilename ( const string& sourceFilename ) const { - return - FixupTargetFilename ( ReplaceExtension ( sourceFilename, - ".o" ) ); + return FixupTargetFilename ( ReplaceExtension ( sourceFilename, + ".o" ) ); } string @@ -144,7 +174,7 @@ MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) const { string parameters; - for (size_t i = 0; i < includes.size (); i++) + for ( size_t i = 0; i < includes.size (); i++ ) { Include& include = *includes[i]; if (parameters.length () > 0) @@ -191,10 +221,12 @@ { string sourceFilename = module.files[i]->name; string objectFilename = GetObjectFilename ( sourceFilename ); + string dependencies = GetModuleDependencies ( module ); fprintf ( fMakefile, - "%s: %s\n", + "%s: %s %s\n", objectFilename.c_str (), - sourceFilename.c_str() ); + sourceFilename.c_str (), + dependencies.c_str ()); fprintf ( fMakefile, "\t%s -c %s -o %s %s\n", cc.c_str (), @@ -234,10 +266,10 @@ objectFilenames.c_str ()); fprintf ( fMakefile, - "\t%s -rc %s %s\n\n", - ar.c_str (), - archiveFilename.c_str (), - objectFilenames.c_str ()); + "\t%s -rc %s %s\n\n", + ar.c_str (), + archiveFilename.c_str (), + objectFilenames.c_str ()); } void @@ -254,7 +286,53 @@ "${ar}" ); } +string +MingwModuleHandler::GetInvocationDependencies ( const Module& module ) const +{ + string dependencies; + for ( size_t i = 0; i < module.invocations.size (); i++ ) + { + Invoke& invoke = *module.invocations[i]; + if ( dependencies.length () > 0 ) + dependencies += " "; + string invokeTarget = module.GetInvocationTarget ( i ); + dependencies += invokeTarget; + } + return dependencies; +} + +void +MingwModuleHandler::GenerateInvocations ( const Module& module ) const +{ + if ( module.invocations.size () == 0 ) + return; + + if ( module.type != BuildTool ) + throw InvalidBuildFileException ( module.node.location, + "Only modules of type buildtool can be invoked." ); + for ( size_t i = 0; i < module.invocations.size (); i++ ) + { + Invoke& invoke = *module.invocations[i]; + string invokeTarget = module.GetInvocationTarget ( i ); + fprintf ( fMakefile, + "%s: %s\n\n", + invoke.GetTargets ().c_str (), + invokeTarget.c_str () ); + fprintf ( fMakefile, + "%s: %s\n", + invokeTarget.c_str (), + FixupTargetFilename ( module.GetPath () ).c_str () ); + fprintf ( fMakefile, + "\t%s\n\n", + FixupTargetFilename ( module.GetPath () ).c_str () ); + fprintf ( fMakefile, + ".PNONY: %s\n\n", + invokeTarget.c_str () ); + } +} + + MingwBuildToolModuleHandler::MingwBuildToolModuleHandler ( FILE* fMakefile ) : MingwModuleHandler ( fMakefile ) { @@ -270,12 +348,13 @@ MingwBuildToolModuleHandler::Process ( const Module& module ) { GenerateBuildToolModuleTarget ( module ); + GenerateInvocations ( module ); } void MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& module ) { - string target ( FixupTargetFilename(module.GetPath()) ); + string target ( FixupTargetFilename ( module.GetPath () ) ); string archiveFilename = GetModuleArchiveFilename ( module ); fprintf ( fMakefile, "%s: %s\n", target.c_str (), @@ -304,6 +383,7 @@ MingwKernelModuleHandler::Process ( const Module& module ) { GenerateKernelModuleTarget ( module ); + GenerateInvocations ( module ); } void @@ -369,6 +449,7 @@ MingwStaticLibraryModuleHandler::Process ( const Module& module ) { GenerateStaticLibraryModuleTarget ( module ); + GenerateInvocations ( module ); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-08 19:38:51 UTC (rev 12891) @@ -15,6 +15,8 @@ const std::string& newExtension ) const; std::string GetModuleArchiveFilename ( const Module& module ) const; std::string GetImportLibraryDependencies ( const Module& module ) const; + std::string GetModuleDependencies ( const Module& module ) const; + std::string GetAllDependencies ( const Module& module ) const; std::string GetSourceFilenames ( const Module& module ) const; std::string GetObjectFilename ( const std::string& sourceFilename ) const; @@ -23,6 +25,8 @@ void GenerateObjectFileTargetsTarget ( const Module& module ) const; void GenerateArchiveTargetHost ( const Module& module ) const; void GenerateArchiveTargetTarget ( const Module& module ) const; + std::string GetInvocationDependencies ( const Module& module ) const; + void GenerateInvocations ( const Module& module ) const; FILE* fMakefile; private: std::string ConcatenatePaths ( const std::string& path1, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-08 19:38:51 UTC (rev 12891) @@ -27,6 +27,7 @@ TESTS = \ tests/definetest.o \ tests/includetest.o \ + tests/invoketest.o \ tests/moduletest.o \ tests/projecttest.o _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-08 19:38:51 UTC (rev 12891) @@ -54,6 +54,14 @@ delete files[i]; for ( i = 0; i < libraries.size(); i++ ) delete libraries[i]; + for ( i = 0; i < includes.size(); i++ ) + delete includes[i]; + for ( i = 0; i < defines.size(); i++ ) + delete defines[i]; + for ( i = 0; i < invocations.size(); i++ ) + delete invocations[i]; + for ( i = 0; i < dependencies.size(); i++ ) + delete dependencies[i]; } void @@ -62,14 +70,18 @@ size_t i; for ( i = 0; i < node.subElements.size(); i++ ) ProcessXMLSubElement ( *node.subElements[i], path ); - for ( i = 0; i < files.size(); i++ ) - files[i]->ProcessXML(); + for ( i = 0; i < files.size (); i++ ) + files[i]->ProcessXML (); for ( i = 0; i < libraries.size(); i++ ) - libraries[i]->ProcessXML(); + libraries[i]->ProcessXML (); for ( i = 0; i < includes.size(); i++ ) - includes[i]->ProcessXML(); + includes[i]->ProcessXML (); for ( i = 0; i < defines.size(); i++ ) - defines[i]->ProcessXML(); + defines[i]->ProcessXML (); + for ( i = 0; i < invocations.size(); i++ ) + invocations[i]->ProcessXML (); + for ( i = 0; i < dependencies.size(); i++ ) + dependencies[i]->ProcessXML (); } void @@ -78,7 +90,7 @@ { bool subs_invalid = false; string subpath ( path ); - if ( e.name == "file" && e.value.size () ) + if ( e.name == "file" && e.value.size () > 0 ) { files.push_back ( new File ( FixSeparator ( path + CSEP + e.value ) ) ); subs_invalid = true; @@ -104,7 +116,17 @@ defines.push_back ( new Define ( project, this, e ) ); subs_invalid = true; } - if ( subs_invalid && e.subElements.size() ) + else if ( e.name == "invoke" ) + { + invocations.push_back ( new Invoke ( e, *this ) ); + subs_invalid = false; + } + else if ( e.name == "dependency" ) + { + dependencies.push_back ( new Dependency ( e, *this ) ); + subs_invalid = true; + } + if ( subs_invalid && e.subElements.size() > 0 ) throw InvalidBuildFileException ( e.location, "<%s> cannot have sub-elements", @@ -154,7 +176,34 @@ return path + CSEP + name + extension; } +string +Module::GetTargets () const +{ + if ( invocations.size () > 0 ) + { + string targets ( "" ); + for ( size_t i = 0; i < invocations.size (); i++ ) + { + Invoke& invoke = *invocations[i]; + if ( targets.length () > 0 ) + targets += " "; + targets += invoke.GetTargets (); + } + return targets; + } + else + return GetPath (); +} +string +Module::GetInvocationTarget ( const int index ) const +{ + return ssprintf ( "%s_invoke_%d", + name.c_str (), + index ); +} + + File::File ( const string& _name ) : name(_name) { @@ -165,6 +214,7 @@ { } + Library::Library ( const XMLElement& _node, const Module& _module, const string& _name ) @@ -189,3 +239,82 @@ module.name.c_str(), name.c_str() ); } + + +Invoke::Invoke ( const XMLElement& _node, + const Module& _module ) + : node(_node), + module(_module) +{ +} + +void +Invoke::ProcessXML() +{ + for ( size_t i = 0; i < node.subElements.size (); i++ ) + ProcessXMLSubElement ( *node.subElements[i] ); +} + +void +Invoke::ProcessXMLSubElement ( const XMLElement& e ) +{ + bool subs_invalid = false; + if ( e.name == "output" ) + { + for ( size_t i = 0; i < e.subElements.size (); i++ ) + ProcessXMLSubElementOutput ( *e.subElements[i] ); + } + if ( subs_invalid && e.subElements.size() > 0 ) + throw InvalidBuildFileException ( e.location, + "<%s> cannot have sub-elements", + e.name.c_str() ); +} + +void +Invoke::ProcessXMLSubElementOutput ( const XMLElement& e ) +{ + bool subs_invalid = false; + if ( e.name == "outputfile" && e.value.size () > 0 ) + { + output.push_back ( new File ( FixSeparator ( module.path + CSEP + e.value ) ) ); + subs_invalid = true; + } + if ( subs_invalid && e.subElements.size() > 0 ) + throw InvalidBuildFileException ( e.location, + "<%s> cannot have sub-elements", + e.name.c_str() ); +} + +string +Invoke::GetTargets () const +{ + string targets ( "" ); + for ( size_t i = 0; i < output.size (); i++ ) + { + File& file = *output[i]; + if ( targets.length () > 0 ) + targets += " "; + targets += file.name; + } + return targets; +} + + +Dependency::Dependency ( const XMLElement& _node, + const Module& _module ) + : node (_node), + module (_module), + dependencyModule (NULL) +{ +} + +void +Dependency::ProcessXML() +{ + dependencyModule = module.project.LocateModule ( node.value ); + if ( dependencyModule == NULL ) + throw InvalidBuildFileException ( node.location, + "module '%s' depend on non-existant module '%s'", + module.name.c_str(), + node.value.c_str() ); +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-08 19:38:51 UTC (rev 12891) @@ -27,6 +27,8 @@ class Define; class File; class Library; +class Invoke; +class Dependency; class Project { @@ -73,7 +75,9 @@ std::vector<Library*> libraries; std::vector<Include*> includes; std::vector<Define*> defines; - + std::vector<Invoke*> invocations; + std::vector<Dependency*> dependencies; + Module ( const Project& project, const XMLElement& moduleNode, const std::string& modulePath ); @@ -81,6 +85,8 @@ ModuleType GetModuleType (const XMLAttribute& attribute ); std::string GetBasePath() const; std::string GetPath () const; + std::string GetTargets () const; + std::string GetInvocationTarget ( const int index ) const; void ProcessXML(); private: std::string GetDefaultModuleExtension () const; @@ -156,6 +162,38 @@ void ProcessXML(); }; + +class Invoke +{ +public: + const XMLElement& node; + const Module& module; + std::vector<File*> output; + + Invoke ( const XMLElement& _node, + const Module& _module ); + + void ProcessXML(); + std::string GetTargets () const; +private: + void ProcessXMLSubElement ( const XMLElement& e ); + void ProcessXMLSubElementOutput ( const XMLElement& e ); +}; + + +class Dependency +{ +public: + const XMLElement& node; + const Module& module; + const Module* dependencyModule; + + Dependency ( const XMLElement& _node, + const Module& _module ); + + void ProcessXML(); +}; + extern std::string FixSeparator ( const std::string& s ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-08 19:38:51 UTC (rev 12891) @@ -12,6 +12,12 @@ virtual void Run() = 0; protected: void Assert(const char *message, ...); + void IsNull(void* reference, + const char* file, + int line); + void IsNotNull(void* reference, + const char* file, + int line); void IsTrue(bool condition, const char* file, int line); @@ -34,6 +40,8 @@ void Fail(); }; +#define IS_NULL(reference) IsNull((void*)reference,__FILE__,__LINE__) +#define IS_NOT_NULL(reference) IsNotNull((void*)reference,__FILE__,__LINE__) #define IS_TRUE(condition) IsTrue(condition,__FILE__,__LINE__) #define IS_FALSE(condition) IsFalse(condition,__FILE__,__LINE__) #define ARE_EQUAL(expected,actual) AreEqual(expected,actual,__FILE__,__LINE__) @@ -66,4 +74,11 @@ void Run(); }; + +class InvokeTest : public BaseTest +{ +public: + void Run(); +}; + #endif /* __TEST_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-08 19:38:51 UTC (rev 12891) @@ -22,6 +22,30 @@ Fail(); } +void BaseTest::IsNull(void* reference, + const char* file, + int line) +{ + if (reference != NULL) + { + Assert("Condition was not NULL at %s:%d\n", + file, + line); + } +} + +void BaseTest::IsNotNull(void* reference, + const char* file, + int line) +{ + if (reference == NULL) + { + Assert("Condition was NULL at %s:%d\n", + file, + line); + } +} + void BaseTest::IsTrue(bool condition, const char* file, int line) @@ -149,6 +173,7 @@ tests.push_back(new ModuleTest()); tests.push_back(new DefineTest()); tests.push_back(new IncludeTest()); + tests.push_back(new InvokeTest()); } }; _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/invoke.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/invoke.xml 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/invoke.xml 2005-01-08 19:38:51 UTC (rev 12891) @@ -0,0 +1,13 @@ +<?xml version="1.0" ?> +<project name="Project" makefile="Makefile"> + <directory name="dir1"> + <module name="module1" type="buildtool"> + <file>file1.c</file> + <invoke> + <output> + <outputfile>file1.c</outputfile> + </output> + </invoke> + </module> + </directory> +</project> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml 2005-01-08 19:38:51 UTC (rev 12891) @@ -8,6 +8,7 @@ </directory> <directory name="dir2"> <module name="module2" type="kernelmodedll"> + <dependency>module1</dependency> <library>module1</library> <file>file3.c</file> <file>file4.c</file> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp 2005-01-08 19:38:51 UTC (rev 12891) @@ -0,0 +1,19 @@ +#include "test.h" + +using std::string; + +void InvokeTest::Run() +{ + string projectFilename ( "tests/data/invoke.xml" ); + Project project ( projectFilename ); + ARE_EQUAL(1, project.modules.size()); + + Module& module1 = *project.modules[0]; + ARE_EQUAL(1, module1.invocations.size()); + + Invoke& invoke1 = *module1.invocations[0]; + ARE_EQUAL(1, invoke1.output.size()); + + File& file1 = *invoke1.output[0]; + ARE_EQUAL(".\\dir1\\file1.c", file1.name); +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-01-08 19:38:51 UTC (rev 12891) @@ -24,6 +24,10 @@ ARE_EQUAL(1, module2.libraries.size()); Library& library1 = *module2.libraries[0]; + ARE_EQUAL("module1", library1.name); - ARE_EQUAL("module1", library1.name); + ARE_EQUAL(1, module2.dependencies.size()); + Dependency& module1dependency = *module2.dependencies[0]; + IS_NOT_NULL(module1dependency.dependencyModule); + ARE_EQUAL("module1", module1dependency.dependencyModule->name); } _____ Added: branches/xmlbuildsystem/reactos/tools/tools.xml --- branches/xmlbuildsystem/reactos/tools/tools.xml 2005-01-08 18:11:46 UTC (rev 12890) +++ branches/xmlbuildsystem/reactos/tools/tools.xml 2005-01-08 19:38:51 UTC (rev 12891) @@ -0,0 +1,9 @@ +<module name="buildno" type="buildtool"> + <include base="buildno">.</include> + <file>buildno.c</file> + <invoke> + <output> + <outputfile>../include/reactos/buildno.h</outputfile> + </output> + </invoke> +</module>

19 years, 10 months

[ekohl] 12890: Start services again and call a services main routine.

by ekohl＠svn.reactos.com

Start services again and call a services main routine. Modified: trunk/reactos/lib/advapi32/service/sctrl.c Modified: trunk/reactos/subsys/system/services/database.c _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2005-01-08 14:54:59 UTC (rev 12889) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2005-01-08 18:11:46 UTC (rev 12890) @@ -19,7 +19,7 @@ /* TYPES *********************************************************************/ -typedef struct +typedef struct _ACTIVE_SERVICE { DWORD ThreadId; UNICODE_STRING ServiceName; @@ -28,31 +28,32 @@ SERVICE_STATUS ServiceStatus; } ACTIVE_SERVICE, *PACTIVE_SERVICE; + /* GLOBALS *******************************************************************/ -static ULONG ActiveServiceCount; -static PACTIVE_SERVICE ActiveServices; +static DWORD dwActiveServiceCount = 0; +static PACTIVE_SERVICE lpActiveServices = NULL; /* static PHANDLE ActiveServicesThreadHandles; */ /* uncomment when in use */ + /* FUNCTIONS *****************************************************************/ - static PACTIVE_SERVICE ScLookupServiceByServiceName(LPWSTR lpServiceName) { DWORD i; - for (i = 0; i < ActiveServiceCount; i++) + for (i = 0; i < dwActiveServiceCount; i++) { - if (_wcsicmp(ActiveServices[i].ServiceName.Buffer, lpServiceName) == 0) + if (_wcsicmp(lpActiveServices[i].ServiceName.Buffer, lpServiceName) == 0) { - return(&ActiveServices[i]); + return &lpActiveServices[i]; } } SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - return(NULL); + return NULL; } @@ -61,20 +62,38 @@ { DWORD i; - for (i = 0; i < ActiveServiceCount; i++) + for (i = 0; i < dwActiveServiceCount; i++) { - if (ActiveServices[i].ThreadId == ThreadId) + if (lpActiveServices[i].ThreadId == ThreadId) { - return(&ActiveServices[i]); + return &lpActiveServices[i]; } } SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - return(NULL); + return NULL; } +static DWORD WINAPI +ScServiceMainStub(LPVOID Context) +{ + PACTIVE_SERVICE lpService; + + lpService = (PACTIVE_SERVICE)Context; + + DPRINT("ScServiceMainStub() called\n"); + + /* FIXME: Send argc and argv (from command line) as arguments */ + + + (lpService->MainFunction)(0, NULL); + + return ERROR_SUCCESS; +} + + static DWORD ScConnectControlPipe(HANDLE *hPipe) { @@ -82,25 +101,31 @@ DWORD dwProcessId; DWORD dwState; - WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", - 15000); + if (!WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", 15000)) + { + DPRINT1("WaitNamedPipe() failed (Error %lu)\n", GetLastError()); + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } *hPipe = CreateFileW(L"\\\\.\\pipe\\net\\NtControlPipe", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, + 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (*hPipe == INVALID_HANDLE_VALUE) - return(ERROR_FAILED_SERVICE_CONTROLLER_CONNECT); + { + DPRINT1("CreateFileW() failed (Error %lu)\n", GetLastError()); + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; + } dwState = PIPE_READMODE_MESSAGE; if (!SetNamedPipeHandleState(*hPipe, &dwState, NULL, NULL)) { CloseHandle(hPipe); *hPipe = INVALID_HANDLE_VALUE; - return(ERROR_FAILED_SERVICE_CONTROLLER_CONNECT); + return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } dwProcessId = GetCurrentProcessId(); @@ -110,15 +135,37 @@ &dwBytesWritten, NULL); - return(ERROR_SUCCESS); + DPRINT("Sent process id %lu\n", dwProcessId); + + return ERROR_SUCCESS; } -static VOID -ScServiceDispatcher(HANDLE hPipe, PVOID p1, PVOID p2) +static BOOL +ScServiceDispatcher(HANDLE hPipe, + PUCHAR lpBuffer, + DWORD dwBufferSize) { - DPRINT1("ScDispatcherLoop() called\n"); + PACTIVE_SERVICE lpService; + HANDLE ThreadHandle; + DPRINT("ScDispatcherLoop() called\n"); + + lpService = &lpActiveServices[0]; + + ThreadHandle = CreateThread(NULL, + 0, + ScServiceMainStub, + lpService, + CREATE_SUSPENDED, + &lpService->ThreadId); + if (ThreadHandle == NULL) + return FALSE; + + ResumeThread(ThreadHandle); + + CloseHandle(ThreadHandle); + #if 0 while (TRUE) { @@ -128,19 +175,8 @@ } #endif -} - -DWORD WINAPI -ScServiceMainStub(LPVOID Context) -{ - LPSERVICE_MAIN_FUNCTIONW lpServiceProc = (LPSERVICE_MAIN_FUNCTIONW)Context; - - /* FIXME: Send argc and argv (from command line) as arguments */ - - (lpServiceProc)(0, NULL); - - return ERROR_SUCCESS; + return TRUE; } @@ -161,7 +197,7 @@ if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ServiceNameU, &ServiceNameA, TRUE))) { SetLastError(ERROR_OUTOFMEMORY); - return((SERVICE_STATUS_HANDLE)0); + return (SERVICE_STATUS_HANDLE)0; } SHandle = RegisterServiceCtrlHandlerW(ServiceNameU.Buffer, @@ -169,7 +205,7 @@ RtlFreeUnicodeString(&ServiceNameU); - return(SHandle); + return SHandle; } @@ -187,12 +223,12 @@ Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); if (Service == NULL) { - return((SERVICE_STATUS_HANDLE)NULL); + return (SERVICE_STATUS_HANDLE)NULL; } Service->HandlerFunction = lpHandlerProc; - return((SERVICE_STATUS_HANDLE)Service->ThreadId); + return (SERVICE_STATUS_HANDLE)Service->ThreadId; } @@ -208,7 +244,7 @@ BOOL bUpdateImmediately) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return(FALSE); + return FALSE; } @@ -242,14 +278,14 @@ if (!Service) { SetLastError(ERROR_INVALID_HANDLE); - return(FALSE); + return FALSE; } RtlCopyMemory(&Service->ServiceStatus, lpServiceStatus, sizeof(SERVICE_STATUS)); - return(TRUE); + return TRUE; } @@ -261,65 +297,71 @@ BOOL STDCALL StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA lpServiceStartTable) { - // FIXME how to deal with diffs between ANSI/UNICODE -#if 0 - LPSERVICE_TABLE_ENTRYW ServiceStartTableW; - ANSI_STRING ServiceNameA; - UNICODE_STRING ServiceNameW; - ULONG i, j; - ULONG Count; - BOOL b; + ULONG i; + HANDLE hPipe; + DWORD dwError; + PUCHAR lpMessageBuffer; + DPRINT("StartServiceCtrlDispatcherA() called\n"); + i = 0; while (lpServiceStartTable[i].lpServiceProc != NULL) { i++; } - Count = i; - ServiceStartTableW = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SERVICE_TABLE_ENTRYW) * Count); - for (i = 0; i < Count; i++) - { - RtlInitAnsiString( - &ServiceNameA, - lpServiceStartTable[i].lpServiceName); - if (!NT_SUCCESS(RtlAnsiStringToUnicodeString( - &ServiceNameW, - &ServiceNameA, - TRUE))) + dwActiveServiceCount = i; + lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); + if (lpActiveServices == NULL) { - for (j = 0; j < i; j++) - { - RtlInitUnicodeString( - &ServiceNameW, - ServiceStartTableW[j].lpServiceName); - RtlFreeUnicodeString(&ServiceNameW); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, ServiceStartTableW); - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; + return FALSE; } - ServiceStartTableW[i].lpServiceName = ServiceNameW.Buffer; - ServiceStartTableW[i].lpServiceProc = - lpServiceStartTable[i].lpServiceProc; - } - b = StartServiceCtrlDispatcherW(ServiceStartTableW); + /* Copy service names and start procedure */ + for (i = 0; i < dwActiveServiceCount; i++) + { + RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, + lpServiceStartTable[i].lpServiceName); + lpActiveServices[i].MainFunction = (LPSERVICE_MAIN_FUNCTIONW)lpServiceStartTable[i].lpServiceProc; + } - for (i = 0; i < Count; i++) + dwError = ScConnectControlPipe(&hPipe); + if (dwError != ERROR_SUCCESS) { - RtlFreeHeap(RtlGetProcessHeap(), 0, ServiceStartTableW[i].lpServiceName); + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + return FALSE; } - RtlFreeHeap(RtlGetProcessHeap(), 0, ServiceStartTableW); + lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + 256); + if (lpMessageBuffer == NULL) + { + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + CloseHandle(hPipe); + return FALSE; + } - return b; -#else - UNIMPLEMENTED; - return 0; -#endif + ScServiceDispatcher(hPipe, lpMessageBuffer, 256); + CloseHandle(hPipe); + + /* Free the message buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); + + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + + return TRUE; } @@ -334,6 +376,7 @@ ULONG i; HANDLE hPipe; DWORD dwError; + PUCHAR lpMessageBuffer; DPRINT("StartServiceCtrlDispatcherW() called\n"); @@ -343,99 +386,58 @@ i++; } - ActiveServiceCount = i; - ActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - ActiveServiceCount * sizeof(ACTIVE_SERVICE)); - if (ActiveServices == NULL) + dwActiveServiceCount = i; + lpActiveServices = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwActiveServiceCount * sizeof(ACTIVE_SERVICE)); + if (lpActiveServices == NULL) { - return(FALSE); + return FALSE; } /* Copy service names and start procedure */ - for (i = 0; i < ActiveServiceCount; i++) + for (i = 0; i < dwActiveServiceCount; i++) { - RtlCreateUnicodeString(&ActiveServices[i].ServiceName, + RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); - ActiveServices[i].MainFunction = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].MainFunction = lpServiceStartTable[i].lpServiceProc; } dwError = ScConnectControlPipe(&hPipe); - if (dwError == ERROR_SUCCESS) + if (dwError != ERROR_SUCCESS) { - /* FIXME: free the service table */ - return(FALSE); + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + return FALSE; } - ScServiceDispatcher(hPipe, NULL, NULL); + lpMessageBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + 256); + if (lpMessageBuffer == NULL) + { + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; + CloseHandle(hPipe); + return FALSE; + } + + ScServiceDispatcher(hPipe, lpMessageBuffer, 256); CloseHandle(hPipe); - /* FIXME: free the service table */ + /* Free the message buffer */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpMessageBuffer); - return(TRUE); + /* Free the service table */ + RtlFreeHeap(RtlGetProcessHeap(), 0, lpActiveServices); + lpActiveServices = NULL; + dwActiveServiceCount = 0; -#if 0 - ActiveServicesThreadHandles = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - (ActiveServiceCount + 1) * sizeof(HANDLE)); - if (!ActiveServicesThreadHandles) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, ActiveServices); - ActiveServices = NULL; - return(FALSE); - } - - for (i = 0; i<ActiveServiceCount; i++) - { - h = CreateThread( - NULL, - 0, - ScServiceMainStub, - lpServiceStartTable[i].lpServiceProc, - 0, - &Tid); - if (h == INVALID_HANDLE_VALUE) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, ActiveServicesThreadHandles); - ActiveServicesThreadHandles = NULL; - RtlFreeHeap(RtlGetProcessHeap(), 0, ActiveServices); - ActiveServices = NULL; - return(FALSE); - } - ActiveServicesThreadHandles[i + 1] = h; - ActiveServices[i].ThreadId = Tid; - } - - while (ActiveServiceCount > 0) - { - r = WaitForMultipleObjects( - ActiveServiceCount + 1, - ActiveServicesThreadHandles, - FALSE, - INFINITE); - if (r == WAIT_OBJECT_0) - { - /* Received message from the scm */ - } - else if (r > WAIT_OBJECT_0 && r < (WAIT_OBJECT_0 + ActiveServiceCount)) - { - /* A service died */ - - ActiveServiceCount--; - ActiveServicesThreadHandles[r - WAIT_OBJECT_0 - 1] = - ActiveServicesThreadHandles[ActiveServiceCount + 1]; - RtlCopyMemory( - &ActiveServices[r - WAIT_OBJECT_0 - 2], - &ActiveServices[ActiveServiceCount], - sizeof(ACTIVE_SERVICE)); - } - else - { - /* Bail */ - } - } return TRUE; -#endif } /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-01-08 14:54:59 UTC (rev 12889) +++ trunk/reactos/subsys/system/services/database.c 2005-01-08 18:11:46 UTC (rev 12890) @@ -81,7 +81,7 @@ /* FUNCTIONS *****************************************************************/ -static NTSTATUS STDCALL +static NTSTATUS STDCALL CreateGroupOrderListRoutine(PWSTR ValueName, ULONG ValueType, PVOID ValueData, @@ -127,6 +127,7 @@ return STATUS_SUCCESS; } + static NTSTATUS STDCALL CreateGroupListRoutine(PWSTR ValueName, ULONG ValueType, @@ -148,15 +149,15 @@ sizeof(SERVICE_GROUP)); if (Group == NULL) { - return(STATUS_INSUFFICIENT_RESOURCES); + return STATUS_INSUFFICIENT_RESOURCES; } if (!RtlCreateUnicodeString(&Group->GroupName, (PWSTR)ValueData)) { - return(STATUS_INSUFFICIENT_RESOURCES); + return STATUS_INSUFFICIENT_RESOURCES; } - + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); QueryTable[0].Name = (PWSTR)ValueData; QueryTable[0].QueryRoutine = CreateGroupOrderListRoutine; @@ -173,7 +174,7 @@ &Group->GroupListEntry); } - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -191,7 +192,7 @@ sizeof(SERVICE)); if (Service == NULL) { - return(STATUS_INSUFFICIENT_RESOURCES); + return STATUS_INSUFFICIENT_RESOURCES; } /* Copy service name */ @@ -202,8 +203,9 @@ if (Service->ServiceName.Buffer == NULL) { HeapFree(GetProcessHeap(), 0, Service); - return(STATUS_INSUFFICIENT_RESOURCES); + return STATUS_INSUFFICIENT_RESOURCES; } + RtlCopyMemory(Service->ServiceName.Buffer, ServiceName->Buffer, ServiceName->Length); @@ -217,8 +219,9 @@ { HeapFree(GetProcessHeap(), 0, Service->ServiceName.Buffer); HeapFree(GetProcessHeap(), 0, Service); - return(STATUS_INSUFFICIENT_RESOURCES); + return STATUS_INSUFFICIENT_RESOURCES; } + wcscpy(Service->RegistryPath.Buffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); wcscat(Service->RegistryPath.Buffer, @@ -260,7 +263,7 @@ RtlFreeUnicodeString(&Service->RegistryPath); RtlFreeUnicodeString(&Service->ServiceName); HeapFree(GetProcessHeap(), 0, Service); - return(Status); + return Status; } DPRINT("ServiceName: '%wZ'\n", &Service->ServiceName); @@ -273,7 +276,7 @@ InsertTailList(&ServiceListHead, &Service->ServiceListEntry); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -311,7 +314,7 @@ NULL, NULL); if (!NT_SUCCESS(Status)) - return(Status); + return Status; RtlRosInitUnicodeStringFromLiteral(&ServicesKeyName, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); @@ -327,7 +330,7 @@ &ObjectAttributes, 0); if (!NT_SUCCESS(Status)) - return(Status); + return Status; /* Allocate key info buffer */ KeyInfoLength = sizeof(KEY_BASIC_INFORMATION) + MAX_PATH * sizeof(WCHAR); @@ -335,7 +338,7 @@ if (KeyInfo == NULL) { NtClose(ServicesKey); - return(STATUS_INSUFFICIENT_RESOURCES); + return STATUS_INSUFFICIENT_RESOURCES; } Index = 0; @@ -379,7 +382,7 @@ DPRINT("ScmCreateServiceDataBase() done\n"); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -421,7 +424,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return(Status); + return Status; } BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) + @@ -485,7 +488,7 @@ DirInfo); NtClose(DirHandle); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -521,14 +524,12 @@ ScmStartService(PSERVICE Service, PSERVICE_GROUP Group) { -#if 0 RTL_QUERY_REGISTRY_TABLE QueryTable[3]; PROCESS_INFORMATION ProcessInformation; STARTUPINFOW StartupInfo; UNICODE_STRING ImagePath; ULONG Type; BOOL Result; -#endif NTSTATUS Status; DPRINT("ScmStartService() called\n"); @@ -546,7 +547,6 @@ } else { -#if 0 RtlInitUnicodeString(&ImagePath, NULL); /* Get service data */ @@ -614,7 +614,7 @@ CloseHandle(Service->ControlPipeHandle); Service->ControlPipeHandle = INVALID_HANDLE_VALUE; - DPRINT("Starting '%S' failed!\n", Service->ServiceName.Buffer); + DPRINT1("Starting '%S' failed!\n", Service->ServiceName.Buffer); Status = STATUS_UNSUCCESSFUL; } else @@ -633,15 +633,35 @@ /* Resume Thread */ ResumeThread(ProcessInformation.hThread); - /* FIXME: connect control pipe */ + /* Connect control pipe */ if (ConnectNamedPipe(Service->ControlPipeHandle, NULL)) { + DWORD dwProcessId = 0; + DWORD dwRead = 0; + DPRINT("Control pipe connected!\n"); - Status = STATUS_SUCCESS; + + /* FIXME: Read thread id from pipe */ + if (!ReadFile(Service->ControlPipeHandle, + (LPVOID)&dwProcessId, + sizeof(DWORD), + &dwRead, + NULL)) + { + DPRINT1("Reading the service control pipe failed (Error %lu)\n", GetLastError()); + } + else + { + DPRINT("Received process id %lu\n", dwProcessId); + + /* FIXME: Send start command */ + + Status = STATUS_SUCCESS; + } } else { - DPRINT1("Connecting control pipe failed!\n"); + DPRINT("Connecting control pipe failed!\n"); /* Close control pipe */ CloseHandle(Service->ControlPipeHandle); @@ -656,13 +676,11 @@ CloseHandle(ProcessInformation.hProcess); } } -#endif - Status = STATUS_SUCCESS; } -#if 0 Done: -#endif + DPRINT("ScmStartService() done (Status %lx)\n", Status); + if (NT_SUCCESS(Status)) { if (Group != NULL) @@ -674,36 +692,34 @@ #if 0 else { - if (CurrentService->ErrorControl == 1) + switch (Service->ErrorControl) { - /* Log error */ + case SERVICE_ERROR_NORMAL: + /* FIXME: Log error */ + break; - } - else if (CurrentService->ErrorControl == 2) - { - if (IsLastKnownGood == FALSE) - { - /* Boot last known good configuration */ + case SERVICE_ERROR_SEVERE: + if (IsLastKnownGood == FALSE) + { + /* FIXME: Boot last known good configuration */ + } + break; - } + case SERVICE_ERROR_CRITICAL: + if (IsLastKnownGood == FALSE) + { + /* FIXME: Boot last known good configuration */ + } + else + { + /* FIXME: BSOD! */ + } + break; } - else if (CurrentService->ErrorControl == 3) - { - if (IsLastKnownGood == FALSE) - { - /* Boot last known good configuration */ - - } - else - { - /* BSOD! */ - - } - } } #endif - return(STATUS_SUCCESS); + return Status; }

19 years, 10 months

[ekohl] 12889: Connect a pipes client side as soon as a listening server side is available.

by ekohl＠svn.reactos.com

Connect a pipes client side as soon as a listening server side is available. Modified: trunk/reactos/drivers/fs/np/create.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-01-08 12:56:07 UTC (rev 12888) +++ trunk/reactos/drivers/fs/np/create.c 2005-01-08 14:54:59 UTC (rev 12889) @@ -192,14 +192,14 @@ KeInitializeEvent(&ClientFcb->Event, SynchronizationEvent, FALSE); /* - * Step 4. Add the client FCB to a list and connect it if necessary. + * Step 4. Add the client FCB to a list and connect it if possible. */ /* Add the client FCB to the pipe FCB list. */ InsertTailList(&Pipe->ClientFcbListHead, &ClientFcb->FcbListEntry); - /* Connect pipes if they were created by the same thread */ - if (ServerFcb && ServerFcb->Thread == ClientFcb->Thread) + /* Connect to listening server side */ + if (ServerFcb) { ClientFcb->OtherSide = ServerFcb; ServerFcb->OtherSide = ClientFcb;

19 years, 10 months

[ekohl] 12888: Use string resources instead of hardcoded strings.

by ekohl＠svn.reactos.com

Use string resources instead of hardcoded strings. Modified: trunk/reactos/lib/cpl/timedate/De.rc Modified: trunk/reactos/lib/cpl/timedate/En.rc Modified: trunk/reactos/lib/cpl/timedate/resource.h Modified: trunk/reactos/lib/cpl/timedate/timedate.c _____ Modified: trunk/reactos/lib/cpl/timedate/De.rc --- trunk/reactos/lib/cpl/timedate/De.rc 2005-01-08 12:54:43 UTC (rev 12887) +++ trunk/reactos/lib/cpl/timedate/De.rc 2005-01-08 12:56:07 UTC (rev 12888) @@ -37,4 +37,7 @@ BEGIN IDS_CPLNAME "Datum/Zeit" IDS_CPLDESCRIPTION "Ändert die Uhrzeit, Datum und Zeitzone." + IDS_TIMEZONETEXT "Aktuelle Zeitzone: %s" + IDS_TIMEZONEINVALID "Ungültig" + IDS_TIMEZONEUNKNOWN "Unbekannt" END _____ Modified: trunk/reactos/lib/cpl/timedate/En.rc --- trunk/reactos/lib/cpl/timedate/En.rc 2005-01-08 12:54:43 UTC (rev 12887) +++ trunk/reactos/lib/cpl/timedate/En.rc 2005-01-08 12:56:07 UTC (rev 12888) @@ -16,7 +16,7 @@ CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 17, 90, 12 - LTEXT "Current time zone: %s", IDC_TIMEZONE, 4, 136, 241, 8 + LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 END @@ -36,4 +36,7 @@ BEGIN IDS_CPLNAME "Date/Time" IDS_CPLDESCRIPTION "Changes date, time and time zone information." + IDS_TIMEZONETEXT "Current time zone: %s" + IDS_TIMEZONEINVALID "Invalid" + IDS_TIMEZONEUNKNOWN "Unknown" END _____ Modified: trunk/reactos/lib/cpl/timedate/resource.h --- trunk/reactos/lib/cpl/timedate/resource.h 2005-01-08 12:54:43 UTC (rev 12887) +++ trunk/reactos/lib/cpl/timedate/resource.h 2005-01-08 12:56:07 UTC (rev 12888) @@ -15,7 +15,10 @@ #define IDC_AUTODAYLIGHT 113 #define IDS_CPLNAME 1001 -#define IDS_CPLDESCRIPTION 2001 +#define IDS_CPLDESCRIPTION 1002 +#define IDS_TIMEZONETEXT 1003 +#define IDS_TIMEZONEINVALID 1004 +#define IDS_TIMEZONEUNKNOWN 1005 #endif /* __CPL_RESOURCE_H */ _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.c --- trunk/reactos/lib/cpl/timedate/timedate.c 2005-01-08 12:54:43 UTC (rev 12887) +++ trunk/reactos/lib/cpl/timedate/timedate.c 2005-01-08 12:56:07 UTC (rev 12888) @@ -102,14 +102,35 @@ { TIME_ZONE_INFORMATION TimeZoneInfo; WCHAR TimeZoneString[128]; + WCHAR TimeZoneText[128]; + WCHAR TimeZoneName[128]; DWORD TimeZoneId; TimeZoneId = GetTimeZoneInformation(&TimeZoneInfo); - wsprintf(TimeZoneString, - L"Current time zone: %s\n", - (TimeZoneId == TIME_ZONE_ID_DAYLIGHT) ? TimeZoneInfo.DaylightName : TimeZoneInfo.StandardName); + LoadString(hApplet, IDS_TIMEZONETEXT, TimeZoneText, 128); + switch (TimeZoneId) + { + case TIME_ZONE_ID_STANDARD: + wcscpy(TimeZoneName, TimeZoneInfo.StandardName); + break; + + case TIME_ZONE_ID_DAYLIGHT: + wcscpy(TimeZoneName, TimeZoneInfo.DaylightName); + break; + + case TIME_ZONE_ID_UNKNOWN: + LoadString(hApplet, IDS_TIMEZONEUNKNOWN, TimeZoneName, 128); + break; + + case TIME_ZONE_ID_INVALID: + default: + LoadString(hApplet, IDS_TIMEZONEINVALID, TimeZoneName, 128); + break; + } + + wsprintf(TimeZoneString, TimeZoneText, TimeZoneName); SendDlgItemMessageW(hwnd, IDC_TIMEZONE, WM_SETTEXT, 0, (LPARAM)TimeZoneString); }

19 years, 10 months

[chorns] 12887: BuildTool module type support.

by chorns＠svn.reactos.com

BuildTool module type support. Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/iface/native/module.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-08 12:47:32 UTC (rev 12886) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-08 12:54:43 UTC (rev 12887) @@ -9,6 +9,11 @@ <file>depends.c</file> </module> </directory> + <directory name="iface"> + <directory name="native"> + <xi:include href="iface/native/module.xml" /> + </directory> + </directory> <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/iface/native/module.xml --- branches/xmlbuildsystem/reactos/iface/native/module.xml 2005-01-08 12:47:32 UTC (rev 12886) +++ branches/xmlbuildsystem/reactos/iface/native/module.xml 2005-01-08 12:54:43 UTC (rev 12887) @@ -0,0 +1,4 @@ +<module name="genntdll" type="buildtool"> + <include base="genntdll">.</include> + <file>genntdll.c</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-08 12:47:32 UTC (rev 12886) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-08 12:54:43 UTC (rev 12887) @@ -61,6 +61,9 @@ void MingwBackend::GenerateGlobalVariables () { + fprintf ( fMakefile, "host_gcc = gcc\n" ); + fprintf ( fMakefile, "host_ar = ar\n" ); + fprintf ( fMakefile, "host_ld = ld\n" ); fprintf ( fMakefile, "rm = del /y\n" ); fprintf ( fMakefile, "gcc = gcc\n" ); fprintf ( fMakefile, "ld = ld\n" ); @@ -102,6 +105,7 @@ void MingwBackend::GetModuleHandlers ( MingwModuleHandlerList& moduleHandlers ) const { + moduleHandlers.push_back ( new MingwBuildToolModuleHandler ( fMakefile ) ); moduleHandlers.push_back ( new MingwKernelModuleHandler ( fMakefile ) ); moduleHandlers.push_back ( new MingwStaticLibraryModuleHandler ( fMakefile ) ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-08 12:47:32 UTC (rev 12886) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-08 12:54:43 UTC (rev 12887) @@ -181,7 +181,8 @@ } void -MingwModuleHandler::GenerateObjectFileTargets ( const Module& module ) const +MingwModuleHandler::GenerateObjectFileTargets ( const Module& module, + const string& cc) const { if ( module.files.size () == 0 ) return; @@ -195,7 +196,8 @@ objectFilename.c_str (), sourceFilename.c_str() ); fprintf ( fMakefile, - "\t${gcc} -c %s -o %s %s\n", + "\t%s -c %s -o %s %s\n", + cc.c_str (), sourceFilename.c_str (), objectFilename.c_str (), GenerateGccParameters ( module ).c_str () ); @@ -205,8 +207,23 @@ } void -MingwModuleHandler::GenerateArchiveTarget ( const Module& module ) const +MingwModuleHandler::GenerateObjectFileTargetsHost ( const Module& module ) const { + GenerateObjectFileTargets ( module, + "${host_gcc}" ); +} + +void +MingwModuleHandler::GenerateObjectFileTargetsTarget ( const Module& module ) const +{ + GenerateObjectFileTargets ( module, + "${gcc}" ); +} + +void +MingwModuleHandler::GenerateArchiveTarget ( const Module& module, + const string& ar ) const +{ string archiveFilename = GetModuleArchiveFilename ( module ); string sourceFilenames = GetSourceFilenames ( module ); string objectFilenames = GetObjectFilenames ( module ); @@ -217,12 +234,61 @@ objectFilenames.c_str ()); fprintf ( fMakefile, - "\t${ar} -rc %s %s\n\n", + "\t%s -rc %s %s\n\n", + ar.c_str (), archiveFilename.c_str (), objectFilenames.c_str ()); } +void +MingwModuleHandler::GenerateArchiveTargetHost ( const Module& module ) const +{ + GenerateArchiveTarget ( module, + "${host_ar}" ); +} +void +MingwModuleHandler::GenerateArchiveTargetTarget ( const Module& module ) const +{ + GenerateArchiveTarget ( module, + "${ar}" ); +} + + +MingwBuildToolModuleHandler::MingwBuildToolModuleHandler ( FILE* fMakefile ) + : MingwModuleHandler ( fMakefile ) +{ +} + +bool +MingwBuildToolModuleHandler::CanHandleModule ( const Module& module ) const +{ + return module.type == BuildTool; +} + +void +MingwBuildToolModuleHandler::Process ( const Module& module ) +{ + GenerateBuildToolModuleTarget ( module ); +} + +void +MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& module ) +{ + string target ( FixupTargetFilename(module.GetPath()) ); + string archiveFilename = GetModuleArchiveFilename ( module ); + fprintf ( fMakefile, "%s: %s\n", + target.c_str (), + archiveFilename.c_str () ); + fprintf ( fMakefile, + "\t${host_gcc} -o %s %s\n", + target.c_str (), + archiveFilename.c_str () ); + GenerateArchiveTargetHost ( module ); + GenerateObjectFileTargetsHost ( module ); +} + + MingwKernelModuleHandler::MingwKernelModuleHandler ( FILE* fMakefile ) : MingwModuleHandler ( fMakefile ) { @@ -283,8 +349,8 @@ "\t${rm} %s\n", temp_exp.c_str () ); - GenerateArchiveTarget ( module ); - GenerateObjectFileTargets ( module ); + GenerateArchiveTargetTarget ( module ); + GenerateObjectFileTargetsTarget ( module ); } @@ -308,6 +374,6 @@ void MingwStaticLibraryModuleHandler::GenerateStaticLibraryModuleTarget ( const Module& module ) { - GenerateArchiveTarget ( module ); - GenerateObjectFileTargets ( module ); + GenerateArchiveTargetTarget ( module ); + GenerateObjectFileTargetsTarget ( module ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-08 12:47:32 UTC (rev 12886) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-08 12:54:43 UTC (rev 12887) @@ -19,8 +19,10 @@ std::string GetObjectFilename ( const std::string& sourceFilename ) const; std::string GetObjectFilenames ( const Module& module ) const; - void GenerateObjectFileTargets ( const Module& module ) const; - void GenerateArchiveTarget ( const Module& module ) const; + void GenerateObjectFileTargetsHost ( const Module& module ) const; + void GenerateObjectFileTargetsTarget ( const Module& module ) const; + void GenerateArchiveTargetHost ( const Module& module ) const; + void GenerateArchiveTargetTarget ( const Module& module ) const; FILE* fMakefile; private: std::string ConcatenatePaths ( const std::string& path1, @@ -30,9 +32,24 @@ std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ) const; std::string GenerateGccIncludeParameters ( const Module& module ) const; std::string GenerateGccParameters ( const Module& module ) const; + void GenerateObjectFileTargets ( const Module& module, + const std::string& cc ) const; + void GenerateArchiveTarget ( const Module& module, + const std::string& ar ) const; }; +class MingwBuildToolModuleHandler : public MingwModuleHandler +{ +public: + MingwBuildToolModuleHandler ( FILE* fMakefile ); + virtual bool CanHandleModule ( const Module& module ) const; + virtual void Process ( const Module& module ); +private: + void GenerateBuildToolModuleTarget ( const Module& module ); +}; + + class MingwKernelModuleHandler : public MingwModuleHandler { public:

19 years, 10 months

[hbirr] 12886: - Make the drive letter to uppercase in RtlDosPathNameToNtPathName_U.

by hbirr＠svn.reactos.com

- Make the drive letter to uppercase in RtlDosPathNameToNtPathName_U. Modified: trunk/reactos/lib/ntdll/rtl/path.c _____ Modified: trunk/reactos/lib/ntdll/rtl/path.c --- trunk/reactos/lib/ntdll/rtl/path.c 2005-01-08 11:59:41 UTC (rev 12885) +++ trunk/reactos/lib/ntdll/rtl/path.c 2005-01-08 12:47:32 UTC (rev 12886) @@ -839,6 +839,12 @@ Length = wcslen(fullname + Offset); memcpy (Buffer + tmpLength, fullname + Offset, (Length + 1) * sizeof(WCHAR)); Length += tmpLength; + if (Type == ABSOLUTE_DRIVE_PATH || + Type == RELATIVE_DRIVE_PATH) + { + /* make the drive letter to uppercase */ + Buffer[tmpLength] = towupper(Buffer[tmpLength]); + } /* set NT filename */ ntname->Length = Length * sizeof(WCHAR);

19 years, 10 months

[arty] 12885: Added spanish layout to the registry.

by arty＠svn.reactos.com

Added spanish layout to the registry. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-01-08 11:57:34 UTC (rev 12884) +++ trunk/reactos/bootdata/hivesys.inf 2005-01-08 11:59:41 UTC (rev 12885) @@ -54,6 +54,8 @@ ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout Text",0x00000000,"DA" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layou t File",0x00000000,"kbdes.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040A","Layou t Text",0x00000000,"ES" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout File",0x00000000,"kbdgr.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout Text",0x00000000,"GR" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout File",0x00000000,"kbdus.dll"

19 years, 10 months

← Newer
1
...
46
47
48
49
50
51
52
...
71
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 January 2005