Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[ea] 13875: Win32 utility to bootstrap the PSX subsystem (it is an optional subsystem, therefore the SM does not bootstrap it on system startup).

by ea＠svn.reactos.com

Win32 utility to bootstrap the PSX subsystem (it is an optional subsystem, therefore the SM does not bootstrap it on system startup). Added: trunk/posix/apps/bootpsx/ Added: trunk/posix/apps/bootpsx/bootpsx.c Added: trunk/posix/apps/bootpsx/bootpsx.rc Added: trunk/posix/apps/bootpsx/makefile _____ Added: trunk/posix/apps/bootpsx/bootpsx.c --- trunk/posix/apps/bootpsx/bootpsx.c 2005-03-08 14:26:31 UTC (rev 13874) +++ trunk/posix/apps/bootpsx/bootpsx.c 2005-03-08 14:28:04 UTC (rev 13875) @@ -0,0 +1,121 @@ +/* $Id$ + * + * PROJECT: ReactOS Operating System / POSIX Environment Subsystem + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> + +#define NTOS_MODE_USER +#include <ntos.h> +#include <sm/helper.h> + +#define RETRY_COUNT 3 + +/********************************************************************** + * PsxCheckSubSystem/1 + */ +NTSTATUS STDCALL +PsxCheckSubSystem (LPCSTR argv0) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING DirectoryName = {0, 0, NULL}; + OBJECT_ATTRIBUTES DirectoryAttributes = {0}; + HANDLE hDir = (HANDLE) 0; + + RtlInitUnicodeString (& DirectoryName, L"\\POSIX"); + InitializeObjectAttributes (& DirectoryAttributes, + & DirectoryName, + 0,0,0); + Status = NtOpenDirectoryObject (& hDir, + DIRECTORY_TRAVERSE, + & DirectoryAttributes); + if(NT_SUCCESS(Status)) + { + NtClose (hDir); + } + + return Status; +} + +/********************************************************************** + * PsxBootstrap/1 + */ +NTSTATUS STDCALL +PsxBootstrap (LPCSTR argv0) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING Program = {0, 0, NULL}; + HANDLE SmApiPort = (HANDLE) 0; + + + printf("Connecting to the SM: "); + Status = SmConnectApiPort (NULL, + (HANDLE) 0, + IMAGE_SUBSYSTEM_UNKNOWN, + & SmApiPort); + if(!NT_SUCCESS(Status)) + { + fprintf(stderr,"\n%s: SmConnectApiPort failed with 0x%08lx\n", + argv0, Status); + return Status; + } + RtlInitUnicodeString (& Program, L"POSIX"); + Status = SmExecuteProgram (SmApiPort, & Program); + if(STATUS_SUCCESS != Status) + { + fprintf(stderr, "%s: SmExecuteProgram = %08lx\n", argv0, Status); + } + NtClose (SmApiPort); + return Status; +} + +/********************************************************************** + * + * ENTRY POINT PUBLIC + * + *********************************************************************/ +int main (int argc, char * argv []) +{ + NTSTATUS Status = STATUS_SUCCESS; + INT RetryCount = RETRY_COUNT; + + while(RetryCount > 0) + { + Status = PsxCheckSubSystem (argv[0]); + if(STATUS_SUCCESS == Status) + { + if (RETRY_COUNT == RetryCount) + { + fprintf(stderr,"POSIX already booted.\n"); + }else{ + fprintf(stderr,"POSIX booted.\n"); + } + break; + }else{ + Status = PsxBootstrap (argv[0]); + } + -- RetryCount; + } + return NT_SUCCESS(Status) ? EXIT_SUCCESS : EXIT_FAILURE; +} +/* EOF */ _____ Added: trunk/posix/apps/bootpsx/bootpsx.rc --- trunk/posix/apps/bootpsx/bootpsx.rc 2005-03-08 14:26:31 UTC (rev 13874) +++ trunk/posix/apps/bootpsx/bootpsx.rc 2005-03-08 14:28:04 UTC (rev 13875) @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "W32 Utility to boot the POSIX Subsystem\0" +#define REACTOS_STR_INTERNAL_NAME "bootpsx\0" +#define REACTOS_STR_ORIGINAL_FILENAME "bootpsx.exe\0" +#include <reactos/version.rc> _____ Added: trunk/posix/apps/bootpsx/makefile --- trunk/posix/apps/bootpsx/makefile 2005-03-08 14:26:31 UTC (rev 13874) +++ trunk/posix/apps/bootpsx/makefile 2005-03-08 14:28:04 UTC (rev 13875) @@ -0,0 +1,21 @@ +# $Id: Makefile 13504 2005-02-12 14:33:41Z ea $ + +PATH_TO_TOP = ../../../reactos + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +TARGET_NAME = bootpsx + +TARGET_SDKLIBS = ntdll.a smdll.a kernel32.a + +TARGET_OBJECTS = $(TARGET_NAME).o + +TARGET_CFLAGS = -Wall -Werror + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +# EOF

19 years, 9 months

[ea] 13874: Fixed a bug in SmConnectApiPort

by ea＠svn.reactos.com

Fixed a bug in SmConnectApiPort Modified: trunk/reactos/lib/smdll/connect.c _____ Modified: trunk/reactos/lib/smdll/connect.c --- trunk/reactos/lib/smdll/connect.c 2005-03-08 11:41:56 UTC (rev 13873) +++ trunk/reactos/lib/smdll/connect.c 2005-03-08 14:26:31 UTC (rev 13874) @@ -49,12 +49,12 @@ DPRINT("SMDLL: %s called\n", __FUNCTION__); - if (pSbApiPortName->Length > (sizeof pSbApiPortName->Buffer[0] * SM_SB_NAME_MAX_LENGTH)) + if (pSbApiPortName) { + if (pSbApiPortName->Length > (sizeof pSbApiPortName->Buffer[0] * SM_SB_NAME_MAX_LENGTH)) + { return STATUS_INVALID_PARAMETER_1; - } - if (pSbApiPortName) - { + } if (NULL == hSbApiPort || IMAGE_SUBSYSTEM_UNKNOWN == dwSubsystem) { return STATUS_INVALID_PARAMETER_MIX; @@ -73,7 +73,7 @@ SecurityQos.EffectiveOnly = TRUE; RtlInitUnicodeString (& SmApiPortName, SM_API_PORT_NAME); - +DbgPrint("SMDLL: calling NtConnectPort\n"); Status = NtConnectPort ( phSmApiPort, & SmApiPortName,

19 years, 9 months

[gvg] 13873: Properly fill DEVMODE

by gvg＠svn.reactos.com

Properly fill DEVMODE Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c _____ Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c --- trunk/reactos/drivers/video/displays/vga/main/enable.c 2005-03-08 11:15:39 UTC (rev 13872) +++ trunk/reactos/drivers/video/displays/vga/main/enable.c 2005-03-08 11:41:56 UTC (rev 13873) @@ -266,6 +266,9 @@ GDIInfoSize = sizeof(GDIINFO); } memcpy(GDIInfo, &gaulCap, GDIInfoSize); + DM->dmBitsPerPel = gaulCap.cBitsPixel * gaulCap.cPlanes; + DM->dmPelsWidth = gaulCap.ulHorzRes; + DM->dmPelsHeight = gaulCap.ulVertRes; devinfoVGA.hpalDefault = EngCreatePalette(PAL_INDEXED, 16, (ULONG *) VGApalette.PaletteEntry, 0, 0, 0); if (sizeof(DEVINFO) < DevInfoSize)

19 years, 9 months

[chorns] 13872: Have Makefile.auto depend on xml build files

by chorns＠svn.reactos.com

Have Makefile.auto depend on xml build files Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-07 22:25:39 UTC (rev 13871) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-08 11:15:39 UTC (rev 13872) @@ -61,7 +61,7 @@ lib$(SEP)kernel32$(SEP)errcodes.rc Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(WRC_TARGET) \ - $(RSYM_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) + $(RSYM_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-03-07 22:25:39 UTC (rev 13871) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-03-08 11:15:39 UTC (rev 13872) @@ -31,28 +31,12 @@ string working_directory; -class XMLInclude +XMLIncludes::~XMLIncludes() { -public: - XMLElement *e; - Path path; + for ( size_t i = 0; i < this->size(); i++ ) + delete (*this)[i]; +} - XMLInclude ( XMLElement* e_, const Path& path_ ) - : e(e_), path(path_) - { - } -}; - -class XMLIncludes : public vector<XMLInclude*> -{ -public: - ~XMLIncludes() - { - for ( size_t i = 0; i < this->size(); i++ ) - delete (*this)[i]; - } -}; - void InitWorkingDirectory() { @@ -159,7 +143,18 @@ return tmp; } -/*static*/ string +string +Path::RelativeFromWorkingDirectory () +{ + string out = ""; + for ( size_t i = 0; i < path.size(); i++ ) + { + out += "/" + path[i]; + } + return RelativeFromWorkingDirectory ( out ); +} + +string Path::RelativeFromWorkingDirectory ( const string& path ) { vector<string> vwork, vpath, vout; @@ -192,7 +187,7 @@ return out; } -/*static*/ void +void Path::Split ( vector<string>& out, const string& path, bool include_last ) @@ -500,10 +495,10 @@ // it's parsed data. Keep calling this function until it returns NULL // (no more data) XMLElement* -XMLParse(XMLFile& f, - XMLIncludes* includes, - const Path& path, - bool* pend_tag = NULL ) +XMLParse ( XMLFile& f, + XMLIncludes* includes, + const Path& path, + bool* pend_tag = NULL ) { string token; if ( !f.get_token(token) ) @@ -511,23 +506,28 @@ bool end_tag, is_include = false; while ( token[0] != '<' - || !strncmp ( token.c_str(), "<!--", 4 ) - || !strncmp ( token.c_str(), "<?", 2 ) ) + || !strncmp ( token.c_str (), "<!--", 4 ) + || !strncmp ( token.c_str (), "<?", 2 ) ) { if ( token[0] != '<' ) - throw XMLSyntaxErrorException ( f.Location(), + throw XMLSyntaxErrorException ( f.Location (), "expecting xml tag, not '%s'", - token.c_str() ); + token.c_str () ); if ( !f.get_token(token) ) return NULL; } - XMLElement* e = new XMLElement ( f.Location() ); + XMLElement* e = new XMLElement ( f.Location () ); bool bNeedEnd = e->Parse ( token, end_tag ); if ( e->name == "xi:include" && includes ) { - includes->push_back ( new XMLInclude ( e, path ) ); + XMLAttribute* att; + att = e->GetAttribute ( "href", true ); + assert ( att ); + string includeFile ( path.Fixup ( att->value, true ) ); + string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); + includes->push_back ( new XMLInclude ( e, path, topIncludeFile ) ); is_include = true; } @@ -538,7 +538,7 @@ else if ( end_tag ) { delete e; - throw XMLSyntaxErrorException ( f.Location(), + throw XMLSyntaxErrorException ( f.Location (), "end tag '%s' not expected", token.c_str() ); return NULL; @@ -546,11 +546,11 @@ return e; } bool bThisMixingErrorReported = false; - while ( f.more_tokens() ) + while ( f.more_tokens () ) { - if ( f.next_is_text() ) + if ( f.next_is_text () ) { - if ( !f.get_token ( token ) || !token.size() ) + if ( !f.get_token ( token ) || token.size () == 0 ) { throw InvalidBuildFileException ( f.Location(), @@ -559,18 +559,18 @@ } if ( e->subElements.size() && !bThisMixingErrorReported ) { - throw XMLSyntaxErrorException ( f.Location(), + throw XMLSyntaxErrorException ( f.Location (), "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } - if ( strchr ( token.c_str(), '>' ) ) + if ( strchr ( token.c_str (), '>' ) ) { - throw XMLSyntaxErrorException ( f.Location(), + throw XMLSyntaxErrorException ( f.Location (), "invalid symbol '>'" ); } - if ( e->value.size() ) + if ( e->value.size() > 0 ) { - throw XMLSyntaxErrorException ( f.Location(), + throw XMLSyntaxErrorException ( f.Location (), "multiple instances of inner text" ); e->value += " " + token; } @@ -592,16 +592,16 @@ if ( e->name != e2->name ) { delete e2; - throw XMLSyntaxErrorException ( f.Location(), + throw XMLSyntaxErrorException ( f.Location (), "end tag name mismatch" ); break; } delete e2; break; } - if ( e->value.size() && !bThisMixingErrorReported ) + if ( e->value.size () > 0 && !bThisMixingErrorReported ) { - throw XMLSyntaxErrorException ( f.Location(), + throw XMLSyntaxErrorException ( f.Location (), "mixing of inner text with sub elements" ); bThisMixingErrorReported = true; } @@ -624,31 +624,38 @@ } XMLElement* -XMLLoadInclude ( XMLElement* e, const Path& path, XMLIncludes& includes ) +XMLLoadInclude ( XMLInclude& include, + XMLIncludes& includes ) { XMLAttribute* att; - att = e->GetAttribute("href",true); + att = include.e->GetAttribute("href", true); assert(att); - string file ( path.Fixup(att->value,true) ); + string file ( include.path.Fixup(att->value, true) ); string top_file ( Path::RelativeFromWorkingDirectory ( file ) ); - e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); + include.e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) ); XMLFile fInc; if ( !fInc.open ( file ) ) { + include.fileExists = false; // look for xi:fallback element - for ( size_t i = 0; i < e->subElements.size(); i++ ) + for ( size_t i = 0; i < include.e->subElements.size (); i++ ) { - XMLElement* e2 = e->subElements[i]; + XMLElement* e2 = include.e->subElements[i]; if ( e2->name == "xi:fallback" ) { // now look for xi:include below... - for ( i = 0; i < e2->subElements.size(); i++ ) + for ( i = 0; i < e2->subElements.size (); i++ ) { XMLElement* e3 = e2->subElements[i]; if ( e3->name == "xi:include" ) { - return XMLLoadInclude ( e3, path, includes ); + att = e3->GetAttribute ( "href", true ); + assert ( att ); + string includeFile ( include.path.Fixup ( att->value, true ) ); + string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) ); + XMLInclude* fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile ); + return XMLLoadInclude ( *fallbackInclude, includes ); } } throw InvalidBuildFileException ( @@ -661,37 +668,39 @@ } else { - XMLElement* new_e = new XMLElement ( e->location ); + include.fileExists = true; + XMLElement* new_e = new XMLElement ( include.e->location ); new_e->name = "xi:included"; - Path path2 ( path, att->value ); + Path path2 ( include.path, att->value ); XMLReadFile ( fInc, *new_e, includes, path2 ); return new_e; } } XMLElement* -XMLLoadFile ( const string& filename, const Path& path ) +XMLLoadFile ( const string& filename, + const Path& path, + XMLIncludes& includes ) { - XMLIncludes includes; XMLFile f; if ( !f.open ( filename ) ) throw FileNotFoundException ( filename ); - XMLElement* head = new XMLElement("(virtual)"); + XMLElement* head = new XMLElement ( "(virtual)" ); XMLReadFile ( f, *head, includes, path ); - for ( size_t i = 0; i < includes.size(); i++ ) + for ( size_t i = 0; i < includes.size (); i++ ) { XMLElement* e = includes[i]->e; - XMLElement* e2 = XMLLoadInclude ( includes[i]->e, includes[i]->path, includes ); + XMLElement* e2 = XMLLoadInclude ( *includes[i], includes ); if ( !e2 ) { throw FileNotFoundException ( - ssprintf("%s (referenced from %s)", - e->GetAttribute("top_href",true)->value.c_str(), - f.Location().c_str() ) ); + ssprintf ( "%s (referenced from %s)", + e->GetAttribute ( "top_href", true )->value.c_str (), + f.Location ().c_str () ) ); } XMLElement* parent = e->parentElement; XMLElement** parent_container = NULL; @@ -701,7 +710,7 @@ throw Exception ( "internal tool error: xi:include doesn't have a parent" ); return NULL; } - for ( size_t j = 0; j < parent->subElements.size(); j++ ) + for ( size_t j = 0; j < parent->subElements.size (); j++ ) { if ( parent->subElements[j] == e ) { @@ -720,7 +729,7 @@ e2->name = e->name; e2->attributes = e->attributes; *parent_container = e2; - e->attributes.resize(0); + e->attributes.resize ( 0 ); delete e; } return head; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-03-07 22:25:39 UTC (rev 13871) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-03-08 11:15:39 UTC (rev 13872) @@ -1,10 +1,10 @@ -// XML.h - #ifndef XML_H #define XML_H #include "pch.h" +class XMLElement; + void InitWorkingDirectory(); @@ -23,6 +23,7 @@ Path ( const Path& cwd, const std::string& filename ); std::string Fixup ( const std::string& filename, bool include_filename ) const; + std::string RelativeFromWorkingDirectory (); static std::string RelativeFromWorkingDirectory ( const std::string& path ); static void Split ( std::vector<std::string>& out, @@ -30,6 +31,26 @@ bool include_last ); }; +class XMLInclude +{ +public: + XMLElement *e; + Path path; + std::string topIncludeFilename; + bool fileExists; + + XMLInclude ( XMLElement* e_, const Path& path_, const std::string topIncludeFilename_ ) + : e ( e_ ), path ( path_ ), topIncludeFilename ( topIncludeFilename_ ) + { + } +}; + +class XMLIncludes : public std::vector<XMLInclude*> +{ +public: + ~XMLIncludes(); +}; + class XMLFile { friend class XMLElement; @@ -86,11 +107,8 @@ }; XMLElement* -XMLLoadFile ( const std::string& filename, const Path& path ); +XMLLoadFile ( const std::string& filename, + const Path& path, + XMLIncludes& includes ); -/*XMLElement* -XMLParse(XMLFile& f, - const Path& path, - bool* pend_tag = NULL);*/ - -#endif//XML_H +#endif // XML_H _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-07 22:25:39 UTC (rev 13871) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-08 11:15:39 UTC (rev 13872) @@ -31,6 +31,7 @@ GenerateGlobalVariables (); GenerateAllTarget (); GenerateInitTarget (); + GenerateXmlBuildFilesMacro(); for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; @@ -259,6 +260,47 @@ } void +MingwBackend::GenerateXmlBuildFilesMacro() const +{ + fprintf ( fMakefile, + "XMLBUILDFILES = %s \\\n", + ProjectNode.GetProjectFilename ().c_str () ); + string xmlbuildFilenames; + int numberOfExistingFiles = 0; + for ( size_t i = 0; i < ProjectNode.xmlbuildfiles.size (); i++ ) + { + XMLInclude& xmlbuildfile = *ProjectNode.xmlbuildfiles[i]; + if ( !xmlbuildfile.fileExists ) + continue; + numberOfExistingFiles++; + if ( xmlbuildFilenames.length () > 0 ) + xmlbuildFilenames += " "; + xmlbuildFilenames += NormalizeFilename ( xmlbuildfile.topIncludeFilename ); + if ( numberOfExistingFiles % 5 == 4 || i == ProjectNode.xmlbuildfiles.size () - 1 ) + { + fprintf ( fMakefile, + "\t%s", + xmlbuildFilenames.c_str ()); + if ( i == ProjectNode.xmlbuildfiles.size () - 1 ) + { + fprintf ( fMakefile, + "\n" ); + } + else + { + fprintf ( fMakefile, + " \\\n", + xmlbuildFilenames.c_str () ); + } + xmlbuildFilenames.resize ( 0 ); + } + numberOfExistingFiles++; + } + fprintf ( fMakefile, + "\n" ); +} + +void MingwBackend::CheckAutomaticDependencies () { AutomaticDependency automaticDependency ( ProjectNode ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-07 22:25:39 UTC (rev 13871) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-08 11:15:39 UTC (rev 13872) @@ -30,6 +30,7 @@ void GenerateAllTarget () const; std::string GetBuildToolDependencies () const; void GenerateInitTarget () const; + void GenerateXmlBuildFilesMacro() const; void CheckAutomaticDependencies (); FILE* fMakefile; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-07 22:25:39 UTC (rev 13871) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-08 11:15:39 UTC (rev 13872) @@ -183,7 +183,7 @@ Project::ReadXml () { Path path; - head = XMLLoadFile ( xmlfile, path ); + head = XMLLoadFile ( xmlfile, path, xmlbuildfiles ); node = NULL; for ( size_t i = 0; i < head->subElements.size (); i++ ) { @@ -344,3 +344,11 @@ return NULL; } + +std::string +Project::GetProjectFilename () const +{ + return xmlfile; +} + + _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-07 22:25:39 UTC (rev 13871) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-08 11:15:39 UTC (rev 13872) @@ -63,6 +63,7 @@ public: std::string name; std::string makefile; + XMLIncludes xmlbuildfiles; std::vector<Module*> modules; std::vector<Include*> includes; std::vector<Define*> defines; @@ -78,6 +79,7 @@ void ProcessXML ( const std::string& path ); Module* LocateModule ( const std::string& name ); const Module* LocateModule ( const std::string& name ) const; + std::string GetProjectFilename () const; private: const Property* LookupProperty ( const std::string& name ) const; void SetConfigurationOption ( char* s,

19 years, 9 months

[gvg] 13871: Use IC instead of DC when possible

by gvg＠svn.reactos.com

Use IC instead of DC when possible Modified: trunk/reactos/lib/user32/windows/bitmap.c Modified: trunk/reactos/lib/user32/windows/icon.c _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2005-03-07 22:24:33 UTC (rev 13870) +++ trunk/reactos/lib/user32/windows/bitmap.c 2005-03-07 22:25:39 UTC (rev 13871) @@ -552,7 +552,7 @@ /* FIXME: Handle color conversion and transparency. */ - hScreenDc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); + hScreenDc = CreateCompatibleDC(NULL); if (hScreenDc == NULL) { RtlFreeHeap(GetProcessHeap(), 0, PrivateInfo); _____ Modified: trunk/reactos/lib/user32/windows/icon.c --- trunk/reactos/lib/user32/windows/icon.c 2005-03-07 22:24:33 UTC (rev 13870) +++ trunk/reactos/lib/user32/windows/icon.c 2005-03-07 22:25:39 UTC (rev 13871) @@ -566,7 +566,7 @@ HDC hdc; int ColorBits; - hdc = GetDC(0); + hdc = CreateICW(NULL, NULL, NULL, NULL); if (Flags & LR_MONOCHROME) { ColorBits = 1; @@ -577,7 +577,7 @@ if (ColorBits > 8) ColorBits = 8; } - ReleaseDC(0, hdc); + DeleteDC(hdc); entry = CURSORICON_FindBestIcon( dir, cxDesired, cyDesired, ColorBits );

19 years, 9 months

[gvg] 13870: Implement Information Contexts

by gvg＠svn.reactos.com

Implement Information Contexts Modified: trunk/reactos/include/win32k/dc.h Modified: trunk/reactos/subsys/win32k/include/intgdi.h Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/print.c Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/include/win32k/dc.h --- trunk/reactos/include/win32k/dc.h 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/include/win32k/dc.h 2005-03-07 22:24:33 UTC (rev 13870) @@ -104,6 +104,7 @@ XLATEOBJ *XlatePen; INT saveLevel; + BOOL IsIC; WIN_DC_INFO w; } DC, *PDC; @@ -136,6 +137,8 @@ DEVINFO DevInfo; DRIVER_FUNCTIONS DriverFunctions; PFILE_OBJECT VideoFileObject; + BOOLEAN PreparedDriver; + ULONG DisplayNumber; GDIPOINTER Pointer; _____ Modified: trunk/reactos/subsys/win32k/include/intgdi.h --- trunk/reactos/subsys/win32k/include/intgdi.h 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/include/intgdi.h 2005-03-07 22:24:33 UTC (rev 13870) @@ -130,7 +130,8 @@ IntGdiCreateDC(PUNICODE_STRING Driver, PUNICODE_STRING Device, PUNICODE_STRING Output, - CONST PDEVMODEW InitData); + CONST PDEVMODEW InitData, + BOOL CreateAsIC); COLORREF FASTCALL IntGetDCColor(HDC hDC, ULONG Object); _____ Modified: trunk/reactos/subsys/win32k/ntuser/metric.c --- trunk/reactos/subsys/win32k/ntuser/metric.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/ntuser/metric.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -42,7 +42,6 @@ { NTSTATUS Status; PWINSTATION_OBJECT WinStaObject; - PWINDOW_OBJECT DesktopWindow; ULONG Width, Height, Result; Result = 0; @@ -156,19 +155,26 @@ return(27); case SM_CXSCREEN: case SM_CYSCREEN: - DesktopWindow = IntGetWindowObject(IntGetDesktopWindow()); - if (NULL != DesktopWindow) - { - Width = DesktopWindow->WindowRect.right; - Height = DesktopWindow->WindowRect.bottom; - } - else - { - Width = 640; - Height = 480; - } - IntReleaseWindowObject(DesktopWindow); + { + HDC ScreenDCHandle; + PDC ScreenDC; + + Width = 640; + Height = 480; + ScreenDCHandle = IntGdiCreateDC(NULL, NULL, NULL, NULL, TRUE); + if (NULL != ScreenDCHandle) + { + ScreenDC = DC_LockDc(ScreenDCHandle); + if (NULL != ScreenDC) + { + Width = ScreenDC->DMW.dmPelsWidth; + Height = ScreenDC->DMW.dmPelsHeight; + DC_UnlockDc(ScreenDCHandle); + } + NtGdiDeleteDC(ScreenDCHandle); + } return SM_CXSCREEN == Index ? Width : Height; + } case SM_CXSIZE: case SM_CYSIZE: return(18); _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -132,7 +132,7 @@ /* No real locking, just get the pointer */ DCEOBJ_UnlockDCE(DceHandle); Dce->Self = DceHandle; - Dce->hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL); + Dce->hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); if (NULL == defaultDCstate) { defaultDCstate = NtGdiGetDCState(Dce->hDC); _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -189,7 +189,7 @@ return FALSE; } RtlInitUnicodeString(&DriverName, L"DISPLAY"); - ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL); + ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); if (NULL == ScreenDeviceContext) { IntDestroyPrimarySurface(); _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -59,6 +59,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCDest->IsIC) + { + DC_UnlockDc(hDCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if (UsesSource) { @@ -72,6 +78,13 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCSrc->IsIC) + { + DC_UnlockDc(hDCSrc); + DC_UnlockDc(hDCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } } else { @@ -258,6 +271,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCDest->IsIC) + { + DC_UnlockDc(hdcDst); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if((hdcDst != hdcSrc) && !(DCSrc = DC_LockDc(hdcSrc))) { @@ -270,6 +289,16 @@ { DCSrc = DCDest; } + if (DCSrc->IsIC) + { + DC_UnlockDc(hdcSrc); + if(hdcDst != hdcSrc) + { + DC_UnlockDc(hdcDst); + } + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } /* Offset positions */ xDst += DCDest->w.DCOrgX; @@ -575,6 +604,11 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return Result; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + return Result; + } XPos += dc->w.DCOrgX; YPos += dc->w.DCOrgY; if ( IN_RECT(dc->CombinedClip->rclBounds,XPos,YPos) ) @@ -1039,6 +1073,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCDest->IsIC) + { + DC_UnlockDc(hDCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if (UsesSource) { @@ -1052,6 +1092,13 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCSrc->IsIC) + { + DC_UnlockDc(hDCSrc); + DC_UnlockDc(hDCDest); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } } else { _____ Modified: trunk/reactos/subsys/win32k/objects/brush.c --- trunk/reactos/subsys/win32k/objects/brush.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/brush.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -266,6 +266,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } for (r = pRects, i = 0; i < cRects; i++) { @@ -466,6 +472,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } BrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); if (BrushObj == NULL) _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/dc.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -136,7 +136,7 @@ if (hDC == NULL) { RtlInitUnicodeString(&DriverName, L"DISPLAY"); - DisplayDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL); + DisplayDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, TRUE); if (NULL == DisplayDC) { return NULL; @@ -169,6 +169,7 @@ /* Copy information from original DC to new DC */ NewDC->hSelf = hNewDC; + NewDC->IsIC = FALSE; NewDC->PDev = OrigDC->PDev; NewDC->DMW = OrigDC->DMW; @@ -454,19 +455,16 @@ return Valid; } -BOOL FASTCALL -IntCreatePrimarySurface() +static BOOL FASTCALL +IntPrepareDriver() { PGD_ENABLEDRIVER GDEnableDriver; DRVENABLEDATA DED; - SURFOBJ *SurfObj; - SIZEL SurfSize; UNICODE_STRING DriverFileNames; PWSTR CurrentName; BOOL GotDriver; BOOL DoDefault; ULONG DisplayNumber; - RECTL SurfaceRect; for (DisplayNumber = 0; ; DisplayNumber++) { @@ -488,7 +486,6 @@ if (!FindDriverFileNames(&DriverFileNames, DisplayNumber)) { DPRINT1("FindDriverFileNames failed\n"); - /* return FALSE; */ continue; } @@ -543,7 +540,6 @@ { ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("No suitable DDI driver found\n"); - /* return FALSE; */ continue; } @@ -608,7 +604,6 @@ ObDereferenceObject(PrimarySurface.VideoFileObject); DPRINT1("DrvEnablePDEV with default parameters failed\n"); DPRINT1("Perhaps DDI driver doesn't match miniport driver?\n"); - /* return FALSE; */ continue; } } @@ -623,7 +618,7 @@ DPRINT("Adjusting GDIInfo.ulLogPixelsY\n"); PrimarySurface.GDIInfo.ulLogPixelsY = 96; } - + PrimarySurface.Pointer.Exclude.right = -1; DPRINT("calling completePDev\n"); @@ -637,43 +632,66 @@ DRIVER_ReferenceDriver(L"DISPLAY"); - DPRINT("calling EnableSurface\n"); + PrimarySurface.PreparedDriver = TRUE; + PrimarySurface.DisplayNumber = DisplayNumber; - /* Enable the drawing surface */ - PrimarySurface.Handle = - PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.PDev); - if (NULL == PrimarySurface.Handle) - { -/* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE);*/ - PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); - ObDereferenceObject(PrimarySurface.VideoFileObject); - DPRINT1("DrvEnableSurface failed\n"); - /* return FALSE; */ - continue; - } + return TRUE; + } - /* attach monitor */ - IntAttachMonitor(&PrimarySurface, DisplayNumber); + return FALSE; +} - SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); - SurfObj->dhpdev = PrimarySurface.PDev; - SurfSize = SurfObj->sizlBitmap; - SurfSize = SurfObj->sizlBitmap; - SurfaceRect.left = SurfaceRect.top = 0; - SurfaceRect.right = SurfObj->sizlBitmap.cx; - SurfaceRect.bottom = SurfObj->sizlBitmap.cy; - /* FIXME - why does EngEraseSurface() sometimes crash? - EngEraseSurface(SurfObj, &SurfaceRect, 0); */ +static BOOL FASTCALL +IntPrepareDriverIfNeeded() +{ + return (PrimarySurface.PreparedDriver ? TRUE : IntPrepareDriver()); +} - /* Put the pointer in the center of the screen */ - GDIDEV(SurfObj)->Pointer.Pos.x = (SurfaceRect.right - SurfaceRect.left) / 2; - GDIDEV(SurfObj)->Pointer.Pos.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; +BOOL FASTCALL +IntCreatePrimarySurface() +{ + SIZEL SurfSize; + RECTL SurfaceRect; + SURFOBJ *SurfObj; - EngUnlockSurface(SurfObj); - IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy); - break; + if (! IntPrepareDriverIfNeeded()) + { + return FALSE; } + DPRINT("calling EnableSurface\n"); + /* Enable the drawing surface */ + PrimarySurface.Handle = + PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.PDev); + if (NULL == PrimarySurface.Handle) + { +/* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE);*/ + PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); + ObDereferenceObject(PrimarySurface.VideoFileObject); + DPRINT1("DrvEnableSurface failed\n"); + return FALSE; + } + + /* attach monitor */ + IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); + + SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); + SurfObj->dhpdev = PrimarySurface.PDev; + SurfSize = SurfObj->sizlBitmap; + SurfSize = SurfObj->sizlBitmap; + SurfaceRect.left = SurfaceRect.top = 0; + SurfaceRect.right = SurfObj->sizlBitmap.cx; + SurfaceRect.bottom = SurfObj->sizlBitmap.cy; + /* FIXME - why does EngEraseSurface() sometimes crash? + EngEraseSurface(SurfObj, &SurfaceRect, 0); */ + + /* Put the pointer in the center of the screen */ + GDIDEV(SurfObj)->Pointer.Pos.x = (SurfaceRect.right - SurfaceRect.left) / 2; + GDIDEV(SurfObj)->Pointer.Pos.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; + + EngUnlockSurface(SurfObj); + IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy); + return TRUE; } @@ -694,6 +712,7 @@ PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.PDev, FALSE); PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.PDev); PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); + PrimarySurface.PreparedDriver = FALSE; DceEmptyCache(); @@ -704,7 +723,8 @@ IntGdiCreateDC(PUNICODE_STRING Driver, PUNICODE_STRING Device, PUNICODE_STRING Output, - CONST PDEVMODEW InitData) + CONST PDEVMODEW InitData, + BOOL CreateAsIC) { HDC hNewDC; PDC NewDC; @@ -714,11 +734,19 @@ UNICODE_STRING StdDriver; RtlInitUnicodeString(&StdDriver, L"DISPLAY"); - + if (NULL == Driver || 0 == RtlCompareUnicodeString(Driver, &StdDriver, TRUE)) { - if (! IntGraphicsCheck(TRUE)) + if (CreateAsIC) { + if (! IntPrepareDriverIfNeeded()) + { + DPRINT1("Unable to prepare graphics driver, returning NULL ic\n"); + return NULL; + } + } + else if (! IntGraphicsCheck(TRUE)) + { DPRINT1("Unable to initialize graphics, returning NULL dc\n"); return NULL; } @@ -750,6 +778,7 @@ return NULL; } + NewDC->IsIC = CreateAsIC; NewDC->DMW = PrimarySurface.DMW; NewDC->DevInfo = &PrimarySurface.DevInfo; NewDC->GDIInfo = &PrimarySurface.GDIInfo; @@ -763,43 +792,46 @@ NewDC->DMW.dmSize = sizeof(NewDC->DMW); NewDC->DMW.dmFields = 0x000fc000; - /* FIXME: get mode selection information from somewhere */ + NewDC->DMW.dmLogPixels = 96; + NewDC->w.bitsPerPixel = NewDC->DMW.dmBitsPerPel; // FIXME: set this here?? + DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); - NewDC->DMW.dmLogPixels = 96; - SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); - if ( !SurfObj ) + if (! CreateAsIC) { - DC_UnlockDc ( hNewDC ); - DC_FreeDC ( hNewDC) ; - return NULL; - } - NewDC->DMW.dmBitsPerPel = BitsPerFormat(SurfObj->iBitmapFormat); - NewDC->DMW.dmPelsWidth = SurfObj->sizlBitmap.cx; - NewDC->DMW.dmPelsHeight = SurfObj->sizlBitmap.cy; - NewDC->DMW.dmDisplayFlags = 0; - NewDC->DMW.dmDisplayFrequency = 0; + SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); + if ( !SurfObj ) + { + DC_UnlockDc ( hNewDC ); + DC_FreeDC ( hNewDC) ; + return NULL; + } + ASSERT(NewDC->DMW.dmBitsPerPel == BitsPerFormat(SurfObj->iBitmapFormat)); + ASSERT(NewDC->DMW.dmPelsWidth == SurfObj->sizlBitmap.cx); + ASSERT(NewDC->DMW.dmPelsHeight == SurfObj->sizlBitmap.cy); - NewDC->w.bitsPerPixel = NewDC->DMW.dmBitsPerPel; // FIXME: set this here?? - NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; - NewDC->w.ROPmode = R2_COPYPEN; - - DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); + NewDC->w.hPalette = NewDC->DevInfo->hpalDefault; + NewDC->w.ROPmode = R2_COPYPEN; - DC_UnlockDc( hNewDC ); + DC_UnlockDc( hNewDC ); - hVisRgn = NtGdiCreateRectRgn(0, 0, SurfObj->sizlBitmap.cx, - SurfObj->sizlBitmap.cy); - NtGdiSelectVisRgn(hNewDC, hVisRgn); - NtGdiDeleteObject(hVisRgn); + hVisRgn = NtGdiCreateRectRgn(0, 0, SurfObj->sizlBitmap.cx, + SurfObj->sizlBitmap.cy); + NtGdiSelectVisRgn(hNewDC, hVisRgn); + NtGdiDeleteObject(hVisRgn); - /* Initialize the DC state */ - DC_InitDC(hNewDC); - NtGdiSetTextColor(hNewDC, RGB(0, 0, 0)); - NtGdiSetTextAlign(hNewDC, TA_TOP); - NtGdiSetBkColor(hNewDC, RGB(255, 255, 255)); - NtGdiSetBkMode(hNewDC, OPAQUE); + /* Initialize the DC state */ + DC_InitDC(hNewDC); + NtGdiSetTextColor(hNewDC, RGB(0, 0, 0)); + NtGdiSetTextAlign(hNewDC, TA_TOP); + NtGdiSetBkColor(hNewDC, RGB(255, 255, 255)); + NtGdiSetBkMode(hNewDC, OPAQUE); - EngUnlockSurface(SurfObj); + EngUnlockSurface(SurfObj); + } + else + { + DC_UnlockDc( hNewDC ); + } return hNewDC; } @@ -847,7 +879,7 @@ } } - Ret = IntGdiCreateDC(&SafeDriver, &SafeDevice, NULL, &SafeInitData); + Ret = IntGdiCreateDC(&SafeDriver, &SafeDevice, NULL, &SafeInitData, FALSE); return Ret; } @@ -856,10 +888,50 @@ NtGdiCreateIC(PUNICODE_STRING Driver, PUNICODE_STRING Device, PUNICODE_STRING Output, - CONST PDEVMODEW DevMode) + CONST PDEVMODEW InitData) { - /* FIXME: this should probably do something else... */ - return NtGdiCreateDC(Driver, Device, Output, DevMode); + UNICODE_STRING SafeDriver, SafeDevice; + DEVMODEW SafeInitData; + HDC Ret; + NTSTATUS Status; + + if(InitData) + { + Status = MmCopyFromCaller(&SafeInitData, InitData, sizeof(DEVMODEW)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + /* FIXME - InitData can have some more bytes! */ + } + + if(Driver) + { + Status = IntSafeCopyUnicodeString(&SafeDriver, Driver); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return NULL; + } + } + + if(Device) + { + Status = IntSafeCopyUnicodeString(&SafeDevice, Device); + if(!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&SafeDriver); + SetLastNtError(Status); + return NULL; + } + } + + Ret = IntGdiCreateDC(NULL == Driver ? NULL : &SafeDriver, + NULL == Device ? NULL : &SafeDevice, NULL, + NULL == InitData ? NULL : &SafeInitData, TRUE); + + return Ret; } BOOL STDCALL @@ -1144,6 +1216,7 @@ newdc->hSelf = hnewdc; newdc->saveLevel = 0; + newdc->IsIC = dc->IsIC; #if 0 PATH_InitGdiPath( &newdc->w.path ); _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -27,6 +27,11 @@ PBITMAPOBJ BitmapObj; if (!(dc = DC_LockDc(hDC))) return 0; + if (dc->IsIC) + { + DC_UnlockDc(hDC); + return 0; + } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); if (BitmapObj == NULL) @@ -73,6 +78,11 @@ PBITMAPOBJ BitmapObj; if (!(dc = DC_LockDc(hDC))) return 0; + if (dc->IsIC) + { + DC_UnlockDc(hDC); + return 0; + } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); if (BitmapObj == NULL) @@ -264,6 +274,11 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + if (Dc->IsIC) + { + DC_UnlockDc(hDC); + return 0; + } Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse); @@ -325,6 +340,11 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + if (Dc->IsIC) + { + DC_UnlockDc(hDC); + return 0; + } hSourcePalette = Dc->w.hPalette; /* FIXME: This is incorrect. hDestPalette should be something other. */ hDestPalette = Dc->DevInfo->hpalDefault; _____ Modified: trunk/reactos/subsys/win32k/objects/fillshap.c --- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -237,6 +237,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } FillBrush = BRUSHOBJ_LockBrush(dc->w.hBrush); if (NULL == FillBrush) @@ -664,6 +670,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } FillBrushObj = BRUSHOBJ_LockBrush(dc->w.hBrush); if (NULL == FillBrushObj) @@ -844,6 +856,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); else { + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_SHAPE); if(!Safept) SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -883,6 +901,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(Count > 0) { @@ -1061,6 +1085,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } ret = IntRectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); DC_UnlockDc ( hDC ); @@ -1358,6 +1388,12 @@ DPRINT1("NtGdiRoundRect() - hDC is invalid\n"); SetLastWin32Error(ERROR_INVALID_HANDLE); } + else if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + ret = TRUE; + } else { ret = IntRoundRect ( dc, LeftRect, TopRect, RightRect, BottomRect, Width, Height ); @@ -1490,6 +1526,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hdc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(!pVertex || !uVertex || !pMesh || !uMesh) { DC_UnlockDc(hdc); _____ Modified: trunk/reactos/subsys/win32k/objects/line.c --- trunk/reactos/subsys/win32k/objects/line.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/line.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -368,6 +368,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } Ret = IntGdiArc(dc, LeftRect, @@ -404,6 +410,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } // Line from current position to starting point of arc if ( !IntGdiLineTo(dc, XRadial1, YRadial1) ) @@ -466,6 +478,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } Ret = IntGdiLineTo(dc, XEnd, YEnd); @@ -491,6 +509,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(Point) { @@ -526,6 +550,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(Count > 0) { @@ -577,6 +607,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(Count > 0) { @@ -639,6 +675,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(Count >= 2) { @@ -690,6 +732,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(Count > 0) { @@ -743,6 +791,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if(Count > 0) { _____ Modified: trunk/reactos/subsys/win32k/objects/print.c --- trunk/reactos/subsys/win32k/objects/print.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/print.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -158,6 +158,11 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return -1; } + if ( pDC->IsIC ) + { + DC_UnlockDc(hDC); + return 0; + } if ( InSize && UnsafeInData ) { _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-03-07 18:31:10 UTC (rev 13869) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-03-07 22:24:33 UTC (rev 13870) @@ -1534,6 +1534,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (dc->IsIC) + { + DC_UnlockDc(hDC); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } if (NULL != UnsafeDx && Count > 0) {

19 years, 9 months

[chorns] 13869: Escape "

by chorns＠svn.reactos.com

Escape " Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.mc _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.mc --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.mc 2005-03-07 16:40:32 UTC (rev 13868) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.mc 2005-03-07 18:31:10 UTC (rev 13869) @@ -2477,7 +2477,7 @@ Facility=System SymbolicName=ERROR_DEVICE_ENUMERATION_ERROR Language=English -ERROR_DEVICE_ENUMERATION_ERROR - The "%hs" encountered an error while applying power or reading the device configuration. This may be caused by a failure of your hardware or by a poor connection. +ERROR_DEVICE_ENUMERATION_ERROR - The \"%hs\" encountered an error while applying power or reading the device configuration. This may be caused by a failure of your hardware or by a poor connection. . MessageId=649 @@ -2981,7 +2981,7 @@ Facility=System SymbolicName=ERROR_CARDBUS_NOT_SUPPORTED Language=English -ERROR_CARDBUS_NOT_SUPPORTED - The device "%hs" has detected a CardBus card in its slot, but the firmware on this system is not configured to allow the CardBus controller to be run in CardBus mode. The operating system will currently accept only 16-bit (R2) pc-cards on this controller. +ERROR_CARDBUS_NOT_SUPPORTED - The device \"%hs\" has detected a CardBus card in its slot, but the firmware on this system is not configured to allow the CardBus controller to be run in CardBus mode. The operating system will currently accept only 16-bit (R2) pc-cards on this controller. . MessageId=725 @@ -16489,7 +16489,7 @@ Facility=System SymbolicName=ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE Language=English -ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE - The manifest has a default namespace specified on the assembly element but its value is not "urn:schemas-microsoft-com:asm.v1". +ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE - The manifest has a default namespace specified on the assembly element but its value is not \"urn:schemas-microsoft-com:asm.v1\". . MessageId=14020 @@ -16865,7 +16865,7 @@ Facility=System SymbolicName=ERROR_SXS_XML_E_RESERVEDNAMESPACE Language=English -ERROR_SXS_XML_E_RESERVEDNAMESPACE - Manifest Parse Error : The namespace prefix is not allowed to start with the reserved string "xml". +ERROR_SXS_XML_E_RESERVEDNAMESPACE - Manifest Parse Error : The namespace prefix is not allowed to start with the reserved string \"xml\". . MessageId=14067

19 years, 9 months

[hbirr] 13868: Split some of the halmp files according its functions.

by hbirr＠svn.reactos.com

Split some of the halmp files according its functions. Modified: trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/include/apic.h Modified: trunk/reactos/hal/halx86/include/hal.h Added: trunk/reactos/hal/halx86/include/ioapic.h Modified: trunk/reactos/hal/halx86/include/mps.h Modified: trunk/reactos/hal/halx86/mp/Makefile Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c Added: trunk/reactos/hal/halx86/mp/ioapic.c Added: trunk/reactos/hal/halx86/mp/mpconfig.c Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c _____ Modified: trunk/reactos/hal/halx86/generic/timer.c --- trunk/reactos/hal/halx86/generic/timer.c 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/generic/timer.c 2005-03-07 16:40:32 UTC (rev 13868) @@ -165,7 +165,7 @@ } -static VOID WaitFor8254Wraparound(VOID) +VOID WaitFor8254Wraparound(VOID) { ULONG CurCount, PrevCount = ~0; LONG Delta; _____ Modified: trunk/reactos/hal/halx86/include/apic.h --- trunk/reactos/hal/halx86/include/apic.h 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/include/apic.h 2005-03-07 16:40:32 UTC (rev 13868) @@ -145,7 +145,16 @@ #define APIC_INTEGRATED(version) (version & 0xF0) +typedef enum { + amPIC = 0, /* IMCR and PIC compatibility mode */ + amVWIRE /* Virtual Wire compatibility mode */ +} APIC_MODE; + +#ifdef CONFIG_SMP #define MAX_CPU 32 +#else +#define MAX_CPU 1 +#endif /* * Local APIC timer IRQ vector is on a different priority level, @@ -158,6 +167,11 @@ #define ERROR_VECTOR 0xFE #define SPURIOUS_VECTOR 0xFF /* Must be 0xXF */ +/* CPU flags */ +#define CPU_USABLE 0x01 /* 1 if the CPU is usable (ie. can be used) */ +#define CPU_ENABLED 0x02 /* 1 if the CPU is enabled */ +#define CPU_BSP 0x04 /* 1 if the CPU is the bootstrap processor */ +#define CPU_TSC 0x08 /* 1 if the CPU has a time stamp counter */ typedef struct _CPU_INFO { @@ -170,23 +184,26 @@ UCHAR Padding[16-12]; /* Padding to 16-byte */ } CPU_INFO, *PCPU_INFO; +extern ULONG CPUCount; /* Total number of CPUs */ +extern ULONG BootCPU; /* Bootstrap processor */ +extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ +extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ /* Prototypes */ - +inline VOID APICWrite(ULONG Offset, ULONG Value); inline ULONG APICRead(ULONG Offset); -inline VOID APICWrite(ULONG Offset, ULONG Value); VOID APICSendIPI(ULONG Target, ULONG Mode); - -ULONG APICGetMaxLVT(VOID); VOID APICSetup(VOID); VOID HaliInitBSP(VOID); VOID APICSyncArbIDs(VOID); inline VOID APICSendEOI(VOID); +VOID APICCalibrateTimer(ULONG CPU); +VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); static inline ULONG ThisCPU(VOID) { - return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; } _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/include/hal.h 2005-03-07 16:40:32 UTC (rev 13868) @@ -413,6 +413,8 @@ #define Ki386EnableInterrupts() __asm__ __volatile__("sti\n\t") #define Ki386HaltProcessor() __asm__ __volatile__("hlt\n\t") #define Ki386RdTSC(x) __asm__ __volatile__("rdtsc\n\t" : "=A" (x.u.LowPart), "=d" (x.u.HighPart)); +#define Ki386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) +#define Ki386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) static inline BYTE Ki386ReadFsByte(ULONG offset) { _____ Added: trunk/reactos/hal/halx86/include/ioapic.h --- trunk/reactos/hal/halx86/include/ioapic.h 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/include/ioapic.h 2005-03-07 16:40:32 UTC (rev 13868) @@ -0,0 +1,101 @@ +/* + * + */ + +#ifndef __INTERNAL_HAL_IOAPIC_H +#define __INTERNAL_HAL_IOAPIC_H + +/* I/O APIC Register Address Map */ +#define IOAPIC_IOREGSEL 0x0000 /* I/O Register Select (index) (R/W) */ +#define IOAPIC_IOWIN 0x0010 /* I/O window (data) (R/W) */ + +#define IOAPIC_ID 0x0000 /* IO APIC ID (R/W) */ +#define IOAPIC_VER 0x0001 /* IO APIC Version (R) */ +#define IOAPIC_ARB 0x0002 /* IO APIC Arbitration ID (R) */ +#define IOAPIC_REDTBL 0x0010 /* Redirection Table (0-23 64-bit registers) (R/W) */ + +#define IOAPIC_ID_MASK (0xF << 24) +#define GET_IOAPIC_ID(x) (((x) & IOAPIC_ID_MASK) >> 24) +#define SET_IOAPIC_ID(x) ((x) << 24) + +#define IOAPIC_VER_MASK (0xFF) +#define GET_IOAPIC_VERSION(x) (((x) & IOAPIC_VER_MASK)) +#define IOAPIC_MRE_MASK (0xFF << 16) /* Maximum Redirection Entry */ +#define GET_IOAPIC_MRE(x) (((x) & IOAPIC_MRE_MASK) >> 16) + +#define IOAPIC_ARB_MASK (0xF << 24) +#define GET_IOAPIC_ARB(x) (((x) & IOAPIC_ARB_MASK) >> 24) + +#define IOAPIC_TBL_DELMOD (0x7 << 10) /* Delivery Mode (see APIC_DM_*) */ +#define IOAPIC_TBL_DM (0x1 << 11) /* Destination Mode */ +#define IOAPIC_TBL_DS (0x1 << 12) /* Delivery Status */ +#define IOAPIC_TBL_INTPOL (0x1 << 13) /* Interrupt Input Pin Polarity */ +#define IOAPIC_TBL_RIRR (0x1 << 14) /* Remote IRR */ +#define IOAPIC_TBL_TM (0x1 << 15) /* Trigger Mode */ +#define IOAPIC_TBL_IM (0x1 << 16) /* Interrupt Mask */ +#define IOAPIC_TBL_DF0 (0xF << 56) /* Destination Field (physical mode) */ +#define IOAPIC_TBL_DF1 (0xFF<< 56) /* Destination Field (logical mode) */ +#define IOAPIC_TBL_VECTOR (0xFF << 0) /* Vector (10h - FEh) */ + +typedef struct _IOAPIC_ROUTE_ENTRY { + ULONG vector : 8, + delivery_mode : 3, /* 000: FIXED + * 001: lowest priority + * 111: ExtINT + */ + dest_mode : 1, /* 0: physical, 1: logical */ + delivery_status : 1, + polarity : 1, + irr : 1, + trigger : 1, /* 0: edge, 1: level */ + mask : 1, /* 0: enabled, 1: disabled */ + __reserved_2 : 15; + + union { + struct { + ULONG __reserved_1 : 24, + physical_dest : 4, + __reserved_2 : 4; + } physical; + struct { + ULONG __reserved_1 : 24, + logical_dest : 8; + } logical; + } dest; +} __attribute__ ((packed)) IOAPIC_ROUTE_ENTRY, *PIOAPIC_ROUTE_ENTRY; + +typedef struct _IOAPIC_INFO +{ + ULONG ApicId; /* APIC ID */ + ULONG ApicVersion; /* APIC version */ + ULONG ApicAddress; /* APIC address */ + ULONG EntryCount; /* Number of redirection entries */ +} IOAPIC_INFO, *PIOAPIC_INFO; + +#define IOAPIC_DEFAULT_BASE 0xFEC00000 /* Default I/O APIC Base Register Address */ + +extern ULONG IRQCount; /* Number of IRQs */ +extern UCHAR BUSMap[MAX_BUS]; /* Map of all buses in the system */ +extern UCHAR PCIBUSMap[MAX_BUS]; /* Map of all PCI buses in the system */ +extern IOAPIC_INFO IOAPICMap[MAX_IOAPIC]; /* Map of all I/O APICs in the system */ +extern ULONG IOAPICCount; /* Number of I/O APICs in the system */ +extern ULONG APICMode; /* APIC mode at startup */ +extern MP_CONFIGURATION_INTSRC IRQMap[MAX_IRQ_SOURCE]; /* Map of all IRQs */ + +VOID IOAPICSetupIrqs(VOID); +VOID IOAPICEnable(VOID); +VOID IOAPICSetupIds(VOID); +VOID IOAPICMaskIrq(ULONG Irq); +VOID IOAPICUnmaskIrq(ULONG Irq); + +VOID HaliReconfigurePciInterrupts(VOID); + +/* For debugging */ +VOID IOAPICDump(VOID); + +#endif + + + +/* EOF */ + _____ Modified: trunk/reactos/hal/halx86/include/mps.h --- trunk/reactos/hal/halx86/include/mps.h 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/include/mps.h 2005-03-07 16:40:32 UTC (rev 13868) @@ -9,77 +9,7 @@ #define IRQL2TPR(irql) ((irql) >= IPI_LEVEL ? IPI_VECTOR : ((irql) >= PROFILE_LEVEL ? LOCAL_TIMER_VECTOR : ((irql) > DISPATCH_LEVEL ? IRQL2VECTOR(irql) : 0))) -#define IOAPIC_DEFAULT_BASE 0xFEC00000 /* Default I/O APIC Base Register Address */ -/* I/O APIC Register Address Map */ -#define IOAPIC_IOREGSEL 0x0000 /* I/O Register Select (index) (R/W) */ -#define IOAPIC_IOWIN 0x0010 /* I/O window (data) (R/W) */ - -#define IOAPIC_ID 0x0000 /* IO APIC ID (R/W) */ -#define IOAPIC_VER 0x0001 /* IO APIC Version (R) */ -#define IOAPIC_ARB 0x0002 /* IO APIC Arbitration ID (R) */ -#define IOAPIC_REDTBL 0x0010 /* Redirection Table (0-23 64-bit registers) (R/W) */ - -#define IOAPIC_ID_MASK (0xF << 24) -#define GET_IOAPIC_ID(x) (((x) & IOAPIC_ID_MASK) >> 24) -#define SET_IOAPIC_ID(x) ((x) << 24) - -#define IOAPIC_VER_MASK (0xFF) -#define GET_IOAPIC_VERSION(x) (((x) & IOAPIC_VER_MASK)) -#define IOAPIC_MRE_MASK (0xFF << 16) /* Maximum Redirection Entry */ -#define GET_IOAPIC_MRE(x) (((x) & IOAPIC_MRE_MASK) >> 16) - -#define IOAPIC_ARB_MASK (0xF << 24) -#define GET_IOAPIC_ARB(x) (((x) & IOAPIC_ARB_MASK) >> 24) - -#define IOAPIC_TBL_DELMOD (0x7 << 10) /* Delivery Mode (see APIC_DM_*) */ -#define IOAPIC_TBL_DM (0x1 << 11) /* Destination Mode */ -#define IOAPIC_TBL_DS (0x1 << 12) /* Delivery Status */ -#define IOAPIC_TBL_INTPOL (0x1 << 13) /* Interrupt Input Pin Polarity */ -#define IOAPIC_TBL_RIRR (0x1 << 14) /* Remote IRR */ -#define IOAPIC_TBL_TM (0x1 << 15) /* Trigger Mode */ -#define IOAPIC_TBL_IM (0x1 << 16) /* Interrupt Mask */ -#define IOAPIC_TBL_DF0 (0xF << 56) /* Destination Field (physical mode) */ -#define IOAPIC_TBL_DF1 (0xFF<< 56) /* Destination Field (logical mode) */ -#define IOAPIC_TBL_VECTOR (0xFF << 0) /* Vector (10h - FEh) */ - -typedef struct _IOAPIC_ROUTE_ENTRY { - ULONG vector : 8, - delivery_mode : 3, /* 000: FIXED - * 001: lowest priority - * 111: ExtINT - */ - dest_mode : 1, /* 0: physical, 1: logical */ - delivery_status : 1, - polarity : 1, - irr : 1, - trigger : 1, /* 0: edge, 1: level */ - mask : 1, /* 0: enabled, 1: disabled */ - __reserved_2 : 15; - - union { struct { ULONG - __reserved_1 : 24, - physical_dest : 4, - __reserved_2 : 4; - } physical; - - struct { ULONG - __reserved_1 : 24, - logical_dest : 8; - } logical; - } dest; -} __attribute__ ((packed)) IOAPIC_ROUTE_ENTRY, *PIOAPIC_ROUTE_ENTRY; - -typedef struct _IOAPIC_INFO -{ - ULONG ApicId; /* APIC ID */ - ULONG ApicVersion; /* APIC version */ - ULONG ApicAddress; /* APIC address */ - ULONG EntryCount; /* Number of redirection entries */ -} IOAPIC_INFO, *PIOAPIC_INFO; - - - #if 0 /* This values are defined in halirql.h */ #define FIRST_DEVICE_VECTOR 0x30 @@ -148,14 +78,8 @@ } __attribute__((packed)) MP_CONFIGURATION_PROCESSOR, *PMP_CONFIGURATION_PROCESSOR; -#define CPU_FLAG_ENABLED 1 /* Processor is available */ -#define CPU_FLAG_BSP 2 /* Processor is the bootstrap processor */ -#define CPU_STEPPING_MASK 0x0F -#define CPU_MODEL_MASK 0xF0 -#define CPU_FAMILY_MASK 0xF00 - typedef struct __attribute__((packed)) _MP_CONFIGURATION_BUS { UCHAR Type; /* 1 */ @@ -239,54 +163,20 @@ } MP_CONFIGURATION_INTLOCAL, *PMP_CONFIGURATION_INTLOCAL; #define MP_APIC_ALL 0xFF - - -static inline VOID ReadPentiumClock(PULARGE_INTEGER Count) -{ - register ULONG nLow; - register ULONG nHigh; -#if defined(__GNUC__) - __asm__ __volatile__ ("rdtsc" : "=a" (nLow), "=d" (nHigh)); -#elif defined(_MSC_VER) - __asm rdtsc - __asm mov nLow, eax - __asm mov nHigh, edx -#else -#error Unknown compiler for inline assembler -#endif +#define CPU_FLAG_ENABLED 1 /* Processor is available */ +#define CPU_FLAG_BSP 2 /* Processor is the bootstrap processor */ - Count->u.LowPart = nLow; - Count->u.HighPart = nHigh; -} +#define CPU_STEPPING_MASK 0x0F +#define CPU_MODEL_MASK 0xF0 +#define CPU_FAMILY_MASK 0xF00 - - - -/* CPU flags */ -#define CPU_USABLE 0x01 /* 1 if the CPU is usable (ie. can be used) */ -#define CPU_ENABLED 0x02 /* 1 if the CPU is enabled */ -#define CPU_BSP 0x04 /* 1 if the CPU is the bootstrap processor */ - - -typedef enum { - amPIC = 0, /* IMCR and PIC compatibility mode */ - amVWIRE /* Virtual Wire compatibility mode */ -} APIC_MODE; - - #define PIC_IRQS 16 /* Prototypes */ VOID HalpInitMPS(VOID); -ULONG IOAPICRead(ULONG Apic, ULONG Offset); -VOID IOAPICWrite(ULONG Apic, ULONG Offset, ULONG Value); -VOID IOAPICMaskIrq(ULONG Irq); -VOID IOAPICUnmaskIrq(ULONG Irq); -/* For debugging */ -VOID IOAPICDump(VOID); #endif /* __INCLUDE_HAL_MPS */ _____ Modified: trunk/reactos/hal/halx86/mp/Makefile --- trunk/reactos/hal/halx86/mp/Makefile 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/mp/Makefile 2005-03-07 16:40:32 UTC (rev 13868) @@ -61,7 +61,9 @@ MP_OBJECTS = \ apic.o \ halinit_mp.o \ + ioapic.o \ ipi_mp.o \ + mpconfig.o \ mpsirql.o \ mpsboot.o \ mps.o \ _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-03-07 16:40:32 UTC (rev 13868) @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004, 2005 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,8 @@ * PROGRAMMER: */ +/* INCLUDE ***********************************************************************/ + #include <ddk/ntddk.h> #include <internal/i386/ps.h> @@ -36,23 +38,47 @@ #define NDEBUG #include <internal/debug.h> -BOOLEAN VerifyLocalAPIC(VOID); -VOID APICCalibrateTimer(ULONG CPU); +/* GLOBALS ***********************************************************************/ -extern VOID MpsTimerInterrupt(VOID); -extern VOID MpsErrorInterrupt(VOID); -extern VOID MpsSpuriousInterrupt(VOID); -extern VOID MpsIpiInterrupt(VOID); +ULONG CPUCount; /* Total number of CPUs */ +ULONG BootCPU; /* Bootstrap processor */ +ULONG OnlineCPUs; /* Bitmask of online CPUs */ +CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ -extern ULONG APICMode; /* APIC mode at startup */ -extern PULONG BIOSBase; /* Virtual address of BIOS data segment */ -extern PULONG CommonBase; /* Virtual address of common area */ -extern ULONG BootCPU; /* Bootstrap processor */ -extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ +#ifdef CONFIG_SMP +PULONG BIOSBase; /* Virtual address of BIOS data segment */ +PULONG CommonBase; /* Virtual address of common area */ +#endif -extern CHAR *APstart, *APend; -extern VOID (*APflush)(VOID); +PULONG APICBase = (PULONG)APIC_DEFAULT_BASE; /* Virtual address of local APIC */ +ULONG APICMode; /* APIC mode at startup */ + +/* For debugging */ +ULONG lastregr[MAX_CPU]; +ULONG lastvalr[MAX_CPU]; +ULONG lastregw[MAX_CPU]; +ULONG lastvalw[MAX_CPU]; + +#ifdef CONFIG_SMP +typedef struct __attribute__((packed)) _COMMON_AREA_INFO +{ + ULONG Stack; /* Location of AP stack */ + ULONG PageDirectory; /* Page directory for an AP */ + ULONG NtProcessStartup; /* Kernel entry point for an AP */ + ULONG PaeModeEnabled; /* PAE mode is enabled */ + ULONG Debug[16]; /* For debugging */ +} COMMON_AREA_INFO, *PCOMMON_AREA_INFO; +#endif + +CHAR *APstart, *APend; + +#define BIOS_AREA 0x0 +#define COMMON_AREA 0x2000 + +#define HZ (100) +#define APIC_DIVISOR (16) + #define CMOS_READ(address) ({ \ WRITE_PORT_UCHAR((PUCHAR)0x70, address)); \ READ_PORT_UCHAR((PUCHAR)0x71)); \ @@ -63,20 +89,17 @@ WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ }) -#define BIOS_AREA 0x0 -#define COMMON_AREA 0x2000 +extern PVOID IMPORTED MmSystemRangeStart; +/* FUNCTIONS *********************************************************************/ -extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ +extern ULONG Read8254Timer(VOID); +extern VOID WaitFor8254Wraparound(VOID); +extern VOID MpsTimerInterrupt(VOID); +extern VOID MpsErrorInterrupt(VOID); +extern VOID MpsSpuriousInterrupt(VOID); +extern VOID MpsIpiInterrupt(VOID); -PULONG APICBase = (PULONG)APIC_DEFAULT_BASE; /* Virtual address of local APIC */ - -/* For debugging */ -ULONG lastregr[MAX_CPU]; -ULONG lastvalr[MAX_CPU]; -ULONG lastregw[MAX_CPU]; -ULONG lastvalw[MAX_CPU]; - ULONG APICGetMaxLVT(VOID) { ULONG tmp, ver, maxlvt; @@ -152,7 +175,7 @@ } /* Enable symetric I/O mode ie. connect the BSP's local APIC to INT and NMI lines */ -VOID EnableSMPMode(VOID) +VOID EnableApicMode(VOID) { /* * Do not trust the local APIC being empty at bootup. @@ -203,64 +226,7 @@ APICWrite(APIC_SIVR, tmp); } -VOID HaliInitBSP(VOID) -{ - PUSHORT ps; - static BOOLEAN BSPInitialized = FALSE; - /* Only initialize the BSP once */ - if (BSPInitialized) - { - KEBUGCHECK(0); - return; - } - - BSPInitialized = TRUE; - - DPRINT("APIC is mapped at 0x%X\n", APICBase); - - if (VerifyLocalAPIC()) - { - DPRINT("APIC found\n"); - } - else - { - DPRINT("No APIC found\n"); - KEBUGCHECK(0); - } - - if (APICMode == amPIC) - { - EnableSMPMode(); - } - - APICSetup(); - - /* BIOS data segment */ - BIOSBase = (PULONG)BIOS_AREA; - - /* Area for communicating with the APs */ - CommonBase = (PULONG)COMMON_AREA; - - /* Copy bootstrap code to common area */ - memcpy((PVOID)((ULONG)CommonBase + PAGE_SIZE), - &APstart, - (ULONG)&APend - (ULONG)&APstart + 1); - - /* Set shutdown code */ - CMOS_WRITE(0xF, 0xA); - - /* Set warm reset vector */ - ps = (PUSHORT)((ULONG)BIOSBase + 0x467); - *ps = (COMMON_AREA + PAGE_SIZE) & 0xF; - - ps = (PUSHORT)((ULONG)BIOSBase + 0x469); - *ps = (COMMON_AREA + PAGE_SIZE) >> 4; - - /* Calibrate APIC timer */ - APICCalibrateTimer(BootCPU); -} - inline ULONG _APICRead(ULONG Offset) { PULONG p; @@ -455,7 +421,6 @@ BOOLEAN VerifyLocalAPIC(VOID) { UINT reg0, reg1; - CHECKPOINT1; /* The version register is read-only in a real APIC */ reg0 = APICRead(APIC_VER); DPRINT1("Getting VERSION: %x\n", reg0); @@ -502,9 +467,23 @@ return FALSE; } + ULONG l, h; + Ki386Rdmsr(0x1b /*MSR_IA32_APICBASE*/, l, h); + + if (!(l & /*MSR_IA32_APICBASE_ENABLE*/(1<<11))) + { + DPRINT1("Local APIC disabled by BIOS -- reenabling.\n"); + l &= ~/*MSR_IA32_APICBASE_BASE*/(1<<11); + l |= /*MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE*/(1<<11)|0xfee00000; + Ki386Wrmsr(0x1b/*MSR_IA32_APICBASE*/, l, h); + } + + + return TRUE; } +#ifdef CONFIG_SMP VOID APICSendIPI(ULONG Target, ULONG Mode) { ULONG tmp, i, flags; @@ -568,6 +547,7 @@ } Ki386RestoreFlags(flags); } +#endif VOID APICSetup(VOID) { @@ -651,7 +631,6 @@ } APICWrite(APIC_LINT0, tmp); - /* * Only the BSP should see the LINT1 NMI signal, obviously. */ @@ -697,7 +676,7 @@ DPRINT("ESR value after enabling vector: 0x%X\n", tmp); } } - +#ifdef CONFIG_SMP VOID APICSyncArbIDs(VOID) { ULONG i, tmp; @@ -720,6 +699,7 @@ DPRINT("Synchronizing Arb IDs.\n"); APICWrite(APIC_ICR0, APIC_ICR0_DESTS_ALL | APIC_ICR0_LEVEL | APIC_DM_INIT); } +#endif VOID MpsErrorHandler(VOID) { @@ -769,12 +749,13 @@ #endif } +#ifdef CONFIG_SMP VOID MpsIpiHandler(VOID) { KIRQL oldIrql; HalBeginSystemInterrupt(IPI_VECTOR, - VECTOR2IRQL(IPI_VECTOR), + IPI_LEVEL, &oldIrql); Ki386EnableInterrupts(); #if 0 @@ -791,6 +772,7 @@ Ki386DisableInterrupts(); HalEndSystemInterrupt(oldIrql, 0); } +#endif VOID MpsIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, @@ -823,7 +805,7 @@ static ULONG Count[MAX_CPU] = {0,}; #endif HalBeginSystemInterrupt(LOCAL_TIMER_VECTOR, - VECTOR2IRQL(LOCAL_TIMER_VECTOR), + PROFILE_LEVEL, &oldIrql); Ki386EnableInterrupts(); @@ -850,4 +832,318 @@ HalEndSystemInterrupt (oldIrql, 0); } +VOID APICSetupLVTT(ULONG ClockTicks) +{ + ULONG tmp; + + tmp = GET_APIC_VERSION(APICRead(APIC_VER)); + if (!APIC_INTEGRATED(tmp)) + { + tmp = SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV) | APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;; + } + else + { + /* Periodic timer */ + tmp = APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;; + } + APICWrite(APIC_LVTT, tmp); + + tmp = APICRead(APIC_TDCR); + tmp &= ~(APIC_TDCR_1 | APIC_TIMER_BASE_DIV); + tmp |= APIC_TDCR_16; + APICWrite(APIC_TDCR, tmp); + APICWrite(APIC_ICRT, ClockTicks / APIC_DIVISOR); +} + +VOID +APICCalibrateTimer(ULONG CPU) +{ + ULARGE_INTEGER t1, t2; + LONG tt1, tt2; + BOOLEAN TSCPresent; + + DPRINT("Calibrating APIC timer for CPU %d\n", CPU); + + APICSetupLVTT(1000000000); + + TSCPresent = KeGetCurrentKPCR()->PrcbData.FeatureBits & X86_FEATURE_TSC ? TRUE : FALSE; + + /* + * The timer chip counts down to zero. Let's wait + * for a wraparound to start exact measurement: + * (the current tick might have been already half done) + */ + WaitFor8254Wraparound(); + + /* + * We wrapped around just now. Let's start + */ + if (TSCPresent) + { + Ki386RdTSC(t1); + } + tt1 = APICRead(APIC_CCRT); + + WaitFor8254Wraparound(); + + + tt2 = APICRead(APIC_CCRT); + if (TSCPresent) + { + Ki386RdTSC(t2); + CPUMap[CPU].CoreSpeed = (HZ * (t2.QuadPart - t1.QuadPart)); + DPRINT("CPU clock speed is %ld.%04ld MHz.\n", + CPUMap[CPU].CoreSpeed/1000000, + CPUMap[CPU].CoreSpeed%1000000); + KeGetCurrentKPCR()->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; + } + + CPUMap[CPU].BusSpeed = (HZ * (long)(tt1 - tt2) * APIC_DIVISOR); + + /* Setup timer for normal operation */ +// APICSetupLVTT((CPUMap[CPU].BusSpeed / 1000000) * 100); // 100ns + APICSetupLVTT((CPUMap[CPU].BusSpeed / 1000000) * 10000); // 10ms +// APICSetupLVTT((CPUMap[CPU].BusSpeed / 1000000) * 100000); // 100ms + + DPRINT("Host bus clock speed is %ld.%04ld MHz.\n", + CPUMap[CPU].BusSpeed/1000000, + CPUMap[CPU].BusSpeed%1000000); +} + +VOID +SetInterruptGate(ULONG index, ULONG address) +{ + IDT_DESCRIPTOR *idt; + + idt = (IDT_DESCRIPTOR*)((ULONG)KeGetCurrentKPCR()->IDT + index * sizeof(IDT_DESCRIPTOR)); + idt->a = (((ULONG)address)&0xffff) + (KERNEL_CS << 16); + idt->b = 0x8e00 + (((ULONG)address)&0xffff0000); +} + +VOID HaliInitBSP(VOID) +{ +#ifdef CONFIG_SMP + PUSHORT ps; +#endif + + static BOOLEAN BSPInitialized = FALSE; + + /* Only initialize the BSP once */ + if (BSPInitialized) + { + KEBUGCHECK(0); + return; + } + + BSPInitialized = TRUE; + + /* Setup interrupt handlers */ + SetInterruptGate(LOCAL_TIMER_VECTOR, (ULONG)MpsTimerInterrupt); + SetInterruptGate(ERROR_VECTOR, (ULONG)MpsErrorInterrupt); + SetInterruptGate(SPURIOUS_VECTOR, (ULONG)MpsSpuriousInterrupt); +#ifdef CONFIG_SMP + SetInterruptGate(IPI_VECTOR, (ULONG)MpsIpiInterrupt); +#endif + DPRINT("APIC is mapped at 0x%X\n", APICBase); + + if (VerifyLocalAPIC()) + { + DPRINT("APIC found\n"); + } + else + { + DPRINT("No APIC found\n"); + KEBUGCHECK(0); + } + + if (APICMode == amPIC) + { + EnableApicMode(); + } + + APICSetup(); + +#ifdef CONFIG_SMP + /* BIOS data segment */ + BIOSBase = (PULONG)BIOS_AREA; + + /* Area for communicating with the APs */ + CommonBase = (PULONG)COMMON_AREA; + + /* Copy bootstrap code to common area */ + memcpy((PVOID)((ULONG)CommonBase + PAGE_SIZE), + &APstart, + (ULONG)&APend - (ULONG)&APstart + 1); + + /* Set shutdown code */ + CMOS_WRITE(0xF, 0xA); + + /* Set warm reset vector */ + ps = (PUSHORT)((ULONG)BIOSBase + 0x467); + *ps = (COMMON_AREA + PAGE_SIZE) & 0xF; + + ps = (PUSHORT)((ULONG)BIOSBase + 0x469); + *ps = (COMMON_AREA + PAGE_SIZE) >> 4; +#endif + + /* Calibrate APIC timer */ + APICCalibrateTimer(BootCPU); +} + +#ifdef CONFIG_SMP +VOID +HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack) +{ + ULONG tmp, maxlvt; + PCOMMON_AREA_INFO Common; + ULONG StartupCount; + ULONG i, j; + ULONG DeliveryStatus = 0; + ULONG AcceptStatus = 0; + + if (Cpu >= MAX_CPU || + Cpu >= CPUCount || + OnlineCPUs & (1 << Cpu)) + { + KEBUGCHECK(0); + } + DPRINT1("Attempting to boot CPU %d\n", Cpu); + + /* Send INIT IPI */ + + APICSendIPI(Cpu, APIC_DM_INIT|APIC_ICR0_LEVEL_ASSERT); + + KeStallExecutionProcessor(200); + + /* Deassert INIT */ + + APICSendIPI(Cpu, APIC_DM_INIT|APIC_ICR0_LEVEL_DEASSERT); + + if (APIC_INTEGRATED(CPUMap[Cpu].APICVersion)) + { + /* Clear APIC errors */ + APICWrite(APIC_ESR, 0); + tmp = (APICRead(APIC_ESR) & APIC_ESR_MASK); + } + + Common = (PCOMMON_AREA_INFO)CommonBase; + + /* Write the location of the AP stack */ + Common->Stack = (ULONG)Stack; + /* Write the page directory page */ + Ke386GetPageTableDirectory(Common->PageDirectory); + /* Write the kernel entry point */ + Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader(MmSystemRangeStart)->OptionalHeader.AddressO fEntryPoint + (ULONG_PTR)MmSystemRangeStart; + /* Write the state of the mae mode */ + Common->PaeModeEnabled = Ke386GetCr4() & X86_CR4_PAE ? 1 : 0; + + DPRINT1("%x %x %x %x\n", Common->Stack, Common->PageDirectory, Common->NtProcessStartup, Common->PaeModeEnabled); + + DPRINT("Cpu %d got stack at 0x%X\n", Cpu, Common->Stack); +#if 0 + for (j = 0; j < 16; j++) + { + Common->Debug[j] = 0; + } +#endif + + maxlvt = APICGetMaxLVT(); + + /* Is this a local APIC or an 82489DX? */ + StartupCount = (APIC_INTEGRATED(CPUMap[Cpu].APICVersion)) ? 2 : 0; + + for (i = 1; i <= StartupCount; i++) + { + /* It's a local APIC, so send STARTUP IPI */ + DPRINT("Sending startup signal %d\n", i); + /* Clear errors */ + APICWrite(APIC_ESR, 0); + APICRead(APIC_ESR); + + APICSendIPI(Cpu, APIC_DM_STARTUP | ((COMMON_AREA + PAGE_SIZE) >> 12)|APIC_ICR0_LEVEL_DEASSERT); + + /* Wait up to 10ms for IPI to be delivered */ + j = 0; + do + { + KeStallExecutionProcessor(10); + + /* Check Delivery Status */ + DeliveryStatus = APICRead(APIC_ICR0) & APIC_ICR0_DS; + + j++; + } while ((DeliveryStatus) && (j < 1000)); + + KeStallExecutionProcessor(200); + + /* + * Due to the Pentium erratum 3AP. + */ + if (maxlvt > 3) + { + APICRead(APIC_SIVR); + APICWrite(APIC_ESR, 0); + } + + AcceptStatus = APICRead(APIC_ESR) & APIC_ESR_MASK; + + if (DeliveryStatus || AcceptStatus) + { + break; + } + } + + if (DeliveryStatus) + { + DPRINT("STARTUP IPI for CPU %d was never delivered.\n", Cpu); + } + + if (AcceptStatus) + { + DPRINT("STARTUP IPI for CPU %d was never accepted.\n", Cpu); + } + + if (!(DeliveryStatus || AcceptStatus)) + { + + /* Wait no more than 5 seconds for processor to boot */ + DPRINT("Waiting for 5 seconds for CPU %d to boot\n", Cpu); + + /* Wait no more than 5 seconds */ + for (j = 0; j < 50000; j++) + { + if (CPUMap[Cpu].Flags & CPU_ENABLED) + { + break; + } + KeStallExecutionProcessor(100); + } + } + + if (CPUMap[Cpu].Flags & CPU_ENABLED) + { + DbgPrint("CPU %d is now running\n", Cpu); + } + else + { + DbgPrint("Initialization of CPU %d failed\n", Cpu); + } + +#if 0 + DPRINT("Debug bytes are:\n"); + + for (j = 0; j < 4; j++) + { + DPRINT("0x%08X 0x%08X 0x%08X 0x%08X.\n", + Common->Debug[j*4+0], + Common->Debug[j*4+1], + Common->Debug[j*4+2], + Common->Debug[j*4+3]); + } + +#endif +} + +#endif + /* EOF */ _____ Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c --- trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-03-07 16:37:49 UTC (rev 13867) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-03-07 16:40:32 UTC (rev 13868) @@ -20,10 +20,34 @@ /* FUNCTIONS ***************************************************************/ +extern BOOLEAN HaliFindSmpConfig(VOID); + +/********************************************************************** *****/ VOID HalpInitPhase0(VOID) + { - HalpInitMPS(); + static BOOLEAN MPSInitialized = FALSE; + + + /* Only initialize MP system once. Once called the first time, + each subsequent call is part of the initialization sequence + for an application processor. */ + + DPRINT("HalpInitPhase0()\n"); + + + if (MPSInitialized) + { + KEBUGCHECK(0); + } + [truncated at 1000 lines; 3147 more skipped]

19 years, 9 months

[arty] 13867: Changed exception format in kernel32 slightly to make the offset of the

by arty＠svn.reactos.com

Changed exception format in kernel32 slightly to make the offset of the addresses apparent. Made a change suggested by ion, to remove the line numbers of the lines printing the stack trace. Modified: trunk/reactos/lib/kernel32/except/except.c _____ Modified: trunk/reactos/lib/kernel32/except/except.c --- trunk/reactos/lib/kernel32/except/except.c 2005-03-07 01:40:01 UTC (rev 13866) +++ trunk/reactos/lib/kernel32/except/except.c 2005-03-07 16:37:49 UTC (rev 13867) @@ -83,14 +83,20 @@ * The address can point to anywhere within the module. */ static const char* -_module_name_from_addr(const void* addr, char* psz, size_t nChars) +_module_name_from_addr(const void* addr, void **module_start_addr, + char* psz, size_t nChars) { MEMORY_BASIC_INFORMATION mbi; if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) || !GetModuleFileNameA((HMODULE)mbi.AllocationBase, psz, nChars)) { psz[0] = '\0'; + *module_start_addr = 0; } + else + { + *module_start_addr = (void *)mbi.AllocationBase; + } return psz; } @@ -152,26 +158,30 @@ { #ifdef _X86_ PULONG Frame; + PVOID StartAddr; CHAR szMod[128] = ""; #endif /* Print a stack trace. */ - DPRINT1("Unhandled exception\n"); - DPRINT1("Address:\n"); - DPRINT1(" %8x %s\n", + DbgPrint("Unhandled exception\n"); + DbgPrint("Address:\n"); + DbgPrint(" %8x %s\n", ExceptionInfo->ExceptionRecord->ExceptionAddress, - _module_name_from_addr(ExceptionInfo->ExceptionRecord->ExceptionAddress, szMod, sizeof(szMod))); + _module_name_from_addr(ExceptionInfo->ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod))); _dump_context ( ExceptionInfo->ContextRecord ); #ifdef _X86_ - DPRINT1("Frames:\n"); + DbgPrint("Frames:\n"); Frame = (PULONG)ExceptionInfo->ContextRecord->Ebp; while (Frame[1] != 0 && Frame[1] != 0xdeadbeef) { if (IsBadReadPtr((PVOID)Frame[1], 4)) { - DPRINT1(" %8x %s\n", Frame[1], "<invalid address>"); + DbgPrint(" %8x%9s %s\n", Frame[1], "<invalid address>"," "); } else { - _module_name_from_addr((const void*)Frame[1], szMod, sizeof(szMod)); - DPRINT1(" %8x %s\n", Frame[1], szMod); + _module_name_from_addr((const void*)Frame[1], &StartAddr, + szMod, sizeof(szMod)); + DbgPrint(" %8x+%-8x %s\n", + (PVOID)StartAddr, + (ULONG_PTR)Frame[1] - (ULONG_PTR)StartAddr, szMod); } if (IsBadReadPtr((PVOID)Frame[0], sizeof(*Frame) * 2)) { break;

19 years, 9 months

[weiden] 13866: change logfont quality to FreeType mode conversion. Patch by tinus.

by weiden＠svn.reactos.com

change logfont quality to FreeType mode conversion. Patch by tinus. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-03-07 01:26:25 UTC (rev 13865) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-03-07 01:40:01 UTC (rev 13866) @@ -427,18 +427,14 @@ { switch(logfont->lfQuality) { - //case ANTIALIASED_QUALITY: - case DEFAULT_QUALITY: - return FT_RENDER_MODE_NORMAL; + case NONANTIALIASED_QUALITY: + return FT_RENDER_MODE_MONO; case DRAFT_QUALITY: return FT_RENDER_MODE_LIGHT; - //case NONANTIALIASED_QUALITY: - case PROOF_QUALITY: - return FT_RENDER_MODE_MONO; - //case CLEARTYPE_QUALITY: - // return FT_RENDER_MODE_LCD; +/* case CLEARTYPE_QUALITY: + return FT_RENDER_MODE_LCD; */ } - return FT_RENDER_MODE_MONO; + return FT_RENDER_MODE_NORMAL; } int

19 years, 9 months

← Newer
1
...
50
51
52
53
54
55
56
...
61
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 March 2005