Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 28220: fix release build
by cwittich＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: cwittich Date: Wed Aug 8 00:04:46 2007 New Revision: 28220 URL: http://svn.reactos.org/svn/reactos?rev=28220&view=rev Log: fix release build Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 00:04:46 2007 @@ -1175,6 +1175,8 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } + + RtlZeroMemory(&SafePoint, sizeof(POINT)); dc = DC_LockDc(hDC); if(!dc)

1 0

[jimtabor] 28219: Don't write to user space with after an error.
by jimtabor＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: jimtabor Date: Tue Aug 7 23:29:48 2007 New Revision: 28219 URL: http://svn.reactos.org/svn/reactos?rev=28219&view=rev Log: Don't write to user space with after an error. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug 7 23:29:48 2007 @@ -1210,18 +1210,22 @@ Ret = FALSE; break; } - _SEH_TRY - { - ProbeForWrite(Point, - sizeof(POINT), - 1); - *Point = SafePoint; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + + if (!Ret) + { + _SEH_TRY + { + ProbeForWrite(Point, + sizeof(POINT), + 1); + *Point = SafePoint; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } if(!NT_SUCCESS(Status)) {

1 0

[hpoussin] 28218: Support absolute paths for intermediate/output directories Never put real intermediate/output directory names in generated makefile, use $(INTERMEDIATE) and $(OUTPUT) instead
by hpoussin＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: hpoussin Date: Tue Aug 7 19:08:09 2007 New Revision: 28218 URL: http://svn.reactos.org/svn/reactos?rev=28218&view=rev Log: Support absolute paths for intermediate/output directories Never put real intermediate/output directory names in generated makefile, use $(INTERMEDIATE) and $(OUTPUT) instead Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Tue Aug 7 19:08:09 2007 @@ -336,10 +336,31 @@ AutomaticDependency::ParseFile ( const Module& module, const File& file ) { - string normalizedFilename = NormalizeFilename ( file.name ); + string normalizedFilename = NormalizeFilename ( file.GetFullPath () ); RetrieveFromCacheOrParse ( module, normalizedFilename, NULL ); +} + +string +AutomaticDependency::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + +string +AutomaticDependency::ResolveVariablesInPath ( const string& path ) +{ + string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); + s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); + s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); + return s; } bool @@ -423,7 +444,7 @@ { sourceFile = new SourceFile ( this, module, - filename, + ResolveVariablesInPath ( filename ), parentSourceFile, false ); sourcefile_map[filename] = sourceFile; Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Tue Aug 7 19:08:09 2007 @@ -766,7 +766,7 @@ char separators[] = " "; char *token; char *prevtoken = NULL; - + string version; token = strtok ( buffer, separators ); @@ -865,11 +865,11 @@ } buffer[i] = '\0'; pclose ( fp ); - + char separators[] = " "; char *token; char *prevtoken = NULL; - + token = strtok ( buffer, separators ); while ( token != NULL ) { Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Aug 7 19:08:09 2007 @@ -466,7 +466,7 @@ FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationUnits[i]->GetFilename ( backend->intermediateDirectory ) ); list.push_back ( PassThruCacheDirectory ( sourceFileLocation->filename, - sourceFileLocation->directory ) ); + sourceFileLocation->directory ) ); } } // intentionally make a copy so that we can append more work in @@ -693,9 +693,9 @@ if ( parameters.length () > 0 ) parameters += " "; if ( include.root == "intermediate" ) - path_prefix = backend->intermediateDirectory->name + cSep; + path_prefix = "$(INTERMEDIATE)" + sSep; else if (include.root == "output" ) - path_prefix = backend->outputDirectory->name + cSep; + path_prefix = "$(OUTPUT)" + sSep; else path_prefix = ""; @@ -811,14 +811,14 @@ include.baseModule->type == RpcClient || include.baseModule->type == IdlHeader) ) includeDirectory = PassThruCacheDirectory ( NormalizeFilename ( include.directory ), - backend->intermediateDirectory ); + backend->intermediateDirectory ); else includeDirectory = include.directory; if ( include.root == "intermediate" ) - path_prefix = backend->intermediateDirectory->name + cSep; + path_prefix = "$(INTERMEDIATE)" + sSep; else if (include.root == "output" ) - path_prefix = backend->outputDirectory->name + cSep; + path_prefix = "$(OUTPUT)" + sSep; else path_prefix = ""; @@ -1281,13 +1281,12 @@ GetDirectory ( EmbeddedTypeLibFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, - //"\t%s %s %s -t -T $@ %s\n", - "\t%s %s %s -t -T %s %s\n", + "\t%s %s %s -t -T %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), - EmbeddedTypeLibFilename.c_str(), - filename.c_str () ); + EmbeddedTypeLibFilename.c_str(), + filename.c_str () ); } void @@ -2003,8 +2002,9 @@ fprintf ( fMakefile, - "%s += $(PROJECT_WIDLFLAGS)\n", - widlflagsMacro.c_str () ); + "%s += $(PROJECT_WIDLFLAGS) -I%s\n", + widlflagsMacro.c_str (), + module.GetBasePath ().c_str () ); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Tue Aug 7 19:08:09 2007 @@ -98,7 +98,7 @@ void GetModuleDependencies ( string_list& dependencies ); std::string GetAllDependencies () const; void GetSourceFilenames ( string_list& list, - bool includeGeneratedFiles ) const; + bool includeGeneratedFiles ) const; void GetSourceFilenamesWithoutGeneratedFiles ( string_list& list ) const; std::string GetObjectFilename ( const FileLocation* sourceFileLocation, string_list* pclean_files ) const; @@ -213,7 +213,7 @@ void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const; std::string GetRpcServerHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const; - std::string GetIdlHeaderFilename ( std::string basename ) const; + std::string GetIdlHeaderFilename ( std::string basename ) const; std::string GetModuleCleanTarget ( const Module& module ) const; void GetReferencedObjectLibraryModuleCleanTargets ( std::vector<std::string>& moduleNames ) const; public: @@ -334,8 +334,8 @@ MingwWin32DLLModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } - void AddImplicitLibraries ( Module& module ); + std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } + void AddImplicitLibraries ( Module& module ); private: void GenerateWin32DLLModuleTarget (); }; @@ -347,8 +347,8 @@ MingwWin32OCXModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } - void AddImplicitLibraries ( Module& module ); + std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } + void AddImplicitLibraries ( Module& module ); private: void GenerateWin32OCXModuleTarget (); }; @@ -361,7 +361,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } - void AddImplicitLibraries ( Module& module ); + void AddImplicitLibraries ( Module& module ); private: void GenerateWin32CUIModuleTarget (); }; @@ -374,7 +374,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } - void AddImplicitLibraries ( Module& module ); + void AddImplicitLibraries ( Module& module ); private: void GenerateWin32GUIModuleTarget (); }; Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp Tue Aug 7 19:08:09 2007 @@ -98,7 +98,10 @@ if ( files.size () == 0 || files.size () > 1 ) return new FileLocation ( intermediateDirectory, name ); File* file = files[0]; - return new FileLocation ( NULL, file->name ); + if (file->path_prefix.length() > 0) + return new FileLocation ( intermediateDirectory, file->name ); + else + return new FileLocation ( NULL, file->name ); } std::string Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Tue Aug 7 19:08:09 2007 @@ -53,6 +53,14 @@ } const char* p = strpbrk ( subdir, "/\\" ); + if ( subdir == p || ( *subdir && subdir[1] == ':' ) ) + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid relative path '%s'", + subdir ); + } + if ( !p ) p = subdir + strlen(subdir); string s ( subdir, p-subdir ); @@ -109,8 +117,8 @@ } string -Directory::ReplaceVariable ( string name, - string value, +Directory::ReplaceVariable ( const string& name, + const string& value, string path ) { size_t i = path.find ( name ); @@ -122,7 +130,7 @@ void Directory::ResolveVariablesInPath ( char* buf, - string path ) + const string& path ) { string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); @@ -140,7 +148,10 @@ { char buf[256]; - path = parent + sSep + name; + if ( name.size () > 0 ) + path = parent + sSep + name; + else + path = parent; ResolveVariablesInPath ( buf, path ); if ( CreateDirectory ( buf ) && verbose ) printf ( "Created %s\n", buf ); Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Tue Aug 7 19:08:09 2007 @@ -45,9 +45,9 @@ if ( att != NULL) { if ( att->value == "intermediate" ) - this->path = Environment::GetIntermediatePath () + sSep + path; + this->path = "$(INTERMEDIATE)" + sSep + path; else if ( att->value == "output" ) - this->path = Environment::GetOutputPath () + sSep + path; + this->path = "$(OUTPUT)" + sSep + path; else { throw InvalidAttributeValueException ( Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Aug 7 19:08:09 2007 @@ -121,7 +121,6 @@ const Project& project, const string& location, const string& path, - const XMLAttribute* root, const string& att_value ) { if ( !att_value.size() ) @@ -135,25 +134,7 @@ if ( !path.size() ) return att_value; - string path_prefix; - if ( root ) - { - if ( root->value == "intermediate" ) - path_prefix = Environment::GetIntermediatePath() + cSep; - else if ( root->value == "output" ) - path_prefix = Environment::GetOutputPath() + cSep; - else - { - throw InvalidAttributeValueException ( - location, - "root", - root->value ); - } - } - else - path_prefix = ""; - - return FixSeparator(path_prefix + path + cSep + att_value); + return FixSeparator(path + cSep + att_value); } string @@ -540,7 +521,7 @@ for ( i = 0; i < node.subElements.size(); i++ ) { ParseContext parseContext; - ProcessXMLSubElement ( *node.subElements[i], path, parseContext ); + ProcessXMLSubElement ( *node.subElements[i], path, "", parseContext ); } for ( i = 0; i < invocations.size(); i++ ) invocations[i]->ProcessXML (); @@ -564,12 +545,14 @@ void Module::ProcessXMLSubElement ( const XMLElement& e, const string& path, + const string& path_prefix, ParseContext& parseContext ) { If* pOldIf = parseContext.ifData; CompilationUnit* pOldCompilationUnit = parseContext.compilationUnit; bool subs_invalid = false; string subpath ( path ); + string subpath_prefix ( "" ); if ( e.name == "file" && e.value.size () > 0 ) { bool first = false; @@ -601,6 +584,7 @@ cplusplus = true; } File* pFile = new File ( FixSeparator ( path + cSep + e.value ), + path_prefix, first, switches, false ); @@ -638,9 +622,23 @@ else if ( e.name == "directory" ) { const XMLAttribute* att = e.GetAttribute ( "name", true ); - const XMLAttribute* base = e.GetAttribute ( "root", false ); + const XMLAttribute* root = e.GetAttribute ( "root", false ); assert(att); - subpath = GetSubPath ( this->project, e.location, path, base, att->value ); + if ( root ) + { + if ( root->value == "intermediate" ) + subpath_prefix = "$(INTERMEDIATE)"; + else if ( root->value == "output" ) + subpath_prefix = "$(OUTPUT)"; + else + { + throw InvalidAttributeValueException ( + e.location, + "root", + root->value ); + } + } + subpath = GetSubPath ( this->project, e.location, path, att->value ); } else if ( e.name == "include" ) { @@ -809,7 +807,7 @@ e.name.c_str() ); } for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); + ProcessXMLSubElement ( *e.subElements[i], subpath, subpath_prefix, parseContext ); parseContext.ifData = pOldIf; parseContext.compilationUnit = pOldCompilationUnit; } @@ -1206,19 +1204,44 @@ } -File::File ( const string& _name, bool _first, +File::File ( const string& _name, + bool _first, std::string _switches, bool _isPreCompiledHeader ) : name(_name), + path_prefix(""), first(_first), switches(_switches), isPreCompiledHeader(_isPreCompiledHeader) { } + +File::File ( const string& _name, + const string& _path_prefix, + bool _first, + std::string _switches, + bool _isPreCompiledHeader ) + : name(_name), + path_prefix(_path_prefix), + first(_first), + switches(_switches), + isPreCompiledHeader(_isPreCompiledHeader) +{ +} + void File::ProcessXML() { +} + + +std::string File::GetFullPath () const +{ + if ( path_prefix.length () > 0 ) + return path_prefix + sSep + name; + else + return name; } Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Tue Aug 7 19:08:09 2007 @@ -391,9 +391,8 @@ else if ( e.name == "directory" ) { const XMLAttribute* att = e.GetAttribute ( "name", true ); - const XMLAttribute* base = e.GetAttribute ( "root", false ); assert(att); - subpath = GetSubPath ( *this, e.location, path, base, att->value ); + subpath = GetSubPath ( *this, e.location, path, att->value ); } else if ( e.name == "include" ) { Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Tue Aug 7 19:08:09 2007 @@ -119,12 +119,12 @@ const std::string& parent ); private: bool mkdir_p ( const char* path ); - std::string ReplaceVariable ( std::string name, - std::string value, + std::string ReplaceVariable ( const std::string& name, + const std::string& value, std::string path ); std::string GetEnvironmentVariable ( const std::string& name ); void ResolveVariablesInPath ( char* buf, - std::string path ); + const std::string& path ); bool CreateDirectory ( std::string path ); }; @@ -354,6 +354,7 @@ std::string entrypoint; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, + const std::string& path_prefix, ParseContext& parseContext ); }; @@ -388,10 +389,10 @@ public: const Project& project; const Module* module; - const XMLElement* node; + const XMLElement* node; std::string name; std::string value; - std::string backend; + std::string backend; Define ( const Project& project, const XMLElement& defineNode ); @@ -413,6 +414,7 @@ { public: std::string name; + std::string path_prefix; bool first; std::string switches; bool isPreCompiledHeader; @@ -422,7 +424,14 @@ std::string _switches, bool _isPreCompiledHeader ); - void ProcessXML(); + File ( const std::string& _name, + const std::string& _path_prefix, + bool _first, + std::string _switches, + bool _isPreCompiledHeader ); + + void ProcessXML(); + std::string GetFullPath () const; }; @@ -629,11 +638,11 @@ void WriteHooksFile ( Module& module ); std::string GetStubsFilename ( Module& module ); char* WriteStubbedSymbolToStubsFile ( char* buffer, - const StubbedComponent& component, + const StubbedComponent& component, const StubbedSymbol& symbol, int stubIndex ); char* WriteStubbedComponentToStubsFile ( char* buffer, - const StubbedComponent& component, + const StubbedComponent& component, int* stubIndex ); void WriteStubsFile ( Module& module ); std::string GetStartupFilename ( Module& module ); @@ -641,9 +650,9 @@ std::string GetTestDispatcherName ( std::string filename ); bool IsTestFile ( std::string& filename ) const; void GetSourceFilenames ( string_list& list, - Module& module ) const; + Module& module ) const; char* WriteTestDispatcherPrototypesToStartupFile ( char* buffer, - Module& module ); + Module& module ); char* WriteRegisterTestsFunctionToStartupFile ( char* buffer, Module& module ); void WriteStartupFile ( Module& module ); @@ -740,18 +749,22 @@ private: void GetModulesToCheck ( Module& module, std::vector<const Module*>& modules ); void CheckAutomaticDependencies ( const Module& module, - bool verbose ); + bool verbose ); void CheckAutomaticDependenciesForFile ( SourceFile* sourceFile ); void GetIncludeDirectories ( std::vector<Include*>& includes, const Module& module, - Include& currentDirectory, - bool searchCurrentDirectory ); + Include& currentDirectory, + bool searchCurrentDirectory ); void GetModuleFiles ( const Module& module, - std::vector<File*>& files ) const; + std::vector<File*>& files ) const; void ParseFiles (); void ParseFiles ( const Module& module ); void ParseFile ( const Module& module, const File& file ); + std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); + std::string ResolveVariablesInPath ( const std::string& path ); std::map<std::string, SourceFile*> sourcefile_map; }; @@ -994,7 +1007,6 @@ const Project& project, const std::string& location, const std::string& path, - const XMLAttribute* root, const std::string& att_value ); extern std::string Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Tue Aug 7 19:08:09 2007 @@ -111,7 +111,7 @@ NormalizeFilename ( resourceFilename ).c_str () ); string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters; - Directory( outputDirectory ).GenerateTree( ".", false ); + Directory( relativeDirectory ).GenerateTree( Environment::GetIntermediatePath(), false ); int exitcode = system ( command.c_str () ); if ( exitcode != 0 )

