Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[gdalsnes] 13626: remove duplicate typedef
by gdalsnes＠svn.reactos.com 18 Feb '05

18 Feb '05

remove duplicate typedef Modified: trunk/reactos/lib/crt/stdlib/wcstombs.c _____ Modified: trunk/reactos/lib/crt/stdlib/wcstombs.c --- trunk/reactos/lib/crt/stdlib/wcstombs.c 2005-02-18 02:28:16 UTC (rev 13625) +++ trunk/reactos/lib/crt/stdlib/wcstombs.c 2005-02-18 02:41:49 UTC (rev 13626) @@ -38,7 +38,7 @@ /* We don't need the state really because we don't have shift states to maintain between calls to this function. */ -typedef int mbstate_t; + static mbstate_t mbstate_internal;

1 0

[gdalsnes] 13625: remove duplicate typedef
by gdalsnes＠svn.reactos.com 18 Feb '05

18 Feb '05

remove duplicate typedef Modified: trunk/reactos/lib/crt/stdlib/atexit.c _____ Modified: trunk/reactos/lib/crt/stdlib/atexit.c --- trunk/reactos/lib/crt/stdlib/atexit.c 2005-02-18 01:57:32 UTC (rev 13624) +++ trunk/reactos/lib/crt/stdlib/atexit.c 2005-02-18 02:28:16 UTC (rev 13625) @@ -2,8 +2,6 @@ #include <stdlib.h> #include <internal/atexit.h> -typedef int (* _onexit_t)(void); - /* * @implemented *

1 0

[weiden] 13624: 1. implemented shared sections used for (shared) desktop heaps
by weiden＠svn.reactos.com 18 Feb '05

18 Feb '05

