Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 13355: securely access buffers in NtImpersonateThread()
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

securely access buffers in NtImpersonateThread() Modified: trunk/reactos/ntoskrnl/ps/create.c _____ Modified: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-01-28 19:28:24 UTC (rev 13354) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-01-28 20:48:43 UTC (rev 13355) @@ -177,56 +177,73 @@ IN HANDLE ThreadToImpersonateHandle, IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService) { + SECURITY_QUALITY_OF_SERVICE SafeServiceQoS; SECURITY_CLIENT_CONTEXT ClientContext; PETHREAD Thread; PETHREAD ThreadToImpersonate; - NTSTATUS Status; - - Status = ObReferenceObjectByHandle (ThreadHandle, - 0, - PsThreadType, - UserMode, - (PVOID*)&Thread, - NULL); - if (!NT_SUCCESS (Status)) + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY { - return Status; + ProbeForRead(SecurityQualityOfService, + sizeof(SECURITY_QUALITY_OF_SERVICE), + sizeof(ULONG)); + SafeServiceQoS = *SecurityQualityOfService; + SecurityQualityOfService = &SafeServiceQoS; } - - Status = ObReferenceObjectByHandle (ThreadToImpersonateHandle, - 0, - PsThreadType, - UserMode, - (PVOID*)&ThreadToImpersonate, - NULL); - if (!NT_SUCCESS(Status)) + _SEH_HANDLE { - ObDereferenceObject (Thread); + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { return Status; } + } - Status = SeCreateClientSecurity (ThreadToImpersonate, - SecurityQualityOfService, - 0, - &ClientContext); - if (!NT_SUCCESS(Status)) + Status = ObReferenceObjectByHandle(ThreadHandle, + THREAD_IMPERSONATE, + PsThreadType, + PreviousMode, + (PVOID*)&Thread, + NULL); + if(NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(ThreadToImpersonateHandle, + THREAD_DIRECT_IMPERSONATION, + PsThreadType, + PreviousMode, + (PVOID*)&ThreadToImpersonate, + NULL); + if(NT_SUCCESS(Status)) { - ObDereferenceObject (ThreadToImpersonate); - ObDereferenceObject (Thread); - return Status; - } + Status = SeCreateClientSecurity(ThreadToImpersonate, + SecurityQualityOfService, + 0, + &ClientContext); + if(NT_SUCCESS(Status)) + { + SeImpersonateClient(&ClientContext, + Thread); + if(ClientContext.ClientToken != NULL) + { + ObDereferenceObject (ClientContext.ClientToken); + } + } - SeImpersonateClient (&ClientContext, - Thread); - if (ClientContext.ClientToken != NULL) - { - ObDereferenceObject (ClientContext.ClientToken); + ObDereferenceObject(ThreadToImpersonate); } + ObDereferenceObject(Thread); + } - ObDereferenceObject (ThreadToImpersonate); - ObDereferenceObject (Thread); - - return STATUS_SUCCESS; + return Status; } /*

1 0

[weiden] 13354: GetTempPathW should write an empty string to the buffer in case it wasn't large enough
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

GetTempPathW should write an empty string to the buffer in case it wasn't large enough Modified: trunk/reactos/lib/kernel32/file/curdir.c _____ Modified: trunk/reactos/lib/kernel32/file/curdir.c --- trunk/reactos/lib/kernel32/file/curdir.c 2005-01-28 19:11:22 UTC (rev 13353) +++ trunk/reactos/lib/kernel32/file/curdir.c 2005-01-28 19:28:24 UTC (rev 13354) @@ -308,7 +308,7 @@ if (nBufferLength < Value->Length / sizeof(WCHAR) + 2) Length++; - if (lpBuffer != NULL) + if (nBufferLength >= Value->Length /sizeof(WCHAR) + 1) { if (nBufferLength < Value->Length / sizeof(WCHAR) + 2) { @@ -324,6 +324,9 @@ lpBuffer[Value->Length / sizeof(WCHAR)] = L'\\'; lpBuffer[Value->Length / sizeof(WCHAR) + 1] = 0; } + } else if (nBufferLength > 0) + { + lpBuffer[0] = L'\0'; } return Length;

1 0

[chorns] 13353: Started on automatic dependencies support
by chorns＠svn.reactos.com 28 Jan '05

28 Jan '05

Started on automatic dependencies support Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 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/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile1_header3.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1.c Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er1.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.h --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.h 2005-01-28 19:11:22 UTC (rev 13353) @@ -8,6 +8,13 @@ void InitWorkingDirectory(); +#ifdef _MSC_VER +unsigned __int64 +#else +unsigned long long +#endif +filelen ( FILE* f ); + class Path { std::vector<std::string> path; _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-01-28 19:11:22 UTC (rev 13353) @@ -0,0 +1,240 @@ +#include "pch.h" + +#ifdef WIN32 +#include <direct.h> +#include <io.h> +#else +#include <sys/stat.h> +#define _MAX_PATH 255 +#endif +#include <assert.h> + +#include "rbuild.h" + +/* Read at most this amount of bytes from each file and assume that all #includes are located within this block */ +#define MAX_BYTES_TO_READ 4096 + +using std::string; +using std::vector; +using std::map; + +SourceFile::SourceFile ( AutomaticDependency* automaticDependency, + Module& module, + const string& filename ) + : automaticDependency ( automaticDependency ), + module ( module ), + filename ( filename ) +{ +} + +void +SourceFile::Close () +{ + buf.resize ( 0 ); + p = end = NULL; +} + +void +SourceFile::Open () +{ + Close (); + FILE* f = fopen ( filename.c_str (), "rb" ); + if ( !f ) + throw FileNotFoundException ( filename ); + unsigned long len = (unsigned long) filelen ( f ); + if ( len > MAX_BYTES_TO_READ) + len = MAX_BYTES_TO_READ; + buf.resize ( len ); + fread ( &buf[0], 1, len, f ); + fclose ( f ); + p = buf.c_str (); + end = p + len; +} + +void +SourceFile::SkipWhitespace () +{ + while ( p < end && isspace ( *p )) + p++; +} + +bool +SourceFile::ReadInclude ( string& filename ) +{ + while ( p < end ) + { + if ( ( *p == '#') && ( end - p > 8 ) ) + { + if ( strncmp ( p, "#include", 8 ) == 0 ) + { + p += 8; + SkipWhitespace (); + if ( p < end && *p == '<' || *p == '"' ) + { + p++; + filename.resize ( MAX_PATH ); + int i = 0; + while ( p < end && *p != '>' && *p != '"' && *p != '\n' ) + filename[i++] = *p++; + filename.resize ( i ); + return true; + } + } + } + p++; + } + filename = ""; + return false; +} + +SourceFile* +SourceFile::ParseFile ( const string& normalizedFilename ) +{ + string extension = GetExtension ( normalizedFilename ); + if ( extension == ".c" || extension == ".C" || extension == ".h" || extension == ".H") + { + SourceFile* sourceFile = automaticDependency->RetrieveFromCacheOrParse ( module, + normalizedFilename ); + return sourceFile; + } + return NULL; +} + +void +SourceFile::Parse () +{ + Open (); + while ( p < end ) + { + string includedFilename ( "" ); + //printf ( "Parsing '%s'\n", filename.c_str () ); + + while ( ReadInclude ( includedFilename )) + { + string resolvedFilename ( "" ); + bool locatedFile = automaticDependency->LocateIncludedFile ( module, + includedFilename, + resolvedFilename ); + if ( locatedFile ) + { + SourceFile* sourceFile = ParseFile ( resolvedFilename ); + files.push_back ( sourceFile ); + } + } + p++; + } + Close (); +} + +string +SourceFile::Location () const +{ + int line = 1; + const char* end_of_line = strchr ( buf.c_str (), '\n' ); + while ( end_of_line && end_of_line < p ) + { + ++line; + end_of_line = strchr ( end_of_line + 1, '\n' ); + } + return ssprintf ( "%s(%i)", + filename.c_str (), + line ); +} + + +AutomaticDependency::AutomaticDependency ( const Project& project ) + : project ( project ) +{ +} + +AutomaticDependency::~AutomaticDependency () +{ + std::map<std::string, SourceFile*>::iterator theIterator; + for ( theIterator = sourcefile_map.begin (); theIterator != sourcefile_map.end (); theIterator++ ) + delete theIterator->second; +} + +void +AutomaticDependency::Process () +{ + for ( size_t i = 0; i < project.modules.size (); i++ ) + ProcessModule ( *project.modules[i] ); +} + +void +AutomaticDependency::ProcessModule ( Module& module ) +{ + for ( size_t i = 0; i < module.files.size (); i++ ) + ProcessFile ( module, *module.files[i] ); +} + +void +AutomaticDependency::ProcessFile ( Module& module, + const File& file ) +{ + string normalizedFilename = NormalizeFilename ( file.name ); + SourceFile sourceFile = SourceFile ( this, + module, + normalizedFilename ); + sourceFile.Parse (); +} + +bool +AutomaticDependency::LocateIncludedFile ( const string& directory, + const string& includedFilename, + string& resolvedFilename ) +{ + string normalizedFilename = NormalizeFilename ( directory + SSEP + includedFilename ); + FILE* f = fopen ( normalizedFilename.c_str (), "rb" ); + if ( f != NULL ) + { + fclose ( f ); + resolvedFilename = normalizedFilename; + return true; + } + resolvedFilename = ""; + return false; +} + +bool +AutomaticDependency::LocateIncludedFile ( Module& module, + const string& includedFilename, + string& resolvedFilename ) +{ + for ( size_t i = 0; i < module.includes.size (); i++ ) + { + Include* include = module.includes[0]; + if ( LocateIncludedFile ( include->directory, + includedFilename, + resolvedFilename ) ) + return true; + } + + /* FIXME: Ifs */ + + resolvedFilename = ""; + return false; +} + +SourceFile* +AutomaticDependency::RetrieveFromCacheOrParse ( Module& module, + const string& filename ) +{ + SourceFile* sourceFile = sourcefile_map[filename]; + if ( sourceFile == NULL ) + { + sourceFile = new SourceFile ( this, + module, + filename ); + sourceFile->Parse (); + sourcefile_map[filename] = sourceFile; + } + return sourceFile; +} + +SourceFile* +AutomaticDependency::RetrieveFromCache ( Module& module, + const string& filename ) +{ + return sourcefile_map[filename]; +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-28 19:11:22 UTC (rev 13353) @@ -35,6 +35,7 @@ Module& module = *ProjectNode.modules[i]; ProcessModule ( module ); } + //GenerateAutomaticDependencies (); CloseMakefile (); } @@ -240,6 +241,52 @@ } void +MingwBackend::GenerateAutomaticDependencies () const +{ + AutomaticDependency automaticDependency ( ProjectNode ); + automaticDependency.Process (); + + for ( size_t mi = 0; mi < ProjectNode.modules.size (); mi++ ) + { + Module& module = *ProjectNode.modules[mi]; + for ( size_t fi = 0; fi < module.files.size (); fi++ ) + { + File& file = *module.files[fi]; + string normalizedFilename = NormalizeFilename ( file.name ); + SourceFile* sourceFile = automaticDependency.RetrieveFromCache ( module, + normalizedFilename ); + if ( sourceFile != NULL ) + { + string dependencies ( "" ); + GenerateAutomaticDependenciesForFile ( sourceFile, + dependencies ); + fprintf ( fMakefile, + "%s:: %s", + normalizedFilename.c_str (), + dependencies.c_str () ); + } + } + } +} + +void +MingwBackend::GenerateAutomaticDependenciesForFile ( SourceFile* sourceFile, + string& dependencies ) const +{ + if ( dependencies.size () > 0 ) + dependencies += " "; + dependencies += sourceFile->filename; + + for ( size_t i = 0; i < sourceFile->files.size (); i++) + { + SourceFile* childSourceFile = sourceFile->files[0]; + + GenerateAutomaticDependenciesForFile ( childSourceFile, + dependencies ); + } +} + +void MingwBackend::ProcessModule ( Module& module ) const { MingwModuleHandler* h = MingwModuleHandler::LookupHandler ( _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-28 19:11:22 UTC (rev 13353) @@ -27,6 +27,9 @@ void GenerateGlobalVariables () const; bool IncludeInAllTarget ( const Module& module ) const; void GenerateAllTarget () const; + void GenerateAutomaticDependencies () const; + void GenerateAutomaticDependenciesForFile ( SourceFile* sourceFile, + std::string& dependencies ) const; FILE* fMakefile; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-28 19:11:22 UTC (rev 13353) @@ -17,6 +17,7 @@ BASE_OBJECTS = \ $(BACKEND_BASE_OBJECTS) \ + automaticdependency.o \ compilerflag.o \ define.o \ exception.o \ @@ -37,7 +38,8 @@ tests/invoketest.o \ tests/linkerflagtest.o \ tests/moduletest.o \ - tests/projecttest.o + tests/projecttest.o \ + tests/sourcefiletest.o TEST_OBJECTS = $(BASE_OBJECTS) $(TESTS) tests/alltests.o _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.cpp 2005-01-28 19:11:22 UTC (rev 13353) @@ -30,7 +30,8 @@ { string projectFilename ( "ReactOS.xml" ); Project project ( projectFilename ); - Backend* backend = Backend::Factory::Create ( buildtarget, project ); + Backend* backend = Backend::Factory::Create ( buildtarget, + project ); backend->Process (); delete backend; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-28 19:11:22 UTC (rev 13353) @@ -35,7 +35,10 @@ class CompilerFlag; class LinkerFlag; class Property; +class AutomaticDependency; +class SourceFileTest; + class Project { std::string xmlfile; @@ -343,6 +346,58 @@ void ProcessXML(); }; + +class SourceFile +{ +public: + SourceFile ( AutomaticDependency* automaticDependency, + Module& module, + const std::string& filename ); + SourceFile* ParseFile ( const std::string& normalizedFilename ); + void Parse (); + std::string Location () const; + std::vector<SourceFile*> files; + AutomaticDependency* automaticDependency; + Module& module; + std::string filename; +private: + void Close (); + void Open (); + void SkipWhitespace (); + bool ReadInclude ( std::string& filename ); + std::string buf; + const char *p; + const char *end; +}; + + +class AutomaticDependency +{ + friend class SourceFileTest; +public: + const Project& project; + + AutomaticDependency ( const Project& project ); + ~AutomaticDependency (); + void Process (); + bool LocateIncludedFile ( const std::string& directory, + const std::string& includedFilename, + std::string& resolvedFilename ); + bool LocateIncludedFile ( Module& module, + const std::string& includedFilename, + std::string& resolvedFilename ); + SourceFile* RetrieveFromCacheOrParse ( Module& module, + const std::string& filename ); + SourceFile* RetrieveFromCache ( Module& module, + const std::string& filename ); +private: + void ProcessModule ( Module& module ); + void ProcessFile ( Module& module, + const File& file ); + std::map<std::string, SourceFile*> sourcefile_map; +}; + + extern std::string FixSeparator ( const std::string& s ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-01-28 19:11:22 UTC (rev 13353) @@ -96,10 +96,18 @@ void Run(); }; + class FunctionTest : public BaseTest { public: void Run(); }; + +class SourceFileTest : public BaseTest +{ +public: + void Run(); +}; + #endif /* __TEST_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-01-28 19:11:22 UTC (rev 13353) @@ -177,6 +177,7 @@ tests.push_back(new LinkerFlagTest()); tests.push_back(new IfTest()); tests.push_back(new FunctionTest()); + tests.push_back(new SourceFileTest()); } }; _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml 2005-01-28 19:11:22 UTC (rev 13353) @@ -0,0 +1,11 @@ +<?xml version="1.0" ?> +<project name="Project" makefile="Makefile"> + <directory name="tests"> + <directory name="data"> + <module name="module1" type="buildtool"> + <include base="module1">.</include> + <file>sourcefile1.c</file> + </module> + </directory> + </directory> +</project> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile1_header3.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile1_header3.h 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1/sour cefile1_header3.h 2005-01-28 19:11:22 UTC (rev 13353) @@ -0,0 +1 @@ +/* empty */ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1.c --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1.c 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1.c 2005-01-28 19:11:22 UTC (rev 13353) @@ -0,0 +1,13 @@ +/* + * ReactOS kernel + */ +/* $Id: main.c 12694 2005-01-01 11:47:33Z hbirr $ + * FILE: ntoskrnl/ke/main.c + */ + +/* INCLUDES *****************************************************************/ + +#include <sourcefile1_header1.h> +#include <sourcefile1_header2.h> + +/* GLOBALS *******************************************************************/ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er1.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er1.h 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er1.h 2005-01-28 19:11:22 UTC (rev 13353) @@ -0,0 +1 @@ +#include <sourcefile1_header2.h> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/sourcefile1_head er2.h 2005-01-28 19:11:22 UTC (rev 13353) @@ -0,0 +1,2 @@ +#include <sourcefile1/sourcefile1_header3.h> +#include <sourcefile2/sourcefile1_dontexist.h> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-01-28 18:35:21 UTC (rev 13352) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-01-28 19:11:22 UTC (rev 13353) @@ -0,0 +1,11 @@ +#include "test.h" + +using std::string; + +void SourceFileTest::Run() +{ + const Project project ( "tests/data/automaticdependency.xml" ); + AutomaticDependency automaticDependency ( project ); + automaticDependency.Process (); + ARE_EQUAL(3, automaticDependency.sourcefile_map.size()); +}

1 0

[weiden] 13352: also save the esi register. Thx to d_layer
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

also save the esi register. Thx to d_layer Modified: trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S _____ Modified: trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S --- trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S 2005-01-28 18:29:13 UTC (rev 13351) +++ trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S 2005-01-28 18:35:21 UTC (rev 13352) @@ -28,6 +28,7 @@ _InbvPutPixels: pushl %ebp movl %esp, %ebp + pushl %esi pushl %ebx /* Compute mask and put it in EBX @@ -98,6 +99,7 @@ movb %al, 0x3(%esi) popl %ebx + popl %esi popl %ebp ret

1 0

[weiden] 13351: When a toolbar doesn't have the TBSTYLE_FLAT style redrawing the buttons when moving the mouse is not necessary.
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

When a toolbar doesn't have the TBSTYLE_FLAT style redrawing the buttons when moving the mouse is not necessary. Merged back from winehq. Fixes bug #404 Modified: trunk/reactos/lib/comctl32/toolbar.c _____ Modified: trunk/reactos/lib/comctl32/toolbar.c --- trunk/reactos/lib/comctl32/toolbar.c 2005-01-28 13:28:56 UTC (rev 13350) +++ trunk/reactos/lib/comctl32/toolbar.c 2005-01-28 18:29:13 UTC (rev 13351) @@ -6081,23 +6081,25 @@ INT nHit; TBUTTON_INFO *btnPtr; - /* fill in the TRACKMOUSEEVENT struct */ - trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); - trackinfo.dwFlags = TME_QUERY; - trackinfo.hwndTrack = hwnd; - trackinfo.dwHoverTime = HOVER_DEFAULT; + if (infoPtr->dwStyle & TBSTYLE_FLAT) { + /* fill in the TRACKMOUSEEVENT struct */ + trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); + trackinfo.dwFlags = TME_QUERY; + trackinfo.hwndTrack = hwnd; + trackinfo.dwHoverTime = HOVER_DEFAULT; - /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */ - _TrackMouseEvent(&trackinfo); + /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */ + _TrackMouseEvent(&trackinfo); - /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */ - if(!(trackinfo.dwFlags & TME_LEAVE)) { - trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */ + /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */ + if(!(trackinfo.dwFlags & TME_LEAVE)) { + trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */ - /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */ - /* and can properly deactivate the hot toolbar button */ - _TrackMouseEvent(&trackinfo); - } + /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */ + /* and can properly deactivate the hot toolbar button */ + _TrackMouseEvent(&trackinfo); + } + } if (infoPtr->hwndToolTip) TOOLBAR_RelayEvent (infoPtr->hwndToolTip, hwnd, @@ -6108,7 +6110,7 @@ nHit = TOOLBAR_InternalHitTest (hwnd, &pt); - if (!infoPtr->bAnchor || (nHit >= 0)) + if ((infoPtr->dwStyle & TBSTYLE_FLAT) && (!infoPtr->bAnchor || (nHit >= 0))) TOOLBAR_SetHotItemEx(infoPtr, nHit, HICF_MOUSE); if (infoPtr->nOldHit != nHit)

1 0

[weiden] 13349: reverted my previous two commits, they are part of not yet committed changes...
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

reverted my previous two commits, they are part of not yet committed changes... Modified: trunk/reactos/include/funcs.h Modified: trunk/reactos/include/ntos/zw.h _____ Modified: trunk/reactos/include/funcs.h --- trunk/reactos/include/funcs.h 2005-01-28 12:06:50 UTC (rev 13348) +++ trunk/reactos/include/funcs.h 2005-01-28 12:12:42 UTC (rev 13349) @@ -1534,6 +1534,20 @@ NTSTATUS STDCALL +NtSecureConnectPort( + OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN OUT PPORT_SECTION_WRITE WriteSection OPTIONAL, + IN PSID ServerSid OPTIONAL, + IN OUT PPORT_SECTION_READ ReadSection OPTIONAL, + OUT PULONG MaxMessageSize OPTIONAL, + IN OUT PVOID ConnectData OPTIONAL, + IN OUT PULONG ConnectDataLength OPTIONAL + ); + +NTSTATUS +STDCALL NtSetHighWaitLowThread( VOID ); @@ -1966,6 +1980,20 @@ NTSTATUS STDCALL +ZwSecureConnectPort( + OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN OUT PPORT_SECTION_WRITE WriteSection OPTIONAL, + IN PSID ServerSid OPTIONAL, + IN OUT PPORT_SECTION_READ ReadSection OPTIONAL, + OUT PULONG MaxMessageSize OPTIONAL, + IN OUT PVOID ConnectData OPTIONAL, + IN OUT PULONG ConnectDataLength OPTIONAL + ); + +NTSTATUS +STDCALL ZwSetHighWaitLowThread( VOID ); _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-01-28 12:06:50 UTC (rev 13348) +++ trunk/reactos/include/ntos/zw.h 2005-01-28 12:12:42 UTC (rev 13349) @@ -465,47 +465,25 @@ NTSTATUS STDCALL -NtConnectPort(OUT PHANDLE PortHandle, - IN PUNICODE_STRING PortName, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, - OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, - OUT PULONG MaxMessageSize OPTIONAL, - IN PVOID ConnectInfo OPTIONAL, - IN PULONG ConnectInfoLength OPTIONAL); +NtConnectPort (PHANDLE PortHandle, + PUNICODE_STRING PortName, + PSECURITY_QUALITY_OF_SERVICE SecurityQos, + PLPC_SECTION_WRITE SectionInfo, + PLPC_SECTION_READ MapInfo, + PULONG MaxMessageSize, + PVOID ConnectInfo, + PULONG ConnectInfoLength); NTSTATUS STDCALL -ZwConnectPort(OUT PHANDLE PortHandle, - IN PUNICODE_STRING PortName, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, - OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, - OUT PULONG MaxMessageSize OPTIONAL, - IN PVOID ConnectInfo OPTIONAL, - IN PULONG ConnectInfoLength OPTIONAL); +ZwConnectPort (PHANDLE PortHandle, + PUNICODE_STRING PortName, + PSECURITY_QUALITY_OF_SERVICE SecurityQos, + PLPC_SECTION_WRITE SectionInfo, + PLPC_SECTION_READ MapInfo, + PULONG MaxMessageSize, + PVOID ConnectInfo, + PULONG ConnectInfoLength); -NTSTATUS STDCALL -NtSecureConnectPort(OUT PHANDLE PortHandle, - IN PUNICODE_STRING PortName, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, - IN PSID ServerSid OPTIONAL, - OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, - OUT PULONG MaxMessageSize OPTIONAL, - IN PVOID ConnectInfo OPTIONAL, - IN PULONG ConnectInfoLength OPTIONAL); - -NTSTATUS STDCALL -ZwSecureConnectPort(OUT PHANDLE PortHandle, - IN PUNICODE_STRING PortName, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, - IN PSID ServerSid OPTIONAL, - OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, - OUT PULONG MaxMessageSize OPTIONAL, - IN PVOID ConnectInfo OPTIONAL, - IN PULONG ConnectInfoLength OPTIONAL); - /* * FUNCTION: Creates a directory object * ARGUMENTS:

1 0

[weiden] 13348: removed double definition of Nt/ZwSecureConnectPort
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

removed double definition of Nt/ZwSecureConnectPort Modified: trunk/reactos/include/ntos/zw.h _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-01-28 12:04:37 UTC (rev 13347) +++ trunk/reactos/include/ntos/zw.h 2005-01-28 12:06:50 UTC (rev 13348) @@ -465,25 +465,47 @@ NTSTATUS STDCALL -NtConnectPort (PHANDLE PortHandle, - PUNICODE_STRING PortName, - PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PLPC_SECTION_WRITE SectionInfo, - PLPC_SECTION_READ MapInfo, - PULONG MaxMessageSize, - PVOID ConnectInfo, - PULONG ConnectInfoLength); +NtConnectPort(OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, + OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, + OUT PULONG MaxMessageSize OPTIONAL, + IN PVOID ConnectInfo OPTIONAL, + IN PULONG ConnectInfoLength OPTIONAL); NTSTATUS STDCALL -ZwConnectPort (PHANDLE PortHandle, - PUNICODE_STRING PortName, - PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PLPC_SECTION_WRITE SectionInfo, - PLPC_SECTION_READ MapInfo, - PULONG MaxMessageSize, - PVOID ConnectInfo, - PULONG ConnectInfoLength); +ZwConnectPort(OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, + OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, + OUT PULONG MaxMessageSize OPTIONAL, + IN PVOID ConnectInfo OPTIONAL, + IN PULONG ConnectInfoLength OPTIONAL); +NTSTATUS STDCALL +NtSecureConnectPort(OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, + IN PSID ServerSid OPTIONAL, + OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, + OUT PULONG MaxMessageSize OPTIONAL, + IN PVOID ConnectInfo OPTIONAL, + IN PULONG ConnectInfoLength OPTIONAL); + +NTSTATUS STDCALL +ZwSecureConnectPort(OUT PHANDLE PortHandle, + IN PUNICODE_STRING PortName, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, + IN OUT PLPC_SECTION_WRITE ClientSharedMemory OPTIONAL, + IN PSID ServerSid OPTIONAL, + OUT PLPC_SECTION_READ ServerSharedMemory OPTIONAL, + OUT PULONG MaxMessageSize OPTIONAL, + IN PVOID ConnectInfo OPTIONAL, + IN PULONG ConnectInfoLength OPTIONAL); + /* * FUNCTION: Creates a directory object * ARGUMENTS:

1 0

[weiden] 13347: removed double definition of Nt/ZwSecureConnectPort
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

removed double definition of Nt/ZwSecureConnectPort Modified: trunk/reactos/include/funcs.h _____ Modified: trunk/reactos/include/funcs.h --- trunk/reactos/include/funcs.h 2005-01-28 11:37:09 UTC (rev 13346) +++ trunk/reactos/include/funcs.h 2005-01-28 12:04:37 UTC (rev 13347) @@ -1534,20 +1534,6 @@ NTSTATUS STDCALL -NtSecureConnectPort( - OUT PHANDLE PortHandle, - IN PUNICODE_STRING PortName, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN OUT PPORT_SECTION_WRITE WriteSection OPTIONAL, - IN PSID ServerSid OPTIONAL, - IN OUT PPORT_SECTION_READ ReadSection OPTIONAL, - OUT PULONG MaxMessageSize OPTIONAL, - IN OUT PVOID ConnectData OPTIONAL, - IN OUT PULONG ConnectDataLength OPTIONAL - ); - -NTSTATUS -STDCALL NtSetHighWaitLowThread( VOID ); @@ -1980,20 +1966,6 @@ NTSTATUS STDCALL -ZwSecureConnectPort( - OUT PHANDLE PortHandle, - IN PUNICODE_STRING PortName, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos, - IN OUT PPORT_SECTION_WRITE WriteSection OPTIONAL, - IN PSID ServerSid OPTIONAL, - IN OUT PPORT_SECTION_READ ReadSection OPTIONAL, - OUT PULONG MaxMessageSize OPTIONAL, - IN OUT PVOID ConnectData OPTIONAL, - IN OUT PULONG ConnectDataLength OPTIONAL - ); - -NTSTATUS -STDCALL ZwSetHighWaitLowThread( VOID );

1 0

[weiden] 13346: 1. fixed InbvPutPixels() to save the ebx register which caused bootvid to crash when built with optimizations
by weiden＠svn.reactos.com 28 Jan '05

28 Jan '05

1. fixed InbvPutPixels() to save the ebx register which caused bootvid to crash when built with optimizations 2. build bootvid with optimizations when enabled Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Modified: trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-01-28 06:10:01 UTC (rev 13345) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-01-28 11:37:09 UTC (rev 13346) @@ -66,7 +66,6 @@ /* Must be 4 bytes per entry */ long maskbit[640]; -static HANDLE BitmapThreadHandle; static CLIENT_ID BitmapThreadId; static PUCHAR BootimageBitmap; @@ -556,6 +555,7 @@ VidInitialize(VOID) { NTSTATUS Status; + HANDLE BitmapThreadHandle; InbvMapVideoMemory(); InbvInitVGAMode(); @@ -574,7 +574,7 @@ return FALSE; } - NtClose(BitmapThreadHandle); + ZwClose(BitmapThreadHandle); return TRUE; } _____ Modified: trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S --- trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S 2005-01-28 06:10:01 UTC (rev 13345) +++ trunk/reactos/drivers/dd/bootvid/pixelsup_i386.S 2005-01-28 11:37:09 UTC (rev 13346) @@ -28,6 +28,7 @@ _InbvPutPixels: pushl %ebp movl %esp, %ebp + pushl %ebx /* Compute mask and put it in EBX mask = maskbit[x] */ @@ -66,7 +67,7 @@ (UCHAR) READ_REGISTER_UCHAR(VideoMemory + offset+0); */ movl (_VideoMemory), %esi addl %ebx, %esi - movb 0x0(%esi), %bl + movb 0x0(%esi), %bl /* Write color index for first pixel *((PUCHAR)(VideoMemory + offset+0)) = (c >> 0*8) & 0xff; */ movl 0x10(%ebp), %eax @@ -96,6 +97,7 @@ shrl $0x8, %eax movb %al, 0x3(%esi) + popl %ebx popl %ebp ret _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-01-28 06:10:01 UTC (rev 13345) +++ trunk/reactos/tools/helper.mk 2005-01-28 11:37:09 UTC (rev 13346) @@ -618,10 +618,8 @@ # if needed, until their problems can be found # ifeq ($(OPTIMIZED), 1) - ifneq ($(TARGET_NAME), bootvid) - MK_CFLAGS += -O2 -Wno-strict-aliasing - MK_CPPFLAGS += -O2 -Wno-strict-aliasing - endif + MK_CFLAGS += -O2 -Wno-strict-aliasing + MK_CPPFLAGS += -O2 -Wno-strict-aliasing endif ifneq ($(TARGET_LIBS),)

1 0

[royce] 13345: allow oring multiple DebugPort values
by royce＠svn.reactos.com 28 Jan '05

28 Jan '05

allow oring multiple DebugPort values Modified: trunk/reactos/boot/freeldr/freeldr/debug.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/debug.c --- trunk/reactos/boot/freeldr/freeldr/debug.c 2005-01-28 06:07:48 UTC (rev 13344) +++ trunk/reactos/boot/freeldr/freeldr/debug.c 2005-01-28 06:10:01 UTC (rev 13345) @@ -46,9 +46,9 @@ U32 DebugPrintMask = 0; #endif -#define SCREEN 0 -#define RS232 1 -#define BOCHS 2 +#define SCREEN 1 +#define RS232 2 +#define BOCHS 4 #define COM1 1 #define COM2 2 @@ -60,6 +60,7 @@ U32 DebugPort = RS232; //U32 DebugPort = SCREEN; //U32 DebugPort = BOCHS; +//U32 DebugPort = SCREEN|BOCHS; U32 ComPort = COM1; //U32 BaudRate = 19200; U32 BaudRate = 115200; @@ -81,7 +82,7 @@ DebugStartOfLine = TRUE; } - if (DebugPort == RS232) + if (DebugPort & RS232) { if (Character == '\n') { @@ -89,11 +90,11 @@ } Rs232PortPutByte(Character); } - else if (DebugPort == BOCHS) + if (DebugPort & BOCHS) { WRITE_PORT_UCHAR((PUCHAR)BOCHS_OUTPUT_PORT, Character); } - else + if (DebugPort & SCREEN) { MachConsPutChar(Character); } @@ -257,7 +258,7 @@ switch (c = *(format++)) { case 'd': case 'u': case 'x': - + if (ll) { *convert_i64_to_ascii(str, c, *((unsigned long long*) dataptr)) = 0; @@ -311,7 +312,7 @@ VOID DebugPrint(U32 Mask, char *format, ...) { int *dataptr = (int *) &format; - + // Mask out unwanted debug messages if (!(Mask & DebugPrintMask)) { @@ -340,7 +341,7 @@ PUCHAR BufPtr = (PUCHAR)Buffer; U32 Idx; U32 Idx2; - + // Mask out unwanted debug messages if (!(Mask & DebugPrintMask)) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs