Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[sir_richard] 49437: [NTOS]: ASSERT nobody tries to put ARM3 pages into the MC_USER LRU.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:42:08 2010 New Revision: 49437 URL: http://svn.reactos.org/svn/reactos?rev=49437&view=rev Log: [NTOS]: ASSERT nobody tries to put ARM3 pages into the MC_USER LRU. 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] Tue Nov 2 14:42:08 2010 @@ -79,6 +79,8 @@ if (Position == 0xFFFFFFFF) return 0; /* Return it */ + ASSERT(Position != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Position)); return Position; } @@ -89,6 +91,8 @@ KIRQL OldIrql; /* Set the page as a user page */ + ASSERT(Pfn != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Pfn)); OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); RtlSetBit(&MiUserPfnBitMap, Pfn); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -108,6 +112,8 @@ if (Position == 0xFFFFFFFF) return 0; /* Return it */ + ASSERT(Position != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Position)); return Position; } @@ -116,6 +122,8 @@ MmRemoveLRUUserPage(PFN_NUMBER Page) { /* Unset the page as a user page */ + ASSERT(Page != 0); + ASSERT_IS_ROS_PFN(MiGetPfnEntry(Page)); RtlClearBit(&MiUserPfnBitMap, Page); }

1 0

[sir_richard] 49436: [NTOS]: Assert nobody tries to touch the sharecount of a non-ARM3 page.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:41:51 2010 New Revision: 49436 URL: http://svn.reactos.org/svn/reactos?rev=49436&view=rev Log: [NTOS]: Assert nobody tries to touch the sharecount of a non-ARM3 page. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Nov 2 14:41:51 2010 @@ -812,6 +812,7 @@ ASSERT(PageFrameIndex > 0); ASSERT(MiGetPfnEntry(PageFrameIndex) != NULL); ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); + ASSERT(MI_IS_ROS_PFN(Pfn1) == FALSE); /* Page must be in-use */ if ((Pfn1->u3.e1.PageLocation != ActiveAndValid) &&

1 0

[sir_richard] 49435: [NTOS]: Fix typos.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:41:29 2010 New Revision: 49435 URL: http://svn.reactos.org/svn/reactos?rev=49435&view=rev Log: [NTOS]: Fix typos. Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Tue Nov 2 14:41:29 2010 @@ -1286,7 +1286,7 @@ /* Check if we have an import list */ if (LoadedImports) { - /* Reset the count again, and loop entries*/ + /* Reset the count again, and loop entries */ ImportCount = 0; for (i = 0; i < LoadedImports->Count; i++) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Nov 2 14:41:29 2010 @@ -160,7 +160,7 @@ MiDecrementShareCount(Pfn1, PageFrameIndex); /* Decrement the page table too */ - DPRINT("FIXME: ARM3 should decrement the PT refcount for: %p\n", Pfn2); + DPRINT("FIXME: ARM3 should decrement the pool PDE refcount for: %p\n", PageTableIndex); #if 0 // ARM3: Dont't trust this yet MiDecrementShareCount(Pfn2, PageTableIndex); #endif @@ -184,7 +184,7 @@ * * Right now, we shouldn't expect any page file information in the PTE */ - ASSERT(PointerPte->u.Soft.PageFileHigh == 0); + ASSERT(PointerPte->u.Soft.PageFileHigh == 0); /* Destroy the PTE */ PointerPte->u.Long = 0; @@ -259,7 +259,7 @@ } #endif /* FIXME: Drop the reference on the page table. For now, leak it until RosMM is gone */ - //MiDecrementShareCount(MiGetPfnEntry(PFN_FROM_PTE(PointerPde)), PFN_FROM_PDE(PointerPde)); + //MiDecrementShareCount(MiGetPfnEntry(PFN_FROM_PTE(PointerPde)), PFN_FROM_PTE(PointerPde)); /* Drop the share count */ MiDecrementShareCount(Pfn1, PageFrameIndex);

1 0