1. implemented shared sections used for (shared) desktop heaps 2. map the gdi handle table to userland Modified: trunk/reactos/include/win32k/gdiobj.h Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/gdi32/main/dllmain.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Added: trunk/reactos/subsys/win32k/include/ssec.h Modified: trunk/reactos/subsys/win32k/include/tags.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/makefile Added: trunk/reactos/subsys/win32k/misc/ssec.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/include/win32k/gdiobj.h --- trunk/reactos/include/win32k/gdiobj.h 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/include/win32k/gdiobj.h 2005-02-18 01:57:32 UTC (rev 13624) @@ -118,6 +118,6 @@ #define GDIOBJFLAG_IGNOREPID (0x1) #define GDIOBJFLAG_IGNORELOCK (0x2) -PVOID INTERNAL_CALL GDI_MapHandleTable(HANDLE hProcess); +PVOID INTERNAL_CALL GDI_MapHandleTable(PEPROCESS Process); #endif _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/include/win32k/ntuser.h 2005-02-18 01:57:32 UTC (rev 13624) @@ -164,7 +164,6 @@ #define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005 #define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006 #define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007 -#define NOPARAM_ROUTINE_GDI_QUERY_TABLE 0xffff0008 DWORD STDCALL NtUserCallNoParam( _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-02-18 01:57:32 UTC (rev 13624) @@ -9,9 +9,6 @@ #define NTOS_MODE_USER #include <ntos.h> -#define NtGdiQueryTable() \ - (PGDI_TABLE_ENTRY)NtUserCallNoParam(NOPARAM_ROUTINE_GDI_QUERY_TABLE) - #define NtUserGetDCBrushColor(hbr) \ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR) _____ Modified: trunk/reactos/lib/gdi32/main/dllmain.c --- trunk/reactos/lib/gdi32/main/dllmain.c 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/lib/gdi32/main/dllmain.c 2005-02-18 01:57:32 UTC (rev 13624) @@ -32,7 +32,7 @@ hProcessHeap = GetProcessHeap(); /* map the gdi handle table to user space */ - GdiHandleTable = NtGdiQueryTable(); + GdiHandleTable = NtCurrentTeb()->Peb->GdiSharedHandleTable; } _____ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h --- trunk/reactos/ntoskrnl/include/internal/ex.h 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/ntoskrnl/include/internal/ex.h 2005-02-18 01:57:32 UTC (rev 13624) @@ -17,6 +17,8 @@ typedef struct _WINSTATION_OBJECT { + PVOID SharedHeap; /* points to kmode memory! */ + CSHORT Type; CSHORT Size; KSPIN_LOCK Lock; @@ -44,6 +46,8 @@ typedef struct _DESKTOP_OBJECT { + PVOID DesktopHeap; /* points to kmode memory! */ + CSHORT Type; CSHORT Size; LIST_ENTRY ListEntry; _____ Added: trunk/reactos/subsys/win32k/include/ssec.h --- trunk/reactos/subsys/win32k/include/ssec.h 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/include/ssec.h 2005-02-18 01:57:32 UTC (rev 13624) @@ -0,0 +1,73 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: shared sections + * FILE: include/ssec.h + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + */ + +#ifndef _WIN32K_SSEC_H +#define _WIN32K_SSEC_H + +typedef struct _SHARED_SECTION +{ + PSECTION_OBJECT SectionObject; + PVOID SystemMappedBase; + ULONG ViewSize; +} SHARED_SECTION, *PSHARED_SECTION; + +typedef struct _SHARED_SECTIONS_ARRAY +{ + struct _SHARED_SECTIONS_ARRAY *Next; + ULONG nEntries; + SHARED_SECTION SharedSection[0]; +} SHARED_SECTIONS_ARRAY, *PSHARED_SECTIONS_ARRAY; + +typedef struct _SHARED_SECTION_POOL +{ + FAST_MUTEX Lock; + ULONG PoolSize; + ULONG PoolFree; + ULONG SharedSectionCount; + SHARED_SECTIONS_ARRAY SectionsArray; +} SHARED_SECTION_POOL, *PSHARED_SECTION_POOL; + +NTSTATUS INTERNAL_CALL +IntUserCreateSharedSectionPool(IN ULONG MaximumPoolSize, + IN PSHARED_SECTION_POOL *SharedSectionPool); + +VOID INTERNAL_CALL +IntUserFreeSharedSectionPool(IN PSHARED_SECTION_POOL SharedSectionPool); + +NTSTATUS INTERNAL_CALL +InUserDeleteSharedSection(IN PSHARED_SECTION_POOL SharedSectionPool, + IN PVOID SystemMappedBase); + +NTSTATUS INTERNAL_CALL +IntUserCreateSharedSection(IN PSHARED_SECTION_POOL SharedSectionPool, + IN OUT PVOID *SystemMappedBase, + IN OUT ULONG *SharedSectionSize); + +NTSTATUS INTERNAL_CALL +IntUserMapSharedSection(IN PSHARED_SECTION_POOL SharedSectionPool, + IN PEPROCESS Process, + IN PVOID SystemMappedBase, + IN PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PVOID *UserMappedBase, + IN PULONG ViewSize OPTIONAL, + IN BOOLEAN ReadOnly); + +NTSTATUS INTERNAL_CALL +IntUserUnMapSharedSection(IN PSHARED_SECTION_POOL SharedSectionPool, + IN PEPROCESS Process, + IN PVOID SystemMappedBase, + IN PVOID UserMappedBase); + +extern PSHARED_SECTION_POOL SessionSharedSectionPool; + +#endif /* ! defined(_WIN32K_SSEC_H) */ + +/* EOF */ + Property changes on: trunk/reactos/subsys/win32k/include/ssec.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/win32k/include/tags.h --- trunk/reactos/subsys/win32k/include/tags.h 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/include/tags.h 2005-02-18 01:57:32 UTC (rev 13624) @@ -54,5 +54,6 @@ /* misc */ #define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ #define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ +#define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ #endif /* _WIN32K_TAGS_H */ _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-02-18 01:57:32 UTC (rev 13624) @@ -51,6 +51,8 @@ extern SSPT Win32kSSPT[]; extern ULONG Win32kNumberOfSysCalls; +PSHARED_SECTION_POOL SessionSharedSectionPool = NULL; + NTSTATUS STDCALL Win32kProcessCallback (struct _EPROCESS *Process, BOOLEAN Create) @@ -76,6 +78,12 @@ Win32Process->KeyboardLayout = W32kGetDefaultKeyLayout(); + if(Process->Peb != NULL) + { + /* map the gdi handle table to user land */ + Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); + } + /* setup process flags */ Win32Process->Flags = 0; } @@ -237,6 +245,13 @@ sizeof(W32THREAD), sizeof(W32PROCESS)); + Status = IntUserCreateSharedSectionPool(48 * 1024 * 1024, /* 48 MB by default */ + &SessionSharedSectionPool); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize the shared section pool: Status 0x%x\n", Status); + } + Status = InitWindowStationImpl(); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/subsys/win32k/makefile --- trunk/reactos/subsys/win32k/makefile 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/makefile 2005-02-18 01:57:32 UTC (rev 13624) @@ -53,7 +53,7 @@ MAIN_OBJECTS = main/dllmain.o main/svctabm.o -MISC_OBJECTS = misc/driver.o misc/error.o misc/math.o misc/object.o +MISC_OBJECTS = misc/driver.o misc/error.o misc/math.o misc/object.o misc/ssec.o LDR_OBJECTS = ldr/loader.o _____ Added: trunk/reactos/subsys/win32k/misc/ssec.c --- trunk/reactos/subsys/win32k/misc/ssec.c 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/misc/ssec.c 2005-02-18 01:57:32 UTC (rev 13624) @@ -0,0 +1,420 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998 - 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: shared sections support + * FILE: subsys/win32k/misc/ssec.c + * PROGRAMER: Thomas Weidenmueller <w3seek(a)reactos.com> + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +/* + * FIXME - instead of mapping the memory into system space using + * MmMapViewInSystemSpace() we should rather use + * MmMapViewInSessionSpace() to map it into session space! + */ + +NTSTATUS INTERNAL_CALL +IntUserCreateSharedSectionPool(IN ULONG MaximumPoolSize, + IN PSHARED_SECTION_POOL *SharedSectionPool) +{ + PSHARED_SECTION_POOL Pool; + ULONG PoolStructSize; + + ASSERT(SharedSectionPool); + + PoolStructSize = ROUND_UP(sizeof(SHARED_SECTION_POOL), PAGE_SIZE); + Pool = ExAllocatePoolWithTag(NonPagedPool, + PoolStructSize, + TAG_SSECTPOOL); + if(Pool != NULL) + { + RtlZeroMemory(Pool, PoolStructSize); + + /* initialize the session heap */ + ExInitializeFastMutex(&Pool->Lock); + Pool->PoolSize = ROUND_UP(MaximumPoolSize, PAGE_SIZE); + Pool->PoolFree = Pool->PoolSize; + Pool->SharedSectionCount = 0; + Pool->SectionsArray.Next = NULL; + Pool->SectionsArray.nEntries = ((PoolStructSize - sizeof(SHARED_SECTION_POOL)) / + sizeof(SHARED_SECTION)) - 1; + + ASSERT(Pool->SectionsArray.nEntries > 0); + + *SharedSectionPool = Pool; + + return STATUS_SUCCESS; + } + + return STATUS_INSUFFICIENT_RESOURCES; +} + + +VOID INTERNAL_CALL +IntUserFreeSharedSectionPool(IN PSHARED_SECTION_POOL SharedSectionPool) +{ + PSHARED_SECTIONS_ARRAY Array, OldArray; + PSHARED_SECTION SharedSection, LastSharedSection; + + ASSERT(SharedSectionPool); + + Array = &SharedSectionPool->SectionsArray; + + ExAcquireFastMutex(&SharedSectionPool->Lock); + while(SharedSectionPool->SharedSectionCount > 0 && Array != NULL) + { + for(SharedSection = Array->SharedSection, LastSharedSection = SharedSection + Array->nEntries; + SharedSection != LastSharedSection && SharedSectionPool->SharedSectionCount > 0; + SharedSection++) + { + if(SharedSection->SectionObject != NULL) + { + ASSERT(SharedSection->SystemMappedBase); + + /* FIXME - use MmUnmapViewInSessionSpace() once implemented! */ + MmUnmapViewInSystemSpace(SharedSection->SystemMappedBase); + /* dereference the keep-alive reference so the section get's deleted */ + ObDereferenceObject(SharedSection->SectionObject); + + SharedSectionPool->SharedSectionCount--; + } + } + + OldArray = Array; + Array = Array->Next; + + /* all shared sections in this array were freed, link the following array to + the main session heap and free this array */ + SharedSectionPool->SectionsArray.Next = Array; + ExFreePool(OldArray); + } + + ASSERT(SharedSectionPool->SectionsArray.Next == NULL); + ASSERT(SharedSectionPool->SharedSectionCount == 0); + + ExReleaseFastMutex(&SharedSectionPool->Lock); +} + + +NTSTATUS INTERNAL_CALL +IntUserCreateSharedSection(IN PSHARED_SECTION_POOL SharedSectionPool, + IN OUT PVOID *SystemMappedBase, + IN OUT ULONG *SharedSectionSize) +{ + PSHARED_SECTIONS_ARRAY Array, LastArray; + PSHARED_SECTION FreeSharedSection, SharedSection, LastSharedSection; + LARGE_INTEGER SectionSize; + ULONG Size; + NTSTATUS Status; + + ASSERT(SharedSectionPool && SharedSectionSize && (*SharedSectionSize) > 0 && SystemMappedBase); + + FreeSharedSection = NULL; + + Size = ROUND_UP(*SharedSectionSize, PAGE_SIZE); + + ExAcquireFastMutex(&SharedSectionPool->Lock); + + if(Size > SharedSectionPool->PoolFree) + { + ExReleaseFastMutex(&SharedSectionPool->Lock); + DPRINT1("Shared Section Pool limit (0x%x KB) reached, attempted to allocate a 0x%x KB shared section!\n", + SharedSectionPool->PoolSize / 1024, (*SharedSectionSize) / 1024); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* walk the array to find a free entry */ + for(Array = &SharedSectionPool->SectionsArray, LastArray = Array; + Array != NULL && FreeSharedSection == NULL; + Array = Array->Next) + { + LastArray = Array; + + for(SharedSection = Array->SharedSection, LastSharedSection = SharedSection + Array->nEntries; + SharedSection != LastSharedSection; + SharedSection++) + { + if(SharedSection->SectionObject == NULL) + { + FreeSharedSection = SharedSection; + break; + } + } + + if(Array->Next != NULL) + { + LastArray = Array; + } + } + + ASSERT(LastArray); + + if(FreeSharedSection == NULL) + { + ULONG nNewEntries; + PSHARED_SECTIONS_ARRAY NewArray; + + ASSERT(LastArray->Next == NULL); + + /* couldn't find a free entry in the array, extend the array */ + + nNewEntries = ((PAGE_SIZE - sizeof(SHARED_SECTIONS_ARRAY)) / sizeof(SHARED_SECTION)) + 1; + NewArray = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SHARED_SECTIONS_ARRAY) + ((nNewEntries - 1) * + sizeof(SHARED_SECTION)), + TAG_SSECTPOOL); + if(NewArray == NULL) + { + ExReleaseFastMutex(&SharedSectionPool->Lock); + DPRINT1("Failed to allocate new array for shared sections!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + NewArray->nEntries = nNewEntries; + NewArray->Next = NULL; + LastArray->Next = NewArray; + + Array = NewArray; + FreeSharedSection = &Array->SharedSection[0]; + } + + ASSERT(FreeSharedSection); + + /* now allocate a real section */ + + SectionSize.QuadPart = Size; + Status = MmCreateSection(&FreeSharedSection->SectionObject, + SECTION_ALL_ACCESS, + NULL, + &SectionSize, + PAGE_EXECUTE_READWRITE, + SEC_COMMIT, + NULL, + NULL); + if(NT_SUCCESS(Status)) + { + Status = MmMapViewInSystemSpace(FreeSharedSection->SectionObject, + &FreeSharedSection->SystemMappedBase, + &FreeSharedSection->ViewSize); + if(NT_SUCCESS(Status)) + { + (*SharedSectionSize) -= Size; + SharedSectionPool->SharedSectionCount++; + + *SystemMappedBase = FreeSharedSection->SystemMappedBase; + *SharedSectionSize = FreeSharedSection->ViewSize; + } + else + { + ObDereferenceObject(FreeSharedSection->SectionObject); + FreeSharedSection->SectionObject = NULL; + DPRINT1("Failed to map the shared section into system space! Status 0x%x\n", Status); + } + } + + ExReleaseFastMutex(&SharedSectionPool->Lock); + + return Status; +} + + +NTSTATUS INTERNAL_CALL +InUserDeleteSharedSection(PSHARED_SECTION_POOL SharedSectionPool, + PVOID SystemMappedBase) +{ + PSHARED_SECTIONS_ARRAY Array; + PSECTION_OBJECT SectionObject; + PSHARED_SECTION SharedSection, LastSharedSection; + NTSTATUS Status; + + ASSERT(SharedSectionPool && SystemMappedBase); + + SectionObject = NULL; + + ExAcquireFastMutex(&SharedSectionPool->Lock); + + for(Array = &SharedSectionPool->SectionsArray; + Array != NULL && SectionObject == NULL; + Array = Array->Next) + { + for(SharedSection = Array->SharedSection, LastSharedSection = SharedSection + Array->nEntries; + SharedSection != LastSharedSection; + SharedSection++) + { + if(SharedSection->SystemMappedBase == SystemMappedBase) + { + SectionObject = SharedSection->SectionObject; + SharedSection->SectionObject = NULL; + SharedSection->SystemMappedBase = NULL; + + ASSERT(SharedSectionPool->SharedSectionCount > 0); + SharedSectionPool->SharedSectionCount--; + break; + } + } + } + + ExReleaseFastMutex(&SharedSectionPool->Lock); + + if(SectionObject != NULL) + { + Status = MmUnmapViewInSystemSpace(SystemMappedBase); + ObDereferenceObject(SectionObject); + } + else + { + DPRINT1("Couldn't find and delete a shared section with SystemMappedBase=0x%x!\n", SystemMappedBase); + Status = STATUS_UNSUCCESSFUL; + } + + return Status; +} + + +NTSTATUS INTERNAL_CALL +IntUserMapSharedSection(IN PSHARED_SECTION_POOL SharedSectionPool, + IN PEPROCESS Process, + IN PVOID SystemMappedBase, + IN PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PVOID *UserMappedBase, + IN PULONG ViewSize OPTIONAL, + IN BOOLEAN ReadOnly) +{ + PSHARED_SECTIONS_ARRAY Array; + PSECTION_OBJECT SectionObject; + PSHARED_SECTION SharedSection, LastSharedSection; + NTSTATUS Status; + + ASSERT(SharedSectionPool && Process && SystemMappedBase && UserMappedBase); + + SectionObject = NULL; + + ExAcquireFastMutex(&SharedSectionPool->Lock); + + for(Array = &SharedSectionPool->SectionsArray; + Array != NULL && SectionObject == NULL; + Array = Array->Next) + { + for(SharedSection = Array->SharedSection, LastSharedSection = SharedSection + Array->nEntries; + SharedSection != LastSharedSection; + SharedSection++) + { + if(SharedSection->SystemMappedBase == SystemMappedBase) + { + SectionObject = SharedSection->SectionObject; + break; + } + } + } + + if(SectionObject != NULL) + { + ULONG RealViewSize = (ViewSize ? min(*ViewSize, SharedSection->ViewSize) : SharedSection->ViewSize); + + ObReferenceObjectByPointer(SectionObject, + (ReadOnly ? SECTION_MAP_READ : SECTION_MAP_READ | SECTION_MAP_WRITE), + NULL, + KernelMode); + + Status = MmMapViewOfSection(SectionObject, + Process, + UserMappedBase, + 0, + 0, + SectionOffset, + &RealViewSize, + ViewUnmap, /* not sure if we should inherit it... */ + MEM_COMMIT, + (ReadOnly ? PAGE_READONLY : PAGE_READWRITE)); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map shared section (readonly=%d) into user memory! Status: 0x%x\n", ReadOnly, Status); + } + } + else + { + DPRINT1("Couldn't find and map a shared section with SystemMappedBase=0x%x!\n", SystemMappedBase); + Status = STATUS_UNSUCCESSFUL; + } + + ExReleaseFastMutex(&SharedSectionPool->Lock); + + return Status; +} + + +NTSTATUS INTERNAL_CALL +IntUserUnMapSharedSection(IN PSHARED_SECTION_POOL SharedSectionPool, + IN PEPROCESS Process, + IN PVOID SystemMappedBase, + IN PVOID UserMappedBase) +{ + PSHARED_SECTIONS_ARRAY Array; + PSECTION_OBJECT SectionObject; + PSHARED_SECTION SharedSection, LastSharedSection; + NTSTATUS Status; + + ASSERT(SharedSectionPool && Process && SystemMappedBase && UserMappedBase); + + SectionObject = NULL; + + ExAcquireFastMutex(&SharedSectionPool->Lock); + + for(Array = &SharedSectionPool->SectionsArray; + Array != NULL && SectionObject == NULL; + Array = Array->Next) + { + for(SharedSection = Array->SharedSection, LastSharedSection = SharedSection + Array->nEntries; + SharedSection != LastSharedSection; + SharedSection++) + { + if(SharedSection->SystemMappedBase == SystemMappedBase) + { + SectionObject = SharedSection->SectionObject; + break; + } + } + } + + ExReleaseFastMutex(&SharedSectionPool->Lock); + + if(SectionObject != NULL) + { + Status = MmUnmapViewOfSection(Process, + UserMappedBase); + ObDereferenceObject(SectionObject); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Failed to unmap shared section UserMappedBase=0x%x! Status: 0x%x\n", UserMappedBase, Status); + } + } + else + { + DPRINT1("Couldn't find and unmap a shared section with SystemMappedBase=0x%x!\n", SystemMappedBase); + Status = STATUS_UNSUCCESSFUL; + } + + return Status; +} Property changes on: trunk/reactos/subsys/win32k/misc/ssec.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-02-18 01:57:32 UTC (rev 13624) @@ -131,10 +131,6 @@ Result = (DWORD)CsrInit(); break; - case NOPARAM_ROUTINE_GDI_QUERY_TABLE: - Result = (DWORD)GDI_MapHandleTable(NtCurrentProcess()); - break; - case NOPARAM_ROUTINE_MSQCLEARWAKEMASK: return (DWORD)IntMsqClearWakeMask(); _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-02-18 01:57:32 UTC (rev 13624) @@ -58,13 +58,15 @@ typedef struct _GDI_HANDLE_TABLE { + /* the table must be located at the beginning of this structure so it can be + properly mapped! */ + GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; + PPAGED_LOOKASIDE_LIST LookasideLists; SLIST_HEADER FreeEntriesHead; SLIST_ENTRY FreeEntries[((GDI_HANDLE_COUNT * sizeof(GDI_TABLE_ENTRY)) << 3) / (sizeof(SLIST_ENTRY) << 3)]; - - GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; } GDI_HANDLE_TABLE, *PGDI_HANDLE_TABLE; typedef struct @@ -125,11 +127,17 @@ GDIOBJ_iAllocHandleTable(VOID) { PGDI_HANDLE_TABLE handleTable; + ULONG htSize; UINT ObjType; UINT i; PGDI_TABLE_ENTRY Entry; - handleTable = ExAllocatePoolWithTag(NonPagedPool, sizeof(GDI_HANDLE_TABLE), TAG_GDIHNDTBLE); + handleTable = NULL; + htSize = sizeof(GDI_HANDLE_TABLE); + + IntUserCreateSharedSection(SessionSharedSectionPool, + (PVOID*)&handleTable, + &htSize); ASSERT( handleTable ); RtlZeroMemory(handleTable, sizeof(GDI_HANDLE_TABLE)); @@ -148,7 +156,8 @@ TAG_GDIHNDTBLE); if(handleTable->LookasideLists == NULL) { - ExFreePool(handleTable); + InUserDeleteSharedSection(SessionSharedSectionPool, + handleTable); return NULL; } @@ -1479,12 +1488,22 @@ } PVOID INTERNAL_CALL -GDI_MapHandleTable(HANDLE hProcess) +GDI_MapHandleTable(PEPROCESS Process) { - DPRINT("%s:%i: %s(): FIXME - Map handle table into the process memory space!\n", - __FILE__, __LINE__, __FUNCTION__); - /* FIXME - Map the entire gdi handle table read-only to userland into the - scope of hProcess and return the pointer */ + ULONG TableSize = sizeof(HandleTable->Entries); + PVOID MappedGdiTable = NULL; /* FIXME - try preferred GDI_HANDLE_TABLE_BASE_ADDRESS? */ + NTSTATUS Status = IntUserMapSharedSection(SessionSharedSectionPool, + Process, + HandleTable, + NULL, + &MappedGdiTable, + &TableSize, + TRUE); + if(NT_SUCCESS(Status)) + { + return MappedGdiTable; + } + return NULL; } _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-02-17 16:41:28 UTC (rev 13623) +++ trunk/reactos/subsys/win32k/w32k.h 2005-02-18 01:57:32 UTC (rev 13624) @@ -28,6 +28,7 @@ #include <rosrtl/string.h> #include <user32/callback.h> +#include <include/ssec.h> #include <include/accelerator.h> #include <include/callback.h> #include <include/caret.h>

