Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 48909: [NTOS]: Don't use dangerous MiRemoveHeadList in MDL page allocation, use MiRemoveAnyPage instead. [NTOS]: Don't repurpose pages from the zero/free page list without actually un...
by sir_richard＠svn.reactos.org 27 Sep '10

27 Sep '10

Author: sir_richard Date: Mon Sep 27 17:09:33 2010 New Revision: 48909 URL: http://svn.reactos.org/svn/reactos?rev=48909&view=rev Log: [NTOS]: Don't use dangerous MiRemoveHeadList in MDL page allocation, use MiRemoveAnyPage instead. [NTOS]: Don't repurpose pages from the zero/free page list without actually unlinking the page first! This should fix even more corruptions. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Sep 27 17:09:33 2010 @@ -229,32 +229,18 @@ // while (PagesFound < PageCount) { - // - // Do we have zeroed pages? - // - if (MmZeroedPageListHead.Total) + /* Grab a page */ + Page = MiRemoveAnyPage(0); + if (Page == 0) { - // - // Grab a zero page - // - Pfn1 = MiRemoveHeadList(&MmZeroedPageListHead); - } - else if (MmFreePageListHead.Total) - { - // - // Nope, grab an unzeroed page - // - Pfn1 = MiRemoveHeadList(&MmFreePageListHead); - } - else - { - // - // This is not good... hopefully we have at least SOME pages - // + /* This is not good... hopefully we have at least SOME pages */ ASSERT(PagesFound); break; } + /* Grab the page entry for it */ + Pfn1 = MiGetPfnEntry(Page); + // // Make sure it's really free // @@ -266,11 +252,6 @@ Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; Pfn1->u3.e2.ReferenceCount = 1; - - // - // Decrease available pages - // - MmAvailablePages--; // // Save it into the MDL @@ -303,6 +284,9 @@ if (MiIsPfnInUse(Pfn1)) continue; if ((Pfn1->u3.e1.PageLocation == ZeroedPageList) != LookForZeroedPages) continue; + /* Remove the page from the free or zero list */ + MiUnlinkFreeOrZeroedPage(Pfn1); + // // Sanity checks // @@ -314,11 +298,6 @@ Pfn1->u3.e2.ReferenceCount = 1; Pfn1->u3.e1.StartOfAllocation = 1; Pfn1->u3.e1.EndOfAllocation = 1; - - // - // Decrease available pages - // - MmAvailablePages--; // // Save this page into the MDL

1 0

[sir_richard] 48908: [NTOS]: Stop using MiInsertInListTail and MiRemoveHeadList in the deprecated ReactOS page functions. Those two functions do not adequately support the semantis needed for page ...
by sir_richard＠svn.reactos.org 27 Sep '10

27 Sep '10

