Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

by jimtabor＠svn.reactos.com

Fix paste error. Modified: trunk/reactos/tools/widl/ChangeLog _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-13 18:47:13 UTC (rev 14024) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-13 18:51:46 UTC (rev 14025) @@ -1,6 +1,6 @@ ChangeLog -2005-03-13 royce3 +2005-03-13 jimtabor tools/widl/write_msft.c

19 years, 6 months

[jimtabor] 14024: Fixup for *nix port

by jimtabor＠svn.reactos.com

Fixup for *nix port Modified: trunk/reactos/tools/widl/ChangeLog _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-13 18:43:44 UTC (rev 14023) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-13 18:47:13 UTC (rev 14024) @@ -1,98 +1,105 @@ -ChangeLog - -2005-03-13 royce3 - - tools/widl/hash.c - tools/widl/Makefile - tools/widl/write_msft.c - --Wall -Werror and fix warnings - - -2005-03-13 ekohl - - tools/widl/client.c - -Fix gcc warnings in generated client stub. - - -2005-03-13 ekohl - - tools/widl/client.c - tools/widl/server.c - -Implement [string] attribute for pointers to char and wchar_t. - - -2005-03-12 ekohl - - tools/widl/client.c - tools/widl/server.c - -Implement [in], [out] and [in, out] support for pointers to basic types. - - -2005-03-10 ekohl - - tools/widl/client.c - tools/widl/header.c - tools/widl/server.c - tools/widl/widl.c - tools/widl/widl.h - -Implement '-o' option. This is equivalent to MIDLs '/oldnames' option. - - -2005-03-06 ekohl - - tools/widl/client.c - tools/widl/header.c - tools/widl/header.h - tools/widl/server.c - -Support pointers to simple types as input arguments. - - -2005-02-27 sedwards - - tools/widl/y.tab.c - tools/widl/parser.y - tools/widl/widl.c - tools/widl/widl.h - tools/widl/server.c - tools/widl/typelib.c - -Merge in Winehq changes to reduce noise. - - tools/widl/server.h - tools/widl/client.h - tools/widl/proxy.h - -Deleted unneeded headers. - -2005-02-26 ekohl - tools/widl/server.c - -Server stubs are void functions. -Fix a warning in the server stub descriptor. - - -2005-02-25 ekohl - tools/widl/client.c - tools/widl/header.c - tools/widl/header.h - tools/widl/server.c - -Support multiple interfaces per idl file. -Support explicit binding handles. - - -2005-02-24 ekohl - include/wine/rpcfc.h - tools/widl/client.c - tools/widl/header.c - tools/widl/parser.l - tools/widl/parser.y - tools/widl/server.c - -Support remaining basic types (float, double, small, wchar_t and handle_t). +ChangeLog + +2005-03-13 royce3 + + tools/widl/write_msft.c + +Fixup *nix port, added include fcntl.h and unistd.h. + + +2005-03-13 royce3 + + tools/widl/hash.c + tools/widl/Makefile + tools/widl/write_msft.c + +-Wall -Werror and fix warnings + + +2005-03-13 ekohl + + tools/widl/client.c + +Fix gcc warnings in generated client stub. + + +2005-03-13 ekohl + + tools/widl/client.c + tools/widl/server.c + +Implement [string] attribute for pointers to char and wchar_t. + + +2005-03-12 ekohl + + tools/widl/client.c + tools/widl/server.c + +Implement [in], [out] and [in, out] support for pointers to basic types. + + +2005-03-10 ekohl + + tools/widl/client.c + tools/widl/header.c + tools/widl/server.c + tools/widl/widl.c + tools/widl/widl.h + +Implement '-o' option. This is equivalent to MIDLs '/oldnames' option. + + +2005-03-06 ekohl + + tools/widl/client.c + tools/widl/header.c + tools/widl/header.h + tools/widl/server.c + +Support pointers to simple types as input arguments. + + +2005-02-27 sedwards + + tools/widl/y.tab.c + tools/widl/parser.y + tools/widl/widl.c + tools/widl/widl.h + tools/widl/server.c + tools/widl/typelib.c + +Merge in Winehq changes to reduce noise. + + tools/widl/server.h + tools/widl/client.h + tools/widl/proxy.h + +Deleted unneeded headers. + +2005-02-26 ekohl + tools/widl/server.c + +Server stubs are void functions. +Fix a warning in the server stub descriptor. + + +2005-02-25 ekohl + tools/widl/client.c + tools/widl/header.c + tools/widl/header.h + tools/widl/server.c + +Support multiple interfaces per idl file. +Support explicit binding handles. + + +2005-02-24 ekohl + include/wine/rpcfc.h + tools/widl/client.c + tools/widl/header.c + tools/widl/parser.l + tools/widl/parser.y + tools/widl/server.c + +Support remaining basic types (float, double, small, wchar_t and handle_t).

19 years, 6 months

[jimtabor] 14023: Fixup for *nix port

by jimtabor＠svn.reactos.com

Fixup for *nix port Modified: trunk/reactos/tools/widl/write_msft.c _____ Modified: trunk/reactos/tools/widl/write_msft.c --- trunk/reactos/tools/widl/write_msft.c 2005-03-13 18:41:59 UTC (rev 14022) +++ trunk/reactos/tools/widl/write_msft.c 2005-03-13 18:43:44 UTC (rev 14023) @@ -35,6 +35,9 @@ #include <time.h> #ifdef WIN32 #include <io.h> /* write() */ +#else +#include <fcntl.h> /* create */ +#include <unistd.h> /* write and close */ #endif /* WIN32 */ #define NONAMELESSUNION

19 years, 6 months

[weiden] 14022: Alex Ionescu <ionucu@videotron.ca>

by weiden＠svn.reactos.com

