Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 15037: minor corrections to match the behavior of wine's implementation
by weiden＠svn.reactos.com 06 May '05

06 May '05

minor corrections to match the behavior of wine's implementation Modified: trunk/reactos/lib/kernel32/file/lfile.c _____ Modified: trunk/reactos/lib/kernel32/file/lfile.c --- trunk/reactos/lib/kernel32/file/lfile.c 2005-05-06 10:45:24 UTC (rev 15036) +++ trunk/reactos/lib/kernel32/file/lfile.c 2005-05-06 11:02:47 UTC (rev 15037) @@ -28,15 +28,14 @@ { DWORD NumberOfBytesRead; - if (ReadFile( + if ( !ReadFile( (HANDLE) hFile, (LPVOID) lpBuffer, (DWORD) lBytes, & NumberOfBytesRead, - NULL - ) == FALSE) + NULL) ) { - return -1; + return HFILE_ERROR; } return NumberOfBytesRead; } @@ -57,21 +56,20 @@ if (lBytes == 0) { - if ( SetEndOfFile((HANDLE) hFile ) == FALSE ) + if ( !SetEndOfFile((HANDLE) hFile ) ) { - return -1; + return HFILE_ERROR; } return 0; } - if ( WriteFile( + if ( !WriteFile( (HANDLE) hFile, (LPVOID) lpBuffer, (DWORD) lBytes, & NumberOfBytesWritten, - NULL - ) == FALSE ) + NULL) ) { - return -1; + return HFILE_ERROR; } return NumberOfBytesWritten; } @@ -97,16 +95,15 @@ else if ( (iReadWrite & OF_WRITE ) == OF_WRITE ) dwAccessMask = GENERIC_WRITE; - if ((iReadWrite & OF_SHARE_COMPAT) == OF_SHARE_COMPAT ) - dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE; - else if ((iReadWrite & OF_SHARE_DENY_NONE) == OF_SHARE_DENY_NONE) - dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE; - else if ((iReadWrite & OF_SHARE_DENY_READ) == OF_SHARE_DENY_READ) - dwShareMode = FILE_SHARE_WRITE | FILE_SHARE_DELETE; + if ((iReadWrite & OF_SHARE_DENY_READ) == OF_SHARE_DENY_READ) + dwShareMode = FILE_SHARE_WRITE; else if ((iReadWrite & OF_SHARE_DENY_WRITE) == OF_SHARE_DENY_WRITE ) - dwShareMode = FILE_SHARE_READ | FILE_SHARE_DELETE; + dwShareMode = FILE_SHARE_READ; else if ((iReadWrite & OF_SHARE_EXCLUSIVE) == OF_SHARE_EXCLUSIVE) dwShareMode = 0; + else + /* OF_SHARE_DENY_NONE, OF_SHARE_COMPAT and everything else */ + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; return (HFILE) CreateFileA( lpPathName, @@ -129,13 +126,14 @@ int iAttribute ) { + iAttribute &= FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; return (HFILE) CreateFileA( lpPathName, - GENERIC_ALL, + GENERIC_READ | GENERIC_WRITE, (FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, CREATE_ALWAYS, - iAttribute & FILE_ATTRIBUTE_VALID_FLAGS, + iAttribute, NULL); } @@ -153,7 +151,7 @@ { return 0; } - return -1; + return HFILE_ERROR; }

1 0

[chorns] 15036: Don't strip relocation information from DLLs
by chorns＠svn.reactos.com 06 May '05

06 May '05

Don't strip relocation information from DLLs Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-06 10:38:30 UTC (rev 15035) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-06 10:45:24 UTC (rev 15036) @@ -1254,7 +1254,8 @@ target_folder.c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); string targetName ( module.GetTargetName () ); - if ( module.importLibrary != NULL ) + + if ( module.IsDLL () ) { string base_tmp = ros_temp + module.name + ".base.tmp"; CLEAN_FILE ( base_tmp ); @@ -1263,7 +1264,7 @@ string temp_exp = ros_temp + module.name + ".temp.exp"; CLEAN_FILE ( temp_exp ); string def_file = GetDefinitionFilename (); - + fprintf ( fMakefile, "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n", linker.c_str (), @@ -1273,11 +1274,11 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); - + fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", junk_tmp.c_str () ); - + string killAt = module.mangledSymbols ? "" : "--kill-at"; fprintf ( fMakefile, "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s %s\n", @@ -1286,11 +1287,11 @@ def_file.c_str (), temp_exp.c_str (), killAt.c_str () ); - + fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", base_tmp.c_str () ); - + fprintf ( fMakefile, "\t%s %s %s -o %s %s %s %s\n", linker.c_str (), @@ -1300,12 +1301,21 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); - + fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", temp_exp.c_str () ); GenerateCleanObjectsAsYouGoCode (); + + GenerateBuildMapCode (); + + GenerateBuildNonSymbolStrippedCode (); + + fprintf ( fMakefile, + "\t$(ECHO_RSYM)\n" ); + fprintf ( fMakefile, + "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); } else { @@ -1320,15 +1330,6 @@ GenerateCleanObjectsAsYouGoCode (); } - - GenerateBuildMapCode (); - - GenerateBuildNonSymbolStrippedCode (); - - fprintf ( fMakefile, - "\t$(ECHO_RSYM)\n" ); - fprintf ( fMakefile, - "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); } void @@ -1790,12 +1791,17 @@ string MingwModuleHandler::GetDefinitionFilename () const { - string defFilename = module.GetBasePath () + SSEP + module.importLibrary->definition; - if ( IsWineModule () ) - return PassThruCacheDirectory ( NormalizeFilename ( defFilename ), - backend->intermediateDirectory ); + if ( module.importLibrary != NULL ) + { + string defFilename = module.GetBasePath () + SSEP + module.importLibrary->definition; + if ( IsWineModule () ) + return PassThruCacheDirectory ( NormalizeFilename ( defFilename ), + backend->intermediateDirectory ); + else + return defFilename; + } else - return defFilename; + return "tools" SSEP "rbuild" SSEP "empty.def"; } void @@ -1954,7 +1960,7 @@ CLEAN_FILE ( junk_tmp ); string temp_exp = ros_temp + module.name + ".temp.exp"; CLEAN_FILE ( temp_exp ); - string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll -Wl,--dll", module.GetBasePath ().c_str (), module.entrypoint.c_str (), module.baseaddress.c_str () ); @@ -2076,7 +2082,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll --dll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2123,7 +2129,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll -Wl,--dll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2169,7 +2175,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll -Wl,--dll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2291,7 +2297,7 @@ else linker = "${gcc}"; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll -Wl,--dll", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-05-06 10:38:30 UTC (rev 15035) +++ branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp 2005-05-06 10:45:24 UTC (rev 15036) @@ -40,7 +40,7 @@ InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber ) + const int linenumber ) { Message = ssprintf ( "%s:%d", filename, @@ -48,9 +48,9 @@ } InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber, - const char* message, - ... ) + const int linenumber, + const char* message, + ... ) { string errorMessage; va_list args; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-06 10:38:30 UTC (rev 15035) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-06 10:45:24 UTC (rev 15036) @@ -523,7 +523,7 @@ string Module::GetDefaultModuleEntrypoint () const { - switch (type) + switch ( type ) { case Kernel: return "_NtProcessStartup"; @@ -560,7 +560,7 @@ string Module::GetDefaultModuleBaseaddress () const { - switch (type) + switch ( type ) { case Kernel: return "0xc0000000"; @@ -600,6 +600,36 @@ return importLibrary != NULL; } +bool +Module::IsDLL () const +{ + switch ( type ) + { + case Kernel: + case KernelModeDLL: + case NativeDLL: + case Win32DLL: + case KernelModeDriver: + return true; + case NativeCUI: + case Win32CUI: + case Test: + case Win32GUI: + case BuildTool: + case StaticLibrary: + case ObjectLibrary: + case BootLoader: + case BootSector: + case Iso: + case LiveIso: + case RpcServer: + case RpcClient: + return false; + } + throw InvalidOperationException ( __FILE__, + __LINE__ ); +} + string Module::GetTargetName () const { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-06 10:38:30 UTC (rev 15035) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-06 10:45:24 UTC (rev 15036) @@ -123,24 +123,24 @@ enum ModuleType { - BuildTool, - StaticLibrary, - ObjectLibrary, - Kernel, - KernelModeDLL, - KernelModeDriver, - NativeDLL, - NativeCUI, - Win32DLL, - Win32CUI, - Win32GUI, - BootLoader, - BootSector, - Iso, - LiveIso, - Test, - RpcServer, - RpcClient + BuildTool = 0, + StaticLibrary = 1, + ObjectLibrary = 2, + Kernel = 3, + KernelModeDLL = 4, + KernelModeDriver = 5, + NativeDLL = 6, + NativeCUI = 7, + Win32DLL = 8, + Win32CUI = 9, + Win32GUI = 10, + BootLoader = 11, + BootSector = 12, + Iso = 13, + LiveIso = 14, + Test = 15, + RpcServer = 16, + RpcClient = 17 }; enum HostType @@ -187,6 +187,7 @@ ModuleType GetModuleType ( const std::string& location, const XMLAttribute& attribute ); bool HasImportLibrary () const; + bool IsDLL () const; std::string GetTargetName () const; std::string GetDependencyPath () const; std::string GetBasePath () const;