[sir_richard] 49434: [NTOS]: Sanity checks when dealing with creating/cleaning process address space. [NTOS]: Set the VmDeleted flag when the process address space is being nuked.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:41:03 2010 New Revision: 49434 URL: http://svn.reactos.org/svn/reactos?rev=49434&view=rev Log: [NTOS]: Sanity checks when dealing with creating/cleaning process address space. [NTOS]: Set the VmDeleted flag when the process address space is being nuked. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Tue Nov 2 14:41:03 2010 @@ -190,6 +190,7 @@ ASSERT((Vad->StartingVpn == ((ULONG_PTR)Teb >> PAGE_SHIFT) && (Vad->EndingVpn == (TebEnd >> PAGE_SHIFT)))); ASSERT(Vad->u.VadFlags.NoChange == TRUE); + ASSERT(Vad->u2.VadFlags2.OneSecured == TRUE); ASSERT(Vad->u2.VadFlags2.MultipleSecured == FALSE); /* Lock the working set */ @@ -1169,8 +1170,14 @@ PMM_AVL_TABLE VadTree; PETHREAD Thread = PsGetCurrentThread(); + /* Only support this */ + ASSERT(Process->AddressSpaceInitialized == 2); + /* Lock the process address space from changes */ MmLockAddressSpace(&Process->Vm); + + /* VM is deleted now */ + Process->VmDeleted = TRUE; /* Enumerate the VADs */ VadTree = &Process->VadRoot;

1 0

[sir_richard] 49433: [NTOS]: Make sure we don't get a user-pointer back from MmMapInSystemSpace.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:40:31 2010 New Revision: 49433 URL: http://svn.reactos.org/svn/reactos?rev=49433&view=rev Log: [NTOS]: Make sure we don't get a user-pointer back from MmMapInSystemSpace. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=494… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Nov 2 14:40:31 2010 @@ -329,6 +329,7 @@ } /* Copy the codepage data in its new location. */ + ASSERT(SectionBase > MmSystemRangeStart); RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); /* Free the previously allocated buffer and set the new location */

1 0

[sir_richard] 49432: [NTOS]: Remove merge artifact from newcc.
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:40:07 2010 New Revision: 49432 URL: http://svn.reactos.org/svn/reactos?rev=49432&view=rev Log: [NTOS]: Remove merge artifact from newcc. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Nov 2 14:40:07 2010 @@ -1427,7 +1427,6 @@ if (!MmIsPagePresent(Process, Address)) { Entry = MmGetPageEntrySectionSegment(Segment, Offset); - DPRINT1("Entry %x\n", Entry); HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry)

1 0

[sir_richard] 49431: [NTOS]: Protect Arty's changes with #ifdef NEWCC, otherwise this code ASSERTs and crashes as soon as a pageout operation is required. Since your advanced test/regression system...
by sir_richard＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: sir_richard Date: Tue Nov 2 14:38:52 2010 New Revision: 49431 URL: http://svn.reactos.org/svn/reactos?rev=49431&view=rev Log: [NTOS]: Protect Arty's changes with #ifdef NEWCC, otherwise this code ASSERTs and crashes as soon as a pageout operation is required. Since your advanced test/regression systems boot into configurations with 1GB+ RAM, you never even test these paths and one could put an ASSERT(FALSE) and you wouldn't even notice it (as proven). 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=494… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Tue Nov 2 14:38:52 2010 @@ -10,7 +10,9 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#ifdef NEWCC #include "../cache/section/newmm.h" +#endif #define NDEBUG #include <debug.h> @@ -56,8 +58,6 @@ ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; - ASSERT(FALSE); - ExAcquireFastMutex(&RmapListLock); entry = MmGetRmapListHeadPage(Page); if (entry == NULL) @@ -197,7 +197,9 @@ } while (current_entry != NULL) { +#ifdef NEWCC if (!RMAP_IS_SEGMENT(current_entry->Address)) +#endif MmSetCleanPage(current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } @@ -219,7 +221,9 @@ } while (current_entry != NULL) { +#ifdef NEWCC if (!RMAP_IS_SEGMENT(current_entry->Address)) +#endif MmSetDirtyPage(current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } @@ -241,7 +245,10 @@ } while (current_entry != NULL) { - if (!RMAP_IS_SEGMENT(current_entry->Address) && + if ( +#ifdef NEWCC + !RMAP_IS_SEGMENT(current_entry->Address) && +#endif MmIsDirtyPage(current_entry->Process, current_entry->Address)) { ExReleaseFastMutex(&RmapListLock); @@ -261,8 +268,9 @@ PMM_RMAP_ENTRY current_entry; PMM_RMAP_ENTRY new_entry; ULONG PrevSize; - +#ifdef NEWCC if (!RMAP_IS_SEGMENT(Address)) +#endif Address = (PVOID)PAGE_ROUND_DOWN(Address); new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); @@ -280,7 +288,10 @@ #endif #endif - if (!RMAP_IS_SEGMENT(Address) && + if ( +#ifdef NEWCC + !RMAP_IS_SEGMENT(Address) && +#endif MmGetPfnForProcess(Process, Address) != Page) { DPRINT1("Insert rmap (%d, 0x%.8X) 0x%.8X which doesn't match physical " @@ -311,8 +322,9 @@ #endif MmSetRmapListHeadPage(Page, new_entry); ExReleaseFastMutex(&RmapListLock); - +#ifdef NEWCC if (!RMAP_IS_SEGMENT(Address)) +#endif { if (Process == NULL) { @@ -352,7 +364,9 @@ { previous_entry = current_entry; current_entry = current_entry->Next; +#ifdef NEWCC if (!RMAP_IS_SEGMENT(current_entry->Address)) +#endif { if (DeleteMapping) { @@ -370,10 +384,12 @@ (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } } +#ifdef NEWCC else { ExFreeToNPagedLookasideList(&RmapLookasideList, previous_entry); } +#endif } } @@ -403,7 +419,10 @@ } ExReleaseFastMutex(&RmapListLock); ExFreeToNPagedLookasideList(&RmapLookasideList, current_entry); - if (!RMAP_IS_SEGMENT(Address)) { +#ifdef NEWCC + if (!RMAP_IS_SEGMENT(Address)) +#endif + { if (Process == NULL) { Process = PsInitialSystemProcess; @@ -421,6 +440,7 @@ KeBugCheck(MEMORY_MANAGEMENT); } +#ifdef NEWCC PVOID NTAPI MmGetSegmentRmap(PFN_NUMBER Page, PULONG RawOffset) @@ -478,3 +498,4 @@ } ExReleaseFastMutex(&RmapListLock); } +#endif