Author: sir_richard Date: Mon Sep 27 16:00:24 2010 New Revision: 48908 URL: http://svn.reactos.org/svn/reactos?rev=48908&view=rev Log: [NTOS]: Stop using MiInsertInListTail and MiRemoveHeadList in the deprecated ReactOS page functions. Those two functions do not adequately support the semantis needed for page insertion/removal and should've never been used. MmAllocPage now uses MiRemoveAny/ZeroPage, and MmDereferencePage uses MiInsertPageInFreeList. Should help with some corruptions. More is coming. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Sep 27 16:00:24 2010 @@ -567,13 +567,11 @@ Page->u3.e2.ReferenceCount--; if (Page->u3.e2.ReferenceCount == 0) { - MmAvailablePages++; - Page->u3.e1.PageLocation = FreePageList; - MiInsertInListTail(&MmFreePageListHead, Page); - if (MmFreePageListHead.Total > 8 && 0 == KeReadStateEvent(&ZeroPageThreadEvent)) - { - KeSetEvent(&ZeroPageThreadEvent, IO_NO_INCREMENT, FALSE); - } + /* Mark the page temporarily as valid, we're going to make it free soon */ + Page->u3.e1.PageLocation = ActiveAndValid; + + /* Bring it back into the free list */ + MiInsertPageInFreeList(Pfn); } } @@ -582,44 +580,26 @@ MmAllocPage(ULONG Type) { PFN_NUMBER PfnOffset; - PPHYSICAL_PAGE PageDescriptor; - BOOLEAN NeedClear = FALSE; - - DPRINT("MmAllocPage()\n"); - - if (MmZeroedPageListHead.Total == 0) + PMMPFN Pfn1; + + if (Type != MC_SYSTEM) { - if (MmFreePageListHead.Total == 0) - { - /* Check if this allocation is for the PFN DB itself */ - if (MmNumberOfPhysicalPages == 0) - { - ASSERT(FALSE); - } - - DPRINT1("MmAllocPage(): Out of memory\n"); - return 0; - } - PageDescriptor = MiRemoveHeadList(&MmFreePageListHead); - - NeedClear = TRUE; + PfnOffset = MiRemoveZeroPage(0); } else { - PageDescriptor = MiRemoveHeadList(&MmZeroedPageListHead); + PfnOffset = MiRemoveAnyPage(0); } - PageDescriptor->u3.e2.ReferenceCount = 1; - - MmAvailablePages--; - - PfnOffset = MiGetPfnEntryIndex(PageDescriptor); - if ((NeedClear) && (Type != MC_SYSTEM)) + if (!PfnOffset) { - MiZeroPage(PfnOffset); + DPRINT1("MmAllocPage(): Out of memory\n"); + return 0; } - - PageDescriptor->u3.e1.PageLocation = ActiveAndValid; + + Pfn1 = MiGetPfnEntry(PfnOffset); + Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u3.e1.PageLocation = ActiveAndValid; return PfnOffset; }

1 0

[gadamopoulos] 48907: [user32] - Remove the last reactos-only export from user32 (PrivateCsrssManualGuiCheck) [win32csr] - Move PrivateCsrssManualGuiCheck from user32 to win32csr
by gadamopoulos＠svn.reactos.org 27 Sep '10

27 Sep '10

Author: gadamopoulos Date: Mon Sep 27 14:31:13 2010 New Revision: 48907 URL: http://svn.reactos.org/svn/reactos?rev=48907&view=rev Log: [user32] - Remove the last reactos-only export from user32 (PrivateCsrssManualGuiCheck) [win32csr] - Move PrivateCsrssManualGuiCheck from user32 to win32csr Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Mon Sep 27 14:31:13 2010 @@ -34,17 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32); /* FUNCTIONS *****************************************************************/ - -/* - * Private calls for CSRSS - */ -VOID -WINAPI -PrivateCsrssManualGuiCheck(LONG Check) -{ - NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); -} - /* * @implemented Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Mon Sep 27 14:31:13 2010 @@ -748,9 +748,6 @@ @ stdcall wvsprintfA(ptr str ptr) @ stdcall wvsprintfW(ptr wstr ptr) -; ROS specific exports -@ stdcall PrivateCsrssManualGuiCheck(long) - ; Functions exported by Win Vista @ stdcall SetProcessDPIAware() Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Mon Sep 27 14:31:13 2010 @@ -145,6 +145,13 @@ return TRUE; } +VOID +WINAPI +PrivateCsrssManualGuiCheck(LONG Check) +{ + NtUserCallOneParam(Check, ONEPARAM_ROUTINE_CSRSS_GUICHECK); +} + BOOL WINAPI Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, PCSRPLUGIN_SERVER_PROCS ServerProcs,

1 0

[spetreolle] 48906: [CMAKE] Add a set_rc_compiler macro, its a workaround for lack of mingw RC support in cmake. Enable winemine build. Improve user32 CMakeLists.txt. Thanks to AmineKhaldi for init...
by spetreolle＠svn.reactos.org 27 Sep '10

27 Sep '10

