Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[hpoussin] 32528: Prevent passing of useless parameters Decide how to compile a file at last moment, in GenerateGccCommand() Fix a memory leak

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Feb 29 14:33:34 2008 New Revision: 32528 URL: http://svn.reactos.org/svn/reactos?rev=32528&view=rev Log: Prevent passing of useless parameters Decide how to compile a file at last moment, in GenerateGccCommand() Fix a memory leak Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 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 Fri Feb 29 14:33:34 2008 @@ -855,7 +855,7 @@ if ( generatingCompilerMacro ) { - string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags , CompilerTypeDontCare ); + string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags, CompilerTypeDontCare ); if ( compilerParameters.size () > 0 ) { fprintf ( @@ -1249,6 +1249,12 @@ ReplaceExtension ( module.pch->file.name, "_" + module.name + ".gch" ) ); } +Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); +Rule arRule2 ( "\t$(ECHO_AR)\n" + "\t${ar} -rc $@ $($(module_name)_OBJS)\n", + NULL ); Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) $(module_rbuild) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(module_name)_CFLAGS)\n", @@ -1316,18 +1322,39 @@ void MingwModuleHandler::GenerateGccCommand ( const FileLocation* sourceFile, - const string& extraDependencies, - const string& cc, - const string& cflagsMacro ) + const string& extraDependencies ) { const FileLocation *generatedSourceFileName = GetActualSourceFilename ( sourceFile ); const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); string dependencies = backend->GetFullName ( *generatedSourceFileName ); + delete generatedSourceFileName; + + string cc; + CompilerType type; + string extension = GetExtension ( *sourceFile ); + if ( extension == ".cc" || extension == ".cpp" || extension == ".cxx" ) + { + cc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); + type = CompilerTypeCPP; + } + else + { + cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); + type = CompilerTypeCC; + } + string flags = GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, type ); + if ( flags != "" ) + flags = cflagsMacro + " " + flags; + else + flags = cflagsMacro; if ( extraDependencies != "" ) dependencies += " " + extraDependencies; if ( pchFilename ) + { dependencies += " " + backend->GetFullName ( *pchFilename ); + delete pchFilename; + } /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; @@ -1336,22 +1363,20 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, module, &clean_files ); + sourceFile, module, NULL ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *objectFilename ).c_str (), dependencies.c_str (), backend->GetFullPath ( *objectFilename ).c_str () ); + CLEAN_FILE(*objectFilename); + delete objectFilename; + fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, "\t%s -c $< -o $@ %s\n", cc.c_str (), - cflagsMacro.c_str () ); - - delete objectFilename; - delete generatedSourceFileName; - if ( pchFilename ) - delete pchFilename; + flags.c_str () ); } string @@ -1409,13 +1434,7 @@ void MingwModuleHandler::GenerateCommands ( const CompilationUnit& compilationUnit, - const string& extraDependencies, - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro, - const string& widlflagsMacro ) + const string& extraDependencies ) { const FileLocation& sourceFile = compilationUnit.GetFilename (); string extension = GetExtension ( sourceFile ); @@ -1458,40 +1477,21 @@ if ( customRule ) customRule->Execute ( fMakefile, backend, module, &sourceFile, clean_files ); - string flags = cflagsMacro; - flags += " "; - if ( extension == ".c" ) - { - flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , CompilerTypeCC ); + if ( extension == ".c" || extension == ".cc" || extension == ".cpp" || extension == ".cxx" ) + { GenerateGccCommand ( &sourceFile, - GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, - cc, - flags ); - } - else if ( extension == ".cc" || - extension == ".cpp" || - extension == ".cxx" ) - { - flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , CompilerTypeCPP ); + GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies ); + } + else if ( extension == ".spec" ) + { GenerateGccCommand ( &sourceFile, - GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies, - cppc, - flags ); - } - else if ( extension == ".spec" ) + extraDependencies ); + } + else if ( extension == ".idl" && + ( module.type == RpcServer ) || ( module.type == RpcClient ) || ( module.type == RpcProxy ) ) { GenerateGccCommand ( &sourceFile, - extraDependencies, - cc, - cflagsMacro ); - } - else if ( extension == ".idl" && - (module.type == RpcServer) || (module.type == RpcClient) || (module.type == RpcProxy) ) - { - GenerateGccCommand ( &sourceFile, - GetExtraDependencies ( &sourceFile ), - cc, - cflagsMacro ); + GetExtraDependencies ( &sourceFile ) ); } else if ( !customRule ) { @@ -1761,14 +1761,7 @@ } void -MingwModuleHandler::GenerateObjectFileTargets ( - const IfableData& data, - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro, - const string& widlflagsMacro ) +MingwModuleHandler::GenerateObjectFileTargets ( const IfableData& data ) { size_t i; string moduleDependencies; @@ -1789,13 +1782,7 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { GenerateCommands ( *compilationUnits[i], - moduleDependencies, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + moduleDependencies ); fprintf ( fMakefile, "\n" ); } @@ -1803,13 +1790,7 @@ const vector<If*>& ifs = data.ifs; for ( i = 0; i < ifs.size(); i++ ) { - GenerateObjectFileTargets ( ifs[i]->data, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + GenerateObjectFileTargets ( ifs[i]->data ); } vector<CompilationUnit*> sourceCompilationUnits; @@ -1817,37 +1798,24 @@ for ( i = 0; i < sourceCompilationUnits.size (); i++ ) { GenerateCommands ( *sourceCompilationUnits[i], - moduleDependencies, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + moduleDependencies ); } CleanupCompilationUnitVector ( sourceCompilationUnits ); } void -MingwModuleHandler::GenerateObjectFileTargets ( - const string& cc, - const string& cppc, - const string& cflagsMacro, - const string& nasmflagsMacro, - const string& windresflagsMacro, - const string& widlflagsMacro ) +MingwModuleHandler::GenerateObjectFileTargets () { const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); if ( pchFilename ) { + string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); + string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); + const FileLocation& baseHeaderFile = module.pch->file; CLEAN_FILE ( *pchFilename ); string dependencies = backend->GetFullName ( baseHeaderFile ); - string flags = cflagsMacro; - CompilerType type = module.cplusplus ? CompilerTypeCPP : CompilerTypeCC; - flags += " "; - flags += GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags , type ); /* WIDL generated headers may be used */ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); @@ -1862,33 +1830,22 @@ "\t%s -o %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), - flags.c_str(), + cflagsMacro.c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; } - GenerateObjectFileTargets ( module.non_if_data, - cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + GenerateObjectFileTargets ( module.non_if_data ); fprintf ( fMakefile, "\n" ); } /* caller needs to delete the returned object */ const FileLocation* -MingwModuleHandler::GenerateArchiveTarget ( const string& ar, - const string& objs_macro ) const +MingwModuleHandler::GenerateArchiveTarget () { const FileLocation *archiveFilename = GetModuleArchiveFilename (); - fprintf ( fMakefile, - "%s: %s | %s\n", - backend->GetFullName ( *archiveFilename ).c_str (), - objs_macro.c_str (), - backend->GetFullPath ( *archiveFilename ).c_str() ); + arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files ); if ( module.type == StaticLibrary && module.importLibrary ) { @@ -1904,12 +1861,7 @@ delete definitionFilename; } - fprintf ( fMakefile, "\t$(ECHO_AR)\n" ); - - fprintf ( fMakefile, - "\t%s -rc $@ %s\n", - ar.c_str (), - objs_macro.c_str ()); + arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_files ); GenerateCleanObjectsAsYouGoCode (); @@ -2201,10 +2153,6 @@ void MingwModuleHandler::GenerateRules () { - string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" ); - string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" ); - string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" ); - string targetMacro = GetTargetMacro ( module ); //CLEAN_FILE ( targetMacro ); CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) ); @@ -2227,17 +2175,11 @@ if ( !ReferenceObjects ( module ) ) { - const FileLocation* ar_target = GenerateArchiveTarget ( ar, objectsMacro ); - CLEAN_FILE ( *ar_target ); + const FileLocation* ar_target = GenerateArchiveTarget (); delete ar_target; } - GenerateObjectFileTargets ( cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + GenerateObjectFileTargets (); } void 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 Fri Feb 29 14:33:34 2008 @@ -152,32 +152,12 @@ std::string GenerateNasmParameters () const; const FileLocation* GetPrecompiledHeaderFilename () const; void GenerateGccCommand ( const FileLocation* sourceFile, - const std::string& extraDependencies, - const std::string& cc, - const std::string& cflagsMacro ); + const std::string& extraDependencies ); void GenerateCommands ( const CompilationUnit& compilationUnit, - const std::string& extraDependencies, - const std::string& cc, - const std::string& cppc, - const std::string& cflagsMacro, - const std::string& nasmflagsMacro, - const std::string& windresflagsMacro, - const std::string& widlflagsMacro ); - void GenerateObjectFileTargets ( const IfableData& data, - const std::string& cc, - const std::string& cppc, - const std::string& cflagsMacro, - const std::string& nasmflagsMacro, - const std::string& windresflagsMacro, - const std::string& widlflagsMacro ); - void GenerateObjectFileTargets ( const std::string& cc, - const std::string& cppc, - const std::string& cflagsMacro, - const std::string& nasmflagsMacro, - const std::string& windresflagsMacro, - const std::string& widlflagsMacro ); - const FileLocation* GenerateArchiveTarget ( const std::string& ar, - const std::string& objs_macro ) const; + const std::string& extraDependencies ); + void GenerateObjectFileTargets ( const IfableData& data ); + void GenerateObjectFileTargets (); + const FileLocation* GenerateArchiveTarget (); void GetMcObjectDependencies ( std::vector<FileLocation>& dependencies, const FileLocation *file ) const; void GetSpecObjectDependencies ( std::vector<FileLocation>& dependencies,