1 0

[weiden] 13623: 1. object type names are stored in ntoskrnl's image (which is nonpaged memory), so there's no need to allocate and copy them to new memory
by weiden＠svn.reactos.com 17 Feb '05

17 Feb '05

1. object type names are stored in ntoskrnl's image (which is nonpaged memory), so there's no need to allocate and copy them to new memory 2. fixed PsLookupThreadByThreadId() prototype 3. renamed the process list to PsActiveProcessHead and use fast mutexes to serialize access to it Modified: trunk/reactos/include/ddk/psfuncs.h Modified: trunk/reactos/ntoskrnl/dbg/kdb.c Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/kd/gdbstub.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/include/ddk/psfuncs.h --- trunk/reactos/include/ddk/psfuncs.h 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/include/ddk/psfuncs.h 2005-02-17 16:41:28 UTC (rev 13623) @@ -403,7 +403,7 @@ OUT struct _ETHREAD **Thread); /* OUT PETHREAD *Thread); */ -NTSTATUS STDCALL PsLookupThreadByThreadId(IN PVOID ThreadId, +NTSTATUS STDCALL PsLookupThreadByThreadId(IN HANDLE ThreadId, OUT struct _ETHREAD **Thread); /* OUT PETHREAD *Thread); */ _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb.c --- trunk/reactos/ntoskrnl/dbg/kdb.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/dbg/kdb.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -862,20 +862,20 @@ ULONG DbgProcessListCommand(ULONG Argc, PCH Argv[], PKTRAP_FRAME Tf) { - extern LIST_ENTRY PsProcessListHead; + extern LIST_ENTRY PsActiveProcessHead; PLIST_ENTRY current_entry; PEPROCESS current; ULONG i = 1; - if (PsProcessListHead.Flink == NULL) + if (PsActiveProcessHead.Flink == NULL) { DbgPrint("No processes.\n"); return(1); } DbgPrint("Process list: "); - current_entry = PsProcessListHead.Flink; - while (current_entry != &PsProcessListHead) + current_entry = PsActiveProcessHead.Flink; + while (current_entry != &PsActiveProcessHead) { current = CONTAINING_RECORD(current_entry, EPROCESS, ProcessListEntry); DbgPrint("%d %.8s", current->UniqueProcessId, _____ Modified: trunk/reactos/ntoskrnl/ex/callback.c --- trunk/reactos/ntoskrnl/ex/callback.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/ex/callback.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -49,7 +49,7 @@ ExCallbackObjectType = ExAllocatePoolWithTag(NonPagedPool, sizeof(OBJECT_TYPE), CALLBACK_TAG); /* Initialize name */ - RtlRosInitUnicodeStringFromLiteral(&ExCallbackObjectType->TypeName,L"Cal lback"); + RtlInitUnicodeString(&ExCallbackObjectType->TypeName, L"Callback"); /* Create the Object Type */ ExCallbackObjectType->Tag = CALLBACK_TAG; _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -295,7 +295,7 @@ ExWindowStationObjectType->OkayToClose = NULL; ExWindowStationObjectType->Create = ExpWinStaObjectCreate; ExWindowStationObjectType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&ExWindowStationObjectType->TypeName, L"WindowStation"); + RtlInitUnicodeString(&ExWindowStationObjectType->TypeName, L"WindowStation"); ObpCreateTypeObject(ExWindowStationObjectType); @@ -325,7 +325,7 @@ ExDesktopObjectType->OkayToClose = NULL; ExDesktopObjectType->Create = ExpDesktopObjectCreate; ExDesktopObjectType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&ExDesktopObjectType->TypeName, L"Desktop"); + RtlInitUnicodeString(&ExDesktopObjectType->TypeName, L"Desktop"); ObpCreateTypeObject(ExDesktopObjectType); } _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -110,7 +110,7 @@ IoDriverObjectType->OkayToClose = NULL; IoDriverObjectType->Create = IopCreateDriver; IoDriverObjectType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&IoDriverObjectType->TypeName, L"Driver"); + RtlInitUnicodeString(&IoDriverObjectType->TypeName, L"Driver"); ObpCreateTypeObject(IoDriverObjectType); _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -410,7 +410,7 @@ IoDeviceObjectType->Create = IopCreateDevice; IoDeviceObjectType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&IoDeviceObjectType->TypeName, L"Device"); + RtlInitUnicodeString(&IoDeviceObjectType->TypeName, L"Device"); ObpCreateTypeObject(IoDeviceObjectType); @@ -439,7 +439,7 @@ IoFileObjectType->Create = IopCreateFile; IoFileObjectType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&IoFileObjectType->TypeName, L"File"); + RtlInitUnicodeString(&IoFileObjectType->TypeName, L"File"); ObpCreateTypeObject(IoFileObjectType); @@ -453,7 +453,7 @@ IoAdapterObjectType->PeakObjects = 0; IoAdapterObjectType->PeakHandles = 0; IoDeviceObjectType->Mapping = &IopFileMapping; - RtlRosInitUnicodeStringFromLiteral(&IoAdapterObjectType->TypeName, L"Adapter"); + RtlInitUnicodeString(&IoAdapterObjectType->TypeName, L"Adapter"); ObpCreateTypeObject(IoAdapterObjectType); /* _____ Modified: trunk/reactos/ntoskrnl/kd/gdbstub.c --- trunk/reactos/ntoskrnl/kd/gdbstub.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/kd/gdbstub.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -106,7 +106,7 @@ static PETHREAD GspDbgThread; static PETHREAD GspEnumThread; -extern LIST_ENTRY PsProcessListHead; +extern LIST_ENTRY PsActiveProcessHead; /* Number of Registers. */ #define NUMREGS 16 @@ -652,12 +652,14 @@ } else { - ULONG ThreadId; + ULONG uThreadId; + HANDLE ThreadId; PCHAR ptr = &Data[0]; - GspHex2Long (&ptr, (PLONG) &ThreadId); + GspHex2Long (&ptr, (PULONG) &uThreadId); + ThreadId = (HANDLE)uThreadId; - if (!NT_SUCCESS (PsLookupThreadByThreadId ((PVOID) ThreadId, &ThreadInfo))) + if (!NT_SUCCESS (PsLookupThreadByThreadId (ThreadId, &ThreadInfo))) { *Thread = NULL; return FALSE; @@ -745,8 +747,8 @@ /* Get first thread id */ GspEnumThread = NULL; - AProcess = PsProcessListHead.Flink; - while(AProcess != &PsProcessListHead) + AProcess = PsActiveProcessHead.Flink; + while(AProcess != &PsActiveProcessHead) { Process = CONTAINING_RECORD(AProcess, EPROCESS, ProcessListEntry); AThread = Process->ThreadListHead.Flink; @@ -791,7 +793,7 @@ { PETHREAD Thread = NULL; AProcess = Process->ProcessListEntry.Flink; - while(AProcess != &PsProcessListHead) + while(AProcess != &PsActiveProcessHead) { Process = CONTAINING_RECORD(AProcess, EPROCESS, ProcessListEntry); AThread = Process->ThreadListHead.Flink; _____ Modified: trunk/reactos/ntoskrnl/lpc/port.c --- trunk/reactos/ntoskrnl/lpc/port.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/lpc/port.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -33,11 +33,11 @@ NTSTATUS INIT_FUNCTION LpcpInitSystem (VOID) { - /* Allocate Memory for the LPC Object */ - LpcPortObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlZeroMemory (LpcPortObjectType, sizeof (OBJECT_TYPE)); + /* Allocate Memory for the LPC Object */ + LpcPortObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + RtlZeroMemory (LpcPortObjectType, sizeof (OBJECT_TYPE)); - RtlRosInitUnicodeStringFromLiteral(&LpcPortObjectType->TypeName,L"Port") ; + RtlInitUnicodeString(&LpcPortObjectType->TypeName,L"Port"); LpcPortObjectType->Tag = TAG('L', 'P', 'R', 'T'); LpcPortObjectType->PeakObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -2127,7 +2127,7 @@ { MmSectionObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlRosInitUnicodeStringFromLiteral(&MmSectionObjectType->TypeName, L"Section"); + RtlInitUnicodeString(&MmSectionObjectType->TypeName, L"Section"); MmSectionObjectType->Tag = TAG('S', 'E', 'C', 'T'); MmSectionObjectType->TotalObjects = 0; _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -391,7 +391,7 @@ ObDirectoryType->Create = ObpCreateDirectory; ObDirectoryType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&ObDirectoryType->TypeName, + RtlInitUnicodeString(&ObDirectoryType->TypeName, L"Directory"); /* create 'type' object type*/ @@ -416,7 +416,7 @@ ObTypeObjectType->Create = NULL; ObTypeObjectType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&ObTypeObjectType->TypeName, + RtlInitUnicodeString(&ObTypeObjectType->TypeName, L"ObjectType"); /* Create security descriptor */ _____ Modified: trunk/reactos/ntoskrnl/ob/symlink.c --- trunk/reactos/ntoskrnl/ob/symlink.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/ob/symlink.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -180,8 +180,8 @@ ObSymbolicLinkType->Create = ObpCreateSymbolicLink; ObSymbolicLinkType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&ObSymbolicLinkType->TypeName, - L"SymbolicLink"); + RtlInitUnicodeString(&ObSymbolicLinkType->TypeName, + L"SymbolicLink"); ObpCreateTypeObject(ObSymbolicLinkType); } _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -1,11 +1,12 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ps/job.c * PURPOSE: Job Native Functions * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) (stubs) + * Thomas Weidenmueller <w3seek(a)reactos.com> */ /* Note: Jobs are only supported on Win2K+ */ @@ -74,7 +75,7 @@ PsJobType->Create = NULL; PsJobType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&PsJobType->TypeName, L"Job"); + RtlInitUnicodeString(&PsJobType->TypeName, L"Job"); ObpCreateTypeObject(PsJobType); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -20,8 +20,8 @@ POBJECT_TYPE EXPORTED PsProcessType = NULL; -LIST_ENTRY PsProcessListHead; -static KSPIN_LOCK PsProcessListLock; +LIST_ENTRY PsActiveProcessHead; +FAST_MUTEX PspActiveProcessMutex; static LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; static GENERIC_MAPPING PiProcessMapping = {STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, @@ -101,7 +101,6 @@ PEPROCESS PsGetNextProcess(PEPROCESS OldProcess) { - KIRQL oldIrql; PEPROCESS NextProcess; NTSTATUS Status; @@ -119,13 +118,13 @@ return PsInitialSystemProcess; } - KeAcquireSpinLock(&PsProcessListLock, &oldIrql); + ExAcquireFastMutex(&PspActiveProcessMutex); NextProcess = OldProcess; while (1) { - if (NextProcess->ProcessListEntry.Blink == &PsProcessListHead) + if (NextProcess->ProcessListEntry.Blink == &PsActiveProcessHead) { - NextProcess = CONTAINING_RECORD(PsProcessListHead.Blink, + NextProcess = CONTAINING_RECORD(PsActiveProcessHead.Blink, EPROCESS, ProcessListEntry); } @@ -154,7 +153,7 @@ } } - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); ObDereferenceObject(OldProcess); return(NextProcess); @@ -281,14 +280,13 @@ VOID PiKillMostProcesses(VOID) { - KIRQL oldIrql; PLIST_ENTRY current_entry; PEPROCESS current; - KeAcquireSpinLock(&PsProcessListLock, &oldIrql); + ExAcquireFastMutex(&PspActiveProcessMutex); - current_entry = PsProcessListHead.Flink; - while (current_entry != &PsProcessListHead) + current_entry = PsActiveProcessHead.Flink; + while (current_entry != &PsActiveProcessHead) { current = CONTAINING_RECORD(current_entry, EPROCESS, ProcessListEntry); @@ -301,7 +299,7 @@ } } - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); } @@ -309,7 +307,6 @@ PsInitProcessManagment(VOID) { PKPROCESS KProcess; - KIRQL oldIrql; NTSTATUS Status; ShortPsLockDelay.QuadPart = -100LL; @@ -339,12 +336,12 @@ PsProcessType->Create = NULL; PsProcessType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&PsProcessType->TypeName, L"Process"); + RtlInitUnicodeString(&PsProcessType->TypeName, L"Process"); ObpCreateTypeObject(PsProcessType); - InitializeListHead(&PsProcessListHead); - KeInitializeSpinLock(&PsProcessListLock); + InitializeListHead(&PsActiveProcessHead); + ExInitializeFastMutex(&PspActiveProcessMutex); RtlZeroMemory(PiProcessNotifyRoutine, sizeof(PiProcessNotifyRoutine)); RtlZeroMemory(PiLoadImageNotifyRoutine, sizeof(PiLoadImageNotifyRoutine)); @@ -412,11 +409,9 @@ PsInitialSystemProcess->Win32WindowStation = (HANDLE)0; - KeAcquireSpinLock(&PsProcessListLock, &oldIrql); - InsertHeadList(&PsProcessListHead, + InsertHeadList(&PsActiveProcessHead, &PsInitialSystemProcess->ProcessListEntry); InitializeListHead(&PsInitialSystemProcess->ThreadListHead); - KeReleaseSpinLock(&PsProcessListLock, oldIrql); SepCreateSystemProcessToken(PsInitialSystemProcess); } @@ -424,7 +419,6 @@ VOID STDCALL PiDeleteProcessWorker(PVOID pContext) { - KIRQL oldIrql; PDEL_CONTEXT Context; PEPROCESS CurrentProcess; PEPROCESS Process; @@ -440,9 +434,9 @@ KeAttachProcess(&Process->Pcb); } - KeAcquireSpinLock(&PsProcessListLock, &oldIrql); + ExAcquireFastMutex(&PspActiveProcessMutex); RemoveEntryList(&Process->ProcessListEntry); - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); /* KDB hook */ KDB_DELETEPROCESS_HOOK(Process); @@ -657,7 +651,6 @@ PEPROCESS Process; PEPROCESS pParentProcess; PKPROCESS KProcess; - KIRQL oldIrql; PVOID LdrStartupAddr; PVOID BaseAddress; PMEMORY_AREA MemoryArea; @@ -863,10 +856,10 @@ Process->Win32WindowStation = (HANDLE)0; - KeAcquireSpinLock(&PsProcessListLock, &oldIrql); - InsertHeadList(&PsProcessListHead, &Process->ProcessListEntry); + ExAcquireFastMutex(&PspActiveProcessMutex); + InsertHeadList(&PsActiveProcessHead, &Process->ProcessListEntry); InitializeListHead(&Process->ThreadListHead); - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); ExInitializeFastMutex(&Process->TebLock); Process->Pcb.State = PROCESS_STATE_ACTIVE; @@ -1261,14 +1254,13 @@ } else { - KIRQL oldIrql; PLIST_ENTRY current_entry; PEPROCESS current; NTSTATUS Status; - KeAcquireSpinLock(&PsProcessListLock, &oldIrql); - current_entry = PsProcessListHead.Flink; - while (current_entry != &PsProcessListHead) + ExAcquireFastMutex(&PspActiveProcessMutex); + current_entry = PsActiveProcessHead.Flink; + while (current_entry != &PsActiveProcessHead) { current = CONTAINING_RECORD(current_entry, EPROCESS, ProcessListEntry); @@ -1285,7 +1277,7 @@ PsProcessType, UserMode); } - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); if (NT_SUCCESS(Status)) { Status = ObCreateHandle(PsGetCurrentProcess(), @@ -1301,7 +1293,7 @@ } current_entry = current_entry->Flink; } - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); DPRINT("NtOpenProcess() = STATUS_UNSUCCESSFUL\n"); return(STATUS_UNSUCCESSFUL); } @@ -2093,6 +2085,27 @@ } break; } + + case ProcessPriorityClass: + { + PROCESS_PRIORITY_CLASS ppc; + + _SEH_TRY + { + ppc = *(PPROCESS_PRIORITY_CLASS)ProcessInformation; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + } + + break; + } case ProcessLdtInformation: case ProcessLdtSize: @@ -2100,7 +2113,6 @@ case ProcessWorkingSetWatch: case ProcessUserModeIOPL: case ProcessEnableAlignmentFaultFixup: - case ProcessPriorityClass: case ProcessAffinityMask: Status = STATUS_NOT_IMPLEMENTED; break; @@ -2143,7 +2155,6 @@ return STATUS_NOT_IMPLEMENTED; #if 0 - KIRQL OldIrql; PLIST_ENTRY CurrentEntryP; PEPROCESS CurrentP; PLIST_ENTRY CurrentEntryT; @@ -2160,16 +2171,15 @@ /* Lock the process list. */ - KeAcquireSpinLock(&PsProcessListLock, - &OldIrql); + ExAcquireFastMutex(&PspActiveProcessMutex); /* * Scan the process list. Since the * list is circular, the guard is false * after the last process. */ - for ( CurrentEntryP = PsProcessListHead.Flink; - (CurrentEntryP != & PsProcessListHead); + for ( CurrentEntryP = PsActiveProcessHead.Flink; + (CurrentEntryP != & PsActiveProcessHead); CurrentEntryP = CurrentEntryP->Flink ) { @@ -2305,9 +2315,8 @@ /* * Unlock the process list. */ - KeReleaseSpinLock ( - & PsProcessListLock, - OldIrql + ExReleaseFastMutex ( + & PspActiveProcessMutex ); /* * Return the proper error status code, @@ -2541,14 +2550,13 @@ PsLookupProcessByProcessId(IN HANDLE ProcessId, OUT PEPROCESS *Process) { - KIRQL oldIrql; PLIST_ENTRY current_entry; PEPROCESS current; - KeAcquireSpinLock(&PsProcessListLock, &oldIrql); + ExAcquireFastMutex(&PspActiveProcessMutex); - current_entry = PsProcessListHead.Flink; - while (current_entry != &PsProcessListHead) + current_entry = PsActiveProcessHead.Flink; + while (current_entry != &PsActiveProcessHead) { current = CONTAINING_RECORD(current_entry, EPROCESS, @@ -2557,13 +2565,13 @@ { *Process = current; ObReferenceObject(current); - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); return(STATUS_SUCCESS); } current_entry = current_entry->Flink; } - KeReleaseSpinLock(&PsProcessListLock, oldIrql); + ExReleaseFastMutex(&PspActiveProcessMutex); return(STATUS_INVALID_PARAMETER); } _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -27,7 +27,7 @@ /* GLOBALS ******************************************************************/ -extern LIST_ENTRY PsProcessListHead; +extern LIST_ENTRY PsActiveProcessHead; POBJECT_TYPE EXPORTED PsThreadType = NULL; @@ -287,8 +287,8 @@ PETHREAD Thread; ULONG nThreads = 0; - AProcess = PsProcessListHead.Flink; - while(AProcess != &PsProcessListHead) + AProcess = PsActiveProcessHead.Flink; + while(AProcess != &PsActiveProcessHead) { Process = CONTAINING_RECORD(AProcess, EPROCESS, ProcessListEntry); /* FIXME - skip suspended, ... processes? */ @@ -767,7 +767,7 @@ PsThreadType->Create = NULL; PsThreadType->DuplicationNotify = NULL; - RtlRosInitUnicodeStringFromLiteral(&PsThreadType->TypeName, L"Thread"); + RtlInitUnicodeString(&PsThreadType->TypeName, L"Thread"); ObpCreateTypeObject(PsThreadType); @@ -1088,12 +1088,12 @@ * @implemented */ NTSTATUS STDCALL -PsLookupThreadByThreadId(IN PVOID ThreadId, +PsLookupThreadByThreadId(IN HANDLE ThreadId, OUT PETHREAD *Thread) { PCID_OBJECT CidObject; - CidObject = PsLockCidHandle((HANDLE)ThreadId, PsThreadType); + CidObject = PsLockCidHandle(ThreadId, PsThreadType); if(CidObject != NULL) { *Thread = CidObject->Obj.Thread; _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -1138,7 +1138,7 @@ return 0; } - Status = PsLookupThreadByThreadId((PVOID)dwThreadId, &Thread); + Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); if(!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -460,7 +460,7 @@ } Mod = NULL; Global = FALSE; - if (! NT_SUCCESS(PsLookupThreadByThreadId((PVOID) ThreadId, &Thread))) + if (! NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread))) { DPRINT1("Invalid thread id 0x%x\n", ThreadId); SetLastWin32Error(ERROR_INVALID_PARAMETER); _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -1173,7 +1173,7 @@ NTSTATUS Status; PMSGMEMORY MsgMemoryEntry; - Status = PsLookupThreadByThreadId((void *)idThread,&peThread); + Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); if( Status == STATUS_SUCCESS ) { pThread = peThread->Tcb.Win32Thread; _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -1179,7 +1179,7 @@ if(idThread) { - Status = PsLookupThreadByThreadId((PVOID)idThread, &Thread); + Status = PsLookupThreadByThreadId((HANDLE)idThread, &Thread); if(!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_ACCESS_DENIED); _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-02-17 16:41:28 UTC (rev 13623) @@ -1164,7 +1164,7 @@ PLIST_ENTRY Current; PWINDOW_OBJECT Window; - Status = PsLookupThreadByThreadId((PVOID)dwThreadId, &Thread); + Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); if(!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-02-17 15:11:36 UTC (rev 13622) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-02-17 16:41:28 UTC (rev 13623) @@ -3306,7 +3306,7 @@ NTSTATUS NTAPI PsLookupThreadByThreadId ( - IN PVOID UniqueThreadId, + IN HANDLE UniqueThreadId, OUT PETHREAD *Thread );