Alex Ionescu <ionucu(a)videotron.ca> - Fix implementation of NT Profile Objects. Structures are guesses, but seem pretty close to the NT ones... a lot of stuff based on David Welch's old implementation, but simplified the way profiles are managed extensively, and also using the same buckethash mechanism as NT, this is required for compatibility with Nt Native APIs that use Profile Objects. - Removed KDBG internal profile management and associated files. I will re-write the Profiler to use NT Profile Objects, which will allow us more extensibilty while profiling and also greater compatibility with NT. Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/dbg/kdb.h Deleted: trunk/reactos/ntoskrnl/dbg/profile.c Deleted: trunk/reactos/ntoskrnl/ex/btree.c Deleted: trunk/reactos/ntoskrnl/ex/hashtab.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Deleted: trunk/reactos/ntoskrnl/ex/stree.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/kd/kdebug.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/profile.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-03-13 18:39:38 UTC (rev 14021) +++ trunk/reactos/ntoskrnl/Makefile 2005-03-13 18:41:59 UTC (rev 14022) @@ -33,7 +33,7 @@ OBJECTS_KDBG := endif ifeq ($(DBG_OR_KDBG), 1) -OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o dbg/profile.o +OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o endif TARGET_ASFLAGS = -I./include @@ -233,14 +233,12 @@ # Executive Subsystem (Ex) OBJECTS_EX = \ - ex/btree.o \ ex/callback.o \ ex/error.o \ ex/event.o \ ex/evtpair.o \ ex/fmutex.o \ ex/handle.o \ - ex/hashtab.o \ ex/init.o \ ex/interlck.o \ ex/list.o \ @@ -250,7 +248,6 @@ ex/profile.o \ ex/resource.o \ ex/rundown.o \ - ex/stree.o \ ex/sem.o \ ex/synch.o \ ex/sysinfo.o \ _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb.h --- trunk/reactos/ntoskrnl/dbg/kdb.h 2005-03-13 18:39:38 UTC (rev 14021) +++ trunk/reactos/ntoskrnl/dbg/kdb.h 2005-03-13 18:41:59 UTC (rev 14022) @@ -255,19 +255,6 @@ KdbpAttachToProcess( PVOID ProcessId); -/* from profile.c */ - -VOID -KdbInitProfiling(); -VOID -KdbInitProfiling2(); -VOID -KdbDisableProfiling(); -VOID -KdbEnableProfiling(); -VOID -KdbProfileInterrupt(ULONG_PTR Eip); - /* other functions */ #define KdbpSafeReadMemory(dst, src, size) MmSafeCopyFromUser(dst, src, size) _____ Deleted: trunk/reactos/ntoskrnl/dbg/profile.c --- trunk/reactos/ntoskrnl/dbg/profile.c 2005-03-13 18:39:38 UTC (rev 14021) +++ trunk/reactos/ntoskrnl/dbg/profile.c 2005-03-13 18:41:59 UTC (rev 14022) @@ -1,478 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/profile.c - * PURPOSE: Kernel profiling - * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include "kdb.h" - -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -#define PROFILE_SESSION_LENGTH 30 /* Session length in seconds */ - -typedef struct _PROFILE_DATABASE_ENTRY -{ - ULONG_PTR Address; -} PROFILE_DATABASE_ENTRY, *PPROFILE_DATABASE_ENTRY; - -#define PDE_BLOCK_ENTRIES ((PAGE_SIZE - (sizeof(LIST_ENTRY) + sizeof(ULONG))) / sizeof(PROFILE_DATABASE_ENTRY)) - -typedef struct _PROFILE_DATABASE_BLOCK -{ - LIST_ENTRY ListEntry; - ULONG UsedEntries; - PROFILE_DATABASE_ENTRY Entries[PDE_BLOCK_ENTRIES]; -} PROFILE_DATABASE_BLOCK, *PPROFILE_DATABASE_BLOCK; - -typedef struct _PROFILE_DATABASE -{ - LIST_ENTRY ListHead; -} PROFILE_DATABASE, *PPROFILE_DATABASE; - -typedef struct _SAMPLE_GROUP_INFO -{ - ULONG_PTR Address; - ULONG Count; - CHAR Description[128]; - LIST_ENTRY ListEntry; -} SAMPLE_GROUP_INFO, *PSAMPLE_GROUP_INFO; - -static volatile BOOLEAN KdbProfilingInitialized = FALSE; -static volatile BOOLEAN KdbProfilingEnabled = FALSE; -static volatile BOOLEAN KdbProfilingSuspended = FALSE; -static PPROFILE_DATABASE KdbProfileDatabase = NULL; -static KDPC KdbProfilerCollectorDpc; -static HANDLE KdbProfilerThreadHandle; -static CLIENT_ID KdbProfilerThreadCid; -static HANDLE KdbProfilerLogFile; -static KTIMER KdbProfilerTimer; -static KMUTEX KdbProfilerLock; -static BOOLEAN KdbEnableProfiler = FALSE; - -VOID -KdbDeleteProfileDatabase(PPROFILE_DATABASE ProfileDatabase) -{ - PLIST_ENTRY current = NULL; - - current = RemoveHeadList(&ProfileDatabase->ListHead); - while (current != &ProfileDatabase->ListHead) - { - PPROFILE_DATABASE_BLOCK block = CONTAINING_RECORD( - current, PROFILE_DATABASE_BLOCK, ListEntry); - ExFreePool(block); - current = RemoveHeadList(&ProfileDatabase->ListHead); - } -} - -VOID -KdbAddEntryToProfileDatabase(PPROFILE_DATABASE ProfileDatabase, ULONG_PTR Address) -{ - PPROFILE_DATABASE_BLOCK block; - - if (IsListEmpty(&ProfileDatabase->ListHead)) - { - block = ExAllocatePool(NonPagedPool, sizeof(PROFILE_DATABASE_BLOCK)); - ASSERT(block); - block->UsedEntries = 0; - InsertTailList(&ProfileDatabase->ListHead, &block->ListEntry); - block->Entries[block->UsedEntries++].Address = Address; - return; - } - - block = CONTAINING_RECORD(ProfileDatabase->ListHead.Blink, PROFILE_DATABASE_BLOCK, ListEntry); - if (block->UsedEntries >= PDE_BLOCK_ENTRIES) - { - block = ExAllocatePool(NonPagedPool, sizeof(PROFILE_DATABASE_BLOCK)); - ASSERT(block); - block->UsedEntries = 0; - InsertTailList(&ProfileDatabase->ListHead, &block->ListEntry); - } - block->Entries[block->UsedEntries++].Address = Address; -} - -VOID INIT_FUNCTION -KdbInitProfiling() -{ - KdbEnableProfiler = TRUE; -} - -VOID INIT_FUNCTION -KdbInitProfiling2() -{ - if (KdbEnableProfiler) - { - KdbEnableProfiling(); - KdbProfilingInitialized = TRUE; - } -} - -VOID -KdbSuspendProfiling() -{ - KdbProfilingSuspended = TRUE; -} - -VOID -KdbResumeProfiling() -{ - KdbProfilingSuspended = FALSE; -} - -BOOLEAN -KdbProfilerGetSymbolInfo(PVOID address, OUT PCH NameBuffer) -{ - PLIST_ENTRY current_entry; - MODULE_TEXT_SECTION* current; - extern LIST_ENTRY ModuleTextListHead; - ULONG_PTR RelativeAddress; - NTSTATUS Status; - CHAR FileName[256]; - CHAR FunctionName[256]; - - current_entry = ModuleTextListHead.Flink; - - while (current_entry != &ModuleTextListHead && - current_entry != NULL) - { - current = - CONTAINING_RECORD(current_entry, MODULE_TEXT_SECTION, ListEntry); - - if (address >= (PVOID)current->Base && - address < (PVOID)(current->Base + current->Length)) - { - RelativeAddress = (ULONG_PTR) address - current->Base; - Status = KdbSymGetAddressInformation(current->RosSymInfo, - RelativeAddress, - NULL, - FileName, - FunctionName); - if (NT_SUCCESS(Status)) - { - sprintf(NameBuffer, "%s (%s)", FunctionName, FileName); - return(TRUE); - } - return(TRUE); - } - current_entry = current_entry->Flink; - } - return(FALSE); -} - -PLIST_ENTRY -KdbProfilerLargestSampleGroup(PLIST_ENTRY SamplesListHead) -{ - PLIST_ENTRY current; - PLIST_ENTRY largest; - ULONG count; - - count = 0; - largest = SamplesListHead->Flink; - current = SamplesListHead->Flink; - while (current != SamplesListHead) - { - PSAMPLE_GROUP_INFO sgi = CONTAINING_RECORD( - current, SAMPLE_GROUP_INFO, ListEntry); - - if (sgi->Count > count) - { - largest = current; - count = sgi->Count; - } - - current = current->Flink; - } - if (count == 0) - { - return NULL; - } - return largest; -} - -VOID -KdbProfilerWriteString(PCH String) -{ - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - ULONG Length; - - Length = strlen(String); - Status = NtWriteFile(KdbProfilerLogFile, - NULL, - NULL, - NULL, - &Iosb, - String, - Length, - NULL, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtWriteFile() failed with status 0x%.08x\n", Status); - } -} - -NTSTATUS -KdbProfilerWriteSampleGroups(PLIST_ENTRY SamplesListHead) -{ - CHAR Buffer[256]; - PLIST_ENTRY current = NULL; - PLIST_ENTRY Largest; - - KdbProfilerWriteString("\r\n\r\n"); - KdbProfilerWriteString("Count Symbol\r\n"); - KdbProfilerWriteString("------------------------------------------------ --\r\n"); - - current = SamplesListHead->Flink; - while (current != SamplesListHead) - { - Largest = KdbProfilerLargestSampleGroup(SamplesListHead); - if (Largest != NULL) - { - PSAMPLE_GROUP_INFO sgi = CONTAINING_RECORD( - Largest, SAMPLE_GROUP_INFO, ListEntry); - - //DbgPrint("%.08lu %s\n", sgi->Count, sgi->Description); - - sprintf(Buffer, "%.08lu %s\r\n", sgi->Count, sgi->Description); - KdbProfilerWriteString(Buffer); - - RemoveEntryList(Largest); - ExFreePool(sgi); - } - else - { - break; - } - - current = SamplesListHead->Flink; - } - - return STATUS_SUCCESS; -} - -LONG STDCALL -KdbProfilerKeyCompare(IN PVOID Key1, - IN PVOID Key2) -{ - int value = strcmp(Key1, Key2); - - if (value == 0) - return 0; - - return (value < 0) ? -1 : 1; -} - - -NTSTATUS -KdbProfilerAnalyzeSamples() -{ - CHAR NameBuffer[512]; - ULONG KeyLength; - PLIST_ENTRY current = NULL; - HASH_TABLE Hashtable; - LIST_ENTRY SamplesListHead; - ULONG Index; - ULONG_PTR Address; - - if (!ExInitializeHashTable(&Hashtable, 12, KdbProfilerKeyCompare, TRUE)) - { - DPRINT1("ExInitializeHashTable() failed."); - KEBUGCHECK(0); - } - - InitializeListHead(&SamplesListHead); - - current = RemoveHeadList(&KdbProfileDatabase->ListHead); - while (current != &KdbProfileDatabase->ListHead) - { - PPROFILE_DATABASE_BLOCK block; - - block = CONTAINING_RECORD(current, PROFILE_DATABASE_BLOCK, ListEntry); - - for (Index = 0; Index < block->UsedEntries; Index++) - { - PSAMPLE_GROUP_INFO sgi; - Address = block->Entries[Index].Address; - if (KdbProfilerGetSymbolInfo((PVOID) Address, (PCH) &NameBuffer)) - { - } - else - { - sprintf(NameBuffer, "(0x%.08lx)", (ULONG) Address); - } - - KeyLength = strlen(NameBuffer); - if (!ExSearchHashTable(&Hashtable, (PVOID) NameBuffer, KeyLength, (PVOID *) &sgi)) - { - sgi = ExAllocatePool(NonPagedPool, sizeof(SAMPLE_GROUP_INFO)); - ASSERT(sgi); - sgi->Address = Address; - sgi->Count = 1; - strcpy(sgi->Description, NameBuffer); - InsertTailList(&SamplesListHead, &sgi->ListEntry); - ExInsertHashTable(&Hashtable, sgi->Description, KeyLength, (PVOID) sgi); - } - else - { - sgi->Count++; - } - } - - ExFreePool(block); - - current = RemoveHeadList(&KdbProfileDatabase->ListHead); - } - - KdbProfilerWriteSampleGroups(&SamplesListHead); - - ExDeleteHashTable(&Hashtable); - - KdbDeleteProfileDatabase(KdbProfileDatabase); - - return STATUS_SUCCESS; -} - -VOID STDCALL -KdbProfilerThreadMain(PVOID Context) -{ - for (;;) - { - KeWaitForSingleObject(&KdbProfilerTimer, Executive, KernelMode, TRUE, NULL); - - KeWaitForSingleObject(&KdbProfilerLock, Executive, KernelMode, FALSE, NULL); - - KdbSuspendProfiling(); - - KdbProfilerAnalyzeSamples(); - - KdbResumeProfiling(); - - KeReleaseMutex(&KdbProfilerLock, FALSE); - } -} - -VOID -KdbDisableProfiling() -{ - if (KdbProfilingEnabled == TRUE) - { - /* FIXME: Implement */ -#if 0 - KdbProfilingEnabled = FALSE; - /* Stop timer */ - /* Close file */ - if (KdbProfileDatabase != NULL) - { - KdbDeleteProfileDatabase(KdbProfileDatabase); - ExFreePool(KdbProfileDatabase); - KdbProfileDatabase = NULL; - } -#endif - } -} - -/* - * SystemArgument1 = EIP - */ -static VOID STDCALL -KdbProfilerCollectorDpcRoutine(PKDPC Dpc, PVOID DeferredContext, - PVOID SystemArgument1, PVOID SystemArgument2) -{ - ULONG_PTR address = (ULONG_PTR) SystemArgument1; - - KdbAddEntryToProfileDatabase(KdbProfileDatabase, address); -} - -VOID INIT_FUNCTION -KdbEnableProfiling() -{ - if (KdbProfilingEnabled == FALSE) - { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING FileName; - IO_STATUS_BLOCK Iosb; - LARGE_INTEGER DueTime; - - RtlInitUnicodeString(&FileName, L"\\SystemRoot\\profiler.log"); - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - 0, - NULL, - NULL); - - Status = NtCreateFile(&KdbProfilerLogFile, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_SUPERSEDE, - FILE_WRITE_THROUGH | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create profiler log file\n"); - return; - } - KeInitializeMutex(&KdbProfilerLock, 0); - - KdbProfileDatabase = ExAllocatePool(NonPagedPool, sizeof(PROFILE_DATABASE)); - ASSERT(KdbProfileDatabase); - InitializeListHead(&KdbProfileDatabase->ListHead); - KeInitializeDpc(&KdbProfilerCollectorDpc, KdbProfilerCollectorDpcRoutine, NULL); - - /* Initialize our periodic timer and its associated DPC object. When the timer - expires, the KdbProfilerSessionEndDpc deferred procedure call (DPC) is queued */ - KeInitializeTimerEx(&KdbProfilerTimer, SynchronizationTimer); - - Status = PsCreateSystemThread(&KdbProfilerThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &KdbProfilerThreadCid, - KdbProfilerThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create profiler thread\n"); - return; - } - - /* Start the periodic timer with an initial and periodic - relative expiration time of PROFILE_SESSION_LENGTH seconds */ - DueTime.QuadPart = -(LONGLONG) PROFILE_SESSION_LENGTH * 1000 * 10000; - KeSetTimerEx(&KdbProfilerTimer, DueTime, PROFILE_SESSION_LENGTH * 1000, NULL); - - KdbProfilingEnabled = TRUE; - } -} - -VOID -KdbProfileInterrupt(ULONG_PTR Address) -{ - ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); - - if (KdbProfilingInitialized != TRUE) - { - return; - } - - if ((KdbProfilingEnabled) && (!KdbProfilingSuspended)) - { - (BOOLEAN) KeInsertQueueDpc(&KdbProfilerCollectorDpc, (PVOID) Address, NULL); - } -} _____ Deleted: trunk/reactos/ntoskrnl/ex/btree.c --- trunk/reactos/ntoskrnl/ex/btree.c 2005-03-13 18:39:38 UTC (rev 14021) +++ trunk/reactos/ntoskrnl/ex/btree.c 2005-03-13 18:41:59 UTC (rev 14022) @@ -1,644 +0,0 @@ -/* $Id:$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/btree.c - * PURPOSE: Binary tree support - * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* DATA **********************************************************************/ - -typedef struct _BINARY_TREE_NODE -{ - struct _BINARY_TREE_NODE * Parent; - struct _BINARY_TREE_NODE * LeftChild; - struct _BINARY_TREE_NODE * RightChild; - PVOID Key; - PVOID Value; -} BINARY_TREE_NODE, *PBINARY_TREE_NODE; - -typedef struct _TRAVERSE_CONTEXT { - PTRAVERSE_ROUTINE Routine; - PVOID Context; -} TRAVERSE_CONTEXT, *PTRAVERSE_CONTEXT; - -/* FUNCTIONS ****************************************************************/ - -#define ExpBinaryTreeRootNode(Tree)(((PBINARY_TREE) (Tree))->RootNode) -#define ExpBinaryTreeIsExternalNode(Node)(((Node)->LeftChild == NULL) && ((Node)->RightChild == NULL)) -#define ExpBinaryTreeIsInternalNode(Node)(!ExpBinaryTreeIsExternalNode(Node)) -#define ExpBinaryTreeNodeKey(Node)((Node)->Key) -#define ExpBinaryTreeNodeValue(Node)((Node)->Value) -#define ExpBinaryTreeParentNode(Node)((Node)->Parent) -#define ExpBinaryTreeLeftChildNode(Node)((Node)->LeftChild) -#define ExpBinaryTreeRightChildNode(Node)((Node)->RightChild) -#define ExpBinaryTreeNodeEqual(Equality)((Equality) == 0) -#define ExpBinaryTreeNodeLess(Equality)((Equality) < 0) -#define ExpBinaryTreeNodeMore(Equality)((Equality) > 0) - - -/* - * Lock the binary tree - */ -inline VOID -ExpLockBinaryTree(PBINARY_TREE Tree, - PKIRQL OldIrql) -{ - if (Tree->UseNonPagedPool) - { - KeAcquireSpinLock(&Tree->Lock.NonPaged, OldIrql); - } - else - { - ExAcquireFastMutex(&Tree->Lock.Paged); - } -} - - -/* - * Unlock the binary tree - */ -inline VOID -ExpUnlockBinaryTree(PBINARY_TREE Tree, - PKIRQL OldIrql) -{ - if (Tree->UseNonPagedPool) - { - KeReleaseSpinLock(&Tree->Lock.NonPaged, *OldIrql); - } - else - { - ExReleaseFastMutex(&Tree->Lock.Paged); - } -} - - -/* - * Allocate resources for a new node and initialize it. - */ -inline PBINARY_TREE_NODE -ExpCreateBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Parent, - PVOID Value) -{ - PBINARY_TREE_NODE Node; - - if (Tree->UseNonPagedPool) - { - Node = (PBINARY_TREE_NODE) ExAllocateFromNPagedLookasideList(&Tree->List.NonPaged); - } - else - { - Node = (PBINARY_TREE_NODE) ExAllocateFromPagedLookasideList(&Tree->List.Paged); - } - - if (Node) - { - ExpBinaryTreeParentNode(Node) = Parent; - ExpBinaryTreeLeftChildNode(Node) = NULL; - ExpBinaryTreeRightChildNode(Node) = NULL; - ExpBinaryTreeNodeValue(Node) = Value; - } - - return Node; -} - - -/* - * Release resources for the node. - */ -inline VOID -ExpDestroyBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - if (Tree->UseNonPagedPool) - { - ExFreeToNPagedLookasideList(&Tree->List.NonPaged, Node); - } - else - { - ExFreeToPagedLookasideList(&Tree->List.Paged, Node); - } -} - - -/* - * Replaces a child node of a node with a new node. - * The lock for the tree must be acquired when this routine is called. - */ -inline VOID -ExpBinaryTreeReplaceChildNode(PBINARY_TREE_NODE Child, - PBINARY_TREE_NODE NewChild) -{ - if (ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Child)) == Child) - { - ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Child)) = NewChild; - } - else - { - ExpBinaryTreeRightChildNode(ExpBinaryTreeParentNode(Child)) = NewChild; - } -} - - -/* - * Returns the sibling node of a node. - * The lock for the tree must be acquired when this routine is called. - */ -inline PBINARY_TREE_NODE -ExpSiblingBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - if (Node == ExpBinaryTreeRootNode(Tree)) - { - return NULL; - } - else - { - if (ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Node)) == Node) - { - return ExpBinaryTreeRightChildNode(ExpBinaryTreeParentNode(Node)); - } - else - { - return ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Node)); - } - } -} - - -/* - * Expands an external node to an internal node. - * The lock for the tree must be acquired when this routine is called. - */ -VOID -ExpExpandExternalBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - ExpBinaryTreeLeftChildNode(Node) = ExpCreateBinaryTreeNode(Tree, Node, NULL); - - if (!ExpBinaryTreeLeftChildNode(Node)) - { - /* FIXME: Throw exception */ - DbgPrint("ExpCreateBinaryTreeNode() failed\n"); - } - - ExpBinaryTreeRightChildNode(Node) = ExpCreateBinaryTreeNode(Tree, Node, NULL); - - if (!ExpBinaryTreeRightChildNode(Node)) - { - ExpDestroyBinaryTreeNode(Tree, ExpBinaryTreeLeftChildNode(Node)); - /* FIXME: Throw exception */ - DbgPrint("ExpCreateBinaryTreeNode() failed\n"); - } -} - - -/* - * Searches a tree for a node with the specified key. If a node with the - * specified key is not found, the external node where it should be is - * returned. - * The lock for the tree must be acquired when this routine is called. - */ -inline PBINARY_TREE_NODE -ExpSearchBinaryTree(PBINARY_TREE Tree, - PVOID Key, - PBINARY_TREE_NODE Node) -{ - LONG Equality; - - /* FIXME: Possibly do this iteratively due to the small kernel-mode stack */ - - if (ExpBinaryTreeIsExternalNode(Node)) - { - return Node; - } - - Equality = (*Tree->Compare)(Key, ExpBinaryTreeNodeKey(Node)); - - if (ExpBinaryTreeNodeEqual(Equality)) - { - return Node; - } - - if (ExpBinaryTreeNodeLess(Equality)) - { - return ExpSearchBinaryTree(Tree, Key, ExpBinaryTreeLeftChildNode(Node)); - } - -/* if (ExpBinaryTreeNodeMore(Equality)) */ - { - return ExpSearchBinaryTree(Tree, Key, ExpBinaryTreeRightChildNode(Node)); - } -} - - -/* - * Removes an external node and it's parent node from the tree. - * The lock for the tree must be acquired when this routine is called. - */ -VOID -ExpRemoveAboveExternalBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - ASSERTMSG(ExpBinaryTreeIsExternalNode(Node), ("Node is not external")); - - if (Node == ExpBinaryTreeRootNode(Tree)) - { - return; - } - else - { - PBINARY_TREE_NODE GrandParent; - PBINARY_TREE_NODE NewChild; - - GrandParent = ExpBinaryTreeParentNode(ExpBinaryTreeParentNode(Node)); - NewChild = ExpSiblingBinaryTreeNode(Tree, Node); - - if (GrandParent != NULL) - { - ExpBinaryTreeReplaceChildNode(ExpBinaryTreeParentNode(Node), NewChild); - } - - ExpDestroyBinaryTreeNode(Tree, ExpBinaryTreeParentNode(Node)); - ExpDestroyBinaryTreeNode(Tree, Node); - } -} - - -/* - * Release resources used by nodes of a binary (sub)tree. - */ -VOID -ExpDeleteBinaryTree(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - /* FIXME: Possibly do this iteratively due to the small kernel-mode stack */ - - if (ExpBinaryTreeIsInternalNode(Node)) - { - ExpDeleteBinaryTree(Tree, ExpBinaryTreeLeftChildNode(Node)); - ExpDeleteBinaryTree(Tree, ExpBinaryTreeRightChildNode(Node)); - } - - ExpDestroyBinaryTreeNode(Tree, Node); -} - - -/* - * Traverse a binary tree using preorder traversal method. - * Returns FALSE, if the traversal was terminated prematurely or - * TRUE if the callback routine did not request that the traversal - * be terminated prematurely. - * The lock for the tree must be acquired when this routine is called. - */ -BOOLEAN -ExpTraverseBinaryTreePreorder(PTRAVERSE_CONTEXT Context, - PBINARY_TREE_NODE Node) -{ - if (ExpBinaryTreeIsInternalNode(Node)) - { - /* Call the traversal routine */ - if (!(*Context->Routine)(Context->Context, - ExpBinaryTreeNodeKey(Node), - ExpBinaryTreeNodeValue(Node))) - { - return FALSE; - } - - /* Traverse left subtree */ - ExpTraverseBinaryTreePreorder(Context, ExpBinaryTreeLeftChildNode(Node)); - - /* Traverse right subtree */ - ExpTraverseBinaryTreePreorder(Context, ExpBinaryTreeRightChildNode(Node)); - } - - return TRUE; -} - - -/* - * Traverse a binary tree using inorder traversal method. - * Returns FALSE, if the traversal was terminated prematurely or - * TRUE if the callback routine did not request that the traversal - * be terminated prematurely. - * The lock for the tree must be acquired when this routine is called. - */ -BOOLEAN -ExpTraverseBinaryTreeInorder(PTRAVERSE_CONTEXT Context, - PBINARY_TREE_NODE Node) -{ - if (ExpBinaryTreeIsInternalNode(Node)) - { - /* Traverse left subtree */ - ExpTraverseBinaryTreeInorder(Context, ExpBinaryTreeLeftChildNode(Node)); - - /* Call the traversal routine */ - if (!(*Context->Routine)(Context->Context, - ExpBinaryTreeNodeKey(Node), - ExpBinaryTreeNodeValue(Node))) - { - return FALSE; - } - - /* Traverse right subtree */ - ExpTraverseBinaryTreeInorder(Context, ExpBinaryTreeRightChildNode(Node)); - } - - return TRUE; -} - - -/* - * Traverse a binary tree using postorder traversal method. - * Returns FALSE, if the traversal was terminated prematurely or - * TRUE if the callback routine did not request that the traversal - * be terminated prematurely. - * The lock for the tree must be acquired when this routine is called. - */ -BOOLEAN -ExpTraverseBinaryTreePostorder(PTRAVERSE_CONTEXT Context, - PBINARY_TREE_NODE Node) -{ - if (ExpBinaryTreeIsInternalNode(Node)) - { - /* Traverse left subtree */ - ExpTraverseBinaryTreePostorder(Context, ExpBinaryTreeLeftChildNode(Node)); - - /* Traverse right subtree */ - ExpTraverseBinaryTreePostorder(Context, ExpBinaryTreeRightChildNode(Node)); - - /* Call the traversal routine */ - return (*Context->Routine)(Context->Context, - ExpBinaryTreeNodeKey(Node), - ExpBinaryTreeNodeValue(Node)); - } - - return TRUE; -} - - -/* - * Default key compare function. Compares the integer values of the two keys. - */ -LONG STDCALL -ExpBinaryTreeDefaultCompare(PVOID Key1, - PVOID Key2) -{ - if (Key1 == Key2) - return 0; - - return (((LONG_PTR) Key1 < (LONG_PTR) Key2) ? -1 : 1); -} - - -/* - * Initializes a binary tree. - */ -BOOLEAN STDCALL -ExInitializeBinaryTree(IN PBINARY_TREE Tree, - IN PKEY_COMPARATOR Compare, - IN BOOLEAN UseNonPagedPool) -{ - RtlZeroMemory(Tree, sizeof(BINARY_TREE)); - - Tree->Compare = (Compare == NULL) - ? ExpBinaryTreeDefaultCompare : Compare; - - Tree->UseNonPagedPool = UseNonPagedPool; - - if (UseNonPagedPool) - { - ExInitializeNPagedLookasideList( - &Tree->List.NonPaged, /* Lookaside list */ - NULL, /* Allocate routine */ - NULL, /* Free routine */ - 0, /* Flags */ - sizeof(BINARY_TREE_NODE), /* Size of each entry */ - TAG('E','X','B','T'), /* Tag */ - 0); /* Depth */ - - KeInitializeSpinLock(&Tree->Lock.NonPaged); - } - else - { - ExInitializePagedLookasideList( - &Tree->List.Paged, /* Lookaside list */ - NULL, /* Allocate routine */ - NULL, /* Free routine */ - 0, /* Flags */ - sizeof(BINARY_TREE_NODE), /* Size of each entry */ - TAG('E','X','B','T'), /* Tag */ - 0); /* Depth */ - - ExInitializeFastMutex(&Tree->Lock.Paged); - } - - ExpBinaryTreeRootNode(Tree) = ExpCreateBinaryTreeNode(Tree, NULL, NULL); - - if (ExpBinaryTreeRootNode(Tree) == NULL) - { - if (UseNonPagedPool) - { - ExDeleteNPagedLookasideList(&Tree->List.NonPaged); - } - else - { [truncated at 1000 lines; 3443 more skipped]

19 years, 6 months

[weiden] 14021: fixed HANDLE_TABLE structure

by weiden＠svn.reactos.com

fixed HANDLE_TABLE structure Modified: trunk/reactos/include/ntos/obtypes.h _____ Modified: trunk/reactos/include/ntos/obtypes.h --- trunk/reactos/include/ntos/obtypes.h 2005-03-13 18:08:10 UTC (rev 14020) +++ trunk/reactos/include/ntos/obtypes.h 2005-03-13 18:39:38 UTC (rev 14021) @@ -119,10 +119,12 @@ ERESOURCE HandleTableLock; LIST_ENTRY HandleTableList; KEVENT HandleContentionEvent; -} HANDLE_TABLE, *PHANDLE_TABLE; +} HANDLE_TABLE; #ifndef __USE_W32API +typedef struct _HANDLE_TABLE *PHANDLE_TABLE; + /* * FIXME: These will eventually become centerfold in the compliant Ob Manager * For now, they are only here so Device Map is properly defined before the header

19 years, 6 months

[royce] 14020: c version of wine's 'make_ctests' script

by royce＠svn.reactos.com

c version of wine's 'make_ctests' script Added: trunk/reactos/tools/make_ctests.c _____ Added: trunk/reactos/tools/make_ctests.c --- trunk/reactos/tools/make_ctests.c 2005-03-13 17:24:17 UTC (rev 14019) +++ trunk/reactos/tools/make_ctests.c 2005-03-13 18:08:10 UTC (rev 14020) @@ -0,0 +1,132 @@ +/* make_ctests.c + + * This program is a port of wine project's make_ctests script + +# Script to generate a C file containing a list of tests +# +# Copyright 2002 Alexandre Julliard +# Copyright 2002 Dimitrie O. Paun +# +# 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 +# + +# ***** Keep in sync with tools/winapi/msvcmaker:_generate_testlist_c ***** +*/ + +#include <stdio.h> +#include <stdlib.h> + +const char* header = + "/* Automatically generated file; DO NOT EDIT!! */\n" + "\n" + "/* stdarg.h is needed for Winelib */\n" + "#include <stdarg.h>\n" + "#include <stdio.h>\n" + "#include <stdlib.h>\n" + "#include \"windef.h\"\n" + "#include \"winbase.h\"\n" + "\n"; + +const char* middle = + "\n" + "struct test\n" + "{\n" + " const char *name;\n" + " void (*func)(void);\n" + "};\n" + "\n" + "static const struct test winetest_testlist[] =\n" + "{\n"; + +const char* end = + " { 0, 0 }\n" + "};\n" + "\n" + "#define WINETEST_WANT_MAIN\n" + "#include \"wine/test.h\"\n" + "\n"; + +char* +basename ( const char* filename ) +{ + const char *p, *p2; + char *out; + size_t out_len; + + if ( filename == NULL ) + { + fprintf ( stderr, "basename() called with null filename\n" ); + return NULL; + } + p = strrchr ( filename, '/' ); + if ( !p ) + p = filename; + else + ++p; + + /* look for backslashes, too... */ + p2 = strrchr ( filename, '\\' ); + if ( p2 > p ) + p = p2 + 1; + + /* find extension... */ + p2 = strrchr ( filename, '.' ); + if ( !p2 ) + p2 = p + strlen(p); + + /* malloc a copy */ + out_len = p2-p; + out = malloc ( out_len+1 ); + if ( out == NULL ) + { + fprintf ( stderr, "malloc() failed\n" ); + return NULL; + } + memmove ( out, p, out_len ); + out[out_len] = '\0'; + return out; +} + +int +main ( int argc, const char** argv ) +{ + size_t i; + + printf ( "%s", header ); + + for ( i = 1; i < argc; i++ ) + { + char* test = basename(argv[i]); + if ( test == NULL ) + return 255; + printf ( "extern void func_%s(void);\n", test ); + free ( test ); + } + + printf ( "%s", middle ); + + for ( i = 1; i < argc; i++ ) + { + char* test = basename(argv[i]); + if ( test == NULL ) + return 255; + printf ( " { \"%s\", func_%s },\n", test, test ); + free ( test ); + } + + printf ( "%s", end ); + + return 0; +} Property changes on: trunk/reactos/tools/make_ctests.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 6 months

[royce] 14019: -Wall -Werror and fix warnings

by royce＠svn.reactos.com

-Wall -Werror and fix warnings Modified: trunk/reactos/tools/widl/ChangeLog _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-13 17:18:33 UTC (rev 14018) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-13 17:24:17 UTC (rev 14019) @@ -1,5 +1,14 @@ ChangeLog +2005-03-13 royce3 + + tools/widl/hash.c + tools/widl/Makefile + tools/widl/write_msft.c + +-Wall -Werror and fix warnings + + 2005-03-13 ekohl tools/widl/client.c

19 years, 6 months

[royce] 14018: -Wall -Werror and fix warnings

by royce＠svn.reactos.com

-Wall -Werror and fix warnings Modified: trunk/reactos/tools/widl/Makefile Modified: trunk/reactos/tools/widl/hash.c Modified: trunk/reactos/tools/widl/write_msft.c _____ Modified: trunk/reactos/tools/widl/Makefile --- trunk/reactos/tools/widl/Makefile 2005-03-13 17:03:42 UTC (rev 14017) +++ trunk/reactos/tools/widl/Makefile 2005-03-13 17:18:33 UTC (rev 14018) @@ -36,7 +36,8 @@ HOST_CFLAGS = -DYYDEBUG=1 -DINT16=SHORT -D__USE_W32API \ -I$(LIB_WPP_DIR) -I$(PATH_TO_TOP)/include/wine \ - -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include + -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/w32api/include \ + -Werror -Wall %.o: %.c $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@ _____ Modified: trunk/reactos/tools/widl/hash.c --- trunk/reactos/tools/widl/hash.c 2005-03-13 17:03:42 UTC (rev 14017) +++ trunk/reactos/tools/widl/hash.c 2005-03-13 17:18:33 UTC (rev 14018) @@ -511,7 +511,7 @@ switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - fprintf(stderr, "Unknown lcid %lx, treating as latin-based, please report\n", lcid); + fprintf(stderr, "Unknown lcid %lx, treating as latin-based, please report\n", (long)lcid); /* .. Fall Through .. */ case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: _____ Modified: trunk/reactos/tools/widl/write_msft.c --- trunk/reactos/tools/widl/write_msft.c 2005-03-13 17:03:42 UTC (rev 14017) +++ trunk/reactos/tools/widl/write_msft.c 2005-03-13 17:18:33 UTC (rev 14018) @@ -33,6 +33,9 @@ #include <stdio.h> #include <ctype.h> #include <time.h> +#ifdef WIN32 +#include <io.h> /* write() */ +#endif /* WIN32 */ #define NONAMELESSUNION #define NONAMELESSSTRUCT

19 years, 6 months

[hbirr] 14017: Added a keep-alive reference to each key object.

by hbirr＠svn.reactos.com

Added a keep-alive reference to each key object. Lock the registry while accessing sub keys of a key object. Implemented a worker thread which removes all unused key objects. Fixed a bug which shows keys twice if a key is already opened. Modified: trunk/reactos/ntoskrnl/cm/cm.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c _____ Modified: trunk/reactos/ntoskrnl/cm/cm.h --- trunk/reactos/ntoskrnl/cm/cm.h 2005-03-13 17:01:59 UTC (rev 14016) +++ trunk/reactos/ntoskrnl/cm/cm.h 2005-03-13 17:03:42 UTC (rev 14017) @@ -353,6 +353,12 @@ /* List of subkeys loaded */ struct _KEY_OBJECT **SubKeys; + + /* List entry into the global key object list */ + LIST_ENTRY ListEntry; + + /* Time stamp for the last access by the parse routine */ + ULONG TimeStamp; } KEY_OBJECT, *PKEY_OBJECT; /* Bits 31-22 (top 10 bits) of the cell index is the directory index */ @@ -529,10 +535,11 @@ NTSTATUS CmiRemoveKeyFromList(IN PKEY_OBJECT NewKey); -PKEY_OBJECT +NTSTATUS CmiScanKeyList(IN PKEY_OBJECT Parent, IN PUNICODE_STRING KeyName, - IN ULONG Attributes); + IN ULONG Attributes, + PKEY_OBJECT* ReturnedObject); NTSTATUS CmiCreateVolatileHive(PREGISTRY_HIVE *RegistryHive); _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-03-13 17:01:59 UTC (rev 14016) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-03-13 17:03:42 UTC (rev 14017) @@ -21,6 +21,7 @@ extern POBJECT_TYPE CmiKeyType; extern PREGISTRY_HIVE CmiVolatileHive; +extern LIST_ENTRY CmiKeyObjectListHead; static BOOLEAN CmiRegistryInitialized = FALSE; @@ -300,6 +301,8 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + InsertTailList(&CmiKeyObjectListHead, &KeyObject->ListEntry); + /* add key to subkeys of parent if needed */ Status = CmiAddSubKey(KeyObject->RegistryHive, KeyObject->ParentKey, @@ -355,7 +358,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - ObDereferenceObject(KeyObject); + ObDereferenceObject(Object); if (Disposition) @@ -419,6 +422,9 @@ /* Dereference the object */ ObDereferenceObject(KeyObject); + /* Remove the keep-alive reference */ + ObDereferenceObject(KeyObject); + if (KeyObject->RegistryHive != KeyObject->ParentKey->RegistryHive) ObDereferenceObject(KeyObject); @@ -513,8 +519,7 @@ for (i = 0; i < KeyObject->NumberOfSubKeys; i++) { CurKey = KeyObject->SubKeys[i]; - if (CurKey->RegistryHive == CmiVolatileHive || - CurKey->RegistryHive != RegistryHive) + if (CurKey->RegistryHive != RegistryHive) { if (j == Index) break; _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-03-13 17:01:59 UTC (rev 14016) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-03-13 17:03:42 UTC (rev 14017) @@ -20,12 +20,15 @@ POBJECT_TYPE CmiKeyType = NULL; PREGISTRY_HIVE CmiVolatileHive = NULL; -KSPIN_LOCK CmiKeyListLock; LIST_ENTRY CmiHiveListHead; ERESOURCE CmiRegistryLock; +KTIMER CmiWorkerTimer; +LIST_ENTRY CmiKeyObjectListHead; +ULONG CmiTimer = 0; + volatile BOOLEAN CmiHiveSyncEnabled = FALSE; volatile BOOLEAN CmiHiveSyncPending = FALSE; KDPC CmiHiveSyncDpc; @@ -241,6 +244,67 @@ CmiCheckByName(Verbose, L"User"); } +VOID STDCALL +CmiWorkerThread(PVOID Param) +{ + NTSTATUS Status; + PLIST_ENTRY CurrentEntry; + PKEY_OBJECT CurrentKey; + ULONG Count; + + + while (1) + { + Status = KeWaitForSingleObject(&CmiWorkerTimer, + Executive, + KernelMode, + FALSE, + NULL); + if (Status == STATUS_SUCCESS) + { + DPRINT("CmiWorkerThread\n"); + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + + CmiTimer++; + + Count = 0; + CurrentEntry = CmiKeyObjectListHead.Blink; + while (CurrentEntry != &CmiKeyObjectListHead) + { + CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, ListEntry); + if (CurrentKey->TimeStamp + 120 > CmiTimer) + { + /* The object was accessed in the last 10min */ + break; + } + if (1 == ObGetObjectPointerCount(CurrentKey) && + !(CurrentKey->Flags & KO_MARKED_FOR_DELETE)) + { + ObDereferenceObject(CurrentKey); + CurrentEntry = CmiKeyObjectListHead.Blink; + Count++; + } + else + { + CurrentEntry = CurrentEntry->Blink; + } + } + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + + DPRINT("Removed %d key objects\n", Count); + + } + else + { + KEBUGCHECK(0); + } + } +} + VOID INIT_FUNCTION STDCALL @@ -279,6 +343,9 @@ HANDLE RootKeyHandle; HANDLE KeyHandle; NTSTATUS Status; + LARGE_INTEGER DueTime; + HANDLE ThreadHandle; + CLIENT_ID ThreadId; /* Initialize the Key object type */ CmiKeyType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); @@ -311,6 +378,29 @@ /* Initialize registry lock */ ExInitializeResourceLite(&CmiRegistryLock); + /* Initialize the key object list */ + InitializeListHead(&CmiKeyObjectListHead); + + /* Initialize the worker timer */ + KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); + + /* Initialize the worker thread */ + Status = PsCreateSystemThread(&ThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &ThreadId, + CmiWorkerThread, + NULL); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } + + /* Start the timer */ + DueTime.QuadPart = -1; + KeSetTimerEx(&CmiWorkerTimer, DueTime, 5000, NULL); /* 5sec */ + /* Build volatile registry store */ Status = CmiCreateVolatileHive (&CmiVolatileHive); ASSERT(NT_SUCCESS(Status)); @@ -346,6 +436,7 @@ RootKey->NumberOfSubKeys = 0; RootKey->SubKeys = NULL; RootKey->SizeOfSubKeys = 0; + InsertTailList(&CmiKeyObjectListHead, &RootKey->ListEntry); Status = RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); ASSERT(NT_SUCCESS(Status)); @@ -672,6 +763,7 @@ NewKey->KeyCell = CmiGetCell (RegistryHive, NewKey->KeyCellOffset, NULL); NewKey->Flags = 0; NewKey->NumberOfSubKeys = 0; + InsertTailList(&CmiKeyObjectListHead, &NewKey->ListEntry); if (NewKey->KeyCell->NumberOfSubKeys != 0) { NewKey->SubKeys = ExAllocatePool(NonPagedPool, @@ -726,6 +818,8 @@ PREGISTRY_HIVE Hive; HANDLE KeyHandle; NTSTATUS Status; + PLIST_ENTRY CurrentEntry; + PKEY_OBJECT CurrentKey; DPRINT("CmiDisconnectHive() called\n"); @@ -765,11 +859,36 @@ return STATUS_INVALID_PARAMETER; } + /* Acquire registry lock exclusively */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + + CurrentEntry = CmiKeyObjectListHead.Flink; + while (CurrentEntry != &CmiKeyObjectListHead) + { + CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, ListEntry); + if (1 == ObGetObjectPointerCount(CurrentKey) && + !(CurrentKey->Flags & KO_MARKED_FOR_DELETE)) + { + ObDereferenceObject(CurrentKey); + CurrentEntry = CmiKeyObjectListHead.Flink; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } + } + if (ObGetObjectHandleCount (KeyObject) != 0 || ObGetObjectPointerCount (KeyObject) != 2) { - DPRINT1 ("Hive is still in use\n"); + DPRINT1 ("Hive is still in use (hc %d, rc %d)\n", ObGetObjectHandleCount (KeyObject), ObGetObjectPointerCount (KeyObject)); ObDereferenceObject (KeyObject); + + /* Release registry lock */ + ExReleaseResourceLite (&CmiRegistryLock); + KeLeaveCriticalRegion(); + return STATUS_UNSUCCESSFUL; } @@ -781,6 +900,10 @@ *RegistryHive = Hive; + /* Release registry lock */ + ExReleaseResourceLite (&CmiRegistryLock); + KeLeaveCriticalRegion(); + DPRINT ("CmiDisconnectHive() done\n"); return STATUS_SUCCESS; _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-03-13 17:01:59 UTC (rev 14016) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-03-13 17:03:42 UTC (rev 14017) @@ -14,6 +14,8 @@ #include "cm.h" +extern LIST_ENTRY CmiKeyObjectListHead; +extern ULONG CmiTimer; static NTSTATUS CmiGetLinkTarget(PREGISTRY_HIVE RegistryHive, @@ -76,10 +78,22 @@ KeyName.Length); KeyName.Buffer[KeyName.Length / sizeof(WCHAR)] = 0; + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - FoundObject = CmiScanKeyList(ParsedKey, - &KeyName, - Attributes); + + Status = CmiScanKeyList(ParsedKey, + &KeyName, + Attributes, + &FoundObject); + if (!NT_SUCCESS(Status)) + { + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + RtlFreeUnicodeString(&KeyName); + return Status; + } if (FoundObject == NULL) { Status = CmiScanForSubKey(ParsedKey->RegistryHive, @@ -91,6 +105,8 @@ Attributes); if (!NT_SUCCESS(Status) || (SubKeyCell == NULL)) { + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(STATUS_UNSUCCESSFUL); } @@ -104,6 +120,9 @@ &LinkPath); if (NT_SUCCESS(Status)) { + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + DPRINT("LinkPath '%wZ'\n", &LinkPath); /* build new FullPath for reparsing */ @@ -140,7 +159,7 @@ } /* Create new key object and put into linked list */ - DPRINT("CmiObjectParse: %s\n", Path); + DPRINT("CmiObjectParse: %S\n", *Path); Status = ObCreateObject(KernelMode, CmiKeyType, NULL, @@ -152,14 +171,19 @@ (PVOID*)&FoundObject); if (!NT_SUCCESS(Status)) { + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(Status); } + /* Add the keep-alive reference */ + ObReferenceObject(FoundObject); FoundObject->Flags = 0; FoundObject->KeyCell = SubKeyCell; FoundObject->KeyCellOffset = BlockOffset; FoundObject->RegistryHive = ParsedKey->RegistryHive; + InsertTailList(&CmiKeyObjectListHead, &FoundObject->ListEntry); RtlpCreateUnicodeString(&FoundObject->Name, KeyName.Buffer, NonPagedPool); CmiAddKeyToList(ParsedKey, FoundObject); @@ -179,7 +203,12 @@ if (NT_SUCCESS(Status)) { DPRINT("LinkPath '%wZ'\n", &LinkPath); + + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + ObDereferenceObject(FoundObject); + /* build new FullPath for reparsing */ TargetPath.MaximumLength = LinkPath.MaximumLength; if (EndPtr != NULL) @@ -212,13 +241,15 @@ return(STATUS_REPARSE); } } - - ObReferenceObjectByPointer(FoundObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); } + RemoveEntryList(&FoundObject->ListEntry); + InsertHeadList(&CmiKeyObjectListHead, &FoundObject->ListEntry); + FoundObject->TimeStamp = CmiTimer; + + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + DPRINT("CmiObjectParse: %s\n", FoundObject->Name); *Path = EndPtr; @@ -274,11 +305,16 @@ ObReferenceObject (ParentKeyObject); + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) { DPRINT1("Key not found in parent list ???\n"); } + RemoveEntryList(&KeyObject->ListEntry); RtlFreeUnicodeString(&KeyObject->Name); if (KeyObject->Flags & KO_MARKED_FOR_DELETE) @@ -302,6 +338,9 @@ ObDereferenceObject (ParentKeyObject); + ExReleaseResourceLite(&CmiRegistryLock); + KeLeaveCriticalRegion(); + if (KeyObject->NumberOfSubKeys) { KEBUGCHECK(REGISTRY_ERROR); @@ -532,11 +571,9 @@ CmiAddKeyToList(PKEY_OBJECT ParentKey, PKEY_OBJECT NewKey) { - KIRQL OldIrql; DPRINT("ParentKey %.08x\n", ParentKey); - KeAcquireSpinLock(&CmiKeyListLock, &OldIrql); if (ParentKey->SizeOfSubKeys <= ParentKey->NumberOfSubKeys) { @@ -568,7 +605,6 @@ NULL, UserMode); NewKey->ParentKey = ParentKey; - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); } @@ -576,11 +612,9 @@ CmiRemoveKeyFromList(PKEY_OBJECT KeyToRemove) { PKEY_OBJECT ParentKey; - KIRQL OldIrql; DWORD Index; ParentKey = KeyToRemove->ParentKey; - KeAcquireSpinLock(&CmiKeyListLock, &OldIrql); /* FIXME: If list maintained in alphabetic order, use dichotomic search */ for (Index = 0; Index < ParentKey->NumberOfSubKeys; Index++) { @@ -591,7 +625,6 @@ &ParentKey->SubKeys[Index + 1], (ParentKey->NumberOfSubKeys - Index - 1) * sizeof(PKEY_OBJECT)); ParentKey->NumberOfSubKeys--; - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); DPRINT("Dereference parent key: 0x%x\n", ParentKey); @@ -599,25 +632,23 @@ return STATUS_SUCCESS; } } - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); return STATUS_UNSUCCESSFUL; } -PKEY_OBJECT +NTSTATUS CmiScanKeyList(PKEY_OBJECT Parent, PUNICODE_STRING KeyName, - ULONG Attributes) + ULONG Attributes, + PKEY_OBJECT* ReturnedObject) { PKEY_OBJECT CurKey; - KIRQL OldIrql; ULONG Index; - + DPRINT("Scanning key list for: %wZ (Parent: %wZ)\n", KeyName, &Parent->Name); - KeAcquireSpinLock(&CmiKeyListLock, &OldIrql); /* FIXME: if list maintained in alphabetic order, use dichotomic search */ for (Index=0; Index < Parent->NumberOfSubKeys; Index++) { @@ -627,8 +658,7 @@ if ((KeyName->Length == CurKey->Name.Length) && (_wcsicmp(KeyName->Buffer, CurKey->Name.Buffer) == 0)) { - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); - return CurKey; + break; } } else @@ -636,14 +666,26 @@ if ((KeyName->Length == CurKey->Name.Length) && (wcscmp(KeyName->Buffer, CurKey->Name.Buffer) == 0)) { - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); - return CurKey; + break; } } } - KeReleaseSpinLock(&CmiKeyListLock, OldIrql); - - return NULL; + + if (Index < Parent->NumberOfSubKeys) + { + if (CurKey->Flags & KO_MARKED_FOR_DELETE) + { + *ReturnedObject = NULL; + return STATUS_UNSUCCESSFUL; + } + ObReferenceObject(CurKey); + *ReturnedObject = CurKey; + } + else + { + *ReturnedObject = NULL; + } + return STATUS_SUCCESS; }