1 0

[chorns] 15035: Set svn:eol-style=native
by chorns＠svn.reactos.com 06 May '05

06 May '05

Set svn:eol-style=native Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/backend.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/devcpp/devcpp.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/pipe_detectio n.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/cdfile.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/compilerflag.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/define.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/exception.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/include.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/installfile.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/linkerflag.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/ssprintf.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/stubbedcomponent.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/cdfiletest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/cdfile.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/define.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/if.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/include.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/invoke.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/linkerflag.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/module.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/project.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile1_header3.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile_includenext.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er1.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_recu rse.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu de.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile_inclu denext.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/symbol.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/linkerflagtest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/symboltest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-05-06 10:17:43 UTC (rev 15034) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-05-06 10:38:30 UTC (rev 15035) @@ -1,741 +1,741 @@ -// XML.cpp - -#include "pch.h" - -#ifdef _MSC_VER -#define MAX_PATH _MAX_PATH -#endif - -#ifdef WIN32 -# include <direct.h> -# include <io.h> -#else -# include <sys/stat.h> -# define MAX_PATH PATH_MAX -#endif -#include <assert.h> - -#include "XML.h" -#include "exception.h" -#include "ssprintf.h" - -using std::string; -using std::vector; - -#ifdef WIN32 -#define getcwd _getcwd -#endif//WIN32 - -static const char* WS = " \t\r\n"; -static const char* WSEQ = " =\t\r\n"; - -string working_directory; - -XMLIncludes::~XMLIncludes() -{ - for ( size_t i = 0; i < this->size(); i++ ) - delete (*this)[i]; -} - -void -InitWorkingDirectory() -{ - // store the current directory for path calculations - working_directory.resize ( _MAX_PATH ); - working_directory[0] = 0; - getcwd ( &working_directory[0], working_directory.size() ); - working_directory.resize ( strlen ( working_directory.c_str() ) ); -} - -#ifdef _MSC_VER -unsigned __int64 -#else -unsigned long long -#endif -filelen ( FILE* f ) -{ -#ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); -#else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) - return 0; - return file_stat.st_size; -#endif -} - -Path::Path() -{ - if ( !working_directory.size() ) - InitWorkingDirectory(); - string s ( working_directory ); - const char* p = strtok ( &s[0], "/\\" ); - while ( p ) - { - if ( *p ) - path.push_back ( p ); - p = strtok ( NULL, "/\\" ); - } -} - -Path::Path ( const Path& cwd, const string& file ) -{ - string s ( cwd.Fixup ( file, false ) ); - const char* p = strtok ( &s[0], "/\\" ); - while ( p ) - { - if ( *p ) - path.push_back ( p ); - p = strtok ( NULL, "/\\" ); - } -} - -string -Path::Fixup ( const string& file, bool include_filename ) const -{ - if ( strchr ( "/\\", file[0] ) -#ifdef WIN32 - // this squirreliness is b/c win32 has drive letters and *nix doesn't... - || file[1] == ':' -#endif//WIN32 - ) - { - return file; - } - vector<string> pathtmp ( path ); - string tmp ( file ); - const char* prev = strtok ( &tmp[0], "/\\" ); - const char* p = strtok ( NULL, "/\\" ); - while ( p ) - { - if ( !strcmp ( prev, "." ) ) - ; // do nothing - else if ( !strcmp ( prev, ".." ) ) - { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( pathtmp.size() > 1 ) -#else - if ( pathtmp.size() ) -#endif - pathtmp.resize ( pathtmp.size() - 1 ); - } - else - pathtmp.push_back ( prev ); - prev = p; - p = strtok ( NULL, "/\\" ); - } - if ( include_filename ) - pathtmp.push_back ( prev ); - - // reuse tmp variable to return recombined path - tmp.resize(0); - for ( size_t i = 0; i < pathtmp.size(); i++ ) - { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( i ) tmp += "/"; -#else - tmp += "/"; -#endif - tmp += pathtmp[i]; - } - return tmp; -} - -string -Path::RelativeFromWorkingDirectory () -{ - string out = ""; - for ( size_t i = 0; i < path.size(); i++ ) - { - out += "/" + path[i]; - } - return RelativeFromWorkingDirectory ( out ); -} - -string -Path::RelativeFromWorkingDirectory ( const string& path ) -{ - vector<string> vwork, vpath, vout; - Path::Split ( vwork, working_directory, true ); - Path::Split ( vpath, path, true ); -#ifdef WIN32 - // this squirreliness is b/c win32 has drive letters and *nix doesn't... - // not possible to do relative across different drive letters - if ( vwork[0] != vpath[0] ) - return path; -#endif - size_t i = 0; - while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] ) - ++i; - if ( i < vwork.size() ) - { - // path goes above our working directory, we will need some ..'s - for ( size_t j = 0; j < i; j++ ) - vout.push_back ( ".." ); - } - while ( i < vpath.size() ) - vout.push_back ( vpath[i++] ); - - // now merge vout into a string again - string out = vout[0]; - for ( i = 1; i < vout.size(); i++ ) - { - out += "/" + vout[i]; - } - return out; -} - -void -Path::Split ( vector<string>& out, - const string& path, - bool include_last ) -{ - string s ( path ); - const char* prev = strtok ( &s[0], "/\\" ); - const char* p = strtok ( NULL, "/\\" ); - out.resize ( 0 ); - while ( p ) - { - out.push_back ( prev ); - prev = p; - p = strtok ( NULL, "/\\" ); - } - if ( include_last ) - out.push_back ( prev ); -} - -XMLFile::XMLFile() -{ -} - -void -XMLFile::close() -{ - _buf.resize(0); - _p = _end = NULL; -} - -bool -XMLFile::open(const string& filename_) -{ - close(); - FILE* f = fopen ( filename_.c_str(), "rb" ); - if ( !f ) - return false; - unsigned long len = (unsigned long)filelen(f); - _buf.resize ( len ); - fread ( &_buf[0], 1, len, f ); - fclose ( f ); - _p = _buf.c_str(); - _end = _p + len; - _filename = filename_; - next_token(); - return true; -} - -// next_token() moves the pointer to next token, which may be -// an xml element or a text element, basically it's a glorified -// skipspace, normally the user of this class won't need to call -// this function -void -XMLFile::next_token() -{ - _p += strspn ( _p, WS ); -} - -bool -XMLFile::next_is_text() -{ - return *_p != '<'; -} - -bool -XMLFile::more_tokens() -{ - return _p != _end; -} - -// get_token() is used to return a token, and move the pointer -// past the token -bool -XMLFile::get_token(string& token) -{ - const char* tokend; - if ( !strncmp ( _p, "" ); - if ( !tokend ) - tokend = _end; - else - tokend += 3; - } - else if ( !strncmp ( _p, "<?", 2 ) ) - { - tokend = strstr ( _p, "?>" ); - if ( !tokend ) - tokend = _end; - else - tokend += 2; - } - else if ( *_p == '<' ) - { - tokend = strchr ( _p, '>' ); - if ( !tokend ) - tokend = _end; - else - ++tokend; - } - else - { - tokend = strchr ( _p, '<' ); - if ( !tokend ) - tokend = _end; - while ( tokend > _p && isspace(tokend[-1]) ) - --tokend; - } - if ( tokend == _p ) - return false; - token = string ( _p, tokend-_p ); - _p = tokend; - next_token(); - return true; -} - -string -XMLFile::Location() const -{ - int line = 1; - const char* p = strchr ( _buf.c_str(), '\n' ); - while ( p && p < _p ) - { - ++line; - p = strchr ( p+1, '\n' ); - } - return ssprintf ( "%s(%i)",_filename.c_str(), line ); -} - -XMLAttribute::XMLAttribute() -{ -} - -XMLAttribute::XMLAttribute(const string& name_, - const string& value_) - : name(name_), value(value_) -{ -} - -XMLAttribute::XMLAttribute ( const XMLAttribute& src ) - : name(src.name), value(src.value) -{ - -} - -XMLAttribute& XMLAttribute::operator = ( const XMLAttribute& src ) -{ - name = src.name; - value = src.value; - return *this; -} - -XMLElement::XMLElement ( XMLFile* xmlFile, - const string& location ) - : xmlFile ( xmlFile ), - location ( location ), - parentElement ( NULL ) -{ -} - -XMLElement::~XMLElement() -{ - size_t i; - for ( i = 0; i < attributes.size(); i++ ) - delete attributes[i]; - for ( i = 0; i < subElements.size(); i++ ) - delete subElements[i]; -} - -void -XMLElement::AddSubElement ( XMLElement* e ) -{ - subElements.push_back ( e ); - e->parentElement = this; -} - -// Parse() -// This function takes a single xml tag ( i.e. beginning with '<' and -// ending with '>', and parses out it's tag name and constituent -// attributes. -// Return Value: returns true if you need to look for a </tag> for -// the one it just parsed... -bool -XMLElement::Parse(const string& token, - bool& end_tag) -{ - const char* p = token.c_str(); - assert ( *p == '<' ); - ++p; - p += strspn ( p, WS ); - - // check if this is a comment - if ( !strncmp ( p, "!--", 3 ) ) - { - name = "!--"; - end_tag = false; - return false; // never look for end tag to a comment - } - - end_tag = ( *p == '/' ); - if ( end_tag ) - { - ++p; - p += strspn ( p, WS ); - } - const char* end = strpbrk ( p, WS ); - if ( !end ) - { - end = strpbrk ( p, "/>" ); - assert ( end ); - } - name = string ( p, end-p ); - p = end; - p += strspn ( p, WS ); - while ( *p != '>' && *p != '/' ) - { - end = strpbrk ( p, WSEQ ); - if ( !end ) - { - end = strpbrk ( p, "/>" ); - assert ( end ); - } - string attribute ( p, end-p ), value; - p = end; - p += strspn ( p, WS ); - if ( *p == '=' ) - { - ++p; - p += strspn ( p, WS ); - char quote = 0; - if ( strchr ( "\"'", *p ) ) - { - quote = *p++; - end = strchr ( p, quote ); - } - else - { - end = strpbrk ( p, WS ); - } - if ( !end ) - { - end = strchr ( p, '>' ); - assert(end); - if ( end[-1] == '/' ) - end--; - } - value = string ( p, end-p ); - p = end; - if ( quote && *p == quote ) - p++; - p += strspn ( p, WS ); - } - else if ( name[0] != '!' ) - { - throw XMLSyntaxErrorException ( location, - "attributes must have values" ); - } - attributes.push_back ( new XMLAttribute ( attribute, value ) ); - } - return !( *p == '/' ) && !end_tag; -} - -XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) -{ - // this would be faster with a tree-based container, but our attribute - // lists are likely to stay so short as to not be an issue. - for ( size_t i = 0; i < attributes.size(); i++ ) - { - if ( attribute == attributes[i]->name ) - return attributes[i]; - } - if ( required ) - { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); - } - return NULL; -} - -const XMLAttribute* -XMLElement::GetAttribute ( const string& attribute, - bool required ) const -{ - // this would be faster with a tree-based container, but our attribute - // lists are likely to stay so short as to not be an issue. - for ( size_t i = 0; i < attributes.size(); i++ ) - { - if ( attribute == attributes[i]->name ) - return attributes[i]; - } - if ( required ) - { - throw RequiredAttributeNotFoundException ( location, - attribute, - name ); - } - return NULL; -} - -// XMLParse() -// This function reads a "token" from the file loaded in XMLFile -// if it finds a tag that is non-singular, it parses sub-elements and/or -// inner text into the XMLElement that it is building to return. -// Return Value: an XMLElement allocated via the new operator that contains -// it's parsed data. Keep calling this function until it returns NULL -// (no more data) -XMLElement* -XMLParse ( XMLFile& f, - XMLIncludes* includes, - const Path& path, - bool* pend_tag = NULL ) -{ - string token; - if ( !f.get_token(token) ) - return NULL; - bool end_tag, is_include = false; - - while ( token[0] != '<' - || !strncmp ( token.c_str (), "<!--", 4 ) - || !strncmp ( token.c_str (), "<?", 2 ) ) - { - if ( token[0] != '<' ) - throw XMLSyntaxErrorException ( f.Location (), - "expecting xml tag, not '%s'", - token.c_str () ); - if ( !f.get_token(token) ) - return NULL; - } - - XMLElement* e = new XMLElement ( &f, - f.Location () ); - bool bNeedEnd = e->Parse ( token, end_tag ); - - if ( e->name == "xi:include" && includes ) - { - XMLAttribute* att; - att = e->GetAttribute ( "href", true ); - assert ( att ); - string includeFile ( path.Fixup ( att->value, true ) ); - string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); - includes->push_back ( new XMLInclude ( e, path, topIncludeFile ) ); - is_include = true; - } - - if ( !bNeedEnd ) - { - if ( pend_tag ) - *pend_tag = end_tag; - else if ( end_tag ) - { - delete e; - throw XMLSyntaxErrorException ( f.Location (), - "end tag '%s' not expected", - token.c_str() ); - return NULL; - } - return e; - } - bool bThisMixingErrorReported = false; - while ( f.more_tokens () ) - { - if ( f.next_is_text () ) - { - if ( !f.get_token ( token ) || token.size () == 0 ) - { - throw InvalidBuildFileException ( - f.Location(), - "internal tool error - get_token() failed when more_tokens() returned true" ); - break; - } - if ( e->subElements.size() && !bThisMixingErrorReported ) - { - throw XMLSyntaxErrorException ( f.Location (), - "mixing of inner text with sub elements" ); - bThisMixingErrorReported = true; - } - if ( strchr ( token.c_str (), '>' ) ) - { - throw XMLSyntaxErrorException ( f.Location (), - "invalid symbol '>'" ); - } - if ( e->value.size() > 0 ) - { - throw XMLSyntaxErrorException ( f.Location (), - "multiple instances of inner text" ); - e->value += " " + token; - } - else - e->value = token; - } - else - { - XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag ); - if ( !e2 ) - { - throw InvalidBuildFileException ( - e->location, - "end of file found looking for end tag" ); - break; - } - if ( end_tag ) - { - if ( e->name != e2->name ) - { - delete e2; - throw XMLSyntaxErrorException ( f.Location (), - "end tag name mismatch" ); - break; - } - delete e2; - break; - } - if ( e->value.size () > 0 && !bThisMixingErrorReported ) - { - throw XMLSyntaxErrorException ( f.Location (), - "mixing of inner text with sub elements" ); - bThisMixingErrorReported = true; - } - e->AddSubElement ( e2 ); - } - } - return e; -} - -void -XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path ) -{ - for ( ;; ) - { - XMLElement* e = XMLParse ( f, &includes, path ); - if ( !e ) - return; - head.AddSubElement ( e ); - } -} - -XMLElement* -XMLLoadInclude ( XMLInclude& include, - XMLIncludes& includes ) -{ - XMLAttribute* att; - att = include.e->GetAttribute("href", true); - assert(att); - - string file ( include.path.Fixup(att->value, true) ); - string top_file ( Path::RelativeFromWorkingDirectory ( file ) ); - include.e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); - XMLFile* fInc = new XMLFile(); - if ( !fInc->open ( file ) ) - { - include.fileExists = false; - // look for xi:fallback element - for ( size_t i = 0; i < include.e->subElements.size (); i++ ) - { - XMLElement* e2 = include.e->subElements[i]; - if ( e2->name == "xi:fallback" ) - { - // now look for xi:include below... - for ( i = 0; i < e2->subElements.size (); i++ ) - { - XMLElement* e3 = e2->subElements[i]; - if ( e3->name == "xi:include" ) - { - att = e3->GetAttribute ( "href", true ); - assert ( att ); - string includeFile ( include.path.Fixup ( att->value, true ) ); - string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); - XMLInclude* fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile ); - return XMLLoadInclude ( *fallbackInclude, includes ); - } - } - throw InvalidBuildFileException ( - e2->location, - "<xi:fallback> must have a <xi:include> sub-element" ); - return NULL; - } - } - return NULL; - } - else - { - include.fileExists = true; - XMLElement* new_e = new XMLElement ( fInc, - include.e->location ); - new_e->name = "xi:included"; - Path path2 ( include.path, att->value ); - XMLReadFile ( *fInc, *new_e, includes, path2 ); - return new_e; - } -} - -XMLElement* -XMLLoadFile ( const string& filename, - const Path& path, - XMLIncludes& includes ) -{ - XMLFile* f = new XMLFile(); - - if ( !f->open ( filename ) ) - throw FileNotFoundException ( filename ); - - XMLElement* head = new XMLElement ( f, - "(virtual)" ); - - XMLReadFile ( *f, *head, includes, path ); - - for ( size_t i = 0; i < includes.size (); i++ ) - { - XMLElement* e = includes[i]->e; - XMLElement* e2 = XMLLoadInclude ( *includes[i], includes ); - if ( !e2 ) - { - throw FileNotFoundException ( - ssprintf ( "%s (referenced from %s)", - e->GetAttribute ( "top_href", true )->value.c_str (), - f->Location ().c_str () ) ); - } - XMLElement* parent = e->parentElement; - XMLElement** parent_container = NULL; - if ( !parent ) - { - delete e; - throw Exception ( "internal tool error: xi:include doesn't have a parent" ); - return NULL; - } - for ( size_t j = 0; j < parent->subElements.size (); j++ ) - { - if ( parent->subElements[j] == e ) - { - parent_container = &parent->subElements[j]; - break; - } - } - if ( !parent_container ) - { - delete e; - throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" ); - return NULL; - } - // replace inclusion tree with the imported tree - e2->parentElement = e->parentElement; - e2->name = e->name; - e2->attributes = e->attributes; - *parent_container = e2; - e->attributes.resize ( 0 ); - delete e; - } - return head; -} +// XML.cpp + +#include "pch.h" + +#ifdef _MSC_VER +#define MAX_PATH _MAX_PATH +#endif + +#ifdef WIN32 +# include <direct.h> +# include <io.h> +#else +# include <sys/stat.h> +# define MAX_PATH PATH_MAX +#endif +#include <assert.h> + +#include "XML.h" +#include "exception.h" +#include "ssprintf.h" + +using std::string; +using std::vector; + +#ifdef WIN32 +#define getcwd _getcwd +#endif//WIN32 + +static const char* WS = " \t\r\n"; +static const char* WSEQ = " =\t\r\n"; + +string working_directory; + +XMLIncludes::~XMLIncludes() +{ + for ( size_t i = 0; i < this->size(); i++ ) + delete (*this)[i]; +} + +void +InitWorkingDirectory() +{ + // store the current directory for path calculations + working_directory.resize ( _MAX_PATH ); + working_directory[0] = 0; + getcwd ( &working_directory[0], working_directory.size() ); + working_directory.resize ( strlen ( working_directory.c_str() ) ); +} + +#ifdef _MSC_VER +unsigned __int64 +#else +unsigned long long +#endif +filelen ( FILE* f ) +{ +#ifdef WIN32 + return _filelengthi64 ( _fileno(f) ); +#else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) + return 0; + return file_stat.st_size; +#endif +} + +Path::Path() +{ + if ( !working_directory.size() ) + InitWorkingDirectory(); + string s ( working_directory ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +Path::Path ( const Path& cwd, const string& file ) +{ + string s ( cwd.Fixup ( file, false ) ); + const char* p = strtok ( &s[0], "/\\" ); + while ( p ) + { + if ( *p ) + path.push_back ( p ); + p = strtok ( NULL, "/\\" ); + } +} + +string +Path::Fixup ( const string& file, bool include_filename ) const +{ + if ( strchr ( "/\\", file[0] ) +#ifdef WIN32 + // this squirreliness is b/c win32 has drive letters and *nix doesn't... + || file[1] == ':' +#endif//WIN32 + ) + { + return file; + } + vector<string> pathtmp ( path ); + string tmp ( file ); + const char* prev = strtok ( &tmp[0], "/\\" ); + const char* p = strtok ( NULL, "/\\" ); + while ( p ) + { + if ( !strcmp ( prev, "." ) ) + ; // do nothing + else if ( !strcmp ( prev, ".." ) ) + { + // this squirreliness is b/c win32 has drive letters and *nix doesn't... +#ifdef WIN32 + if ( pathtmp.size() > 1 ) +#else + if ( pathtmp.size() ) +#endif + pathtmp.resize ( pathtmp.size() - 1 ); + } + else + pathtmp.push_back ( prev ); + prev = p; + p = strtok ( NULL, "/\\" ); + } + if ( include_filename ) + pathtmp.push_back ( prev ); + + // reuse tmp variable to return recombined path + tmp.resize(0); + for ( size_t i = 0; i < pathtmp.size(); i++ ) + { + // this squirreliness is b/c win32 has drive letters and *nix doesn't... +#ifdef WIN32 + if ( i ) tmp += "/"; +#else + tmp += "/"; +#endif + tmp += pathtmp[i]; + } + return tmp; +} + +string +Path::RelativeFromWorkingDirectory () +{ + string out = ""; + for ( size_t i = 0; i < path.size(); i++ ) + { + out += "/" + path[i]; + } + return RelativeFromWorkingDirectory ( out ); +} + +string +Path::RelativeFromWorkingDirectory ( const string& path ) +{ + vector<string> vwork, vpath, vout; + Path::Split ( vwork, working_directory, true ); + Path::Split ( vpath, path, true ); +#ifdef WIN32 + // this squirreliness is b/c win32 has drive letters and *nix doesn't... + // not possible to do relative across different drive letters + if ( vwork[0] != vpath[0] ) + return path; +#endif + size_t i = 0; + while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] ) + ++i; + if ( i < vwork.size() ) + { + // path goes above our working directory, we will need some ..'s + for ( size_t j = 0; j < i; j++ ) + vout.push_back ( ".." ); + } + while ( i < vpath.size() ) + vout.push_back ( vpath[i++] ); + + // now merge vout into a string again + string out = vout[0]; + for ( i = 1; i < vout.size(); i++ ) + { + out += "/" + vout[i]; + } + return out; +} + +void +Path::Split ( vector<string>& out, + const string& path, + bool include_last ) +{ + string s ( path ); + const char* prev = strtok ( &s[0], "/\\" ); + const char* p = strtok ( NULL, "/\\" ); + out.resize ( 0 ); + while ( p ) + { + out.push_back ( prev ); + prev = p; + p = strtok ( NULL, "/\\" ); + } + if ( include_last ) + out.push_back ( prev ); +} + +XMLFile::XMLFile() +{ +} + +void +XMLFile::close() +{ + _buf.resize(0); + _p = _end = NULL; +} + +bool +XMLFile::open(const string& filename_) +{ + close(); + FILE* f = fopen ( filename_.c_str(), "rb" ); + if ( !f ) + return false; + unsigned long len = (unsigned long)filelen(f); + _buf.resize ( len ); + fread ( &_buf[0], 1, len, f ); + fclose ( f ); + _p = _buf.c_str(); + _end = _p + len; + _filename = filename_; + next_token(); + return true; +} + +// next_token() moves the pointer to next token, which may be +// an xml element or a text element, basically it's a glorified +// skipspace, normally the user of this class won't need to call +// this function +void +XMLFile::next_token() +{ + _p += strspn ( _p, WS ); +} + +bool +XMLFile::next_is_text() +{ + return *_p != '<'; +} + +bool [truncated at 1000 lines; 24330 more skipped]

