Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[weiden] 16759: added an initial MARTA provider (only two functions stubbed)

by weiden＠svn.reactos.com

added an initial MARTA provider (only two functions stubbed) Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/ntmarta/ Added: trunk/reactos/lib/ntmarta/ntmarta.c Added: trunk/reactos/lib/ntmarta/ntmarta.def Added: trunk/reactos/lib/ntmarta/ntmarta.h Added: trunk/reactos/lib/ntmarta/ntmarta.rc Added: trunk/reactos/lib/ntmarta/ntmarta.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/baseaddress.xml 2005-07-26 21:17:06 UTC (rev 16759) @@ -56,6 +56,7 @@ <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> +<property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-07-26 21:17:06 UTC (rev 16759) @@ -114,6 +114,7 @@ lib\mswsock\mswsock.dll 1 lib\netapi32\netapi32.dll 1 lib\ntdll\ntdll.dll 1 +lib\ntmarta\ntmarta.dll 1 lib\objsel\objsel.dll 1 lib\ole32\ole32.dll 1 lib\oleaut32\oleaut32.dll 1 _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/directory.xml 2005-07-26 21:17:06 UTC (rev 16759) @@ -190,6 +190,9 @@ <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> +<directory name="ntmarta"> + <xi:include href="ntmarta/ntmarta.xml" /> +</directory> <directory name="objsel"> <xi:include href="objsel/objsel.xml" /> </directory> Property changes on: trunk/reactos/lib/ntmarta ___________________________________________________________________ Name: svn:ignore + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp *.gch makefile _____ Added: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,89 @@ +/* + * ReactOS MARTA provider + * Copyright (C) 2004 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* $Id$ + * + * PROJECT: ReactOS MARTA provider + * FILE: lib/ntmarta/ntmarta.c + * PURPOSE: ReactOS MARTA provider + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * UPDATE HISTORY: + * 07/26/2005 Created + */ +#include <ntmarta.h> + +#define NDEBUG +#include <debug.h> + +HINSTANCE hDllInstance; + +/********************************************************************** + * AccRewriteGetHandleRights EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccRewriteGetHandleRights(HANDLE handle, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSID* ppsidOwner, + PSID* ppsidGroup, + PACL* ppDacl, + PACL* ppSacl, + PSECURITY_DESCRIPTOR* ppSecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** + * AccRewriteSetHandleRights EXPORTED + * + * @unimplemented + */ +DWORD STDCALL +AccRewriteSetHandleRights(HANDLE handle, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, + PSECURITY_DESCRIPTOR pSecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +BOOL STDCALL +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hDllInstance = hinstDLL; + break; + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + Property changes on: trunk/reactos/lib/ntmarta/ntmarta.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.def --- trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.def 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,47 @@ +LIBRARY ntmarta.dll + +EXPORTS +;AccFreeIndexArray +;AccGetInheritanceSource +;AccProvHandleGrantAccessRights; +;AccRewriteGetExplicitEntriesFromAcl +AccRewriteGetHandleRights@32 +;AccRewriteGetNamedRights +;AccRewriteSetEntriesInAcl +AccRewriteSetHandleRights@16 +;AccRewriteSetNamedRights +;AccTreeResetNamedSecurityInfo +;AccConvertAccessMaskToActrlAccess +;AccConvertAccessToSD +;AccConvertAccessToSecurityDescriptor +;AccConvertAclToAccess +;AccConvertSDToAccess +;AccGetAccessForTrustee +;AccGetExplicitEntries +;AccLookupAccountName +;AccLookupAccountSid; +;AccLookupAccountTrustee +;AccProvCancelOperation; +;AccProvGetAccessInfoPerObjectType +;AccProvGetAllRights +;AccProvGetCapabilities +;AccProvGetOperationResults +;AccProvGetTrusteesAccess +;AccProvGrantAccessRights +;AccProvHandleGetAccessInfoPerObjectType +;AccProvHandleGetAllRights +;AccProvHandleGetTrusteesAccess +;AccProvHandleIsAccessAudited +;AccProvHandleIsObjectAccessible +;AccProvHandleRevokeAccessRights +;AccProvHandleRevokeAuditRights +;AccProvHandleSetAccessRights +;AccProvIsAccessAudited +;AccProvIsObjectAccessible +;AccProvRevokeAccessRights +;AccProvSetAccessRights +;AccSetEntriesInAList +;EventGuidToName +;EventNameFree + +; EOF Property changes on: trunk/reactos/lib/ntmarta/ntmarta.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.h --- trunk/reactos/lib/ntmarta/ntmarta.h 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.h 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,8 @@ +#include <windows.h> +#include <accctrl.h> + +ULONG DbgPrint(PCH Format,...); + +extern HINSTANCE hDllInstance; + +/* EOF */ Property changes on: trunk/reactos/lib/ntmarta/ntmarta.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.rc --- trunk/reactos/lib/ntmarta/ntmarta.rc 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.rc 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,9 @@ +#include <windows.h> +#include <reactos/resource.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS MARTA Provider\0" +#define REACTOS_STR_INTERNAL_NAME "ntmarta\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ntmarta.dll\0" +#include <reactos/version.rc> + Property changes on: trunk/reactos/lib/ntmarta/ntmarta.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/ntmarta/ntmarta.xml --- trunk/reactos/lib/ntmarta/ntmarta.xml 2005-07-26 19:46:07 UTC (rev 16758) +++ trunk/reactos/lib/ntmarta/ntmarta.xml 2005-07-26 21:17:06 UTC (rev 16759) @@ -0,0 +1,16 @@ +<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll"> + <importlibrary definition="ntmarta.def" /> + <include base="ntmarta">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>ntmarta.c</file> + <file>ntmarta.rc</file> + <pch>ntmarta.h</pch> +</module> Property changes on: trunk/reactos/lib/ntmarta/ntmarta.xml ___________________________________________________________________ Name: svn:eol-style + native