19 years, 6 months

[ea] 14016: ea@reactos.com

by ea＠svn.reactos.com

ea(a)reactos.com - make SmExecuteProgram work - implement SmCompleteSession (untested) Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smapicomp.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-03-13 17:00:19 UTC (rev 14015) +++ trunk/reactos/subsys/smss/client.c 2005-03-13 17:01:59 UTC (rev 14016) @@ -42,40 +42,7 @@ } SmpClientDirectory; -#if 0 /********************************************************************** - * SmpRegisterSmss/0 - */ -static NTSTATUS -SmpRegisterSmss(VOID) -{ - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING SbApiPortName = {0,0,NULL}; - HANDLE hSmApiPort = (HANDLE) 0; - - DPRINT("SM: %s called\n",__FUNCTION__); - - Status = SmConnectApiPort(& SbApiPortName, - (HANDLE) -1, - IMAGE_SUBSYSTEM_NATIVE, - & hSmApiPort); - if(!NT_SUCCESS(Status)) - { - DPRINT("SM: %s: SMDLL!SmConnectApiPort failed (Status=0x%08lx)\n",__FUNCTION__,Status); - return Status; - } - Status = SmCompleteSession (hSmApiPort, (HANDLE)0, hSmApiPort); - if(!NT_SUCCESS(Status)) - { - DPRINT("SM: %s: SMDLL!SmCompleteSession failed (Status=0x%08lx)\n",__FUNCTION__,Status); - return Status; - } - NtClose(hSmApiPort); - return Status; -} -#endif - -/********************************************************************** * SmInitializeClientManagement/0 */ NTSTATUS @@ -85,18 +52,48 @@ RtlInitializeCriticalSection(& SmpClientDirectory.Lock); SmpClientDirectory.Count = 0; SmpClientDirectory.Client = NULL; -#if 0 - /* Register IMAGE_SUBSYSTE_NATIVE to be managed by SM */ - return SmpRegisterSmss(); -#endif return STATUS_SUCCESS; } /********************************************************************** - * SmpLookupClient/1 + * SmCompleteClientInitialization/1 * * DESCRIPTION + * Lookup the subsystem server descriptor given the process handle + * of the subsystem server process. + */ +NTSTATUS STDCALL +SmCompleteClientInitialization (HANDLE hProcess) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CLIENT_DATA Client = NULL; + + DPRINT("SM: %s called\n", __FUNCTION__); + + RtlEnterCriticalSection (& SmpClientDirectory.Lock); + if (SmpClientDirectory.Count > 0) + { + Client = SmpClientDirectory.Client; + while (NULL != Client) + { + if (hProcess == Client->ServerProcess) + { + Client->Initialized = TRUE; + break; + } + Client = Client->Next; + } + Status = STATUS_NOT_FOUND; + } + RtlLeaveCriticalSection (& SmpClientDirectory.Lock); + return Status; +} + +/********************************************************************** + * SmpLookupClient/1 PRIVATE + * + * DESCRIPTION * Lookup the subsystem server descriptor given its image ID. * * SIDE EFFECTS @@ -148,7 +145,7 @@ */ if (SmpLookupClient(ConnectData->Subsystem)) { - DPRINT("SMSS: %s: attempt to register again subsystem %d.\n", + DPRINT("SM: %s: attempt to register again subsystem %d.\n", __FUNCTION__, ConnectData->Subsystem); return STATUS_UNSUCCESSFUL; _____ Modified: trunk/reactos/subsys/smss/initss.c --- trunk/reactos/subsys/smss/initss.c 2005-03-13 17:00:19 UTC (rev 14015) +++ trunk/reactos/subsys/smss/initss.c 2005-03-13 17:01:59 UTC (rev 14016) @@ -53,7 +53,43 @@ */ /********************************************************************** + * SmpRegisterSmss/0 + * + * DESCRIPTION + * Make smss register with itself for IMAGE_SUBSYSTEM_NATIVE + * (programmatically). This also open hSmApiPort to be used + * in loading required subsystems. */ +#if 0 +static NTSTATUS +SmpRegisterSmss(VOID) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING SbApiPortName = {0,0,NULL}; + + DPRINT("SM: %s called\n",__FUNCTION__); + + Status = SmConnectApiPort(& SbApiPortName, + (HANDLE) 0, + IMAGE_SUBSYSTEM_NATIVE, + & hSmApiPort); + if(!NT_SUCCESS(Status)) + { + DPRINT("SM: %s: SMDLL!SmConnectApiPort failed (Status=0x%08lx)\n", + __FUNCTION__,Status); + return Status; + } + /* + * Note that you don't need to call complete session + * because connection handling code autocompletes + * the client structure for IMAGE_SUBSYSTEM_NATIVE. + */ + return Status; +} +#endif + +/********************************************************************** + */ NTSTATUS SmLoadSubsystems(VOID) { @@ -65,7 +101,15 @@ DPRINT("SM: loading subsystems\n"); - + + /* SM self registers */ +#if 0 + Status = SmpRegisterSmss(); + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: SM failed to self register: system is not secure!\n"); + } +#endif /* Load Kmode subsystem (aka win32k.sys) */ Status = SmLookupSubsystem (L"Kmode", Data, @@ -91,6 +135,13 @@ } } /* TODO: load Required subsystems (Debug Windows) */ +#if 0 + Status = SmExecuteProgram(L"DEBUG"); + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: DBSS failed to initialize!\n"); + } +#endif return Status; } _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-03-13 17:00:19 UTC (rev 14015) +++ trunk/reactos/subsys/smss/smapi.c 2005-03-13 17:01:59 UTC (rev 14016) @@ -51,20 +51,22 @@ * Entry point for the listener thread of LPC port "\SmApiPort". */ VOID STDCALL -SmpApiConnectedThread(PVOID dummy) +SmpApiConnectedThread(PVOID pConnectedPort) { NTSTATUS Status = STATUS_SUCCESS; PVOID Unknown = NULL; PLPC_MESSAGE Reply = NULL; SM_PORT_MESSAGE Request = {{0}}; + HANDLE ConnectedPort = * (PHANDLE) pConnectedPort; - DPRINT("SM: %s running\n",__FUNCTION__); + DPRINT("SM: %s(%08lx) running\n", __FUNCTION__, pConnectedPort); + DPRINT("SM: %s(%08lx): ConnectedPort = %08lx\n", __FUNCTION__, pConnectedPort, ConnectedPort); while (TRUE) { DPRINT("SM: %s: waiting for message\n",__FUNCTION__); - Status = NtReplyWaitReceivePort(SmApiPort, + Status = NtReplyWaitReceivePort(ConnectedPort, (PULONG) & Unknown, Reply, (PLPC_MESSAGE) & Request); @@ -98,8 +100,13 @@ Reply = (PLPC_MESSAGE) & Request; } } + } else { + /* LPC failed */ + break; } } + NtClose (ConnectedPort); + NtTerminateThread (NtCurrentThread(), Status); } /********************************************************************** @@ -115,75 +122,91 @@ NTSTATUS STDCALL SmpHandleConnectionRequest (PSM_PORT_MESSAGE Request) { -#if defined(__USE_NT_LPC__) + PSM_CONNECT_DATA ConnectData = (PSM_CONNECT_DATA) ((PBYTE) Request) + sizeof (LPC_REQUEST); NTSTATUS Status = STATUS_SUCCESS; + BOOL Accept = FALSE; PSM_CLIENT_DATA ClientData = NULL; + HANDLE hClientDataApiPort = (HANDLE) 0; + PHANDLE ClientDataApiPort = & hClientDataApiPort; + HANDLE hClientDataApiPortThread = (HANDLE) 0; + PHANDLE ClientDataApiPortThread = & hClientDataApiPortThread; PVOID Context = NULL; - DPRINT("SM: %s called\n",__FUNCTION__); + DPRINT("SM: %s called\n", __FUNCTION__); - /* - * SmCreateClient/2 is called here explicitly to *fail*. - * If it succeeds, there is something wrong in the - * connection request. An environment subsystem *never* - * registers twice. (Security issue: maybe we will - * write this event into the security log). - */ - Status = SmCreateClient (Request, & ClientData); - if(STATUS_SUCCESS == Status) + if(sizeof (SM_CONNECT_DATA) == Request->Header.DataSize) { - /* OK: the client is an environment subsystem - * willing to manage a free image type. - * Accept it. - */ - Status = NtAcceptConnectPort (& ClientData->ApiPort, - Context, - (PLPC_MESSAGE) Request, - TRUE, //accept - NULL, - NULL); - if(NT_SUCCESS(Status)) + if(IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->Subsystem) { - Status = NtCompleteConnectPort(ClientData->ApiPort); + /* + * This is not a call from an environment server + * willing to register, but from any other process + * that will use the SM API. + */ + DPRINT("SM: %s: req from NON subsys server process\n", __FUNCTION__); + ClientDataApiPort = & hClientDataApiPort; + ClientDataApiPortThread = & hClientDataApiPortThread; + Accept = TRUE; + } else { + DPRINT("SM: %s: req from subsys server process\n", __FUNCTION__); + /* + * SmCreateClient/2 is called here explicitly to *fail*. + * If it succeeds, there is something wrong in the + * connection request. An environment subsystem *never* + * registers twice. (Security issue: maybe we will + * write this event into the security log). + */ + Status = SmCreateClient (Request, & ClientData); + if(STATUS_SUCCESS == Status) + { + /* OK: the client is an environment subsystem + * willing to manage a free image type. + */ + ClientDataApiPort = & ClientData->ApiPort; + ClientDataApiPortThread = & ClientData->ApiPortThread; + /* + * Reject GUIs: only odd subsystem IDs are + * allowed to register here. + */ + Accept = (1 == (ConnectData->Subsystem % 2)); + } } - return STATUS_SUCCESS; - } else { - /* Reject the subsystem */ - Status = NtAcceptConnectPort (& ClientData->ApiPort, - Context, - (PLPC_MESSAGE) Request, - FALSE, //reject - NULL, - NULL); } +#if defined(__USE_NT_LPC__) + Status = NtAcceptConnectPort (ClientDataApiPort, + Context, + (PLPC_MESSAGE) Request, + Accept, + NULL, + NULL); #else /* ReactOS LPC */ - NTSTATUS Status = STATUS_SUCCESS; - PSM_CLIENT_DATA ClientData = NULL; - - DPRINT("SM: %s called\n",__FUNCTION__); - - Status = SmCreateClient (Request, & ClientData); - if(STATUS_SUCCESS == Status) + Status = NtAcceptConnectPort (ClientDataApiPort, + SmApiPort, // ROS LPC requires the listen port here + Context, + Accept, + NULL, + NULL); +#endif + DPRINT("SM: %s: ClientDataPort=0x%08lx\n", __FUNCTION__, ClientDataApiPort); + DPRINT("SM: %s: *ClientDataPort=0x%08lx\n", __FUNCTION__, *ClientDataApiPort); + if(Accept) { - Status = NtAcceptConnectPort (& ClientData->ApiPort, - SmApiPort, - NULL, - TRUE, //accept - NULL, - NULL); - if (!NT_SUCCESS(Status)) + if(!NT_SUCCESS(Status)) { DPRINT1("SM: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n", - __FUNCTION__, Status); + __FUNCTION__, Status); return Status; } else { - Status = NtCompleteConnectPort(ClientData->ApiPort); + DPRINT("SM: %s: completing conn req\n", __FUNCTION__); + Status = NtCompleteConnectPort (*ClientDataApiPort); if (!NT_SUCCESS(Status)) { DPRINT1("SM: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } +#if !defined(__USE_NT_LPC__) /* ReactOS LPC */ + DPRINT("SM: %s: server side comm port thread (ROS LPC)\n", __FUNCTION__); Status = RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE, @@ -191,8 +214,8 @@ NULL, NULL, (PTHREAD_START_ROUTINE) SmpApiConnectedThread, - ClientData->ApiPort, - & ClientData->ApiPortThread, + ClientDataApiPort, + ClientDataApiPortThread, NULL); if (!NT_SUCCESS(Status)) { @@ -200,18 +223,11 @@ __FUNCTION__, Status); return Status; } +#endif } - return STATUS_SUCCESS; - } else { - /* Reject the subsystem */ - Status = NtAcceptConnectPort (& ClientData->ApiPort, - SmApiPort, - NULL, - FALSE, //reject - NULL, - NULL); + Status = STATUS_SUCCESS; } -#endif /* defined __USE_NT_LPC__ */ + DPRINT("SM: %s done\n", __FUNCTION__); return Status; } _____ Modified: trunk/reactos/subsys/smss/smapicomp.c --- trunk/reactos/subsys/smss/smapicomp.c 2005-03-13 17:00:19 UTC (rev 14015) +++ trunk/reactos/subsys/smss/smapicomp.c 2005-03-13 17:01:59 UTC (rev 14016) @@ -4,10 +4,26 @@ * * Reactos Session Manager * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- */ - #include "smss.h" -#include <rosrtl/string.h> #define NDEBUG #include <debug.h> @@ -18,9 +34,19 @@ */ SMAPI(SmCompSes) { - DPRINT("SM: %s called\n",__FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("SM: %s called from [%lx|%lx]\n", + __FUNCTION__, + Request->ClientId.UniqueProcessId, + Request->ClientId.UniqueThreadId); + + Status = SmCompleteClientInitialization (Request->Header.ClientId.UniqueProcess); + if(!NT_SUCCESS(Status)) + { + Request->Status = STATUS_UNSUCCESSFUL; + } + return Status; } _____ Modified: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-03-13 17:00:19 UTC (rev 14015) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-03-13 17:01:59 UTC (rev 14016) @@ -285,18 +285,23 @@ } else { - WCHAR ImagePath [1024] = {0}; - ULONG ImagePathLength = sizeof ImagePath; - ULONG ImagePathType = REG_EXPAND_SZ; + WCHAR Data [MAX_PATH + 1] = {0}; + ULONG DataLength = sizeof Data; + ULONG DataType = REG_EXPAND_SZ; /* Lookup Name in the registry */ Status = SmLookupSubsystem (Name, - ImagePath, - & ImagePathLength, - & ImagePathType, + Data, + & DataLength, + & DataType, TRUE); /* expand */ if(NT_SUCCESS(Status)) { + WCHAR ImagePath [MAX_PATH + 1] = {0}; + + wcscpy (ImagePath, L"\\??\\"); + wcscat (ImagePath, Data); + /* Create native process */ Request->Status = SmCreateUserProcess(ImagePath, L"", /* FIXME */ _____ Modified: trunk/reactos/subsys/smss/smss.c --- trunk/reactos/subsys/smss/smss.c 2005-03-13 17:00:19 UTC (rev 14015) +++ trunk/reactos/subsys/smss/smss.c 2005-03-13 17:01:59 UTC (rev 14016) @@ -40,7 +40,6 @@ NTSTATUS Status; PROCESS_BASIC_INFORMATION PBI = {0}; - DisplayString(L"SMSS\n"); PrintString("ReactOS Session Manager %s (Build %s)\n", KERNEL_RELEASE_STR, KERNEL_VERSION_BUILD_STR); _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-03-13 17:00:19 UTC (rev 14015) +++ trunk/reactos/subsys/smss/smss.h 2005-03-13 17:01:59 UTC (rev 14016) @@ -91,9 +91,9 @@ } SM_CLIENT_DATA, *PSM_CLIENT_DATA; NTSTATUS SmInitializeClientManagement(VOID); -NTSTATUS SmpRegisterSmss(VOID); NTSTATUS STDCALL SmCreateClient(PSM_PORT_MESSAGE,PSM_CLIENT_DATA*); NTSTATUS STDCALL SmDestroyClient(ULONG); +NTSTATUS STDCALL SmCompleteClientInitialization (HANDLE hProcess); /* debug.c */ extern HANDLE DbgSsApiPort;

19 years, 6 months

← Newer
1
...
35
36
37
38
39
40
41
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005