1 0

[hpoussin] 28217: Remove some debug messages scsiport.c: Do not try to open Device subkey if we don't have a service key cmhardwr.c: Write BIOS information only if we succeeded to open the key
by hpoussin＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: hpoussin Date: Tue Aug 7 15:45:30 2007 New Revision: 28217 URL: http://svn.reactos.org/svn/reactos?rev=28217&view=rev Log: Remove some debug messages scsiport.c: Do not try to open Device subkey if we don't have a service key cmhardwr.c: Write BIOS information only if we succeeded to open the key Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/drivers/filesystems/vfat/create.c trunk/reactos/drivers/input/i8042prt/registry.c trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/include/psdk/msidefs.h trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Tue Aug 7 15:45:30 2007 @@ -1826,7 +1826,7 @@ NTSTATUS Status; /* FAT or FAT32 partition */ - DPRINT1("System path: '%wZ'\n", SystemRootPath); + DPRINT("System path: '%wZ'\n", SystemRootPath); if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") == TRUE || DoesFileExist(SystemRootPath->Buffer, L"boot.ini") == TRUE) @@ -2040,7 +2040,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.sys"); - DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); if (!NT_SUCCESS(Status)) { @@ -2055,7 +2055,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.ini"); - DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = CreateFreeLoaderIniForReactos(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) @@ -2069,7 +2069,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\bootsect.old"); - DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Save bootsector: %S ==> %S\n", SrcPath, DstPath); Status = SaveCurrentBootSector(SrcPath, DstPath); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c (original) +++ trunk/reactos/base/setup/usetup/inicache.c Tue Aug 7 15:45:30 2007 @@ -1032,7 +1032,7 @@ } BufferSize++; /* Null-terminator */ - DPRINT1("BufferSize: %lu\n", BufferSize); + DPRINT("BufferSize: %lu\n", BufferSize); /* Allocate file buffer */ Buffer = (CHAR*) RtlAllocateHeap(ProcessHeap, Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Aug 7 15:45:30 2007 @@ -481,10 +481,6 @@ /* Load keyboard driver */ -#if 0 - if (!LoadDriver(SourcePath, "keyboard.sys")) - return; -#endif if (!LoadDriver(SourcePath, "i8042prt.sys")) return; if (!LoadDriver(SourcePath, "kbdclass.sys")) Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Tue Aug 7 15:45:30 2007 @@ -1249,7 +1249,7 @@ hWnd, Msg, wParam, lParam); else { - DPRINT("CallWindowProcA: can not dereference WndProcHandle\n"); + WARN("CallWindowProcA: can not dereference WndProcHandle\n"); return 0; } } @@ -1282,7 +1282,7 @@ hWnd, Msg, wParam, lParam); else { - DPRINT("CallWindowProcW: can not dereference WndProcHandle\n"); + WARN("CallWindowProcW: can not dereference WndProcHandle\n"); return 0; } } Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Tue Aug 7 15:45:30 2007 @@ -249,7 +249,7 @@ } else { - CHECKPOINT1; + DPRINT1("File not found %wZ\n", &PathNameU); Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb); Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c Tue Aug 7 15:45:30 2007 @@ -194,13 +194,13 @@ * set them manually anyway... */ RTL_QUERY_REGISTRY_TABLE *Current = Parameters; - DPRINT1 ("Can't read registry: %x\n", Status); + DPRINT ("Can't read registry: %x\n", Status); while (Current->Name) { *((PULONG)Current->EntryContext) = *((PULONG)Current->DefaultData); Current++; } - DPRINT1 ("Manually set defaults\n"); + DPRINT ("Manually set defaults\n"); } Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c (original) +++ trunk/reactos/drivers/setup/blue/blue.c Tue Aug 7 15:45:30 2007 @@ -255,7 +255,7 @@ DeviceExtension->Rows = 30; #endif - DPRINT1 ("%d Columns %d Rows %d Scanlines\n", + DPRINT ("%d Columns %d Rows %d Scanlines\n", DeviceExtension->Columns, DeviceExtension->Rows, DeviceExtension->ScanLines); Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Tue Aug 7 15:45:30 2007 @@ -806,7 +806,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Unable to open driver's registry key %wZ, status 0x%08x\n", RegistryPath, Status); + DPRINT("Unable to open driver's registry key %wZ, status 0x%08x\n", RegistryPath, Status); ConfigInfo->ServiceKey = NULL; } @@ -835,18 +835,21 @@ } } - /* Open the Device key */ - RtlInitUnicodeString(&KeyName, L"Device"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ConfigInfo->ServiceKey, - NULL); - - /* We don't check for failure here - not needed */ - ZwOpenKey(&ConfigInfo->DeviceKey, - KEY_READ, - &ObjectAttributes); + if (ConfigInfo->ServiceKey != NULL) + { + /* Open the Device key */ + RtlInitUnicodeString(&KeyName, L"Device"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ConfigInfo->ServiceKey, + NULL); + + /* We don't check for failure here - not needed */ + ZwOpenKey(&ConfigInfo->DeviceKey, + KEY_READ, + &ObjectAttributes); + } } Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… ============================================================================== --- trunk/reactos/include/psdk/msidefs.h (original) +++ trunk/reactos/include/psdk/msidefs.h Tue Aug 7 15:45:30 2007 @@ -166,6 +166,12 @@ msidbComponentAttributesTransitive = 0x00000040, msidbComponentAttributesNeverOverwrite = 0x00000080, msidbComponentAttributes64bit = 0x00000100 +}; + +enum msidbODBCDataSourceRegistration +{ + msidbODBCDataSourceRegistrationPerMachine = 0x00000000, + msidbODBCDataSourceRegistrationPerUser = 0x00000001 }; enum msidbRegistryRoot Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Tue Aug 7 15:45:30 2007 @@ -304,7 +304,13 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (!NT_SUCCESS(Status) && !ExpInTextModeSetup) return Status; + if (ExpInTextModeSetup) + { + if (!NT_SUCCESS(Status)) + BiosHandle = NULL; + } + else if (!NT_SUCCESS(Status)) + return Status; /* Create the CPU Key, and check if it already existed */ RtlInitUnicodeString(&KeyName, L"CentralProcessor"); @@ -623,29 +629,32 @@ /* Free the string */ RtlFreeUnicodeString(&Data); - /* Get the BIOS Date Identifier */ - RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); - Buffer[8] = ANSI_NULL; - - /* Convert it to unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - if (NT_SUCCESS(Status)) - { - /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - } - - /* Close the bios information handle */ - NtClose(BiosHandle); + if (BiosHandle) + { + /* Get the BIOS Date Identifier */ + RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); + Buffer[8] = ANSI_NULL; + + /* Convert it to unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + if (NT_SUCCESS(Status)) + { + /* Save it to the registry */ + Status = NtSetValueKey(BiosHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + } + + /* Close the bios information handle */ + NtClose(BiosHandle); + } } /* Get the BIOS Version */ Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Tue Aug 7 15:45:30 2007 @@ -461,7 +461,7 @@ if (!NT_SUCCESS(Status)) { hKey = NULL; - DPRINT1("ZwCreateKey failed for %wZ, status=%x\n", &UnicodeString1, Status); + DPRINT("ZwCreateKey failed for %wZ, status=%x\n", &UnicodeString1, Status); } /* Create PhysicalDrive links */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Aug 7 15:45:30 2007 @@ -787,7 +787,6 @@ if (!NT_SUCCESS(Status)) { IopFreeDeviceNode(DeviceNode); - CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -1253,6 +1252,7 @@ if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ + DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", DriverName, Status); ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); } Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Tue Aug 7 15:45:30 2007 @@ -698,7 +698,7 @@ * a conflict is detected with another driver. */ { - DPRINT1("IoReportResourceUsage is unimplemented\n"); + UNIMPLEMENTED; *ConflictDetected = FALSE; return STATUS_SUCCESS; }