16 years, 7 months

[fireball] 32527: - Fix memory corruption, thanks to Alex for reporting.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Feb 29 12:43:36 2008 New Revision: 32527 URL: http://svn.reactos.org/svn/reactos?rev=32527&view=rev Log: - Fix memory corruption, thanks to Alex for reporting. Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c Fri Feb 29 12:43:36 2008 @@ -88,6 +88,7 @@ /* All lists failed, use the pool */ List->L.FreeMisses++; ExFreePool(Packet); + return; } }

16 years, 7 months

[fireball] 32526: Samuel Serapion <samcharly@hotmail.com> - Make the ext2 dbgprint not annoying.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 28 17:51:41 2008 New Revision: 32526 URL: http://svn.reactos.org/svn/reactos?rev=32526&view=rev Log: Samuel Serapion <samcharly(a)hotmail.com> - Make the ext2 dbgprint not annoying. Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Thu Feb 28 17:51:41 2008 @@ -185,15 +185,14 @@ { \ if( ( TYPE ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ - DbgPrint(" "); \ + if( ( DEBUG_TRACE_LINENO ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ + { \ + DbgPrint("(%s:%ld) ", __FILE__, __LINE__ ); \ + } \ DbgPrint(X,Y); \ if( ( DEBUG_TRACE_IRQL ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ { \ - DbgPrint( " IRQL = %d ", KeGetCurrentIrql( ) ); \ - } \ - if( ( DEBUG_TRACE_LINENO ) & ( PERMITTED_DEBUG_TRACE_TYPES ) ) \ - { \ - DbgPrint( " [%s] Line No = %ld", __FILE__, __LINE__ ); \ + DbgPrint( ",IRQL = %d ", KeGetCurrentIrql( ) ); \ } \ DbgPrint("\n"); \ } \

