Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[gedmurphy] 23597: match up taskmgr with current icon theme
by gedmurphy＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: gedmurphy Date: Thu Aug 17 23:11:17 2006 New Revision: 23597 URL: http://svn.reactos.org/svn/reactos?rev=23597&view=rev Log: match up taskmgr with current icon theme Modified: trunk/reactos/base/applications/taskmgr/res/taskmgr.ico Modified: trunk/reactos/base/applications/taskmgr/res/taskmgr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== Binary files - no diff available.

1 0

[gedmurphy] 23596: Don't allow ws2_32 access to apps with bad setup data (commit correct version this time)
by gedmurphy＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: gedmurphy Date: Thu Aug 17 20:48:36 2006 New Revision: 23596 URL: http://svn.reactos.org/svn/reactos?rev=23596&view=rev Log: Don't allow ws2_32 access to apps with bad setup data (commit correct version this time) Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h (original) +++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h Thu Aug 17 20:48:36 2006 @@ -28,6 +28,7 @@ #define EXPORT STDCALL +extern HINSTANCE g_hInstDll; extern HANDLE GlobalHeap; extern BOOL WsaInitialized; /* TRUE if WSAStartup() has been successfully called */ extern WSPUPCALLTABLE UpcallTable; Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Thu Aug 17 20:48:36 2006 @@ -27,7 +27,7 @@ /* To make the linker happy */ VOID STDCALL KeBugCheck (ULONG BugCheckCode) {} - +HINSTANCE g_hInstDll; HANDLE GlobalHeap; BOOL WsaInitialized = FALSE; /* TRUE if WSAStartup() has been successfully called */ WSPUPCALLTABLE UpcallTable; @@ -86,8 +86,8 @@ if (lpWSAData == NULL) return WSAEFAULT; - Low = LOWBYTE(wVersionRequested); - High = HIGHBYTE(wVersionRequested); + Low = LOBYTE(wVersionRequested); + High = HIBYTE(wVersionRequested); if (Low < 1) { @@ -841,6 +841,8 @@ { GlobalHeap = GetProcessHeap(); + g_hInstDll = hInstDll; + CreateCatalog(); InitProviderHandleTable();

1 0

[gedmurphy] 23595: Don't allow ws2_32 access to apps with bad setup data
by gedmurphy＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: gedmurphy Date: Thu Aug 17 20:44:54 2006 New Revision: 23595 URL: http://svn.reactos.org/svn/reactos?rev=23595&view=rev Log: Don't allow ws2_32 access to apps with bad setup data Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Thu Aug 17 20:44:54 2006 @@ -76,15 +76,61 @@ WSAStartup(IN WORD wVersionRequested, OUT LPWSADATA lpWSAData) { + BYTE Low, High; + WS_DbgPrint(MAX_TRACE, ("WSAStartup of ws2_32.dll\n")); + if (!g_hInstDll) + return WSASYSNOTREADY; + + if (lpWSAData == NULL) + return WSAEFAULT; + + Low = LOWBYTE(wVersionRequested); + High = HIGHBYTE(wVersionRequested); + + if (Low < 1) + { + WS_DbgPrint(MAX_TRACE, ("Bad winsock version requested, %d,%d", Low, High)); + return WSAVERNOTSUPPORTED; + } + + if (Low == 1) + { + if (High == 0) + { + lpWSAData->wVersion = wVersionRequested; + } + else + { + lpWSAData->wVersion = MAKEWORD(1, 1); + } + } + else if (Low == 2) + { + if (High <= 2) + { + lpWSAData->wVersion = MAKEWORD(2, High); + } + else + { + lpWSAData->wVersion = MAKEWORD(2, 2); + } + } + else + { + lpWSAData->wVersion = MAKEWORD(2, 2); + } + lpWSAData->wVersion = wVersionRequested; - lpWSAData->wHighVersion = 2; - lstrcpyA(lpWSAData->szDescription, "WinSock 2.0"); + lpWSAData->wHighVersion = MAKEWORD(2,2); + lstrcpyA(lpWSAData->szDescription, "WinSock 2.2"); lstrcpyA(lpWSAData->szSystemStatus, "Running"); lpWSAData->iMaxSockets = 0; lpWSAData->iMaxUdpDg = 0; lpWSAData->lpVendorInfo = NULL; + + /*FIXME: increment internal counter */ WSASETINITIALIZED;

