Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[jimtabor] 42151: - [Win32k] More work on classes. Wine test drop to 35 failures from 52, now with the system class rewrite it is up to 42 failures. There is one User32 loaded so there is one User client Instance for this system. One System class per system not including Public (Global) or Private (Local) classes per process. Sorting continues. - Tested wine (some improvements and losses), Firefox 1.15.xx and AbiWord 2.6.8.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 23 03:34:31 2009 New Revision: 42151 URL: http://svn.reactos.org/svn/reactos?rev=42151&view=rev Log: - [Win32k] More work on classes. Wine test drop to 35 failures from 52, now with the system class rewrite it is up to 42 failures. There is one User32 loaded so there is one User client Instance for this system. One System class per system not including Public (Global) or Private (Local) classes per process. Sorting continues. - Tested wine (some improvements and losses), Firefox 1.15.xx and AbiWord 2.6.8. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -70,9 +70,6 @@ #define NtUserSetCaretBlinkTime(uMSeconds) \ (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME) -#define NtUserRegisterUserModule(hInstance) \ - (BOOL)NtUserCallOneParam((DWORD)hInstance, ONEPARAM_ROUTINE_REGISTERUSERMODULE) - /* #define NtUserEnumClipboardFormats(format) \ (UINT)NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS) Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -244,7 +244,6 @@ gHandleEntries = SharedPtrToUser(gHandleTable->handles); //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); - RegisterClientPFN(); /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); if (User32TlsIndex != TLS_OUT_OF_INDEXES) @@ -290,7 +289,7 @@ { case DLL_PROCESS_ATTACH: User32Instance = hInstanceDll; - if (!NtUserRegisterUserModule(hInstanceDll) || + if (!RegisterClientPFN() || !RegisterSystemControls()) { return FALSE; @@ -351,8 +350,6 @@ g_ulSharedDelta = UserCon.siClient.ulSharedDelta; g_psi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - - RegisterClientPFN(); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); } Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -136,8 +136,6 @@ WNDCLASSEXA wcex; BOOL retval; - if (!hInstance) hInstance = User32Instance; - retval = GetClassInfoExA(hInstance, lpClassName, &wcex); if (retval) { @@ -145,7 +143,7 @@ lpWndClass->lpfnWndProc = wcex.lpfnWndProc; lpWndClass->cbClsExtra = wcex.cbClsExtra; lpWndClass->cbWndExtra = wcex.cbWndExtra; - lpWndClass->hInstance = (User32Instance == hInstance) ? 0 : wcex.hInstance; + lpWndClass->hInstance = wcex.hInstance; lpWndClass->hIcon = wcex.hIcon; lpWndClass->hCursor = wcex.hCursor; lpWndClass->hbrBackground = wcex.hbrBackground; @@ -169,8 +167,6 @@ WNDCLASSEXW wcex; BOOL retval; - if (!hInstance) hInstance = User32Instance; - retval = GetClassInfoExW(hInstance, lpClassName, &wcex); if (retval) { @@ -178,7 +174,7 @@ lpWndClass->lpfnWndProc = wcex.lpfnWndProc; lpWndClass->cbClsExtra = wcex.cbClsExtra; lpWndClass->cbWndExtra = wcex.cbWndExtra; - lpWndClass->hInstance = (User32Instance == hInstance) ? 0 : wcex.hInstance; + lpWndClass->hInstance = wcex.hInstance; lpWndClass->hIcon = wcex.hIcon; lpWndClass->hCursor = wcex.hCursor; lpWndClass->hbrBackground = wcex.hbrBackground; Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -2988,7 +2988,6 @@ #define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0xfffe0010 #define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 // CREATE_EMPTY_CURSOR_OBJECT ? #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 -#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -1,7 +1,11 @@ #ifndef __INCLUDE_NAPI_WIN32_H #define __INCLUDE_NAPI_WIN32_H -extern HINSTANCE hModClient; // This should replace (PROCESSINFO)->hModUser +extern BOOL ClientPfnInit; +extern HINSTANCE hModClient; +extern HANDLE hModuleWin; // This Win32k Instance. +extern PCLS SystemClassList; +extern BOOL RegisteredSysClasses; typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; @@ -99,14 +103,11 @@ typedef struct _PROCESSINFO { W32PROCESS XzyxW32Process; /* Place holder. */ + + PCLS pclsPrivateList; + PCLS pclsPublicList; /* ReactOS */ - HINSTANCE hModUser; - PCLS LocalClassList; - PCLS GlobalClassList; - PCLS SystemClassList; - - UINT RegisteredSysClasses : 1; - + } PROCESSINFO; #endif /* __INCLUDE_NAPI_WIN32_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -1,21 +1,3 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998 - 2006 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 @@ -34,6 +16,9 @@ #define TRACE DPRINT #define WARN DPRINT1 #define ERR DPRINT1 + +PCLS SystemClassList = NULL; +BOOL RegisteredSysClasses = FALSE; static struct { @@ -137,43 +122,31 @@ { PCLS Class; PPROCESSINFO pi = (PPROCESSINFO)Process; - + if (pi != NULL) { /* free all local classes */ - Class = pi->LocalClassList; + Class = pi->pclsPrivateList; while (Class != NULL) { - pi->LocalClassList = Class->pclsNext; + pi->pclsPrivateList = Class->pclsNext; ASSERT(Class->pclsBase == Class); IntDestroyClass(Class); - Class = pi->LocalClassList; + Class = pi->pclsPrivateList; } /* free all global classes */ - Class = pi->GlobalClassList; + Class = pi->pclsPublicList; while (Class != NULL) { - pi->GlobalClassList = Class->pclsNext; + pi->pclsPublicList = Class->pclsNext; ASSERT(Class->pclsBase == Class); IntDestroyClass(Class); - Class = pi->GlobalClassList; - } - - /* free all system classes */ - Class = pi->SystemClassList; - while (Class != NULL) - { - pi->SystemClassList = Class->pclsNext; - - ASSERT(Class->pclsBase == Class); - IntDestroyClass(Class); - - Class = pi->SystemClassList; + Class = pi->pclsPublicList; } } } @@ -632,11 +605,11 @@ if (BaseClass->pclsClone != NULL) { if (BaseClass->System) - PrevLink = &pi->SystemClassList; + PrevLink = &SystemClassList; else if (BaseClass->Global) - PrevLink = &pi->GlobalClassList; + PrevLink = &pi->pclsPublicList; else - PrevLink = &pi->LocalClassList; + PrevLink = &pi->pclsPrivateList; CurrentClass = *PrevLink; while (CurrentClass != BaseClass) @@ -810,19 +783,19 @@ /* check all local classes */ IntCheckDesktopClasses(Desktop, - &pi->LocalClassList, + &pi->pclsPrivateList, FreeOnFailure, &Ret); /* check all global classes */ IntCheckDesktopClasses(Desktop, - &pi->GlobalClassList, + &pi->pclsPublicList, FreeOnFailure, &Ret); /* check all system classes */ IntCheckDesktopClasses(Desktop, - &pi->SystemClassList, + &SystemClassList, FreeOnFailure, &Ret); @@ -891,6 +864,8 @@ Class->rpdeskParent = Desktop; Class->pclsBase = Class; Class->atomClassName = Atom; + + Class->CSF_flags = dwFlags; if (dwFlags & CSF_SYSTEMCLASS) { @@ -1117,7 +1092,7 @@ /* Step 1: try to find an exact match of locally registered classes */ Class = IntFindClass(Atom, hInstance, - &pi->LocalClassList, + &pi->pclsPrivateList, Link); if (Class != NULL) { @@ -1128,7 +1103,7 @@ is not relevant for global classes */ Class = IntFindClass(Atom, NULL, - &pi->GlobalClassList, + &pi->pclsPublicList, Link); if (Class != NULL) { @@ -1137,8 +1112,8 @@ /* Step 3: try to find any local class registered by user32 */ Class = IntFindClass(Atom, - pi->hModUser, - &pi->LocalClassList, + hModClient, + &pi->pclsPrivateList, Link); if (Class != NULL) { @@ -1147,8 +1122,8 @@ /* Step 4: try to find any global class registered by user32 */ Class = IntFindClass(Atom, - pi->hModUser, - &pi->GlobalClassList, + hModClient, + &pi->pclsPublicList, Link); if (Class != NULL) { @@ -1158,7 +1133,7 @@ /* Step 5: try to find a system class */ Class = IntFindClass(Atom, NULL, - &pi->SystemClassList, + &SystemClassList, Link); if (Class == NULL) { @@ -1191,7 +1166,7 @@ pti = PsGetCurrentThreadWin32Thread(); ti = GetW32ThreadInfo(); - if (ti == NULL || !ti->ppi->RegisteredSysClasses) + if (ti == NULL || !RegisteredSysClasses) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return (RTL_ATOM)0; @@ -1240,11 +1215,11 @@ /* Register the class */ if (Class->System) - List = &pi->SystemClassList; + List = &SystemClassList; else if (Class->Global) - List = &pi->GlobalClassList; + List = &pi->pclsPublicList; else - List = &pi->LocalClassList; + List = &pi->pclsPrivateList; Class->pclsNext = *List; (void)InterlockedExchangePointer((PVOID*)List, @@ -1763,7 +1738,7 @@ if (!IntSetClassMenuName(Class, Value)) { - DPRINT("Setting the class menu name failed!\n"); + DPRINT1("Setting the class menu name failed!\n"); } /* FIXME - really return NULL? Wine does so... */ @@ -1841,10 +1816,10 @@ else lpwcx->lpszMenuName = Class->MenuName; - if (Class->hModule == pi->hModUser) + if (hInstance == hModClient) lpwcx->hInstance = NULL; else - lpwcx->hInstance = Class->hModule; + lpwcx->hInstance = hInstance; lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->atomClassName); /* FIXME - return the string? */ @@ -1865,8 +1840,11 @@ PCLS Class; BOOL Ret = TRUE; - if (pi->RegisteredSysClasses || pi->hModUser == NULL) + if ( hModClient == NULL) return FALSE; + /* Init System Classes once only*/ + if (RegisteredSysClasses) + return TRUE; RtlZeroMemory(&MenuName, sizeof(MenuName)); @@ -1885,7 +1863,7 @@ wc.lpfnWndProc = SystemClasses[i].ProcW; wc.cbClsExtra = 0; wc.cbWndExtra = SystemClasses[i].ExtraBytes; - wc.hInstance = pi->hModUser; + wc.hInstance = hModClient; wc.hIcon = NULL; wc.hCursor = SystemClasses[i].hCursor; wc.hbrBackground = SystemClasses[i].hBrush; @@ -1911,8 +1889,8 @@ } ASSERT(Class->System); - Class->pclsNext = pi->SystemClassList; - (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, + Class->pclsNext = SystemClassList; + (void)InterlockedExchangePointer((PVOID*)&SystemClassList, Class); } else @@ -1923,7 +1901,7 @@ } if (Ret) - pi->RegisteredSysClasses = TRUE; + RegisteredSysClasses = TRUE; return Ret; } @@ -2294,8 +2272,8 @@ NULL); if (ClassAtom != (RTL_ATOM)0) { - if (hInstance == NULL) - hInstance = pi->hModUser; + if (hInstance == NULL) + hInstance = hModClient; Ret = UserGetClassInfo(Class, lpWndClassEx, @@ -2313,7 +2291,8 @@ (PVOID)Class->AnsiMenuName : (PVOID)Class->MenuName); } - + // From Wine: + /* We must return the atom of the class here instead of just TRUE. */ /* Undocumented behavior! Return the class atom as a BOOL! */ Ret = (BOOL)ClassAtom; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -1122,7 +1122,7 @@ wc.lpfnWndProc = gpsi->apfnClientW.pfnDesktopWndProc; // Use User32 Desktop Proc. wc.cbClsExtra = 0; wc.cbWndExtra = 0; - wc.hInstance = pi->hModUser; // hModClient; + wc.hInstance = hModClient; wc.hIcon = NULL; wc.hCursor = NULL; wc.hbrBackground = 0; @@ -1140,8 +1140,8 @@ if (Class != NULL) { ASSERT(Class->System); - Class->pclsNext = pi->SystemClassList; - (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, + Class->pclsNext = SystemClassList; + (void)InterlockedExchangePointer((PVOID*)&SystemClassList, Class); } else @@ -1159,7 +1159,7 @@ 100, NULL, NULL, - pi->hModUser, // hModClient; + hModClient, NULL, 0, TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -366,6 +366,9 @@ { NTSTATUS Status = STATUS_SUCCESS; DPRINT("Enter NtUserInitializeClientPfnArrays User32 0x%x\n",hmodUser); + + if (ClientPfnInit) return Status; + UserEnterExclusive(); _SEH2_TRY @@ -378,6 +381,7 @@ RtlCopyMemory(&gpsi->apfnClientWorker, pfnClientWorker, sizeof(PFNCLIENTWORKER)); hModClient = hmodUser; + ClientPfnInit = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Thu Jul 23 03:34:31 2009 @@ -22,6 +22,7 @@ ATOM AtomMessage; // Window Message atom. BOOL gbInitialized; HINSTANCE hModClient = NULL; +BOOL ClientPfnInit = FALSE; /* PRIVATE FUNCTIONS *********************************************************/ 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] Thu Jul 23 03:34:31 2009 @@ -344,25 +344,6 @@ case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT: RETURN( (DWORD)UserGetKeyboardLayout(Param)); - case ONEPARAM_ROUTINE_REGISTERUSERMODULE: - { - PW32THREADINFO ti; - - ti = GetW32ThreadInfo(); - if (ti == NULL) - { - DPRINT1("Cannot register user32 module instance!\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN(FALSE); - } - - if (InterlockedCompareExchangePointer(&ti->ppi->hModUser, - (HINSTANCE)Param, - NULL) == NULL) - { - RETURN(TRUE); - } - } case ONEPARAM_ROUTINE_RELEASEDC: RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE));

15 years, 5 months

[janderwald] 42150: - Implement KsQueryObjectAccessMask, KsQueryObjectCreateItem - Use KSQUEUE_SPINLOCK_IRP_STORAGE macro for access the stored spin lock

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jul 23 02:47:21 2009 New Revision: 42150 URL: http://svn.reactos.org/svn/reactos?rev=42150&view=rev Log: - Implement KsQueryObjectAccessMask, KsQueryObjectCreateItem - Use KSQUEUE_SPINLOCK_IRP_STORAGE macro for access the stored spin lock Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kstypes.h Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Jul 23 02:47:21 2009 @@ -245,7 +245,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI ACCESS_MASK @@ -253,8 +253,11 @@ KsQueryObjectAccessMask( IN KSOBJECT_HEADER Header) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PKSIOBJECT_HEADER ObjectHeader = (PKSIOBJECT_HEADER)Header; + + /* return access mask */ + return ObjectHeader->AccessMask; + } /* @@ -402,7 +405,7 @@ /* - @unimplemented + @implemented */ KSDDKAPI PKSOBJECT_CREATE_ITEM @@ -410,8 +413,8 @@ KsQueryObjectCreateItem( IN KSOBJECT_HEADER Header) { - UNIMPLEMENTED; - return NULL; + PKSIOBJECT_HEADER ObjectHeader = (PKSIOBJECT_HEADER)Header; + return ObjectHeader->OriginalCreateItem; } NTSTATUS @@ -648,6 +651,13 @@ /* store parent device */ ObjectHeader->ParentDeviceObject = IoGetRelatedDeviceObject(IoStack->FileObject); + + /* store originating create item */ + ObjectHeader->OriginalCreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + + /* FIXME store access mask see KsQueryObjectAccessMask */ + ObjectHeader->AccessMask = IoStack->Parameters.Create.SecurityContext->DesiredAccess; + /* store result */ *Header = ObjectHeader; @@ -1145,3 +1155,4 @@ return STATUS_UNSUCCESSFUL; } + 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] Thu Jul 23 02:47:21 2009 @@ -830,10 +830,8 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - /* get internal queue lock - * see KsAddIrpToCancelableQueue - */ - SpinLock = (PKSPIN_LOCK)Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink; + /* get internal queue lock */ + SpinLock = KSQUEUE_SPINLOCK_IRP_STORAGE(Irp); /* acquire spinlock */ KeAcquireSpinLock(SpinLock, &OldLevel); @@ -993,10 +991,8 @@ PKSPIN_LOCK SpinLock; KIRQL OldLevel; - /* get internal queue lock - * see KsAddIrpToCancelableQueue - */ - SpinLock = (PKSPIN_LOCK)Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink; + /* get internal queue lock */ + SpinLock = KSQUEUE_SPINLOCK_IRP_STORAGE(Irp); /* acquire spinlock */ KeAcquireSpinLock(SpinLock, &OldLevel); @@ -1053,11 +1049,8 @@ InsertHeadList(QueueHead, &Irp->Tail.Overlay.ListEntry); } - /* store the spinlock in the device queue list entry, - * as other fields may have been internally been used - * used in KsCancelRoutine - */ - Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink = (PLIST_ENTRY)SpinLock; + /* store internal queue lock */ + KSQUEUE_SPINLOCK_IRP_STORAGE(Irp) = SpinLock; /* now set the cancel routine */ OldDriverCancel = IoSetCancelRoutine(Irp, DriverCancel); @@ -1093,10 +1086,8 @@ PKSPIN_LOCK SpinLock; KIRQL OldLevel; - /* get internal queue lock - * see KsAddIrpToCancelableQueue - */ - SpinLock = (PKSPIN_LOCK)Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink; + /* get internal queue lock */ + SpinLock = KSQUEUE_SPINLOCK_IRP_STORAGE(Irp); /* acquire spinlock */ KeAcquireSpinLock(SpinLock, &OldLevel); Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Thu Jul 23 02:47:21 2009 @@ -20,6 +20,8 @@ PFNKSCONTEXT_DISPATCH PowerDispatch; PVOID PowerContext; LIST_ENTRY PowerDispatchEntry; + PKSOBJECT_CREATE_ITEM OriginalCreateItem; + ACCESS_MASK AccessMask; }KSIOBJECT_HEADER, *PKSIOBJECT_HEADER;

15 years, 5 months