1 0

[weiden] 13622: declare NtTerminateThread()
by weiden＠svn.reactos.com 17 Feb '05

17 Feb '05

declare NtTerminateThread() Modified: trunk/reactos/w32api/include/ddk/ntapi.h _____ Modified: trunk/reactos/w32api/include/ddk/ntapi.h --- trunk/reactos/w32api/include/ddk/ntapi.h 2005-02-17 15:10:55 UTC (rev 13621) +++ trunk/reactos/w32api/include/ddk/ntapi.h 2005-02-17 15:11:36 UTC (rev 13622) @@ -1266,6 +1266,13 @@ NTOSAPI NTSTATUS NTAPI +NtTerminateThread( + IN HANDLE ThreadHandle OPTIONAL, + IN NTSTATUS ExitStatus); + +NTOSAPI +NTSTATUS +NTAPI NtQueryInformationThread( IN HANDLE ThreadHandle, IN THREADINFOCLASS ThreadInformationClass,

1 0

[weiden] 13621: fixed includes
by weiden＠svn.reactos.com 17 Feb '05

17 Feb '05

fixed includes Modified: trunk/reactos/subsys/system/lsass/lsass.c _____ Modified: trunk/reactos/subsys/system/lsass/lsass.c --- trunk/reactos/subsys/system/lsass/lsass.c 2005-02-17 14:35:47 UTC (rev 13620) +++ trunk/reactos/subsys/system/lsass/lsass.c 2005-02-17 15:10:55 UTC (rev 13621) @@ -26,8 +26,8 @@ * 19990704 (Emanuele Aliberti) * Compiled successfully with egcs 1.1.2 */ -//#include <ddk/ntddk.h> -//#include <windows.h> +#include <ddk/ntddk.h> +#include <windows.h> #include <ddk/ntapi.h> #include <lsass/lsasrv.h>

1 0

[gdalsnes] 13620: add missing include
by gdalsnes＠svn.reactos.com 17 Feb '05

17 Feb '05

add missing include Modified: trunk/reactos/subsys/system/services/services.c _____ Modified: trunk/reactos/subsys/system/services/services.c --- trunk/reactos/subsys/system/services/services.c 2005-02-17 14:06:19 UTC (rev 13619) +++ trunk/reactos/subsys/system/services/services.c 2005-02-17 14:35:47 UTC (rev 13620) @@ -32,6 +32,7 @@ #define NTOS_MODE_USER #include <ntos.h> #include <stdio.h> +#include <tchar.h> #include <windows.h> #include "services.h"

1 0

[gdalsnes] 13619: _T should not be defined here
by gdalsnes＠svn.reactos.com 17 Feb '05

17 Feb '05

_T should not be defined here Modified: trunk/reactos/include/base.h _____ Modified: trunk/reactos/include/base.h --- trunk/reactos/include/base.h 2005-02-17 12:46:56 UTC (rev 13618) +++ trunk/reactos/include/base.h 2005-02-17 14:06:19 UTC (rev 13619) @@ -412,16 +412,10 @@ #ifndef _DISABLE_TIDENTS # ifdef UNICODE -# ifndef _T -# define _T(quote) L##quote -# endif /* _T */ # ifndef _TEXT # define TEXT(quote) L##quote # endif /* _TEXT */ # else /* UNICODE */ -# ifndef _T -# define _T(quote) quote -# endif /* _T */ # ifndef _TEXT # define TEXT(quote) quote # endif /* _TEXT */

1 0

[ekohl] 13618: Build lsass.exe.
by ekohl＠svn.reactos.com 17 Feb '05

17 Feb '05

Build lsass.exe. Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-17 12:45:13 UTC (rev 13617) +++ trunk/reactos/Makefile 2005-02-17 12:46:56 UTC (rev 13618) @@ -105,7 +105,7 @@ # autochk cmd format services setup usetup welcome winlogon msiexec SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regedt32 regsvr32 \ reporterror services setup taskmgr userinit usetup welcome vmwinst \ - winlogon regedit winefile notepad reactos + winlogon regedit winefile notepad reactos lsass # System services SYS_SVC = rpcss eventlog umpnpmgr

1 0

[ekohl] 13617: - Make lsass.exe a win32 application.
by ekohl＠svn.reactos.com 17 Feb '05

17 Feb '05

- Make lsass.exe a win32 application. - Load and initialize lsasrv.dll. Deleted: trunk/reactos/subsys/system/lsass/init.c Deleted: trunk/reactos/subsys/system/lsass/lsasrv.def Modified: trunk/reactos/subsys/system/lsass/lsass.c Modified: trunk/reactos/subsys/system/lsass/makefile _____ Deleted: trunk/reactos/subsys/system/lsass/init.c --- trunk/reactos/subsys/system/lsass/init.c 2005-02-17 12:18:10 UTC (rev 13616) +++ trunk/reactos/subsys/system/lsass/init.c 2005-02-17 12:45:13 UTC (rev 13617) @@ -1,43 +0,0 @@ -/* $Id$ - * - * init.c - Local Security Manager Initialization - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * 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. - * - * -------------------------------------------------------------------- - * - * 19990704 (Emanuele Aliberti) - * Compiled successfully with egcs 1.1.2 - */ -#include <ddk/ntddk.h> - -BOOL -InitLsa( - HANDLE Children[] - ) -{ - /* FIXME: create the \SeLsaCommandPort LPC port */ - /* FIXME: create the \LsaAuthenticationPort LPC port */ - return TRUE; -} - - -/* EOF */ - _____ Deleted: trunk/reactos/subsys/system/lsass/lsasrv.def --- trunk/reactos/subsys/system/lsass/lsasrv.def 2005-02-17 12:18:10 UTC (rev 13616) +++ trunk/reactos/subsys/system/lsass/lsasrv.def 2005-02-17 12:45:13 UTC (rev 13617) @@ -1,68 +0,0 @@ -; $Id$ -LIBRARY lsasrv -EXPORTS -LsaIAuditNotifyPackageLoad -LsaIAuditSamEvent -LsaIEnumerateSecrets -LsaIFree_LSAI_PRIVATE_DATA -LsaIFree_LSAI_SECRET_ENUM_BUFFER -LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER -LsaIFree_LSAPR_CR_CIPHER_VALUE -LsaIFree_LSAPR_POLICY_INFORMATION -LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER -LsaIFree_LSAPR_PRIVILEGE_SET -LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST -LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR -LsaIFree_LSAPR_TRANSLATED_NAMES -LsaIFree_LSAPR_TRANSLATED_SIDS -LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO -LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER -LsaIFree_LSAPR_TRUST_INFORMATION -LsaIFree_LSAPR_UNICODE_STRING -LsaIGetPrivateData -LsaIGetSerialNumberPolicy -LsaIGetSerialNumberPolicy2 -LsaIHealthCheck -LsaIInitializeWellKnownSids -LsaIOpenPolicyTrusted -LsaIQueryInformationPolicyTrusted -LsaISetPrivateData -LsaISetSerialNumberPolicy -LsaISetTimesSecret -LsaISetupWasRun -LsapAuOpenSam -LsapInitLsa -LsarAddPrivilegesToAccount -LsarClose -LsarCreateAccount -LsarCreateSecret -LsarCreateTrustedDomain -LsarDelete -LsarEnumerateAccounts -LsarEnumeratePrivileges -LsarEnumeratePrivilegesAccount -LsarEnumerateTrustedDomains -LsarGetQuotasForAccount -LsarGetSystemAccessAccount -LsarLookupNames -LsarLookupPrivilegeDisplayName -LsarLookupPrivilegeName -LsarLookupPrivilegeValue -LsarLookupSids -LsarOpenAccount -LsarOpenPolicy -LsarOpenSecret -LsarOpenTrustedDomain -LsarQueryInfoTrustedDomain -LsarQueryInformationPolicy -LsarQuerySecret -LsarQuerySecurityObject -LsarRemovePrivilegesFromAccount -LsarSetInformationPolicy -LsarSetInformationTrustedDomain -LsarSetQuotasForAccount -LsarSetSecret -LsarSetSecurityObject -LsarSetSystemAccessAccount -ServiceInit - _____ Modified: trunk/reactos/subsys/system/lsass/lsass.c --- trunk/reactos/subsys/system/lsass/lsass.c 2005-02-17 12:18:10 UTC (rev 13616) +++ trunk/reactos/subsys/system/lsass/lsass.c 2005-02-17 12:45:13 UTC (rev 13617) @@ -1,6 +1,6 @@ /* $Id$ * - * reactos/services/lsass/lsass.c + * reactos/subsys/system/lsass/lsass.c * * ReactOS Operating System * @@ -26,47 +26,39 @@ * 19990704 (Emanuele Aliberti) * Compiled successfully with egcs 1.1.2 */ -#include <ddk/ntddk.h> -#include <wchar.h> +//#include <ddk/ntddk.h> +//#include <windows.h> +#include <ddk/ntapi.h> +#include <lsass/lsasrv.h> -BOOL InitLsa(VOID); /* ./init.c */ +#define NDEBUG +#include <debug.h> -void -DisplayString( LPCWSTR lpwString ) +int STDCALL +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nShowCmd) { - UNICODE_STRING us; + NTSTATUS Status = STATUS_SUCCESS; - us.Buffer = (LPWSTR) lpwString; - us.Length = wcslen(lpwString) * sizeof (WCHAR); - us.MaximumLength = us.Length + sizeof (WCHAR); - NtDisplayString( & us ); -} + DPRINT("Local Security Authority Subsystem\n"); + DPRINT(" Initializing...\n"); + Status = LsapInitLsa(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsapInitLsa() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } -/* Native image's entry point */ + /* FIXME: More initialization */ -VOID STDCALL -NtProcessStartup(PPEB Peb) -{ - DisplayString( L"Local Security Authority Subsystem:\n" ); - DisplayString( L"\tInitializing...\n" ); +ByeBye: + NtTerminateThread(NtCurrentThread(), Status); - if (TRUE == InitLsa()) - { - DisplayString( L"\tInitialization OK\n" ); - /* FIXME: do nothing loop */ - while (TRUE) - { - NtYieldExecution(); - } - } - else - { - DisplayString( L"\tInitialization failed!\n" ); - } - NtTerminateProcess( NtCurrentProcess(), 0 ); + return 0; } - /* EOF */ _____ Modified: trunk/reactos/subsys/system/lsass/makefile --- trunk/reactos/subsys/system/lsass/makefile 2005-02-17 12:18:10 UTC (rev 13616) +++ trunk/reactos/subsys/system/lsass/makefile 2005-02-17 12:45:13 UTC (rev 13617) @@ -4,14 +4,18 @@ TARGET_TYPE = program -TARGET_APPTYPE = native +TARGET_APPTYPE = windows TARGET_NAME = lsass TARGET_INSTALLDIR = system32 -TARGET_OBJECTS = $(TARGET_NAME).o init.o +TARGET_CFLAGS += -Wall -Werror -D__USE_W32API +TARGET_OBJECTS = lsass.o + +TARGET_SDKLIBS = ntdll.a kernel32.a lsasrv.a + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
42
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005