16 years, 7 months

[hpoussin] 32525: Use a generic .spec file, instead of a .def file per architecture

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Feb 28 17:13:07 2008 New Revision: 32525 URL: http://svn.reactos.org/svn/reactos?rev=32525&view=rev Log: Use a generic .spec file, instead of a .def file per architecture Added: trunk/reactos/drivers/base/kdcom/kdcom.spec (with props) Removed: trunk/reactos/drivers/base/kdcom/kdcom_arm.def trunk/reactos/drivers/base/kdcom/kdcom_i386.def Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Thu Feb 28 17:13:07 2008 @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> - <importlibrary definition="kdcom_$(ARCH).def"></importlibrary> + <importlibrary definition="kdcom.spec.def"></importlibrary> <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> <include base="kdcom">.</include> <library>ntoskrnl</library> <library>hal</library> <file>kdbg.c</file> + <file>kdcom.spec</file> </module> Added: trunk/reactos/drivers/base/kdcom/kdcom.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.s… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.spec (added) +++ trunk/reactos/drivers/base/kdcom/kdcom.spec Thu Feb 28 17:13:07 2008 @@ -1,0 +1,21 @@ +; Old KD +@ stdcall KdPortGetByte(ptr) +@ stdcall KdPortGetByteEx(ptr ptr) +@ stdcall KdPortInitialize(ptr long long) +@ stdcall KdPortInitializeEx(ptr long long) +@ stdcall KdPortPollByte(ptr) +@ stdcall KdPortPollByteEx(ptr ptr) +@ stdcall KdPortPutByte(long) +@ stdcall KdPortPutByteEx(ptr long) +@ stdcall KdPortRestore() +@ stdcall KdPortSave() +@ stdcall KdPortDisableInterrupts() +@ stdcall KdPortEnableInterrupts() + +; New KD +@ stdcall KdDebuggerInitialize0(ptr) +@ stdcall KdDebuggerInitialize1(ptr) +@ stdcall KdSave(long) +@ stdcall KdRestore(long) +@ stdcall KdReceivePacket(long ptr ptr ptr ptr) +@ stdcall KdSendPacket(long ptr ptr ptr) Propchange: trunk/reactos/drivers/base/kdcom/kdcom.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/base/kdcom/kdcom_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom_a… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom_arm.def (original) +++ trunk/reactos/drivers/base/kdcom/kdcom_arm.def (removed) @@ -1,24 +1,0 @@ -LIBRARY kdcom.dll -EXPORTS - -; Old KD -KdPortGetByte -KdPortGetByteEx -KdPortInitialize -KdPortInitializeEx -KdPortPollByte -KdPortPollByteEx -KdPortPutByte -KdPortPutByteEx -KdPortRestore -KdPortSave -KdPortDisableInterrupts -KdPortEnableInterrupts - -; New KD -KdDebuggerInitialize0 -KdDebuggerInitialize1 -KdSave -KdRestore -KdReceivePacket -KdSendPacket Removed: trunk/reactos/drivers/base/kdcom/kdcom_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom_i… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom_i386.def (original) +++ trunk/reactos/drivers/base/kdcom/kdcom_i386.def (removed) @@ -1,24 +1,0 @@ -LIBRARY kdcom.dll -EXPORTS - -; Old KD -KdPortGetByte@4 -KdPortGetByteEx@8 -KdPortInitialize@12 -KdPortInitializeEx@12 -KdPortPollByte@4 -KdPortPollByteEx@8 -KdPortPutByte@4 -KdPortPutByteEx@8 -KdPortRestore@0 -KdPortSave@0 -KdPortDisableInterrupts@0 -KdPortEnableInterrupts@0 - -; New KD -KdDebuggerInitialize0@4 -KdDebuggerInitialize1@4 -KdSave@4 -KdRestore@4 -KdReceivePacket@20 -KdSendPacket@16

