Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 31562: Release memory when not needed anymore Do not display errors when checking for binutils Cleanup PCH handling
by hpoussin＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: hpoussin Date: Wed Jan 2 17:04:35 2008 New Revision: 31562 URL: http://svn.reactos.org/svn/reactos?rev=31562&view=rev Log: Release memory when not needed anymore Do not display errors when checking for binutils Cleanup PCH handling Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 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 Wed Jan 2 17:04:35 2008 @@ -929,7 +929,7 @@ MingwBackend::TryToDetectThisBinutils ( const string& binutils ) { string command = ssprintf ( - "%s -v 1>%s", + "%s -v 1>%s 2>%s", FixSeparatorForSystemCommand(binutils).c_str (), NUL, NUL ); 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 Wed Jan 2 17:04:35 2008 @@ -122,7 +122,8 @@ return file; } -/*static*/ const FileLocation* +/* caller needs to delete the returned object */ +const FileLocation* MingwModuleHandler::GetTargetFilename ( const Module& module, string_list* pclean_files ) @@ -136,7 +137,8 @@ return target; } -/*static*/ const FileLocation* +/* caller needs to delete the returned object */ +const FileLocation* MingwModuleHandler::GetImportLibraryFilename ( const Module& module, string_list* pclean_files ) @@ -150,7 +152,8 @@ return target; } -/*static*/ MingwModuleHandler* +/* caller needs to delete the returned object */ +MingwModuleHandler* MingwModuleHandler::InstanciateHandler ( const Module& module, MingwBackend* backend ) @@ -261,6 +264,7 @@ return ""; } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetActualSourceFilename ( const FileLocation* file ) const @@ -311,11 +315,22 @@ if ( extension == ".idl" || extension == ".IDL" ) { if ( (module.type == RpcServer) || (module.type == RpcClient) ) - return backend->GetFullName ( *GetRpcServerHeaderFilename ( file ) ) - + " " - + backend->GetFullName ( *GetRpcClientHeaderFilename ( file ) ); + { + const FileLocation *server_header = GetRpcServerHeaderFilename ( file ); + const FileLocation *client_header = GetRpcClientHeaderFilename ( file ); + string dependencies = backend->GetFullName ( *server_header ) + " " + + backend->GetFullName ( *client_header ); + delete server_header; + delete client_header; + return dependencies; + } else if ( module.type == IdlHeader ) - return backend->GetFullName ( *GetIdlHeaderFilename ( file ) ); + { + const FileLocation *idl_header = GetIdlHeaderFilename ( file ); + string dependencies = backend->GetFullName ( *idl_header ); + delete idl_header; + return dependencies; + } else return ""; } @@ -338,11 +353,12 @@ return v2s ( sourceFiles, 10 ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetModuleArchiveFilename () const { if ( module.type == StaticLibrary ) - return new FileLocation ( *GetTargetFilename ( module, NULL ) ); + return GetTargetFilename ( module, NULL ); return new FileLocation ( IntermediateDirectory, module.output->relative_path, ReplaceExtension ( module.name, ".temp.a" ) ); @@ -410,7 +426,11 @@ } } else - dep = backend->GetFullName ( *GetImportLibraryFilename ( importedModule, NULL ) ); + { + const FileLocation *library_target = GetImportLibraryFilename ( importedModule, NULL ); + dep = backend->GetFullName ( *library_target ); + delete library_target; + } return dep; } @@ -470,6 +490,7 @@ const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationUnits[i]->GetFilename () ); list.push_back ( *sourceFileLocation ); + delete sourceFileLocation; } } // intentionally make a copy so that we can append more work in @@ -492,6 +513,7 @@ const FileLocation* sourceFileLocation = GetActualSourceFilename ( compilationUnit.GetFilename () ); list.push_back ( *sourceFileLocation ); + delete sourceFileLocation; } } } @@ -504,6 +526,7 @@ GetSourceFilenames ( list, false ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetObjectFilename ( const FileLocation* sourceFile, @@ -649,7 +672,9 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += backend->GetFullName ( *GetObjectFilename ( compilationUnits[i]->GetFilename (), module, NULL ) ); + const FileLocation *object_file = GetObjectFilename ( compilationUnits[i]->GetFilename (), module, NULL ); + objectFilenames += backend->GetFullName ( *object_file ); + delete object_file; } return objectFilenames; } @@ -812,11 +837,13 @@ assignmentOperation ); } - if ( use_pch && module.pch != NULL ) + const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); + if ( pchFilename ) { fprintf ( fMakefile, " -I%s", - backend->GetFullPath ( *GetPrecompiledHeaderFilename () ).c_str () ); + backend->GetFullPath ( *pchFilename ).c_str () ); + delete pchFilename; } if ( generatingCompilerMacro ) @@ -966,7 +993,7 @@ void MingwModuleHandler::CleanupCompilationUnitVector ( vector<CompilationUnit*>& compilationUnits ) { - for (size_t i = 0; i < compilationUnits.size (); i++) + for ( size_t i = 0; i < compilationUnits.size (); i++ ) delete compilationUnits[i]; } @@ -1051,7 +1078,7 @@ const vector<CompilationUnit*>& compilationUnits = data.compilationUnits; vector<const FileLocation *> headers; - vector<const FileLocation *> mcheaders; + vector<const FileLocation *> mcheaders; vector<const FileLocation *> mcresources; if ( compilationUnits.size () > 0 ) { @@ -1060,11 +1087,13 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( compilationUnit.IsFirstFile () ) { + const FileLocation *object_file = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ) ).c_str (), + backend->GetFullName ( *object_file ).c_str (), objectsMacro.c_str() ); + delete object_file; } } fprintf ( @@ -1080,18 +1109,21 @@ const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) headers.push_back ( objectFilename ); - else if ( GetExtension ( *objectFilename ) == ".rc" ) - { - const FileLocation *headerFilename = GetMcHeaderFilename ( compilationUnit.GetFilename () ); - mcheaders.push_back ( headerFilename ); + else if ( GetExtension ( *objectFilename ) == ".rc" ) + { + const FileLocation *headerFilename = GetMcHeaderFilename ( compilationUnit.GetFilename () ); + mcheaders.push_back ( headerFilename ); mcresources.push_back ( objectFilename ); - } + } else + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *objectFilename ).c_str () ); + delete objectFilename; + } } } fprintf ( fMakefile, "\n" ); @@ -1104,15 +1136,18 @@ module.name.c_str (), assignmentOperation ); for ( i = 0; i < headers.size (); i++ ) + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *headers[i] ).c_str () ); + delete headers[i]; + } fprintf ( fMakefile, "\n" ); } - if ( mcheaders.size () > 0 ) + if ( mcheaders.size () > 0 ) { fprintf ( fMakefile, @@ -1120,15 +1155,18 @@ module.name.c_str (), assignmentOperation ); for ( i = 0; i < mcheaders.size (); i++ ) + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *mcheaders[i] ).c_str () ); + delete mcheaders[i]; + } fprintf ( fMakefile, "\n" ); } - if ( mcresources.size () > 0 ) + if ( mcresources.size () > 0 ) { fprintf ( fMakefile, @@ -1136,11 +1174,14 @@ module.name.c_str (), assignmentOperation ); for ( i = 0; i < mcresources.size (); i++ ) + { fprintf ( fMakefile, "%s%s", ( i%10 == 9 ? " \\\n\t" : " " ), backend->GetFullName ( *mcresources[i] ).c_str () ); + delete mcresources[i]; + } fprintf ( fMakefile, "\n" ); } @@ -1174,18 +1215,23 @@ GetModuleSpecificCompilationUnits ( sourceCompilationUnits ); for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { + const FileLocation *object_file = GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), module, NULL ); fprintf ( fMakefile, "%s += %s\n", objectsMacro.c_str(), - backend->GetFullName ( *GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), module, NULL ) ).c_str () ); + backend->GetFullName ( *object_file ).c_str () ); + delete object_file; } CleanupCompilationUnitVector ( sourceCompilationUnits ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetPrecompiledHeaderFilename () const { + if ( !module.pch || !use_pch ) + return NULL; return new FileLocation ( IntermediateDirectory, module.pch->file.relative_path, ReplaceExtension ( module.pch->file.name, "_" + module.name + ".gch" ) ); @@ -1199,11 +1245,13 @@ const string& cflagsMacro ) { const FileLocation *generatedSourceFileName = GetActualSourceFilename ( sourceFile ); + const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); string dependencies = backend->GetFullName ( *generatedSourceFileName ); + if ( extraDependencies != "" ) dependencies += " " + extraDependencies; - if ( module.pch && use_pch ) - dependencies += " " + backend->GetFullName ( *GetPrecompiledHeaderFilename () ); + if ( pchFilename ) + dependencies += " " + backend->GetFullName ( *pchFilename ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; @@ -1223,6 +1271,11 @@ "\t%s -c $< -o $@ %s\n", cc.c_str (), cflagsMacro.c_str () ); + + delete objectFilename; + delete generatedSourceFileName; + if ( pchFilename ) + delete pchFilename; } void @@ -1246,6 +1299,8 @@ "\t%s -x assembler-with-cpp -c $< -o $@ -D__ASM__ %s\n", cc.c_str (), cflagsMacro.c_str () ); + + delete objectFilename; } void @@ -1268,6 +1323,8 @@ "\t%s -f win32 $< -o $@ %s\n", "$(Q)${nasm}", nasmflagsMacro.c_str () ); + + delete objectFilename; } void @@ -1313,6 +1370,8 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", backend->GetFullName ( resFilename ).c_str () ); + + delete objectFilename; } void @@ -1328,8 +1387,8 @@ basename + ".spec.def" ); CLEAN_FILE ( def_file ); - FileLocation stub_file ( *GetActualSourceFilename ( sourceFile ) ); - CLEAN_FILE ( stub_file ); + const FileLocation *stub_file = GetActualSourceFilename ( sourceFile ); + CLEAN_FILE ( *stub_file ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET) | %s\n", @@ -1344,14 +1403,16 @@ backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "%s: %s $(WINEBUILD_TARGET)\n", - backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *stub_file ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); fprintf ( fMakefile, "\t%s -o %s --pedll %s\n", "$(Q)$(WINEBUILD_TARGET)", - backend->GetFullName ( stub_file ).c_str (), + backend->GetFullName ( *stub_file ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); + + delete stub_file; } void @@ -1403,6 +1464,7 @@ return string ( "" ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetRpcServerHeaderFilename ( const FileLocation *base ) const { @@ -1444,8 +1506,11 @@ backend->GetFullName ( *generatedHeaderFilename ).c_str (), backend->GetFullName ( generatedServerFilename ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); -} - + + delete generatedHeaderFilename; +} + +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetRpcClientHeaderFilename ( const FileLocation *base ) const { @@ -1453,6 +1518,7 @@ return new FileLocation ( IntermediateDirectory, base->relative_path, newname ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetIdlHeaderFilename ( const FileLocation *base ) const { @@ -1460,6 +1526,7 @@ return new FileLocation ( IntermediateDirectory, base->relative_path, newname ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetMcHeaderFilename ( const FileLocation *base ) const { @@ -1531,6 +1598,8 @@ backend->GetFullName ( *generatedHeaderFilename ).c_str (), backend->GetFullName ( generatedClientFilename ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); + + delete generatedHeaderFilename; } void @@ -1560,6 +1629,8 @@ widlflagsMacro.c_str (), backend->GetFullName ( *generatedHeader ).c_str (), backend->GetFullName ( *sourceFile ).c_str () ); + + delete generatedHeader; } void @@ -1751,7 +1822,9 @@ for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *data.compilationUnits[i]; - objectFiles.push_back ( *GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ) ); + const FileLocation *object_file = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); + objectFiles.push_back ( *object_file ); + delete object_file; } } @@ -1807,9 +1880,11 @@ const string& libsMacro, const string& pefixupParameters ) { - string target ( GetTargetMacro ( module ) ); - string target_folder ( backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ) ); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); const FileLocation *definitionFilename = GetDefinitionFilename (); + + string target_macro ( GetTargetMacro ( module ) ); + string target_folder ( backend->GetFullPath ( *target_file ) ); string linkerScriptArgument; if ( module.linkerScript != NULL ) @@ -1819,7 +1894,7 @@ fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) $(PEFIXUP_TARGET) | %s\n", - target.c_str (), + target_macro.c_str (), backend->GetFullName ( *definitionFilename ).c_str (), dependencies.c_str (), target_folder.c_str () ); @@ -1833,7 +1908,7 @@ linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - target.c_str (), + target_macro.c_str (), objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); @@ -1859,14 +1934,14 @@ linkerParameters.c_str (), linkerScriptArgument.c_str (), backend->GetFullName ( temp_exp ).c_str (), - target.c_str (), + target_macro.c_str (), objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); fprintf ( fMakefile, "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", - target.c_str (), + target_macro.c_str (), pefixupParameters.c_str() ); fprintf ( fMakefile, @@ -1886,7 +1961,7 @@ linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - target.c_str (), + target_macro.c_str (), objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); @@ -1897,18 +1972,25 @@ GenerateRunRsymCode (); GenerateRunStripCode (); GenerateCleanObjectsAsYouGoCode (); + + delete definitionFilename; + delete target_file; } void MingwModuleHandler::GeneratePhonyTarget() const { string targetMacro ( GetTargetMacro ( module ) ); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); + fprintf ( fMakefile, ".PHONY: %s\n\n", targetMacro.c_str ()); fprintf ( fMakefile, "%s: | %s\n", targetMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); + + delete target_file; } void @@ -1939,6 +2021,7 @@ moduleDependencies += ssprintf ( " $(%s_RESOURCES)", module.name.c_str () ); break; } + delete objectFilename; } for ( i = 0; i < compilationUnits.size (); i++ ) @@ -1992,10 +2075,11 @@ const string& windresflagsMacro, const string& widlflagsMacro ) { - if ( module.pch && use_pch ) + const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); + + if ( pchFilename ) { const FileLocation& baseHeaderFile = module.pch->file; - const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); CLEAN_FILE ( *pchFilename ); string dependencies = backend->GetFullName ( baseHeaderFile ); /* WIDL generated headers may be used */ @@ -2014,6 +2098,7 @@ backend->GetFullName ( *pchFilename ).c_str(), cflagsMacro.c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); + delete pchFilename; } GenerateObjectFileTargets ( module.non_if_data, @@ -2026,6 +2111,7 @@ fprintf ( fMakefile, "\n" ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GenerateArchiveTarget ( const string& ar, const string& objs_macro ) const @@ -2040,7 +2126,7 @@ if ( module.type == StaticLibrary && module.importLibrary ) { - const FileLocation *definitionFilename ( GetDefinitionFilename () ); + const FileLocation *definitionFilename = GetDefinitionFilename (); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib $@ %s %s\n", @@ -2048,6 +2134,8 @@ backend->GetFullName ( *definitionFilename ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); + + delete definitionFilename; } fprintf ( fMakefile, "\t$(ECHO_AR)\n" ); @@ -2103,7 +2191,12 @@ if ( ReferenceObjects ( module ) ) return GetObjectsMacro ( module ); else - return backend->GetFullName ( *GetTargetFilename ( module, NULL ) ).c_str (); + { + const FileLocation *target_file = GetTargetFilename ( module, NULL ); + string target = backend->GetFullName ( *target_file ).c_str (); + delete target_file; + return target; + } } void @@ -2161,11 +2254,23 @@ { string basename = GetBasename ( sourceFile->name ); if ( library.importedModule->type == RpcServer ) - dependencies.push_back ( *GetRpcServerHeaderFilename ( sourceFile ) ); + { + const FileLocation *header = GetRpcServerHeaderFilename ( sourceFile ); + dependencies.push_back ( *header ); + delete header; + } if ( library.importedModule->type == RpcClient ) - dependencies.push_back ( *GetRpcClientHeaderFilename ( sourceFile ) ); + { + const FileLocation *header = GetRpcClientHeaderFilename ( sourceFile ); + dependencies.push_back ( *header ); + delete header; + } if ( library.importedModule->type == IdlHeader ) - dependencies.push_back ( *GetIdlHeaderFilename ( sourceFile ) ); + { + const FileLocation *header = GetIdlHeaderFilename ( sourceFile ); + dependencies.push_back ( *header ); + delete header; + } } } } @@ -2351,6 +2456,7 @@ { const FileLocation* ar_target = GenerateArchiveTarget ( ar, objectsMacro ); CLEAN_FILE ( *ar_target ); + delete ar_target; } GenerateObjectFileTargets ( cc, @@ -2511,6 +2617,7 @@ return ( index != string::npos ); } +/* caller needs to delete the returned object */ const FileLocation* MingwModuleHandler::GetDefinitionFilename () const { @@ -2540,7 +2647,7 @@ vector<FileLocation> deps; GetDefinitionDependencies ( deps ); - + fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" ); fprintf ( fMakefile, "%s: %s", @@ -2553,7 +2660,7 @@ backend->GetFullName ( deps[i] ).c_str () ); fprintf ( fMakefile, " | %s\n", - backend->GetFullPath ( *GetImportLibraryFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *library_target ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); @@ -2564,6 +2671,9 @@ backend->GetFullName ( *library_target ).c_str (), module.mangledSymbols ? "" : "--kill-at", module.underscoreSymbols ? "--add-underscore" : "" ); + + delete defFilename; + delete library_target; } } @@ -2609,12 +2719,15 @@ const FileLocation *file ) const { string basename = GetBasename ( file->name ); + const FileLocation *generatedHeaderFilename = GetRpcServerHeaderFilename ( file ); FileLocation serverSourceDependency ( IntermediateDirectory, file->relative_path, basename + "_s.c" ); dependencies.push_back ( serverSourceDependency ); - dependencies.push_back ( *GetRpcServerHeaderFilename ( file ) ); + dependencies.push_back ( *generatedHeaderFilename ); + + delete generatedHeaderFilename; } void @@ -2692,11 +2805,12 @@ else linker = "${host_gcc}"; + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); fprintf ( fMakefile, "\t%s %s -o $@ %s %s\n\n", @@ -2704,6 +2818,8 @@ GetLinkerMacro ().c_str (), objectsMacro.c_str (), libsMacro.c_str () ); + + delete target_file; } @@ -3359,11 +3475,12 @@ GenerateRules (); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); @@ -3380,6 +3497,8 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", backend->GetFullName ( junk_tmp ).c_str () ); + + delete target_file; } @@ -3449,12 +3568,13 @@ GenerateRules (); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), payload->name.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); @@ -3484,6 +3604,8 @@ backend->GetFullName ( junk_tmp ).c_str (), backend->GetFullName ( junk_elf ).c_str (), backend->GetFullName ( junk_cpy ).c_str () ); + + delete target_file; } @@ -3883,6 +4005,7 @@ GenerateTestModuleTarget (); } +/* caller needs to delete the returned object */ void MingwTestModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { @@ -4003,11 +4126,12 @@ GenerateRules (); + const FileLocation *target_file = GetTargetFilename ( module, NULL ); fprintf ( fMakefile, "%s: %s %s | %s\n", targetMacro.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str (), - backend->GetFullPath ( *GetTargetFilename ( module, NULL ) ).c_str () ); + backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); @@ -4016,4 +4140,6 @@ objectsMacro.c_str(), libsMacro.c_str(), targetMacro.c_str () ); -} + + delete target_file; +}

