Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 19856: adding missing dx headers

by greatlrd＠svn.reactos.com

adding missing dx headers Added: trunk/reactos/w32api/include/amparse.h _____ Added: trunk/reactos/w32api/include/amparse.h --- trunk/reactos/w32api/include/amparse.h 2005-12-04 12:03:50 UTC (rev 19855) +++ trunk/reactos/w32api/include/amparse.h 2005-12-04 12:07:08 UTC (rev 19856) @@ -0,0 +1,20 @@ + +#ifndef __AMPARSE__ +#define __AMPARSE__ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_INTERFACE_(IAMParse, IUnknown) +{ + STDMETHOD(GetParseTime) (THIS_REFERENCE_TIME *prtCurrent) PURE; + STDMETHOD(SetParseTime) (THIS_REFERENCE_TIME rtCurrent) PURE; + STDMETHOD(Flush) (THIS) PURE; +}; + +DEFINE_GUID(IID_IAMParse, 0xC47A3420, 0x005C, 0x11D2, 0x90, 0x38, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x98); +#ifdef __cplusplus +} +#endif +#endif

18 years, 11 months

[arty] 19855: Added powerpc boot program. Not working with egcs tools yet.

by arty＠svn.reactos.com

Added powerpc boot program. Not working with egcs tools yet. Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.xml _____ Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.xml --- trunk/reactos/boot/freeldr/bootsect/bootsect.xml 2005-12-04 12:02:45 UTC (rev 19854) +++ trunk/reactos/boot/freeldr/bootsect/bootsect.xml 2005-12-04 12:03:50 UTC (rev 19855) @@ -18,3 +18,9 @@ <bootstrap base="loader" nameoncd="isoboot.bin" /> <file>isoboot.asm</file> </module> +<if property="ARCH" value="powerpc"> + <module name="ofwldr" type="bootprogram" payload="freeldr"> + <bootstrap base="loader" nameoncd="boot/ofwldr" /> + <file>ofwboot.s</file> + </module> +</if> \ No newline at end of file

18 years, 11 months

[arty] 19854: Added support for ROS_AUTOMAKE variable.

by arty＠svn.reactos.com

Added support for ROS_AUTOMAKE variable. Added support for <if> <module ...> </if> Added BootProgram target type Added simple initial ReactOS-ppc.xml, using my egcs compiler More work required, but getting there Added: trunk/reactos/ReactOS-ppc.xml Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/bootstrap.cpp Modified: trunk/reactos/tools/rbuild/define.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/rbuild.mak _____ Added: trunk/reactos/ReactOS-ppc.xml --- trunk/reactos/ReactOS-ppc.xml 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/ReactOS-ppc.xml 2005-12-04 12:02:45 UTC (rev 19854) @@ -0,0 +1,91 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config-ppc.xml"> + <xi:fallback> + <xi:include href="config.template.xml" /> + </xi:fallback> + </xi:include> + + <xi:include href="baseaddress.xml" /> + + <property name="BOOTPROG_PREPARE" value="ppc-le2be" /> + <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" /> + <property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" /> + <property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" /> + + <define name="_M_PPC" /> + <define name="_PPC_" /> + <define name="__PowerPC__" /> + <define name="_REACTOS_" /> + <define name="__MINGW_IMPORT" empty="true" /> + <define name="__restrict__" empty="true" /> + <compilerflag>-v</compilerflag> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="DBG" value="0"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <compilerflag>-Wpointer-arith</compilerflag> + + <include>.</include> + <include>include</include> + <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> + <include>include/ndk</include> + <include>w32api/include</include> + <include>w32api/include/crt</include> + <include>w32api/include/ddk</include> + + <directory name="apps"> + <xi:include href="apps/directory.xml" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.xml" /> + </directory> + <directory name="bootdata"> + <xi:include href="bootdata/bootdata.xml" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/directory.xml" /> + </directory> + <directory name="hal"> + <xi:include href="hal/directory.xml" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.xml" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.xml" /> + </directory> + <directory name="media"> + <xi:include href="media/directory.xml" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.xml" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.xml" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.xml" /> + </directory> + <directory name="services"> + <xi:include href="services/directory.xml" /> + </directory> + <directory name="subsys"> + <xi:include href="subsys/directory.xml" /> + </directory> +</project> _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-12-04 12:02:45 UTC (rev 19854) @@ -71,6 +71,7 @@ MingwBackend::MingwBackend ( Project& project, Configuration& configuration ) : Backend ( project, configuration ), + manualBinutilsSetting( false ), intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ), outputDirectory ( new Directory ( "$(OUTPUT)" ) ), installDirectory ( new Directory ( "$(INSTALL)" ) ) @@ -137,6 +138,7 @@ vector<MingwModuleHandler*> v; size_t i; + for ( i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; @@ -752,6 +754,7 @@ bool MingwBackend::IsSupportedBinutilsVersion ( const string& binutilsVersion ) { + if ( manualBinutilsSetting ) return true; if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) && ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) || ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) ) @@ -767,11 +770,13 @@ bool detectedBinutils = false; const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); + if ( ROS_PREFIXValue.length () > 0 ) { binutilsPrefix = ROS_PREFIXValue; binutilsCommand = binutilsPrefix + "-ld"; - detectedBinutils = TryToDetectThisBinutils ( binutilsCommand ); + manualBinutilsSetting = true; + detectedBinutils = true; } #if defined(WIN32) if ( !detectedBinutils ) @@ -802,6 +807,7 @@ } else printf ( "not detected\n" ); + } void _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-12-04 12:02:45 UTC (rev 19854) @@ -48,7 +48,7 @@ std::string nasmCommand; std::string binutilsPrefix; std::string binutilsCommand; - bool usePipe; + bool usePipe, manualBinutilsSetting; Directory* intermediateDirectory; Directory* outputDirectory; Directory* installDirectory; _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-12-04 12:02:45 UTC (rev 19854) @@ -230,6 +230,9 @@ case BootSector: handler = new MingwBootSectorModuleHandler ( module ); break; + case BootProgram: + handler = new MingwBootProgramModuleHandler ( module ); + break; case Iso: handler = new MingwIsoModuleHandler ( module ); break; @@ -2704,6 +2707,69 @@ } +MingwBootProgramModuleHandler::MingwBootProgramModuleHandler ( + const Module& module_ ) + : MingwModuleHandler ( module_ ) +{ +} + +void +MingwBootProgramModuleHandler::Process () +{ + GenerateBootProgramModuleTarget (); +} + +void +MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget () +{ + string targetName ( module.GetTargetName () ); + string targetMacro ( GetTargetMacro (module) ); + string workingDirectory = GetWorkingDirectory (); + string junk_tmp = ros_temp + module.name + ".junk.tmp"; + string junk_elf = ros_temp + module.name + ".junk.elf"; + string junk_cpy = ros_temp + module.name + ".junk.cpy"; + CLEAN_FILE ( junk_tmp ); + CLEAN_FILE ( junk_elf ); + CLEAN_FILE ( junk_cpy ); + string objectsMacro = GetObjectsMacro ( module ); + string linkDepsMacro = GetLinkingDependenciesMacro (); + string libsMacro = GetLibsMacro (); + const Module *payload = module.project.LocateModule ( module.payload ); + + GenerateRules (); + + fprintf ( fMakefile, "%s: %s %s %s | %s\n", + targetMacro.c_str (), + objectsMacro.c_str (), + linkDepsMacro.c_str (), + payload->name.c_str (), + GetDirectory(GetTargetFilename(module,NULL)).c_str () ); + + fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); + + fprintf ( fMakefile, "\t$(BOOTPROG_PREPARE) $(OUTPUT)$(SEP)%s %s\n", + NormalizeFilename( payload->GetPath() ).c_str (), + junk_cpy.c_str () ); + + fprintf ( fMakefile, "\t${objcopy} $(BOOTPROG_FLATFORMAT) %s %s\n", + junk_cpy.c_str (), + junk_tmp.c_str () ); + + fprintf ( fMakefile, "\t${ld} $(BOOTPROG_LINKFORMAT) %s %s -g -o %s\n", + linkDepsMacro.c_str (), + junk_tmp.c_str (), + junk_elf.c_str () ); + + fprintf ( fMakefile, "\t${objcopy} $(BOOTPROG_COPYFORMAT) %s %s\n", + junk_elf.c_str (), + module.GetPath().c_str () ); + + fprintf ( fMakefile, + "\t-@${rm} %s %s %s 2>$(NUL)\n", + junk_tmp.c_str (), junk_elf.c_str (), junk_cpy.c_str () ); +} + + MingwIsoModuleHandler::MingwIsoModuleHandler ( const Module& module_ ) _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-12-04 12:02:45 UTC (rev 19854) @@ -375,6 +375,19 @@ }; +class MingwBootProgramModuleHandler : public MingwModuleHandler +{ +public: + MingwBootProgramModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostFalse; } + virtual void Process (); + std::string GetProgTextAddrMacro (); + std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } +private: + void GenerateBootProgramModuleTarget (); +}; + + class MingwIsoModuleHandler : public MingwModuleHandler { public: _____ Modified: trunk/reactos/tools/rbuild/bootstrap.cpp --- trunk/reactos/tools/rbuild/bootstrap.cpp 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/bootstrap.cpp 2005-12-04 12:02:45 UTC (rev 19854) @@ -51,6 +51,7 @@ case KernelModeDriver: case BootSector: case BootLoader: + case BootProgram: return true; case BuildTool: case StaticLibrary: _____ Modified: trunk/reactos/tools/rbuild/define.cpp --- trunk/reactos/tools/rbuild/define.cpp 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/define.cpp 2005-12-04 12:02:45 UTC (rev 19854) @@ -50,9 +50,11 @@ Define::Initialize() { const XMLAttribute* att = node.GetAttribute ( "name", true ); + const XMLAttribute* empty = node.GetAttribute ( "empty", false ); assert(att); name = att->value; value = node.value; + if( empty ) value = " "; } void _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/module.cpp 2005-12-04 12:02:45 UTC (rev 19854) @@ -195,6 +195,13 @@ return filename; } +void IfableData::ExtractModules( std::vector<Module*> &modules ) +{ + size_t i; + for ( i = 0; i < this->modules.size (); i++ ) + modules.push_back(this->modules[i]); +} + IfableData::~IfableData() { size_t i; @@ -208,6 +215,8 @@ delete properties[i]; for ( i = 0; i < compilerFlags.size (); i++ ) delete compilerFlags[i]; + for ( i = 0; i < modules.size(); i++ ) + delete modules[i]; for ( i = 0; i < ifs.size (); i++ ) delete ifs[i]; for ( i = 0; i < compilationUnits.size (); i++ ) @@ -388,6 +397,12 @@ aliasedModuleName = att->value; else aliasedModuleName = ""; + + if ( type == BootProgram ) + { + att = moduleNode.GetAttribute ( "payload", true ); + payload = att->value; + } } Module::~Module () @@ -732,6 +747,8 @@ return BootLoader; if ( attribute.value == "bootsector" ) return BootSector; + if ( attribute.value == "bootprogram" ) + return BootProgram; if ( attribute.value == "iso" ) return Iso; if ( attribute.value == "liveiso" ) @@ -785,6 +802,8 @@ return ".o"; case Alias: return ""; + case BootProgram: + return ""; } throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -828,6 +847,7 @@ case RpcServer: case RpcClient: case Alias: + case BootProgram: return ""; } throw InvalidOperationException ( __FILE__, @@ -863,6 +883,7 @@ case RpcServer: case RpcClient: case Alias: + case BootProgram: return ""; } throw InvalidOperationException ( __FILE__, @@ -895,6 +916,7 @@ case ObjectLibrary: case BootLoader: case BootSector: + case BootProgram: case Iso: case LiveIso: case RpcServer: @@ -923,6 +945,7 @@ case BuildTool: case BootLoader: case BootSector: + case BootProgram: case Iso: case LiveIso: return true; @@ -1289,6 +1312,7 @@ void If::ProcessXML() { + } @@ -1358,6 +1382,7 @@ case KernelModeDriver: case BootSector: case BootLoader: + case BootProgram: case BuildTool: case StaticLibrary: case ObjectLibrary: _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/project.cpp 2005-12-04 12:02:45 UTC (rev 19854) @@ -97,8 +97,10 @@ size_t i; if ( _backend ) delete _backend; +#ifdef NOT_NEEDED_SINCE_THESE_ARE_CLEANED_BY_IFABLE_DATA for ( i = 0; i < modules.size (); i++ ) delete modules[i]; +#endif for ( i = 0; i < linkerFlags.size (); i++ ) delete linkerFlags[i]; for ( i = 0; i < cdfiles.size (); i++ ) @@ -225,6 +227,7 @@ void Project::ExecuteInvocations () { + fprintf( stderr, "ExecuteInvocations\n" ); for ( size_t i = 0; i < modules.size (); i++ ) modules[i]->InvokeModule (); } @@ -277,11 +280,29 @@ ParseContext parseContext; ProcessXMLSubElement ( *node->subElements[i], path, parseContext ); } + + non_if_data.ProcessXML (); + + non_if_data.ExtractModules( modules ); + + for ( i = 0; i < non_if_data.ifs.size (); i++ ) + { + const Property *property = + LookupProperty( non_if_data.ifs[i]->property ); + + if( !property ) continue; + + bool conditionTrue = + (non_if_data.ifs[i]->negated && + (property->value != non_if_data.ifs[i]->value)) || + (property->value == non_if_data.ifs[i]->value); + if ( conditionTrue ) + non_if_data.ifs[i]->data.ExtractModules( modules ); + } + for ( i = 0; i < linkerFlags.size (); i++ ) + linkerFlags[i]->ProcessXML (); for ( i = 0; i < modules.size (); i++ ) modules[i]->ProcessXML (); - for ( i = 0; i < linkerFlags.size (); i++ ) - linkerFlags[i]->ProcessXML (); - non_if_data.ProcessXML (); for ( i = 0; i < cdfiles.size (); i++ ) cdfiles[i]->ProcessXML (); for ( i = 0; i < installfiles.size (); i++ ) @@ -294,13 +315,11 @@ ParseContext& parseContext ) { bool subs_invalid = false; + If* pOldIf = parseContext.ifData; + string subpath(path); if ( e.name == "module" ) { - if ( parseContext.ifData ) - throw XMLInvalidBuildFileException ( - e.location, - "<module> is not a valid sub-element of <if>" ); Module* module = new Module ( *this, e, path ); if ( LocateModule ( module->name ) ) throw XMLInvalidBuildFileException ( @@ -308,7 +327,10 @@ "module name conflict: '%s' (originally defined at %s)", module->name.c_str(), module->node.location.c_str() ); - modules.push_back ( module ); + if ( parseContext.ifData ) + parseContext.ifData->data.modules.push_back( module ); + else + non_if_data.modules.push_back ( module ); return; // defer processing until later } else if ( e.name == "cdfile" ) @@ -363,7 +385,6 @@ } else if ( e.name == "if" ) { - If* pOldIf = parseContext.ifData; parseContext.ifData = new If ( e, *this, NULL ); if ( pOldIf ) pOldIf->data.ifs.push_back ( parseContext.ifData ); @@ -373,7 +394,6 @@ } else if ( e.name == "ifnot" ) { - If* pOldIf = parseContext.ifData; parseContext.ifData = new If ( e, *this, NULL, true ); if ( pOldIf ) pOldIf->data.ifs.push_back ( parseContext.ifData ); @@ -398,6 +418,8 @@ } for ( size_t i = 0; i < e.subElements.size (); i++ ) ProcessXMLSubElement ( *e.subElements[i], subpath, parseContext ); + + parseContext.ifData = pOldIf; } Module* _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-12-04 12:02:45 UTC (rev 19854) @@ -183,11 +183,13 @@ std::vector<Define*> defines; std::vector<Library*> libraries; std::vector<Property*> properties; + std::vector<Module*> modules; std::vector<CompilerFlag*> compilerFlags; std::vector<If*> ifs; ~IfableData(); void ProcessXML(); + void ExtractModules( std::vector<Module*> &modules ); }; class Project @@ -200,10 +202,10 @@ std::string name; std::string makefile; XMLIncludes xmlbuildfiles; - std::vector<Module*> modules; std::vector<LinkerFlag*> linkerFlags; std::vector<CDFile*> cdfiles; std::vector<InstallFile*> installfiles; + std::vector<Module*> modules; IfableData non_if_data; Project ( const Configuration& configuration, @@ -258,7 +260,8 @@ Test = 15, RpcServer = 16, RpcClient = 17, - Alias = 18 + Alias = 18, + BootProgram = 19 }; enum HostType @@ -279,6 +282,7 @@ std::string extension; std::string entrypoint; std::string baseaddress; + std::string payload; std::string path; ModuleType type; ImportLibrary* importLibrary; _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-12-04 12:02:21 UTC (rev 19853) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-12-04 12:02:45 UTC (rev 19854) @@ -254,6 +254,7 @@ .PHONY: rbuild rbuild: $(RBUILD_TARGET) +host_gpp += -g $(RBUILD_TARGET): $(RBUILD_OBJECTS) $(XML_SSPRINTF_OBJECTS) $(INFLIB_HOST_OBJECTS) | $(RBUILD_OUT) $(ECHO_LD)