16 years, 7 months

[fireball] 32524: - Fix coding style in some places.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 28 17:05:47 2008 New Revision: 32524 URL: http://svn.reactos.org/svn/reactos?rev=32524&view=rev Log: - Fix coding style in some places. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Thu Feb 28 17:05:47 2008 @@ -160,6 +160,8 @@ { PUSHORT LdtDescriptor; ULONG LdtBase; + PULONG Pde; + PULONG PageDir; ULONG i, j; DPRINT("Mmi386ReleaseMmInfo(Process %x)\n",Process); @@ -176,9 +178,6 @@ ExFreePool((PVOID) LdtBase); } - - PULONG Pde; - PULONG PageDir; PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart)); for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++) { @@ -250,6 +249,7 @@ NTSTATUS Status; ULONG i, j; PFN_TYPE Pfn[2]; + PULONG PageDirectory; DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); @@ -267,7 +267,6 @@ } } - PULONG PageDirectory; PageDirectory = MmCreateHyperspaceMapping(Pfn[0]); memcpy(PageDirectory + ADDR_TO_PDE_OFFSET(MmSystemRangeStart), @@ -317,6 +316,7 @@ PEPROCESS CurrentProcess = PsGetCurrentProcess(); ULONG i; PFN_TYPE Pfn; + PULONG PageTable; DPRINT("ProcessId %d, Address %x\n", Process->UniqueProcessId, Address); if (Process != NULL && Process != CurrentProcess) @@ -324,7 +324,6 @@ KeAttachProcess(&Process->Pcb); } - PULONG PageTable; PageTable = (PULONG)PAGE_ROUND_DOWN((PVOID)ADDR_TO_PTE(Address)); for (i = 0; i < 1024; i++) { @@ -564,11 +563,11 @@ { BOOLEAN WasValid = FALSE; PFN_TYPE Pfn; + ULONG Pte; + PULONG Pt; DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", Process, Address, FreePage, WasDirty, Page); - ULONG Pte; - PULONG Pt; Pt = MmGetPageTableForProcess(Process, Address, FALSE); @@ -718,84 +717,85 @@ NTAPI MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) { - if (Address < MmSystemRangeStart && Process == NULL) - { - DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n"); - KEBUGCHECK(0); - } - + PULONG Pt; + ULONG Pte; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n"); + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte)); + + if (Pte & PA_ACCESSED) + { + MiFlushTlb(Pt, Address); + return TRUE; + } + else + { + MmUnmapPageTable(Pt); + return FALSE; + } +} + +VOID +NTAPI +MmSetCleanPage(PEPROCESS Process, PVOID Address) +{ + PULONG Pt; + ULONG Pte; + + if (Address < MmSystemRangeStart && Process == NULL) + { + DPRINT1("MmSetCleanPage is called for user space without a process.\n"); + KEBUGCHECK(0); + } + + Pt = MmGetPageTableForProcess(Process, Address, FALSE); + + if (Pt == NULL) + { + KEBUGCHECK(0); + } + + do + { + Pte = *Pt; + } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_DIRTY, Pte)); + + if (Pte & PA_DIRTY) + { + MiFlushTlb(Pt, Address); + } + else + { + MmUnmapPageTable(Pt); + } +} + +VOID +NTAPI +MmSetDirtyPage(PEPROCESS Process, PVOID Address) +{ PULONG Pt; ULONG Pte; - Pt = MmGetPageTableForProcess(Process, Address, FALSE); - if (Pt == NULL) - { - KEBUGCHECK(0); - } - - do - { - Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_ACCESSED, Pte)); - - if (Pte & PA_ACCESSED) - { - MiFlushTlb(Pt, Address); - return TRUE; - } - else - { - MmUnmapPageTable(Pt); - return FALSE; - } -} - -VOID -NTAPI -MmSetCleanPage(PEPROCESS Process, PVOID Address) -{ - if (Address < MmSystemRangeStart && Process == NULL) - { - DPRINT1("MmSetCleanPage is called for user space without a process.\n"); - KEBUGCHECK(0); - } - - PULONG Pt; - ULONG Pte; - - Pt = MmGetPageTableForProcess(Process, Address, FALSE); - - if (Pt == NULL) - { - KEBUGCHECK(0); - } - - do - { - Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_DIRTY, Pte)); - - if (Pte & PA_DIRTY) - { - MiFlushTlb(Pt, Address); - } - else - { - MmUnmapPageTable(Pt); - } -} - -VOID -NTAPI -MmSetDirtyPage(PEPROCESS Process, PVOID Address) -{ if (Address < MmSystemRangeStart && Process == NULL) { DPRINT1("MmSetDirtyPage is called for user space without a process.\n"); KEBUGCHECK(0); } - PULONG Pt; - ULONG Pte; Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) @@ -871,6 +871,8 @@ ULONG i; PVOID Addr; ULONG PdeOffset, oldPdeOffset; + PULONG Pt; + ULONG Pte; BOOLEAN NoExecute = FALSE; DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", @@ -894,9 +896,6 @@ } Addr = Address; - - PULONG Pt; - ULONG Pte; oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr); Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); @@ -948,6 +947,9 @@ PVOID Address, SWAPENTRY SwapEntry) { + PULONG Pt; + ULONG Pte; + if (Process == NULL && Address < MmSystemRangeStart) { DPRINT1("No process\n"); @@ -962,9 +964,6 @@ { KEBUGCHECK(0); } - - PULONG Pt; - ULONG Pte; Pt = MmGetPageTableForProcess(Process, Address, TRUE); if (Pt == NULL) @@ -1013,6 +1012,8 @@ PVOID Addr; ULONG i; ULONG oldPdeOffset, PdeOffset; + PULONG Pt = NULL; + ULONG Pte; BOOLEAN NoExecute = FALSE; DPRINT("MmCreateVirtualMappingUnsafe(%x, %x, %x, %x (%x), %d)\n", @@ -1068,9 +1069,6 @@ } Addr = Address; - - PULONG Pt = NULL; - ULONG Pte; oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr) + 1; for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE)) { @@ -1208,6 +1206,7 @@ { ULONG Attributes = 0; BOOLEAN NoExecute = FALSE; + PULONG Pt; DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", Process, Address, flProtect); @@ -1230,7 +1229,6 @@ { Attributes |= PA_USER; } - PULONG Pt; Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) @@ -1251,9 +1249,9 @@ */ { PHYSICAL_ADDRESS p; + ULONG Pte; DPRINT("MmGetPhysicalAddress(vaddr %x)\n", vaddr); - ULONG Pte; Pte = MmGetPageEntryForProcess(NULL, vaddr); if (Pte != 0 && Pte & PA_PRESENT) { @@ -1338,9 +1336,10 @@ MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) { PFN_TYPE Pfn; + ULONG Entry; + ASSERT (IS_HYPERSPACE(Address)); - ULONG Entry; Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), PFN_TO_PTE(NewPage) | PA_PRESENT | PA_READWRITE); Pfn = PTE_TO_PFN(Entry); @@ -1353,9 +1352,10 @@ MmDeleteHyperspaceMapping(PVOID Address) { PFN_TYPE Pfn; + ULONG Entry; + ASSERT (IS_HYPERSPACE(Address)); - ULONG Entry; Entry = InterlockedExchange((PLONG)ADDR_TO_PTE(Address), 0); Pfn = PTE_TO_PFN(Entry); @@ -1368,13 +1368,13 @@ MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) { ULONG StartOffset, EndOffset, Offset; + PULONG Pde; if (Address < MmSystemRangeStart) { KEBUGCHECK(0); } - PULONG Pde; StartOffset = ADDR_TO_PDE_OFFSET(Address); EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); @@ -1405,10 +1405,10 @@ MmInitGlobalKernelPageDirectory(VOID) { ULONG i; + PULONG CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; DPRINT("MmInitGlobalKernelPageDirectory()\n"); - PULONG CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; for (i = ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 1024; i++) { if (i != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) &&

16 years, 7 months

[fireball] 32523: - Remove duplicates, add STATUS_SUCCESS define (which gets commented out by wmc for now). - Add STATUS_WAIT_X and STATUS_INSUFFICIENT_RESOURCES codes.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 28 16:52:54 2008 New Revision: 32523 URL: http://svn.reactos.org/svn/reactos?rev=32523&view=rev Log: - Remove duplicates, add STATUS_SUCCESS define (which gets commented out by wmc for now). - Add STATUS_WAIT_X and STATUS_INSUFFICIENT_RESOURCES codes. Modified: trunk/reactos/dll/ntdll/def/ntstatus.mc Modified: trunk/reactos/dll/ntdll/def/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntstatus.mc?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntstatus.mc (original) +++ trunk/reactos/dll/ntdll/def/ntstatus.mc Thu Feb 28 16:52:54 2008 @@ -20,7 +20,39 @@ ) LanguageNames=(English=0x409:MSG00409) - +;#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) +MessageId=0x00 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_0 +Language=English +STATUS_WAIT_0 + +. +MessageId=0x01 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_1 +Language=English +STATUS_WAIT_1 + +. +MessageId=0x02 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_2 +Language=English +STATUS_WAIT_2 + +. +MessageId=0x03 +Severity=Success +Facility=System +SymbolicName=STATUS_WAIT_3 +Language=English +STATUS_WAIT_3 + +. MessageId=0x80 Severity=Success Facility=System @@ -245,23 +277,6 @@ SymbolicName=STATUS_PROCESS_IN_JOB Language=English The specified process is part of a job. - -. -MessageId=0x125 -Severity=Success -Facility=System -SymbolicName=STATUS_SPECIAL_GROUP -Language=English -{Volume Shadow Copy Service} -The system is now ready for hibernation. - -. -MessageId=0x126 -Severity=Success -Facility=System -SymbolicName=STATUS_SPECIAL_USER -Language=English -A file system or file system filter driver has successfully completed an FsFilter operation. . MessageId=0x367 @@ -1870,6 +1885,14 @@ When a block of memory is allotted for future updates, such as the memory allocated to hold discretionary access control and primary group information, successive updates may exceed the amount of memory originally allotted. Since quota may already have been charged to several processes which have handles to the object, it is not reasonable to alter the size of the allocated memory. Instead, a request that requires more memory than has been allotted must fail and the STATUS_ALLOTED_SPACE_EXCEEDED error returned. + +. +MessageId=0x9a +Severity=Error +Facility=System +SymbolicName=STATUS_INSUFFICIENT_RESOURCES +Language=English +Insufficient system resources exist to complete this API. . MessageId=0x9c