1 0

[mpiulachs] 31561: - Fix typo
by mpiulachs＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: mpiulachs Date: Wed Jan 2 16:50:37 2008 New Revision: 31561 URL: http://svn.reactos.org/svn/reactos?rev=31561&view=rev Log: - Fix typo Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Wed Jan 2 16:50:37 2008 @@ -6,7 +6,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -52,7 +52,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -128,7 +128,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -228,7 +228,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -352,7 +352,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -445,7 +445,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -514,7 +514,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -566,7 +566,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -606,7 +606,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -652,7 +652,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -703,7 +703,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -749,7 +749,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -796,7 +796,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -854,7 +854,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -888,7 +888,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -940,7 +940,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -980,7 +980,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1026,7 +1026,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1078,7 +1078,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1131,7 +1131,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1160,7 +1160,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1207,7 +1207,7 @@ { 4, 3, - "Installation de ReactOS " KERNEL_VERSION_STR " ", + " Installation de ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { @@ -1449,8 +1449,8 @@ frFRLanguagePageEntries }, { - START_PAGE, - frFRWelcomePageEntries + START_PAGE, + frFRWelcomePageEntries }, { INSTALL_INTRO_PAGE,

1 0

[fireball] 31560: - Use IopOpenRegistryKeyEx() to reduce code size and improve readability.
by fireball＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: fireball Date: Wed Jan 2 16:33:40 2008 New Revision: 31560 URL: http://svn.reactos.org/svn/reactos?rev=31560&view=rev Log: - Use IopOpenRegistryKeyEx() to reduce code size and improve readability. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c 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 Wed Jan 2 16:33:40 2008 @@ -270,7 +270,6 @@ ULONG ServiceStart; UNICODE_STRING ServiceImagePath, CCSName; NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; HANDLE CCSKey, ServiceKey; DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); @@ -282,13 +281,7 @@ /* Open CurrentControlSet */ RtlInitUnicodeString(&CCSName, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - InitializeObjectAttributes(&ObjectAttributes, - &CCSName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&CCSKey, KEY_READ, &ObjectAttributes); - + Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -296,12 +289,7 @@ } /* Open service key */ - InitializeObjectAttributes(&ObjectAttributes, - ServiceName, - OBJ_CASE_INSENSITIVE, - CCSKey, - NULL); - Status = ZwOpenKey(&ServiceKey, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -572,7 +560,6 @@ BOOLEAN Lower) { RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; - OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Class; WCHAR ClassBuffer[40]; UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); @@ -580,13 +567,8 @@ NTSTATUS Status; /* Open enumeration root key */ - InitializeObjectAttributes(&ObjectAttributes, - &EnumRoot, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&EnumRootKey, KEY_READ, &ObjectAttributes); - + Status = IopOpenRegistryKeyEx(&EnumRootKey, NULL, + &EnumRoot, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -594,12 +576,8 @@ } /* Open subkey */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceNode->InstancePath, - OBJ_CASE_INSENSITIVE, - EnumRootKey, - NULL); - Status = ZwOpenKey(&SubKey, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&SubKey, EnumRootKey, + &DeviceNode->InstancePath, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -649,17 +627,12 @@ /* * Load the class filter driver */ - if (NT_SUCCESS(Status)) { UNICODE_STRING ControlClass = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class"); - InitializeObjectAttributes(&ObjectAttributes, - &ControlClass, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&EnumRootKey, KEY_READ, &ObjectAttributes); - + + Status = IopOpenRegistryKeyEx(&EnumRootKey, NULL, + &ControlClass, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); @@ -667,12 +640,8 @@ } /* Open subkey */ - InitializeObjectAttributes(&ObjectAttributes, - &Class, - OBJ_CASE_INSENSITIVE, - EnumRootKey, - NULL); - Status = ZwOpenKey(&SubKey, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&SubKey, EnumRootKey, + &Class, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Jan 2 16:33:40 2008 @@ -408,7 +408,6 @@ LPCWSTR RegistryPropertyName; UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); UNICODE_STRING ValueName; - OBJECT_ATTRIBUTES ObjectAttributes; KEY_VALUE_PARTIAL_INFORMATION *ValueInformation; ULONG ValueInformationLength; HANDLE KeyHandle, EnumRootHandle; @@ -445,9 +444,8 @@ DPRINT("Registry property %S\n", RegistryPropertyName); /* Open Enum key */ - InitializeObjectAttributes(&ObjectAttributes, &EnumRoot, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&EnumRootHandle, 0, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&EnumRootHandle, NULL, + &EnumRoot, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("Error opening ENUM_ROOT, Status=0x%08x\n", Status); @@ -455,13 +453,12 @@ } /* Open instance key */ - InitializeObjectAttributes(&ObjectAttributes, &DeviceNode->InstancePath, - OBJ_CASE_INSENSITIVE, EnumRootHandle, NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&KeyHandle, EnumRootHandle, + &DeviceNode->InstancePath, KEY_READ); if (!NT_SUCCESS(Status)) { DPRINT1("Error opening InstancePath, Status=0x%08x\n", Status); + ZwClose(EnumRootHandle); return Status; } @@ -686,10 +683,7 @@ /* * Open the base key. */ - - InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(DevInstRegKey, DesiredAccess, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(DevInstRegKey, NULL, &KeyName, DesiredAccess); if (!NT_SUCCESS(Status)) { DPRINT1("IoOpenDeviceRegistryKey(%wZ): Base key doesn't exist, exiting... (Status 0x%08lx)\n", &KeyName, Status); @@ -1100,14 +1094,7 @@ *Handle = NULL; /* Open root key for device instances */ - InitializeObjectAttributes(&ObjectAttributes, - &EnumU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&hParent, - KEY_CREATE_SUB_KEY, - &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hParent, NULL, &EnumU, KEY_CREATE_SUB_KEY); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey('%wZ') failed with status 0x%08lx\n", &EnumU, Status); @@ -1611,7 +1598,6 @@ UNICODE_STRING KeyName; UNICODE_STRING KeyValue; UNICODE_STRING ValueName; - OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hKey = NULL; ULONG crc32; NTSTATUS Status; @@ -1643,8 +1629,7 @@ wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); RtlInitUnicodeString(&KeyName, KeyNameBuffer); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hKey, NULL, &KeyName, KEY_QUERY_VALUE | KEY_SET_VALUE); if (!NT_SUCCESS(Status)) goto cleanup; RtlInitUnicodeString(&ValueName, L"ParentIdPrefix"); @@ -2704,8 +2689,7 @@ if (RelativePath) { - InitializeObjectAttributes(&ObjectAttributes, RelativePath, OBJ_KERNEL_HANDLE, hBaseKey, NULL); - Status = ZwOpenKey(&hDevicesKey, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hDevicesKey, hBaseKey, RelativePath, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); @@ -2759,11 +2743,9 @@ /* Open device key */ DeviceName.Length = DeviceName.MaximumLength = (USHORT)pDeviceInformation->NameLength; DeviceName.Buffer = pDeviceInformation->Name; - InitializeObjectAttributes(&ObjectAttributes, &DeviceName, OBJ_KERNEL_HANDLE, hDevicesKey, NULL); - Status = ZwOpenKey( - &hDeviceKey, - KEY_QUERY_VALUE + (EnumerateSubKeys ? KEY_ENUMERATE_SUB_KEYS : 0), - &ObjectAttributes); + + Status = IopOpenRegistryKeyEx(&hDeviceKey, hDevicesKey, &DeviceName, + KEY_QUERY_VALUE + (EnumerateSubKeys ? KEY_ENUMERATE_SUB_KEYS : 0)); if (!NT_SUCCESS(Status)) { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); @@ -3281,8 +3263,7 @@ } else { - InitializeObjectAttributes(&ObjectAttributes, &MultiKeyPathU, OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hEnum, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&hEnum, NULL, &MultiKeyPathU, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { /* Nothing to do, don't return with an error status */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Wed Jan 2 16:33:40 2008 @@ -280,7 +280,6 @@ IN PDEVICE_OBJECT DeviceObject) { PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - OBJECT_ATTRIBUTES ObjectAttributes; PKEY_BASIC_INFORMATION KeyInfo = NULL, SubKeyInfo = NULL; UNICODE_STRING LegacyU = RTL_CONSTANT_STRING(L"LEGACY_"); UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM L"\\" REGSTR_KEY_ROOTENUM); @@ -318,17 +317,10 @@ goto cleanup; } - InitializeObjectAttributes( - &ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&KeyHandle, NULL, &KeyName, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyName, Status); + DPRINT("IopOpenRegistryKeyEx(%wZ) failed with status 0x%08lx\n", &KeyName, Status); goto cleanup; } @@ -370,16 +362,10 @@ } /* Open the key */ - InitializeObjectAttributes( - &ObjectAttributes, - &SubKeyName, - 0, /* Attributes */ - KeyHandle, - NULL); /* Security descriptor */ - Status = ZwOpenKey(&SubKeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&SubKeyHandle, KeyHandle, &SubKeyName, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + DPRINT("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); break; } @@ -438,16 +424,10 @@ } /* Open registry key to fill other informations */ - InitializeObjectAttributes( - &ObjectAttributes, - &Device->InstanceID, - 0, /* Attributes */ - SubKeyHandle, - NULL); /* Security descriptor */ - Status = ZwOpenKey(&DeviceKeyHandle, KEY_READ, &ObjectAttributes); + Status = IopOpenRegistryKeyEx(&DeviceKeyHandle, SubKeyHandle, &Device->InstanceID, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + DPRINT("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); break; }