18 years, 11 months

[greatlrd] 19853: adding missing dx headers

by greatlrd＠svn.reactos.com

adding missing dx headers Added: trunk/reactos/w32api/include/activecf.h _____ Added: trunk/reactos/w32api/include/activecf.h --- trunk/reactos/w32api/include/activecf.h 2005-12-04 11:50:42 UTC (rev 19852) +++ trunk/reactos/w32api/include/activecf.h 2005-12-04 12:02:21 UTC (rev 19853) @@ -0,0 +1,13 @@ + +#ifndef __ACTIVECF__ +#define __ACTIVECF__ + +#define CFSTR_VFW_FILTERLIST "Video for Windows 4 Filters" + +typedef struct tagVFW_FILTERLIST +{ + UINT cFilters; + CLSID aClsId[1]; +} VFW_FILTERLIST; + +#endif \ No newline at end of file

18 years, 11 months

[greatlrd] 19852: wrote amaudio.h directx header, for it is missing and it need for new sync of dxdiag.dll from wine.

by greatlrd＠svn.reactos.com

wrote amaudio.h directx header, for it is missing and it need for new sync of dxdiag.dll from wine. Added: trunk/reactos/w32api/include/amaudio.h _____ Added: trunk/reactos/w32api/include/amaudio.h --- trunk/reactos/w32api/include/amaudio.h 2005-12-04 11:38:48 UTC (rev 19851) +++ trunk/reactos/w32api/include/amaudio.h 2005-12-04 11:50:42 UTC (rev 19852) @@ -0,0 +1,34 @@ +#ifndef __AMAUDIO__ +#define __AMAUDIO__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <mmsystem.h> +#include <dsound.h> + +#undef INTERFACE +#define INTERFACE IAMDirectSound + +DECLARE_INTERFACE_(IAMDirectSound,IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(GetDirectSoundInterface)(THIS_ LPDIRECTSOUND *lplpds) PURE; + STDMETHOD(GetPrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(GetSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(ReleaseDirectSoundInterface)(THIS_ LPDIRECTSOUND lpds) PURE; + STDMETHOD(ReleasePrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(ReleaseSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(SetFocusWindow)(THIS_ HWND, BOOL) PURE ; + STDMETHOD(GetFocusWindow)(THIS_ HWND *, BOOL*) PURE ; +}; + + +#ifdef __cplusplus +} +#endif +#endif +

18 years, 11 months

[greatlrd] 19851: wrote audevcod.h directx header, for it is missing and it need for new sync of dxdiag.dll from wine.

by greatlrd＠svn.reactos.com

wrote audevcod.h directx header, for it is missing and it need for new sync of dxdiag.dll from wine. Added: trunk/reactos/w32api/include/audevcod.h _____ Added: trunk/reactos/w32api/include/audevcod.h --- trunk/reactos/w32api/include/audevcod.h 2005-12-04 11:09:40 UTC (rev 19850) +++ trunk/reactos/w32api/include/audevcod.h 2005-12-04 11:38:48 UTC (rev 19851) @@ -0,0 +1,28 @@ + +#ifndef __AUDEVCOD__ +#define __AUDEVCOD__ + +#define EC_SND_DEVICE_ERROR_BASE 0x0200 +#define EC_SNDDEV_IN_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x00) +#define EC_SNDDEV_OUT_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x01) + +typedef enum _tagSND_DEVICE_ERROR +{ + + SNDDEV_ERROR_Open =1, + SNDDEV_ERROR_Close =2, + SNDDEV_ERROR_GetCaps =3, + SNDDEV_ERROR_PrepareHeader =4, + SNDDEV_ERROR_UnprepareHeader =5, + SNDDEV_ERROR_Reset =6, + SNDDEV_ERROR_Restart =7, + SNDDEV_ERROR_GetPosition =8, + SNDDEV_ERROR_Write =9, + SNDDEV_ERROR_Pause =10, + SNDDEV_ERROR_Stop =11, + SNDDEV_ERROR_Start =12, + SNDDEV_ERROR_AddBuffer =13, + SNDDEV_ERROR_Query =14, + +} SNDDEV_ERR; +#endif // __AUDEVCOD__

18 years, 11 months

[greatlrd] 19850: wrote amvideo.h directx header, for it is missing and it need for new sync of dxdiag.dll from wine.

by greatlrd＠svn.reactos.com

wrote amvideo.h directx header, for it is missing and it need for new sync of dxdiag.dll from wine. Added: trunk/reactos/w32api/include/amvideo.h _____ Added: trunk/reactos/w32api/include/amvideo.h --- trunk/reactos/w32api/include/amvideo.h 2005-12-04 08:09:18 UTC (rev 19849) +++ trunk/reactos/w32api/include/amvideo.h 2005-12-04 11:09:40 UTC (rev 19850) @@ -0,0 +1,259 @@ +/* + * amvideo.h + * + * DirectX header + * + * Copyright Magnus Olsen (magnus(a)greatlord.com) + */ + +#ifndef __AMVIDEO__ +#define __AMVIDEO__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <ddraw.h> + +#define AMDDS_NONE 0x00 +#define AMDDS_DCIPS 0x01 +#define AMDDS_PS 0x02 +#define AMDDS_RGBOVR 0x04 +#define AMDDS_YUVOVR 0x08 +#define AMDDS_RGBOFF 0x10 +#define AMDDS_YUVOFF 0x20 +#define AMDDS_RGBFLP 0x40 +#define AMDDS_YUVFLP 0x80 +#define AMDDS_ ALL 0xFF +#define AMDDS_DEFAULT AMDDS_ALL +#define AMDDS_YUV (AMDDS_YUVOFF | AMDDS_YUVOVR | AMDDS_YUVFLP) +#define AMDDS_RGB (AMDDS_RGBOFF | AMDDS_RGBOVR | AMDDS_RGBFLP) +#define AMDDS_PRIMARY (AMDDS_DCIPS | AMDDS_PS) +#define iPALETTE_COLORS 256 +#define iEGA_COLORS 16 +#define iMASK_COLORS 3 +#define iTRUECOLOR 16 +#define iRED 0 +#define iGREEN 1 +#define iBLUE 2 +#define iPALETTE 8 +#define iMAXBITS 8 + +typedef struct tag_TRUECOLORINFO +{ + DWORD dwBitMasks[iMASK_COLORS]; + RGBQUAD bmiColors[iPALETTE_COLORS]; +} TRUECOLORINFO; + + +typedef struct tagVIDEOINFOHEADER +{ + RECT rcSource; + RECT rcTarget; + DWORD dwBitRate; + DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + BITMAPINFOHEADER bmiHeader; +} VIDEOINFOHEADER; + + +typedef struct tagVIDEOINFO +{ + RECT rcSource; + RECT rcTarget; + DWORD dwBitRate; + DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + BITMAPINFOHEADER bmiHeader; + union + { + RGBQUAD bmiColors[iPALETTE_COLORS]; + DWORD dwBitMasks[iMASK_COLORS]; + TRUECOLORINFO TrueColorInfo; + }; +} VIDEOINFO; + +typedef struct tagMPEG1VIDEOINFO +{ + VIDEOINFOHEADER hdr; + DWORD dwStartTimeCode; + DWORD cbSequenceHeader; + BYTE bSequenceHeader[1]; +} MPEG1VIDEOINFO; + +typedef struct tagAnalogVideoInfo +{ + RECT rcSource; + RECT rcTarget; + DWORD dwActiveWidth; + DWORD dwActiveHeight; + REFERENCE_TIME AvgTimePerFrame; +} ANALOGVIDEOINFO; + +#define TRUECOLOR(PBMIH) ((TRUECOLORINFO *)(((LPBYTE)&((PBMIH)->bmiHeader)) + (PBMIH)->bmiHeader.biSize)) +#define COLORS(PBMIH) ((RGBQUAD *)(((LPBYTE)&((PBMIH)->bmiHeader)) + (PBMIH)->bmiHeader.biSize)) +#define BITMASKS(PBMIH) ((DWORD *)(((LPBYTE)&((PBMIH)->bmiHeader)) + (PBMIH)->bmiHeader.biSize)) + +#define SIZE_EGA_PALETTE (iEGA_COLORS * sizeof(RGBQUAD)) +#define SIZE_PALETTE (iPALETTE_COLORS * sizeof(RGBQUAD)) +#define SIZE_MASKS (iMASK_COLORS * sizeof(DWORD)) +#define SIZE_PREHEADER (FIELD_OFFSET(VIDEOINFOHEADER,bmiHeader)) +#define SIZE_VIDEOHEADER (sizeof(BITMAPINFOHEADER) + SIZE_PREHEADER) + +#define WIDTHBYTES(BTIS) ((DWORD)(((BTIS)+31) & (~31)) / 8) +#define DIBWIDTHBYTES(BI) (DWORD)(BI).biBitCount) * (DWORD)WIDTHBYTES((DWORD)(BI).biWidth +#define _DIBSIZE(BI) (DIBWIDTHBYTES(BI) * (DWORD)(BI).biHeight) +#define DIBSIZE(BI) ((BI).biHeight < 0 ? (-1)*(_DIBSIZE(BI)) : _DIBSIZE(BI)) + +#define BIT_MASKS_MATCH(PBMIH1,PBMIH2) \ + ((PBMIH2)->dwBitMasks[iGREEN] == (PBMIH1)->dwBitMasks[iGREEN]) && \ + (((PBMIH2)->dwBitMasks[iRED] == (PBMIH1)->dwBitMasks[iRED]) && \ + ((PBMIH2)->dwBitMasks[iBLUE] == (PBMIH1)->dwBitMasks[iBLUE])) + +#define RESET_MASKS(PBMIH) (ZeroMemory((PVOID)(PBMIH)->dwBitFields,SIZE_MASKS)) +#define RESET_HEADER(PBMIH) (ZeroMemory((PVOID)(PBMIH),SIZE_VIDEOHEADER)) +#define RESET_PALETTE(PBMIH) (ZeroMemory((PVOID)(PBMIH)->bmiColors,SIZE_PALETTE)); +#define PALETTISED(PBMIH) ((PBMIH)->bmiHeader.biBitCount <= iPALETTE) +#define PALETTE_ENTRIES(PBMIH) ((DWORD) 1 << (PBMIH)->bmiHeader.biBitCount) +#define HEADER(pVideoInfo) (&(((VIDEOINFOHEADER *) (pVideoInfo))->bmiHeader)) +#define MAX_SIZE_MPEG1_SEQUENCE_INFO 140 +#define MPEG1_SEQUENCE_INFO(pv) ((const BYTE *)(pv)->bSequenceHeader) +#define SIZE_MPEG1VIDEOINFO(pv) (FIELD_OFFSET(MPEG1VIDEOINFO, bSequenceHeader[0]) + \ + (pv)->cbSequenceHeader) + +#undef INTERFACE +#define INTERFACE IDirectDrawVideo + +DECLARE_INTERFACE_(IDirectDrawVideo, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(GetSwitches)(THIS_ DWORD *pSwitches) PURE; + STDMETHOD(SetSwitches)(THIS_ DWORD Switches) PURE; + STDMETHOD(GetCaps)(THIS_ DDCAPS *pCaps) PURE; + STDMETHOD(GetEmulatedCaps)(THIS_ DDCAPS *pCaps) PURE; + STDMETHOD(GetSurfaceDesc)(THIS_ DDSURFACEDESC *pSurfaceDesc) PURE; + STDMETHOD(GetFourCCCodes)(THIS_ DWORD *pCount,DWORD *pCodes) PURE; + STDMETHOD(SetDirectDraw)(THIS_ LPDIRECTDRAW pDirectDraw) PURE; + STDMETHOD(GetDirectDraw)(THIS_ LPDIRECTDRAW *ppDirectDraw) PURE; + STDMETHOD(GetSurfaceType)(THIS_ DWORD *pSurfaceType) PURE; + STDMETHOD(SetDefault)(THIS) PURE; + STDMETHOD(UseScanLine)(THIS_ long UseScanLine) PURE; + STDMETHOD(CanUseScanLine)(THIS_ long *UseScanLine) PURE; + STDMETHOD(UseOverlayStretch)(THIS_ long UseOverlayStretch) PURE; + STDMETHOD(CanUseOverlayStretch)(THIS_ long *UseOverlayStretch) PURE; + STDMETHOD(UseWhenFullScreen)(THIS_ long UseWhenFullScreen) PURE; + STDMETHOD(WillUseFullScreen)(THIS_ long *UseWhenFullScreen) PURE; +}; + + +#undef INTERFACE +#define INTERFACE IFullScreenVideo + +DECLARE_INTERFACE_(IFullScreenVideo, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(CountModes)(THIS_ long *pModes) PURE; + STDMETHOD(GetModeInfo)(THIS_ long Mode,long *pWidth,long *pHeight,long *pDepth) PURE; + STDMETHOD(GetCurrentMode)(THIS_ long *pMode) PURE; + STDMETHOD(IsModeAvailable)(THIS_ long Mode) PURE; + STDMETHOD(IsModeEnabled)(THIS_ long Mode) PURE; + STDMETHOD(SetEnabled)(THIS_ long Mode,long bEnabled) PURE; + STDMETHOD(GetClipFactor)(THIS_ long *pClipFactor) PURE; + STDMETHOD(SetClipFactor)(THIS_ long ClipFactor) PURE; + STDMETHOD(SetMessageDrain)(THIS_ HWND hwnd) PURE; + STDMETHOD(GetMessageDrain)(THIS_ HWND *hwnd) PURE; + STDMETHOD(SetMonitor)(THIS_ long Monitor) PURE; + STDMETHOD(GetMonitor)(THIS_ long *Monitor) PURE; + STDMETHOD(HideOnDeactivate)(THIS_ long Hide) PURE; + STDMETHOD(IsHideOnDeactivate)(THIS) PURE; + STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE; + STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE; + STDMETHOD(SetDefault)(THIS) PURE; +} + +#undef INTERFACE +#define INTERFACE IQualProp + +DECLARE_INTERFACE_(IQualProp, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(get_FramesDroppedInRenderer)(THIS_ int *pcFrames) PURE; + STDMETHOD(get_FramesDrawn)(THIS_ int *pcFramesDrawn) PURE; + STDMETHOD(get_AvgFrameRate)(THIS_ int *piAvgFrameRate) PURE; + STDMETHOD(get_Jitter)(THIS_ int *iJitter) PURE; + STDMETHOD(get_AvgSyncOffset)(THIS_ int *piAvg) PURE; + STDMETHOD(get_DevSyncOffset)(THIS_ int *piDev) PURE; +}; + + +#undef INTERFACE +#define INTERFACE IBaseVideoMixer + +DECLARE_INTERFACE_(IBaseVideoMixer, IUnknown) +{ + STDMETHOD(SetLeadPin)(THIS_ int iPin) PURE; + STDMETHOD(GetLeadPin)(THIS_ int *piPin) PURE; + STDMETHOD(GetInputPinCount)(THIS_ int *piPinCount) PURE; + STDMETHOD(IsUsingClock)(THIS_ int *pbValue) PURE; + STDMETHOD(SetUsingClock)(THIS_ int bValue) PURE; + STDMETHOD(GetClockPeriod)(THIS_ int *pbValue) PURE; + STDMETHOD(SetClockPeriod)(THIS_ int bValue) PURE; +}; + +#undef INTERFACE +#define INTERFACE IFullScreenVideoEx + +DECLARE_INTERFACE_(IFullScreenVideoEx, IFullScreenVideo) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(CountModes)(THIS_ long *pModes) PURE; + STDMETHOD(GetModeInfo)(THIS_ long Mode,long *pWidth,long *pHeight,long *pDepth) PURE; + STDMETHOD(GetCurrentMode)(THIS_ long *pMode) PURE; + STDMETHOD(IsModeAvailable)(THIS_ long Mode) PURE; + STDMETHOD(IsModeEnabled)(THIS_ long Mode) PURE; + STDMETHOD(SetEnabled)(THIS_ long Mode,long bEnabled) PURE; + STDMETHOD(GetClipFactor)(THIS_ long *pClipFactor) PURE; + STDMETHOD(SetClipFactor)(THIS_ long ClipFactor) PURE; + STDMETHOD(SetMessageDrain)(THIS_ HWND hwnd) PURE; + STDMETHOD(GetMessageDrain)(THIS_ HWND *hwnd) PURE; + STDMETHOD(SetMonitor)(THIS_ long Monitor) PURE; + STDMETHOD(GetMonitor)(THIS_ long *Monitor) PURE; + STDMETHOD(HideOnDeactivate)(THIS_ long Hide) PURE; + STDMETHOD(IsHideOnDeactivate)(THIS) PURE; + STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE; + STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE; + STDMETHOD(SetDefault)(THIS) PURE; + STDMETHOD(SetAcceleratorTable)(THIS_ HWND hwnd,HACCEL hAccel) PURE; + STDMETHOD(GetAcceleratorTable)(THIS_ HWND *phwnd,HACCEL *phAccel) PURE; + STDMETHOD(KeepPixelAspectRatio)(THIS_ long KeepAspect) PURE; + STDMETHOD(IsKeepPixelAspectRatio)(THIS_ long *pKeepAspect) PURE; +}; + + + + +typedef enum +{ + AM_PROPERTY_FRAMESTEP_STEP = 0x01, + AM_PROPERTY_FRAMESTEP_CANCEL = 0x02, + AM_PROPERTY_FRAMESTEP_CANSTEP = 0x03, + AM_PROPERTY_FRAMESTEP_CANSTEPMULTIPLE = 0x04 +} AM_PROPERTY_FRAMESTEP; + +typedef struct _AM_FRAMESTEP_STEP +{ + DWORD dwFramesToStep; +} AM_FRAMESTEP_STEP; + +#ifdef __cplusplus +} +#endif +#endif

18 years, 11 months

[arty] 19849: Broaden the lock over the whole text rendering loop. Solves text corruption.

by arty＠svn.reactos.com

Broaden the lock over the whole text rendering loop. Solves text corruption. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-12-04 07:58:46 UTC (rev 19848) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-12-04 08:09:18 UTC (rev 19849) @@ -1631,6 +1631,7 @@ FontGDI = ObjToGDI(FontObj, FONT); ASSERT(FontGDI); + IntLockFreeType; face = FontGDI->face; if (face->charmap == NULL) { @@ -1651,10 +1652,8 @@ { DPRINT1("WARNING: Could not find desired charmap!\n"); } - IntLockFreeType; error = FT_Set_Charmap(face, found); - IntUnLockFreeType; - if (error) + if (error) { DPRINT1("WARNING: Could not set the charmap!\n"); } @@ -1666,7 +1665,6 @@ else RenderMode = FT_RENDER_MODE_MONO; - IntLockFreeType; error = FT_Set_Pixel_Sizes( face, TextObj->logfont.lfWidth, @@ -1674,10 +1672,10 @@ (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); - IntUnLockFreeType; if (error) { DPRINT1("Error in setting pixel sizes: %u\n", error); + IntUnLockFreeType; goto fail; } @@ -1722,10 +1720,8 @@ for (i = Start; i < Count; i++) { - IntLockFreeType; glyph_index = FT_Get_Char_Index(face, *TempText); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - IntUnLockFreeType; if (error) { @@ -1738,9 +1734,7 @@ if (use_kerning && previous && glyph_index) { FT_Vector delta; - IntLockFreeType; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - IntUnLockFreeType; TextWidth += delta.x; } @@ -1772,14 +1766,13 @@ for (i = 0; i < Count; i++) { - IntLockFreeType; glyph_index = FT_Get_Char_Index(face, *String); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - IntUnLockFreeType; if (error) { DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; goto fail; } @@ -1789,17 +1782,13 @@ if (use_kerning && previous && glyph_index && NULL == Dx) { FT_Vector delta; - IntLockFreeType; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - IntUnLockFreeType; TextLeft += delta.x; } if (glyph->format == ft_glyph_format_outline) { - IntLockFreeType; error = FT_Render_Glyph(glyph, RenderMode); - IntUnLockFreeType; if (error) { DPRINT1("WARNING: Failed to render glyph!\n"); @@ -1856,6 +1845,7 @@ if ( !HSourceGlyph ) { DPRINT1("WARNING: EngLockSurface() failed!\n"); + IntUnLockFreeType; goto fail; } SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); @@ -1863,6 +1853,7 @@ { EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); + IntUnLockFreeType; goto fail; } @@ -1915,6 +1906,8 @@ String++; } + IntUnLockFreeType; + EngDeleteXlate(XlateObj); EngDeleteXlate(XlateObj2); BITMAPOBJ_UnlockBitmap(BitmapObj);

18 years, 11 months

[arty] 19848: Add ROS_AUTOMAKE variable to determine the location of makefile.auto

by arty＠svn.reactos.com

Add ROS_AUTOMAKE variable to determine the location of makefile.auto - Allows multiple configurations to be used in the same tree Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-12-04 03:24:11 UTC (rev 19847) +++ trunk/reactos/Makefile 2005-12-04 07:58:46 UTC (rev 19848) @@ -106,6 +106,11 @@ # -mi Let make handle creation of install directories. Rbuild will not generate the directories. # -ps Generate proxy makefiles in source tree instead of the output tree. # -ud Disable compilation units. +# -r Input XML +# +# ROS_AUTOMAKE +# Alternate name of makefile.auto +# # check for versions of make that don't have features we need... # the function "eval" is only available in 3.80+, which happens to be the minimum @@ -124,9 +129,14 @@ .PHONY: all .PHONY: clean -all: makefile.auto +ifeq ($(ROS_AUTOMAKE),) +ROS_AUTOMAKE=makefile.auto +endif +all: $(ROS_AUTOMAKE) + + .SUFFIXES: ifeq ($(HOST),) @@ -336,7 +346,7 @@ include lib/lib.mak include tools/tools.mak include boot/freeldr/bootsect/bootsect.mak --include makefile.auto +-include $(ROS_AUTOMAKE) PREAUTO := \ $(BIN2C_TARGET) \ @@ -349,7 +359,7 @@ $(NCI_SERVICE_FILES) \ $(GENDIB_DIB_FILES) -makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw @@ -388,7 +398,7 @@ .PHONY: makefile_auto_clean makefile_auto_clean: - -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL) + -@$(rm) $(ROS_AUTOMAKE) $(PREAUTO) 2>$(NUL) .PHONY: clean clean: makefile_auto_clean

18 years, 11 months

[ros-diffs] [ion] 19847: - Fix KeAttackProcess, KeStackAttachProcess, KeUnstackDetachProcess and KeDetachProcess. The code was brain-dead and I must've been drunk when I first wrote it.

by ion＠svn.reactos.com

- Fix KeAttackProcess, KeStackAttachProcess, KeUnstackDetachProcess and KeDetachProcess. The code was brain-dead and I must've been drunk when I first wrote it. - Update some NDK definitions and some fixes. - Update HAL Private Dispatch Table to 2.0 - Make RtlIpv* API definitions more correct. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/kdfuncs.h Modified: trunk/reactos/include/ndk/kdtypes.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/ntoskrnl/ke/process.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/include/ndk/asm.h 2005-12-04 03:24:11 UTC (rev 19847) @@ -110,6 +110,7 @@ #define KPCR_GDT 0x3C #define KPCR_TSS 0x40 #define KPCR_SET_MEMBER 0x48 +#define KPCR_NUMBER 0x51 #define KPCR_CURRENT_THREAD 0x124 #define KPCR_PROCESSOR_NUMBER 0x130 #define KPCR_PRCB_SET_MEMBER 0x134 _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/include/ndk/haltypes.h 2005-12-04 03:24:11 UTC (rev 19847) @@ -61,10 +61,29 @@ // // Hal Private dispatch Table // -#define HAL_PRIVATE_DISPATCH_VERSION 1 +#define HAL_PRIVATE_DISPATCH_VERSION 2 typedef struct _HAL_PRIVATE_DISPATCH { ULONG Version; + PVOID HalHandlerForBus; + PVOID HalHandlerForBus2; + PVOID HalLocateHiberRanges; + PVOID HalRegisterBusHandler; + PVOID HalSetWakeEnable; + PVOID HalSetWakeAlarm; + PVOID HalTranslateBusAddress; + PVOID HalTranslateBusAddress2; + PVOID HalHaltSystem; + PVOID Null; + PVOID Null2; + PVOID HalAllocateMapRegisters; + PVOID KdSetupPciDeviceForDebugging; + PVOID KdReleasePciDeviceforDebugging; + PVOID KdGetAcpiTablePhase0; + PVOID HalReferenceHandler; + PVOID HalVectorToIDTEntry; + PVOID MatchAll; + PVOID KdUnmapVirtualAddress; } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; #ifndef _REACTOS_ _____ Modified: trunk/reactos/include/ndk/kdfuncs.h --- trunk/reactos/include/ndk/kdfuncs.h 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/include/ndk/kdfuncs.h 2005-12-04 03:24:11 UTC (rev 19847) @@ -105,6 +105,12 @@ NTAPI KdPortEnableInterrupts(VOID); +BOOLEAN +NTAPI +KdDebuggerInitialize0( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + #endif // _____ Modified: trunk/reactos/include/ndk/kdtypes.h --- trunk/reactos/include/ndk/kdtypes.h 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/include/ndk/kdtypes.h 2005-12-04 03:24:11 UTC (rev 19847) @@ -49,6 +49,8 @@ // #define BREAKPOINT_PRINT 1 #define BREAKPOINT_PROMPT 2 +#define BREAKPOINT_LOAD_SYMBOLS 3 +#define BREAKPOINT_UNLOAD_SYMBOLS 4 // // Debug Control Codes for NtSystemDebugcontrol _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/include/ndk/ketypes.h 2005-12-04 03:24:11 UTC (rev 19847) @@ -704,7 +704,11 @@ // // Exported Loader Parameter Block // +#ifdef _REACTOS_ extern LOADER_PARAMETER_BLOCK NTSYSAPI KeLoaderBlock; +#else +extern PLOADER_PARAMETER_BLOCK NTSYSAPI KeLoaderBlock; +#endif // // Exported Hardware Data _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/include/ndk/pstypes.h 2005-12-04 03:24:11 UTC (rev 19847) @@ -254,6 +254,7 @@ // // Descriptor Table Entry Definition // +#define _DESCRIPTOR_TABLE_ENTRY_DEFINED typedef struct _DESCRIPTOR_TABLE_ENTRY { ULONG Selector; _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-12-04 03:24:11 UTC (rev 19847) @@ -2282,6 +2282,45 @@ OUT PULONG IpAddr ); +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv6StringToAddressA( + IN LPSTR Name, + OUT PULONG Unknown, + OUT PVOID IpAddr +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv6StringToAddressW( + IN LPWSTR Name, + OUT PULONG Unknown, + OUT PVOID IpAddr +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv6StringToAddressExA( + IN LPSTR AddressName, + IN PVOID Address, + IN PULONG ScopeId, + IN PWORD Port +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlIpv6StringToAddressExW( + IN LPWSTR AddressName, + IN PVOID Address, + IN PULONG ScopeId, + IN PWORD Port +); + + // // Time Functions // _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-12-04 03:24:11 UTC (rev 19847) @@ -521,10 +521,10 @@ RtlIpv6AddressToStringExA@16 RtlIpv6AddressToStringExW@16 RtlIpv6AddressToStringW@8 -RtlIpv6StringToAddressA@16 +RtlIpv6StringToAddressA@12 RtlIpv6StringToAddressExA@16 RtlIpv6StringToAddressExW@16 -RtlIpv6StringToAddressW@16 +RtlIpv6StringToAddressW@12 RtlIsDosDeviceName_U@4 RtlIsGenericTableEmpty@4 RtlIsGenericTableEmptyAvl@4 _____ Modified: trunk/reactos/lib/rtl/network.c --- trunk/reactos/lib/rtl/network.c 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/lib/rtl/network.c 2005-12-04 03:24:11 UTC (rev 19847) @@ -233,15 +233,12 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressA( - IN LPSTR IpString, - IN ULONG Base, - OUT PVOID PtrToIpAddr, - OUT ULONG IpAddr - ) +RtlIpv6StringToAddressA(IN LPSTR Name, + OUT PULONG Unknown, + OUT PVOID IpAddr) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -249,15 +246,13 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExA( - IN LPSTR IpString, - IN ULONG Base, - OUT PULONG IpAddr, - OUT PULONG Port - ) +RtlIpv6StringToAddressExA(IN LPSTR AddressName, + IN PVOID Address, + IN PULONG ScopeId, + IN PWORD Port) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -265,15 +260,12 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressW( - IN LPWSTR IpString, - IN ULONG Base, - OUT PVOID PtrToIpAddr, - OUT ULONG IpAddr - ) +RtlIpv6StringToAddressW(IN LPWSTR Name, + OUT PULONG Unknown, + OUT PVOID IpAddr) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -281,16 +273,13 @@ */ NTSTATUS NTAPI -RtlIpv6StringToAddressExW( - IN LPWSTR IpString, - IN ULONG Base, - OUT PULONG IpAddr, - OUT PULONG Port - ) +RtlIpv6StringToAddressExW(IN LPWSTR AddressName, + IN PVOID Address, + IN PULONG ScopeId, + IN PWORD Port) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } - /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-12-04 03:24:11 UTC (rev 19847) @@ -1,11 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ke/process.c - * PURPOSE: Attaching/Detaching and System Call Tables - * - * PROGRAMMERS: Alex Ionescu (Implemented Attach/Detach and KeRemoveSystemServiceTable) - * Gregor Anich (Bugfixes to Attach Functions) + * PURPOSE: Kernel Process Management and System Call Tables + * PROGRAMMERS: Alex Ionescu + * Gregor Anich */ /* INCLUDES *****************************************************************/ @@ -19,7 +18,8 @@ KSERVICE_TABLE_DESCRIPTOR __declspec(dllexport) -KeServiceDescriptorTable[SSDT_MAX_ENTRIES] = { +KeServiceDescriptorTable[SSDT_MAX_ENTRIES] = +{ { MainSSDT, NULL, NUMBER_OF_SYSCALLS, MainSSPT }, { NULL, NULL, 0, NULL }, { NULL, NULL, 0, NULL }, @@ -27,7 +27,8 @@ }; KSERVICE_TABLE_DESCRIPTOR -KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES] = { +KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES] = +{ { MainSSDT, NULL, NUMBER_OF_SYSCALLS, MainSSPT }, { NULL, NULL, 0, NULL }, { NULL, NULL, 0, NULL }, @@ -36,9 +37,19 @@ /* FUNCTIONS *****************************************************************/ -static __inline void -UpdatePageDirs(PKTHREAD Thread, PKPROCESS Process) +PKPROCESS +STDCALL +KeGetCurrentProcess(VOID) { + return(&(PsGetCurrentProcess()->Pcb)); +} + +static __inline +VOID +NTAPI +UpdatePageDirs(IN PKTHREAD Thread, + IN PKPROCESS Process) +{ /* * The stack and the thread structure of the current process may be * located in a page which is not present in the page directory of @@ -53,24 +64,66 @@ MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); } -/* - * FUNCTION: Returns a pointer to the current process - */ -PKPROCESS -STDCALL -KeGetCurrentProcess(VOID) +VOID +NTAPI +KiAttachProcess(PKTHREAD Thread, + PKPROCESS Process, + KIRQL OldIrql, + PRKAPC_STATE SavedApcState) { - return(&(PsGetCurrentProcess()->Pcb)); + ASSERT(Process != Thread->ApcState.Process); + DPRINT("KiAttachProcess(Thread: %x, Process: %x, SavedApcState: %x\n", + Thread, Process, SavedApcState); + + /* Increase Stack Count */ + Process->StackCount++; + + /* Swap the APC Environment */ + KiMoveApcState(&Thread->ApcState, SavedApcState); + + /* Reinitialize Apc State */ + InitializeListHead(&Thread->ApcState.ApcListHead[KernelMode]); + InitializeListHead(&Thread->ApcState.ApcListHead[UserMode]); + Thread->ApcState.Process = Process; + Thread->ApcState.KernelApcInProgress = FALSE; + Thread->ApcState.KernelApcPending = FALSE; + Thread->ApcState.UserApcPending = FALSE; + + /* Update Environment Pointers if needed*/ + if (SavedApcState == &Thread->SavedApcState) + { + Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->SavedApcState; + Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->ApcState; + Thread->ApcStateIndex = AttachedApcEnvironment; + } + + /* Check if the process is paged in */ + if (Process->State == ProcessInMemory) + { + /* FIXME: Scan the Ready Thread List once new scheduler is in */ + + /* Swap the Processes */ + KiSwapProcess(Process, SavedApcState->Process); + + /* Return to old IRQL*/ + KeReleaseDispatcherDatabaseLock(OldIrql); + } + else + { + DPRINT1("Errr. ReactOS doesn't support paging out processes yet...\n"); + DbgBreakPoint(); + } } VOID -STDCALL +NTAPI KeInitializeProcess(PKPROCESS Process, KPRIORITY Priority, KAFFINITY Affinity, LARGE_INTEGER DirectoryTableBase) { - DPRINT("KeInitializeProcess. Process: %x, DirectoryTableBase: %x\n", Process, DirectoryTableBase); + DPRINT("KeInitializeProcess. Process: %x, DirectoryTableBase: %x\n", + Process, DirectoryTableBase); /* Initialize the Dispatcher Header */ KeInitializeDispatcherHeader(&Process->Header, @@ -94,7 +147,7 @@ } ULONG -STDCALL +NTAPI KeSetProcess(PKPROCESS Process, KPRIORITY Increment) { @@ -109,8 +162,8 @@ /* Signal the Process */ Process->Header.SignalState = TRUE; - if ((OldState == 0) && IsListEmpty(&Process->Header.WaitListHead) != TRUE) { - + if ((OldState == 0) && IsListEmpty(&Process->Header.WaitListHead) != TRUE) + { /* Satisfy waits */ KiWaitTest((PVOID)Process, Increment); } @@ -122,98 +175,110 @@ return OldState; } +VOID +NTAPI +KiSwapProcess(PKPROCESS NewProcess, + PKPROCESS OldProcess) +{ + DPRINT("Switching CR3 to: %x\n", NewProcess->DirectoryTableBase.u.LowPart); + Ke386SetPageTableDirectory(NewProcess->DirectoryTableBase.u.LowPart); +} + /* * @implemented */ VOID -STDCALL +NTAPI KeAttachProcess(PKPROCESS Process) { KIRQL OldIrql; - PKTHREAD Thread = KeGetCurrentThread(); - + PKTHREAD Thread; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); DPRINT("KeAttachProcess: %x\n", Process); /* Make sure that we are in the right page directory */ + Thread = KeGetCurrentThread(); UpdatePageDirs(Thread, Process); /* Lock Dispatcher */ OldIrql = KeAcquireDispatcherDatabaseLock(); - KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); - /* Crash system if DPC is being executed! */ - if (KeIsExecutingDpc()) { - - DPRINT1("Invalid attach (Thread is executing a DPC!)\n"); - KEBUGCHECK(INVALID_PROCESS_ATTACH_ATTEMPT); + /* Check if we're already in that process */ + if (Thread->ApcState.Process == Process) + { + /* Unlock the dispatcher, nothing to do */ + KeReleaseDispatcherDatabaseLock(OldIrql); } - - /* Check if the Target Process is already attached */ - if (Thread->ApcState.Process == Process || Thread->ApcStateIndex != OriginalApcEnvironment) { - - DPRINT("Process already Attached. Exitting\n"); - KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); - KeReleaseDispatcherDatabaseLock(OldIrql); - } else { - + else if ((Thread->ApcStateIndex != OriginalApcEnvironment) || + (KeIsExecutingDpc())) + { + /* Executing a DPC or already attached, crash! */ + KEBUGCHECKEX(INVALID_PROCESS_ATTACH_ATTEMPT, + (ULONG_PTR)Process, + (ULONG_PTR)Thread->ApcState.Process, + Thread->ApcStateIndex, + KeIsExecutingDpc()); + } + else + { + /* Legit attach attempt: do it! */ KiAttachProcess(Thread, Process, OldIrql, &Thread->SavedApcState); } } +/* + * @implemented + */ VOID -STDCALL -KiAttachProcess(PKTHREAD Thread, PKPROCESS Process, KIRQL ApcLock, PRKAPC_STATE SavedApcState) +NTAPI +KeDetachProcess (VOID) { + PKTHREAD Thread; + KIRQL OldIrql; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + DPRINT("KeDetachProcess()\n"); - DPRINT("KiAttachProcess(Thread: %x, Process: %x, SavedApcState: %x\n", Thread, Process, SavedApcState); + /* Get Current Thread and lock the dispatcher */ + Thread = KeGetCurrentThread(); + OldIrql = KeAcquireDispatcherDatabaseLock(); - /* Increase Stack Count */ - Process->StackCount++; + /* Check if it's attached */ + if (Thread->ApcStateIndex != OriginalApcEnvironment) + { + /* It is, decrease Stack Count */ + if(!(--Thread->ApcState.Process->StackCount)) + { + /* FIXME: Swap the process out */ + } - /* Swap the APC Environment */ - KiMoveApcState(&Thread->ApcState, SavedApcState); + /* Restore the APC State */ + KiMoveApcState(&Thread->SavedApcState, &Thread->ApcState); + Thread->SavedApcState.Process = NULL; + Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; + Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState; + Thread->ApcStateIndex = OriginalApcEnvironment; - /* Reinitialize Apc State */ - InitializeListHead(&Thread->ApcState.ApcListHead[KernelMode]); - InitializeListHead(&Thread->ApcState.ApcListHead[UserMode]); - Thread->ApcState.Process = Process; - Thread->ApcState.KernelApcInProgress = FALSE; - Thread->ApcState.KernelApcPending = FALSE; - Thread->ApcState.UserApcPending = FALSE; + /* Check if we have pending APCs */ + if (IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + { + /* What do you know, we do! Request them to be delivered */ + Thread->ApcState.KernelApcPending = TRUE; + HalRequestSoftwareInterrupt(APC_LEVEL); + } - /* Update Environment Pointers if needed*/ - if (SavedApcState == &Thread->SavedApcState) { - - Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->SavedApcState; - Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->ApcState; - Thread->ApcStateIndex = AttachedApcEnvironment; + /* Swap Processes */ + KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); } - /* Swap the Processes */ - DPRINT("Swapping\n"); - KiSwapProcess(Process, SavedApcState->Process); - - /* Return to old IRQL*/ - KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); - KeReleaseDispatcherDatabaseLock(ApcLock); - - DPRINT("KiAttachProcess Completed Sucesfully\n"); + /* Unlock Dispatcher */ + KeReleaseDispatcherDatabaseLock(OldIrql); } -VOID -STDCALL -KiSwapProcess(PKPROCESS NewProcess, - PKPROCESS OldProcess) -{ - DPRINT("Switching CR3 to: %x\n", NewProcess->DirectoryTableBase.u.LowPart); - Ke386SetPageTableDirectory(NewProcess->DirectoryTableBase.u.LowPart); -} - /* * @implemented */ BOOLEAN -STDCALL +NTAPI KeIsAttachedProcess(VOID) { /* Return the APC State */ @@ -224,39 +289,52 @@ * @implemented */ VOID -STDCALL +NTAPI KeStackAttachProcess(IN PKPROCESS Process, OUT PRKAPC_STATE ApcState) { KIRQL OldIrql; - PKTHREAD Thread = KeGetCurrentThread(); + PKTHREAD Thread; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Make sure that we are in the right page directory */ + Thread = KeGetCurrentThread(); UpdatePageDirs(Thread, Process); + /* Acquire the dispatcher lock */ OldIrql = KeAcquireDispatcherDatabaseLock(); - KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); /* Crash system if DPC is being executed! */ - if (KeIsExecutingDpc()) { - - DPRINT1("Invalid attach (Thread is executing a DPC!)\n"); - KEBUGCHECK(INVALID_PROCESS_ATTACH_ATTEMPT); + if (KeIsExecutingDpc()) + { + /* Executing a DPC, crash! */ + KEBUGCHECKEX(INVALID_PROCESS_ATTACH_ATTEMPT, + (ULONG_PTR)Process, + (ULONG_PTR)Thread->ApcState.Process, + Thread->ApcStateIndex, + KeIsExecutingDpc()); } - /* Check if the Target Process is already attached */ - if (Thread->ApcState.Process == Process) { + /* Check if we are already in the target process */ + if (Thread->ApcState.Process == Process) + { + /* Unlock the dispatcher database */ + KeReleaseDispatcherDatabaseLock(OldIrql); - ApcState->Process = (PKPROCESS)1; /* Meaning already attached to the same Process */ - - } else { - - /* Check if the Current Thread is already attached and call the Internal Function*/ - if (Thread->ApcStateIndex != OriginalApcEnvironment) { - + /* Set magic value so we don't crash later when detaching */ + ApcState->Process = (PKPROCESS)1; + } + else + { + /* Check if the Current Thread is already attached */ + if (Thread->ApcStateIndex != OriginalApcEnvironment) + { + /* We're already attached, so save the APC State into what we got */ KiAttachProcess(Thread, Process, OldIrql, ApcState); - } else { - + } + else + { + /* We're not attached, so save the APC State into SavedApcState */ KiAttachProcess(Thread, Process, OldIrql, &Thread->SavedApcState); ApcState->Process = NULL; } @@ -266,95 +344,67 @@ /* * @implemented */ -VOID STDCALL -KeDetachProcess (VOID) -{ - PKTHREAD Thread; - KIRQL OldIrql; - - DPRINT("KeDetachProcess()\n"); - - /* Get Current Thread and Lock */ - Thread = KeGetCurrentThread(); - OldIrql = KeAcquireDispatcherDatabaseLock(); - KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); - - /* Check if it's attached */ - DPRINT("Current ApcStateIndex: %x\n", Thread->ApcStateIndex); - - if (Thread->ApcStateIndex == OriginalApcEnvironment) { - - DPRINT1("Invalid detach (thread was not attached)\n"); - KEBUGCHECK(INVALID_PROCESS_DETACH_ATTEMPT); - } - - /* Decrease Stack Count */ - Thread->ApcState.Process->StackCount--; - - /* Restore the APC State */ - KiMoveApcState(&Thread->SavedApcState, &Thread->ApcState); - Thread->SavedApcState.Process = NULL; - Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; - Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState; - Thread->ApcStateIndex = OriginalApcEnvironment; - - /* Swap Processes */ - KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); - - /* Unlock Dispatcher */ - KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); - KeReleaseDispatcherDatabaseLock(OldIrql); -} - -/* - * @implemented - */ VOID -STDCALL -KeUnstackDetachProcess ( - IN PRKAPC_STATE ApcState - ) +NTAPI +KeUnstackDetachProcess(IN PRKAPC_STATE ApcState) { KIRQL OldIrql; PKTHREAD Thread; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); - /* - * If the special "We tried to attach to the process already being - * attached to" flag is there, don't do anything - */ - if (ApcState->Process == (PKPROCESS)1) return; - + /* Get the current thread and acquire the dispatcher lock */ Thread = KeGetCurrentThread(); OldIrql = KeAcquireDispatcherDatabaseLock(); - KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); - /* Sorry Buddy, can't help you if you've got APCs or just aren't attached */ - if ((Thread->ApcStateIndex == OriginalApcEnvironment) || (Thread->ApcState.KernelApcInProgress)) { + /* Check for magic value meaning we were already in the same process */ + if (ApcState->Process != (PKPROCESS)1) + { + /* + * Check if the process isn't attacked, or has a Kernel APC in progress + * or has pending APC of any kind. + */ + if ((Thread->ApcStateIndex == OriginalApcEnvironment) || + (Thread->ApcState.KernelApcInProgress) || + (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) || + (!IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]))) + { + KEBUGCHECK(INVALID_PROCESS_DETACH_ATTEMPT); + } - DPRINT1("Invalid detach (Thread not Attached, or Kernel APC in Progress!)\n"); - KEBUGCHECK(INVALID_PROCESS_DETACH_ATTEMPT); - } + /* Decrease Stack Count */ + if(!(--Thread->ApcState.Process->StackCount)) + { + /* FIXME: Swap the process out */ + } - /* Restore the Old APC State if a Process was present */ - if (ApcState->Process) { + if (ApcState->Process != NULL) + { + /* Restore the APC State */ + KiMoveApcState(ApcState, &Thread->ApcState); + } + else + { + /* The ApcState parameter is useless, so use the saved data and reset it */ + KiMoveApcState(&Thread->SavedApcState, &Thread->ApcState); + Thread->SavedApcState.Process = NULL; + Thread->ApcStateIndex = OriginalApcEnvironment; + Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; + Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState; + } - KiMoveApcState(ApcState, &Thread->ApcState); + /* Check if we have pending APCs */ + if (IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + { + /* What do you know, we do! Request them to be delivered */ + Thread->ApcState.KernelApcPending = TRUE; + HalRequestSoftwareInterrupt(APC_LEVEL); + } - } else { - - /* The ApcState parameter is useless, so use the saved data and reset it */ - KiMoveApcState(&Thread->SavedApcState, &Thread->ApcState); - Thread->SavedApcState.Process = NULL; - Thread->ApcStateIndex = OriginalApcEnvironment; - Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; - Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState; + /* Swap Processes */ + KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); } - /* Swap Processes */ - KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); - /* Return to old IRQL*/ - KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); } @@ -362,7 +412,7 @@ * @implemented */ BOOLEAN -STDCALL +NTAPI KeAddSystemServiceTable(PULONG_PTR Base, PULONG Count OPTIONAL, ULONG Limit, @@ -390,7 +440,7 @@ * @implemented */ BOOLEAN -STDCALL +NTAPI KeRemoveSystemServiceTable(IN ULONG Index) { /* Make sure the Index is valid */ _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-12-03 21:25:27 UTC (rev 19846) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-12-04 03:24:11 UTC (rev 19847) @@ -1117,10 +1117,10 @@ RtlIpv6AddressToStringExA@16 RtlIpv6AddressToStringExW@16 RtlIpv6AddressToStringW@8 -RtlIpv6StringToAddressA@16 +RtlIpv6StringToAddressA@12 RtlIpv6StringToAddressExA@16 RtlIpv6StringToAddressExW@16 -RtlIpv6StringToAddressW@16 +RtlIpv6StringToAddressW@12 RtlIsGenericTableEmpty@4 RtlIsGenericTableEmptyAvl@4 RtlIsNameLegalDOS8Dot3@12

18 years, 11 months

← Newer
1
...
62
63
64
65
66
67
68
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005