Author: spetreolle Date: Mon Sep 27 09:14:54 2010 New Revision: 48906 URL: http://svn.reactos.org/svn/reactos?rev=48906&view=rev Log: [CMAKE] Add a set_rc_compiler macro, its a workaround for lack of mingw RC support in cmake. Enable winemine build. Improve user32 CMakeLists.txt. Thanks to AmineKhaldi for initial support of resources in user32. Modified: branches/cmake-bringup/base/applications/games/CMakeLists.txt branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/base/applications/games/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] Mon Sep 27 09:14:54 2010 @@ -1,4 +1,4 @@ add_subdirectory(solitaire) #add_subdirectory(spider) -#add_subdirectory(winemine) +add_subdirectory(winemine) Modified: branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] Mon Sep 27 09:14:54 2010 @@ -1,11 +1,14 @@ + add_executable(winemine main.c dialog.c rsrc.rc) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) set_unicode(winemine yes) set_module_type(winemine win32gui) +set_rc_compiler() add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Mon Sep 27 09:14:54 2010 @@ -8,20 +8,61 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) include_directories(include) -get_directory_property(defines COMPILE_DEFINITIONS) -get_directory_property(includes INCLUDE_DIRECTORIES) +set_rc_compiler() -foreach(arg ${defines}) - set(result_defs "${result_defs} -D${arg}") -endforeach(arg ${defines}) - -foreach(arg ${includes}) - set(result_incs "-I${arg} ${result_incs}") -endforeach(arg ${includes}) - -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") - -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + user32_stubs.c + controls/button.c + controls/combo.c + controls/edit.c + controls/icontitle.c + controls/listbox.c + controls/regcontrol.c + controls/scrollbar.c + controls/static.c + misc/dde.c + misc/ddeclient.c + misc/ddeserver.c + misc/desktop.c + misc/display.c + misc/dllmain.c + misc/exit.c + misc/exticon.c + misc/imm.c + misc/misc.c + misc/object.c + misc/resources.c + misc/rtlstr.c + misc/stubs.c + misc/timer.c + misc/usrapihk.c + misc/winhelp.c + misc/winsta.c + misc/wsprintf.c + windows/accel.c + windows/caret.c + windows/class.c + windows/clipboard.c + windows/cursoricon.c + windows/dc.c + windows/defwnd.c + windows/dialog.c + windows/draw.c + windows/font.c + windows/hook.c + windows/input.c + windows/mdi.c + windows/menu.c + windows/messagebox.c + windows/message.c + windows/nonclient.c + windows/paint.c + windows/prop.c + windows/rect.c + windows/spy.c + windows/text.c + windows/window.c + windows/winpos.c) add_library(user32 SHARED ${SOURCE} Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Sep 27 09:14:54 2010 @@ -93,4 +93,18 @@ target_link_libraries(${MODULE} mingw_common) endmacro() - +# Workaround lack of mingw RC support in cmake +macro(set_rc_compiler) + get_directory_property(defines COMPILE_DEFINITIONS) + get_directory_property(includes INCLUDE_DIRECTORIES) + + foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") + endforeach(arg ${defines}) + + foreach(arg ${includes}) + set(result_incs "-I${arg} ${result_incs}") + endforeach(arg ${includes}) + + SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") +endmacro() Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Sep 27 09:14:54 2010 @@ -62,3 +62,6 @@ set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") +macro(set_rc_compiler) +# dummy, this workaround is only needed in mingw due to lack of RC support in cmake +endmacro()

1 0

[mjmartin] 48905: [ntoskrnl/mm] - Acquire rundown protection on process to make sure it is not being terminated and before attempting to do anything with the process. Fixed a rare case of PspDelete...
by mjmartin＠svn.reactos.org 27 Sep '10

27 Sep '10