1 0

[pschweitzer] 31559: [FORMATTING] Fix indentation
by pschweitzer＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: pschweitzer Date: Wed Jan 2 14:04:48 2008 New Revision: 31559 URL: http://svn.reactos.org/svn/reactos?rev=31559&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c Wed Jan 2 14:04:48 2008 @@ -36,8 +36,8 @@ static NTSTATUS NtfsGetFsVolumeInformation(PDEVICE_OBJECT DeviceObject, - PFILE_FS_VOLUME_INFORMATION FsVolumeInfo, - PULONG BufferLength) + PFILE_FS_VOLUME_INFORMATION FsVolumeInfo, + PULONG BufferLength) { DPRINT("NtfsGetFsVolumeInformation() called\n"); DPRINT("FsVolumeInfo = %p\n", FsVolumeInfo); @@ -46,12 +46,12 @@ DPRINT("Vpb %p\n", DeviceObject->Vpb); DPRINT("Required length %lu\n", - sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength); + sizeof(FILE_FS_VOLUME_INFORMATION) + DeviceObject->Vpb->VolumeLabelLength); DPRINT("LabelLength %hu\n", - DeviceObject->Vpb->VolumeLabelLength); + DeviceObject->Vpb->VolumeLabelLength); DPRINT("Label %*.S\n", - DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), - DeviceObject->Vpb->VolumeLabel); + DeviceObject->Vpb->VolumeLabelLength / sizeof(WCHAR), + DeviceObject->Vpb->VolumeLabel); if (*BufferLength < sizeof(FILE_FS_VOLUME_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; @@ -63,8 +63,8 @@ FsVolumeInfo->VolumeSerialNumber = DeviceObject->Vpb->SerialNumber; FsVolumeInfo->VolumeLabelLength = DeviceObject->Vpb->VolumeLabelLength; memcpy(FsVolumeInfo->VolumeLabel, - DeviceObject->Vpb->VolumeLabel, - DeviceObject->Vpb->VolumeLabelLength); + DeviceObject->Vpb->VolumeLabel, + DeviceObject->Vpb->VolumeLabelLength); /* dummy entries */ FsVolumeInfo->VolumeCreationTime.QuadPart = 0; @@ -81,8 +81,8 @@ static NTSTATUS NtfsGetFsAttributeInformation(PDEVICE_EXTENSION DeviceExt, - PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, - PULONG BufferLength) + PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, + PULONG BufferLength) { DPRINT("NtfsGetFsAttributeInformation()\n"); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); @@ -113,8 +113,8 @@ static NTSTATUS NtfsGetFsSizeInformation(PDEVICE_OBJECT DeviceObject, - PFILE_FS_SIZE_INFORMATION FsSizeInfo, - PULONG BufferLength) + PFILE_FS_SIZE_INFORMATION FsSizeInfo, + PULONG BufferLength) { PDEVICE_EXTENSION DeviceExt; NTSTATUS Status = STATUS_SUCCESS; @@ -142,7 +142,7 @@ static NTSTATUS NtfsGetFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, - PULONG BufferLength) + PULONG BufferLength) { DPRINT("NtfsGetFsDeviceInformation()\n"); DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); @@ -167,7 +167,7 @@ NTSTATUS STDCALL NtfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { FS_INFORMATION_CLASS FsInformationClass; PIO_STACK_LOCATION Stack; @@ -186,33 +186,33 @@ DPRINT("SystemBuffer %p\n", SystemBuffer); switch (FsInformationClass) - { - case FileFsVolumeInformation: - Status = NtfsGetFsVolumeInformation(DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileFsAttributeInformation: - Status = NtfsGetFsAttributeInformation(DeviceObject->DeviceExtension, - SystemBuffer, - &BufferLength); - break; - - case FileFsSizeInformation: - Status = NtfsGetFsSizeInformation(DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileFsDeviceInformation: - Status = NtfsGetFsDeviceInformation(SystemBuffer, - &BufferLength); - break; - - default: - Status = STATUS_NOT_SUPPORTED; - } + { + case FileFsVolumeInformation: + Status = NtfsGetFsVolumeInformation(DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FileFsAttributeInformation: + Status = NtfsGetFsAttributeInformation(DeviceObject->DeviceExtension, + SystemBuffer, + &BufferLength); + break; + + case FileFsSizeInformation: + Status = NtfsGetFsSizeInformation(DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FileFsDeviceInformation: + Status = NtfsGetFsDeviceInformation(SystemBuffer, + &BufferLength); + break; + + default: + Status = STATUS_NOT_SUPPORTED; + } Irp->IoStatus.Status = Status; if (NT_SUCCESS(Status)) @@ -228,7 +228,7 @@ NTSTATUS STDCALL NtfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { DPRINT("NtfsSetVolumeInformation() called\n");