16 years, 7 months

[fireball] 32522: - If BASEDIR env var is set to point to your WDK installation, make msvcX will take it into account, and add additional include directories for WDK headers and libraries for all kernelmode modules.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 28 16:35:09 2008 New Revision: 32522 URL: http://svn.reactos.org/svn/reactos?rev=32522&view=rev Log: - If BASEDIR env var is set to point to your WDK installation, make msvcX will take it into account, and add additional include directories for WDK headers and libraries for all kernelmode modules. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Thu Feb 28 16:35:09 2008 @@ -350,12 +350,36 @@ multiple_includes = true; } } + else + { + // Add WDK or PSDK paths, if user provides them + if (getenv ( "BASEDIR" ) != NULL && + (module.type == Kernel || + module.type == KernelModeDLL || + module.type == KernelModeDriver)) + { + string WdkBase, SdkPath, CrtPath, DdkPath; + WdkBase = getenv ( "BASEDIR" ); + SdkPath = WdkBase + "\\inc\\api"; + CrtPath = WdkBase + "\\inc\\crt"; + DdkPath = WdkBase + "\\inc\\ddk"; + + if ( multiple_includes ) + fprintf ( OUT, ";" ); + + fprintf ( OUT, "%s;", SdkPath.c_str() ); + fprintf ( OUT, "%s;", CrtPath.c_str() ); + fprintf ( OUT, "%s", DdkPath.c_str() ); + multiple_includes = true; + } + } fprintf ( OUT, "\"\r\n" ); StringSet defines = common_defines; - // Always add _CRT_SECURE_NO_WARNINGS to disable warnings about not using the safe functions introduced in MSVC8. - defines.insert ( "_CRT_SECURE_NO_WARNINGS" ); + // Always add _CRT_SECURE_NO_WARNINGS to disable warnings about not + // using the safe functions introduced in MSVC8. + defines.insert ( "_CRT_SECURE_NO_WARNINGS" ); if ( debug ) { @@ -485,6 +509,26 @@ fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tAdditionalLibraryDirectories=\"" ); + + // Add WDK libs paths, if needed + if (getenv ( "BASEDIR" ) != NULL && + (module.type == Kernel || + module.type == KernelModeDLL || + module.type == KernelModeDriver)) + { + string WdkBase, CrtPath, DdkPath; + WdkBase = getenv ( "BASEDIR" ); + CrtPath = WdkBase + "\\lib\\crt\\i386"; + DdkPath = WdkBase + "\\lib\\wnet\\i386"; + + fprintf ( OUT, "%s;", CrtPath.c_str() ); + fprintf ( OUT, "%s", DdkPath.c_str() ); + + if (libraries.size () > 0) + fprintf ( OUT, ";" ); + } + + // Add conventional libraries dirs for (i = 0; i < libraries.size (); i++) { if ( i > 0 ) @@ -495,6 +539,7 @@ libpath = libpath.substr (0, libpath.find_last_of ("\\") ); fprintf ( OUT, "%s", libpath.c_str() ); } + fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"\r\n", module.name.c_str(), module_type.c_str() );