19 years, 2 months

[hbirr] 16758: Lock the handle table if we trying to get a pointer from a handle.

by hbirr＠svn.reactos.com

Lock the handle table if we trying to get a pointer from a handle. Modified: trunk/reactos/ntoskrnl/ex/handle.c _____ Modified: trunk/reactos/ntoskrnl/ex/handle.c --- trunk/reactos/ntoskrnl/ex/handle.c 2005-07-26 19:38:33 UTC (rev 16757) +++ trunk/reactos/ntoskrnl/ex/handle.c 2005-07-26 19:46:07 UTC (rev 16758) @@ -910,14 +910,16 @@ ASSERT(HandleTable); + ExAcquireHandleTableLockShared(HandleTable); HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle); if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) { DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry); + ExReleaseHandleTableLock(HandleTable); return HandleTableEntry; } - + ExReleaseHandleTableLock(HandleTable); return NULL; } @@ -936,12 +938,14 @@ ASSERT(ChangeHandleCallback); KeEnterCriticalRegion(); + ExAcquireHandleTableLockShared(HandleTable); HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle); if(HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) { + ExReleaseHandleTableLock(HandleTable); Ret = ChangeHandleCallback(HandleTable, HandleTableEntry, NULL); @@ -949,7 +953,10 @@ ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); } - + else + { + ExReleaseHandleTableLock(HandleTable); + } KeLeaveCriticalRegion(); return Ret;

19 years, 2 months

[hbirr] 16757: Used IoQueryFileInformation and IoSetInformation instead of ZwQueryInformationFile and ZwSetInformationFile to remove some overhead.

by hbirr＠svn.reactos.com

Used IoQueryFileInformation and IoSetInformation instead of ZwQueryInformationFile and ZwSetInformationFile to remove some overhead. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-07-26 19:35:22 UTC (rev 16756) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-07-26 19:38:33 UTC (rev 16757) @@ -2308,11 +2308,11 @@ * (as in case of the EXT2FS driver by Manoj Paul Joseph where the * standard file information is filled on first request). */ - Status = ZwQueryInformationFile(FileHandle, - &Iosb, - &FileInfo, + Status = IoQueryFileInformation(FileObject, + FileStandardInformation, sizeof(FILE_STANDARD_INFORMATION), - FileStandardInformation); + &FileInfo, + &Iosb.Information); if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); @@ -2342,11 +2342,10 @@ if (MaximumSize.QuadPart > FileInfo.EndOfFile.QuadPart) { - Status = ZwSetInformationFile(FileHandle, - &Iosb, - &MaximumSize, - sizeof(LARGE_INTEGER), - FileAllocationInformation); + Status = IoSetInformation(FileObject, + FileAllocationInformation, + sizeof(LARGE_INTEGER), + &MaximumSize); if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section);