1 0

[chorns] 15034: Add missing leading underscores in symbols
by chorns＠svn.reactos.com 06 May '05

06 May '05

Add missing leading underscores in symbols Modified: branches/xmlbuildsystem/reactos/lib/pseh/i386/setjmp.asm _____ Modified: branches/xmlbuildsystem/reactos/lib/pseh/i386/setjmp.asm --- branches/xmlbuildsystem/reactos/lib/pseh/i386/setjmp.asm 2005-05-06 08:27:46 UTC (rev 15033) +++ branches/xmlbuildsystem/reactos/lib/pseh/i386/setjmp.asm 2005-05-06 10:17:43 UTC (rev 15034) @@ -22,9 +22,9 @@ ; Note: the undecorated names are for Borland C++ (and possibly other compilers ; using the OMF format) -global SEHSetJmp +global _SEHSetJmp global __SEHSetJmp@4 -SEHSetJmp: +_SEHSetJmp: __SEHSetJmp@4: ; jump buffer mov eax, [esp+4] @@ -46,9 +46,9 @@ xor eax, eax ret 4 -global SEHLongJmp +global _SEHLongJmp global __SEHLongJmp@8 -SEHLongJmp: +_SEHLongJmp: __SEHLongJmp@8: ; return value mov eax, [esp+8] @@ -66,9 +66,9 @@ jmp edx -global SEHLongJmp_KeepEsp +global _SEHLongJmp_KeepEsp global __SEHLongJmp_KeepEsp@8 -SEHLongJmp_KeepEsp: +_SEHLongJmp_KeepEsp: __SEHLongJmp_KeepEsp@8: ; return value mov eax, [esp+8]