16 years, 7 months

[fireball] 32521: - Fix leaking an entry in some cases during ObpFreeCapturedAttributes call. For more details: http://www.reactos.org/forum/viewtopic.php?t=5311.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 28 14:37:14 2008 New Revision: 32521 URL: http://svn.reactos.org/svn/reactos?rev=32521&view=rev Log: - Fix leaking an entry in some cases during ObpFreeCapturedAttributes call. For more details: http://www.reactos.org/forum/viewtopic.php?t=5311. Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Thu Feb 28 14:37:14 2008 @@ -290,6 +290,12 @@ List->L.FreeMisses++; List->L.Free(Buffer); } + else + { + /* The free was within the Depth */ + InterlockedPushEntrySList(&List->L.ListHead, + (PSINGLE_LIST_ENTRY)Buffer); + } } else {

16 years, 7 months

[fireball] 32520: - Bump some Lsa debug messages from FIXME to TRACE, to prevent debug log spamming (their importance is rather low right now).

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 28 14:10:18 2008 New Revision: 32520 URL: http://svn.reactos.org/svn/reactos?rev=32520&view=rev Log: - Bump some Lsa debug messages from FIXME to TRACE, to prevent debug log spamming (their importance is rather low right now). Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Thu Feb 28 14:10:18 2008 @@ -315,7 +315,7 @@ PLSA_REFERENCED_DOMAIN_LIST LocalDomains; PLSA_TRANSLATED_NAME LocalNames; - FIXME("(%p,%u,%p,%p,%p) stub\n", PolicyHandle, Count, Sids, + TRACE("(%p,%u,%p,%p,%p) stub\n", PolicyHandle, Count, Sids, ReferencedDomains, Names); WARN("LsaLookupSids(): stub. Always returning 'Administrator'\n"); @@ -377,7 +377,7 @@ IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - FIXME("(%s,%p,0x%08x,%p) stub\n", + TRACE("(%s,%p,0x%08x,%p) stub\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle);