1 0

[ion] 23594: - Fix CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK and CMP_ASSERT_REGISTRY_LOCK - Create cmutil.c and add registry lock routines in it, as well as CmpAllocateDelayItem and CmpFreeDelayItem (move them out from cmkcbncb.c) - Implement CmpCompareCompressedName.
by ion＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: ion Date: Thu Aug 17 05:54:33 2006 New Revision: 23594 URL: http://svn.reactos.org/svn/reactos?rev=23594&view=rev Log: - Fix CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK and CMP_ASSERT_REGISTRY_LOCK - Create cmutil.c and add registry lock routines in it, as well as CmpAllocateDelayItem and CmpFreeDelayItem (move them out from cmkcbncb.c) - Implement CmpCompareCompressedName. Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Thu Aug 17 05:54:33 2006 @@ -569,12 +569,24 @@ ); // -// Registry Locking Functions +// Registry Utility Functions // BOOLEAN NTAPI CmpTestRegistryLockExclusive( VOID +); + +PVOID +NTAPI +CmpAllocateDelayItem( + VOID +); + +VOID +NTAPI +CmpFreeDelayItem( + PVOID Entry ); // @@ -588,8 +600,22 @@ ); // +// Name Functions +// +LONG +NTAPI +CmpCompareCompressedName( + IN PUNICODE_STRING SearchName, + IN PWCHAR CompressedName, + IN ULONG NameLength +); + +// // Global variables accessible from all of Cm // +extern BOOLEAN CmpSpecialBootCondition; +extern BOOLEAN CmpFlushOnLockRelease; + // // Inlined functions Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Thu Aug 17 05:54:33 2006 @@ -41,14 +41,14 @@ // // Makes sure that the registry is locked // -#define CMP_ASSERT_REGISTRY_LOCK \ +#define CMP_ASSERT_REGISTRY_LOCK() \ ASSERT((CmpSpecialBootCondition == TRUE) || \ (CmpTestRegistryLock() == TRUE)) // // Makes sure that the registry is exclusively locked // -#define CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK \ +#define CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK() \ ASSERT((CmpSpecialBootCondition == TRUE) || \ (CmpTestRegistryLockExclusive() == TRUE)) Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt Thu Aug 17 05:54:33 2006 @@ -107,6 +107,8 @@ paths. cmobject.c - Contains the implementation of the key object that is exported to the Object Manager. +cmutil.c - Contains utility functions such as the registry lock and delayed + item allocation and de-allocation routines. ntapi.c - Contains the Nt APIs exported to drivers and user-mode, which wrap around other internal APIs in this module (mostly cmapi.c). Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Thu Aug 17 05:54:33 2006 @@ -17,15 +17,14 @@ ULONG CmpHashTableSize; PCM_KEY_HASH_TABLE_ENTRY *CmpCacheTable; PCM_NAME_HASH_TABLE_ENTRY *CmpNameCacheTable; +LIST_ENTRY CmpFreeKCBListHead; BOOLEAN CmpAllocInited; -KGUARDED_MUTEX CmpAllocBucketLock, CmpDelayAllocBucketLock; -LIST_ENTRY CmpFreeKCBListHead; +KGUARDED_MUTEX CmpAllocBucketLock; ULONG CmpDelayedCloseSize; ULONG CmpDelayedCloseElements; KGUARDED_MUTEX CmpDelayedCloseTableLock; BOOLEAN CmpDelayCloseWorkItemActive; LIST_ENTRY CmpDelayedLRUListHead; -LIST_ENTRY CmpFreeDelayItemsListHead; ULONG CmpDelayCloseIntervalInSeconds = 5; KDPC CmpDelayCloseDpc; KTIMER CmpDelayCloseTimer; @@ -201,6 +200,9 @@ /* Go to the next hash */ HashEntry = HashEntry->NextHash; } + + /* Return the NCB found */ + return Ncb; } BOOLEAN @@ -320,46 +322,6 @@ /* Release the lock */ CmpReleaseNcbLock(Ncb); -} - -VOID -NTAPI -CmpFreeDelayItem(PVOID Entry) -{ - PCM_DELAYED_CLOSE_ENTRY AllocEntry = (PCM_DELAYED_CLOSE_ENTRY)Entry; - PCM_DELAYED_CLOSE_ENTRY *AllocTable; - PCM_ALLOC_PAGE AllocPage; - ULONG i; - PAGED_CODE(); - - /* Lock the table */ - KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - - /* Add the entry at the end */ - InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->DelayedLRUList); - - /* Get the alloc page */ - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - ASSERT(AllocPage->FreeCount != CM_DELAYS_PER_PAGE); - - /* Increase the number of free items */ - if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) - { - /* Page is totally free now, loop each entry */ - AllocTable = (PCM_DELAYED_CLOSE_ENTRY*)&AllocPage->AllocPage; - for (i = CM_DELAYS_PER_PAGE; i; i--) - { - /* Get the entry and unlink it */ - AllocEntry = AllocTable[i]; - RemoveEntryList(&AllocEntry->DelayedLRUList); - } - - /* Now free the page */ - ExFreePool(AllocPage); - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); } VOID @@ -487,58 +449,6 @@ /* Return success */ return TRUE; -} - -// FIXME: THIS FUNCTION IS PARTIALLY FUCKED -PVOID -NTAPI -CmpAllocateDelayItem(VOID) -{ - PCM_DELAYED_CLOSE_ENTRY Entry; - PCM_ALLOC_PAGE AllocPage; - ULONG i; - PLIST_ENTRY NextEntry; - PAGED_CODE(); - - /* Lock the allocation buckets */ - KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - if (TRUE) - { - /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); - if (AllocPage) - { - /* Set default entries */ - AllocPage->FreeCount = CM_DELAYS_PER_PAGE; - - /* Loop each entry */ - for (i = 0; i < CM_DELAYS_PER_PAGE; i++) - { - /* Get this entry and link it */ - Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); - InsertHeadList(&Entry->DelayedLRUList, - &CmpFreeDelayItemsListHead); - } - } - - /* Get the entry and the alloc page */ - Entry = CONTAINING_RECORD(NextEntry, - CM_DELAYED_CLOSE_ENTRY, - DelayedLRUList); - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - - /* Decrease free entries */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; } VOID Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c Thu Aug 17 05:54:33 2006 @@ -14,3 +14,37 @@ /* FUNCTIONS *****************************************************************/ +LONG +NTAPI +CmpCompareCompressedName(IN PUNICODE_STRING SearchName, + IN PWCHAR CompressedName, + IN ULONG NameLength) +{ + WCHAR *p, *pp; + WCHAR p1, p2; + USHORT SearchLength; + LONG Result; + + /* Set the pointers and length and then loop */ + p = SearchName->Buffer; + pp = CompressedName; + SearchLength = (SearchName->Length / sizeof(WCHAR)); + while (SearchLength && NameLength) + { + /* Get the characters */ + p1 = *p++; + p2 = *pp++; + + /* See if they match and return result if they don't */ + Result = (LONG)RtlUpcaseUnicodeChar(p1) - + (LONG)RtlUpcaseUnicodeChar(p2); + if (Result) return Result; + + /* Next chars */ + SearchLength--; + NameLength--; + } + + /* Return the difference directly */ + return SearchLength - NameLength; +} Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c (added) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Thu Aug 17 05:54:33 2006 @@ -1,0 +1,167 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/cm/cmapi.c + * PURPOSE: Internal routines that implement Nt* API functionality + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +ERESOURCE CmpRegistryLock; +PVOID CmpRegistryLockCallerCaller, CmpRegistryLockCaller; +BOOLEAN CmpFlushStarveWriters; + +KGUARDED_MUTEX CmpDelayAllocBucketLock; +LIST_ENTRY CmpFreeDelayItemsListHead; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpLockRegistryExclusive(VOID) +{ + /* Enter a critical region and lock the registry */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Sanity check */ + ASSERT(CmpFlushStarveWriters == 0); + RtlGetCallersAddress(&CmpRegistryLockCaller, &CmpRegistryLockCallerCaller); +} + +BOOLEAN +NTAPI +CmpTestRegistryLock(VOID) +{ + /* Test the lock */ + return (BOOLEAN)ExIsResourceAcquiredSharedLite(&CmpRegistryLock); +} + +BOOLEAN +NTAPI +CmpTestRegistryLockExclusive(VOID) +{ + /* Test the lock */ + return ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock); +} + +// FIXME: THIS FUNCTION IS PARTIALLY FUCKED +PVOID +NTAPI +CmpAllocateDelayItem(VOID) +{ + PCM_DELAYED_CLOSE_ENTRY Entry; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + /* Lock the allocation buckets */ + KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); + if (TRUE) + { + /* Allocate an allocation page */ + AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + if (AllocPage) + { + /* Set default entries */ + AllocPage->FreeCount = CM_DELAYS_PER_PAGE; + + /* Loop each entry */ + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) + { + /* Get this entry and link it */ + Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); + InsertHeadList(&Entry->DelayedLRUList, + &CmpFreeDelayItemsListHead); + } + } + + /* Get the entry and the alloc page */ + Entry = CONTAINING_RECORD(NextEntry, + CM_DELAYED_CLOSE_ENTRY, + DelayedLRUList); + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + + /* Decrease free entries */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; +} + + +VOID +NTAPI +CmpFreeDelayItem(PVOID Entry) +{ + PCM_DELAYED_CLOSE_ENTRY AllocEntry = (PCM_DELAYED_CLOSE_ENTRY)Entry; + PCM_DELAYED_CLOSE_ENTRY *AllocTable; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PAGED_CODE(); + + /* Lock the table */ + KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); + + /* Add the entry at the end */ + InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->DelayedLRUList); + + /* Get the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + ASSERT(AllocPage->FreeCount != CM_DELAYS_PER_PAGE); + + /* Increase the number of free items */ + if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) + { + /* Page is totally free now, loop each entry */ + AllocTable = (PCM_DELAYED_CLOSE_ENTRY*)&AllocPage->AllocPage; + for (i = CM_DELAYS_PER_PAGE; i; i--) + { + /* Get the entry and unlink it */ + AllocEntry = AllocTable[i]; + RemoveEntryList(&AllocEntry->DelayedLRUList); + } + + /* Now free the page */ + ExFreePool(AllocPage); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); +} + +VOID +NTAPI +CmpUnlockRegistry(VOID) +{ + /* Sanity check */ + CMP_ASSERT_REGISTRY_LOCK(); + + /* Check if we should flush the registry */ + if (CmpFlushOnLockRelease) + { + /* The registry should be exclusively locked for this */ + CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); + + /* Flush the registry */ + CmpFlushEntireRegistry(TRUE); + CmpFlushOnLockRelease = FALSE; + } + + /* Release the lock and leave the critical region */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); +}

1 0

[turner] 23593: Fix the 'hack' that makes regedit and explorer links in the start menu to load the applications.
by turner＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: turner Date: Thu Aug 17 05:26:51 2006 New Revision: 23593 URL: http://svn.reactos.org/svn/reactos?rev=23593&view=rev Log: Fix the 'hack' that makes regedit and explorer links in the start menu to load the applications. Modified: branches/ros-branch-0_3_0/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_0/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/win32/syssetup/install.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/win32/syssetup/install.c Thu Aug 17 05:26:51 2006 @@ -425,8 +425,8 @@ CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"), _T("calc.exe"), IDS_CMT_CALC); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("..\\ReactOS Explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("..\\Regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("ReactOS Explorer.lnk"), _T("..\\explorer.exe"), IDS_CMT_EXPLORER); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Regedit.lnk"), _T("..\\regedit.exe"), IDS_CMT_REGEDIT); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("WordPad.lnk"), _T("wordpad.exe"), IDS_CMT_WORDPAD); }

1 0

[ion] 23592: - Update status.
by ion＠svn.reactos.org 16 Aug '06

16 Aug '06

Author: ion Date: Thu Aug 17 03:33:24 2006 New Revision: 23592 URL: http://svn.reactos.org/svn/reactos?rev=23592&view=rev Log: - Update status. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt Thu Aug 17 03:33:24 2006 @@ -88,6 +88,10 @@ ~60% of the KCB/NCB code is complete. Blocking on cmlib being modified to use actual NT _HHIVE. +**As of 16/08/2006 + ~90% of the KCB/NCB code is complete. + Work about to resume on initialization code. + -= Structure =- cmapi.c - Contains the low-level Cmp APIs that correspond to the external Nt

1 0

[ion] 23591: - Add NCB lock macros. - Implement CmpDereferenceNcbWithLock, CmpFreeDelayItem.
by ion＠svn.reactos.org 16 Aug '06

16 Aug '06

Author: ion Date: Thu Aug 17 03:31:39 2006 New Revision: 23591 URL: http://svn.reactos.org/svn/reactos?rev=23591&view=rev Log: - Add NCB lock macros. - Implement CmpDereferenceNcbWithLock, CmpFreeDelayItem. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Thu Aug 17 03:31:39 2006 @@ -80,3 +80,20 @@ (k)->ConvKey).Lock); \ } +// +// Exclusively acquires an NCB +// +#define CmpAcquireNcbLockExclusive(n) \ +{ \ + ExAcquirePushLockExclusive(GET_HASH_ENTRY(CmpNameCacheTable, \ + (n)->ConvKey).Lock); \ +} + +// +// Releases an exlusively or shared acquired NCB +// +#define CmpReleaseNcbLock(k) \ +{ \ + ExReleasePushLock(GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)->ConvKey).Lock); \ +} Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Thu Aug 17 03:31:39 2006 @@ -290,6 +290,79 @@ } VOID +CmpDereferenceNcbWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) +{ + PCM_NAME_HASH Current, Next; + + /* Lock the NCB */ + CmpAcquireNcbLockExclusive(Ncb); + + /* Decrease the reference count */ + if (!(--Ncb->RefCount)) + { + /* Find the NCB in the table */ + Next = GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey).Entry; + while (TRUE) + { + /* Check the current entry */ + Current = Next; + ASSERT(Current != NULL); + if (Current == &Ncb->NameHash) break; + + /* Get to the next one */ + Next = Current->NextHash; + } + + /* Found it, now unlink it and free it */ + Current->NextHash = Next->NextHash; + ExFreePool(Ncb); + } + + /* Release the lock */ + CmpReleaseNcbLock(Ncb); +} + +VOID +NTAPI +CmpFreeDelayItem(PVOID Entry) +{ + PCM_DELAYED_CLOSE_ENTRY AllocEntry = (PCM_DELAYED_CLOSE_ENTRY)Entry; + PCM_DELAYED_CLOSE_ENTRY *AllocTable; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PAGED_CODE(); + + /* Lock the table */ + KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); + + /* Add the entry at the end */ + InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->DelayedLRUList); + + /* Get the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + ASSERT(AllocPage->FreeCount != CM_DELAYS_PER_PAGE); + + /* Increase the number of free items */ + if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) + { + /* Page is totally free now, loop each entry */ + AllocTable = (PCM_DELAYED_CLOSE_ENTRY*)&AllocPage->AllocPage; + for (i = CM_DELAYS_PER_PAGE; i; i--) + { + /* Get the entry and unlink it */ + AllocEntry = AllocTable[i]; + RemoveEntryList(&AllocEntry->DelayedLRUList); + } + + /* Now free the page */ + ExFreePool(AllocPage); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); +} + +VOID NTAPI CmpRemoveFromDelayedClose(IN PCM_KEY_CONTROL_BLOCK Kcb) {

1 0

[ion] 23590: - Add definitions for HCELL_NIL and HCELL_CACHED. - Add CM_DELAY_DEREF_KCB_ITEM. - Add CM_CACHED_VALUE_INDEX, CM_CACHED_VALUE. - Add macros for dealing with cached cells (CMP_GET_CACHED_CELL, CMP_GET_CACHED_DATA, _INDEX, _VALUE and CMP_IS_CELL_CACHED). - Implement CmpRemoveFromDelayedClose, CmpDelayDerefKCb, CmpCleanUpKcbValueCache, CmpCleanUpKcbCacheWithLock. - Fix return value of CmpAllocateDelayItem.
by ion＠svn.reactos.org 16 Aug '06

16 Aug '06

Author: ion Date: Wed Aug 16 22:38:09 2006 New Revision: 23590 URL: http://svn.reactos.org/svn/reactos?rev=23590&view=rev Log: - Add definitions for HCELL_NIL and HCELL_CACHED. - Add CM_DELAY_DEREF_KCB_ITEM. - Add CM_CACHED_VALUE_INDEX, CM_CACHED_VALUE. - Add macros for dealing with cached cells (CMP_GET_CACHED_CELL, CMP_GET_CACHED_DATA, _INDEX, _VALUE and CMP_IS_CELL_CACHED). - Implement CmpRemoveFromDelayedClose, CmpDelayDerefKCb, CmpCleanUpKcbValueCache, CmpCleanUpKcbCacheWithLock. - Fix return value of CmpAllocateDelayItem. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Wed Aug 16 22:38:09 2006 @@ -73,6 +73,12 @@ #define HBLOCK_SIZE 0x1000 #define HSECTOR_SIZE 0x200 #define HSECTOR_COUNT 8 + +// +// Cell Masks +// +#define HCELL_NIL 0 +#define HCELL_CACHED 1 // // CM_KEY_CONTROL_BLOCK Flags @@ -367,6 +373,15 @@ LIST_ENTRY DelayedLRUList; PCM_KEY_CONTROL_BLOCK KeyControlBlock; } CM_DELAYED_CLOSE_ENTRY, *PCM_DELAYED_CLOSE_ENTRY; + +// +// Delayed KCB Dereference Entry +// +typedef struct _CM_DELAY_DEREF_KCB_ITEM +{ + LIST_ENTRY ListEntry; + PCM_KEY_CONTROL_BLOCK Kcb; +} CM_DELAY_DEREF_KCB_ITEM, *PCM_DELAY_DEREF_KCB_ITEM; // // Use Count Log and Entry @@ -521,6 +536,29 @@ } CELL_DATA, *PCELL_DATA; // +// Cached Value Index +// +typedef struct _CM_CACHED_VALUE_INDEX +{ + HCELL_INDEX CellIndex; + union + { + CELL_DATA CellData; + ULONG_PTR List[ANYSIZE_ARRAY]; + } Data; +} CM_CACHED_VALUE_INDEX, *PCM_CACHED_VALUE_INDEX; + +// +// Cached Value +// +typedef struct _CM_CACHED_VALUE +{ + USHORT DataCacheType; + USHORT ValueKeySize; + CM_KEY_VALUE KeyValue; +} CM_CACHED_VALUE, *PCM_CACHED_VALUE; + +// // Registry Validation Functions // BOOLEAN @@ -531,7 +569,7 @@ ); // -// Registry Lock +// Registry Locking Functions // BOOLEAN NTAPI @@ -540,6 +578,16 @@ ); // +// KCB Functions +// +VOID +NTAPI +CmpDereferenceKcbWithLock( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively +); + +// // Global variables accessible from all of Cm // Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Wed Aug 16 22:38:09 2006 @@ -19,6 +19,24 @@ GET_HASH_KEY(ConvKey) % CmpHashTableSize #define GET_HASH_ENTRY(Table, ConvKey) \ (*Table[GET_HASH_INDEX(ConvKey)]) + +// +// Returns whether or not the cell is cached +// +#define CMP_IS_CELL_CACHED(c) \ + (((c) & HCELL_CACHED) && ((c) != HCELL_NIL)) + +// +// Return data from a cached cell +// +#define CMP_GET_CACHED_CELL(c) \ + (ULONG_PTR)((c) & ~HCELL_CACHED) +#define CMP_GET_CACHED_DATA(c) \ + (&(((PCM_CACHED_VALUE_INDEX)(CMP_GET_CACHED_CELL(c)))->Data.CellData)) +#define CMP_GET_CACHED_INDEX(c) \ + (&(((PCM_CACHED_ENTRY)(CMP_GET_CACHED_CELL(c)))->CellIndex)) +#define CMP_GET_CACHED_VALUE(c) \ + (&(((PCM_CACHED_VALUE)(CMP_GET_CACHED_CELL(c)))->KeyValue)) // // Makes sure that the registry is locked Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Wed Aug 16 22:38:09 2006 @@ -29,6 +29,14 @@ ULONG CmpDelayCloseIntervalInSeconds = 5; KDPC CmpDelayCloseDpc; KTIMER CmpDelayCloseTimer; + +KGUARDED_MUTEX CmpDelayDerefKCBLock; +BOOLEAN CmpDelayDerefKCBWorkItemActive; +LIST_ENTRY CmpDelayDerefKCBListHead; +ULONG CmpDelayDerefKCBIntervalInSeconds = 5; +KDPC CmpDelayDerefKCBDpc; +KTIMER CmpDelayDerefKCBTimer; + BOOLEAN CmpHoldLazyFlush; /* FUNCTIONS *****************************************************************/ @@ -281,6 +289,56 @@ } } +VOID +NTAPI +CmpRemoveFromDelayedClose(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + PCM_DELAYED_CLOSE_ENTRY Entry; + ULONG NewRefCount, OldRefCount; + PAGED_CODE(); + + /* Sanity checks */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + if (Kcb->DelayedCloseIndex == CmpDelayedCloseSize) ASSERT(FALSE); + + /* Get the entry and lock the table */ + Entry = Kcb->DelayCloseEntry; + KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); + + /* Remove the entry */ + RemoveEntryList(&Entry->DelayedLRUList); + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); + + /* Free the entry */ + CmpFreeDelayItem(Entry); + + /* Reduce the number of elements */ + InterlockedDecrement(&CmpDelayedCloseElements); + + /* Sanity check */ + if (!Kcb->InDelayClose) ASSERT(FALSE); + + /* Get the old reference count */ + OldRefCount = Kcb->InDelayClose; + ASSERT(OldRefCount == 1); + + /* Set it to 0 */ + NewRefCount = InterlockedCompareExchange(&Kcb->InDelayClose, + 0, + OldRefCount); + if (NewRefCount != OldRefCount) ASSERT(FALSE); + + /* Remove the link to the entry */ + Kcb->DelayCloseEntry = NULL; + + /* Set new delay size and remove the delete flag */ + Kcb->DelayedCloseIndex = CmpDelayedCloseSize; + Kcb->Delete = FALSE; +} + BOOLEAN NTAPI CmpReferenceKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) @@ -359,7 +417,7 @@ } // FIXME: THIS FUNCTION IS PARTIALLY FUCKED -PCM_DELAYED_CLOSE_ENTRY +PVOID NTAPI CmpAllocateDelayItem(VOID) { @@ -408,6 +466,131 @@ /* Release the lock */ KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); return Entry; +} + +VOID +NTAPI +CmpDelayDerefKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + USHORT OldRefCount, NewRefCount; + LARGE_INTEGER Timeout; + PCM_DELAY_DEREF_KCB_ITEM Entry; + PAGED_CODE(); + + /* Get the previous reference count */ + OldRefCount = Kcb->RefCount; + + /* Write the new one */ + NewRefCount = (USHORT)InterlockedCompareExchange((PLONG)&Kcb->RefCount, + OldRefCount - 1, + OldRefCount); + if (NewRefCount != OldRefCount) return; + + /* Allocate a delay item */ + Entry = CmpAllocateDelayItem(); + if (!Entry) return; + + /* Set the KCB */ + Entry->Kcb = Kcb; + + /* Acquire the delayed deref table lock */ + KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); + + /* Insert the entry into the list */ + InsertHeadList(&CmpDelayDerefKCBListHead, &Entry->ListEntry); + + /* Check if we need to enable anything */ + if (CmpDelayDerefKCBWorkItemActive) + { + /* Yes, we have no work item, setup the interval */ + Timeout.QuadPart = CmpDelayDerefKCBIntervalInSeconds * -10000000; + KeSetTimer(&CmpDelayDerefKCBTimer, Timeout, &CmpDelayDerefKCBDpc); + } + + /* Release the table lock */ + KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); +} + +VOID +NTAPI +CmpCleanUpKcbValueCache(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + PULONG_PTR CachedList; + ULONG i; + + /* Sanity check */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Check if the value list is cached */ + if (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)) + { + /* Get the cache list */ + CachedList = (PULONG_PTR)CMP_GET_CACHED_DATA(Kcb->ValueCache.ValueList); + for (i = 0; i < Kcb->ValueCache.Count; i++) + { + /* Check if this cell is cached */ + if (CMP_IS_CELL_CACHED(CachedList[i])) + { + /* Free it */ + ExFreePool((PVOID)CMP_GET_CACHED_CELL(CachedList[i])); + } + } + + /* Now free the list */ + ExFreePool((PVOID)CMP_GET_CACHED_CELL(Kcb->ValueCache.ValueList)); + Kcb->ValueCache.ValueList = HCELL_NIL; + } + else if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) + { + /* This is a sym link, check if there's only one reference left */ + if ((Kcb->ValueCache.RealKcb->RefCount == 1) && + !(Kcb->ValueCache.RealKcb->Delete)) + { + /* Disable delay close for the KCB */ + Kcb->ValueCache.RealKcb->ExtFlags |= CM_KCB_NO_DELAY_CLOSE; + } + + /* Dereference the KCB */ + CmpDelayDerefKcb(Kcb->ValueCache.RealKcb); + Kcb->ExtFlags &= ~ CM_KCB_SYM_LINK_FOUND; + } +} + +VOID +NTAPI +CmpCleanUpKcbCacheWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively) +{ + PCM_KEY_CONTROL_BLOCK Parent; + PAGED_CODE(); + + /* Sanity checks */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + ASSERT(Kcb->RefCount == 0); + + /* Cleanup the value cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Reference the NCB */ + CmpDereferenceNcbWithLock(Kcb->NameBlock); + + /* Check if we have an index hint block and free it */ + if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) ExFreePool(Kcb->IndexHint); + + /* Check if we were already deleted */ + Parent = Kcb->ParentKcb; + if (!Kcb->Delete) CmpFreeKcb(Kcb); + + /* Check if we have a parent */ + if (Parent) + { + /* Dereference the parent */ + LockHeldExclusively ? CmpDereferenceKcbWithLock(Kcb, + LockHeldExclusively) : + CmpDelayDerefKcb(Kcb); + } } VOID

1 0

[janderwald] 23589: merge 23524 from trunk
by janderwald＠svn.reactos.org 16 Aug '06

16 Aug '06

Author: janderwald Date: Wed Aug 16 19:03:49 2006 New Revision: 23589 URL: http://svn.reactos.org/svn/reactos?rev=23589&view=rev Log: merge 23524 from trunk Modified: branches/ros-branch-0_3_0/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-branch-0_3_0/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_0/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/ros-branch-0_3_0/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Aug 16 19:03:49 2006 @@ -1810,6 +1810,10 @@ globalCflags += " -pipe"; if ( !module.allowWarnings ) globalCflags += " -Werror"; + + // Always force disabling of sibling calls optimisation for GCC + // (TODO: Move to version-specific once this bug is fixed in GCC) + globalCflags += " -fno-optimize-sibling-calls"; fprintf ( fMakefile,

1 0

[ion] 23588: - Properly disable impersonation in PsDisableImpersonation if it was previously enabled, instead of not disabling it. (fix a wrong check). Thanks to Arty.
by ion＠svn.reactos.org 16 Aug '06

16 Aug '06

Author: ion Date: Wed Aug 16 07:17:21 2006 New Revision: 23588 URL: http://svn.reactos.org/svn/reactos?rev=23588&view=rev Log: - Properly disable impersonation in PsDisableImpersonation if it was previously enabled, instead of not disabling it. (fix a wrong check). Thanks to Arty. Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Wed Aug 16 07:17:21 2006 @@ -814,8 +814,8 @@ OldValue); } while (NewValue != OldValue); - /* Did someone disable behind our back? */ - if (!(NewValue & CT_ACTIVE_IMPERSONATION_INFO_BIT)) + /* Make sure nobody disabled it behind our back */ + if (NewValue & CT_ACTIVE_IMPERSONATION_INFO_BIT) { /* Copy the old state */ Impersonation = Thread->ImpersonationInfo;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
45
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 August 2006