1 0

[ros-diffs] [greatlrd] 15033: David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt
by greatlrd＠svn.reactos.com 06 May '05

06 May '05

David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt Added: trunk/reactos/subsys/system/reporterror/Sv.rc Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc _____ Added: trunk/reactos/subsys/system/reporterror/Sv.rc --- trunk/reactos/subsys/system/reporterror/Sv.rc 2005-05-06 08:21:12 UTC (rev 15032) +++ trunk/reactos/subsys/system/reporterror/Sv.rc 2005-05-06 08:27:46 UTC (rev 15033) @@ -0,0 +1,56 @@ +/* Swedish resources by David Nordenberg */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Felrapporteringsassistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Systemet har Õterstõllts efter ett fel.", -1, 115, 15, 160, 24 + LTEXT "Vill du rapportera felet till ReactOS-projektet?", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Felrapporteringsassistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Beskriv vad du gjorde nõr felet uppstod. Klicka pÕ 'Nõsta' f÷r att \n\nskicka rapporten till ReactOS-projektet eller 'Avbryt' f÷r at inte skicka nÕgon information.",-1,10,0,225,40 + LTEXT "Din epost-adress (frivilligt):",-1,10,40,120,20 + EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 + LTEXT "Beskrivning av problemet (frivilligt):",-1,10,55,120,20 + EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL +END + +IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Felrapporteringsassistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 + CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Felrapporteringsassistenten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Din felrapport har skickats.",-1,25,5,225,20 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Rapportera fel till ReactOS-projektet" + IDS_FAILED_TO_CONTACT_SERVER "Systemet kunde inte kontakta felrapportsservern.\nKontrollera att din anslutning till internet fungerar." + IDS_FAILED_TO_DELIVER_ERROR_REPORT "Systemet har inte kunnat leverera felrapporten." +END + +STRINGTABLE +BEGIN + IDS_CONTACTING_SERVER "Ansluter till felrapportsservern..." + IDS_FAILED_TO_INITIALIZE_WINSOCK "Kunde inte initiera winsock (windows felkod %d)" + IDS_FAILED_TO_LOCATE_SERVER "Misslyckades att ansluta till servern" +END + _____ Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc --- trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-05-06 08:21:12 UTC (rev 15032) +++ trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-05-06 08:27:46 UTC (rev 15033) @@ -17,3 +17,5 @@ #include "En.rc" #include "De.rc" #include "Dk.rc" +#include "Sv.rc" +