[janderwald] 42149: - Remove old irp queue implementation - Implement KsCancelIo, KsReleaseIrpOnCancelableQueue, KsRemoveIrpFromCancelableQueue, KsRemoveSpecificIrpFromCancelableQueue, KsAddIrpToCancelableQueue, KsCancelRoutine

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jul 23 02:13:04 2009 New Revision: 42149 URL: http://svn.reactos.org/svn/reactos?rev=42149&view=rev Log: - Remove old irp queue implementation - Implement KsCancelIo, KsReleaseIrpOnCancelableQueue, KsRemoveIrpFromCancelableQueue, KsRemoveSpecificIrpFromCancelableQueue, KsAddIrpToCancelableQueue, KsCancelRoutine Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kstypes.h 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] Thu Jul 23 02:13:04 2009 @@ -746,7 +746,7 @@ /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -755,11 +755,55 @@ IN OUT PLIST_ENTRY QueueHead, IN PKSPIN_LOCK SpinLock) { - UNIMPLEMENTED; -} - -/* - @unimplemented + PDRIVER_CANCEL OldDriverCancel; + PIO_STACK_LOCATION IoStack; + PLIST_ENTRY Entry; + PIRP Irp; + KIRQL OldLevel; + + /* acquire spinlock */ + KeAcquireSpinLock(SpinLock, &OldLevel); + /* point to first entry */ + Entry = QueueHead->Flink; + /* loop all items */ + while(Entry != QueueHead) + { + /* get irp offset */ + Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + + /* set cancelled bit */ + Irp->Cancel = TRUE; + + /* now set the cancel routine */ + OldDriverCancel = IoSetCancelRoutine(Irp, NULL); + if (OldDriverCancel) + { + /* this irp hasnt been yet used, so free to cancel */ + KeReleaseSpinLock(SpinLock, OldLevel); + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* acquire cancel spinlock */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + + /* call provided cancel routine */ + OldDriverCancel(IoStack->DeviceObject, Irp); + + /* re-acquire spinlock */ + KeAcquireSpinLock(SpinLock, &OldLevel); + } + /* move on to next entry */ + Entry = Entry->Flink; + } + + /* the irp has already been canceled */ + KeReleaseSpinLock(SpinLock, OldLevel); + +} + +/* + @implemented */ KSDDKAPI VOID @@ -768,7 +812,51 @@ IN PIRP Irp, IN PDRIVER_CANCEL DriverCancel OPTIONAL) { - UNIMPLEMENTED; + PKSPIN_LOCK SpinLock; + PDRIVER_CANCEL OldDriverCancel; + PIO_STACK_LOCATION IoStack; + KIRQL OldLevel; + + /* check for required parameters */ + if (!Irp) + return; + + if (!DriverCancel) + { + /* default to KsCancelRoutine */ + DriverCancel = KsCancelRoutine; + } + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get internal queue lock + * see KsAddIrpToCancelableQueue + */ + SpinLock = (PKSPIN_LOCK)Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink; + + /* acquire spinlock */ + KeAcquireSpinLock(SpinLock, &OldLevel); + + /* now set the cancel routine */ + OldDriverCancel = IoSetCancelRoutine(Irp, DriverCancel); + + if (Irp->Cancel && OldDriverCancel == NULL) + { + /* the irp has already been canceled */ + KeReleaseSpinLock(SpinLock, OldLevel); + + /* cancel routine requires that cancel spinlock is held */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + + /* cancel irp */ + DriverCancel(IoStack->DeviceObject, Irp); + } + else + { + /* done */ + KeReleaseSpinLock(SpinLock, OldLevel); + } } /* @@ -783,49 +871,95 @@ IN KSLIST_ENTRY_LOCATION ListLocation, IN KSIRP_REMOVAL_OPERATION RemovalOperation) { - PQUEUE_ENTRY Entry = NULL; PIRP Irp; + PLIST_ENTRY CurEntry; KIRQL OldIrql; + /* check parameters */ if (!QueueHead || !SpinLock) return NULL; + /* check if parameter ListLocation is valid */ if (ListLocation != KsListEntryTail && ListLocation != KsListEntryHead) return NULL; - if (RemovalOperation != KsAcquireOnly && RemovalOperation != KsAcquireAndRemove) - return NULL; - + /* acquire list lock */ KeAcquireSpinLock(SpinLock, &OldIrql); - if (!IsListEmpty(QueueHead)) - { - if (RemovalOperation == KsAcquireOnly) - { - if (ListLocation == KsListEntryHead) - Entry = (PQUEUE_ENTRY)QueueHead->Flink; - else - Entry = (PQUEUE_ENTRY)QueueHead->Blink; - } - else if (RemovalOperation == KsAcquireAndRemove) - { - if (ListLocation == KsListEntryTail) - Entry = (PQUEUE_ENTRY)RemoveTailList(QueueHead); - else - Entry = (PQUEUE_ENTRY)RemoveHeadList(QueueHead); - } - } + /* point to queue head */ + CurEntry = QueueHead; + + do + { + /* reset irp to null */ + Irp = NULL; + + /* iterate to next entry */ + if (ListLocation == KsListEntryHead) + CurEntry = CurEntry->Flink; + else + CurEntry = CurEntry->Blink; + + /* is the end of list reached */ + if (CurEntry == QueueHead) + { + /* reached end of list */ + break; + } + + /* get irp offset */ + Irp = (PIRP)CONTAINING_RECORD(Irp, IRP, Tail.Overlay.ListEntry); + + if (Irp->Cancel) + { + /* irp has been canceled */ + break; + } + + if (Irp->CancelRoutine) + { + /* remove cancel routine */ + Irp->CancelRoutine = NULL; + + if (RemovalOperation == KsAcquireAndRemove || RemovalOperation == KsAcquireAndRemoveOnlySingleItem) + { + /* remove irp from list */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + } + + if (RemovalOperation == KsAcquireAndRemoveOnlySingleItem || RemovalOperation == KsAcquireOnlySingleItem) + break; + } + + }while(TRUE); + + /* release lock */ KeReleaseSpinLock(SpinLock, OldIrql); - if (!Entry) - return NULL; - - Irp = Entry->Irp; - - if (RemovalOperation == KsAcquireAndRemove) - ExFreePool(Entry); - - return Irp; + if (!Irp || Irp->CancelRoutine == NULL) + { + /* either an irp has been acquired or nothing found */ + return Irp; + } + + /* time to remove the canceled irp */ + IoAcquireCancelSpinLock(&OldIrql); + /* acquire list lock */ + KeAcquireSpinLockAtDpcLevel(SpinLock); + + if (RemovalOperation == KsAcquireAndRemove || RemovalOperation == KsAcquireAndRemoveOnlySingleItem) + { + /* remove it */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + } + + /* release list lock */ + KeReleaseSpinLockFromDpcLevel(SpinLock); + + /* release cancel spinlock */ + IoReleaseCancelSpinLock(OldIrql); + /* no non canceled irp has been found */ + return NULL; } /* @@ -848,7 +982,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -856,7 +990,22 @@ KsRemoveSpecificIrpFromCancelableQueue( IN PIRP Irp) { - UNIMPLEMENTED; + PKSPIN_LOCK SpinLock; + KIRQL OldLevel; + + /* get internal queue lock + * see KsAddIrpToCancelableQueue + */ + SpinLock = (PKSPIN_LOCK)Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink; + + /* acquire spinlock */ + KeAcquireSpinLock(SpinLock, &OldLevel); + + /* remove the irp from the list */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + /* release spinlock */ + KeReleaseSpinLock(SpinLock, OldLevel); } @@ -873,11 +1022,66 @@ IN KSLIST_ENTRY_LOCATION ListLocation, IN PDRIVER_CANCEL DriverCancel OPTIONAL) { - UNIMPLEMENTED; -} - -/* - @unimplemented + PDRIVER_CANCEL OldDriverCancel; + PIO_STACK_LOCATION IoStack; + KIRQL OldLevel; + + /* check for required parameters */ + if (!QueueHead || !SpinLock || !Irp) + return; + + if (!DriverCancel) + { + /* default to KsCancelRoutine */ + DriverCancel = KsCancelRoutine; + } + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* acquire spinlock */ + KeAcquireSpinLock(SpinLock, &OldLevel); + + if (ListLocation == KsListEntryTail) + { + /* insert irp to tail of list */ + InsertTailList(QueueHead, &Irp->Tail.Overlay.ListEntry); + } + else + { + /* insert irp to head of list */ + InsertHeadList(QueueHead, &Irp->Tail.Overlay.ListEntry); + } + + /* store the spinlock in the device queue list entry, + * as other fields may have been internally been used + * used in KsCancelRoutine + */ + Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink = (PLIST_ENTRY)SpinLock; + + /* now set the cancel routine */ + OldDriverCancel = IoSetCancelRoutine(Irp, DriverCancel); + + if (Irp->Cancel && OldDriverCancel == NULL) + { + /* the irp has already been canceled */ + KeReleaseSpinLock(SpinLock, OldLevel); + + /* cancel routine requires that cancel spinlock is held */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + + /* cancel irp */ + DriverCancel(IoStack->DeviceObject, Irp); + } + else + { + /* done */ + KeReleaseSpinLock(SpinLock, OldLevel); + } +} + +/* + @implemented */ KSDDKAPI VOID @@ -886,7 +1090,36 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; + PKSPIN_LOCK SpinLock; + KIRQL OldLevel; + + /* get internal queue lock + * see KsAddIrpToCancelableQueue + */ + SpinLock = (PKSPIN_LOCK)Irp->Tail.Overlay.DeviceQueueEntry.DeviceListEntry.Flink; + + /* acquire spinlock */ + KeAcquireSpinLock(SpinLock, &OldLevel); + + /* sanity check */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + /* release cancel spinlock */ + IoReleaseCancelSpinLock(DISPATCH_LEVEL); + + /* remove the irp from the list */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + /* release spinlock */ + KeReleaseSpinLock(SpinLock, OldLevel); + + /* has the irp already been canceled */ + if (Irp->IoStatus.Status != STATUS_CANCELLED) + { + /* let's complete it */ + Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } } /* Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Thu Jul 23 02:13:04 2009 @@ -74,12 +74,6 @@ typedef struct { LIST_ENTRY Entry; - PIRP Irp; -}QUEUE_ENTRY, *PQUEUE_ENTRY; - -typedef struct -{ - LIST_ENTRY Entry; UNICODE_STRING SymbolicLink; }SYMBOLIC_LINK_ENTRY, *PSYMBOLIC_LINK_ENTRY;

15 years, 5 months