Author: mjmartin Date: Mon Sep 27 08:46:02 2010 New Revision: 48905 URL: http://svn.reactos.org/svn/reactos?rev=48905&view=rev Log: [ntoskrnl/mm] - Acquire rundown protection on process to make sure it is not being terminated and before attempting to do anything with the process. Fixed a rare case of PspDeleteProcess being called twice for a process, resulting in bugcheck. Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=489… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Mon Sep 27 08:46:02 2010 @@ -208,6 +208,13 @@ return(STATUS_UNSUCCESSFUL); } Process = entry->Process; + + if (!ExAcquireRundownProtection(&Process->RundownProtect)) + { + ExReleaseFastMutex(&RmapListLock); + return STATUS_PROCESS_IS_TERMINATING; + } + Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { @@ -220,6 +227,7 @@ ExReleaseFastMutex(&RmapListLock); if (!NT_SUCCESS(Status)) { + ExReleaseRundownProtection(&Process->RundownProtect); return Status; } AddressSpace = &Process->Vm; @@ -235,6 +243,7 @@ if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); + ExReleaseRundownProtection(&Process->RundownProtect); if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); @@ -256,6 +265,7 @@ if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); + ExReleaseRundownProtection(&Process->RundownProtect); if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); @@ -281,6 +291,7 @@ if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); + ExReleaseRundownProtection(&Process->RundownProtect); if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); @@ -303,6 +314,9 @@ { KeBugCheck(MEMORY_MANAGEMENT); } + + ExReleaseRundownProtection(&Process->RundownProtect); + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); @@ -499,6 +513,7 @@ ExAcquireFastMutex(&RmapListLock); previous_entry = NULL; current_entry = MmGetRmapListHeadPage(Page); + while (current_entry != NULL) { if (current_entry->Process == (PEPROCESS)Process && @@ -514,14 +529,14 @@ } ExReleaseFastMutex(&RmapListLock); ExFreeToNPagedLookasideList(&RmapLookasideList, current_entry); - if (Process == NULL) - { - Process = PsInitialSystemProcess; - } - if (Process) - { + if (Process == NULL) + { + Process = PsInitialSystemProcess; + } + if (Process) + { (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); - } + } return; } previous_entry = current_entry;

1 0

[jimtabor] 48904: [Win32k] - Implement win32k support functions for Get and Set process default layout. - Due to changes with wine it will be difficult to sync when RTL support is being added to Co...
by jimtabor＠svn.reactos.org 27 Sep '10

27 Sep '10

Author: jimtabor Date: Mon Sep 27 02:46:16 2010 New Revision: 48904 URL: http://svn.reactos.org/svn/reactos?rev=48904&view=rev Log: [Win32k] - Implement win32k support functions for Get and Set process default layout. - Due to changes with wine it will be difficult to sync when RTL support is being added to ComCtl32. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Mon Sep 27 02:46:16 2010 @@ -317,6 +317,41 @@ _SEH2_END; RETURN(Ret); } + case ONEPARAM_ROUTINE_SETPROCDEFLAYOUT: + { + PPROCESSINFO ppi; + if (Param & LAYOUT_ORIENTATIONMASK) + { + ppi = PsGetCurrentProcessWin32Process(); + ppi->dwLayout = Param; + RETURN(TRUE); + } + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + case ONEPARAM_ROUTINE_GETPROCDEFLAYOUT: + { + BOOL Ret = TRUE; + PPROCESSINFO ppi; + PDWORD pdwLayout; + if ( PsGetCurrentProcess() == CsrProcess) + { + SetLastWin32Error(ERROR_INVALID_ACCESS); + RETURN(FALSE); + } + ppi = PsGetCurrentProcessWin32Process(); + _SEH2_TRY + { + pdwLayout = (PDWORD)Param; + *pdwLayout = ppi->dwLayout; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + } + _SEH2_END; + RETURN(Ret); + } } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param);

1 0

[sir_richard] 48903: [DDK]: Add misisng MmLockPagableCodeSection.
by sir_richard＠svn.reactos.org 26 Sep '10

26 Sep '10

Author: sir_richard Date: Sun Sep 26 15:01:37 2010 New Revision: 48903 URL: http://svn.reactos.org/svn/reactos?rev=48903&view=rev Log: [DDK]: Add misisng MmLockPagableCodeSection. Modified: trunk/reactos/include/ddk/wdm.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4890… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Sep 26 15:01:37 2010 @@ -10615,6 +10615,7 @@ ((PVOID) ((PCHAR) ((_Mdl)->StartVa) + (_Mdl)->ByteOffset)) #define MmGetProcedureAddress(Address) (Address) +#define MmLockPagableCodeSection(Address) MmLockPagableDataSection(Address) /* PVOID MmGetSystemAddressForMdl( * IN PMDL Mdl);