1 0

[fireball] 49430: - Fix RosBuildShellHookWndList() declaration and its usage in user32. Fixes weird crashes "here and there" (c) ROS forum.
by fireball＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: fireball Date: Tue Nov 2 14:01:04 2010 New Revision: 49430 URL: http://svn.reactos.org/svn/reactos?rev=49430&view=rev Log: - Fix RosBuildShellHookWndList() declaration and its usage in user32. Fixes weird crashes "here and there" (c) ROS forum. Modified: branches/arwinss/reactos/dll/win32/user32/hook.c branches/arwinss/reactos/include/reactos/wine/rosuser.h Modified: branches/arwinss/reactos/dll/win32/user32/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] Tue Nov 2 14:01:04 2010 @@ -415,16 +415,19 @@ if (id == WH_SHELL) { - HWND *hook_windows = RosUserBuildShellHookHwndList(); - if (hook_windows) + HWND hook_windows[4]; // FIXME: Not a good way, but dynamic allocation all the time is stupid too + UINT cbListSize = sizeof(hook_windows); + if (!RosUserBuildShellHookHwndList(hook_windows, &cbListSize)) + { + ERR("Not enough hook windows array size!\n"); + } + else { INT wm_shellhook = RegisterWindowMessageW(L"SHELLHOOK"); - HWND* cursor = hook_windows; - - for (; *cursor; cursor++) - PostMessage(*cursor, wm_shellhook, code, wparam); - - HeapFree(GetProcessHeap(), 0, hook_windows); + INT wnd_num; + + for (wnd_num = 0; wnd_num < cbListSize / sizeof(HWND); wnd_num++) + PostMessage(hook_windows[wnd_num], wm_shellhook, code, wparam); } } Modified: branches/arwinss/reactos/include/reactos/wine/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] Tue Nov 2 14:01:04 2010 @@ -164,6 +164,15 @@ APIENTRY RosUserGetAsyncKeyboardState(BYTE key_state_table[]); +BOOL NTAPI +RosUserRegisterShellHookWindow(HWND hWnd); + +BOOL NTAPI +RosUserDeRegisterShellHookWindow(HWND hWnd); + +BOOL NTAPI +RosUserBuildShellHookHwndList(HWND *list, UINT *cbSize); + VOID NTAPI SwmAddWindow(HWND hWnd, RECT *WindowRect, DWORD style, DWORD ex_style);

1 0