[ros-arm-bringup] 42148: - Initialize the value of MmBootImageSize in ARM3 now. - Also fix its value such that it's PDE aligned -- this makes sure that we don't step on any of the boot loader's PDE mappings and can blow everything away later. - Initialize the MmSystem/User/Probe Addresses in ARM3 as well (no functional change). - Print out a lot more of the VA ranges in ARM3's Phase 2 initialization. Most of the VA space is now dumped out. - Write out the code to initialize session space VA rang

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Jul 23 00:46:29 2009 New Revision: 42148 URL: http://svn.reactos.org/svn/reactos?rev=42148&view=rev Log: - Initialize the value of MmBootImageSize in ARM3 now. - Also fix its value such that it's PDE aligned -- this makes sure that we don't step on any of the boot loader's PDE mappings and can blow everything away later. - Initialize the MmSystem/User/Probe Addresses in ARM3 as well (no functional change). - Print out a lot more of the VA ranges in ARM3's Phase 2 initialization. Most of the VA space is now dumped out. - Write out the code to initialize session space VA ranges - Image space, view space, working set space and pool space values are all calculated properly. - NT default sizes are used, without support for registry overrides (yet). - Also system view space is initialized and sized. - Code is heavily commented and explained for inquisitive minds. - Define the paged pool start address, minimum/default size, and add some extra pool header asserts/definitions. - Define MmPagedPoolInfo to keep track of all paged pool related information (start/end PTEs, VA ranges, allocation/free bitmaps, etc). - Fixed a lot of comments and added some new ones to provide extra clarity. - Implement MiBuildPagedPool. It has two jobs: - Build and create the shadow system page directory, which double-maps the System process' PDE. - More explenations are in the comments. - Define the paged pool region and size, and initialize MmPagedPoolInfo accordingly. - Create and setup the paged pool allocation and free bitmaps (again explained in the comments). - There shouldn't be any real functional change yet due to this commit. - We need to create memory areas for session space and system view space otherwise the VA regions could get used by ReactOS instead. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Jul 23 00:46:29 2009 @@ -52,8 +52,8 @@ // immediately follows the PFN database, typically sharing the same PDE. It is // a very small resource (32MB on a 1GB system), and capped at 128MB. // -// Right now, we call this the "ARM Pool" and it begins somewhere after the ARM -// PFN database (which starts at 0xB0000000). +// Right now we call this the "ARMÂ³ Nonpaged Pool" and it begins somewhere after +// the PFN database (which starts at 0xB0000000). // // The expansion nonpaged pool, on the other hand, can grow much bigger (400MB // for a 1GB system). On ARMÂ³ however, it is currently capped at 128MB. @@ -93,7 +93,63 @@ PVOID MmNonPagedSystemStart; PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; -PVOID MmNonPagedPoolEnd = (PVOID)0xFFBE0000; +PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; + +// +// This is where paged pool starts by default +// +PVOID MmPagedPoolStart = MI_PAGED_POOL_START; +PVOID MmPagedPoolEnd; + +// +// And this is its default size +// +ULONG MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; +PFN_NUMBER MmSizeOfPagedPoolInPages = MI_MIN_INIT_PAGED_POOLSIZE / PAGE_SIZE; + +// +// Session space starts at 0xBFFFFFFF and grows downwards +// By default, it includes an 8MB image area where we map win32k and video card +// drivers, followed by a 4MB area containing the session's working set. This is +// then followed by a 20MB mapped view area and finally by the session's paged +// pool, by default 16MB. +// +// On a normal system, this results in session space occupying the region from +// 0xBD000000 to 0xC0000000 +// +// See miarm.h for the defines that determine the sizing of this region. On an +// NT system, some of these can be configured through the registry, but we don't +// support that yet. +// +PVOID MiSessionSpaceEnd; // 0xC0000000 +PVOID MiSessionImageEnd; // 0xC0000000 +PVOID MiSessionImageStart; // 0xBF800000 +PVOID MiSessionViewStart; // 0xBE000000 +PVOID MiSessionPoolEnd; // 0xBE000000 +PVOID MiSessionPoolStart; // 0xBD000000 +PVOID MmSessionBase; // 0xBD000000 +ULONG MmSessionSize; +ULONG MmSessionViewSize; +ULONG MmSessionPoolSize; +ULONG MmSessionImageSize; + +// +// The system view space, on the other hand, is where sections that are memory +// mapped into "system space" end up. +// +// By default, it is a 16MB region. +// +PVOID MiSystemViewStart; +ULONG MmSystemViewSize; + +// +// A copy of the system page directory (the page directory associated with the +// System process) is kept (double-mapped) by the manager in order to lazily +// map paged pool PDEs into external processes when they fault on a paged pool +// address. +// +PFN_NUMBER MmSystemPageDirectory; +PMMPTE MmSystemPagePtes; // // Windows NT seems to choose between 7000, 11000 and 50000 @@ -128,6 +184,24 @@ // This is where we keep track of the most basic physical layout markers // ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; + +// +// The total number of pages mapped by the boot loader, which include the kernel +// HAL, boot drivers, registry, NLS files and other loader data structures is +// kept track of here. This depends on "LoaderPagesSpanned" being correct when +// coming from the loader. +// +// This number is later aligned up to a PDE boundary. +// +ULONG MmBootImageSize; + +// +// These three variables keep track of the core separation of address space that +// exists between kernel mode and user mode. +// +ULONG MmUserProbeAddress; +PVOID MmHighestUserAddress; +PVOID MmSystemRangeStart; /* PRIVATE FUNCTIONS **********************************************************/ @@ -317,6 +391,184 @@ Buffer->NumberOfRuns = Run; Buffer->NumberOfPages = PageCount; return Buffer; +} + +VOID +NTAPI +MiBuildPagedPool(VOID) +{ + PMMPTE PointerPte, PointerPde; + MMPTE TempPte = HyperTemplatePte; + PFN_NUMBER PageFrameIndex; + KIRQL OldIrql; + ULONG Size, BitMapSize; + + // + // Get the page frame number for the system page directory + // + PointerPte = MiAddressToPte(PDE_BASE); + MmSystemPageDirectory = PFN_FROM_PTE(PointerPte); + + // + // Allocate a system PTE which will hold a copy of the page directory + // + PointerPte = MiReserveSystemPtes(1, SystemPteSpace); + ASSERT(PointerPte); + MmSystemPagePtes = MiPteToAddress(PointerPte); + + // + // Make this system PTE point to the system page directory. + // It is now essentially double-mapped. This will be used later for lazy + // evaluation of PDEs accross process switches, similarly to how the Global + // page directory array in the old ReactOS Mm is used (but in a less hacky + // way). + // + TempPte = HyperTemplatePte; + TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory; + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; + + // + // Let's get back to paged pool work: size it up. + // By default, it should be twice as big as nonpaged pool. + // + MmSizeOfPagedPoolInBytes = 2 * MmMaximumNonPagedPoolInBytes; + if (MmSizeOfPagedPoolInBytes > ((ULONG_PTR)MmNonPagedSystemStart - + (ULONG_PTR)MmPagedPoolStart)) + { + // + // On the other hand, we have limited VA space, so make sure that the VA + // for paged pool doesn't overflow into nonpaged pool VA. Otherwise, set + // whatever maximum is possible. + // + MmSizeOfPagedPoolInBytes = (ULONG_PTR)MmNonPagedSystemStart - + (ULONG_PTR)MmPagedPoolStart; + } + + // + // Get the size in pages and make sure paged pool is at least 32MB. + // + Size = MmSizeOfPagedPoolInBytes; + if (Size < MI_MIN_INIT_PAGED_POOLSIZE) Size = MI_MIN_INIT_PAGED_POOLSIZE; + Size = BYTES_TO_PAGES(Size); + + // + // Now check how many PTEs will be required for these many pages. + // + Size = (Size + (1024 - 1)) / 1024; + + // + // Recompute the page-aligned size of the paged pool, in bytes and pages. + // + MmSizeOfPagedPoolInBytes = Size * PAGE_SIZE * 1024; + MmSizeOfPagedPoolInPages = MmSizeOfPagedPoolInBytes >> PAGE_SHIFT; + + // + // Let's be really sure this doesn't overflow into nonpaged system VA + // + ASSERT((MmSizeOfPagedPoolInBytes + (ULONG_PTR)MmPagedPoolStart) <= + (ULONG_PTR)MmNonPagedSystemStart); + + // + // This is where paged pool ends + // + MmPagedPoolEnd = (PVOID)(((ULONG_PTR)MmPagedPoolStart + + MmSizeOfPagedPoolInBytes) - 1); + + // + // So now get the PDE for paged pool and zero it out + // + PointerPde = MiAddressToPde(MmPagedPoolStart); + RtlZeroMemory(PointerPde, + (1 + MiAddressToPde(MmPagedPoolEnd) - PointerPde) * sizeof(MMPTE)); + + // + // Next, get the first and last PTE + // + PointerPte = MiAddressToPte(MmPagedPoolStart); + MmPagedPoolInfo.FirstPteForPagedPool = PointerPte; + MmPagedPoolInfo.LastPteForPagedPool = MiAddressToPte(MmPagedPoolEnd); + + // + // Lock the PFN database + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + // + // Allocate a page and map the first paged pool PDE + // + PageFrameIndex = MmAllocPage(MC_NPPOOL, 0); + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; + ASSERT(PointerPde->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPde = TempPte; + + // + // Release the PFN database lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // We only have one PDE mapped for now... at fault time, additional PDEs + // will be allocated to handle paged pool growth. This is where they'll have + // to start. + // + MmPagedPoolInfo.NextPdeForPagedPoolExpansion = PointerPde + 1; + + // + // We keep track of each page via a bit, so check how big the bitmap will + // have to be (make sure to align our page count such that it fits nicely + // into a 4-byte aligned bitmap. + // + // We'll also allocate the bitmap header itself part of the same buffer. + // + Size = Size * 1024; + ASSERT(Size == MmSizeOfPagedPoolInPages); + BitMapSize = sizeof(RTL_BITMAP) + (((Size + 31) / 32) * sizeof(ULONG)); + + // + // Allocate the allocation bitmap, which tells us which regions have not yet + // been mapped into memory + // + MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, + BitMapSize, + ' mM'); + ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); + + // + // Initialize it such that at first, only the first page's worth of PTEs is + // marked as allocated (incidentially, the first PDE we allocated earlier). + // + RtlInitializeBitMap(MmPagedPoolInfo.PagedPoolAllocationMap, + (PULONG)(MmPagedPoolInfo.PagedPoolAllocationMap + 1), + BitMapSize); + RtlSetAllBits(MmPagedPoolInfo.PagedPoolAllocationMap); + RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, 0, 1024); + + // + // We have a second bitmap, which keeps track of where allocations end. + // Given the allocation bitmap and a base address, we can therefore figure + // out which page is the last page of that allocation, and thus how big the + // entire allocation is. + // + MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, + BitMapSize, + ' mM'); + ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); + RtlInitializeBitMap(MmPagedPoolInfo.EndOfPagedPoolBitmap, + (PULONG)(MmPagedPoolInfo.EndOfPagedPoolBitmap + 1), + BitMapSize); + + // + // Since no allocations have been made yet, there are no bits set as the end + // + RtlClearAllBits(MmPagedPoolInfo.EndOfPagedPoolBitmap); + + // + // Initialize paged pool. + // + //InitializePool(PagedPool, 0); } NTSTATUS @@ -342,6 +594,86 @@ if (Phase == 0) { // + // Define the basic user vs. kernel address space separation + // + MmSystemRangeStart = (PVOID)KSEG0_BASE; + MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; + MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); + + // + // Get the size of the boot loader's image allocations and then round + // that region up to a PDE size, so that any PDEs we might create for + // whatever follows are separate from the PDEs that boot loader might've + // already created (and later, we can blow all that away if we want to). + // + MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned; + MmBootImageSize *= PAGE_SIZE; + MmBootImageSize = (MmBootImageSize + (4 * 1024 * 1024) - 1) & ~((4 * 1024 * 1024) - 1); + ASSERT((MmBootImageSize % (4 * 1024 * 1024)) == 0); + + // + // Set the size of session view, pool, and image + // + MmSessionSize = MI_SESSION_SIZE; + MmSessionViewSize = MI_SESSION_VIEW_SIZE; + MmSessionPoolSize = MI_SESSION_POOL_SIZE; + MmSessionImageSize = MI_SESSION_IMAGE_SIZE; + + // + // Set the size of system view + // + MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; + + // + // This is where it all ends + // + MiSessionImageEnd = (PVOID)PTE_BASE; + + // + // This is where we will load Win32k.sys and the video driver + // + MiSessionImageStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - + MmSessionImageSize); + + // + // So the view starts right below the session working set (itself below + // the image area) + // + MiSessionViewStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - + MmSessionImageSize - + MI_SESSION_WORKING_SET_SIZE - + MmSessionViewSize); + + // + // Session pool follows + // + MiSessionPoolEnd = MiSessionViewStart; + MiSessionPoolStart = (PVOID)((ULONG_PTR)MiSessionPoolEnd - + MmSessionPoolSize); + + // + // And it all begins here + // + MmSessionBase = MiSessionPoolStart; + + // + // Sanity check that our math is correct + // + ASSERT((ULONG_PTR)MmSessionBase + MmSessionSize == PTE_BASE); + + // + // Session space ends wherever image session space ends + // + MiSessionSpaceEnd = MiSessionImageEnd; + + // + // System view space ends at session space, so now that we know where + // this is, we can compute the base address of system view space itself. + // + MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - + MmSystemViewSize); + + // // Set CR3 for the system process // PointerPte = MiAddressToPde(PTE_BASE); @@ -766,7 +1098,7 @@ MiAddressToPte(MmNonPagedPoolExpansionStart)); // - // Now go ahead and initialize the ARM pool + // Now go ahead and initialize the ARMÂ³ nonpaged pool // MiInitializeArmPool(); } @@ -839,10 +1171,59 @@ MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); MiSyncARM3WithROS(MmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); - + } + else // NOW WE HAVE NONPAGED POOL + { + // + // Instantiate memory that we don't consider RAM/usable + // We use the same exclusions that Windows does, in order to try to be + // compatible with WinLDR-style booting + // + for (i = 0; i < LoaderMaximum; i++) IncludeType[i] = TRUE; + IncludeType[LoaderBad] = FALSE; + IncludeType[LoaderFirmwarePermanent] = FALSE; + IncludeType[LoaderSpecialMemory] = FALSE; + IncludeType[LoaderBBTMemory] = FALSE; + + // + // Build the physical memory block + // + MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, + IncludeType); + for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) + { + // + // Dump it for debugging + // + PPHYSICAL_MEMORY_RUN Run; + Run = &MmPhysicalMemoryBlock->Run[i]; + DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", + Run->BasePage << PAGE_SHIFT, + (Run->BasePage + Run->PageCount) << PAGE_SHIFT); + } + + // + // Size up paged pool and build the shadow system page directory + // + MiBuildPagedPool(); + // // Print the memory layout // + extern PVOID MiNonPagedPoolStart; + extern ULONG MiNonPagedPoolLength; + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmSystemRangeStart, + (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, + "Boot Loaded Image"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MiNonPagedPoolStart, + (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength, + "Non Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPagedPoolBase, + (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, + "Paged Pool"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmPfnDatabase, (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), @@ -850,7 +1231,28 @@ DPRINT1(" 0x%p - 0x%p\t%s\n", MmNonPagedPoolStart, (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, - "ARM Non Paged Pool"); + "ARMÂ³ Non Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MiSystemViewStart, + (ULONG_PTR)MiSystemViewStart + MmSystemViewSize, + "System View Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmSessionBase, + MiSessionSpaceEnd, + "Session Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + PTE_BASE, PDE_BASE, + "Page Tables"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + PDE_BASE, HYPER_SPACE, + "Page Directories"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + HYPER_SPACE, HYPER_SPACE + (4 * 1024 * 1024), + "Hyperspace"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPagedPoolStart, + (ULONG_PTR)MmPagedPoolStart + MmSizeOfPagedPoolInBytes, + "ARMÂ³ Paged Pool"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, "System PTE Space"); @@ -858,36 +1260,6 @@ MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, "Non Paged Pool Expansion PTE Space"); } - else // NOW WE HAVE NONPAGED POOL - { - // - // Instantiate memory that we don't consider RAM/usable - // We use the same exclusions that Windows does, in order to try to be - // compatible with WinLDR-style booting - // - for (i = 0; i < LoaderMaximum; i++) IncludeType[i] = TRUE; - IncludeType[LoaderBad] = FALSE; - IncludeType[LoaderFirmwarePermanent] = FALSE; - IncludeType[LoaderSpecialMemory] = FALSE; - IncludeType[LoaderBBTMemory] = FALSE; - - // - // Build the physical memory block - // - MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, - IncludeType); - for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) - { - // - // Dump it for debugging - // - PPHYSICAL_MEMORY_RUN Run; - Run = &MmPhysicalMemoryBlock->Run[i]; - DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", - Run->BasePage << PAGE_SHIFT, - (Run->BasePage + Run->PageCount) << PAGE_SHIFT); - } - } // // Always return success for now Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jul 23 00:46:29 2009 @@ -13,11 +13,28 @@ #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_FREE_PAGE_LISTS 4 +#define MI_MIN_INIT_PAGED_POOLSIZE (32 * 1024 * 1024) + +#define MI_SESSION_VIEW_SIZE (20 * 1024 * 1024) +#define MI_SESSION_POOL_SIZE (16 * 1024 * 1024) +#define MI_SESSION_IMAGE_SIZE (8 * 1024 * 1024) +#define MI_SESSION_WORKING_SET_SIZE (4 * 1024 * 1024) +#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ + MI_SESSION_POOL_SIZE + \ + MI_SESSION_IMAGE_SIZE + \ + MI_SESSION_WORKING_SET_SIZE) + +#define MI_SYSTEM_VIEW_SIZE (16 * 1024 * 1024) + +#define MI_PAGED_POOL_START (PVOID)0xE1000000 +#define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 + // // FIXFIX: These should go in ex.h after the pool merge // -#define POOL_BLOCK_SIZE 8 -#define POOL_LISTS_PER_PAGE (PAGE_SIZE / POOL_BLOCK_SIZE) +#define POOL_LISTS_PER_PAGE (PAGE_SIZE / sizeof(LIST_ENTRY)) +#define BASE_POOL_TYPE_MASK 1 +#define POOL_MAX_ALLOC (PAGE_SIZE - (sizeof(POOL_HEADER) + sizeof(LIST_ENTRY))) typedef struct _POOL_DESCRIPTOR { @@ -59,6 +76,13 @@ }; }; } POOL_HEADER, *PPOOL_HEADER; + +// +// Everything depends on this +// +C_ASSERT(sizeof(POOL_HEADER) == 8); +C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); + // // END FIXFIX // @@ -108,6 +132,7 @@ extern PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; extern ULONG MxPfnAllocation; +extern MM_PAGED_POOL_INFO MmPagedPoolInfo; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu Jul 23 00:46:29 2009 @@ -22,6 +22,8 @@ PFN_NUMBER MmNumberOfFreeNonPagedPool, MiExpansionPoolPagesInitialCharge; PVOID MmNonPagedPoolEnd0; PFN_NUMBER MiStartOfInitialPoolFrame, MiEndOfInitialPoolFrame; + +MM_PAGED_POOL_INFO MmPagedPoolInfo; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Jul 23 00:46:29 2009 @@ -47,15 +47,12 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; -ULONG MmBootImageSize; -ULONG MmUserProbeAddress = 0; -PVOID MmHighestUserAddress = NULL; PBOOLEAN Mm64BitPhysicalAddress = FALSE; -PVOID MmSystemRangeStart = NULL; ULONG MmReadClusterSize; MM_STATS MmStats; PMMSUPPORT MmKernelAddressSpace; extern KMUTANT MmSystemLoadLock; +extern ULONG MmBootImageSize; BOOLEAN MiDbgEnableMdDump = #ifdef _ARM_ TRUE; @@ -139,7 +136,7 @@ INIT_FUNCTION NTAPI MmInit1(VOID) -{ +{ /* Initialize the kernel address space */ KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); MmKernelAddressSpace = MmGetCurrentAddressSpace(); @@ -147,15 +144,6 @@ /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); - - /* Get the size of FreeLDR's image allocations */ - MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned; - MmBootImageSize *= PAGE_SIZE; - - /* Set memory limits */ - MmSystemRangeStart = (PVOID)KSEG0_BASE; - MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; - MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); // // Initialize ARMÂ³ in phase 0 @@ -164,10 +152,10 @@ /* Intialize system memory areas */ MiInitSystemMemoryAreas(); - + /* Initialize the page list */ MmInitializePageList(); - + // // Initialize ARMÂ³ in phase 1 // @@ -181,15 +169,15 @@ /* Initialize nonpaged pool */ // DEPRECATED MiInitializeNonPagedPool(); // DEPRECATED // DEPRECATED - // - // Initialize ARMÂ³ in phase 2 - // - MmArmInitSystem(2, KeLoaderBlock); - /* Put the paged pool after nonpaged pool */ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength); MmPagedPoolSize = MM_PAGED_POOL_SIZE; + + // + // Initialize ARMÂ³ in phase 2 + // + MmArmInitSystem(2, KeLoaderBlock); /* Initialize paged pool */ MmInitializePagedPool();

15 years, 5 months

[janderwald] 42147: - Fix totally broken KSWORKER implementation (it may have worked, but it didnt do what it should have) - Re-Implement KsQueueWorkItem, KsIncrementCountedWorker, KsDecrementCountedWorker, KsRegisterCountedWorker, KsUnregisterWorker, KsRegisterWorker

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jul 22 23:27:44 2009 New Revision: 42147 URL: http://svn.reactos.org/svn/reactos?rev=42147&view=rev Log: - Fix totally broken KSWORKER implementation (it may have worked, but it didnt do what it should have) - Re-Implement KsQueueWorkItem, KsIncrementCountedWorker, KsDecrementCountedWorker, KsRegisterCountedWorker, KsUnregisterWorker, KsRegisterWorker Modified: trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Wed Jul 22 23:27:44 2009 @@ -15,14 +15,64 @@ typedef struct { + WORK_QUEUE_ITEM WorkItem; + KEVENT Event; KSPIN_LOCK Lock; WORK_QUEUE_TYPE Type; LONG Counter; + LONG QueuedWorkItemCount; + LIST_ENTRY QueuedWorkItems; + + PWORK_QUEUE_ITEM CountedWorkItem; +}KSIWORKER, *PKSIWORKER; + +VOID +NTAPI +WorkItemRoutine( + IN PVOID Context) +{ + PKSIWORKER KsWorker; + KIRQL OldLevel; PWORK_QUEUE_ITEM WorkItem; - ULONG WorkItemActive; - ULONG DeleteInProgress; -}KS_WORKER; + PLIST_ENTRY Entry; + + + /* get ks worker implementation */ + KsWorker = (PKSIWORKER)Context; + + /* acquire back the lock */ + KeAcquireSpinLock(&KsWorker->Lock, &OldLevel); + + do + { + /* remove first entry */ + Entry = RemoveHeadList(&KsWorker->QueuedWorkItems); + /* get offset to work item */ + WorkItem = (PWORK_QUEUE_ITEM)CONTAINING_RECORD(Entry, WORK_QUEUE_ITEM, List); + + /* release lock as the callback might call one KsWorker functions */ + KeReleaseSpinLock(&KsWorker->Lock, OldLevel); + + /* now dispatch the work */ + WorkItem->WorkerRoutine(WorkItem->Parameter); + + /* acquire back the lock */ + KeAcquireSpinLock(&KsWorker->Lock, &OldLevel); + + /* decrement queued work item count */ + InterlockedDecrement(&KsWorker->QueuedWorkItemCount); + + }while(KsWorker->QueuedWorkItemCount); + + /* release the lock */ + KeReleaseSpinLock(&KsWorker->Lock, OldLevel); + + /* signal completion event */ + KeSetEvent(&KsWorker->Event, IO_NO_INCREMENT, FALSE); + +} + /* @implemented @@ -34,8 +84,8 @@ IN WORK_QUEUE_TYPE WorkQueueType, OUT PKSWORKER* Worker) { - KS_WORKER * KsWorker; - UNIMPLEMENTED; + PKSIWORKER KsWorker; + if (WorkQueueType != CriticalWorkQueue && WorkQueueType != DelayedWorkQueue && @@ -44,16 +94,22 @@ return STATUS_INVALID_PARAMETER; } - KsWorker = ExAllocatePool(NonPagedPool, sizeof(KS_WORKER)); + /* allocate worker context */ + KsWorker = ExAllocatePool(NonPagedPool, sizeof(KSIWORKER)); if (!KsWorker) return STATUS_INSUFFICIENT_RESOURCES; + /* initialze the work ctx */ + ExInitializeWorkItem(&KsWorker->WorkItem, WorkItemRoutine, (PVOID)KsWorker); + /* setup type */ KsWorker->Type = WorkQueueType; + /* set counter to zero */ KsWorker->Counter = 0; - KsWorker->WorkItemActive = 0; - KsWorker->WorkItem = NULL; - KsWorker->DeleteInProgress = FALSE; + /* Initialize work item queue */ + InitializeListHead(&KsWorker->QueuedWorkItems); + /* initialize work item lock */ KeInitializeSpinLock(&KsWorker->Lock); + /* initialize event */ KeInitializeEvent(&KsWorker->Event, NotificationEvent, FALSE); *Worker = KsWorker; @@ -63,53 +119,68 @@ /* @implemented */ -KSDDKAPI VOID NTAPI +KSDDKAPI +VOID +NTAPI KsUnregisterWorker( IN PKSWORKER Worker) { - KS_WORKER * KsWorker; + PKSIWORKER KsWorker; KIRQL OldIrql; if (!Worker) return; - KsWorker = (KS_WORKER *)Worker; - + /* get ks worker implementation */ + KsWorker = (PKSIWORKER)Worker; + /* acquire spinlock */ KeAcquireSpinLock(&KsWorker->Lock, &OldIrql); - - KsWorker->DeleteInProgress = TRUE; - - if (KsWorker->WorkItemActive) - { + /* fake status running to avoid work items to be queued by the counted worker */ + KsWorker->Counter = 1; + /* is there currently a work item active */ + if (KsWorker->QueuedWorkItemCount) + { + /* release the lock */ KeReleaseSpinLock(&KsWorker->Lock, OldIrql); + /* wait for the worker routine to finish */ KeWaitForSingleObject(&KsWorker->Event, Executive, KernelMode, FALSE, NULL); } else { + /* no work item active, just release the lock */ KeReleaseSpinLock(&KsWorker->Lock, OldIrql); } - - ExFreePool(KsWorker); -} - -/* - @implemented -*/ -KSDDKAPI NTSTATUS NTAPI + /* free worker context */ + FreeItem(KsWorker); +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI KsRegisterCountedWorker( IN WORK_QUEUE_TYPE WorkQueueType, IN PWORK_QUEUE_ITEM CountedWorkItem, OUT PKSWORKER* Worker) { NTSTATUS Status; - KS_WORKER * KsWorker; - + PKSIWORKER KsWorker; + + /* check for counted work item parameter */ + if (!CountedWorkItem) + return STATUS_INVALID_PARAMETER_2; + + /* create the work ctx */ Status = KsRegisterWorker(WorkQueueType, Worker); - + /* check for success */ if (NT_SUCCESS(Status)) { - KsWorker = (KS_WORKER *)Worker; - KsWorker->WorkItem = CountedWorkItem; + /* get ks worker implementation */ + KsWorker = (PKSIWORKER)Worker; + /* store counted work item */ + KsWorker->CountedWorkItem = CountedWorkItem; } return Status; @@ -124,21 +195,18 @@ KsDecrementCountedWorker( IN PKSWORKER Worker) { - KS_WORKER * KsWorker; + PKSIWORKER KsWorker; LONG Counter; + /* did the caller pass a work ctx */ if (!Worker) return STATUS_INVALID_PARAMETER; - KsWorker = (KS_WORKER *)Worker; + /* get ks worker implementation */ + KsWorker = (PKSIWORKER)Worker; + /* decrement counter */ Counter = InterlockedDecrement(&KsWorker->Counter); - - if (KsWorker->DeleteInProgress) - { - /* signal that we are done */ - KeSetEvent(&KsWorker->Event, 0, 0); - } - + /* return result */ return Counter; } @@ -151,19 +219,24 @@ KsIncrementCountedWorker( IN PKSWORKER Worker) { - KS_WORKER * KsWorker; + PKSIWORKER KsWorker; LONG Counter; + /* did the caller pass a work ctx */ if (!Worker) return STATUS_INVALID_PARAMETER; - KsWorker = (KS_WORKER *)Worker; - + /* get ks worker implementation */ + KsWorker = (PKSIWORKER)Worker; + /* increment counter */ Counter = InterlockedIncrement(&KsWorker->Counter); if (Counter == 1) { - KsQueueWorkItem(Worker, KsWorker->WorkItem); - } + /* this is the first work item in list, so queue a real work item */ + KsQueueWorkItem(Worker, KsWorker->CountedWorkItem); + } + + /* return current counter */ return Counter; } @@ -177,25 +250,31 @@ IN PKSWORKER Worker, IN PWORK_QUEUE_ITEM WorkItem) { - KS_WORKER * KsWorker; + PKSIWORKER KsWorker; KIRQL OldIrql; - NTSTATUS Status = STATUS_SUCCESS; - + + /* check for all parameters */ if (!Worker || !WorkItem) return STATUS_INVALID_PARAMETER; - KsWorker = (KS_WORKER *)Worker; + /* get ks worker implementation */ + KsWorker = (PKSIWORKER)Worker; + /* lock the work queue */ KeAcquireSpinLock(&KsWorker->Lock, &OldIrql); - - if (!KsWorker->DeleteInProgress) - { + /* insert work item to list */ + InsertTailList(&KsWorker->QueuedWorkItems, &WorkItem->List); + /* increment active count */ + InterlockedIncrement(&KsWorker->QueuedWorkItemCount); + /* is this the first work item */ + if (KsWorker->QueuedWorkItemCount == 1) + { + /* clear event */ + KeClearEvent(&KsWorker->Event); + /* it is, queue it */ ExQueueWorkItem(WorkItem, KsWorker->Type); } - else - { - Status = STATUS_UNSUCCESSFUL; - } - + /* release lock */ KeReleaseSpinLock(&KsWorker->Lock, OldIrql); - return Status; -} + + return STATUS_SUCCESS; +}