1 0

[greatlrd] 31558: implement DxEngIncDispUniq
by greatlrd＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: greatlrd Date: Wed Jan 2 13:19:56 2008 New Revision: 31558 URL: http://svn.reactos.org/svn/reactos?rev=31558&view=rev Log: implement DxEngIncDispUniq Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Wed Jan 2 13:19:56 2008 @@ -49,47 +49,27 @@ /************************************************************************/ /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ - -/* Notes : Check see if termal server got a connections or not */ BOOL DxEngNUIsTermSrv(); - -/* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ BOOL DxEngRedrawDesktop(); - -/* Notes : return the DisplayUniqVisrgn counter from gdishare memory */ ULONG DxEngDispUniq(); - -/* Notes : return the VisRgnUniq counter for win32k */ ULONG DxEngVisRgnUniq(); - -/* Notes : Enumate all drivers in win32k */ HDEV *DxEngEnumerateHdev(HDEV *hdev); - -/* Notes : same protypes NtGdiEngGetDeviceGammaRamp, diffent is we skipp the user mode checks and seh */ -BOOL -DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); - -/* Notes : Lock the hDC */ +BOOL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); PDC DxEngLockDC(HDC hDC); - -/* Notes : Unlock the hDC */ BOOL DxEngUnlockDC(PDC pDC); - -/* Notes : Set Gamma ramp */ BOOL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); - BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); DWORD DxEngGetHdevData(HDEV hdev, DWORD Index); BOOLEAN DxEngSetHdevData(HDEV hdev, DWORD Index, DWORD Save); +BOOLEAN DxEngIncDispUniq(); /* prototypes are not done yet, I need gather all my notes * to make them correct */ DWORD DxEngCreateMemoryDC(DWORD x1); DWORD DxEngScreenAccessCheck(); - DWORD DxEngLockHdev(DWORD x1); DWORD DxEngUnlockHdev(DWORD x1); DWORD DxEngReferenceHdev(DWORD x1); @@ -98,7 +78,6 @@ DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpSpritesVisible(DWORD x1); - DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngDeleteDC(DWORD x1, DWORD x2); DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); @@ -116,5 +95,5 @@ DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngGetRedirectionBitmap(DWORD x1); DWORD DxEngLoadImage(DWORD x1,DWORD x2); -DWORD DxEngIncDispUniq(); + Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Wed Jan 2 13:19:56 2008 @@ -89,11 +89,19 @@ } -/************************************************************************/ -/* DxEngDispUniq */ -/************************************************************************/ - -/* Notes : return the DisplayUniqVisrgn counter from gdishare memory */ +/*++ +* @name DxEngDispUniq +* @implemented +* +* The function DxEngDispUniq return the DisplayUniqVisrgn counter from gdishare memory +* +* @return +* return DisplayUniqVisrgn counter value from gdishare memory +* +* @remarks. +* none +* +*--*/ ULONG DxEngDispUniq() { @@ -633,13 +641,24 @@ return FALSE; } -/************************************************************************/ -/* DxEngIncDispUniq */ -/************************************************************************/ -DWORD DxEngIncDispUniq() -{ - UNIMPLEMENTED; - return FALSE; -} - - +/*++ +* @name DxEngIncDispUniq +* @implemented +* +* The function DxEngIncDispUniq incress DisplayUniqVisrgn counter from gdishare memory +* +* @return +* This function returns TRUE no matter what +* +* @remarks. +* none +* +*--*/ +BOOLEAN +DxEngIncDispUniq() +{ + InterlockedIncrement((LONG*)&GdiHandleTable->flDeviceUniq); + return TRUE; +} + +