1 0

[greatlrd] 15032: Swedish translations by David Nordenberg
by greatlrd＠svn.reactos.com 06 May '05

06 May '05

Swedish translations by David Nordenberg Modified: trunk/reactos/lib/cpl/desk/desk.rc Added: trunk/reactos/lib/cpl/desk/sv.rc _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-05-06 00:11:25 UTC (rev 15031) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-05-06 08:21:12 UTC (rev 15032) @@ -15,4 +15,6 @@ #include "cz.rc" #include "en.rc" #include "de.rc" +#include "sv.rc" + _____ Added: trunk/reactos/lib/cpl/desk/sv.rc --- trunk/reactos/lib/cpl/desk/sv.rc 2005-05-06 00:11:25 UTC (rev 15031) +++ trunk/reactos/lib/cpl/desk/sv.rc 2005-05-06 08:21:12 UTC (rev 15032) @@ -0,0 +1,82 @@ +/* Swedish resources by David Nordenberg */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bakgrund" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,139,173,71 + LTEXT "Võlj en bild du vill ha som skrivbordsunderlõgg:", + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Blõddra...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Fõrg...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "Placering:",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skõrmslõckare" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Det hõr utrymmet õr avsiktligt lõmnats tomt",IDC_STATIC,66, + 110,112,8 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Utseende" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Det hõr utrymmet õr avsiktligt lõmnats tomt",IDC_STATIC,66, + 110,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bildskõrmsinstõllningar" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Bild:",1820,3,140,30,8 + LTEXT "<ingen>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "&Bildyta",1818,3,160,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,170,58,17 + LTEXT "Mindre",1815,9,170,15,8,NOT WS_GROUP + LTEXT "Mer",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Fõrger",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Statisk",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,188,103,9 + PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,306,205,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Bildskõrm" + IDS_CPLDESCRIPTION "?ndrar skrivbordsunderlõgg och skõrmslõckare." + + IDS_NONE "(Ingen)" + IDS_CENTER "Centrera" + IDS_STRETCH "Strõck ut" + IDS_TILE "Stapla" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 fõrger" + IDS_COLOR_8BIT "256 fõrger" + IDS_COLOR_16BIT "65 536 fõrger (16 Bit)" + IDS_COLOR_32BIT "16,7 miljoner fõrger (24 Bit)" + IDS_COLOR_32BIT "16,7 miljoner fõrger (32 Bit)" + IDS_PIXEL "%lux%lu Pixlar" +END

1 0

[weiden] 15030: open the module image file with read access rights instead of full access rights
by weiden＠svn.reactos.com 06 May '05

06 May '05

open the module image file with read access rights instead of full access rights Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-06 00:09:08 UTC (rev 15029) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-05-06 00:11:14 UTC (rev 15030) @@ -311,7 +311,7 @@ NULL); CHECKPOINT; Status = ZwOpenFile(&FileHandle, - FILE_ALL_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0,

2 1

[ion] 15031: Update some more kernel structures
by ion＠svn.reactos.com 06 May '05

06 May '05

Update some more kernel structures Modified: trunk/reactos/include/ddk/defines.h Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/include/ddk/kedef.h Modified: trunk/reactos/include/ddk/ketypes.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h _____ Modified: trunk/reactos/include/ddk/defines.h --- trunk/reactos/include/ddk/defines.h 2005-05-06 00:11:14 UTC (rev 15030) +++ trunk/reactos/include/ddk/defines.h 2005-05-06 00:11:25 UTC (rev 15031) @@ -99,10 +99,12 @@ #define DESKTOP_SWITCHDESKTOP (0x100L) #define DESKTOP_WRITEOBJECTS (0x80L) -#endif /* __ASM__ */ +#else /* Values returned by KeGetPreviousMode() */ #define KernelMode (0) #define UserMode (1) +#endif /* __ASM__ */ + #endif /* ndef _DDK_DEFINES_H */ _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-05-06 00:11:14 UTC (rev 15030) +++ trunk/reactos/include/ddk/iotypes.h 2005-05-06 00:11:25 UTC (rev 15031) @@ -695,13 +695,6 @@ IN BOOLEAN DriverActive); #endif // (_WIN32_WINNT >= 0x0400) -typedef struct _KDEVICE_QUEUE_ENTRY -{ - LIST_ENTRY DeviceListEntry; - ULONG SortKey; - BOOLEAN Inserted; -} KDEVICE_QUEUE_ENTRY, *PKDEVICE_QUEUE_ENTRY; - typedef struct _WAIT_CONTEXT_BLOCK { KDEVICE_QUEUE_ENTRY WaitQueueEntry; _____ Modified: trunk/reactos/include/ddk/kedef.h --- trunk/reactos/include/ddk/kedef.h 2005-05-06 00:11:14 UTC (rev 15030) +++ trunk/reactos/include/ddk/kedef.h 2005-05-06 00:11:25 UTC (rev 15031) @@ -61,7 +61,14 @@ Spare5, Spare6, WrKernel, - MaximumWaitReason, + WrResource, + WrPushLock, + WrMutex, + WrQuantumEnd, + WrDispatchInt, + WrPreempted, + WrYieldExecution, + MaximumWaitReason } KWAIT_REASON; #endif _____ Modified: trunk/reactos/include/ddk/ketypes.h --- trunk/reactos/include/ddk/ketypes.h 2005-05-06 00:11:14 UTC (rev 15030) +++ trunk/reactos/include/ddk/ketypes.h 2005-05-06 00:11:25 UTC (rev 15031) @@ -5,12 +5,15 @@ /* include ntos/ketypes.h here? */ +# define RESTRICTED_POINTER __restrict + struct _KMUTANT; typedef LONG KPRIORITY; typedef LONG FLONG; + typedef VOID STDCALL_FUNC (*PKBUGCHECK_CALLBACK_ROUTINE)(PVOID Buffer, ULONG Length); @@ -34,7 +37,12 @@ typedef VOID STDCALL_FUNC (*PKRUNDOWN_ROUTINE)(struct _KAPC* Apc); -struct _DISPATCHER_HEADER; +typedef enum _MODE +{ + KernelMode, + UserMode, + MaximumMode +} MODE; typedef enum _KOBJECTS { EventNotificationObject = 0, @@ -67,54 +75,112 @@ #include <pshpack1.h> -typedef struct _DISPATCHER_HEADER +typedef struct _DISPATCHER_HEADER { - UCHAR Type; - UCHAR Absolute; - UCHAR Size; - UCHAR Inserted; - LONG SignalState; - LIST_ENTRY WaitListHead; -} DISPATCHER_HEADER, *PDISPATCHER_HEADER; + union { + struct { + UCHAR Type; + UCHAR Absolute; + UCHAR Size; + union { + UCHAR Inserted; + BOOLEAN DebugActive; + }; + }; + volatile LONG Lock; + }; + LONG SignalState; + LIST_ENTRY WaitListHead; +} DISPATCHER_HEADER; #include <poppack.h> -typedef struct _KQUEUE +typedef struct _KQUEUE { - DISPATCHER_HEADER Header; - LIST_ENTRY EntryListHead; - ULONG CurrentCount; - ULONG MaximumCount; - LIST_ENTRY ThreadListHead; -} KQUEUE, *PKQUEUE; + DISPATCHER_HEADER Header; + LIST_ENTRY EntryListHead; + ULONG CurrentCount; + ULONG MaximumCount; + LIST_ENTRY ThreadListHead; +} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; typedef struct _KGATE { DISPATCHER_HEADER Header; -} KGATE, *PKGATE; +} KGATE, *PKGATE, *RESTRICTED_POINTER PRKGATE; struct _KDPC; -typedef struct _KTIMER - { +typedef struct _KTIMER +{ DISPATCHER_HEADER Header; ULARGE_INTEGER DueTime; LIST_ENTRY TimerListEntry; - struct _KDPC* Dpc; + struct _KDPC *Dpc; LONG Period; -} KTIMER, *PKTIMER; +} KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER; +typedef struct _KMUTANT +{ + DISPATCHER_HEADER Header; + LIST_ENTRY MutantListEntry; + struct _KTHREAD *RESTRICTED_POINTER OwnerThread; + BOOLEAN Abandoned; + UCHAR ApcDisable; +} KMUTANT, *PKMUTANT, *RESTRICTED_POINTER PRKMUTANT, KMUTEX, *PKMUTEX, *RESTRICTED_POINTER PRKMUTEX; + +typedef struct _KGUARDED_MUTEX +{ + LONG Count; + struct _KTHREAD* Owner; + ULONG Contention; + KGATE Gate; + union { + struct { + SHORT KernelApcDisable; + SHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; + }; +} KGUARDED_MUTEX, *PKGUARDED_MUTEX; + +typedef struct _KSEMAPHORE +{ + DISPATCHER_HEADER Header; + LONG Limit; +} KSEMAPHORE, *PKSEMAPHORE, *RESTRICTED_POINTER PRKSEMAPHORE; + +typedef struct _KEVENT +{ + DISPATCHER_HEADER Header; +} KEVENT, *PKEVENT, *RESTRICTED_POINTER PRKEVENT; + +typedef struct _KEVENT_PAIR +{ + CSHORT Type; + CSHORT Size; + KEVENT LowEvent; + KEVENT HighEvent; +} KEVENT_PAIR, *PKEVENT_PAIR; + typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; -typedef struct _KDEVICE_QUEUE +typedef struct _KDEVICE_QUEUE { - CSHORT Type; - CSHORT Size; - LIST_ENTRY DeviceListHead; - KSPIN_LOCK Lock; - BOOLEAN Busy; -} KDEVICE_QUEUE, *PKDEVICE_QUEUE; + CSHORT Type; + CSHORT Size; + LIST_ENTRY DeviceListHead; + KSPIN_LOCK Lock; + BOOLEAN Busy; +} KDEVICE_QUEUE, *PKDEVICE_QUEUE, *RESTRICTED_POINTER PRKDEVICE_QUEUE; +typedef struct _KDEVICE_QUEUE_ENTRY +{ + LIST_ENTRY DeviceListEntry; + ULONG SortKey; + BOOLEAN Inserted; +} KDEVICE_QUEUE_ENTRY, *PKDEVICE_QUEUE_ENTRY, *RESTRICTED_POINTER PRKDEVICE_QUEUE_ENTRY; + /* * Size of the profile hash table. */ @@ -138,26 +204,20 @@ CCHAR ApcStateIndex; KPROCESSOR_MODE ApcMode; BOOLEAN Inserted; -} KAPC, *PKAPC; - +} KAPC, *PKAPC, *RESTRICTED_POINTER PRKAPC; #include <poppack.h> #ifndef __USE_W32API -#include <pshpack1.h> - -typedef struct _KAPC_STATE +typedef struct _KAPC_STATE { - LIST_ENTRY ApcListHead[2]; - struct _KPROCESS* Process; - UCHAR KernelApcInProgress; - UCHAR KernelApcPending; - UCHAR UserApcPending; - UCHAR Reserved; -} KAPC_STATE, *PKAPC_STATE, *__restrict PRKAPC_STATE; + LIST_ENTRY ApcListHead[MaximumMode]; + struct _KPROCESS *Process; + BOOLEAN KernelApcInProgress; + BOOLEAN KernelApcPending; + BOOLEAN UserApcPending; +} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; -#include <poppack.h> - #endif /* __USE_W32API */ typedef struct _KBUGCHECK_CALLBACK_RECORD @@ -171,54 +231,6 @@ UCHAR State; } KBUGCHECK_CALLBACK_RECORD, *PKBUGCHECK_CALLBACK_RECORD; -typedef struct _KMUTEX -{ - DISPATCHER_HEADER Header; - LIST_ENTRY MutantListEntry; - struct _KTHREAD* OwnerThread; - BOOLEAN Abandoned; - UCHAR ApcDisable; -} KMUTEX, *PKMUTEX, KMUTANT, *PKMUTANT; - -typedef struct _KGUARDED_MUTEX -{ - LONG Count; - struct _KTHREAD* Owner; - ULONG Contention; - KGATE Gate; - union { - struct { - SHORT KernelApcDisable; - SHORT SpecialApcDisable; - }; - ULONG CombinedApcDisable; - }; -} KGUARDED_MUTEX, *PKGUARDED_MUTEX; - -#include <pshpack1.h> - -typedef struct _KSEMAPHORE -{ - DISPATCHER_HEADER Header; - LONG Limit; -} KSEMAPHORE, *PKSEMAPHORE; - -#include <poppack.h> - -typedef struct _KEVENT -{ - DISPATCHER_HEADER Header; -} KEVENT, *PKEVENT; - -typedef struct _KEVENT_PAIR -{ - CSHORT Type; - CSHORT Size; - KEVENT LowEvent; - KEVENT HighEvent; -} KEVENT_PAIR, *PKEVENT_PAIR; - - struct _KDPC; typedef struct _KSPIN_LOCK_QUEUE { @@ -231,18 +243,15 @@ KIRQL OldIrql; } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; -typedef struct _KWAIT_BLOCK -/* - * PURPOSE: Object describing the wait a thread is currently performing - */ +typedef struct _KWAIT_BLOCK { - LIST_ENTRY WaitListEntry; - struct _KTHREAD* Thread; - struct _DISPATCHER_HEADER *Object; - struct _KWAIT_BLOCK* NextWaitBlock; - USHORT WaitKey; - USHORT WaitType; -} KWAIT_BLOCK, *PKWAIT_BLOCK; + LIST_ENTRY WaitListEntry; + struct _KTHREAD *RESTRICTED_POINTER Thread; + PVOID Object; + struct _KWAIT_BLOCK *RESTRICTED_POINTER NextWaitBlock; + USHORT WaitKey; + USHORT WaitType; +} KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; /* * PURPOSE: Defines a delayed procedure call routine @@ -258,26 +267,24 @@ PVOID SystemArgument1, PVOID SystemArgument2); +#define DPC_NORMAL 0 +#define DPC_THREADED 1 /* * PURPOSE: Defines a delayed procedure call object */ -#include <pshpack1.h> - typedef struct _KDPC { - SHORT Type; - UCHAR Number; - UCHAR Importance; - LIST_ENTRY DpcListEntry; - PKDEFERRED_ROUTINE DeferredRoutine; - PVOID DeferredContext; - PVOID SystemArgument1; - PVOID SystemArgument2; - PVOID DpcData; + CSHORT Type; + UCHAR Number; + UCHAR Importance; + LIST_ENTRY DpcListEntry; + PKDEFERRED_ROUTINE DeferredRoutine; + PVOID DeferredContext; + PVOID SystemArgument1; + PVOID SystemArgument2; + PVOID DpcData; } KDPC, *PKDPC; -#include <poppack.h> - typedef struct _KDPC_DATA { LIST_ENTRY DpcListHead; ULONG DpcLock; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-05-06 00:11:14 UTC (rev 15030) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-05-06 00:11:25 UTC (rev 15031) @@ -39,6 +39,8 @@ #endif /* __USE_W32API */ +typedef struct _DISPATCHER_HEADER *PDISPATCHER_HEADER; + typedef struct _HARDWARE_PTE_X86 { ULONG Valid : 1; ULONG Write : 1;

1 0

[weiden] 15029: create a token handle with TOKEN_QUERY access rights which is required to query the user information in RtlFormatCurrentUserKeyPath
by weiden＠svn.reactos.com 06 May '05

06 May '05

create a token handle with TOKEN_QUERY access rights which is required to query the user information in RtlFormatCurrentUserKeyPath Modified: trunk/reactos/lib/rtl/registry.c _____ Modified: trunk/reactos/lib/rtl/registry.c --- trunk/reactos/lib/rtl/registry.c 2005-05-06 00:07:05 UTC (rev 15028) +++ trunk/reactos/lib/rtl/registry.c 2005-05-06 00:09:08 UTC (rev 15029) @@ -257,7 +257,7 @@ DPRINT ("RtlFormatCurrentUserKeyPath() called\n"); Status = ZwOpenThreadToken (NtCurrentThread (), - TOKEN_READ, + TOKEN_QUERY, TRUE, &TokenHandle); if (!NT_SUCCESS (Status)) @@ -269,7 +269,7 @@ } Status = ZwOpenProcessToken (NtCurrentProcess (), - TOKEN_READ, + TOKEN_QUERY, &TokenHandle); if (!NT_SUCCESS (Status)) {

1 0

[weiden] 15028: don't leak the registry path string after initializing a driver
by weiden＠svn.reactos.com 06 May '05

06 May '05

don't leak the registry path string after initializing a driver Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/ntoskrnl/io/driver.c _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-05-05 22:40:05 UTC (rev 15027) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-05-06 00:07:05 UTC (rev 15028) @@ -587,8 +587,27 @@ } DriverExtension->HwContext = HwContext; - RtlCopyMemory(&DriverExtension->RegistryPath, RegistryPath, sizeof(UNICODE_STRING)); + /* we can't use RtlDuplicateUnicodeString because only ntdll exposes it... */ + if (RegistryPath->Length != 0) + { + DriverExtension->RegistryPath.Length = 0; + DriverExtension->RegistryPath.MaximumLength = RegistryPath->Length + sizeof(UNICODE_NULL); + DriverExtension->RegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, + DriverExtension->RegistryPath.MaximumLength, + TAG('U', 'S', 'T', 'R')); + if (DriverExtension->RegistryPath.Buffer == NULL) + { + RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlCopyUnicodeString(&DriverExtension->RegistryPath, RegistryPath); + } + else + { + RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); + } + switch (HwInitializationData->HwInitDataSize) { /* _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-05 22:40:05 UTC (rev 15027) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-06 00:07:05 UTC (rev 15028) @@ -544,10 +544,29 @@ IN BOOLEAN FileSystemDriver, OUT PDRIVER_OBJECT *DriverObject) { + const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; UNICODE_STRING RegistryKey; - PDRIVER_INITIALIZE DriverEntry = ModuleObject->EntryPoint; + PDRIVER_INITIALIZE DriverEntry; NTSTATUS Status; - WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; + + DriverEntry = ModuleObject->EntryPoint; + + if (ServiceName != NULL && ServiceName->Length != 0) + { + RegistryKey.Length = 0; + RegistryKey.MaximumLength = sizeof(ServicesKeyName) + ServiceName->Length; + RegistryKey.Buffer = ExAllocatePool(PagedPool, RegistryKey.MaximumLength); + if (RegistryKey.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlAppendUnicodeToString(&RegistryKey, ServicesKeyName); + RtlAppendUnicodeStringToString(&RegistryKey, ServiceName); + } + else + { + RtlInitUnicodeString(&RegistryKey, NULL); + } Status = IopCreateDriverObject( DriverObject, @@ -563,26 +582,15 @@ return Status; } - if (ServiceName->Buffer) - { - RegistryKey.Length = ServiceName->Length + - sizeof(ServicesKeyName) - sizeof(UNICODE_NULL); - RegistryKey.MaximumLength = RegistryKey.Length + sizeof(UNICODE_NULL); - RegistryKey.Buffer = ExAllocatePool(PagedPool, RegistryKey.MaximumLength); - wcscpy(RegistryKey.Buffer, ServicesKeyName); - wcscat(RegistryKey.Buffer, ServiceName->Buffer); - } - else - { - RtlInitUnicodeString(&RegistryKey, NULL); - } - DPRINT("RegistryKey: %wZ\n", &RegistryKey); DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); IopMarkLastReinitializeDriver(); Status = DriverEntry(*DriverObject, &RegistryKey); + + RtlFreeUnicodeString(&RegistryKey); + if (!NT_SUCCESS(Status)) { ObMakeTemporaryObject(*DriverObject);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs