Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[sginsberg] 38761: - DBGK: Use flags instead of magic values for Debug Events -- names taken from http://neitsabes.online.fr/dc/index.php?2007/12/04/7-ntqueryinformationprocess-processinfoclass-30
by sginsberg＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: sginsberg Date: Wed Jan 14 08:55:46 2009 New Revision: 38761 URL: http://svn.reactos.org/svn/reactos?rev=38761&view=rev Log: - DBGK: Use flags instead of magic values for Debug Events -- names taken from http://neitsabes.online.fr/dc/index.php?2007/12/04/7-ntqueryinformationproc… Modified: trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] Wed Jan 14 08:55:46 2009 @@ -32,6 +32,16 @@ #define DEBUG_OBJECT_ADD_REMOVE_PROCESS 0x0002 #define DEBUG_OBJECT_SET_INFORMATION 0x0004 #define DEBUG_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x0F) + +// +// Debug Event Flags +// +#define DEBUG_EVENT_READ (0x01) +#define DEBUG_EVENT_NOWAIT (0x02) +#define DEBUG_EVENT_INACTIVE (0x04) +#define DEBUG_EVENT_RELEASE (0x08) +#define DEBUG_EVENT_PROTECT_FAILED (0x10) +#define DEBUG_EVENT_SUSPEND (0x20) // // Debug Object Information Classes for NtQueryDebugObject Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Wed Jan 14 08:55:46 2009 @@ -53,7 +53,7 @@ Process, Thread, Message, Flags); /* Check if we have to allocate a debug event */ - NewEvent = (Flags & 2) ? TRUE : FALSE; + NewEvent = (Flags & DEBUG_EVENT_NOWAIT) ? TRUE : FALSE; if (NewEvent) { /* Allocate it */ @@ -63,7 +63,7 @@ if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES; /* Set flags */ - DebugEvent->Flags = Flags | 4; + DebugEvent->Flags = Flags | DEBUG_EVENT_INACTIVE; /* Reference the thread and process */ ObReferenceObject(Thread); @@ -428,17 +428,17 @@ DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent); /* Check if we have to wake the thread */ - if (DebugEvent->Flags & 0x20) PsResumeThread(Thread, NULL); + if (DebugEvent->Flags & DEBUG_EVENT_SUSPEND) PsResumeThread(Thread, NULL); /* Check if we had locked the thread */ - if (DebugEvent->Flags & 8) + if (DebugEvent->Flags & DEBUG_EVENT_RELEASE) { /* Unlock it */ ExReleaseRundownProtection(&Thread->RundownProtect); } /* Check if we have to wake up the event */ - if (DebugEvent->Flags & 2) + if (DebugEvent->Flags & DEBUG_EVENT_NOWAIT) { /* Otherwise, free the debug event */ DbgkpFreeDebugEvent(DebugEvent); @@ -552,7 +552,7 @@ Status = DbgkpQueueMessage(Process, Thread, &ApiMessage, - 2, + DEBUG_EVENT_NOWAIT, DebugObject); if (!NT_SUCCESS(Status)) { @@ -621,7 +621,7 @@ if (ExAcquireRundownProtection(&ThisThread->RundownProtect)) { /* Acquire worked, set flags */ - Flags = 0x8 | 0x2; + Flags = DEBUG_EVENT_RELEASE | DEBUG_EVENT_NOWAIT; /* Check if this is a user thread */ if (!ThisThread->SystemThread) @@ -630,14 +630,14 @@ if (NT_SUCCESS(PsSuspendThread(ThisThread, NULL))) { /* Remember this */ - Flags = 0x8 | 0x2 | 0x20; + Flags |= DEBUG_EVENT_SUSPEND; } } } else { /* Couldn't acquire rundown */ - Flags = 0x10 | 0x2; + Flags = DEBUG_EVENT_PROTECT_FAILED | DEBUG_EVENT_NOWAIT; } /* Clear the API Message */ @@ -645,7 +645,7 @@ /* Check if this is the first thread */ if ((IsFirstThread) && - !(Flags & 0x10) && + !(Flags & DEBUG_EVENT_PROTECT_FAILED) && !(ThisThread->SystemThread) && (ThisThread->GrantedAccess)) { @@ -1279,7 +1279,7 @@ DebugEvent->BackoutThread, PsGetCurrentThread()); /* Check for if the debug event queue needs flushing */ - if ((DebugEvent->Flags & 4) && + if ((DebugEvent->Flags & DEBUG_EVENT_INACTIVE) && (DebugEvent->BackoutThread == PsGetCurrentThread())) { /* Get the event's thread */ @@ -1293,7 +1293,7 @@ (!EventThread->SystemThread)) { /* Check if we couldn't acquire rundown for it */ - if (DebugEvent->Flags & 0x10) + if (DebugEvent->Flags & DEBUG_EVENT_PROTECT_FAILED) { /* Set the skip termination flag */ PspSetCrossThreadFlag(EventThread, CT_SKIP_CREATION_MSG_BIT); @@ -1308,7 +1308,7 @@ if (DoSetEvent) { /* Do it */ - DebugEvent->Flags &= ~4; + DebugEvent->Flags &= ~DEBUG_EVENT_INACTIVE; KeSetEvent(&DebugObject->EventsPresent, IO_NO_INCREMENT, FALSE); @@ -1330,10 +1330,10 @@ } /* Check if the lock is held */ - if (DebugEvent->Flags & 8) + if (DebugEvent->Flags & DEBUG_EVENT_RELEASE) { /* Release it */ - DebugEvent->Flags &= ~8; + DebugEvent->Flags &= ~DEBUG_EVENT_RELEASE; ExReleaseRundownProtection(&EventThread->RundownProtect); } } @@ -1569,7 +1569,7 @@ if (NeedsWake) { /* Wake it up and break out */ - DebugEvent->Flags &= ~4; + DebugEvent->Flags &= ~DEBUG_EVENT_INACTIVE; KeSetEvent(&DebugEvent->ContinueEvent, IO_NO_INCREMENT, FALSE); @@ -1578,7 +1578,7 @@ /* Compare thread ID and flag */ if ((DebugEvent->ClientId.UniqueThread == - AppClientId->UniqueThread) && (DebugEvent->Flags & 1)) + AppClientId->UniqueThread) && (DebugEvent->Flags & DEBUG_EVENT_READ)) { /* Remove the event from the list */ RemoveEntryList(NextEntry); @@ -1931,7 +1931,7 @@ DebugEvent, DebugEvent->Flags); /* Check flags */ - if (!(DebugEvent->Flags & (4 | 1))) + if (!(DebugEvent->Flags & (DEBUG_EVENT_INACTIVE | DEBUG_EVENT_READ))) { /* We got an event */ GotEvent = TRUE; @@ -1950,7 +1950,7 @@ DebugEvent->ClientId.UniqueProcess) { /* Found it, break out */ - DebugEvent->Flags |= 4; + DebugEvent->Flags |= DEBUG_EVENT_INACTIVE; DebugEvent->BackoutThread = NULL; GotEvent = FALSE; break; @@ -1982,7 +1982,7 @@ DebugEvent); /* Set flag */ - DebugEvent->Flags |= 1; + DebugEvent->Flags |= DEBUG_EVENT_READ; } else { @@ -2049,5 +2049,3 @@ /* Return status */ return Status; } - -/* EOF */

1 0

[hyperion] 38760: deleted lib/pseh/framebased-gcchack.c added lib/pseh/i386/framebased-gcchack-asm.S added lib/pseh/i386/framebased-gcchack.c deleted lib/pseh/i386/framebased-gcchack.S modified lib/pseh/pseh.rbuild framebased-gcchack.c is irreversibly married to the x86 architecture. Move it to the appropriate place Rename framebased-gcchack.S because its base name now conflicts with framebased-gcchack.c
by hyperion＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: hyperion Date: Wed Jan 14 08:51:23 2009 New Revision: 38760 URL: http://svn.reactos.org/svn/reactos?rev=38760&view=rev Log: deleted lib/pseh/framebased-gcchack.c added lib/pseh/i386/framebased-gcchack-asm.S added lib/pseh/i386/framebased-gcchack.c deleted lib/pseh/i386/framebased-gcchack.S modified lib/pseh/pseh.rbuild framebased-gcchack.c is irreversibly married to the x86 architecture. Move it to the appropriate place Rename framebased-gcchack.S because its base name now conflicts with framebased-gcchack.c Added: trunk/reactos/lib/pseh/i386/framebased-gcchack-asm.S (props changed) - copied unchanged from r38757, trunk/reactos/lib/pseh/i386/framebased-gcchack.S trunk/reactos/lib/pseh/i386/framebased-gcchack.c (props changed) - copied unchanged from r38757, trunk/reactos/lib/pseh/framebased-gcchack.c Removed: trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/lib/pseh/pseh.rbuild Removed: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c (removed) @@ -1,280 +1,0 @@ -/* - Copyright (c) 2008 KJK::Hyperion - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#define _NTSYSTEM_ /* removes dllimport attribute from RtlUnwind */ - -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#include <pseh/pseh2.h> -#include <excpt.h> -#include <intrin.h> - -#ifndef EXCEPTION_EXIT_UNWIND -#define EXCEPTION_EXIT_UNWIND 4 -#endif - -#ifndef EXCEPTION_UNWINDING -#define EXCEPTION_UNWINDING 2 -#endif - -extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *, void *, void *, void *); -extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); -extern int __cdecl __SEH2UnwindHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); - -FORCEINLINE -_SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void) -{ - return (_SEH2Registration_t *)__readfsdword(0); -} - -FORCEINLINE -void __cdecl __SEH2EnterFrame(_SEH2Registration_t * frame) -{ - frame->SER_Prev = _SEH2CurrentRegistration(); - __writefsdword(0, (unsigned long)frame); -} - -FORCEINLINE -void __cdecl __SEH2LeaveFrame(void) -{ - __writefsdword(0, (unsigned long)_SEH2CurrentRegistration()->SER_Prev); -} - -FORCEINLINE -void _SEH2GlobalUnwind(void * target) -{ - __asm__ __volatile__ - ( - "push %%ebp\n" - "push $0\n" - "push $0\n" - "push $Return%=\n" - "push %[target]\n" - "call %c[RtlUnwind]\n" - "Return%=: pop %%ebp\n" : - : - [target] "g" (target), [RtlUnwind] "g" (&RtlUnwind) : - "eax", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" - ); -} - -static -__SEH_EXCEPT_RET _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, struct _EXCEPTION_POINTERS * ep) -{ - void * filter = trylevel->ST_Filter; - void * context = NULL; - __SEH_EXCEPT_RET ret; - - if(filter == (void *)0) - return 0; - - if(filter == (void *)1) - return 1; - - if(filter == (void *)-1) - return -1; - - if(_SEHIsTrampoline((_SEHTrampoline_t *)filter)) - { - context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)filter); - filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)filter); - } - - __asm__ __volatile__ - ( - "push %[ep]\n" - "push %[frame]\n" - "call *%[filter]\n" - "pop %%edx\n" - "pop %%edx\n" : - [ret] "=a" (ret) : - "c" (context), [filter] "r" (filter), [frame] "g" (frame), [ep] "g" (ep) : - "edx", "flags", "memory" - ); - - return ret; -} - -static -void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) -{ - if(trylevel->ST_Filter == NULL && trylevel->ST_Body != NULL) - { - void * body = trylevel->ST_Body; - void * context = NULL; - - if(_SEHIsTrampoline((_SEHTrampoline_t *)body)) - { - context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)body); - body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)body); - } - - __asm__ __volatile__("call *%1\n" : : "c" (context), "r" (body) : "eax", "edx", "flags", "memory"); - } -} - -typedef struct __SEH2UnwindFrame -{ - _SEH2Registration_t SUF_Registration; - _SEH2Frame_t * SUF_Frame; - volatile _SEH2TryLevel_t * SUF_TargetTryLevel; -} -_SEH2UnwindFrame_t; - -static void _SEH2LocalUnwind(_SEH2Frame_t *, volatile _SEH2TryLevel_t *); - -extern -int __cdecl _SEH2UnwindHandler -( - struct _EXCEPTION_RECORD * ExceptionRecord, - void * EstablisherFrame, - struct _CONTEXT * ContextRecord, - void * DispatcherContext -) -{ - if(ExceptionRecord->ExceptionFlags & (EXCEPTION_EXIT_UNWIND | EXCEPTION_UNWINDING)) - { - _SEH2UnwindFrame_t * unwindframe = CONTAINING_RECORD(EstablisherFrame, _SEH2UnwindFrame_t, SUF_Registration); - _SEH2LocalUnwind(unwindframe->SUF_Frame, unwindframe->SUF_TargetTryLevel); - *((void **)DispatcherContext) = EstablisherFrame; - return ExceptionCollidedUnwind; - } - - return ExceptionContinueSearch; -} - -static -void _SEH2LocalUnwind(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * dsttrylevel) -{ - volatile _SEH2TryLevel_t * trylevel; - _SEH2UnwindFrame_t unwindframe; - - unwindframe.SUF_Frame = frame; - unwindframe.SUF_TargetTryLevel = dsttrylevel; - - unwindframe.SUF_Registration.SER_Handler = &__SEH2UnwindHandler; - __SEH2EnterFrame(&unwindframe.SUF_Registration); - - for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) - { - frame->SF_TopTryLevel = trylevel->ST_Next; - _SEH2Finally(frame, trylevel); - } - - __SEH2LeaveFrame(); -} - -static DECLSPEC_NORETURN -void _SEH2Handle(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) -{ - volatile _SEH2HandleTryLevel_t * fulltrylevel = CONTAINING_RECORD(trylevel, _SEH2HandleTryLevel_t, SHT_Common); - - _SEH2GlobalUnwind(frame); - _SEH2LocalUnwind(frame, &fulltrylevel->SHT_Common); - - __SEH2Handle - ( - fulltrylevel->SHT_Common.ST_Body, - fulltrylevel->SHT_Esp, - fulltrylevel->SHT_Ebp, - fulltrylevel->SHT_Ebx, - fulltrylevel->SHT_Esi, - fulltrylevel->SHT_Edi - ); -} - -extern -int __cdecl _SEH2FrameHandler -( - struct _EXCEPTION_RECORD * ExceptionRecord, - void * EstablisherFrame, - struct _CONTEXT * ContextRecord, - void * DispatcherContext -) -{ - _SEH2Frame_t * frame; - - frame = EstablisherFrame; - - /* Unwinding */ - if(ExceptionRecord->ExceptionFlags & (EXCEPTION_EXIT_UNWIND | EXCEPTION_UNWINDING)) - { - _SEH2LocalUnwind(frame, NULL); - } - /* Handling */ - else - { - int ret = 0; - volatile _SEH2TryLevel_t * trylevel; - EXCEPTION_POINTERS ep; - - ep.ExceptionRecord = ExceptionRecord; - ep.ContextRecord = ContextRecord; - - frame->SF_Code = ExceptionRecord->ExceptionCode; - - for(trylevel = frame->SF_TopTryLevel; trylevel != NULL; trylevel = trylevel->ST_Next) - { - ret = _SEH2Except(frame, trylevel, &ep); - - if(ret < 0) - return ExceptionContinueExecution; - else if(ret > 0) - _SEH2Handle(frame, trylevel); - } - } - - return ExceptionContinueSearch; -} - -extern -void __cdecl _SEH2EnterFrame(_SEH2Frame_t * frame) -{ - frame->SF_Registration.SER_Handler = __SEH2FrameHandler; - frame->SF_Code = 0; - __SEH2EnterFrame(&frame->SF_Registration); -} - -extern -int __cdecl _SEH2EnterFrameAndTrylevel(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) -{ - frame->SF_TopTryLevel = trylevel; - _SEH2EnterFrame(frame); - return 0; -} - -extern -void __cdecl _SEH2LeaveFrame(void) -{ - __SEH2LeaveFrame(); -} - -extern -void __cdecl _SEH2Return(void) -{ - _SEH2LocalUnwind(CONTAINING_RECORD(_SEH2CurrentRegistration(), _SEH2Frame_t, SF_Registration), NULL); - _SEH2LeaveFrame(); -} - -/* EOF */ Propchange: trunk/reactos/lib/pseh/i386/framebased-gcchack-asm.S ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/pseh/i386/framebased-gcchack-asm.S ------------------------------------------------------------------------------ svn:mergeinfo = Removed: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S (removed) @@ -1,89 +1,0 @@ -// Copyright (c) 2008 KJK::Hyperion - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to dos so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -.text -.intel_syntax noprefix - -.func _SEH2EnterHandleTrylevel -.globl __SEH2EnterHandleTrylevel -__SEH2EnterHandleTrylevel: - mov eax, [esp+8] - mov ecx, [esp+12] - mov [eax+8], ecx - mov [eax+16], ebp - mov [eax+20], ebx - mov [eax+24], esi - mov [eax+28], edi - - mov edx, [esp+4] - mov [edx+8], eax - - xor eax, eax - ret -.endfunc - -.func _SEH2EnterFrameAndHandleTrylevel -.globl __SEH2EnterFrameAndHandleTrylevel -__SEH2EnterFrameAndHandleTrylevel: - mov eax, [esp+8] - mov ecx, [esp+12] - mov [eax+8], ecx - mov [eax+16], ebp - mov [eax+20], ebx - mov [eax+24], esi - mov [eax+28], edi - -.extern __SEH2EnterFrameAndTrylevel - jmp __SEH2EnterFrameAndTrylevel -.endfunc - -.func __SEH2Handle -.globl ___SEH2Handle -___SEH2Handle: - mov eax, [esp+4] - mov ebp, [esp+12] - mov ebx, [esp+16] - mov esi, [esp+20] - mov edi, [esp+24] - mov esp, [esp+8] - jmp eax -.endfunc - -.func __SEH2FrameHandler -.globl ___SEH2FrameHandler -___SEH2FrameHandler: - -.extern __SEH2FrameHandler - - cld - jmp __SEH2FrameHandler -.endfunc - -.func __SEH2UnwindHandler -.globl ___SEH2UnwindHandler -___SEH2UnwindHandler: - -.extern __SEH2UnwindHandler - - cld - jmp __SEH2UnwindHandler -.endfunc - -// EOF Propchange: trunk/reactos/lib/pseh/i386/framebased-gcchack.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/pseh/i386/framebased-gcchack.c ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=3… ============================================================================== --- trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] Wed Jan 14 08:51:23 2009 @@ -4,7 +4,8 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file>framebased.S</file> - <file>framebased-gcchack.S</file> + <file>framebased-gcchack.c</file> + <file>framebased-gcchack-asm.S</file> </directory> </if> <if property="ARCH" value="powerpc"> @@ -13,5 +14,4 @@ </directory> </if> <file>framebased.c</file> - <file>framebased-gcchack.c</file> </module>

1 0

[khornicek] 38759: [FORMATTING] Fix indentation. No code change.
by khornicek＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: khornicek Date: Wed Jan 14 08:41:25 2009 New Revision: 38759 URL: http://svn.reactos.org/svn/reactos?rev=38759&view=rev Log: [FORMATTING] Fix indentation. No code change. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc…

1 0

[dreimer] 38758: Sync PS Port.
by dreimer＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: dreimer Date: Wed Jan 14 07:21:18 2009 New Revision: 38758 URL: http://svn.reactos.org/svn/reactos?rev=38758&view=rev Log: Sync PS Port. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Wed Jan 14 07:21:18 2009 @@ -74,20 +74,16 @@ # if ($_ROSBE_OBJPATH -ne $null) { if (Test-Path "$_ROSBE_OBJPATH") { - "ERROR: The Object-Path specified doesn't seem to exist." - exit - } else { - $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" - } + "WARNING: The Object-Path specified doesn't seem to exist. Creating..." + } + $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" } if ($_ROSBE_OUTPATH -ne $null) { if (Test-Path "$_ROSBE_OUTPATH") { - "ERROR: The Output-Path specified doesn't seem to exist." - exit - } else { - $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" - $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH" - } + "WARNING: The Output-Path specified doesn't seem to exist. Creating..." + } + $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" + $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH" } # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Wed Jan 14 07:21:18 2009 @@ -27,45 +27,52 @@ # Check if we have something to clean, if so, clean it. # - if ($ENV:ROS_ARCH -ne $null) { - if (Test-Path ".\obj-$ENV:ROS_ARCH") { - "Cleaning ReactOS $ENV:ROS_ARCH source directory..." - # - # Remove directories/makefile.auto created by the build. - # - if (Test-Path ".\obj-$ENV:ROS_ARCH") { - $null = (Remove-Item ".\obj-$ENV:ROS_ARCH" -recurse -force) - } - if (Test-Path ".\output-$ENV:ROS_ARCH") { - $null = (Remove-Item ".\output-$ENV:ROS_ARCH" -recurse -force) - } - if (Test-Path ".\makefile-$ENV:ROS_ARCH.auto") { - $null = (Remove-Item ".\makefile-$ENV:ROS_ARCH.auto" -force) - } - "Done cleaning ReactOS $ENV:ROS_ARCH source directory." + # + # Apply modified obj and out paths for deletion. + # + + if ($_ROSBE_OBJPATH -eq $null) { + if ($ENV:ROS_ARCH -ne $null) { + $_ROSBE_OBJCLEANPATH = "obj-$ENV:ROS_ARCH" } else { - "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." + $_ROSBE_OBJCLEANPATH = "obj-i386" } } else { - if (Test-Path ".\obj-i386") { - "Cleaning ReactOS i386 source directory..." - # - # Remove directories/makefile.auto created by the build. - # - if (Test-Path ".\obj-i386") { - $null = (Remove-Item ".\obj-i386" -recurse -force) - } - if (Test-Path ".\output-i386") { - $null = (Remove-Item ".\output-i386" -recurse -force) - } - if (Test-Path ".\makefile.auto") { - $null = (Remove-Item ".\makefile.auto" -force) - } - "Done cleaning ReactOS i386 source directory." + $_ROSBE_OBJCLEANPATH = "$_ROSBE_OBJPATH" + } + + if ($_ROSBE_OUTPATH -eq $null) { + if ($ENV:ROS_ARCH -ne $null) { + $_ROSBE_OUTCLEANPATH = "output-$ENV:ROS_ARCH" } else { - "ERROR: There is no i386 compiler output to clean." + $_ROSBE_OUTCLEANPATH = "output-i386" } + } else { + $_ROSBE_OUTCLEANPATH = "$_ROSBE_OUTPATH" } + + if ($ENV:ROS_ARCH -ne $null) { + $_ROSBE_MAKEFILE = "makefile-$ENV:ROS_ARCH.auto" + } else { + $_ROSBE_MAKEFILE = "makefile.auto" + } + + if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { + "Cleaning ReactOS $ENV:ROS_ARCH source directory..." + if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { + $null = (Remove-Item "$_ROSBE_OBJCLEANPATH" -recurse -force) + } + if (Test-Path "$_ROSBE_OUTCLEANPATH\.") { + $null = (Remove-Item "$_ROSBE_OUTCLEANPATH" -recurse -force) + } + if (Test-Path "$_ROSBE_MAKEFILE") { + $null = (Remove-Item "$_ROSBE_MAKEFILE" -force) + } + "Done cleaning ReactOS $ENV:ROS_ARCH source directory." + } else { + "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." + } + if (Test-Path "reactos") { $null = (Remove-Item "reactos" -recurse -force) } @@ -73,6 +80,14 @@ function end { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + + # + # Unload all used Vars. + # + $_ROSBE_OBJCLEANPATH = $null + $_ROSBE_OUTCLEANPATH = $null + $_ROSBE_MAKEFILE = $null + exit } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Jan 14 07:21:18 2009 @@ -91,7 +91,6 @@ ) set ROS_OUTPUT=%_ROSBE_OUTPATH% set ROS_TEMPORARY=%_ROSBE_OUTPATH% - ) ) ::

1 0

[dreimer] 38757: If the specified OBJ and OUT Paths are non existant, don't just abort. Create them and continue.
by dreimer＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: dreimer Date: Wed Jan 14 06:32:00 2009 New Revision: 38757 URL: http://svn.reactos.org/svn/reactos?rev=38757&view=rev Log: If the specified OBJ and OUT Paths are non existant, don't just abort. Create them and continue. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Jan 14 06:32:00 2009 @@ -81,19 +81,16 @@ :: if defined _ROSBE_OBJPATH ( if not exist "%_ROSBE_OBJPATH%\." ( - echo ERROR: The Object-Path specified doesn't seem to exist. - goto :EOC - ) else ( - set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% - ) + echo WARNING: The Object-Path specified doesn't seem to exist. Creating... + ) + set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% ) if defined _ROSBE_OUTPATH ( if not exist "%_ROSBE_OUTPATH%\." ( - echo ERROR: The Output-Path specified doesn't seem to exist. - goto :EOC - ) else ( - set ROS_OUTPUT=%_ROSBE_OUTPATH% - set ROS_TEMPORARY=%_ROSBE_OUTPATH% + echo WARNING: The Output-Path specified doesn't seem to exist. Creating... + ) + set ROS_OUTPUT=%_ROSBE_OUTPATH% + set ROS_TEMPORARY=%_ROSBE_OUTPATH% ) )

1 0

[dreimer] 38756: Fixed clean when using _ROSBE_OBJPATH and/or _ROSBE_OUTPATH
by dreimer＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: dreimer Date: Wed Jan 14 06:13:56 2009 New Revision: 38756 URL: http://svn.reactos.org/svn/reactos?rev=38756&view=rev Log: Fixed clean when using _ROSBE_OBJPATH and/or _ROSBE_OUTPATH Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Wed Jan 14 06:13:56 2009 @@ -54,39 +54,50 @@ :DEL -if not "%ROS_ARCH%" == "" ( - if exist "obj-%ROS_ARCH%\." ( - echo Cleaning ReactOS %ROS_ARCH% source directory... - if exist "obj-%ROS_ARCH%\." ( - rd /s /q "obj-%ROS_ARCH%" 1> NUL 2> NUL - ) - if exist "output-%ROS_ARCH%\." ( - rd /s /q "output-%ROS_ARCH%" 1> NUL 2> NUL - ) - if exist "makefile-%ROS_ARCH%.auto" ( - del "makefile-%ROS_ARCH%.auto" 1> NUL 2> NUL - ) - echo Done cleaning ReactOS %ROS_ARCH% source directory. +:: +:: Apply modified obj and out paths for deletion. +:: + +if "%_ROSBE_OBJPATH%" == "" ( + if not "%ROS_ARCH%" == "" ( + set _ROSBE_OBJCLEANPATH=obj-%ROS_ARCH% ) else ( - echo ERROR: There is no %ROS_ARCH% compiler output to clean. + set _ROSBE_OBJCLEANPATH=obj-i386 ) - goto :ROS +) else ( + set _ROSBE_OBJCLEANPATH=%_ROSBE_OBJPATH% ) -if exist "obj-i386\." ( - echo Cleaning ReactOS i386 source directory... - if exist "obj-i386\." ( - rd /s /q "obj-i386" 1> NUL 2> NUL +if "%_ROSBE_OUTPATH%" == "" ( + if not "%ROS_ARCH%" == "" ( + set _ROSBE_OUTCLEANPATH=output-%ROS_ARCH% + ) else ( + set _ROSBE_OUTCLEANPATH=output-i386 ) - if exist "output-i386\." ( - rd /s /q "output-i386" 1> NUL 2> NUL +) else ( + set _ROSBE_OUTCLEANPATH=%_ROSBE_OUTPATH% +) + +if not "%ROS_ARCH%" == "" ( + set _ROSBE_MAKEFILE=makefile-%ROS_ARCH%.auto +) else ( + set _ROSBE_MAKEFILE=makefile.auto +) + +if exist "%_ROSBE_OBJCLEANPATH%\." ( + echo Cleaning ReactOS %ROS_ARCH% source directory... + if exist "%_ROSBE_OBJCLEANPATH%\." ( + rd /s /q "%_ROSBE_OBJCLEANPATH%" 1> NUL 2> NUL ) - if exist "makefile.auto" ( - del "makefile.auto" 1> NUL 2> NUL + if exist "%_ROSBE_OUTCLEANPATH%\." ( + rd /s /q "%_ROSBE_OUTCLEANPATH%" 1> NUL 2> NUL ) - echo Done cleaning ReactOS i386 source directory. + if exist "%_ROSBE_MAKEFILE%" ( + del "%_ROSBE_MAKEFILE%" 1> NUL 2> NUL + ) + echo Done cleaning ReactOS %ROS_ARCH% source directory. ) else ( - echo ERROR: There is no i386 compiler output to clean. + echo ERROR: There is no %ROS_ARCH% compiler output to clean. ) :ROS @@ -101,3 +112,10 @@ if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) + +:: +:: Unload all used Vars. +:: +set _ROSBE_OBJCLEANPATH= +set _ROSBE_OUTCLEANPATH= +set _ROSBE_MAKEFILE=

1 0

[fireball] 38755: - Add stubs for VolumeControlBlock structure, VolumeDeviceObject, - Improve FAT_IRP_CONTEXT structure to suit future needs. - Some more cleanup of fastfat.h (to be separated into a few headers as shown by Alex Vlasov). - Implement FatBuildIrpContext / FatDestroyIrpContext. - Implement FatCompleteRequest. - Implement dispatching of FSCTRL requests. - DPRINT->DPRINT1 for all unimplemented functions. - We receive a mount volume request!
by fireball＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: fireball Date: Wed Jan 14 04:42:56 2009 New Revision: 38755 URL: http://svn.reactos.org/svn/reactos?rev=38755&view=rev Log: - Add stubs for VolumeControlBlock structure, VolumeDeviceObject, - Improve FAT_IRP_CONTEXT structure to suit future needs. - Some more cleanup of fastfat.h (to be separated into a few headers as shown by Alex Vlasov). - Implement FatBuildIrpContext / FatDestroyIrpContext. - Implement FatCompleteRequest. - Implement dispatching of FSCTRL requests. - DPRINT->DPRINT1 for all unimplemented functions. - We receive a mount volume request! Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c trunk/reactos/drivers/filesystems/fastfat_new/close.c trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/device.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/finfo.c trunk/reactos/drivers/filesystems/fastfat_new/flush.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c trunk/reactos/drivers/filesystems/fastfat_new/lock.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,7 +17,7 @@ NTAPI FatCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("FatCleanup(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + DPRINT1("FatCleanup(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,7 +17,7 @@ NTAPI FatClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("FatClose(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + DPRINT1("FatClose(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,6 +17,7 @@ NTAPI FatCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatCreate()\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/device.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,6 +17,7 @@ NTAPI FatDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatDeviceControl()\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,6 +17,7 @@ NTAPI FatDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatDirectoryControl()\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -114,5 +114,112 @@ return STATUS_SUCCESS; } +PFAT_IRP_CONTEXT +NTAPI +FatBuildIrpContext(PIRP Irp, + BOOLEAN CanWait) +{ + PIO_STACK_LOCATION IrpSp; + PFAT_IRP_CONTEXT IrpContext; + PVOLUME_DEVICE_OBJECT VolumeObject; + + /* Get current IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Allocate memory for the Irp context */ + IrpContext = ExAllocateFromNPagedLookasideList(&FatGlobalData.IrpContextList); + + /* Zero init memory */ + RtlZeroMemory(IrpContext, sizeof(FAT_IRP_CONTEXT)); + + /* Save IRP, MJ and MN */ + IrpContext->Irp = Irp; + IrpContext->MajorFunction = IrpSp->MajorFunction; + IrpContext->MinorFunction = IrpSp->MinorFunction; + + /* Set DeviceObject */ + if (IrpSp->FileObject) + { + IrpContext->DeviceObject = IrpSp->FileObject->DeviceObject; + + /* Save VCB pointer */ + VolumeObject = (PVOLUME_DEVICE_OBJECT)IrpSp->DeviceObject; + IrpContext->Vcb = &VolumeObject->Vcb; + + /* TODO: Handle write-through */ + } + else if (IrpContext->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) + { + /* Handle FSCTRL case */ + IrpContext->DeviceObject = IrpSp->Parameters.MountVolume.Vpb->RealDevice; + } + + /* Set Wait flag */ + if (CanWait) IrpContext->Flags |= IRPCONTEXT_CANWAIT; + + /* Return prepared context */ + return IrpContext; +} + +VOID +NTAPI +FatDestroyIrpContext(PFAT_IRP_CONTEXT IrpContext) +{ + PAGED_CODE(); + + /* Make sure it has no pinned stuff */ + ASSERT(IrpContext->PinCount == 0); + + /* If there is a FatIo context associated with it - free it */ + if (IrpContext->FatIoContext) + { + if (!(IrpContext->Flags & IRPCONTEXT_STACK_IO_CONTEXT)) + { + /* If a zero mdl was allocated - free it */ + if (IrpContext->FatIoContext->ZeroMdl) + IoFreeMdl(IrpContext->FatIoContext->ZeroMdl); + + /* Free memory of FatIo context */ + ExFreePool(IrpContext->FatIoContext); + } + } + + /* Free memory */ + ExFreeToNPagedLookasideList(&FatGlobalData.IrpContextList, IrpContext); +} + +VOID +NTAPI +FatCompleteRequest(PFAT_IRP_CONTEXT IrpContext OPTIONAL, + PIRP Irp OPTIONAL, + NTSTATUS Status) +{ + PAGED_CODE(); + + if (IrpContext) + { + /* TODO: Unpin repinned BCBs */ + //ASSERT(IrpContext->Repinned.Bcb[0] == NULL); + //FatUnpinRepinnedBcbs( IrpContext ); + + /* Destroy IRP context */ + FatDestroyIrpContext(IrpContext); + } + + /* Complete the IRP */ + if (Irp) + { + /* Cleanup IoStatus.Information in case of error input operation */ + if (NT_ERROR(Status) && (Irp->Flags & IRP_INPUT_OPERATION)) + { + Irp->IoStatus.Information = 0; + } + + /* Save status and complete this IRP */ + Irp->IoStatus.Status = Status; + IoCompleteRequest( Irp, IO_DISK_INCREMENT ); + } +} + + /* EOF */ - Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -3,6 +3,7 @@ #include <reactos/helper.h> #include <debug.h> +/* FAT on-disk data structures */ #include <pshpack1.h> struct _BootSector { @@ -164,46 +165,15 @@ #include <poppack.h> -#define VFAT_CASE_LOWER_BASE 8 // base is lower case -#define VFAT_CASE_LOWER_EXT 16 // extension is lower case - -#define LONGNAME_MAX_LENGTH 256 // max length for a long filename - -#define ENTRY_DELETED(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) -#define ENTRY_VOLUME(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) -#define ENTRY_END(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) - -#define FAT_ENTRY_DELETED(DirEntry) ((DirEntry)->Filename[0] == 0xe5) -#define FAT_ENTRY_END(DirEntry) ((DirEntry)->Filename[0] == 0) -#define FAT_ENTRY_LONG(DirEntry) (((DirEntry)->Attrib & 0x3f) == 0x0f) -#define FAT_ENTRY_VOLUME(DirEntry) (((DirEntry)->Attrib & 0x1f) == 0x08) - -#define FATX_ENTRY_DELETED(DirEntry) ((DirEntry)->FilenameLength == 0xe5) -#define FATX_ENTRY_END(DirEntry) ((DirEntry)->FilenameLength == 0xff) -#define FATX_ENTRY_LONG(DirEntry) (FALSE) -#define FATX_ENTRY_VOLUME(DirEntry) (((DirEntry)->Attrib & 0x1f) == 0x08) - -#define FAT_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof (FAT_DIR_ENTRY)) -#define FATX_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof (FATX_DIR_ENTRY)) - -typedef struct _FATXDirEntry FATX_DIR_ENTRY, *PFATX_DIR_ENTRY; - -union _DIR_ENTRY -{ - FAT_DIR_ENTRY Fat; - FATX_DIR_ENTRY FatX; -}; - -typedef union _DIR_ENTRY DIR_ENTRY, *PDIR_ENTRY; - -#define BLOCKSIZE 512 - + +/* File system types */ #define FAT16 (1) #define FAT12 (2) #define FAT32 (3) #define FATX16 (4) #define FATX32 (5) +/* VCB Flags */ #define VCB_VOLUME_LOCKED 0x0001 #define VCB_DISMOUNT_PENDING 0x0002 #define VCB_IS_FATX 0x0004 @@ -232,23 +202,7 @@ struct _VFATFCB; struct _VFAT_DIRENTRY_CONTEXT; -typedef struct _HASHENTRY -{ - ULONG Hash; - struct _VFATFCB* self; - struct _HASHENTRY* next; -} -HASHENTRY; - -#define FCB_HASH_TABLE_SIZE 65536 - typedef struct DEVICE_EXTENSION *PDEVICE_EXTENSION; - -typedef NTSTATUS (*PGET_NEXT_CLUSTER)(PDEVICE_EXTENSION,ULONG,PULONG); -typedef NTSTATUS (*PFIND_AND_MARK_AVAILABLE_CLUSTER)(PDEVICE_EXTENSION,PULONG); -typedef NTSTATUS (*PWRITE_CLUSTER)(PDEVICE_EXTENSION,ULONG,ULONG,PULONG); - -typedef NTSTATUS (*PGET_NEXT_DIR_ENTRY)(PVOID*,PVOID*,struct _VFATFCB*,struct _VFAT_DIRENTRY_CONTEXT*,BOOLEAN); typedef struct _DEVICE_EXTENSION { @@ -269,19 +223,10 @@ ULONG Flags; struct _VFATFCB * VolumeFcb; - /* Pointers to functions for manipulating FAT. */ - PGET_NEXT_CLUSTER GetNextCluster; - PFIND_AND_MARK_AVAILABLE_CLUSTER FindAndMarkAvailableCluster; - PWRITE_CLUSTER WriteCluster; - ULONG CleanShutBitMask; - - /* Pointers to functions for manipulating directory entries. */ - PGET_NEXT_DIR_ENTRY GetNextDirEntry; - ULONG BaseDateYear; LIST_ENTRY VolumeListEntry; -} DEVICE_EXTENSION, VCB, *PVCB; +} DEVICE_EXTENSION; typedef struct _FAT_GLOBAL_DATA { @@ -298,6 +243,7 @@ extern VFAT_GLOBAL_DATA VfatGlobalData; +/* FCB flags */ #define FCB_CACHE_INITIALIZED 0x0001 #define FCB_DELETE_PENDING 0x0002 #define FCB_IS_FAT 0x0004 @@ -315,9 +261,6 @@ ERESOURCE PagingIoResource; /* end FCB header required by ROS/NT */ - /* directory entry for this file or directory */ - DIR_ENTRY entry; - /* Pointer to attributes in entry */ PUCHAR Attributes; @@ -365,12 +308,6 @@ /* Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP */ ULONG OpenHandleCount; - - /* Entry into the hash table for the path + long name */ - HASHENTRY Hash; - - /* Entry into the hash table for the path + short name */ - HASHENTRY ShortHash; /* List of byte-range locks for this file */ FILE_LOCK FileLock; @@ -394,6 +331,21 @@ UNICODE_STRING SearchPattern; } VFATCCB, *PVFATCCB; +/* Volume Control Block */ +typedef struct _VCB +{ + FSRTL_ADVANCED_FCB_HEADER VolumeFileHeader; +} VCB, *PVCB; + +/* Volume Device Object */ +typedef struct _VOLUME_DEVICE_OBJECT +{ + DEVICE_OBJECT DeviceObject; + FSRTL_COMMON_FCB_HEADER VolumeHeader; + VCB Vcb; /* Must be the last entry! */ +} VOLUME_DEVICE_OBJECT, *PVOLUME_DEVICE_OBJECT; + + #ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #endif @@ -402,8 +354,6 @@ #define TAG_FCB TAG('V', 'F', 'C', 'B') #define TAG_IRP TAG('V', 'I', 'R', 'P') #define TAG_VFAT TAG('V', 'F', 'A', 'T') - -#define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry)) typedef struct __DOSTIME { @@ -421,33 +371,32 @@ } DOSDATE, *PDOSDATE; -#define IRPCONTEXT_CANWAIT 0x0001 +#define IRPCONTEXT_CANWAIT 0x0001 #define IRPCONTEXT_PENDINGRETURNED 0x0002 +#define IRPCONTEXT_STACK_IO_CONTEXT 0x0004 typedef struct _FAT_IRP_CONTEXT { PIRP Irp; PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExt; - ULONG Flags; - WORK_QUEUE_ITEM WorkQueueItem; - PIO_STACK_LOCATION Stack; UCHAR MajorFunction; UCHAR MinorFunction; PFILE_OBJECT FileObject; - ULONG RefCount; + ULONG Flags; + PVCB Vcb; + ULONG PinCount; + struct _FAT_IO_CONTEXT *FatIoContext; + + PDEVICE_EXTENSION DeviceExt; + WORK_QUEUE_ITEM WorkQueueItem; + PIO_STACK_LOCATION Stack; KEVENT Event; } FAT_IRP_CONTEXT, *PFAT_IRP_CONTEXT; -typedef struct _VFAT_DIRENTRY_CONTEXT -{ - ULONG StartIndex; - ULONG DirIndex; - DIR_ENTRY DirEntry; - UNICODE_STRING LongNameU; - UNICODE_STRING ShortNameU; -} VFAT_DIRENTRY_CONTEXT, *PVFAT_DIRENTRY_CONTEXT; - +typedef struct _FAT_IO_CONTEXT +{ + PMDL ZeroMdl; +} _FAT_IO_CONTEXT, *PFAT_IO_CONTEXT; /* ------------------------------------------------------ shutdown.c */ @@ -511,6 +460,20 @@ VOID NTAPI FatNoopRelease(IN PVOID Context); +/* --------------------------------------------------------- fastfat.c */ + +PFAT_IRP_CONTEXT NTAPI +FatBuildIrpContext(PIRP Irp, BOOLEAN CanWait); + +VOID NTAPI +FatDestroyIrpContext(PFAT_IRP_CONTEXT IrpContext); + +VOID NTAPI +FatCompleteRequest(PFAT_IRP_CONTEXT IrpContext OPTIONAL, + PIRP Irp OPTIONAL, + NTSTATUS Status); + + /* --------------------------------------------------------- lock.c */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/finfo.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,6 +17,7 @@ NTAPI FatQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatQueryInformation()\n"); return STATUS_NOT_IMPLEMENTED; } @@ -24,6 +25,7 @@ NTAPI FatSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatSetInformation()\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/flush.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -18,6 +18,7 @@ NTAPI FatFlushBuffers(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatFlushBuffers()\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -15,9 +15,102 @@ NTSTATUS NTAPI +FatUserFsCtrl(PFAT_IRP_CONTEXT IrpContext, PIRP Irp) +{ + DPRINT1("FatUserFsCtrl()\n"); + FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_DEVICE_REQUEST); + return STATUS_INVALID_DEVICE_REQUEST; +} + +NTSTATUS +NTAPI +FatVerifyVolume(PFAT_IRP_CONTEXT IrpContext, PIRP Irp) +{ + DPRINT1("FatVerifyVolume()\n"); + FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_DEVICE_REQUEST); + return STATUS_INVALID_DEVICE_REQUEST; +} + +NTSTATUS +NTAPI +FatMountVolume(PFAT_IRP_CONTEXT IrpContext, + PDEVICE_OBJECT TargetDeviceObject, + PVPB Vpb, + PDEVICE_OBJECT FsDeviceObject) +{ + DPRINT1("FatMountVolume()\n"); + + FatCompleteRequest(IrpContext, IrpContext->Irp, STATUS_INVALID_DEVICE_REQUEST); + return STATUS_INVALID_DEVICE_REQUEST; +} + + + +NTSTATUS +NTAPI +FatiFileSystemControl(PFAT_IRP_CONTEXT IrpContext, PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + + /* Get current IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Dispatch depending on the minor function */ + switch (IrpSp->MinorFunction) + { + case IRP_MN_USER_FS_REQUEST: + Status = FatUserFsCtrl(IrpContext, Irp); + break; + + case IRP_MN_MOUNT_VOLUME: + Status = FatMountVolume(IrpContext, + IrpSp->Parameters.MountVolume.DeviceObject, + IrpSp->Parameters.MountVolume.Vpb, + IrpSp->DeviceObject); + break; + + case IRP_MN_VERIFY_VOLUME: + Status = FatVerifyVolume(IrpContext, Irp); + break; + + default: + DPRINT1("Unhandled FSCTL minor 0x%x\n", IrpSp->MinorFunction); + FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_DEVICE_REQUEST); + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + return Status; +} + + +NTSTATUS +NTAPI FatFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("VfatFileSystemControl(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + NTSTATUS Status = STATUS_SUCCESS; + PFAT_IRP_CONTEXT IrpContext; + BOOLEAN CanWait = TRUE; - return STATUS_NOT_IMPLEMENTED; + DPRINT1("FatFileSystemControl(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + + /* Get CanWait flag */ + if (IoGetCurrentIrpStackLocation(Irp)->FileObject) + { + CanWait = IoIsOperationSynchronous(Irp); + } + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, CanWait); + + /* Call internal function */ + Status = FatiFileSystemControl(IrpContext, Irp); + + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + + return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/lock.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,6 +17,7 @@ NTAPI FatLockControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatLockControl()\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,6 +17,7 @@ NTAPI FatRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatRead()\n"); return STATUS_NOT_IMPLEMENTED; } @@ -24,6 +25,7 @@ NTAPI FatWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatWrite()\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/shutdown.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,7 +17,7 @@ NTAPI FatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT("FatShutdown(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + DPRINT1("FatShutdown(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Wed Jan 14 04:42:56 2009 @@ -17,6 +17,7 @@ NTAPI FatQueryVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatQueryVolumeInfo()\n"); return STATUS_NOT_IMPLEMENTED; } @@ -24,6 +25,7 @@ NTAPI FatSetVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + DPRINT1("FatSetVolumeInfo()\n"); return STATUS_NOT_IMPLEMENTED; }