19 years, 2 months

[hbirr] 16756: Silence debug messages.

by hbirr＠svn.reactos.com

Silence debug messages. Modified: trunk/reactos/ntoskrnl/io/share.c _____ Modified: trunk/reactos/ntoskrnl/io/share.c --- trunk/reactos/ntoskrnl/io/share.c 2005-07-26 19:31:41 UTC (rev 16755) +++ trunk/reactos/ntoskrnl/io/share.c 2005-07-26 19:35:22 UTC (rev 16756) @@ -11,6 +11,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#define NDEBUG #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ @@ -243,7 +244,7 @@ IoSetInformation(IN PFILE_OBJECT FileObject, IN FILE_INFORMATION_CLASS FileInformationClass, IN ULONG Length, - OUT PVOID FileInformation) + IN PVOID FileInformation) { IO_STATUS_BLOCK IoStatusBlock; PIRP Irp;

19 years, 2 months

[hbirr] 16755: - Remove the permanent flag from an object if ObInserObject failed (in IoCreateFile).

by hbirr＠svn.reactos.com

- Remove the permanent flag from an object if ObInserObject failed (in IoCreateFile). - Bypass the driver for FilePositionInformation and FileAlignmentInformation in NtQueryInformationFile and NtSetInformationFile. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-07-26 19:21:27 UTC (rev 16754) +++ trunk/reactos/ntoskrnl/io/file.c 2005-07-26 19:31:41 UTC (rev 16755) @@ -845,6 +845,7 @@ DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); } + /* First try to open an existing named object */ Status = ObOpenObjectByName(ObjectAttributes, NULL, NULL, @@ -910,6 +911,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); + ObMakeTemporaryObject(FileObject); ObDereferenceObject (FileObject); return Status; } @@ -2429,11 +2431,6 @@ Failed = TRUE; break; - case FileAlignmentInformation: - if (!(FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING)) - Failed = TRUE; - break; - default: break; } @@ -2445,6 +2442,30 @@ return STATUS_ACCESS_DENIED; } + if (FileInformationClass == FilePositionInformation) + { + if (Length < sizeof(FILE_POSITION_INFORMATION)) + { + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + _SEH_TRY + { + ((PFILE_POSITION_INFORMATION)FileInformation)->CurrentByteOffset = FileObject->CurrentByteOffset; + IoStatusBlock->Information = sizeof(FILE_POSITION_INFORMATION); + Status = IoStatusBlock->Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + ObDereferenceObject(FileObject); + return Status; + } + DPRINT("FileObject 0x%p\n", FileObject); /* Check if this is a direct open or not */ @@ -2457,6 +2478,30 @@ DeviceObject = IoGetRelatedDeviceObject(FileObject); } + if (FileInformationClass == FileAlignmentInformation) + { + if (Length < sizeof(FILE_ALIGNMENT_INFORMATION)) + { + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + _SEH_TRY + { + ((PFILE_ALIGNMENT_INFORMATION)FileInformation)->AlignmentRequirement = DeviceObject->AlignmentRequirement; + IoStatusBlock->Information = sizeof(FILE_ALIGNMENT_INFORMATION); + Status = IoStatusBlock->Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + ObDereferenceObject(FileObject); + return Status; + } + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -2895,6 +2940,30 @@ DPRINT("FileObject 0x%p\n", FileObject); + if (FileInformationClass == FilePositionInformation) + { + if (Length < sizeof(FILE_POSITION_INFORMATION)) + { + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + _SEH_TRY + { + FileObject->CurrentByteOffset = ((PFILE_POSITION_INFORMATION)FileInformation)->CurrentByteOffset; + IoStatusBlock->Information = 0; + Status = IoStatusBlock->Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + ObDereferenceObject(FileObject); + return Status; + } + /* FIXME: Later, we can implement a lot of stuff here and avoid a driver call */ /* Handle IO Completion Port quickly */ if (FileInformationClass == FileCompletionInformation)

19 years, 2 months

[hbirr] 16754: Acquire always the apc lock if we are modifying the apc queue.

by hbirr＠svn.reactos.com

Acquire always the apc lock if we are modifying the apc queue. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/process.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-07-26 19:15:08 UTC (rev 16753) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-07-26 19:21:27 UTC (rev 16754) @@ -245,7 +245,7 @@ * The APC will execute at APC_LEVEL for the KernelRoutine registered, and * at PASSIVE_LEVEL for the NormalRoutine registered. * - * Callers of this routine must be running at IRQL = PASSIVE_LEVEL. + * Callers of this routine must have locked the dipatcher database. * *--*/ BOOLEAN @@ -257,9 +257,12 @@ PLIST_ENTRY ApcListEntry; PKAPC QueuedApc; + KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); + /* Don't do anything if the APC is already inserted */ if (Apc->Inserted) { - + + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); return FALSE; } @@ -301,6 +304,8 @@ /* Confirm Insertion */ Apc->Inserted = TRUE; + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); + /* * Three possibilites here again: * 1) Kernel APC, The thread is Running: Request an Interrupt @@ -318,13 +323,11 @@ #ifdef CONFIG_SMP PKPRCB Prcb, CurrentPrcb; LONG i; - KIRQL oldIrql; #endif DPRINT ("Requesting APC Interrupt for Running Thread \n"); #ifdef CONFIG_SMP - oldIrql = KeRaiseIrqlToDpcLevel(); CurrentPrcb = KeGetCurrentPrcb(); if (CurrentPrcb->CurrentThread == Thread) { @@ -344,7 +347,6 @@ } ASSERT (i < KeNumberProcessors); } - KeLowerIrql(oldIrql); #else HalRequestSoftwareInterrupt(APC_LEVEL); #endif _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-07-26 19:15:08 UTC (rev 16753) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-07-26 19:21:27 UTC (rev 16754) @@ -89,6 +89,7 @@ /* Initialize the Thread List */ InitializeListHead(&Process->ThreadListHead); + KeInitializeSpinLock(&Process->ProcessLock); DPRINT("The Process has now been initalized with the Kernel\n"); } @@ -138,6 +139,7 @@ /* Lock Dispatcher */ OldIrql = KeAcquireDispatcherDatabaseLock(); + KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); /* Crash system if DPC is being executed! */ if (KeIsExecutingDpc()) { @@ -150,6 +152,7 @@ if (Thread->ApcState.Process == Process || Thread->ApcStateIndex != OriginalApcEnvironment) { DPRINT("Process already Attached. Exitting\n"); + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); } else { @@ -191,6 +194,7 @@ KiSwapProcess(Process, SavedApcState->Process); /* Return to old IRQL*/ + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(ApcLock); DPRINT("KiAttachProcess Completed Sucesfully\n"); @@ -232,6 +236,7 @@ UpdatePageDirs(Thread, Process); OldIrql = KeAcquireDispatcherDatabaseLock(); + KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); /* Crash system if DPC is being executed! */ if (KeIsExecutingDpc()) { @@ -273,6 +278,7 @@ /* Get Current Thread and Lock */ Thread = KeGetCurrentThread(); OldIrql = KeAcquireDispatcherDatabaseLock(); + KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); /* Check if it's attached */ DPRINT("Current ApcStateIndex: %x\n", Thread->ApcStateIndex); @@ -297,6 +303,7 @@ KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); /* Unlock Dispatcher */ + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); } @@ -320,6 +327,7 @@ Thread = KeGetCurrentThread(); OldIrql = KeAcquireDispatcherDatabaseLock(); + KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); /* Sorry Buddy, can't help you if you've got APCs or just aren't attached */ if ((Thread->ApcStateIndex == OriginalApcEnvironment) || (Thread->ApcState.KernelApcInProgress)) { @@ -347,6 +355,7 @@ KiSwapProcess(Thread->ApcState.Process, Thread->ApcState.Process); /* Return to old IRQL*/ + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); }