1 0

[fireball] 28216: - Remove empty init.S
by fireball＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: fireball Date: Tue Aug 7 14:24:06 2007 New Revision: 28216 URL: http://svn.reactos.org/svn/reactos?rev=28216&view=rev Log: - Remove empty init.S Removed: trunk/reactos/ntoskrnl/ke/i386/init.S Removed: trunk/reactos/ntoskrnl/ke/i386/init.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/init.S?re… ============================================================================== (empty)

1 0

[winesync] 28215: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: winesync Date: Tue Aug 7 11:27:43 2007 New Revision: 28215 URL: http://svn.reactos.org/svn/reactos?rev=28215&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Eo.rc (with props) trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc (with props) trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc (with props) Removed: trunk/reactos/dll/win32/shlwapi/Makefile.in Modified: trunk/reactos/dll/win32/shlwapi/assoc.c trunk/reactos/dll/win32/shlwapi/clist.c trunk/reactos/dll/win32/shlwapi/istream.c trunk/reactos/dll/win32/shlwapi/msgbox.c trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/path.c trunk/reactos/dll/win32/shlwapi/reg.c trunk/reactos/dll/win32/shlwapi/regstream.c trunk/reactos/dll/win32/shlwapi/resource.h trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_main.c trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff trunk/reactos/dll/win32/shlwapi/stopwatch.c trunk/reactos/dll/win32/shlwapi/string.c trunk/reactos/dll/win32/shlwapi/thread.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/dll/win32/shlwapi/version.rc trunk/reactos/dll/win32/shlwapi/wsprintf.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/shlwapi/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/Makefile… Modified: trunk/reactos/dll/win32/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/assoc.c?… Modified: trunk/reactos/dll/win32/shlwapi/clist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/clist.c?… Modified: trunk/reactos/dll/win32/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/istream.… Modified: trunk/reactos/dll/win32/shlwapi/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/msgbox.c… Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… Modified: trunk/reactos/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?re… Modified: trunk/reactos/dll/win32/shlwapi/regstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/regstrea… Modified: trunk/reactos/dll/win32/shlwapi/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/resource… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/stopwatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/stopwatc… Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… Modified: trunk/reactos/dll/win32/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/thread.c… Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… Modified: trunk/reactos/dll/win32/shlwapi/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/version.… Modified: trunk/reactos/dll/win32/shlwapi/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/wsprintf…