15 years, 5 months

[janderwald] 42146: - Use KSSTRING instead of hardcoding object class - Implement KsValidateAllocatorCreateRequest, KsValidateClockCreateRequest, KsValidateTopologyNodeCreateRequest

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jul 22 21:08:57 2009 New Revision: 42146 URL: http://svn.reactos.org/svn/reactos?rev=42146&view=rev Log: - Use KSSTRING instead of hardcoding object class - Implement KsValidateAllocatorCreateRequest, KsValidateClockCreateRequest, KsValidateTopologyNodeCreateRequest Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/image.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Wed Jul 22 21:08:57 2009 @@ -368,7 +368,7 @@ OUT PHANDLE AllocatorHandle) { return KspCreateObjectType(ConnectionHandle, - L"{642F5D00-4791-11D0-A5D6-28DB04C10000}", //KSNAME_Allocator + KSSTRING_Allocator, (PVOID)AllocatorFraming, sizeof(KSALLOCATOR_FRAMING), GENERIC_READ, @@ -386,15 +386,47 @@ } /* - @unimplemented + @implemented */ -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsValidateAllocatorCreateRequest( IN PIRP Irp, - OUT PKSALLOCATOR_FRAMING* AllocatorFraming) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + OUT PKSALLOCATOR_FRAMING* OutAllocatorFraming) +{ + PKSALLOCATOR_FRAMING AllocatorFraming; + ULONG Size; + NTSTATUS Status; + ULONG SupportedFlags; + + /* set minimum request size */ + Size = sizeof(KSALLOCATOR_FRAMING); + + Status = KspCopyCreateRequest(Irp, + KSSTRING_Allocator, + &Size, + (PVOID*)&AllocatorFraming); + + if (!NT_SUCCESS(Status)) + return Status; + + /* allowed supported flags */ + SupportedFlags = (KSALLOCATOR_OPTIONF_COMPATIBLE | KSALLOCATOR_OPTIONF_SYSTEM_MEMORY | + KSALLOCATOR_REQUIREMENTF_INPLACE_MODIFIER | KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_FRAME_INTEGRITY | + KSALLOCATOR_REQUIREMENTF_MUST_ALLOCATE); + + + if (!AllocatorFraming->FrameSize || (AllocatorFraming->OptionsFlags & (~SupportedFlags))) + { + FreeItem(AllocatorFraming); + return STATUS_INVALID_PARAMETER; + } + + /* store result */ + *OutAllocatorFraming = AllocatorFraming; + + return Status; } NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Wed Jul 22 21:08:57 2009 @@ -779,7 +779,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Wed Jul 22 21:08:57 2009 @@ -46,7 +46,7 @@ OUT PHANDLE ClockHandle) { return KspCreateObjectType(ConnectionHandle, - L"{53172480-4791-11D0-A5D6-28DB04C10000}", /* KSName_Clock */ + KSSTRING_Clock, ClockCreate, sizeof(KSCLOCK_CREATE), GENERIC_READ, @@ -54,17 +54,40 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS NTAPI KsValidateClockCreateRequest( IN PIRP Irp, - OUT PKSCLOCK_CREATE* ClockCreate) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + OUT PKSCLOCK_CREATE* OutClockCreate) +{ + PKSCLOCK_CREATE ClockCreate; + NTSTATUS Status; + ULONG Size; + + /* minimum request size */ + Size = sizeof(KSCLOCK_CREATE); + + /* copy create request */ + Status = KspCopyCreateRequest(Irp, + KSSTRING_Clock, + &Size, + (PVOID*)&ClockCreate); + + if (!NT_SUCCESS(Status)) + return Status; + + if (ClockCreate->CreateFlags != 0) + { + /* flags must be zero */ + FreeItem(ClockCreate); + return STATUS_INVALID_PARAMETER; + } + + *OutClockCreate = ClockCreate; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Wed Jul 22 21:08:57 2009 @@ -31,7 +31,7 @@ } return KspCreateObjectType(FilterHandle, - L"{146F1A80-4791-11D0-A5D6-28DB04C10000}", //KSNAME_Pin + KSSTRING_Pin, (PVOID)Connect, ConnectSize, DesiredAccess, Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Wed Jul 22 21:08:57 2009 @@ -613,7 +613,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Wed Jul 22 21:08:57 2009 @@ -9,7 +9,7 @@ #include "priv.h" /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Wed Jul 22 21:08:57 2009 @@ -107,4 +107,11 @@ LPWSTR Buffer, OUT PCREATE_ITEM_ENTRY *OutCreateItem); +NTSTATUS +KspCopyCreateRequest( + IN PIRP Irp, + IN LPWSTR ObjectClass, + IN OUT PULONG Size, + OUT PVOID * Result); + #endif 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] Wed Jul 22 21:08:57 2009 @@ -98,3 +98,44 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } + + +NTSTATUS +KspCopyCreateRequest( + IN PIRP Irp, + IN LPWSTR ObjectClass, + IN OUT PULONG Size, + OUT PVOID * Result) +{ + PIO_STACK_LOCATION IoStack; + ULONG ObjectLength, ParametersLength; + PVOID Buffer; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get object class length */ + ObjectLength = (wcslen(ObjectClass) + 2) * sizeof(WCHAR); + + /* check for minium length requirement */ + if (ObjectLength + *Size > IoStack->FileObject->FileName.MaximumLength) + return STATUS_UNSUCCESSFUL; + + /* extract parameters length */ + ParametersLength = IoStack->FileObject->FileName.MaximumLength - ObjectLength; + + /* allocate buffer */ + Buffer = AllocateItem(NonPagedPool, ParametersLength); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + /* copy parameters */ + RtlMoveMemory(Buffer, &IoStack->FileObject->FileName.Buffer[ObjectLength / sizeof(WCHAR)], ParametersLength); + + /* store result */ + *Result = Buffer; + *Size = ParametersLength; + + return STATUS_SUCCESS; +} + 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] Wed Jul 22 21:08:57 2009 @@ -84,7 +84,7 @@ OUT PHANDLE NodeHandle) { return KspCreateObjectType(ParentHandle, - L"{0621061A-EE75-11D0-B915-00A0C9223196}", + KSSTRING_TopologyNode, (PVOID)NodeCreate, sizeof(KSNODE_CREATE), DesiredAccess, @@ -92,16 +92,47 @@ } /* - @unimplemented + @implemented */ -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsValidateTopologyNodeCreateRequest( IN PIRP Irp, IN PKSTOPOLOGY Topology, - OUT PKSNODE_CREATE* NodeCreate) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + OUT PKSNODE_CREATE* OutNodeCreate) +{ + PKSNODE_CREATE NodeCreate; + ULONG Size; + NTSTATUS Status; + + /* did the caller miss the topology */ + if (!Topology) + return STATUS_INVALID_PARAMETER; + + /* set create param size */ + Size = sizeof(KSNODE_CREATE); + + /* fetch create parameters */ + Status = KspCopyCreateRequest(Irp, + KSSTRING_TopologyNode, + &Size, + (PVOID*)&NodeCreate); + + if (!NT_SUCCESS(Status)) + return Status; + + if (NodeCreate->CreateFlags != 0 || (NodeCreate->Node >= Topology->TopologyNodesCount && NodeCreate->Node != (ULONG)-1)) + { + /* invalid node create */ + FreeItem(NodeCreate); + return STATUS_UNSUCCESSFUL; + } + + /* store result */ + *OutNodeCreate = NodeCreate; + + return Status; } /*

15 years, 5 months

[janderwald] 42145: - Add flags - Revert 42107

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jul 22 21:05:58 2009 New Revision: 42145 URL: http://svn.reactos.org/svn/reactos?rev=42145&view=rev Log: - Add flags - Revert 42107 Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4214… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Wed Jul 22 21:05:58 2009 @@ -1546,6 +1546,16 @@ KS_FRAMING_ITEM FramingItem[1]; } KSALLOCATOR_FRAMING_EX, *PKSALLOCATOR_FRAMING_EX; +#define KSALLOCATOR_REQUIREMENTF_INPLACE_MODIFIER 0x00000001 +#define KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY 0x00000002 +#define KSALLOCATOR_REQUIREMENTF_FRAME_INTEGRITY 0x00000004 +#define KSALLOCATOR_REQUIREMENTF_MUST_ALLOCATE 0x00000008 +#define KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY 0x80000000 + +#define KSALLOCATOR_OPTIONF_COMPATIBLE 0x00000001 +#define KSALLOCATOR_OPTIONF_SYSTEM_MEMORY 0x00000002 +#define KSALLOCATOR_OPTIONF_VALID 0x00000003 + #define KSALLOCATOR_FLAG_PARTIAL_READ_SUPPORT 0x00000010 #define KSALLOCATOR_FLAG_DEVICE_SPECIFIC 0x00000020 #define KSALLOCATOR_FLAG_CAN_ALLOCATE 0x00000040 @@ -3666,14 +3676,14 @@ IN PVOID Object ); - +static +__inline PUNKNOWN -NTAPI KsDeviceGetOuterUnknown( - IN PKSDEVICE Device); -//{ -// return KsGetOuterUnknown((PVOID) Device); -//} + IN PKSDEVICE Device) +{ + return KsGetOuterUnknown((PVOID) Device); +} KSDDKAPI PUNKNOWN

15 years, 5 months