[fireball] 49429: - Fix RosUserBuildShellhookWndList() implementation in win32k.
by fireball＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: fireball Date: Tue Nov 2 13:57:43 2010 New Revision: 49429 URL: http://svn.reactos.org/svn/reactos?rev=49429&view=rev Log: - Fix RosUserBuildShellhookWndList() implementation in win32k. Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Nov 2 13:57:43 2010 @@ -84,7 +84,7 @@ RosUserGetAsyncKeyState 1 RosUserRegisterShellHookWindow 1 RosUserDeRegisterShellHookWindow 1 -RosUserBuildShellHookHwndList 0 +RosUserBuildShellHookHwndList 2 SwmAddWindow 4 SwmAddDesktopWindow 3 SwmRemoveWindow 1 Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Tue Nov 2 13:57:43 2010 @@ -242,15 +242,15 @@ return FALSE; } -HWND * NTAPI -RosUserBuildShellHookHwndList() +BOOL NTAPI +RosUserBuildShellHookHwndList(HWND *list, UINT *cbSize) { //PPROCESSINFO process = PsGetCurrentProcessWin32Process(); //struct desktop *desktop; struct list *entry, *shell_hooks; PSHELL_HOOK_WINDOW hook_entry; ULONG entries=0; - HWND* list = NULL; + NTSTATUS Status = STATUS_SUCCESS; UserEnterExclusive(); @@ -266,22 +266,47 @@ { //release_object( desktop ); UserLeave(); - return NULL; - } - - list = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(HWND) * (entries + 1)); /* alloc one extra for nullterm */ - if (list) - { - HWND* cursor = list; - - LIST_FOR_EACH(entry, shell_hooks) + return FALSE; + } + + /* Check if enough user buffer was provided */ + if (*cbSize < sizeof(HWND) * entries) + { + *cbSize = sizeof(HWND) * entries; + //release_object( desktop ); + UserLeave(); + return FALSE; + } + + /* Fill the list */ + _SEH2_TRY + { + if (list) { - hook_entry = LIST_ENTRY( entry, SHELL_HOOK_WINDOW, ListEntry ); - - *cursor++ = hook_entry->hWnd; + HWND* cursor = list; + + LIST_FOR_EACH(entry, shell_hooks) + { + hook_entry = LIST_ENTRY( entry, SHELL_HOOK_WINDOW, ListEntry ); + + *cursor++ = hook_entry->hWnd; + } + + *cbSize = sizeof(HWND) * entries; } - - *cursor = NULL; /* nullterm list */ + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Return error in case of exception */ + if (!NT_SUCCESS(Status)) + { + //release_object( desktop ); + UserLeave(); + return FALSE; } //release_object( desktop ); @@ -289,7 +314,7 @@ UserLeave(); - return list; + return TRUE; } /* EOF */

1 0

[janderwald] 49428: [KSUSER, KS, SYSAUDIO] - Make pin / node / allocator create requests compatible to ms by removing obsolete slash before object class - Return correct error code in ksuser's KsCr...
by janderwald＠svn.reactos.org 02 Nov '10

02 Nov '10

Author: janderwald Date: Tue Nov 2 09:37:30 2010 New Revision: 49428 URL: http://svn.reactos.org/svn/reactos?rev=49428&view=rev Log: [KSUSER, KS, SYSAUDIO] - Make pin / node / allocator create requests compatible to ms by removing obsolete slash before object class - Return correct error code in ksuser's KsCreatePin - ReactOS KS is now able to create audio pins in Windows XP, though playback is not yet working - All changes except ksuser change has been verified to work with VBox 3.2.10 - KS user changes not tested yet as KSStudio not working in trunk Modified: trunk/reactos/dll/directx/ksuser/ksuser.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Tue Nov 2 09:37:30 2010 @@ -1,34 +1,19 @@ /* - * KSUSER.DLL - ReactOS - * - * Copyright 2008 Magnus Olsen and Dmitry Chapyshev - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: dll/directx/ksuser/ksuser.c + * PURPOSE: KS USER functions + * PROGRAMMER: Magnus Olsen and Dmitry Chapyshev and Johannes Anderwald */ - #include "ksuser.h" #define NDEBUG #include <debug.h> -NTSTATUS NTAPI KsiCreateObjectType( HANDLE hHandle, PVOID guidstr, PVOID Buffer, ULONG BufferSize, ACCESS_MASK DesiredAccess, PHANDLE phHandle); - NTSTATUS NTAPI KsiCreateObjectType( HANDLE hHandle, - PVOID IID, + LPWSTR ObjectType, PVOID Buffer, ULONG BufferSize, ACCESS_MASK DesiredAccess, @@ -42,31 +27,56 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - Length = wcslen(IID); - - TotalSize = (Length * sizeof(WCHAR)) + BufferSize + 4 * sizeof(WCHAR); - + /* get length of object type */ + Length = wcslen(ObjectType); + + /* get length for request */ + TotalSize = (Length * sizeof(WCHAR)) + BufferSize; + + /* append space for '\\'*/ + TotalSize += sizeof(WCHAR); + + /* allocate buffer */ pStr = HeapAlloc(GetProcessHeap(), 0, TotalSize); if (!pStr) - return STATUS_INSUFFICIENT_RESOURCES; - pStr[0] = L'\\'; - wcscpy(&pStr[1], (LPWSTR)IID); - pStr[Length+1] = L'\\'; - memcpy(&pStr[Length+2], Buffer, BufferSize); - pStr[Length+3+(BufferSize/sizeof(WCHAR))] = L'\0'; - - RtlInitUnicodeString(&ObjectName, pStr); + { + /* out of memory */ + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* copy object type */ + wcscpy(pStr, ObjectType); + + /* append slash */ + pStr[Length] = L'\\'; + + /* append parameters */ + memcpy(&pStr[Length+1], Buffer, BufferSize); + + /* initialize object name */ + ObjectName.Buffer = pStr; ObjectName.Length = ObjectName.MaximumLength = TotalSize; + /* initialize object attributes */ InitializeObjectAttributes(&ObjectAttributes, &ObjectName, OBJ_CASE_INSENSITIVE, hHandle, NULL); + /* create the object */ Status = NtCreateFile(phHandle, DesiredAccess, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, 0, 1, 0, NULL, 0); + + /* free buffer */ HeapFree(GetProcessHeap(), 0, pStr); + + /* check for success */ if (!NT_SUCCESS(Status)) { + /* failed zero handle */ *phHandle = INVALID_HANDLE_VALUE; + + /* convert error code */ Status = RtlNtStatusToDosError(Status); } + + /* done */ return Status; } Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Nov 2 09:37:30 2010 @@ -1739,22 +1739,24 @@ PLIST_ENTRY Entry; PCREATE_ITEM_ENTRY CreateItemEntry; UNICODE_STRING RefString; - - -#ifndef MS_KSUSER - /* remove '\' slash */ - Buffer++; - BufferSize -= sizeof(WCHAR); -#endif - - if (!wcschr(Buffer, L'\\')) - { - RtlInitUnicodeString(&RefString, Buffer); + LPWSTR pStr; + + /* get terminator */ + pStr = wcschr(Buffer, L'\\'); + + /* sanity check */ + ASSERT(pStr != NULL); + + if (pStr == Buffer) + { + // skip slash + RtlInitUnicodeString(&RefString, ++pStr); } else { + // request is for pin / node / allocator RefString.Buffer = Buffer; - RefString.Length = RefString.MaximumLength = ((ULONG_PTR)wcschr(Buffer, L'\\') - (ULONG_PTR)Buffer); + RefString.Length = BufferSize = RefString.MaximumLength = ((ULONG_PTR)pStr - (ULONG_PTR)Buffer); } /* point to first entry */ Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Nov 2 09:37:30 2010 @@ -95,7 +95,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); /* get object class length */ - ObjectLength = (wcslen(ObjectClass) + 2) * sizeof(WCHAR); + ObjectLength = (wcslen(ObjectClass) + 1) * sizeof(WCHAR); /* check for minium length requirement */ if (ObjectLength + *Size > IoStack->FileObject->FileName.MaximumLength) Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Tue Nov 2 09:37:30 2010 @@ -27,7 +27,7 @@ /* calculate request length */ Name.Length = 0; - Name.MaximumLength = wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 2 * sizeof(WCHAR); + Name.MaximumLength = wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 1 * sizeof(WCHAR); Name.MaximumLength += sizeof(WCHAR); /* acquire request buffer */ Name.Buffer = AllocateItem(NonPagedPool, Name.MaximumLength); @@ -42,7 +42,6 @@ * For pins the parent is the reference string used in registration * For clocks it is full path for pin\{ClockGuid}\ClockCreateParams */ - RtlAppendUnicodeToString(&Name, L"\\"); RtlAppendUnicodeToString(&Name, ObjectType); RtlAppendUnicodeToString(&Name, L"\\"); /* append create parameters */ Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Tue Nov 2 09:37:30 2010 @@ -398,7 +398,7 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); /* get object class length */ - ObjectLength = (wcslen(KSSTRING_Pin) + 2) * sizeof(WCHAR); + ObjectLength = (wcslen(KSSTRING_Pin) + 1) * sizeof(WCHAR); /* check for minium length requirement */ if (ObjectLength + sizeof(KSPIN_CONNECT) > IoStack->FileObject->FileName.MaximumLength)

1 0

← Newer
1
...
42
43
44
45
46
47
48
49
50
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 November 2010