1 0

[greatlrd] 31557: sorry a file been accent committed.
by greatlrd＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: greatlrd Date: Wed Jan 2 12:58:51 2008 New Revision: 31557 URL: http://svn.reactos.org/svn/reactos?rev=31557&view=rev Log: sorry a file been accent committed. Modified: trunk/reactos/drivers/directx/dxg/eng.c Modified: trunk/reactos/drivers/directx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/eng.c?… ============================================================================== --- trunk/reactos/drivers/directx/dxg/eng.c (original) +++ trunk/reactos/drivers/directx/dxg/eng.c Wed Jan 2 12:58:51 2008 @@ -45,117 +45,6 @@ return retVal; } -HANDLE -STDCALL -DxDdCreateDirectDrawObject(HDC hdc) -{ - HANDLE hDirectDraw = NULL; - DHPDEV hPdev; // PGDIDEVICE - ULONG iDitherFormat; - - DC *pDC; = gpEngFuncs[DXENG_INDEX_DxEngLockDC](); - - if (pDC != NULL) - { - hPdev = gpEngFuncs[DXENG_INDEX_DxEngGetDCState](hdc, 3); - - if (hPdev != 0) - { - /* Get DC display flag */ - if (gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev, 12)) - { - EDD_DEVLOCK(hdc, esi); - - if (!gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,19)) - { - CheckAgpHeaps( gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,7) ); - } - - iDitherFormat = gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,2); - - .text:00019FF1 cmp eax, 3 - .text:00019FF4 jb short loc_1A001 - - hDirectDraw = hDdCreateDirectDrawLocal(hPdev); - - loc_1A001: - if (hdc != NULL) - { - gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev](hdc); - } - } - } - - gpEngFuncs[DXENG_INDEX_DxEngUnlockDC](pDC); - } - - return hDirectDraw; - -} - - -int __stdcall hDdCreateDirectDrawLocal(HDEV hDEV) -{ - int v1; // eax@1 - int v2; // edi@1 - int result; // eax@2 - int v4; // ebx@2 - struct HDD_OBJ__ *v5; // eax@5 - struct HDD_OBJ__ *v6; // esi@5 - int v7; // eax@1 - int v8; // eax@6 - int v9; // eax@6 - int v10; // eax@6 - int _EAX; // eax@6 - signed int _ECX; // ecx@6 - int v18; // [sp+8h] [bp-4h]@1 - - v18 = 0; - v7 = gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,7); - v2 = v7; - v1 = *(_DWORD *)(v7 + 0x30); - if ( v1 ) - { - result = EngAllocMem(1, 4 * v1, 1885627463); - v4 = result; - if ( !result ) - return result; - } - else - { - v4 = 0; - } - v5 = DdHmgAlloc(0x54u, 1u, 1u); - v6 = v5; - if ( v5 ) - { - *((_DWORD *)v5 + 12) = *(_DWORD *)(v2 + 1448); - *(_DWORD *)(v2 + 1448) = v5; - *((_DWORD *)v5 + 8) = (char *)v5 + 28; - *((_DWORD *)v5 + 7) = (char *)v5 + 28; - *((_DWORD *)v5 + 9) = v2; - *((_DWORD *)v5 + 4) = v2; - v8 = PsGetCurrentThread(); - *((_DWORD *)v6 + 15) = PsGetThreadProcessId(v8); - v9 = PsGetCurrentProcess(); - *((_DWORD *)v6 + 19) = 0; - *((_DWORD *)v6 + 16) = v9; - v10 = a1; - *((_DWORD *)v6 + 17) = v4; - (*(int (__cdecl **)(_DWORD))(gpEngFuncs + 108))(*(_DWORD *)v10); - v18 = *(_DWORD *)v6; - _EAX = (int)((char *)v6 + 8); - _ECX = -1; - __asm { lock xadd [eax], ecx } - MapAllAgpHeaps(v6); - } - else - { - if ( v4 ) - EngFreeMem(v4); - } - return v18; -}