[dreimer] 42144: - Added RBuild Flags Setting possibility into the "config" command. They will be loaded at RosBE startup and thus behave the same way like the other settings you can set in there. - Made the "update" command stop when it found the last existant update online. Theres no use in trying the full update 1-9 if theres none/one. This speeds up the status generation process. Both still untested. 1. Will be done later / 2. I like looking at diffs of fixes i did, so I commit seperately :-

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 22 19:34:38 2009 New Revision: 42144 URL: http://svn.reactos.org/svn/reactos?rev=42144&view=rev Log: - Added RBuild Flags Setting possibility into the "config" command. They will be loaded at RosBE startup and thus behave the same way like the other settings you can set in there. - Made the "update" command stop when it found the last existant update online. Theres no use in trying the full update 1-9 if theres none/one. This speeds up the status generation process. Both still untested. 1. Will be done later / 2. I like looking at diffs of fixes i did, so I commit seperately :-P Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -9,9 +9,177 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Configurator" +if (!(Test-Path "%APPDATA%\RosBE\RBUILDFLAGS.FLG")) { + $RBUILDFLAGS > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" +} + function settitle { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" exit +} + +function rbuild { + "Be verbose." + "Default is: no" + "" + $VERBOSE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-v") + if ("$VERBOSE_B" -eq "") { + $VERBOSE_B = "no" + } else { + $VERBOSE_B = "yes" + } + "Right now: $VERBOSE_B" + $VERBOSE = Read-Host "(yes), (no)" + if ("$VERBOSE" -eq "") { + $VERBOSE = "$VERBOSE_B" + } + if (($VERBOSE -eq "yes") -or ($VERBOSE -eq "y")) { + $RBUILDFLAGS = "-v" + } + clear-host + + "Delete generated files as soon as they are not needed anymore." + "Default is: no" + "" + $CLEAN_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-c") + if ("$CLEAN_B" -eq "") { + $CLEAN_B = "no" + } else { + $CLEAN_B = "yes" + } + "Right now: $CLEAN_B" + $CLEAN = Read-Host "(yes), (no)" + if ("$CLEAN" -eq "") { + $CLEAN = "$CLEAN_B" + } + if (($CLEAN -eq "yes") -or ($CLEAN -eq "y")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -c" + } + clear-host + + "Disable/Enable automatic dependencies." + "Default is: yes" + "" + $DEPENDS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-df") + $DEPENDS_B2 = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-dd") + if (!("$DEPENDS_B" -eq "")) { + $DEPENDS_B = "full" + } elseif (!("$DEPENDS_B2" -eq "")) { + $DEPENDS_B = "no" + } else { + $DEPENDS_B = "yes" + } + "Right now: $DEPENDS_B" + $DEPENDS = Read-Host "(full), (yes), (no)" + if ("$DEPENDS" -eq "") { + $DEPENDS = "$DEPENDS_B" + } + if (($DEPENDS -eq "full") -or ($DEPENDS -eq "f")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -df" + } elseif (($DEPENDS -eq "no") -or ($DEPENDS -eq "n")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -dd" + } else { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -da" + } + clear-host + + "Use precompiled headers." + "Default is: yes" + "" + $PRECHEADER_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-hd") + if ("$PRECHEADER_B" -eq "") { + $PRECHEADER_B = "yes" + } else { + $PRECHEADER_B = "no" + } + "Right now: $PRECHEADER_B" + $PRECHEADER = Read-Host "(yes), (no)" + if ("$PRECHEADER" -eq "") { + $PRECHEADER = "$PRECHEADER_B" + } + if (($PRECHEADER -eq "no") -or ($PRECHEADER -eq "n")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -hd" + } + clear-host + + "Let make handle creation of install directories. Rbuild will not generate" + "the directories." + "Default is: no" + "" + $MAKEDIR_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-mi") + if ("$MAKEDIR_B" -eq "") { + $MAKEDIR_B = "no" + } else { + $MAKEDIR_B = "yes" + } + "Right now: $MAKEDIR_B" + $MAKEDIR = Read-Host "(yes), (no)" + if ("$MAKEDIR" -eq "") { + $MAKEDIR = "$MAKEDIR_B" + } + if (($MAKEDIR -eq "yes") -or ($MAKEDIR -eq "y")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -mi" + } + clear-host + + "Generate proxy makefiles in source tree instead of the output tree." + "Default is: no" + "" + $PROXYMAKE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-ps") + if ("$PROXYMAKE_B" -eq "") { + $PROXYMAKE_B = "no" + } else { + $PROXYMAKE_B = "yes" + } + "Right now: $PROXYMAKE_B" + $PROXYMAKE = Read-Host "(yes), (no)" + if ("$PROXYMAKE" -eq "") { + $PROXYMAKE = "$PROXYMAKE_B" + } + if (($PROXYMAKE -eq "yes") -or ($PROXYMAKE -eq "y")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -ps" + } + clear-host + + "Use compilation units." + "Default is: yes" + "" + $COMPUNITS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-ud") + if ("$COMPUNITS_B" -eq "") { + $COMPUNITS_B = "yes" + } else { + $COMPUNITS_B = "no" + } + "Right now: $COMPUNITS_B" + $COMPUNITS = Read-Host "(yes), (no)" + if ("$COMPUNITS" -eq "") { + $COMPUNITS = "$COMPUNITS_B" + } + if (($COMPUNITS -eq "no") -or ($COMPUNITS -eq "n")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -ud" + } + clear-host + + "Input XML." + "Default is: no" + "" + $XML_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" "-r") + if ("$XML_B" -eq "") { + $XML_B = "no" + } else { + $XML_B = "yes" + } + "Right now: $XML_B" + $XML = Read-Host "(yes), (no)" + if ("$XML" -eq "") { + $XML = "$XML_B" + } + if (($XML -eq "yes") -or ($XML -eq "y")) { + $RBUILDFLAGS = "$RBUILDFLAGS" + " -r" + } + clear-host + $RBUILDFLAGS > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + $ENV:ROS_RBUILDFLAGS = $RBUILDFLAGS } # Receive the first Parameter and decide what to do. @@ -32,6 +200,12 @@ } else { "Working Configuration File was not found in ReactOS Source Tree." } + if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { + remove-item "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + "RBuild Flags File was found and deleted." + } else { + "RBuild Flags File was not found in ReactOS Source Tree." + } } settitle } @@ -46,6 +220,10 @@ copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" "Successfully Updated." } + settitle +} +elseif ($args[0] -eq "rbuild") { + rbuild settitle } elseif ($args[0] -ne $null) { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -159,6 +159,7 @@ "" " delete - Deletes the created configuration file and so sets back to the" " default settings." + " rbuild - Switches to RBuild Flag setting mode." " update - Deletes the old created configuration file and updates it with a" " new, default one." } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -138,6 +138,10 @@ & "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1" } +if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { + $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" +} + # Check if writing logs is enabled, if so check if our log directory # exists, if it doesn't, create it. if ($_ROSBE_WRITELOG -eq 1) { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -53,8 +53,9 @@ } else { if ($_ROSBE_MULTIUPD -ne "1") { "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." - return } + $_ROSBE_STATCOUNT = 9 + return } } @@ -133,6 +134,8 @@ get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { $_ROSBE_UPDATES += "$_ROSBE_STATCOUNT " + } else { + $_ROSBE_STATCOUNT = 9 } } $_ROSBE_STATCOUNT += 1 Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -15,6 +15,10 @@ setlocal enabledelayedexpansion title ReactOS Build Configurator +if not exists "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( + echo %RBUILDFLAGS% > "%APPDATA%\RosBE\RBUILDFLAGS.FLG" +) + :: Receive the first Parameter and decide what to do. if /i "%1" == "delete" ( echo config.rbuild will be permanently deleted. All your settings will be gone. @@ -39,6 +43,13 @@ echo Working Configuration File was not found in ReactOS Source Tree. ) + if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( + del "%APPDATA%\RosBE\RBUILDFLAGS.FLG" + echo RBuild Flags File was found and deleted. + ) else ( + echo RBuild Flags File was not found in ReactOS Source Tree. + ) + goto :NOK ) @@ -56,6 +67,170 @@ del "config.rbuild" copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" echo Successfully Updated. + goto :NOK +) + +if /i "%1" == "rbuild" ( + echo Be verbose. + echo Default is: no + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-v""`) do set VERBOSE_B=%%i + if "%VERBOSE_B%" == "" ( + set VERBOSE_B=no + ) else ( + set VERBOSE_B=yes + ) + echo Right now: %VERBOSE_B% + set /p VERBOSE="(yes), (no)" + if "%VERBOSE%" == "" ( + set VERBOSE=%VERBOSE_B% + ) + if "%VERBOSE%" == "yes" ( + set RBUILDFLAGS=-v + ) + cls + + echo Delete generated files as soon as they are not needed anymore. + echo Default is: no + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-c""`) do set CLEAN_B=%%i + if "%CLEAN_B%" == "" ( + set CLEAN_B=no + ) else ( + set CLEAN_B=yes + ) + echo Right now: %CLEAN_B% + set /p CLEAN="(yes), (no)" + if "%CLEAN%" == "" ( + set CLEAN=%CLEAN_B% + ) + if "%CLEAN%" == "yes" ( + set RBUILDFLAGS=%RBUILDFLAGS% -c + ) + cls + + echo Disable/Enable automatic dependencies. + echo Default is: yes + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-df""`) do set DEPENDS_B=%%i + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-dd""`) do set DEPENDS_B2=%%i + ) + if not "%DEPENDS_B%" == "" ( + set DEPENDS_B=full + ) else if not "%DEPENDS_B2%" == "" ( + set DEPENDS_B=no + ) else ( + set DEPENDS_B=yes + ) + echo Right now: %DEPENDS_B% + set /p DEPENDS="(full), (yes), (no)" + if "%DEPENDS%" == "" ( + set DEPENDS=%DEPENDS_B% + ) + if "%DEPENDS%" == "full" ( + set RBUILDFLAGS=%RBUILDFLAGS% -df + ) else if "%DEPENDS%" == "no" ( + set RBUILDFLAGS=%RBUILDFLAGS% -dd + ) + cls + + echo Use precompiled headers. + echo Default is: yes + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-hd""`) do set PRECHEADER_B=%%i + if "%PRECHEADER_B%" == "" ( + set PRECHEADER_B=yes + ) else ( + set PRECHEADER_B=no + ) + echo Right now: %PRECHEADER_B% + set /p PRECHEADER="(yes), (no)" + if "%PRECHEADER%" == "" ( + set PRECHEADER=%PRECHEADER_B% + ) + if "%PRECHEADER%" == "no" ( + set RBUILDFLAGS=%RBUILDFLAGS% -hd + ) + cls + + echo Let make handle creation of install directories. Rbuild will not generate + echo the directories. + echo Default is: no + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-mi""`) do set MAKEDIR_B=%%i + if "%MAKEDIR_B%" == "" ( + set MAKEDIR_B=no + ) else ( + set MAKEDIR_B=yes + ) + echo Right now: %MAKEDIR_B% + set /p MAKEDIR="(yes), (no)" + if "%MAKEDIR%" == "" ( + set MAKEDIR=%MAKEDIR_B% + ) + if "%MAKEDIR%" == "yes" ( + set RBUILDFLAGS=%RBUILDFLAGS% -mi + ) + cls + + echo Generate proxy makefiles in source tree instead of the output tree. + echo Default is: no + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-ps""`) do set PROXYMAKE_B=%%i + if "%PROXYMAKE_B%" == "" ( + set PROXYMAKE_B=no + ) else ( + set PROXYMAKE_B=yes + ) + echo Right now: %PROXYMAKE_B% + set /p PROXYMAKE="(yes), (no)" + if "%PROXYMAKE%" == "" ( + set PROXYMAKE=%PROXYMAKE_B% + ) + if "%PROXYMAKE%" == "yes" ( + set RBUILDFLAGS=%RBUILDFLAGS% -ps + ) + cls + + echo Use compilation units. + echo Default is: yes + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-ud""`) do set COMPUNITS_B=%%i + if "%COMPUNITS_B%" == "" ( + set COMPUNITS_B=yes + ) else ( + set COMPUNITS_B=no + ) + echo Right now: %COMPUNITS_B% + set /p COMPUNITS="(yes), (no)" + if "%COMPUNITS%" == "" ( + set COMPUNITS=%COMPUNITS_B% + ) + if "%COMPUNITS%" == "no" ( + set RBUILDFLAGS=%RBUILDFLAGS% -ud + ) + cls + + echo Input XML. + echo Default is: no + echo. + for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG" | find "-r""`) do set XML_B=%%i + if "%XML_B%" == "" ( + set XML_B=no + ) else ( + set XML_B=yes + ) + echo Right now: %XML_B% + set /p XML="(yes), (no)" + if "%XML%" == "" ( + set XML=%XML_B% + ) + if "%XML%" == "yes" ( + set RBUILDFLAGS=%RBUILDFLAGS% -r + ) + cls + echo %RBUILDFLAGS% > "%APPDATA%\RosBE\RBUILDFLAGS.FLG" + %ROS_RBUILDFLAGS% = %RBUILDFLAGS% goto :NOK ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -165,6 +165,7 @@ echo. echo delete - Deletes the created configuration file and so sets back to default echo settings. + echo rbuild - Switches to RBuild Flag setting mode. echo update - Deletes the old created configuration file and updates it with a echo new, default one. ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -69,6 +69,10 @@ call "%APPDATA%\RosBE\rosbe-options-%1.cmd" ) +if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( + for /f "usebackq" %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i +) + :: Check if RosBE data directory exists, if not, create it. if not exist "%APPDATA%\RosBE\." ( mkdir "%APPDATA%\RosBE" 1> NUL 2> NUL Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Wed Jul 22 19:34:38 2009 @@ -136,8 +136,9 @@ ) else ( if not "%_ROSBE_MULTIUPD%" == "1" ( echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. - goto :EOF ) + set _ROSBE_STATCOUNT=9 + goto :EOF ) goto :EOF @@ -154,6 +155,8 @@ "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" ( set _ROSBE_UPDATES=!_ROSBE_UPDATES! !_ROSBE_STATCOUNT! + ) else ( + set _ROSBE_STATCOUNT=9 ) ) cd..

15 years, 5 months