16 years, 7 months

[cfinck] 32519: Fix portcls build, broken in r32517, by moving the header inclusion order in "portcls.h" around. I checked this with MS DDK and its "wdm.h" file also defines no types and depends on a previously included "ntddk.h" by the driver.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 28 01:47:56 2008 New Revision: 32519 URL: http://svn.reactos.org/svn/reactos?rev=32519&view=rev Log: Fix portcls build, broken in r32517, by moving the header inclusion order in "portcls.h" around. I checked this with MS DDK and its "wdm.h" file also defines no types and depends on a previously included "ntddk.h" by the driver. Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (original) +++ trunk/reactos/include/ddk/portcls.h Thu Feb 28 01:47:56 2008 @@ -123,6 +123,12 @@ #ifndef PORTCLS_H #define PORTCLS_H +//#include <windef.h> +#include <ks.h> +#include <punknown.h> +#include <ntddk.h> +#include <drmk.h> + #ifdef __cplusplus extern "C" { @@ -131,12 +137,6 @@ #else #include <wdm.h> #endif - -//#include <windef.h> -#include <ks.h> -#include <punknown.h> -#include <ntddk.h> -#include <drmk.h> #ifndef PC_NO_IMPORTS #define PORTCLASSAPI EXTERN_C __declspec(dllimport)

16 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008