1 0

[greatlrd] 31556: partly implement DxEngSetHdevData fixed DxEngGetHdevData protoype as well
by greatlrd＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: greatlrd Date: Wed Jan 2 12:37:05 2008 New Revision: 31556 URL: http://svn.reactos.org/svn/reactos?rev=31556&view=rev Log: partly implement DxEngSetHdevData fixed DxEngGetHdevData protoype as well Modified: trunk/reactos/drivers/directx/dxg/eng.c trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/drivers/directx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/eng.c?… ============================================================================== --- trunk/reactos/drivers/directx/dxg/eng.c (original) +++ trunk/reactos/drivers/directx/dxg/eng.c Wed Jan 2 12:37:05 2008 @@ -45,6 +45,117 @@ return retVal; } +HANDLE +STDCALL +DxDdCreateDirectDrawObject(HDC hdc) +{ + HANDLE hDirectDraw = NULL; + DHPDEV hPdev; // PGDIDEVICE + ULONG iDitherFormat; + + DC *pDC; = gpEngFuncs[DXENG_INDEX_DxEngLockDC](); + + if (pDC != NULL) + { + hPdev = gpEngFuncs[DXENG_INDEX_DxEngGetDCState](hdc, 3); + + if (hPdev != 0) + { + /* Get DC display flag */ + if (gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev, 12)) + { + EDD_DEVLOCK(hdc, esi); + + if (!gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,19)) + { + CheckAgpHeaps( gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,7) ); + } + + iDitherFormat = gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,2); + + .text:00019FF1 cmp eax, 3 + .text:00019FF4 jb short loc_1A001 + + hDirectDraw = hDdCreateDirectDrawLocal(hPdev); + + loc_1A001: + if (hdc != NULL) + { + gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev](hdc); + } + } + } + + gpEngFuncs[DXENG_INDEX_DxEngUnlockDC](pDC); + } + + return hDirectDraw; + +} + + +int __stdcall hDdCreateDirectDrawLocal(HDEV hDEV) +{ + int v1; // eax@1 + int v2; // edi@1 + int result; // eax@2 + int v4; // ebx@2 + struct HDD_OBJ__ *v5; // eax@5 + struct HDD_OBJ__ *v6; // esi@5 + int v7; // eax@1 + int v8; // eax@6 + int v9; // eax@6 + int v10; // eax@6 + int _EAX; // eax@6 + signed int _ECX; // ecx@6 + int v18; // [sp+8h] [bp-4h]@1 + + v18 = 0; + v7 = gpEngFuncs[DXENG_INDEX_DxEngGetHdevData](hPdev,7); + v2 = v7; + v1 = *(_DWORD *)(v7 + 0x30); + if ( v1 ) + { + result = EngAllocMem(1, 4 * v1, 1885627463); + v4 = result; + if ( !result ) + return result; + } + else + { + v4 = 0; + } + v5 = DdHmgAlloc(0x54u, 1u, 1u); + v6 = v5; + if ( v5 ) + { + *((_DWORD *)v5 + 12) = *(_DWORD *)(v2 + 1448); + *(_DWORD *)(v2 + 1448) = v5; + *((_DWORD *)v5 + 8) = (char *)v5 + 28; + *((_DWORD *)v5 + 7) = (char *)v5 + 28; + *((_DWORD *)v5 + 9) = v2; + *((_DWORD *)v5 + 4) = v2; + v8 = PsGetCurrentThread(); + *((_DWORD *)v6 + 15) = PsGetThreadProcessId(v8); + v9 = PsGetCurrentProcess(); + *((_DWORD *)v6 + 19) = 0; + *((_DWORD *)v6 + 16) = v9; + v10 = a1; + *((_DWORD *)v6 + 17) = v4; + (*(int (__cdecl **)(_DWORD))(gpEngFuncs + 108))(*(_DWORD *)v10); + v18 = *(_DWORD *)v6; + _EAX = (int)((char *)v6 + 8); + _ECX = -1; + __asm { lock xadd [eax], ecx } + MapAllAgpHeaps(v6); + } + else + { + if ( v4 ) + EngFreeMem(v4); + } + return v18; +} Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Wed Jan 2 12:37:05 2008 @@ -81,6 +81,8 @@ BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); +DWORD DxEngGetHdevData(HDEV hdev, DWORD Index); +BOOLEAN DxEngSetHdevData(HDEV hdev, DWORD Index, DWORD Save); /* prototypes are not done yet, I need gather all my notes * to make them correct @@ -96,8 +98,7 @@ DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngSpSpritesVisible(DWORD x1); -DWORD DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl, DWORD Index); -DWORD DxEngSetHdevData(DWORD x1, DWORD x2, DWORD x3); + DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngDeleteDC(DWORD x1, DWORD x2); DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Wed Jan 2 12:37:05 2008 @@ -374,20 +374,49 @@ /* DxEngGetHdevData */ /************************************************************************/ DWORD -DxEngGetHdevData(PEDD_DIRECTDRAW_GLOBAL pEDDgpl, +DxEngGetHdevData(HDEV hdev, DWORD Index) { UNIMPLEMENTED; return 0; } -/************************************************************************/ -/* DxEngSetHdevData */ -/************************************************************************/ -DWORD DxEngSetHdevData(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; +/*++ +* @name DxEngSetHdevData +* @implemented +* +* The function DxEngSetHdevData sets a value in hdev + +* @param HDEV hPDev +* The hdev +* +* @param DWORD Index +* Support only Index 8 it is a internal counter how many time hdev been lock and unlock +* +* @param DWORD Save +* The value to be save to hdev internal counter +* +* @return +* Returns TRUE for success, FALSE for failure +* +* @remarks. +* ReactOS specfiy Not finish implement, I have not save the value into the hdev yet. +* +*--*/ +BOOLEAN +DxEngSetHdevData(HDEV hdev, + DWORD Index, + DWORD Save) +{ + BOOL retVal = FALSE; + if (Index == 8) + { + /* Counter how many time hdev been lock/unlock, we do not support it yet in ReactOS */ + DPRINT1("Warning not supproted yet\n"); + retVal = TRUE; + } + + return retVal; } /************************************************************************/