[janderwald] 42143: [KS] - Rewrite KSCREATE_ITEM handling to support clocks, nodes, allocators. - Store create items in list instead of an array. Consequently, the code can be re-used for KSDEVICE_HEADER / KSOBJECT_HEADER functions. - Implement KsAddObjectCreateItemToObjectHeader - Implement now KspCreate and IKsDevice_Create properly - Implement KsGetDevice by using KSBASIC_HEADER struct which must be positioned before its object specific (PKSFILTER, PKSFILTERFACTOR, PKSPIN) - Remove a hack fro

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jul 22 16:42:51 2009 New Revision: 42143 URL: http://svn.reactos.org/svn/reactos?rev=42143&view=rev Log: [KS] - Rewrite KSCREATE_ITEM handling to support clocks, nodes, allocators. - Store create items in list instead of an array. Consequently, the code can be re-used for KSDEVICE_HEADER / KSOBJECT_HEADER functions. - Implement KsAddObjectCreateItemToObjectHeader - Implement now KspCreate and IKsDevice_Create properly - Implement KsGetDevice by using KSBASIC_HEADER struct which must be positioned before its object specific (PKSFILTER, PKSFILTERFACTOR, PKSPIN) - Remove a hack from KspCreateObjectType [PORTCLS] - Store real dispatched object in FsContext2 - Implement a fast device i/o handler - Increase minimum data threshold when a stream stops prematurely by 10 audio frames (port driver WaveCyclic) - Remove the hack of checking wether pin create request is passed. Since create items now work nicely, use a different function and handle pin creation requests seperately. [KMIXER] - Remove the hack of checking wether pin create request is passed. Since create items now work nicely, use a different function and handle pin creation requests seperately. [SYSAUDIO] - Remove the hack of checking wether pin create request is passed. Since create items now work nicely, use a different function and handle pin creation requests seperately. Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -550,7 +550,6 @@ NTSTATUS Status; PKSALLOCATOR_FRAMING AllocatorFraming; PALLOCATOR Allocator; - PKSOBJECT_CREATE_ITEM CreateItem; PVOID Ctx; /* first validate connect request */ @@ -568,6 +567,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* allocate object header */ + Status = KsAllocateObjectHeader((KSOBJECT_HEADER*)&Allocator->Header, 0, NULL, Irp, &DispatchTable); if (!NT_SUCCESS(Status)) { @@ -619,16 +619,6 @@ /* backup allocator framing */ RtlMoveMemory(&Allocator->Status.Framing, AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); - /* get create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - if (CreateItem) - { - /* store create item */ - Allocator->Header->CreateItem = CreateItem; - Allocator->Header->ItemCount = 1; - } - return Status; } Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -414,6 +414,65 @@ return NULL; } +NTSTATUS +KspAddCreateItemToList( + OUT PLIST_ENTRY ListHead, + IN ULONG ItemsCount, + IN PKSOBJECT_CREATE_ITEM ItemsList) +{ + ULONG Index; + PCREATE_ITEM_ENTRY Entry; + + /* add the items */ + for(Index = 0; Index < ItemsCount; Index++) + { + /* allocate item */ + Entry = AllocateItem(NonPagedPool, sizeof(CREATE_ITEM_ENTRY)); + if (!Entry) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize entry */ + InitializeListHead(&Entry->ObjectItemList); + Entry->CreateItem = &ItemsList[Index]; + Entry->ReferenceCount = 0; + Entry->ItemFreeCallback = NULL; + + InsertTailList(ListHead, &Entry->Entry); + } + return STATUS_SUCCESS; +} + +VOID +KspFreeCreateItems( + PLIST_ENTRY ListHead) +{ + PCREATE_ITEM_ENTRY Entry; + + while(!IsListEmpty(ListHead)) + { + /* remove create item from list */ + Entry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(RemoveHeadList(ListHead), CREATE_ITEM_ENTRY, Entry); + + /* caller shouldnt have any references */ + ASSERT(Entry->ReferenceCount == 0); + ASSERT(IsListEmpty(&Entry->ObjectItemList)); + + /* does the creator wish notification */ + if (Entry->ItemFreeCallback) + { + /* notify creator */ + Entry->ItemFreeCallback(Entry->CreateItem); + } + + /* free create item entry */ + FreeItem(Entry); + } + +} + /* @implemented */ @@ -425,7 +484,7 @@ IN ULONG ItemsCount, IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL) { - ULONG Index = 0; + NTSTATUS Status = STATUS_SUCCESS; PKSIDEVICE_HEADER Header; if (!OutHeader) @@ -440,9 +499,6 @@ /* clear all memory */ RtlZeroMemory(Header, sizeof(KSIDEVICE_HEADER)); - - /* initialize spin lock */ - KeInitializeSpinLock(&Header->ItemListLock); //FIXME /* initialize device mutex */ KeInitializeMutex(&Header->DeviceMutex, 0); @@ -452,34 +508,34 @@ /* initialize power dispatch list */ InitializeListHead(&Header->PowerDispatchList); + /* initialize create item list */ + InitializeListHead(&Header->ItemList); + /* are there any create items provided */ if (ItemsCount && ItemsList) { - /* allocate space for device item list */ - Header->ItemList = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_ITEM) * ItemsCount, TAG_DEVICE_HEADER); - if (!Header->ItemList) - { - ExFreePoolWithTag(Header, TAG_DEVICE_HEADER); - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlZeroMemory(Header->ItemList, sizeof(DEVICE_ITEM) * ItemsCount); - - for(Index = 0; Index < ItemsCount; Index++) - { - /* store provided create items */ - Header->ItemList[Index].CreateItem = &ItemsList[Index]; - } - Header->MaxItems = ItemsCount; + Status = KspAddCreateItemToList(&Header->ItemList, ItemsCount, ItemsList); + + if (NT_SUCCESS(Status)) + { + /* store item count */ + Header->ItemListCount = ItemsCount; + } + else + { + /* release create items */ + KspFreeCreateItems(&Header->ItemList); + } } /* store result */ *OutHeader = Header; - return STATUS_SUCCESS; -} - -/* - @unimplemented + return Status; +} + +/* + @implemented */ KSDDKAPI VOID @@ -494,7 +550,7 @@ if (!DevHeader) return; - ExFreePoolWithTag(Header->ItemList, TAG_DEVICE_HEADER); + KspFreeCreateItems(&Header->ItemList); ExFreePoolWithTag(Header, TAG_DEVICE_HEADER); } @@ -515,6 +571,8 @@ PDEVICE_EXTENSION DeviceExtension; PKSIDEVICE_HEADER DeviceHeader; PKSIOBJECT_HEADER ObjectHeader; + PKSOBJECT_CREATE_ITEM CreateItem; + NTSTATUS Status; if (!Header) return STATUS_INVALID_PARAMETER_1; @@ -544,6 +602,12 @@ /* initialize object header */ RtlZeroMemory(ObjectHeader, sizeof(KSIOBJECT_HEADER)); + /* initialize create item list */ + InitializeListHead(&ObjectHeader->ItemList); + + /* get create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* do we have a name */ if (IoStack->FileObject->FileName.Buffer) { @@ -560,28 +624,34 @@ /* copy dispatch table */ RtlCopyMemory(&ObjectHeader->DispatchTable, Table, sizeof(KSDISPATCH_TABLE)); + /* store create items */ if (ItemsCount && ItemsList) { - ObjectHeader->ItemCount = ItemsCount; - ObjectHeader->CreateItem = ItemsList; - } - + Status = KspAddCreateItemToList(&ObjectHeader->ItemList, ItemsCount, ItemsList); + + if (NT_SUCCESS(Status)) + { + /* store item count */ + ObjectHeader->ItemListCount = ItemsCount; + } + else + { + /* destroy header*/ + KsFreeObjectHeader(ObjectHeader); + return Status; + } + } /* store the object in the file object */ ASSERT(IoStack->FileObject->FsContext == NULL); IoStack->FileObject->FsContext = ObjectHeader; - /* the object header is for a audio filter */ - ASSERT(DeviceHeader->DeviceIndex < DeviceHeader->MaxItems); - /* store parent device */ ObjectHeader->ParentDeviceObject = IoGetRelatedDeviceObject(IoStack->FileObject); /* store result */ *Header = ObjectHeader; - - DPRINT("KsAllocateObjectHeader ObjectClass %S FileObject %p, ObjectHeader %p\n", ObjectHeader->ObjectClass.Buffer, IoStack->FileObject, ObjectHeader); return STATUS_SUCCESS; @@ -611,11 +681,57 @@ ObjectHeader->Unknown->lpVtbl->Release(ObjectHeader->Unknown); } - /* FIXME free create items */ + /* free create items */ + KspFreeCreateItems(&ObjectHeader->ItemList); /* free object header */ ExFreePoolWithTag(ObjectHeader, TAG_DEVICE_HEADER); +} + +NTSTATUS +KspAddObjectCreateItemToList( + PLIST_ENTRY ListHead, + IN PDRIVER_DISPATCH Create, + IN PVOID Context, + IN PWCHAR ObjectClass, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PLIST_ENTRY Entry; + PCREATE_ITEM_ENTRY CreateEntry; + + /* point to first entry */ + Entry = ListHead->Flink; + + while(Entry != ListHead) + { + /* get create entry */ + CreateEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(Entry, CREATE_ITEM_ENTRY, Entry); + /* if the create item has no create routine, then it is free to use */ + if (CreateEntry->CreateItem->Create == NULL) + { + /* sanity check */ + ASSERT(IsListEmpty(&CreateEntry->ObjectItemList)); + ASSERT(CreateEntry->ReferenceCount == 0); + /* use free entry */ + CreateEntry->CreateItem->Context = Context; + CreateEntry->CreateItem->Create = Create; + RtlInitUnicodeString(&CreateEntry->CreateItem->ObjectClass, ObjectClass); + CreateEntry->CreateItem->SecurityDescriptor = SecurityDescriptor; + + return STATUS_SUCCESS; + } + + if (!wcsicmp(ObjectClass, CreateEntry->CreateItem->ObjectClass.Buffer)) + { + /* the same object class already exists */ + return STATUS_OBJECT_NAME_COLLISION; + } + + /* iterate to next entry */ + Entry = Entry->Flink; + } + return STATUS_ALLOTTED_SPACE_EXCEEDED; } /* @@ -632,7 +748,7 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor) { PKSIDEVICE_HEADER Header; - ULONG FreeIndex, Index; + NTSTATUS Status; Header = (PKSIDEVICE_HEADER)DevHeader; @@ -650,39 +766,16 @@ if (!ObjectClass) return STATUS_INVALID_PARAMETER_4; - FreeIndex = (ULONG)-1; - /* now scan the list and check for a free item */ - for(Index = 0; Index < Header->MaxItems; Index++) - { - ASSERT(Header->ItemList[Index].CreateItem); - - if (Header->ItemList[Index].CreateItem->Create == NULL) - { - FreeIndex = Index; - break; - } - - if (!wcsicmp(ObjectClass, Header->ItemList[Index].CreateItem->ObjectClass.Buffer)) - { - /* the same object class already exists */ - return STATUS_OBJECT_NAME_COLLISION; - } - } - /* found a free index */ - if (FreeIndex == (ULONG)-1) - { - /* no empty space found */ - return STATUS_ALLOTTED_SPACE_EXCEEDED; - } - - /* initialize create item */ - Header->ItemList[FreeIndex].CreateItem->Create = Create; - Header->ItemList[FreeIndex].CreateItem->Context = Context; - RtlInitUnicodeString(&Header->ItemList[FreeIndex].CreateItem->ObjectClass, ObjectClass); - Header->ItemList[FreeIndex].CreateItem->SecurityDescriptor = SecurityDescriptor; - - - return STATUS_SUCCESS; + /* let others do the work */ + Status = KspAddObjectCreateItemToList(&Header->ItemList, Create, Context, ObjectClass, SecurityDescriptor); + + if (NT_SUCCESS(Status)) + { + /* increment create item count */ + InterlockedIncrement(&Header->ItemListCount); + } + + return Status; } /* @@ -692,14 +785,41 @@ NTSTATUS NTAPI KsAddObjectCreateItemToObjectHeader( - IN KSOBJECT_HEADER Header, + IN KSOBJECT_HEADER ObjectHeader, IN PDRIVER_DISPATCH Create, IN PVOID Context, IN PWCHAR ObjectClass, IN PSECURITY_DESCRIPTOR SecurityDescriptor) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PKSIOBJECT_HEADER Header; + NTSTATUS Status; + + Header = (PKSIOBJECT_HEADER)ObjectHeader; + + DPRINT1("KsAddObjectCreateItemToDeviceHeader entered\n"); + + /* check if a device header has been provided */ + if (!Header) + return STATUS_INVALID_PARAMETER_1; + + /* check if a create item has been provided */ + if (!Create) + return STATUS_INVALID_PARAMETER_2; + + /* check if a object class has been provided */ + if (!ObjectClass) + return STATUS_INVALID_PARAMETER_4; + + /* let's work */ + Status = KspAddObjectCreateItemToList(&Header->ItemList, Create, Context, ObjectClass, SecurityDescriptor); + + if (NT_SUCCESS(Status)) + { + /* increment create item count */ + InterlockedIncrement(&Header->ItemListCount); + } + + return Status; } /* @@ -714,10 +834,9 @@ IN BOOLEAN AllocateEntry, IN PFNKSITEMFREECALLBACK ItemFreeCallback OPTIONAL) { + PCREATE_ITEM_ENTRY CreateEntry; PKSIDEVICE_HEADER Header; PKSOBJECT_CREATE_ITEM Item; - PDEVICE_ITEM ItemList; - KIRQL OldLevel; Header = (PKSIDEVICE_HEADER)DevHeader; @@ -727,35 +846,25 @@ if (!CreateItem) return STATUS_INVALID_PARAMETER_2; - /* acquire list lock */ - KeAcquireSpinLock(&Header->ItemListLock, &OldLevel); - - ItemList = ExAllocatePool(NonPagedPool, sizeof(DEVICE_ITEM) * (Header->MaxItems + 1)); - if (!ItemList) - { + /* first allocate a create entry */ + CreateEntry = AllocateItem(NonPagedPool, sizeof(PCREATE_ITEM_ENTRY)); + + /* check for allocation success */ + if (!CreateEntry) + { + /* not enough resources */ return STATUS_INSUFFICIENT_RESOURCES; } + if (AllocateEntry) { - if (!ItemFreeCallback) - { - /* caller must be notified */ - ExFreePool(ItemList); - /* release lock */ - KeReleaseSpinLock(&Header->ItemListLock, OldLevel); - - return STATUS_INVALID_PARAMETER_4; - } /* allocate create item */ Item = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); if (!Item) { /* no memory */ - ExFreePool(ItemList); - /* release lock */ - KeReleaseSpinLock(&Header->ItemListLock, OldLevel); - + ExFreePool(CreateEntry); return STATUS_INSUFFICIENT_RESOURCES; } @@ -772,15 +881,11 @@ if (!Item->ObjectClass.Buffer) { /* release resources */ - ExFreePool(Item); - ExFreePool(ItemList); - - /* release lock */ - KeReleaseSpinLock(&Header->ItemListLock, OldLevel); + FreeItem(Item); + FreeItem(CreateEntry); return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyUnicodeString(&Item->ObjectClass, &CreateItem->ObjectClass); } else @@ -788,39 +893,25 @@ if (ItemFreeCallback) { /* callback is only accepted when the create item is copied */ - ExFreePool(ItemList); - /* release lock */ - KeReleaseSpinLock(&Header->ItemListLock, OldLevel); - - return STATUS_INVALID_PARAMETER_4; - } - + ItemFreeCallback = NULL; + } + /* use passed create item */ Item = CreateItem; } - - if (Header->MaxItems) - { - /* copy old create items */ - RtlMoveMemory(ItemList, Header->ItemList, sizeof(DEVICE_ITEM) * Header->MaxItems); - } - - /* initialize item entry */ - ItemList[Header->MaxItems].CreateItem = Item; - ItemList[Header->MaxItems].ItemFreeCallback = ItemFreeCallback; - - - /* free old item list */ - ExFreePool(Header->ItemList); - - Header->ItemList = ItemList; - Header->MaxItems++; - - /* release lock */ - KeReleaseSpinLock(&Header->ItemListLock, OldLevel); + /* initialize create item entry */ + InitializeListHead(&CreateEntry->ObjectItemList); + CreateEntry->ItemFreeCallback = ItemFreeCallback; + CreateEntry->CreateItem = Item; + CreateEntry->ReferenceCount = 0; + + /* now insert the create item entry */ + InsertTailList(&Header->ItemList, &CreateEntry->Entry); + + /* increment item count */ + InterlockedIncrement(&Header->ItemListCount); return STATUS_SUCCESS; - } NTSTATUS @@ -990,7 +1081,7 @@ /* it is send the request */ Status = ObjectHeader->DispatchTable.FastDeviceIoControl(FileObject, TRUE, InBuffer, InSize, OutBuffer, OutSize, IoControl, &IoStatusBlock, DeviceObject); /* check if the request was handled */ - DPRINT("Handled %u Status %x Length %u\n", Status, IoStatusBlock.Status, IoStatusBlock.Information); + //DPRINT("Handled %u Status %x Length %u\n", Status, IoStatusBlock.Status, IoStatusBlock.Information); if (Status) { /* store bytes returned */ Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -159,13 +159,6 @@ /* get create item */ CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - if (CreateItem) - { - /* store create item */ - Clock->ObjectHeader->CreateItem = CreateItem; - Clock->ObjectHeader->ItemCount = 1; - } - return Status; } Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -532,12 +532,12 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PCREATE_ITEM_ENTRY CreateItemEntry; PIO_STACK_LOCATION IoStack; PDEVICE_EXTENSION DeviceExtension; PKSIDEVICE_HEADER DeviceHeader; - ULONG Index; + PKSIOBJECT_HEADER ObjectHeader; NTSTATUS Status; - ULONG Length; DPRINT("KS / CREATE\n"); /* get current stack location */ @@ -553,49 +553,54 @@ /* sanity check */ ASSERT(IoStack->FileObject); - /* loop all device items */ - for(Index = 0; Index < DeviceHeader->MaxItems; Index++) - { - /* is there a create item */ - if (DeviceHeader->ItemList[Index].CreateItem == NULL) - continue; - - /* check if the create item is initialized */ - if (!DeviceHeader->ItemList[Index].CreateItem->Create) - continue; - - ASSERT(DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer); - DPRINT("CreateItem %p Request %S\n", DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer, - IoStack->FileObject->FileName.Buffer); - - /* get object class length */ - Length = wcslen(DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer); - /* now check if the object class is the same */ - if (!_wcsnicmp(DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer, &IoStack->FileObject->FileName.Buffer[1], Length) || - (DeviceHeader->ItemList[Index].CreateItem->Flags & KSCREATE_ITEM_WILDCARD)) - { - /* setup create parameters */ - DeviceHeader->DeviceIndex = Index; - /* set object create item */ - KSCREATE_ITEM_IRP_STORAGE(Irp) = DeviceHeader->ItemList[Index].CreateItem; - - /* call create function */ - Status = DeviceHeader->ItemList[Index].CreateItem->Create(DeviceObject, Irp); - - /* release lock */ - IKsDevice_fnRelease((IKsDevice*)&DeviceHeader->lpVtblIKsDevice); - - /* did we succeed */ - if (NT_SUCCESS(Status)) - { - /* increment create item reference count */ - InterlockedIncrement((PLONG)&DeviceHeader->ItemList[Index].ReferenceCount); - } - - /* return result */ - return Status; - } - } + /* check if the request is relative */ + if (IoStack->FileObject->RelatedFileObject != NULL) + { + /* request is to instantiate a pin / node / clock / allocator */ + ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->RelatedFileObject->FsContext; + + /* sanity check */ + ASSERT(ObjectHeader); + + /* find a matching a create item */ + Status = FindMatchingCreateItem(&ObjectHeader->ItemList, IoStack->FileObject->FileName.Length, IoStack->FileObject->FileName.Buffer, &CreateItemEntry); + } + else + { + /* request to create a filter */ + Status = FindMatchingCreateItem(&DeviceHeader->ItemList, IoStack->FileObject->FileName.Length, IoStack->FileObject->FileName.Buffer, &CreateItemEntry); + } + + if (NT_SUCCESS(Status)) + { + /* set object create item */ + KSCREATE_ITEM_IRP_STORAGE(Irp) = CreateItemEntry->CreateItem; + + /* call create function */ + Status = CreateItemEntry->CreateItem->Create(DeviceObject, Irp); + + if (NT_SUCCESS(Status)) + { + /* increment create item reference count */ + InterlockedIncrement(&CreateItemEntry->ReferenceCount); + } + + /* acquire list lock */ + IKsDevice_fnReleaseDevice((IKsDevice*)&DeviceHeader->lpVtblIKsDevice); + + return Status; + } + + /* acquire list lock */ + IKsDevice_fnReleaseDevice((IKsDevice*)&DeviceHeader->lpVtblIKsDevice); + + DPRINT1("No item found for Request %p\n", IoStack->FileObject->FileName.Buffer); + + Irp->IoStatus.Information = 0; + /* set return status */ + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; /* release lock */ IKsDevice_fnRelease((IKsDevice*)&DeviceHeader->lpVtblIKsDevice); @@ -641,6 +646,7 @@ KsSetDevicePnpAndBaseObject(Header, PhysicalDeviceObject, NextDeviceObject); /* initialize IKsDevice interface */ Header->lpVtblIKsDevice = &vt_IKsDevice; + Header->Type = KsObjectTypeDevice; Header->ref = 1; /* FIXME Power state */ Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -37,6 +37,22 @@ DeviceExtension = (PDEVICE_EXTENSION)FunctionalDeviceObject->DeviceExtension; return &DeviceExtension->DeviceHeader->KsDevice; +} + +/* + @implemented +*/ +KSDDKAPI +PKSDEVICE +NTAPI +KsGetDevice( + IN PVOID Object) +{ + PKSBASIC_HEADER BasicHeader = (PKSBASIC_HEADER)(ULONG_PTR)Object - sizeof(KSBASIC_HEADER); + + ASSERT(BasicHeader->Type == KsObjectTypeFilterFactory || BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == BasicHeader->Type); + + return BasicHeader->KsDevice; } /* Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -11,13 +11,15 @@ typedef struct { + KSBASIC_HEADER Header; + KSFILTER Filter; + IKsFilterVtbl *lpVtbl; IKsControlVtbl *lpVtblKsControl; IKsFilterFactory * FilterFactory; LONG ref; PKSIOBJECT_HEADER ObjectHeader; - KSFILTER Filter; KSTOPOLOGY Topology; KSPIN_DESCRIPTOR * PinDescriptors; ULONG PinDescriptorCount; @@ -831,8 +833,11 @@ IKsFilterImpl * This; PKSFILTERFACTORY Factory; PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; NTSTATUS Status; + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get the filter factory */ Factory = iface->lpVtbl->GetStruct(iface); @@ -859,6 +864,8 @@ This->Factory = Factory; This->FilterFactory = iface; This->FileObject = IoStack->FileObject; + This->Header.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; + This->Header.Type = KsObjectTypeFilter; /* allocate the stream descriptors */ Status = IKsFilter_CreateDescriptors(This, (PKSFILTER_DESCRIPTOR)Factory->FilterDescriptor); @@ -908,6 +915,8 @@ } /* initialize object header */ + This->Header.Type = KsObjectTypeFilter; + This->Header.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; This->ObjectHeader->Type = KsObjectTypeFilter; This->ObjectHeader->Unknown = (PUNKNOWN)&This->lpVtbl; Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -11,19 +11,17 @@ typedef struct { + KSBASIC_HEADER Header; + KSFILTERFACTORY FilterFactory; + IKsFilterFactoryVtbl *lpVtbl; - KSFILTERFACTORY FilterFactory; + LONG ref; PKSIDEVICE_HEADER DeviceHeader; - - LONG ref; - PFNKSFILTERFACTORYPOWER SleepCallback; PFNKSFILTERFACTORYPOWER WakeCallback; LIST_ENTRY SymbolicLinkList; LIST_ENTRY FilterInstanceList; - - }IKsFilterFactoryImpl; typedef struct @@ -178,10 +176,17 @@ IKsFilterFactoryImpl * This = (IKsFilterFactoryImpl*)CONTAINING_RECORD(iface, IKsFilterFactoryImpl, lpVtbl); + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* initialize filterfactory */ This->SleepCallback = SleepCallback; This->WakeCallback = WakeCallback; This->FilterFactory.FilterDescriptor = Descriptor; + This->Header.KsDevice = &DeviceExtension->DeviceHeader->KsDevice; + This->Header.Type = KsObjectTypeFilterFactory; + This->DeviceHeader = DeviceExtension->DeviceHeader; + InitializeListHead(&This->SymbolicLinkList); InitializeListHead(&This->FilterInstanceList); @@ -205,9 +210,6 @@ FreeString = TRUE; } - - /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; /* now register the device interface */ Status = KspRegisterDeviceInterfaces(DeviceExtension->DeviceHeader->KsDevice.PhysicalDeviceObject, 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] Wed Jul 22 16:42:51 2009 @@ -269,7 +269,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -903,19 +903,85 @@ return STATUS_UNSUCCESSFUL; } +NTSTATUS +FindMatchingCreateItem( + PLIST_ENTRY ListHead, + ULONG BufferSize, + LPWSTR Buffer, + OUT PCREATE_ITEM_ENTRY *OutCreateItem) +{ + PLIST_ENTRY Entry; + PCREATE_ITEM_ENTRY CreateItemEntry; + + /* remove '\' slash */ + Buffer++; + BufferSize -= sizeof(WCHAR); + + /* point to first entry */ + Entry = ListHead->Flink; + + /* loop all device items */ + while(Entry != ListHead) + { + /* get create item entry */ + CreateItemEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(Entry, CREATE_ITEM_ENTRY, Entry); + + ASSERT(CreateItemEntry->CreateItem); + + if(CreateItemEntry->CreateItem->Flags & KSCREATE_ITEM_WILDCARD) + { + /* create item is default */ + *OutCreateItem = CreateItemEntry; + return STATUS_SUCCESS; + } + + if (!CreateItemEntry->CreateItem->Create) + { + /* skip free create item */ + Entry = Entry->Flink; + continue; + } + + ASSERT(CreateItemEntry->CreateItem->ObjectClass.Buffer); + + DPRINT1("CreateItem %S Length %u Request %S %u\n", CreateItemEntry->CreateItem->ObjectClass.Buffer, + CreateItemEntry->CreateItem->ObjectClass.Length, + Buffer, + BufferSize); + + if (CreateItemEntry->CreateItem->ObjectClass.Length > BufferSize) + { + /* create item doesnt match in length */ + Entry = Entry->Flink; + continue; + } + + /* now check if the object class is the same */ + if (RtlCompareMemory(CreateItemEntry->CreateItem->ObjectClass.Buffer, Buffer, CreateItemEntry->CreateItem->ObjectClass.Length) == CreateItemEntry->CreateItem->ObjectClass.Length) + { + /* found matching create item */ + *OutCreateItem = CreateItemEntry; + return STATUS_SUCCESS; + } + /* iterate to next */ + Entry = Entry->Flink; + } + + return STATUS_NOT_FOUND; +} + NTAPI NTSTATUS KspCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PCREATE_ITEM_ENTRY CreateItemEntry; PIO_STACK_LOCATION IoStack; PDEVICE_EXTENSION DeviceExtension; PKSIDEVICE_HEADER DeviceHeader; - ULONG Index; + PKSIOBJECT_HEADER ObjectHeader; NTSTATUS Status; - KIRQL OldLevel; - ULONG Length; DPRINT("KS / CREATE\n"); /* get current stack location */ @@ -925,41 +991,36 @@ /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; - /* acquire list lock */ - KeAcquireSpinLock(&DeviceHeader->ItemListLock, &OldLevel); - - /* sanity check */ - ASSERT(IoStack->FileObject); - - if (IoStack->FileObject->FileName.Buffer == NULL && DeviceHeader->MaxItems == 1) + if (IoStack->FileObject->FileName.Buffer == NULL && DeviceHeader->ItemListCount == 1) { /* hack for bug 4566 */ - if (!DeviceHeader->ItemList[0].CreateItem || !DeviceHeader->ItemList[0].CreateItem->Create) + ASSERT(!IsListEmpty(&DeviceHeader->ItemList)); + /* get create item entry */ + CreateItemEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(DeviceHeader->ItemList.Flink, CREATE_ITEM_ENTRY, Entry); + + ASSERT(CreateItemEntry->CreateItem); + + if (!CreateItemEntry->CreateItem->Create) { /* no valid create item */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* release lock */ - KeReleaseSpinLock(&DeviceHeader->ItemListLock, OldLevel); /* return status */ return STATUS_UNSUCCESSFUL; } /* set object create item */ - KSCREATE_ITEM_IRP_STORAGE(Irp) = DeviceHeader->ItemList[0].CreateItem; + KSCREATE_ITEM_IRP_STORAGE(Irp) = CreateItemEntry->CreateItem; /* call create function */ - Status = DeviceHeader->ItemList[0].CreateItem->Create(DeviceObject, Irp); + Status = CreateItemEntry->CreateItem->Create(DeviceObject, Irp); if (NT_SUCCESS(Status)) { /* increment create item reference count */ - InterlockedIncrement((PLONG)&DeviceHeader->ItemList[0].ReferenceCount); - } - - /* release lock */ - KeReleaseSpinLock(&DeviceHeader->ItemListLock, OldLevel); + InterlockedIncrement(&CreateItemEntry->ReferenceCount); + } /* return result */ return Status; } @@ -969,8 +1030,6 @@ if (IoStack->FileObject->FileName.Buffer == NULL) { DPRINT("Using reference string hack\n"); - /* release lock */ - KeReleaseSpinLock(&DeviceHeader->ItemListLock, OldLevel); Irp->IoStatus.Information = 0; /* set return status */ Irp->IoStatus.Status = STATUS_SUCCESS; @@ -978,51 +1037,40 @@ return STATUS_SUCCESS; } - /* loop all device items */ - for(Index = 0; Index < DeviceHeader->MaxItems; Index++) - { - /* is there a create item */ - if (DeviceHeader->ItemList[Index].CreateItem == NULL) - continue; - - /* check if the create item is initialized */ - if (!DeviceHeader->ItemList[Index].CreateItem->Create) - continue; - - ASSERT(DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer); - DPRINT("CreateItem %p Request %S\n", DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer, - IoStack->FileObject->FileName.Buffer); - - /* get object class length */ - Length = wcslen(DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer); - /* now check if the object class is the same */ - if (!_wcsnicmp(DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer, &IoStack->FileObject->FileName.Buffer[1], Length) || - (DeviceHeader->ItemList[Index].CreateItem->Flags & KSCREATE_ITEM_WILDCARD)) - { - /* setup create parameters */ - DeviceHeader->DeviceIndex = Index; - /* set object create item */ - KSCREATE_ITEM_IRP_STORAGE(Irp) = DeviceHeader->ItemList[Index].CreateItem; - - /* call create function */ - Status = DeviceHeader->ItemList[Index].CreateItem->Create(DeviceObject, Irp); - - if (NT_SUCCESS(Status)) - { - /* increment create item reference count */ - InterlockedIncrement((PLONG)&DeviceHeader->ItemList[Index].ReferenceCount); - } - - /* release lock */ - KeReleaseSpinLock(&DeviceHeader->ItemListLock, OldLevel); - - /* return result */ - return Status; - } - } - - /* release lock */ - KeReleaseSpinLock(&DeviceHeader->ItemListLock, OldLevel); + + if (IoStack->FileObject->RelatedFileObject != NULL) + { + /* request is to instantiate a pin / node / clock / allocator */ + ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->RelatedFileObject->FsContext; + + /* sanity check */ + ASSERT(ObjectHeader); + + /* find a matching a create item */ + Status = FindMatchingCreateItem(&ObjectHeader->ItemList, IoStack->FileObject->FileName.Length, IoStack->FileObject->FileName.Buffer, &CreateItemEntry); + } + else + { + /* request to create a filter */ + Status = FindMatchingCreateItem(&DeviceHeader->ItemList, IoStack->FileObject->FileName.Length, IoStack->FileObject->FileName.Buffer, &CreateItemEntry); + } + + if (NT_SUCCESS(Status)) + { + /* set object create item */ + KSCREATE_ITEM_IRP_STORAGE(Irp) = CreateItemEntry->CreateItem; + + /* call create function */ + Status = CreateItemEntry->CreateItem->Create(DeviceObject, Irp); + + if (NT_SUCCESS(Status)) + { + /* increment create item reference count */ + InterlockedIncrement(&CreateItemEntry->ReferenceCount); + } + return Status; + } + Irp->IoStatus.Information = 0; /* set return status */ @@ -1031,6 +1079,81 @@ return STATUS_UNSUCCESSFUL; } +NTSTATUS +RosDeviceInterfaceReferenceStringHack( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PKSIDEVICE_HEADER DeviceHeader; + PDEVICE_EXTENSION DeviceExtension; + PCREATE_ITEM_ENTRY CreateItemEntry; + PLIST_ENTRY Entry; + LPWSTR Buffer; + ULONG Length; + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; + /* get device header */ + DeviceHeader = DeviceExtension->DeviceHeader; + + /* retrieve all available reference strings registered */ + Length = 0; + Entry = DeviceHeader->ItemList.Flink; + while(Entry != &DeviceHeader->ItemList) + { + CreateItemEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(Entry, CREATE_ITEM_ENTRY, Entry); + + ASSERT(CreateItemEntry->CreateItem); + if (CreateItemEntry->CreateItem->Create && CreateItemEntry->CreateItem->ObjectClass.Buffer) + Length += wcslen(CreateItemEntry->CreateItem->ObjectClass.Buffer) + 1; + + Entry = Entry->Flink; + } + + /* add extra zero */ + Length += 1; + + /* allocate the buffer */ + Buffer = ExAllocatePool(NonPagedPool, Length * sizeof(WCHAR)); + if (!Buffer) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + + *((LPWSTR*)Irp->UserBuffer) = Buffer; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(LPWSTR); + + Entry = DeviceHeader->ItemList.Flink; + while(Entry != &DeviceHeader->ItemList) + { + CreateItemEntry = (PCREATE_ITEM_ENTRY)CONTAINING_RECORD(Entry, CREATE_ITEM_ENTRY, Entry); + + ASSERT(CreateItemEntry->CreateItem); + if (CreateItemEntry->CreateItem->Create && CreateItemEntry->CreateItem->ObjectClass.Buffer) + { + wcscpy(Buffer, CreateItemEntry->CreateItem->ObjectClass.Buffer); + Buffer += wcslen(Buffer) + 1; + } + Entry = Entry->Flink; + } + + + + *Buffer = L'\0'; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + +} + NTAPI NTSTATUS KspDeviceControl( @@ -1041,8 +1164,8 @@ PKSIOBJECT_HEADER ObjectHeader; PKSIDEVICE_HEADER DeviceHeader; PDEVICE_EXTENSION DeviceExtension; - ULONG Length, Index; - LPWSTR Buffer; + + /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1052,65 +1175,18 @@ /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; - /* hack for bug 4566 */ if (IoStack->MajorFunction == IRP_MJ_DEVICE_CONTROL && IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_OBJECT_CLASS) { - /* retrieve all available reference strings registered */ - Length = 0; - - for(Index = 0; Index < DeviceHeader->MaxItems; Index++) - { - if (!DeviceHeader->ItemList[Index].CreateItem || !DeviceHeader->ItemList[Index].CreateItem->Create || !DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer) - continue; - - Length += wcslen(DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer) + 1; - } - - /* add extra zero */ - Length += 1; - - /* allocate the buffer */ - Buffer = ExAllocatePool(NonPagedPool, Length * sizeof(WCHAR)); - if (!Buffer) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - *((LPWSTR*)Irp->UserBuffer) = Buffer; - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(LPWSTR); - - for(Index = 0; Index < DeviceHeader->MaxItems; Index++) - { - if (!DeviceHeader->ItemList[Index].CreateItem || !DeviceHeader->ItemList[Index].CreateItem->Create || !DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer) - continue; - - wcscpy(Buffer, DeviceHeader->ItemList[Index].CreateItem->ObjectClass.Buffer); - Buffer += wcslen(Buffer) + 1; - } - *Buffer = L'\0'; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - - DPRINT("KS / DeviceControl\n"); - if (IoStack->FileObject && IoStack->FileObject->FsContext) - { - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - - return ObjectHeader->DispatchTable.DeviceIoControl(DeviceObject, Irp); - } - else - { - DPRINT1("Expected Object Header\n"); - KeBugCheckEx(0, 0, 0, 0, 0); - return STATUS_SUCCESS; - } + /* hack for bug 4566 */ + return RosDeviceInterfaceReferenceStringHack(DeviceObject, Irp); + } + + ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; + + ASSERT(ObjectHeader); + //KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; + + return ObjectHeader->DispatchTable.DeviceIoControl(DeviceObject, Irp); } NTAPI @@ -1150,7 +1226,7 @@ /* sanity check */ ASSERT(ObjectHeader); /* store create item */ - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; + //KSCREATE_ITEM_IRP_STORAGE(Irp) = (PKSOBJECT_CREATE_ITEM)0x12345678; //ObjectHeader->CreateItem; /* retrieve matching dispatch function */ switch(IoStack->MajorFunction) Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -2,6 +2,7 @@ #define KSFUNC_H__ #include "ksiface.h" +#include "kstypes.h" #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_KSDEVICE TAG('K', 'S', 'E', 'D') @@ -99,4 +100,11 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data); +NTSTATUS +FindMatchingCreateItem( + PLIST_ENTRY ListHead, + ULONG BufferSize, + LPWSTR Buffer, + OUT PCREATE_ITEM_ENTRY *OutCreateItem); + #endif Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -5,8 +5,9 @@ { KSDISPATCH_TABLE DispatchTable; KSOBJECTTYPE Type; - ULONG ItemCount; - PKSOBJECT_CREATE_ITEM CreateItem; + + LONG ItemListCount; + LIST_ENTRY ItemList; UNICODE_STRING ObjectClass; PUNKNOWN Unknown; @@ -24,32 +25,38 @@ typedef struct { + LIST_ENTRY Entry; PKSOBJECT_CREATE_ITEM CreateItem; PFNKSITEMFREECALLBACK ItemFreeCallback; LONG ReferenceCount; -}DEVICE_ITEM, *PDEVICE_ITEM; - - + LIST_ENTRY ObjectItemList; +}CREATE_ITEM_ENTRY, *PCREATE_ITEM_ENTRY; typedef struct { + KSOBJECTTYPE Type; + PKSDEVICE KsDevice; +}KSBASIC_HEADER, *PKSBASIC_HEADER; + +typedef struct +{ + KSOBJECTTYPE Type; + KSDEVICE KsDevice; IKsDeviceVtbl *lpVtblIKsDevice; + LONG ref; ERESOURCE SecurityLock; - USHORT MaxItems; - DEVICE_ITEM *ItemList; + LONG ItemListCount; + LIST_ENTRY ItemList; ULONG DeviceIndex; - KSPIN_LOCK ItemListLock; - PDEVICE_OBJECT PnpDeviceObject; PDEVICE_OBJECT BaseDevice; KSTARGET_STATE TargetState; LIST_ENTRY TargetDeviceList; - KSDEVICE KsDevice; KMUTEX DeviceMutex; KSDEVICE_DESCRIPTOR* Descriptor; 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] Wed Jul 22 16:42:51 2009 @@ -23,29 +23,11 @@ NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; OBJECT_ATTRIBUTES ObjectAttributes; - PFILE_OBJECT FileObject; UNICODE_STRING Name; - PKSIOBJECT_HEADER ObjectHeader; - - /* acquire parent file object */ - Status = ObReferenceObjectByHandle(ParentHandle, - GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to reference parent %x\n", Status); - return Status; - } - - /* get parent object header */ - ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; - /* sanity check */ - ASSERT(ObjectHeader); /* calculate request length */ Name.Length = 0; - Name.MaximumLength = wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + ObjectHeader->ObjectClass.MaximumLength + 2 * sizeof(WCHAR); + Name.MaximumLength = wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 2 * sizeof(WCHAR); Name.MaximumLength += sizeof(WCHAR); /* acquire request buffer */ Name.Buffer = ExAllocatePool(NonPagedPool, Name.MaximumLength); @@ -53,16 +35,13 @@ if (!Name.Buffer) { /* insufficient resources */ - ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - /* build a request which looks like \Parent\{ObjectGuid}\CreateParameters + /* build a request which looks like \{ObjectClass}\CreateParameters * For pins the parent is the reference string used in registration * For clocks it is full path for pin\{ClockGuid}\ClockCreateParams */ - - RtlAppendUnicodeStringToString(&Name, &ObjectHeader->ObjectClass); RtlAppendUnicodeToString(&Name, L"\\"); RtlAppendUnicodeToString(&Name, ObjectType); RtlAppendUnicodeToString(&Name, L"\\"); @@ -81,7 +60,7 @@ 0, 0, FILE_OPEN, - FILE_SYNCHRONOUS_IO_NONALERT, + 0, NULL, 0, CreateFileTypeNone, @@ -90,8 +69,6 @@ /* free request buffer */ ExFreePool(Name.Buffer); - /* release parent handle */ - ObDereferenceObject(FileObject); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -183,7 +183,7 @@ if (PrevDeviceObject) { /* store the device object in the device header */ - //KsSetDevicePnpBaseObject(portcls_ext->KsDeviceHeader, PrevDeviceObject, fdo); + //KsSetDevicePnpBaseObject(portcls_ext->KsDeviceHeader, fdo, PrevDeviceObject); portcls_ext->PrevDeviceObject = PrevDeviceObject; } else Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -15,13 +15,15 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - /* get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + PIO_STACK_LOCATION IoStack; + IIrpTarget * IrpTarget; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext2; + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->DeviceIoControl(IrpTarget, DeviceObject, Irp); } @@ -32,13 +34,16 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - /* get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + PIO_STACK_LOCATION IoStack; + IIrpTarget * IrpTarget; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext2; + + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Read(IrpTarget, DeviceObject, Irp); } @@ -49,13 +54,16 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - /* get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + PIO_STACK_LOCATION IoStack; + IIrpTarget * IrpTarget; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext2; + + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Write(IrpTarget, DeviceObject, Irp); } @@ -66,13 +74,16 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - /* get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + PIO_STACK_LOCATION IoStack; + IIrpTarget * IrpTarget; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext2; + + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Flush(IrpTarget, DeviceObject, Irp); } @@ -83,13 +94,16 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - /* get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + PIO_STACK_LOCATION IoStack; + IIrpTarget * IrpTarget; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext2; + + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->Close(IrpTarget, DeviceObject, Irp); } @@ -100,13 +114,16 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - /* get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + PIO_STACK_LOCATION IoStack; + IIrpTarget * IrpTarget; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext2; + + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->QuerySecurity(IrpTarget, DeviceObject, Irp); } @@ -117,13 +134,16 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - IIrpTarget * IrpTarget; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - /* get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + PIO_STACK_LOCATION IoStack; + IIrpTarget * IrpTarget; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* access IrpTarget */ + IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext2; + + /* let IrpTarget handle request */ return IrpTarget->lpVtbl->SetSecurity(IrpTarget, DeviceObject, Irp); } @@ -212,26 +232,19 @@ NewDispatchObject( IN PIRP Irp, IN IIrpTarget * Target, - IN LPWSTR Name) + IN ULONG CreateItemCount, + IN PKSOBJECT_CREATE_ITEM CreateItem) { NTSTATUS Status; KSOBJECT_HEADER ObjectHeader; - PKSOBJECT_CREATE_ITEM CreateItem; - PIO_STACK_LOCATION IoStack; - - CreateItem = AllocateItem(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM), TAG_PORTCLASS); - if (!CreateItem) - return STATUS_INSUFFICIENT_RESOURCES; - - CreateItem->Context = (PVOID)Target; - RtlInitUnicodeString(&CreateItem->ObjectClass, Name); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->FileObject); + PIO_STACK_LOCATION IoStack; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); IoStack->FileObject->FsContext2 = (PVOID)Target; - Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); + Status = KsAllocateObjectHeader(&ObjectHeader, CreateItemCount, CreateItem, Irp, &DispatchTable); DPRINT("KsAllocateObjectHeader result %x\n", Status); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -242,7 +242,43 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + ULONG Index; + PKSPROPERTY Property; + NTSTATUS Status; + ISubdevice * SubDevice = NULL; + PSUBDEVICE_DESCRIPTOR Descriptor = NULL; + IPortFilterTopologyImpl * This = (IPortFilterTopologyImpl*)iface; + + Property = (PKSPROPERTY)InputBuffer; + + if (InputBufferLength < sizeof(KSPROPERTY)) + return FALSE; + + + /* get private interface */ + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); + if (!NT_SUCCESS(Status)) + return FALSE; + + /* get descriptor */ + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); + if (!NT_SUCCESS(Status)) + { + SubDevice->lpVtbl->Release(SubDevice); + return FALSE; + } + + for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) + { + FastPropertyHandler(FileObject, (PKSPROPERTY)InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock, + 1, + &Descriptor->FilterPropertySet.Properties[Index], + Descriptor, SubDevice); + } + } + return TRUE; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -1015,7 +1015,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -260,7 +260,7 @@ /* get maximum data threshold */ MaximumDataThreshold = ((PKSDATAFORMAT_WAVEFORMATEX)This->Format)->WaveFormatEx.nAvgBytesPerSec; /* increase minimum data threshold by a third sec */ - MinimumDataThreshold += ((PKSDATAFORMAT_WAVEFORMATEX)This->Format)->WaveFormatEx.nAvgBytesPerSec / 3; + MinimumDataThreshold += This->FrameSize * 10; /* assure it has not exceeded */ MinimumDataThreshold = min(MinimumDataThreshold, MaximumDataThreshold); @@ -970,7 +970,7 @@ PrePostRatio = (This->PreCompleted * 100) / This->TotalPackets; MinData = This->IrpQueue->lpVtbl->NumData(This->IrpQueue); - DPRINT1("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u Ratio %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue), PrePostRatio); + DPRINT("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u Ratio %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue), PrePostRatio); Packet = (PCONTEXT_WRITE)Buffer; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -249,9 +249,9 @@ /* get current data threshold */ MinimumDataThreshold = This->IrpQueue->lpVtbl->GetMinimumDataThreshold(This->IrpQueue); /* get maximum data threshold */ - MaximumDataThreshold = ((PKSDATAFORMAT_WAVEFORMATEX)This->Format)->WaveFormatEx.nAvgBytesPerSec * 3; - /* increase minimum data threshold by a third sec */ - MinimumDataThreshold += ((PKSDATAFORMAT_WAVEFORMATEX)This->Format)->WaveFormatEx.nAvgBytesPerSec / 3; + MaximumDataThreshold = ((PKSDATAFORMAT_WAVEFORMATEX)This->Format)->WaveFormatEx.nAvgBytesPerSec; + /* increase minimum data threshold by 10 frames */ + MinimumDataThreshold += This->AllocatorFraming.FrameSize * 10; /* assure it has not exceeded */ MinimumDataThreshold = min(MinimumDataThreshold, MaximumDataThreshold); @@ -432,48 +432,48 @@ NTAPI IPortPinWavePci_HandleKsProperty( IN IPortPinWavePci * iface, - IN PIRP Irp) + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN PIO_STATUS_BLOCK IoStatusBlock) { PKSPROPERTY Property; NTSTATUS Status; UNICODE_STRING GuidString; - PIO_STACK_LOCATION IoStack; IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; - IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT("IPortPinWavePci_HandleKsProperty entered\n"); - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSPROPERTY)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (InputBufferLength < sizeof(KSPROPERTY)) + { + IoStatusBlock->Information = 0; + IoStatusBlock->Status = STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER; } - Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + Property = (PKSPROPERTY)InputBuffer; if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Connection)) { if (Property->Id == KSPROPERTY_CONNECTION_STATE) { - PKSSTATE State = (PKSSTATE)Irp->UserBuffer; + PKSSTATE State = (PKSSTATE)OutputBuffer; ASSERT_IRQL(DISPATCH_LEVEL); - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSSTATE)) + if (OutputBufferLength < sizeof(KSSTATE)) { - Irp->IoStatus.Information = sizeof(KSSTATE); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = sizeof(KSSTATE); + IoStatusBlock->Status = STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL; } if (Property->Flags & KSPROPERTY_TYPE_SET) { Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; + IoStatusBlock->Information = 0; if (This->Stream) { @@ -485,39 +485,35 @@ This->State = *State; } } - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Status = Status; return Status; } else if (Property->Flags & KSPROPERTY_TYPE_GET) { *State = This->State; - Irp->IoStatus.Information = sizeof(KSSTATE); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = sizeof(KSSTATE); + IoStatusBlock->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } } else if (Property->Id == KSPROPERTY_CONNECTION_DATAFORMAT) { - PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)Irp->UserBuffer; + PKSDATAFORMAT DataFormat = (PKSDATAFORMAT)OutputBuffer; if (Property->Flags & KSPROPERTY_TYPE_SET) { PKSDATAFORMAT NewDataFormat; if (!RtlCompareMemory(DataFormat, This->Format, DataFormat->FormatSize)) { - Irp->IoStatus.Information = DataFormat->FormatSize; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = DataFormat->FormatSize; + IoStatusBlock->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } NewDataFormat = AllocateItem(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); if (!NewDataFormat) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_NO_MEMORY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = 0; + IoStatusBlock->Status = STATUS_NO_MEMORY; return STATUS_NO_MEMORY; } RtlMoveMemory(NewDataFormat, DataFormat, DataFormat->FormatSize); @@ -543,16 +539,14 @@ This->IrpQueue->lpVtbl->UpdateFormat(This->IrpQueue, (PKSDATAFORMAT)NewDataFormat); This->Format = NewDataFormat; - Irp->IoStatus.Information = DataFormat->FormatSize; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = DataFormat->FormatSize; + IoStatusBlock->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } } DPRINT1("Failed to set format\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = 0; + IoStatusBlock->Status = STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL; } else if (Property->Flags & KSPROPERTY_TYPE_GET) @@ -560,45 +554,40 @@ if (!This->Format) { DPRINT1("No format\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = 0; + IoStatusBlock->Status = STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL; } - if (This->Format->FormatSize > IoStack->Parameters.DeviceIoControl.OutputBufferLength) + if (This->Format->FormatSize > OutputBufferLength) { - Irp->IoStatus.Information = This->Format->FormatSize; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = This->Format->FormatSize; + IoStatusBlock->Status = STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL; } RtlMoveMemory(DataFormat, This->Format, This->Format->FormatSize); - Irp->IoStatus.Information = DataFormat->FormatSize; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = DataFormat->FormatSize; + IoStatusBlock->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } } else if (Property->Id == KSPROPERTY_CONNECTION_ALLOCATORFRAMING) { - PKSALLOCATOR_FRAMING Framing = (PKSALLOCATOR_FRAMING)Irp->UserBuffer; + PKSALLOCATOR_FRAMING Framing = (PKSALLOCATOR_FRAMING)OutputBuffer; ASSERT_IRQL(DISPATCH_LEVEL); /* Validate input buffer */ - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KSALLOCATOR_FRAMING)) + if (OutputBufferLength < sizeof(KSALLOCATOR_FRAMING)) { - Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = sizeof(KSALLOCATOR_FRAMING); + IoStatusBlock->Status = STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL; } /* copy frame allocator struct */ RtlMoveMemory(Framing, &This->AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); - Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Information = sizeof(KSALLOCATOR_FRAMING); + IoStatusBlock->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } } @@ -607,9 +596,8 @@ DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); RtlFreeUnicodeString(&GuidString); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoStatusBlock->Status = STATUS_NOT_IMPLEMENTED; + IoStatusBlock->Information = 0; return STATUS_NOT_IMPLEMENTED; } @@ -624,12 +612,15 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; + NTSTATUS Status; IoStack = IoGetCurrentIrpStackLocation(Irp); if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) { - return IPortPinWavePci_HandleKsProperty(iface, Irp); + Status = IPortPinWavePci_HandleKsProperty(iface, IoStack->Parameters.DeviceIoControl.Type3InputBuffer, IoStack->Parameters.DeviceIoControl.InputBufferLength, Irp->UserBuffer, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &Irp->IoStatus); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } @@ -850,7 +841,17 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED + NTSTATUS Status; + + if (IoControlCode == IOCTL_KS_PROPERTY) + { + Status = IPortPinWavePci_HandleKsProperty(iface, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock); + if (NT_SUCCESS(Status)) + { + return TRUE; + } + } + return FALSE; } @@ -917,6 +918,7 @@ NTSTATUS Status; PCONTEXT_WRITE Packet; PIRP Irp; + ULONG MinimumDataThreshold; IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; DPRINT("IPortPinWavePci_fnFastWrite entered Total %u Pre %u Post %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted); @@ -955,9 +957,15 @@ if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue)) { - /* notify port driver that new mapping is available */ - DPRINT("Notifying of new mapping\n"); - This->Stream->lpVtbl->MappingAvailable(This->Stream); + /* get minimum data threshold */ + MinimumDataThreshold = This->IrpQueue->lpVtbl->GetMinimumDataThreshold(This->IrpQueue); + + if (MinimumDataThreshold < This->IrpQueue->lpVtbl->NumData(This->IrpQueue)) + { + /* notify port driver that new mapping is available */ + DPRINT("Notifying of new mapping\n"); + This->Stream->lpVtbl->MappingAvailable(This->Stream); + } } return TRUE; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -515,12 +515,13 @@ WorkerContext->Irp, NULL); - DPRINT("CreatePinWorkerRoutine Status %x\n", Status); + DPRINT1("CreatePinWorkerRoutine Status %x\n", Status); if (NT_SUCCESS(Status)) { /* create the dispatch object */ - Status = NewDispatchObject(WorkerContext->Irp, Pin, NULL); + /* FIXME need create item for clock */ + Status = NewDispatchObject(WorkerContext->Irp, Pin, 0, NULL); DPRINT("Pin %p\n", Pin); } @@ -536,6 +537,78 @@ FreeItem(WorkerContext, TAG_PORTCLASS); } +NTSTATUS +NTAPI +PcCreatePinDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + IIrpTarget *Filter; + PKSOBJECT_CREATE_ITEM CreateItem; + PPIN_WORKER_CONTEXT Context; + + /* access the create item */ + CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* sanity check */ + ASSERT(CreateItem); + + DPRINT1("PcCreatePinDispatch called DeviceObject %p %S Name\n", DeviceObject, CreateItem->ObjectClass.Buffer); + + Filter = (IIrpTarget*)CreateItem->Context; + + /* sanity checks */ + ASSERT(Filter != NULL); + + +#if KS_IMPLEMENTED + Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); + if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) + { + DPRINT1("PcCreatePinDispatch failed to reference device header\n"); + + FreeItem(Entry, TAG_PORTCLASS); + goto cleanup; + } +#endif + + /* new pins are instantiated at passive level, + * so allocate a work item and context for it + */ + + Context = AllocateItem(NonPagedPool, sizeof(PIN_WORKER_CONTEXT), TAG_PORTCLASS); + if (!Context) + { + DPRINT("Failed to allocate worker context\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate work item */ + Context->WorkItem = IoAllocateWorkItem(DeviceObject); + if (!Context->WorkItem) + { + DPRINT("Failed to allocate workitem\n"); + FreeItem(Context, TAG_PORTCLASS); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Context->Filter = Filter; + Context->Irp = Irp; + + DPRINT("Queueing IRP %p Irql %u\n", Irp, KeGetCurrentIrql()); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + IoQueueWorkItem(Context->WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); + return STATUS_PENDING; +} + + NTSTATUS NTAPI @@ -543,59 +616,34 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status = STATUS_SUCCESS; - PIO_STACK_LOCATION IoStack; + NTSTATUS Status; ISubdevice * SubDevice; - PPCLASS_DEVICE_EXTENSION DeviceExt; IIrpTarget *Filter; - PKSOBJECT_CREATE_ITEM CreateItem; - PPIN_WORKER_CONTEXT Context; - LPWSTR Buffer; + PKSOBJECT_CREATE_ITEM CreateItem, PinCreateItem; + static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; - - DPRINT1("PcCreateItemDispatch called DeviceObject %p\n", DeviceObject); /* access the create item */ CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - if (!CreateItem) - { - DPRINT1("PcCreateItemDispatch no CreateItem\n"); - return STATUS_UNSUCCESSFUL; - } - + + DPRINT1("PcCreateItemDispatch called DeviceObject %p %S Name\n", DeviceObject, CreateItem->ObjectClass.Buffer); + + /* get the subdevice */ SubDevice = (ISubdevice*)CreateItem->Context; - DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (!SubDevice || !DeviceExt) - { - DPRINT1("PcCreateItemDispatch SubDevice %p DeviceExt %p\n", SubDevice, DeviceExt); - return STATUS_UNSUCCESSFUL; - } + + /* sanity checks */ + ASSERT(SubDevice != NULL); #if KS_IMPLEMENTED Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) { - DPRINT1("PciCreateItemDispatch failed to reference device header\n"); + DPRINT1("PcCreateItemDispatch failed to reference device header\n"); FreeItem(Entry, TAG_PORTCLASS); goto cleanup; } #endif - - - /* get current io stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - /* sanity check */ - ASSERT(IoStack->FileObject != NULL); - - if (IoStack->FileObject->FsContext != NULL) - { - /* nothing to do */ - DPRINT1("FsContext already exists\n"); - return STATUS_SUCCESS; - } - /* get filter object * is implemented as a singleton @@ -611,61 +659,36 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get filter object\n"); - return Status; - } - - /* get the buffer */ - Buffer = IoStack->FileObject->FileName.Buffer; - - /* check if the request contains a pin request */ - if (!wcsstr(Buffer, KS_NAME_PIN)) - { - /* creator just wants the filter object */ - Status = NewDispatchObject(Irp, Filter, CreateItem->ObjectClass.Buffer); - - DPRINT1("Filter %p\n", Filter); - Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } - else - { - /* try to create new pin */ - Context = AllocateItem(NonPagedPool, sizeof(PIN_WORKER_CONTEXT), TAG_PORTCLASS); - if (!Context) - { - DPRINT("Failed to allocate worker context\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - /* allocate work item */ - Context->WorkItem = IoAllocateWorkItem(DeviceObject); - if (!Context->WorkItem) - { - DPRINT("Failed to allocate workitem\n"); - FreeItem(Context, TAG_PORTCLASS); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Context->Filter = Filter; - Context->Irp = Irp; - - DPRINT("Queueing IRP %p Irql %u\n", Irp, KeGetCurrentIrql()); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_PENDING; - IoMarkIrpPending(Irp); - IoQueueWorkItem(Context->WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)Context); - return STATUS_PENDING; - } -} - - + + /* allocate pin create item */ + PinCreateItem = AllocateItem(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM), TAG_PORTCLASS); + if (!PinCreateItem) + { + /* not enough memory */ + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize pin create item */ + PinCreateItem->Context = (PVOID)Filter; + PinCreateItem->Create = PcCreatePinDispatch; + RtlInitUnicodeString(&PinCreateItem->ObjectClass, KS_NAME_PIN); + /* FIXME copy security descriptor */ + + /* now allocate a dispatch object */ + Status = NewDispatchObject(Irp, Filter, 1, PinCreateItem); + + /* complete request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} NTSTATUS NewPortTopology( Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -162,7 +162,8 @@ NewDispatchObject( IN PIRP Irp, IN IIrpTarget * Target, - IN LPWSTR Name); + IN ULONG ObjectCreateItemCount, + IN PKSOBJECT_CREATE_ITEM ObjectCreateItem); PMINIPORTWAVECYCLIC GetWaveCyclicMiniport( Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -121,9 +121,9 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { - PKSOBJECT_CREATE_ITEM CreateItem; + PIO_STACK_LOCATION IoStack; + //PKSOBJECT_CREATE_ITEM CreateItem; PSUBDEVICE_DESCRIPTOR Descriptor; - PIO_STACK_LOCATION IoStack; IIrpTarget * IrpTarget; IPort *Port; ISubdevice *SubDevice; @@ -134,10 +134,11 @@ Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); ASSERT(Descriptor); - /* Access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + /* Get the IrpTarget */ - IrpTarget = (IIrpTarget*)CreateItem->Context; + IrpTarget = (IIrpTarget*)IoStack->FileObject->FsContext2; /* Get the parent */ Status = IrpTarget->lpVtbl->QueryInterface(IrpTarget, &IID_IPort, (PVOID*)&Port); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -181,38 +181,38 @@ NTSTATUS NTAPI +DispatchCreateKMixPin( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + DPRINT("DispatchCreateKMix entered\n"); + + /* create the pin */ + Status = CreatePin(Irp); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI DispatchCreateKMix( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { NTSTATUS Status; KSOBJECT_HEADER ObjectHeader; - PIO_STACK_LOCATION IoStatus; - LPWSTR Buffer; PKSOBJECT_CREATE_ITEM CreateItem; static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; - IoStatus = IoGetCurrentIrpStackLocation(Irp); - Buffer = IoStatus->FileObject->FileName.Buffer; - DPRINT("DispatchCreateKMix entered\n"); - if (Buffer) - { - /* is the request for a new pin */ - if (wcsstr(Buffer, KS_NAME_PIN)) - { - Status = CreatePin(Irp); - - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - } - - /* allocate create item */ + /* allocate create item */ CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); if (!CreateItem) { @@ -225,7 +225,10 @@ /* zero create struct */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); - RtlInitUnicodeString(&CreateItem->ObjectClass, L"KMixer"); + /* initialize pin create item */ + CreateItem->Create = DispatchCreateKMixPin; + RtlInitUnicodeString(&CreateItem->ObjectClass, KS_NAME_PIN); + /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -5,7 +5,7 @@ #include <portcls.h> #include <ks.h> #include <ksmedia.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <samplerate.h> @@ -18,6 +18,14 @@ }KMIXER_DEVICE_EXT, *PKMIXER_DEVICE_EXT; +typedef struct +{ + KSPIN_LOCK Lock; + + +}SUM_NODE_CONTEXT, *PSUM_NODE_CONTEXT; + + NTSTATUS NTAPI KMixAllocateDeviceHeader( Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -141,7 +141,7 @@ HANDLE PinHandle; PFILE_OBJECT FileObject; - Status = KsCreatePin(KMixerHandle, PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle);//, L"KMixer"); + Status = KsCreatePin(KMixerHandle, PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -181,6 +181,25 @@ NTSTATUS NTAPI +DispatchCreateSysAudioPin( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + DPRINT("DispatchCreateSysAudio entered\n"); + /* create the virtual pin */ + Status = CreateSysAudioPin(Irp); + + /* store result */ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI DispatchCreateSysAudio( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -188,30 +207,10 @@ NTSTATUS Status; KSOBJECT_HEADER ObjectHeader; PKSOBJECT_CREATE_ITEM CreateItem; - PIO_STACK_LOCATION IoStatus; - LPWSTR Buffer; - PSYSAUDIODEVEXT DeviceExtension; + static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; - IoStatus = IoGetCurrentIrpStackLocation(Irp); - Buffer = IoStatus->FileObject->FileName.Buffer; - DPRINT("DispatchCreateSysAudio entered\n"); - - if (Buffer) - { - /* is the request for a new pin */ - if (wcsstr(Buffer, KS_NAME_PIN)) - { - Status = CreateDispatcher(Irp); - DPRINT("Virtual pin Status %x FileObject %p\n", Status, IoStatus->FileObject); - - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - } /* allocate create item */ CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); @@ -223,14 +222,12 @@ return STATUS_INSUFFICIENT_RESOURCES; } - /* get device extension */ - DeviceExtension = (PSYSAUDIODEVEXT) DeviceObject->DeviceExtension; - /* zero create struct */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); - /* store create context */ - RtlInitUnicodeString(&CreateItem->ObjectClass, L"SysAudio"); + /* setup create context */ + CreateItem->Create = DispatchCreateSysAudioPin; + RtlInitUnicodeString(&CreateItem->ObjectClass, KS_NAME_PIN); /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); 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] Wed Jul 22 16:42:51 2009 @@ -419,7 +419,7 @@ }; NTSTATUS -CreateDispatcher( +CreateSysAudioPin( IN PIRP Irp) { NTSTATUS Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Wed Jul 22 16:42:51 2009 @@ -124,7 +124,7 @@ IN ULONG Index); NTSTATUS -CreateDispatcher( +CreateSysAudioPin( IN PIRP Irp); ULONG

15 years, 5 months

[fireball] 42142: - Kill another 16 bit support crappiness.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jul 22 14:45:42 2009 New Revision: 42142 URL: http://svn.reactos.org/svn/reactos?rev=42142&view=rev Log: - Kill another 16 bit support crappiness. Modified: branches/arwinss/reactos/dll/win32/user32/menu.c Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Wed Jul 22 14:45:42 2009 @@ -5403,12 +5403,12 @@ INT WINAPI TranslateAcceleratorW( HWND hWnd, HACCEL hAccel, LPMSG msg ) { /* YES, Accel16! */ - LPACCEL16 lpAccelTbl; + LPACCEL lpAccelTbl; int i; if (!hWnd || !msg) return 0; - if (!hAccel || !(lpAccelTbl = (LPACCEL16) LockResource16(LOWORD(hAccel)))) + if (!hAccel || !(lpAccelTbl = LockResource(hAccel))) { WARN_(accel)("invalid accel handle=%p\n", hAccel); return 0;

15 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009