1 0

[fireball] 38754: - Revert 38750, a dereference happens when that hook is freed by IntFreeHook. - Change thread dereferencing mechanism in NtUserSetWindowsHookEx: * A thread may be referenced in some cases when it's a system-wide hook, however dereference flag was not set for these, so they leaked a reference. Add a ThreadReferenced boolean var to track real references, and set hook's flag according to it. * There should be no need to call ObDereferenceObject on a thread when a call to IntRemove
by fireball＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: fireball Date: Wed Jan 14 03:51:50 2009 New Revision: 38754 URL: http://svn.reactos.org/svn/reactos?rev=38754&view=rev Log: - Revert 38750, a dereference happens when that hook is freed by IntFreeHook. - Change thread dereferencing mechanism in NtUserSetWindowsHookEx: * A thread may be referenced in some cases when it's a system-wide hook, however dereference flag was not set for these, so they leaked a reference. Add a ThreadReferenced boolean var to track real references, and set hook's flag according to it. * There should be no need to call ObDereferenceObject on a thread when a call to IntRemoveHook was already performed (in failure branches). IntFreeHook() will dereference the thread object. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Wed Jan 14 03:51:50 2009 @@ -969,6 +969,7 @@ UNICODE_STRING ModuleName; NTSTATUS Status; HHOOK Handle; + BOOLEAN ThreadReferenced = FALSE; DECLARE_RETURN(HHOOK); DPRINT("Enter NtUserSetWindowsHookEx\n"); @@ -1008,6 +1009,8 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); RETURN( NULL); } + /* Thread was referenced */ + ThreadReferenced = TRUE; if (Thread->ThreadsProcess != PsGetCurrentProcess()) { ObDereferenceObject(Thread); @@ -1032,6 +1035,9 @@ SetLastNtError(Status); RETURN( (HANDLE) NULL); } + + /* Thread was referenced */ + ThreadReferenced = TRUE; } else if (NULL == Mod) { @@ -1056,10 +1062,8 @@ DPRINT1("Not implemented: HookId %d Global %s\n", HookId, Global ? "TRUE" : "FALSE"); #endif - if (NULL != Thread) - { - ObDereferenceObject(Thread); - } + /* Dereference thread if needed */ + if (ThreadReferenced) ObDereferenceObject(Thread); SetLastWin32Error(ERROR_NOT_SUPPORTED); RETURN( NULL); } @@ -1071,10 +1075,8 @@ if (! NT_SUCCESS(Status)) { - if (NULL != Thread) - { - ObDereferenceObject(Thread); - } + /* Dereference thread if needed */ + if (ThreadReferenced) ObDereferenceObject(Thread); SetLastNtError(Status); RETURN( (HANDLE) NULL); } @@ -1082,15 +1084,14 @@ Hook = IntAddHook(Thread, HookId, Global, WinStaObj); if (NULL == Hook) { - if (NULL != Thread) - { - ObDereferenceObject(Thread); - } + /* Dereference thread if needed */ + if (ThreadReferenced) ObDereferenceObject(Thread); ObDereferenceObject(WinStaObj); RETURN( NULL); } - if (NULL != Thread) + /* Let IntFreeHook now that this thread needs a dereference */ + if (ThreadReferenced) { Hook->Flags |= HOOK_THREAD_REFERENCED; } @@ -1102,10 +1103,6 @@ { UserDereferenceObject(Hook); IntRemoveHook(Hook, WinStaObj, FALSE); - if (NULL != Thread) - { - ObDereferenceObject(Thread); - } ObDereferenceObject(WinStaObj); SetLastNtError(Status); RETURN( NULL); @@ -1117,10 +1114,6 @@ { UserDereferenceObject(Hook); IntRemoveHook(Hook, WinStaObj, FALSE); - if (NULL != Thread) - { - ObDereferenceObject(Thread); - } ObDereferenceObject(WinStaObj); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); RETURN( NULL); @@ -1134,10 +1127,6 @@ ExFreePoolWithTag(Hook->ModuleName.Buffer, TAG_HOOK); UserDereferenceObject(Hook); IntRemoveHook(Hook, WinStaObj, FALSE); - if (NULL != Thread) - { - ObDereferenceObject(Thread); - } ObDereferenceObject(WinStaObj); SetLastNtError(Status); RETURN( NULL); @@ -1154,13 +1143,9 @@ // Clear the client threads next hook. ClientInfo->phkCurrent = 0; - + UserDereferenceObject(Hook); - if (NULL != Thread) - { - ObDereferenceObject(Thread); - } ObDereferenceObject(WinStaObj); RETURN( Handle);