1 0

[greatlrd] 31555: fixed DxEngCleanDC protoype
by greatlrd＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: greatlrd Date: Wed Jan 2 12:13:51 2008 New Revision: 31555 URL: http://svn.reactos.org/svn/reactos?rev=31555&view=rev Log: fixed DxEngCleanDC protoype Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Wed Jan 2 12:13:51 2008 @@ -80,6 +80,7 @@ BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); +BOOLEAN DxEngCleanDC(HDC hdc); /* prototypes are not done yet, I need gather all my notes * to make them correct @@ -99,7 +100,6 @@ DWORD DxEngSetHdevData(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngDeleteDC(DWORD x1, DWORD x2); -DWORD DxEngCleanDC(DWORD x1); DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); DWORD DxEngGetDCState(HDC hDC, DWORD type); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Wed Jan 2 12:13:51 2008 @@ -411,7 +411,7 @@ /************************************************************************/ /* DxEngCleanDC */ /************************************************************************/ -DWORD DxEngCleanDC(DWORD x1) +BOOLEAN DxEngCleanDC(HDC hdc) { UNIMPLEMENTED; return FALSE;

1 0

[greatlrd] 31554: implement DxEngLockShareSem implement DxEngUnlockShareSem
by greatlrd＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: greatlrd Date: Wed Jan 2 11:47:46 2008 New Revision: 31554 URL: http://svn.reactos.org/svn/reactos?rev=31554&view=rev Log: implement DxEngLockShareSem implement DxEngUnlockShareSem Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Wed Jan 2 11:47:46 2008 @@ -78,13 +78,15 @@ /* Notes : Set Gamma ramp */ BOOL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); -/* prototypes are not done yet, I need gather all my notes - * to make them correct +BOOLEAN DxEngLockShareSem(); +BOOLEAN DxEngUnlockShareSem(); + +/* prototypes are not done yet, I need gather all my notes + * to make them correct */ DWORD DxEngCreateMemoryDC(DWORD x1); DWORD DxEngScreenAccessCheck(); -DWORD DxEngLockShareSem(); -DWORD DxEngUnlockShareSem(); + DWORD DxEngLockHdev(DWORD x1); DWORD DxEngUnlockHdev(DWORD x1); DWORD DxEngReferenceHdev(DWORD x1); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Wed Jan 2 11:47:46 2008 @@ -10,6 +10,7 @@ #include <w32k.h> #include <debug.h> +ERESOURCE ghsemShareDevLock; @@ -214,22 +215,57 @@ return FALSE; } -/************************************************************************/ -/* DxEngLockShareSem */ -/************************************************************************/ -DWORD DxEngLockShareSem() -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUnlockShareSem */ -/************************************************************************/ -DWORD DxEngUnlockShareSem() -{ - UNIMPLEMENTED; - return FALSE; +/*++ +* @name DxEngLockShareSem +* @implemented +* +* The function DxEngLockShareSem doing share lock of ghsemShareDevLock +* +* @return +* This function returns TRUE for susssess, or FALSE for fail, FALSE can only +* mean it being already lock. +* +* @remarks. +* it being use in diffent ntuser* functions and ntgdi* +* ReactOS specify it is not been inuse at moment +*SystemResourcesList +*--*/ +BOOLEAN +DxEngLockShareSem() +{ + BOOLEAN retVal = 0; + + if (ExIsResourceAcquiredExclusiveLite(&ghsemShareDevLock) == FALSE) + { + KeEnterCriticalRegion(); + retVal = ExAcquireResourceExclusiveLite(&ghsemShareDevLock, TRUE); + } + + return retVal; +} + +/*++ +* @name DxEngUnlockShareSem +* @implemented +* +* The function DxEngUnlockShareSem doing share unlock of ghsemShareDevLock +* +* @return +* This function returns TRUE no matter what +* +* @remarks. +* ReactOS specify it is not been inuse at moment +* +*--*/ +BOOLEAN +DxEngUnlockShareSem() +{ + if (ExIsResourceAcquiredExclusiveLite(&ghsemShareDevLock) == TRUE) + { + ExReleaseResourceLite(&ghsemShareDevLock); + KeLeaveCriticalRegion(); + } + return TRUE; } /************************************************************************/ @@ -415,9 +451,9 @@ * The DC handle * * @param DWORD type -* value 1 = Is DC fullscreen -* value 2 = Get Complexity of visible region. -* value 3 = Get Driver hdev, which is a pPDev. +* value 1 = Is DC fullscreen +* value 2 = Get Complexity of visible region. +* value 3 = Get Driver hdev, which is a pPDev. * * @return * Return one of the type values @@ -445,13 +481,13 @@ break; case 3: { - /* Return the HDEV of this DC. */ + /* Return the HDEV of this DC. */ retVal = (DWORD) pDC->pPDev; break; } default: /* if a valid type is not found, zero is returned */ - DPRINT1("Warning did not find type %d\n",type); + DPRINT1("Warning did not find type %d\n",type); break; } DC_UnlockDc(pDC);