1 0

[jimtabor] 28214: Move Break Extra and Count justification to Dc_Attr.
by jimtabor＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: jimtabor Date: Tue Aug 7 11:27:12 2007 New Revision: 28214 URL: http://svn.reactos.org/svn/reactos?rev=28214&view=rev Log: Move Break Extra and Count justification to Dc_Attr. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Aug 7 11:27:12 2007 @@ -35,11 +35,6 @@ GdiPath path; /* #endif */ - - short breakTotalExtra; /* Total extra space for justification */ - short breakCount; /* Break char. count */ - short breakExtra; /* breakTotalExtra / breakCount */ - short breakRem; /* breakTotalExtra % breakCount */ RECT totalExtent; BYTE bitsPerPixel; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug 7 11:27:12 2007 @@ -1302,10 +1302,8 @@ newdc->Dc_Attr.ptlBrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y; newdc->Dc_Attr.lTextAlign = dc->Dc_Attr.lTextAlign; newdc->Dc_Attr.lTextExtra = dc->Dc_Attr.lTextExtra; - newdc->w.breakTotalExtra = dc->w.breakTotalExtra; - newdc->w.breakCount = dc->w.breakCount; - newdc->w.breakExtra = dc->w.breakExtra; - newdc->w.breakRem = dc->w.breakRem; + newdc->Dc_Attr.cBreak = dc->Dc_Attr.cBreak; + newdc->Dc_Attr.lBreakExtra = dc->Dc_Attr.lBreakExtra; newdc->Dc_Attr.iMapMode = dc->Dc_Attr.iMapMode; newdc->Dc_Attr.iGraphicsMode = dc->Dc_Attr.iGraphicsMode; #if 0 @@ -1385,10 +1383,8 @@ dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y; dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign; dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra; - dc->w.breakTotalExtra = dcs->w.breakTotalExtra; - dc->w.breakCount = dcs->w.breakCount; - dc->w.breakExtra = dcs->w.breakExtra; - dc->w.breakRem = dcs->w.breakRem; + dc->Dc_Attr.cBreak = dcs->Dc_Attr.cBreak; + dc->Dc_Attr.lBreakExtra = dcs->Dc_Attr.lBreakExtra; dc->Dc_Attr.iMapMode = dcs->Dc_Attr.iMapMode; dc->Dc_Attr.iGraphicsMode = dcs->Dc_Attr.iGraphicsMode; #if 0

1 0

[hpoussin] 28213: Add mlang.dll to bootcd
by hpoussin＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: hpoussin Date: Tue Aug 7 10:54:21 2007 New Revision: 28213 URL: http://svn.reactos.org/svn/reactos?rev=28213&view=rev Log: Add mlang.dll to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Aug 7 10:54:21 2007 @@ -186,6 +186,7 @@ dll\win32\lz32\lz32.dll 1 dll\win32\mapi32\mapi32.dll 1 dll\win32\winmm\midimap\midimap.dll 1 +dll\win32\mlang\mlang.dll 1 dll\win32\mmdrv\mmdrv.dll 1 dll\win32\mpr\mpr.dll 1 dll\win32\msacm32\msacm32.dll 1

1 0

[winesync] 28212: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: winesync Date: Tue Aug 7 10:52:34 2007 New Revision: 28212 URL: http://svn.reactos.org/svn/reactos?rev=28212&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/mlang/ trunk/reactos/dll/win32/mlang/mlang.c (with props) trunk/reactos/dll/win32/mlang/mlang.rbuild (with props) trunk/reactos/dll/win32/mlang/mlang.spec (with props) trunk/reactos/dll/win32/mlang/regsvr.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… Added: trunk/reactos/dll/win32/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.rbui… Added: trunk/reactos/dll/win32/mlang/mlang.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.spec… Added: trunk/reactos/dll/win32/mlang/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/regsvr.c?r…

1 0

[hpoussin] 28211: Prepare import of mlang library. This revision does not compile.
by hpoussin＠svn.reactos.org 07 Aug '07

07 Aug '07

Author: hpoussin Date: Tue Aug 7 10:48:01 2007 New Revision: 28211 URL: http://svn.reactos.org/svn/reactos?rev=28211&view=rev Log: Prepare import of mlang library. This revision does not compile. Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=282… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Tue Aug 7 10:48:01 2007 @@ -26,6 +26,7 @@ <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> <property name="BASEADDRESS_DESK" value="0x65080000" /> <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> + <property name="BASEADDRESS_MLANG" value="0x65140000" /> <property name="BASEADDRESS_ACCESS" value="0x65180000" /> <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Aug 7 10:48:01 2007 @@ -115,6 +115,9 @@ <directory name="mapi32"> <xi:include href="mapi32/mapi32.rbuild" /> </directory> +<directory name="mlang"> + <xi:include href="mlang/mlang.rbuild" /> +</directory> <directory name="mmdrv"> <xi:include href="mmdrv/mmdrv.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Tue Aug 7 10:48:01 2007 @@ -49,6 +49,7 @@ reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync +reactos/dll/win32/mlang # Autosync reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync reactos/dll/win32/msimg32 # Autosync

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