1 0

[cwittich] 38753: fix jim's copypasta
by cwittich＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: cwittich Date: Wed Jan 14 01:09:25 2009 New Revision: 38753 URL: http://svn.reactos.org/svn/reactos?rev=38753&view=rev Log: fix jim's copypasta Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Wed Jan 14 01:09:25 2009 @@ -103,7 +103,7 @@ iMonitor++; break; case otTimer: - iMonitor++; + iTimer++; break; default: break;

1 0

[jimtabor] 38752: - Added stubs to timers, tooling up to change over to handled timers. This is related to just about everything. From Carets to window positions.
by jimtabor＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: jimtabor Date: Tue Jan 13 20:02:26 2009 New Revision: 38752 URL: http://svn.reactos.org/svn/reactos?rev=38752&view=rev Log: - Added stubs to timers, tooling up to change over to handled timers. This is related to just about everything. From Carets to window positions. Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Tue Jan 13 20:02:26 2009 @@ -28,5 +28,7 @@ UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer); PTIMER FASTCALL FindSystemTimer(PMSG); BOOL FASTCALL ValidateTimerCallback(PW32THREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); +VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); +UINT_PTR FASTCALL SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); #endif /* _WIN32K_TIMER_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Tue Jan 13 20:02:26 2009 @@ -70,7 +70,7 @@ { /**/ int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, - iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0; + iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0; /**/ DPRINT1("Out of user handles! Used -> %i, NM_Handle -> %d\n", usedHandles, ht->nb_handles); //#if 0 @@ -102,12 +102,15 @@ case otMonitor: iMonitor++; break; + case otTimer: + iMonitor++; + break; default: break; } } - DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d\n", - iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor ); + DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d Timer = %d\n", + iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor, iTimer ); //#endif return NULL; #if 0 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Tue Jan 13 20:02:26 2009 @@ -54,6 +54,72 @@ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&Mutex) /* FUNCTIONS *****************************************************************/ +PTIMER +FASTCALL +CreateTimer(VOID) +{ + HANDLE Handle; + PTIMER Ret = NULL; + + if (!FirstpTmr) + { + FirstpTmr = UserCreateObject(gHandleTable, &Handle, otTimer, sizeof(TIMER)); + if (FirstpTmr) InitializeListHead(&FirstpTmr->ptmrList); + Ret = FirstpTmr; + } + else + { + Ret = UserCreateObject(gHandleTable, &Handle, otTimer, sizeof(TIMER)); + if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); + } + return Ret; +} + +static +BOOL +FASTCALL +RemoveTimer(PTIMER pTmr) +{ + if (pTmr) + { + RemoveEntryList(&pTmr->ptmrList); + UserDeleteObject( USER_BODY_TO_HEADER(pTmr)->hSelf, otTimer); + return TRUE; + } + return FALSE; +} + +PTIMER +FASTCALL +FindTimer(PWINDOW_OBJECT Window, + UINT_PTR nID, + UINT flags, + BOOL Distroy) +{ + PTIMER pTmr = FirstpTmr; + KeEnterCriticalRegion(); + do + { + if (!pTmr) break; + + if ( pTmr->nID == nID && + pTmr->pWnd == Window && + (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) == (flags & (TMRF_SYSTEM|TMRF_RIT))) + { + if (Distroy) + { + RemoveTimer(pTmr); + pTmr = (PTIMER)1; // We are here to remove the timer. + } + break; + } + + pTmr = (PTIMER)pTmr->ptmrList.Flink; + } while (pTmr != FirstpTmr); + KeLeaveCriticalRegion(); + + return pTmr; +} PTIMER FASTCALL @@ -104,6 +170,41 @@ return TRUE; } +// Rename it to IntSetTimer after move. +UINT_PTR FASTCALL +InternalSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) +{ + return 0; +} + +// +// Process system timers. +// +VOID +CALLBACK +SystemTimerProc(HWND hwnd, + UINT uMsg, + UINT_PTR idEvent, + DWORD dwTime) +{ +} + +UINT_PTR +FASTCALL +SetSystemTimer( HWND hWnd, + UINT_PTR nIDEvent, + UINT uElapse, + TIMERPROC lpTimerFunc) +{ + return 0; +} + + +// +// +// Old Timer Queueing +// +// UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) { @@ -268,12 +369,6 @@ /* yes we need this, since ExAllocatePool isn't supposed to zero out allocated memory */ RtlClearAllBits(&WindowLessTimersBitMap); - if (!FirstpTmr) - { - FirstpTmr = ExAllocatePoolWithTag(PagedPool, sizeof(TIMER), TAG_TIMERBMP); - if (FirstpTmr) InitializeListHead(&FirstpTmr->ptmrList); - } - return STATUS_SUCCESS; } @@ -337,6 +432,7 @@ DPRINT("Enter NtUserSetSystemTimer\n"); UserEnterExclusive(); + // This is wrong, lpTimerFunc is NULL! RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, TRUE)); CLEANUP:

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
76
Older →

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 January 2009