1 0

[ekohl] 48902: [NTOSKRNL] Implement NtQueryOpenSubKeys.
by ekohl＠svn.reactos.org 26 Sep '10

26 Sep '10

Author: ekohl Date: Sun Sep 26 11:37:40 2010 New Revision: 48902 URL: http://svn.reactos.org/svn/reactos?rev=48902&view=rev Log: [NTOSKRNL] Implement NtQueryOpenSubKeys. Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sun Sep 26 11:37:40 2010 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/config/cmapi.c * PURPOSE: Configuration Manager - Internal Registry APIs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES ******************************************************************/ @@ -1814,3 +1815,86 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } + +ULONG +NTAPI +CmCountOpenSubKeys(IN PCM_KEY_CONTROL_BLOCK RootKcb, + IN BOOLEAN RemoveEmptyCacheEntries) +{ + PCM_KEY_HASH Entry; + PCM_KEY_CONTROL_BLOCK CachedKcb; + PCM_KEY_CONTROL_BLOCK ParentKcb; + USHORT ParentKeyCount; + USHORT j; + ULONG i; + ULONG SubKeys = 0; + + DPRINT("CmCountOpenSubKeys() called\n"); + + /* The root key is the only referenced key. There are no refereced sub keys. */ + if (RootKcb->RefCount == 1) + { + DPRINT("open sub keys: 0\n"); + return 0; + } + + /* Enumerate all hash lists */ + for (i = 0; i < CmpHashTableSize; i++) + { + /* Get the first cache entry */ + Entry = CmpCacheTable[i].Entry; + + /* Enumerate all cache entries */ + while (Entry) + { + /* Get the KCB of the current cache entry */ + CachedKcb = CONTAINING_RECORD(Entry, CM_KEY_CONTROL_BLOCK, KeyHash); + + /* Check keys only that are subkeys to our root key */ + if (CachedKcb->TotalLevels > RootKcb->TotalLevels) + { + /* Calculate the number of parent keys to the root key */ + ParentKeyCount = CachedKcb->TotalLevels - RootKcb->TotalLevels; + + /* Find a parent key that could be the root key */ + ParentKcb = CachedKcb; + for (j = 0; j < ParentKeyCount; j++) + { + ParentKcb = ParentKcb->ParentKcb; + } + + /* Check whether the parent is the root key */ + if (ParentKcb == RootKcb) + { + DPRINT("Found a sub key \n"); + DPRINT("RefCount = %u\n", CachedKcb->RefCount); + + if (CachedKcb->RefCount > 0) + { + /* Count the current hash entry if it is in use */ + SubKeys++; + } + else if ((CachedKcb->RefCount == 0) && (RemoveEmptyCacheEntries == TRUE)) + { + /* Remove the current key from the delayed close list */ + CmpRemoveFromDelayedClose(CachedKcb); + + /* Remove the current cache entry */ + CmpCleanUpKcbCacheWithLock(CachedKcb, TRUE); + + /* Restart, because the hash list has changed */ + Entry = CmpCacheTable[i].Entry; + continue; + } + } + } + + /* Get the next cache entry */ + Entry = Entry->NextHash; + } + } + + DPRINT("open sub keys: %u\n", SubKeys); + + return SubKeys; +} Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun Sep 26 11:37:40 2010 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/config/cmapi.c * PURPOSE: Configuration Manager - Internal Registry APIs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES ******************************************************************/ @@ -1015,8 +1016,91 @@ NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, OUT PULONG HandleCount) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + PCM_KEY_BODY KeyBody = NULL; + HANDLE KeyHandle; + NTSTATUS Status; + + DPRINT("NtQueryOpenSubKeys()\n"); + + PAGED_CODE(); + + /* Get the processor mode */ + PreviousMode = KeGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + /* Prepare to probe parameters */ + _SEH2_TRY + { + /* Probe target key */ + ProbeForRead(TargetKey, + sizeof(OBJECT_ATTRIBUTES), + sizeof(ULONG)); + + /* Probe handle count */ + ProbeForWriteUlong(HandleCount); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + /* Open a handle to the key */ + Status = ObOpenObjectByName(TargetKey, + CmpKeyObjectType, + PreviousMode, + NULL, + KEY_READ, + NULL, + &KeyHandle); + if (NT_SUCCESS(Status)) + { + /* Reference the key object */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_READ, + CmpKeyObjectType, + PreviousMode, + (PVOID *)&KeyBody, + NULL); + + /* Close the handle */ + NtClose(KeyHandle); + } + + /* Fail, if the key object could not be referenced */ + if (!NT_SUCCESS(Status)) + return Status; + + /* Lock the registry exclusively */ + CmpLockRegistryExclusive(); + + /* Fail, if we did not open a hive root key */ + if (KeyBody->KeyControlBlock->KeyCell != + KeyBody->KeyControlBlock->KeyHive->BaseBlock->RootCell) + { + DPRINT("Error: Key is not a hive root key!\n"); + CmpUnlockRegistry(); + ObDereferenceObject(KeyBody); + return STATUS_INVALID_PARAMETER; + } + + /* Call the internal API */ + *HandleCount = CmCountOpenSubKeys(KeyBody->KeyControlBlock, + FALSE); + + /* Unlock the registry */ + CmpUnlockRegistry(); + + /* Dereference the key object */ + ObDereferenceObject(KeyBody); + + DPRINT("Done.\n"); + + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun Sep 26 11:37:40 2010 @@ -1499,6 +1499,13 @@ CmUnloadKey( IN PCM_KEY_CONTROL_BLOCK Kcb, IN ULONG Flags +); + +ULONG +NTAPI +CmCountOpenSubKeys( + IN PCM_KEY_CONTROL_BLOCK RootKcb, + IN BOOLEAN RemoveEmptyCacheEntries ); //