1 0

[zguo] 31553: Completion of editing current documentation in dxg
by zguo＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: zguo Date: Wed Jan 2 08:44:59 2008 New Revision: 31553 URL: http://svn.reactos.org/svn/reactos?rev=31553&view=rev Log: Completion of editing current documentation in dxg Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c trunk/reactos/drivers/directx/dxg/historic.c Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/ddhmg.… ============================================================================== --- trunk/reactos/drivers/directx/dxg/ddhmg.c (original) +++ trunk/reactos/drivers/directx/dxg/ddhmg.c Wed Jan 2 08:44:59 2008 @@ -35,14 +35,14 @@ * @name DdHmgCreate * @implemented * -* The function DdHmgCreate is internal use in dxg.sys -* It Create all DX kernel object that is need it, for create DX object. +* The function DdHmgCreate is used internally in dxg.sys +* It creates all DX kernel objects that are need it for creation of DX objects. * * @return -* return FALSE for fail, return TRUE for sussess create DX object +* Return FALSE for failure and TRUE for success in creating the DX object * * @remarks. -* Only use internal in dxg.sys +* Only used internally in dxg.sys *--*/ BOOL FASTCALL @@ -81,14 +81,14 @@ * @name DdHmgDestroy * @implemented * -* The function DdHmgDestroy is internal use in dxg.sys -* It destore all DX kernel object +* The function DdHmgDestroy is used internally in dxg.sys +* It destroys all DX kernel objects * * @return -* return FALSE for fail or noting to destore, return TRUE for sussess destore all dx object +* Always returns true, as a failure here would result in a BSOD. * * @remarks. -* Only use internal in dxg.sys +* Only used internally in dxg.sys *--*/ BOOL FASTCALL @@ -118,29 +118,29 @@ * @name DdHmgLock * @implemented * -* The function DdHmgLock is internal use in dxg.sys -* it lock a Dx kernel object +* The function DdHmgLock is used internally in dxg.sys +* It locks a DX kernel object * * @param HANDLE DdHandle -* The handle we want lock +* The handle we want locked * * @param UCHAR ObjectType -* The type of the object we expected the handle contain -* value 0 is for getting ? -* value 1 is for getting EDD_DIRECTDRAW_LOCAL -* value 2 is for getting EDD_SURFACE -* value 3 is for getting ? -* value 4 is for getting EDD_VIDEOPORT -* value 5 is for getting EDD_MOTIONCOMP +* The type of the object we expected the handle to contain +* value 0 is for ? +* value 1 is for EDD_DIRECTDRAW_LOCAL +* value 2 is for EDD_SURFACE +* value 3 is for ? +* value 4 is for EDD_VIDEOPORT +* value 5 is for EDD_MOTIONCOMP * @param BOOLEAN LockOwned -* if it need be EngAcquireSemaphore or not +* If it needs to call EngAcquireSemaphore or not * * @return -* return a EDD_* object, or NULL depnes if it success or not. +* Returns an EDD_* object, or NULL if it fails * * @remarks. -* Only use internal in dxg.sys +* Only used internally in dxg.sys *--*/ PVOID FASTCALL Modified: trunk/reactos/drivers/directx/dxg/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/histor… ============================================================================== --- trunk/reactos/drivers/directx/dxg/historic.c (original) +++ trunk/reactos/drivers/directx/dxg/historic.c Wed Jan 2 08:44:59 2008 @@ -15,7 +15,7 @@ * @name DxDxgGenericThunk * @implemented * -* The function DxDxgGenericThunk redirect dx call to other thing. +* The function DxDxgGenericThunk redirects DirectX calls to other functions. * * @param ULONG_PTR ulIndex * The functions we want redirct @@ -36,10 +36,10 @@ * Unknown * * @return -* always return DDHAL_DRIVER_NOTHANDLED +* Always returns DDHAL_DRIVER_NOTHANDLED * * @remarks. -* This api are not longer use in Windows NT 2000/XP/2003 +* This function is no longer used in Windows NT 2000/XP/2003 * *--*/ DWORD @@ -59,7 +59,7 @@ * @name DxDdIoctl * @implemented * -* The function DxDdIoctl is the ioctl call to diffent dx functions +* The function DxDdIoctl is the ioctl call to diffent DirectX functions * * @param ULONG ulIoctl * The ioctl code that we want call to @@ -71,10 +71,10 @@ * The buffer size in bytes * * @return -* always return DDERR_UNSUPPORTED +* Always returns DDERR_UNSUPPORTED * * @remarks. -* This api are not longer use in Windows NT 2000/XP/2003 +* This function is no longer used in Windows NT 2000/XP/2003 * *--*/ DWORD

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