19 years, 2 months

[hbirr] 16753: - Forgot one change to KeAcquireSpinLockAtDpcLevel.

by hbirr＠svn.reactos.com

- Forgot one change to KeAcquireSpinLockAtDpcLevel. Modified: trunk/reactos/ntoskrnl/ke/apc.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-07-26 19:11:25 UTC (rev 16752) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-07-26 19:15:08 UTC (rev 16753) @@ -471,7 +471,7 @@ /* Lock the Dispatcher Database and APC Queue */ OldIrql = KeAcquireDispatcherDatabaseLock(); - KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); ApcEntry = CurrentEntry = NULL; while (!IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode]))

19 years, 2 months

[hbirr] 16752: - Fixed the broken implementation of KeFlushQueueApc.

by hbirr＠svn.reactos.com

- Fixed the broken implementation of KeFlushQueueApc. - Fixed some locking operations with two spin locks. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-07-26 19:02:31 UTC (rev 16751) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-07-26 19:11:25 UTC (rev 16752) @@ -270,14 +270,14 @@ */ if ((Apc->ApcMode != KernelMode) && (Apc->KernelRoutine == (PKKERNEL_ROUTINE)PsExitSpecialApc)) { - DPRINT1("Inserting the Process Exit APC into the Queue\n"); + DPRINT1("Inserting the Thread Exit APC for '%.16s' into the Queue\n", ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->UserApcPending = TRUE; InsertHeadList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], &Apc->ApcListEntry); } else if (Apc->NormalRoutine == NULL) { - DPRINT("Inserting Special APC %x into the Queue\n", Apc); + DPRINT("Inserting Special APC %x for '%.16s' into the Queue\n", Apc, ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); for (ApcListEntry = Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc-> ApcMode].Flink; ApcListEntry != &Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcListHead[(int)Apc- >ApcMode]; @@ -293,7 +293,7 @@ } else { - DPRINT("Inserting Normal APC %x into the %x Queue\n", Apc, Apc->ApcMode); + DPRINT("Inserting Normal APC %x for '%.16s' into the %x Queue\n", Apc, ((PETHREAD)Thread)->ThreadsProcess->ImageFileName, Apc->ApcMode); InsertTailList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], &Apc->ApcListEntry); } @@ -473,34 +473,27 @@ OldIrql = KeAcquireDispatcherDatabaseLock(); KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); - /* Check if the list is empty */ - if (IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode])) + ApcEntry = CurrentEntry = NULL; + while (!IsListEmpty(&Thread->ApcState.ApcListHead[PreviousMode])) { - /* We'll return NULL */ - ApcEntry = NULL; - } - else - { - /* Remove this one */ - RemoveEntryList(&Thread->ApcState.ApcListHead[PreviousMode]); - CurrentEntry = ApcEntry; + if (ApcEntry == NULL) + { + ApcEntry = CurrentEntry = RemoveHeadList(&Thread->ApcState.ApcListHead[PreviousMode]); + } + else + { + CurrentEntry->Flink = RemoveHeadList(&Thread->ApcState.ApcListHead[PreviousMode]); + CurrentEntry = CurrentEntry->Flink; + } + CurrentEntry->Flink = NULL; - /* Remove all the other ones too, if present */ - do - { - /* Get the APC */ - Apc = CONTAINING_RECORD(CurrentEntry, KAPC, ApcListEntry); - - /* Move to the next one */ - CurrentEntry = CurrentEntry->Flink; - - /* Mark it as not inserted */ - Apc->Inserted = FALSE; - } while (ApcEntry != CurrentEntry); + /* Get the APC */ + Apc = CONTAINING_RECORD(CurrentEntry, KAPC, ApcListEntry); + Apc->Inserted = FALSE; } /* Release the locks */ - KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); /* Return the first entry */ @@ -539,7 +532,7 @@ DPRINT("KeRemoveQueueApc called for APC: %x \n", Apc); OldIrql = KeAcquireDispatcherDatabaseLock(); - KeAcquireSpinLock(&Thread->ApcQueueLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&Thread->ApcQueueLock); /* Check if it's inserted */ if (Apc->Inserted) { @@ -565,13 +558,13 @@ } else { /* It's not inserted, fail */ - KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); return(FALSE); } /* Restore IRQL and Return */ - KeReleaseSpinLock(&Thread->ApcQueueLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Thread->ApcQueueLock); KeReleaseDispatcherDatabaseLock(OldIrql); return(TRUE); } _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-07-26 19:02:31 UTC (rev 16751) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-07-26 19:11:25 UTC (rev 16752) @@ -213,7 +213,7 @@ PTERMINATION_PORT TerminationPort; PTEB Teb; KIRQL oldIrql; - PLIST_ENTRY ApcEntry, CurrentApc; + PLIST_ENTRY ApcEntry; PKAPC Apc; DPRINT("PspExitThread(ExitStatus %x), Current: 0x%x\n", ExitStatus, PsGetCurrentThread()); @@ -338,30 +338,26 @@ KeDisableThreadApcQueueing(&CurrentThread->Tcb); /* Flush the User APCs */ - if ((ApcEntry = KeFlushQueueApc(&CurrentThread->Tcb, UserMode))) + ApcEntry = KeFlushQueueApc(&CurrentThread->Tcb, UserMode); + while(ApcEntry) { - CurrentApc = ApcEntry; - do - { - /* Get the APC */ - Apc = CONTAINING_RECORD(CurrentApc, KAPC, ApcListEntry); + /* Get the APC */ + Apc = CONTAINING_RECORD(ApcEntry, KAPC, ApcListEntry); - /* Move to the next one */ - CurrentApc = CurrentApc->Flink; + /* Move to the next one */ + ApcEntry = ApcEntry->Flink; - /* Rundown the APC or de-allocate it */ - if (Apc->RundownRoutine) - { - /* Call its own routine */ - (Apc->RundownRoutine)(Apc); - } - else - { - /* Do it ourselves */ - ExFreePool(Apc); - } - } - while (CurrentApc != ApcEntry); + /* Rundown the APC or de-allocate it */ + if (Apc->RundownRoutine) + { + /* Call its own routine */ + (Apc->RundownRoutine)(Apc); + } + else + { + /* Do it ourselves */ + ExFreePool(Apc); + } } /* Call the Lego routine */ @@ -392,8 +388,8 @@ PVOID* SystemArgument1, PVOID* SystemArguemnt2) { - DPRINT1("PsExitSpecialApc called: 0x%x (proc: 0x%x)\n", - PsGetCurrentThread(), PsGetCurrentProcess()); + DPRINT1("PsExitSpecialApc called: 0x%x (proc: 0x%x, '%.16s')\n", + PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); /* Don't do anything unless we are in User-Mode */ if (Apc->SystemArgument2) @@ -421,8 +417,8 @@ PETHREAD Thread = PsGetCurrentThread(); NTSTATUS ExitStatus; - DPRINT1("PspExitNormalApc called: 0x%x (proc: 0x%x)\n", - PsGetCurrentThread(), PsGetCurrentProcess()); + DPRINT1("PspExitNormalApc called: 0x%x (proc: 0x%x, '%.16s')\n", + PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); /* This should never happen */ ASSERT(!SystemArgument2);

19 years, 2 months

[navaraf] 16751: Yet another fix to WinPosActivateOtherWindow, we should search only for top-level windows next to the window we're about to deactivate.

by navaraf＠svn.reactos.com

Yet another fix to WinPosActivateOtherWindow, we should search only for top-level windows next to the window we're about to deactivate. Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 17:46:48 UTC (rev 16750) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 19:02:31 UTC (rev 16751) @@ -114,6 +114,8 @@ IntSetFocusMessageQueue(NULL); return; } + + /* If this is popup window, try to activate the owner first. */ if ((Window->Style & WS_POPUP) && (Wnd = IntGetOwner(Window))) { for(;;) @@ -135,50 +137,21 @@ IntReleaseWindowObject(Wnd); } + + /* Pick a next top-level window. */ + /* FIXME: Search for non-tooltip windows first. */ Wnd = Window; - for(;;) + while (Wnd != NULL) { - HWND *List, *phWnd; - Old = Wnd; - Wnd = IntGetParentObject(Wnd); - if(Old != Window) - { + IntLockRelatives(Old); + Wnd = IntGetWindowObject(Old->NextSibling->Self); + IntUnLockRelatives(Old); + if (Old != Window) IntReleaseWindowObject(Old); - } - if(!Wnd) - { - IntSetFocusMessageQueue(NULL); - return; - } - - if((List = IntWinListChildren(Wnd))) - { - /* FIXME: We should scan for non-tooltip windows first. */ - for(phWnd = List; *phWnd; phWnd++) - { - PWINDOW_OBJECT Child; - - if((*phWnd) == Window->Self) - { - continue; - } - - if((Child = IntGetWindowObject(*phWnd))) - { - if ((Child->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && - (Child->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) - { - ExFreePool(List); - IntReleaseWindowObject(Wnd); - Wnd = Child; - goto done; - } - IntReleaseWindowObject(Child); - } - } - ExFreePool(List); - } + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + break; } done: @@ -193,7 +166,8 @@ } if (!IntSetActiveWindow(Wnd)) IntSetActiveWindow(0); - IntReleaseWindowObject(Wnd); + if (Wnd) + IntReleaseWindowObject(Wnd); }

19 years, 2 months

[navaraf] 16750: Don't steal foreground window focus from other applications in WinPosActivateOtherWindow and remove incorrect code for searching top-most windows.

by navaraf＠svn.reactos.com

Don't steal foreground window focus from other applications in WinPosActivateOtherWindow and remove incorrect code for searching top-most windows. Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 16:34:48 UTC (rev 16749) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-07-26 17:46:48 UTC (rev 16750) @@ -107,7 +107,7 @@ WinPosActivateOtherWindow(PWINDOW_OBJECT Window) { PWINDOW_OBJECT Wnd, Old; - int TryTopmost; + HWND Fg; if (!Window || IntIsDesktopWindow(Window)) { @@ -129,11 +129,9 @@ IntReleaseWindowObject(Old); } - if (IntSetForegroundWindow(Wnd)) - { - IntReleaseWindowObject(Wnd); - return; - } + if ((Wnd->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Wnd->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) + goto done; IntReleaseWindowObject(Wnd); } @@ -156,35 +154,45 @@ if((List = IntWinListChildren(Wnd))) { - for(TryTopmost = 0; TryTopmost <= 1; TryTopmost++) + /* FIXME: We should scan for non-tooltip windows first. */ + for(phWnd = List; *phWnd; phWnd++) { - for(phWnd = List; *phWnd; phWnd++) + PWINDOW_OBJECT Child; + + if((*phWnd) == Window->Self) { - PWINDOW_OBJECT Child; + continue; + } - if((*phWnd) == Window->Self) + if((Child = IntGetWindowObject(*phWnd))) + { + if ((Child->Style & (WS_DISABLED | WS_VISIBLE)) == WS_VISIBLE && + (Child->Style & (WS_POPUP | WS_CHILD)) != WS_CHILD) { - continue; + ExFreePool(List); + IntReleaseWindowObject(Wnd); + Wnd = Child; + goto done; } - - if((Child = IntGetWindowObject(*phWnd))) - { - if(((! TryTopmost && (0 == (Child->ExStyle & WS_EX_TOPMOST))) - || (TryTopmost && (0 != (Child->ExStyle & WS_EX_TOPMOST)))) - && IntSetForegroundWindow(Child)) - { - ExFreePool(List); - IntReleaseWindowObject(Wnd); - IntReleaseWindowObject(Child); - return; - } - IntReleaseWindowObject(Child); - } + IntReleaseWindowObject(Child); } } ExFreePool(List); } } + +done: + Fg = NtUserGetForegroundWindow(); + if (!Fg || Window->Self == Fg) + { + if (IntSetForegroundWindow(Wnd)) + { + IntReleaseWindowObject(Wnd); + return; + } + } + if (!IntSetActiveWindow(Wnd)) + IntSetActiveWindow(0); IntReleaseWindowObject(Wnd); }

19 years, 2 months

← Newer
1
...
15
16
17
18
19
20
21
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005