1 0

[jgardou] 48901: [CMAKE] - Add disabled winemine build file
by jgardou＠svn.reactos.org 26 Sep '10

26 Sep '10

Author: jgardou Date: Sun Sep 26 10:09:06 2010 New Revision: 48901 URL: http://svn.reactos.org/svn/reactos?rev=48901&view=rev Log: [CMAKE] - Add disabled winemine build file Added: branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt (with props) Added: branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] Sun Sep 26 10:09:06 2010 @@ -1,0 +1,11 @@ + +add_executable(winemine + main.c + dialog.c + rsrc.rc) + +set_unicode(winemine yes) + +set_module_type(winemine win32gui) + +add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) Propchange: branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 48900: [CMAKE] - add iexplore to build
by jgardou＠svn.reactos.org 26 Sep '10

26 Sep '10

Author: jgardou Date: Sun Sep 26 09:56:28 2010 New Revision: 48900 URL: http://svn.reactos.org/svn/reactos?rev=48900&view=rev Log: [CMAKE] - add iexplore to build Added: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libshdocvw.a (with props) Modified: branches/cmake-bringup/base/applications/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sun Sep 26 09:56:28 2010 @@ -9,7 +9,7 @@ add_subdirectory(fontview) add_subdirectory(games) add_subdirectory(hh) -#add_subdirectory(iexplore) +add_subdirectory(iexplore) #add_subdirectory(kbswitch) #add_subdirectory(logoff) #add_subdirectory(magnify) Added: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Sun Sep 26 09:56:28 2010 @@ -1,0 +1,10 @@ + +add_executable(iexplore + main.c + iexplore.rc) + +set_unicode(iexplore no) + +set_module_type(iexplore win32gui) + +add_importlibs(iexplore shdocvw msvcrt) Propchange: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libshdocvw.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshd… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libshdocvw.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

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