Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 42339: Cleanup in win32k/dib: - Replace old headers with new ones, programmers added according to svn blame info - Apply consistent 2pt indentation because of the many indentation levels in this code; getting rid of a tab and 2/3/4pt mixture - Rename universal StretchBlt file to reflect content
by gschneider＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: gschneider Date: Sun Aug 2 17:49:17 2009 New Revision: 42339 URL: http://svn.reactos.org/svn/reactos?rev=42339&view=rev Log: Cleanup in win32k/dib: - Replace old headers with new ones, programmers added according to svn blame info - Apply consistent 2pt indentation because of the many indentation levels in this code; getting rid of a tab and 2/3/4pt mixture - Rename universal StretchBlt file to reflect content Added: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c (with props) Removed: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c trunk/reactos/subsystems/win32/win32k/dib/floodfill.c trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib24bppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Removed: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Added: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

1 0

[jmorlan] 42338: Fix many incompatibilities in DIR switch parsing, including those noted in Bug 4744.
by jmorlan＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: jmorlan Date: Sun Aug 2 17:16:03 2009 New Revision: 42338 URL: http://svn.reactos.org/svn/reactos?rev=42338&view=rev Log: Fix many incompatibilities in DIR switch parsing, including those noted in Bug 4744. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sun Aug 2 17:16:03 2009 @@ -176,22 +176,16 @@ { DWORD dwAttribVal; /* The desired state of attribute */ DWORD dwAttribMask; /* Which attributes to check */ - BOOL bUnSet; /* A helper flag if "-" was given with the switch */ - BOOL bParSetted; /* A helper flag if parameters of switch were given */ } stAttribs; /* Displays files with this attributes only */ struct { enum EOrderBy eCriteria[3]; /* Criterias used to order by */ BOOL bCriteriaRev[3]; /* If the criteria is in reversed order */ short sCriteriaCount; /* The quantity of criterias */ - BOOL bUnSet; /* A helper flag if "-" was given with the switch */ - BOOL bParSetted; /* A helper flag if parameters of switch were given */ } stOrderBy; /* Ordered by criterias */ struct { enum ETimeField eTimeField; /* The time field that will be used for */ - BOOL bUnSet; /* A helper flag if "-" was given with the switch */ - BOOL bParSetted; /* A helper flag if parameters of switch were given */ } stTimeField; /* The time field to display or use for sorting */ } DIRSWITCHFLAGS, *LPDIRSWITCHFLAGS; @@ -247,6 +241,7 @@ BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ LPTSTR ptrStart; /* A pointer to the first character of a parameter */ LPTSTR ptrEnd; /* A pointer to the last character of a parameter */ + BOOL bOrderByNoPar; /* A flag to indicate /O with no switch parameter */ LPTSTR temp; /* Initialize parameter array */ @@ -261,10 +256,7 @@ /* We suppose that switch parameters were given to avoid setting them to default if the switch was not given */ - lpFlags->stAttribs.bParSetted = TRUE; - lpFlags->stOrderBy.bParSetted = TRUE; - lpFlags->stTimeField.bParSetted = TRUE; - + bOrderByNoPar = FALSE; /* Main Loop (see README_DIR.txt) */ /* scan the command line char per char, and we process its char */ @@ -278,23 +270,45 @@ /* When a switch is expecting */ if (cCurSwitch == _T('/')) { + while (*Line == _T(' ')) + Line++; + + bNegative = (*Line == _T('-')); + Line += bNegative; + + cCurChar = *Line; + cCurUChar = _totupper(*Line); + if ((cCurUChar == _T('A')) ||(cCurUChar == _T('T')) || (cCurUChar == _T('O'))) { - cCurSwitch = cCurUChar; + /* If positive, prepare for parameters... if negative, reset to defaults */ switch (cCurUChar) { case _T('A'): - lpFlags->stAttribs.bUnSet = bNegative; - lpFlags->stAttribs.bParSetted = FALSE; + lpFlags->stAttribs.dwAttribVal = 0L; + lpFlags->stAttribs.dwAttribMask = 0L; + if (bNegative) + lpFlags->stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; break; case _T('T'): - lpFlags->stTimeField.bUnSet = bNegative; - lpFlags->stTimeField.bParSetted = FALSE; + if (bNegative) + lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE; break; case _T('O'): - lpFlags->stOrderBy.bUnSet = bNegative; - lpFlags->stOrderBy.bParSetted = FALSE; + bOrderByNoPar = !bNegative; + lpFlags->stOrderBy.sCriteriaCount = 0; break; + } + + if (!bNegative) + { + /* Positive switch, so it can take parameters. */ + cCurSwitch = cCurUChar; + Line++; + /* Skip optional leading colon */ + if (*Line == _T(':')) + Line++; + continue; } } else if (cCurUChar == _T('L')) @@ -324,24 +338,20 @@ DirHelp(); return FALSE; } - else if (cCurChar == _T('-')) - { - bNegative = TRUE; - } else { error_invalid_switch ((TCHAR)_totupper (*Line)); return FALSE; } - /* We check if we calculated the negative value and realese the flag */ - if ((cCurChar != _T('-')) && bNegative) - bNegative = FALSE; - - /* if not a,o,t or - option then next parameter is not a switch */ - if ((cCurSwitch == _T('/')) && (!bNegative)) - cCurSwitch = _T(' '); - + /* Make sure there's no extra characters at the end of the switch */ + if (Line[1] && Line[1] != _T('/') && Line[1] != _T(' ')) + { + error_parameter_format(Line[1]); + return FALSE; + } + + cCurSwitch = _T(' '); } else if (cCurSwitch == _T(' ')) { @@ -393,20 +403,14 @@ if ((cCurChar == _T('/')) || ( cCurChar == _T(' '))) { /* Wrong desicion path, reprocess current character */ - cCurSwitch = cCurChar; + cCurSwitch = _T(' '); continue; } /* Process parameter switch */ switch(cCurSwitch) { case _T('A'): /* Switch parameters for /A (attributes filter) */ - /* Ok a switch parameter was given */ - lpFlags->stAttribs.bParSetted = TRUE; - - if (cCurChar == _T(':')) - /* =V= dead command, used to make the "if" work */ - cCurChar = cCurChar; - else if(cCurChar == _T('-')) + if(cCurChar == _T('-')) bPNegative = TRUE; else if(cCurUChar == _T('D')) { @@ -455,14 +459,7 @@ } break; case _T('T'): /* Switch parameters for /T (time field) */ - - /* Ok a switch parameter was given */ - lpFlags->stTimeField.bParSetted = TRUE; - - if (cCurChar == _T(':')) - /* =V= dead command, used to make the "if" work */ - cCurChar = cCurChar; - else if(cCurUChar == _T('C')) + if(cCurUChar == _T('C')) lpFlags->stTimeField.eTimeField= TF_CREATIONDATE ; else if(cCurUChar == _T('A')) lpFlags->stTimeField.eTimeField= TF_LASTACCESSEDDATE ; @@ -476,12 +473,9 @@ break; case _T('O'): /* Switch parameters for /O (order) */ /* Ok a switch parameter was given */ - lpFlags->stOrderBy.bParSetted = TRUE; - - if (cCurChar == _T(':')) - /* <== dead command, used to make the "if" work */ - cCurChar = cCurChar; - else if(cCurChar == _T('-')) + bOrderByNoPar = FALSE; + + if(cCurChar == _T('-')) bPNegative = TRUE; else if(cCurUChar == _T('N')) { @@ -530,38 +524,16 @@ Line++; } - /* Calculate the switches with no switch paramater */ - if (!(lpFlags->stAttribs.bParSetted)) - { - lpFlags->stAttribs.dwAttribVal = 0L; - lpFlags->stAttribs.dwAttribMask = lpFlags->stAttribs.dwAttribVal; - } - if (!(lpFlags->stOrderBy.bParSetted)) - { - lpFlags->stOrderBy.sCriteriaCount = 1; - lpFlags->stOrderBy.eCriteria[0] = ORDER_NAME; + /* /O with no switch parameters acts like /O:GN */ + if (bOrderByNoPar) + { + lpFlags->stOrderBy.sCriteriaCount = 2; + lpFlags->stOrderBy.eCriteria[0] = ORDER_DIRECTORY; lpFlags->stOrderBy.bCriteriaRev[0] = FALSE; - } - if (!(lpFlags->stTimeField.bParSetted)) - lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE ; - - /* Calculate the unsetted switches (the "-" prefixed)*/ - if (lpFlags->stAttribs.bUnSet) - { - lpFlags->stAttribs.bUnSet = FALSE; - lpFlags->stAttribs.dwAttribVal = 0L; - lpFlags->stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; - } - if (lpFlags->stOrderBy.bUnSet) - { - lpFlags->stOrderBy.bUnSet = FALSE; - lpFlags->stOrderBy.sCriteriaCount = 0; - } - if (lpFlags->stTimeField.bUnSet ) - { - lpFlags->stTimeField.bUnSet = FALSE; - lpFlags->stTimeField.eTimeField = TF_MODIFIEDDATE; - } + lpFlags->stOrderBy.eCriteria[1] = ORDER_NAME; + lpFlags->stOrderBy.bCriteriaRev[1] = FALSE; + } + return TRUE; } @@ -1600,12 +1572,9 @@ stFlags.bWideList = FALSE; stFlags.bWideListColSort = FALSE; stFlags.stTimeField.eTimeField = TF_MODIFIEDDATE; - stFlags.stTimeField.bUnSet = FALSE; stFlags.stAttribs.dwAttribMask = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM; stFlags.stAttribs.dwAttribVal = 0L; - stFlags.stAttribs.bUnSet = FALSE; stFlags.stOrderBy.sCriteriaCount = 0; - stFlags.stOrderBy.bUnSet = FALSE; nErrorLevel = 0;

1 0

[janderwald] 42337: - Implement KsStreamPointerDelete, KsStreamPointerScheduleTimeout, KsStreamPointerCancelTimeout, KsPinGetFirstCloneStreamPointer, KsStreamPointerGetNextClone - Partly Implement IKsPin_DispatchDeviceIoControl, IKsPin_Close
by janderwald＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: janderwald Date: Sun Aug 2 16:40:15 2009 New Revision: 42337 URL: http://svn.reactos.org/svn/reactos?rev=42337&view=rev Log: - Implement KsStreamPointerDelete, KsStreamPointerScheduleTimeout, KsStreamPointerCancelTimeout, KsPinGetFirstCloneStreamPointer, KsStreamPointerGetNextClone - Partly Implement IKsPin_DispatchDeviceIoControl, IKsPin_Close Modified: trunk/reactos/drivers/ksfilter/ks/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Sun Aug 2 16:40:15 2009 @@ -9,6 +9,17 @@ #include "priv.h" +typedef struct _KSISTREAM_POINTER +{ + KSSTREAM_POINTER StreamPointer; + PFNKSSTREAMPOINTER Callback; + PIRP Irp; + KTIMER Timer; + KDPC TimerDpc; + struct _KSISTREAM_POINTER *Next; + +}KSISTREAM_POINTER, *PKSISTREAM_POINTER; + typedef struct { KSBASIC_HEADER BasicHeader; @@ -24,6 +35,13 @@ PKSGATE AttachedGate; BOOL OrGate; + + LIST_ENTRY IrpList; + KSPIN_LOCK IrpListLock; + + PKSISTREAM_POINTER ClonedStreamPointer; + PKSISTREAM_POINTER LeadingEdgeStreamPointer; + PKSISTREAM_POINTER TrailingStreamPointer; PFNKSPINPOWER Sleep; PFNKSPINPOWER Wake; @@ -687,7 +705,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -695,7 +713,41 @@ KsStreamPointerDelete( IN PKSSTREAM_POINTER StreamPointer) { - UNIMPLEMENTED + IKsPinImpl * This; + PKSISTREAM_POINTER Cur, Last; + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + This = (IKsPinImpl*)CONTAINING_RECORD(Pointer->StreamPointer.Pin, IKsPinImpl, Pin); + + /* point to first stream pointer */ + Last = NULL; + Cur = This->ClonedStreamPointer; + + while(Cur != Pointer && Cur) + { + Last = Cur; + /* iterate to next cloned pointer */ + Cur = Cur->Next; + } + + if (!Cur) + { + /* you naughty driver */ + return; + } + + if (!Last) + { + /* remove first cloned pointer */ + This->ClonedStreamPointer = Pointer->Next; + } + else + { + Last->Next = Pointer->Next; + } + + /* FIXME make sure no timeouts are pending */ + FreeItem(Pointer); } /* @@ -772,7 +824,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI VOID @@ -782,11 +834,22 @@ IN PFNKSSTREAMPOINTER Callback, IN ULONGLONG Interval) { - UNIMPLEMENTED -} - -/* - @unimplemented + LARGE_INTEGER DueTime; + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + /* setup timer callback */ + Pointer->Callback = Callback; + + /* setup expiration */ + DueTime.QuadPart = (LONGLONG)Interval; + + /* setup the timer */ + KeSetTimer(&Pointer->Timer, DueTime, &Pointer->TimerDpc); + +} + +/* + @implemented */ KSDDKAPI VOID @@ -794,11 +857,14 @@ KsStreamPointerCancelTimeout( IN PKSSTREAM_POINTER StreamPointer) { - UNIMPLEMENTED -} - -/* - @unimplemented + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + KeCancelTimer(&Pointer->Timer); + +} + +/* + @implemented */ KSDDKAPI PKSSTREAM_POINTER @@ -806,12 +872,13 @@ KsPinGetFirstCloneStreamPointer( IN PKSPIN Pin) { - UNIMPLEMENTED - return NULL; -} - -/* - @unimplemented + IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); + /* return first cloned stream pointer */ + return &This->ClonedStreamPointer->StreamPointer; +} + +/* + @implemented */ KSDDKAPI PKSSTREAM_POINTER @@ -819,8 +886,14 @@ KsStreamPointerGetNextClone( IN PKSSTREAM_POINTER StreamPointer) { - UNIMPLEMENTED - return NULL; + PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + + /* is there a another cloned stream pointer */ + if (!Pointer->Next) + return NULL; + + /* return next stream pointer */ + return &Pointer->Next->StreamPointer; } NTSTATUS @@ -829,11 +902,55 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PKSIOBJECT_HEADER ObjectHeader; + IKsPinImpl * This; + NTSTATUS Status = STATUS_SUCCESS; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity check */ + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FsContext); + + /* get the object header */ + ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->FsContext; + + /* locate ks pin implemention fro KSPIN offset */ + This = (IKsPinImpl*)CONTAINING_RECORD(ObjectHeader->ObjectType, IKsPinImpl, Pin); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_WRITE_STREAM && IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) + { + UNIMPLEMENTED; + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* add irp to cancelable queue */ + KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL /* FIXME */); + + if (This->Pin.Descriptor->Dispatch->Process) + { + /* it is a pin centric avstream */ + Status = This->Pin.Descriptor->Dispatch->Process(&This->Pin); + + /* TODO */ + } + else + { + /* TODO + * filter-centric avstream + */ + UNIMPLEMENTED + } + + return Status; } NTSTATUS @@ -842,11 +959,51 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PKSIOBJECT_HEADER ObjectHeader; + IKsPinImpl * This; + NTSTATUS Status = STATUS_SUCCESS; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity check */ + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FsContext); + + /* get the object header */ + ObjectHeader = (PKSIOBJECT_HEADER)IoStack->FileObject->FsContext; + + /* locate ks pin implemention fro KSPIN offset */ + This = (IKsPinImpl*)CONTAINING_RECORD(ObjectHeader->ObjectType, IKsPinImpl, Pin); + + /* acquire filter control mutex */ + KsFilterAcquireControl(This->BasicHeader.Parent.KsFilter); + + if (This->Pin.Descriptor->Dispatch->Close) + { + /* call pin close routine */ + Status = This->Pin.Descriptor->Dispatch->Close(&This->Pin, Irp); + + if (!NT_SUCCESS(Status)) + { + /* abort closing */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* FIXME remove pin from filter pin list and decrement reference count */ + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + } + + return Status; } NTSTATUS @@ -962,6 +1119,8 @@ This->ref = 1; This->FileObject = IoStack->FileObject; KeInitializeMutex(&This->ProcessingMutex, 0); + InitializeListHead(&This->IrpList); + KeInitializeSpinLock(&This->IrpListLock); /* initialize ks pin descriptor */ This->Pin.Descriptor = Descriptor;

1 0

[khornicek] 42336: - add support for ETO_OPAQUE
by khornicek＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: khornicek Date: Sun Aug 2 15:37:22 2009 New Revision: 42336 URL: http://svn.reactos.org/svn/reactos?rev=42336&view=rev Log: - add support for ETO_OPAQUE Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Sun Aug 2 15:37:22 2009 @@ -622,16 +622,21 @@ } #endif - if(flags & ETO_OPAQUE) + if((flags & ETO_OPAQUE) && lprect) { -#if 0 - wine_tsx11_lock(); - XSetForeground( gdi_display, physDev->gc, backgroundPixel ); - XFillRectangle( gdi_display, physDev->drawable, physDev->gc, - physDev->dc_rect.left + lprect->left, physDev->dc_rect.top + lprect->top, - lprect->right - lprect->left, lprect->bottom - lprect->top ); - wine_tsx11_unlock(); -#endif + HBRUSH brush, oldBrush; + HPEN pen, oldPen; + + brush = CreateSolidBrush(GetBkColor(physDev->hUserDC)); + oldBrush = SelectObject(physDev->hUserDC, brush); + + pen = CreatePen(PS_NULL, 0, 0); + oldPen = SelectObject(physDev->hUserDC, pen); + + RosGdiRectangle(physDev->hKernelDC, lprect); + + DeleteObject(SelectObject(physDev->hUserDC, oldBrush)); + DeleteObject(SelectObject(physDev->hUserDC, oldPen)); } if(count == 0)

1 0

[janderwald] 42335: [KS] - Acquire Spinlock at dpc level - Release cancel spinlock at correct level [PORTCLS] - Check if current partially processed irp has been cancelled and complete it in that case - Silence debug flood
by janderwald＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: janderwald Date: Sun Aug 2 14:38:08 2009 New Revision: 42335 URL: http://svn.reactos.org/svn/reactos?rev=42335&view=rev Log: [KS] - Acquire Spinlock at dpc level - Release cancel spinlock at correct level [PORTCLS] - Check if current partially processed irp has been cancelled and complete it in that case - Silence debug flood Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c 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] Sun Aug 2 14:38:08 2009 @@ -1287,25 +1287,24 @@ IN PIRP Irp) { PKSPIN_LOCK SpinLock; - KIRQL OldLevel; /* get internal queue lock */ SpinLock = KSQUEUE_SPINLOCK_IRP_STORAGE(Irp); /* acquire spinlock */ - KeAcquireSpinLock(SpinLock, &OldLevel); + KeAcquireSpinLockAtDpcLevel(SpinLock); /* sanity check */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* release cancel spinlock */ - IoReleaseCancelSpinLock(DISPATCH_LEVEL); + IoReleaseCancelSpinLock(Irp->CancelIrql); /* remove the irp from the list */ RemoveEntryList(&Irp->Tail.Overlay.ListEntry); /* release spinlock */ - KeReleaseSpinLock(SpinLock, OldLevel); + KeReleaseSpinLockFromDpcLevel(SpinLock); /* has the irp already been canceled */ if (Irp->IoStatus.Status != STATUS_CANCELLED) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Sun Aug 2 14:38:08 2009 @@ -165,10 +165,18 @@ if (This->Irp) { /* use last irp */ - Irp = This->Irp; - Offset = This->CurrentOffset; - /* TODO cancel irp when required */ - ASSERT(Irp->Cancel == FALSE); + if (This->Irp->Cancel == FALSE) + { + Irp = This->Irp; + Offset = This->CurrentOffset; + } + else + { + /* irp has been cancelled */ + This->Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(This->Irp, IO_NO_INCREMENT); + This->Irp = Irp = NULL; + } } else { 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] Sun Aug 2 14:38:08 2009 @@ -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; Irp = Packet->Irp;

1 0

[janderwald] 42334: [KS] - Implement KsQueryInformationFile - Properly implement KsStreamIo - Fix a desastreous bug in KsRemoveIrpFromCancelableQueue - Implement KsMoveIrpsOnCancelableQueue [PORTCLS] - Switch portcls to use the provided ks irp queue function instead of the homegrown IRP_MAPPING routines. Irp queueing is now faster and consumes less memory - Return an allocated silence buffer when there are no mappings available - HACK-Remove: Don't pre-complete any audio buffers now anymore. If
by janderwald＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: janderwald Date: Sun Aug 2 13:40:38 2009 New Revision: 42334 URL: http://svn.reactos.org/svn/reactos?rev=42334&view=rev Log: [KS] - Implement KsQueryInformationFile - Properly implement KsStreamIo - Fix a desastreous bug in KsRemoveIrpFromCancelableQueue - Implement KsMoveIrpsOnCancelableQueue [PORTCLS] - Switch portcls to use the provided ks irp queue function instead of the homegrown IRP_MAPPING routines. Irp queueing is now faster and consumes less memory - Return an allocated silence buffer when there are no mappings available - HACK-Remove: Don't pre-complete any audio buffers now anymore. If you experience audio stuttering, let me know [SYSAUDIO, PORTCLS, KMIXER] - FastRead / FastWrite routines must store their return values in the status block as KsStreamIo now checks these Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.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/pin_wavert.c trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/drivers/wdm/audio/sysaudio/pin.c 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] Sun Aug 2 13:40:38 2009 @@ -344,7 +344,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -357,7 +357,13 @@ { PDEVICE_OBJECT DeviceObject; PFAST_IO_DISPATCH FastIoDispatch; + PIRP Irp; + PIO_STACK_LOCATION IoStack; IO_STATUS_BLOCK IoStatus; + KEVENT Event; + LARGE_INTEGER Offset; + IO_STATUS_BLOCK StatusBlock; + NTSTATUS Status; /* get related file object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); @@ -386,10 +392,47 @@ } } } - - /* Implement Me */ - - return STATUS_UNSUCCESSFUL; + /* clear event */ + KeClearEvent(&FileObject->Event); + + /* initialize event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* set offset to zero */ + Offset.QuadPart = 0L; + + /* build the request */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_QUERY_INFORMATION, IoGetRelatedDeviceObject(FileObject), NULL, 0, &Offset, &Event, &StatusBlock); + + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* setup parameters */ + IoStack->Parameters.QueryFile.FileInformationClass = FileInformationClass; + IoStack->Parameters.QueryFile.Length = Length; + Irp->AssociatedIrp.SystemBuffer = FileInformation; + + + /* call the driver */ + Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); + + if (Status == STATUS_PENDING) + { + /* wait for the operation to complete */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + /* is object sync */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + Status = FileObject->FinalStatus; + else + Status = StatusBlock.Status; + } + + /* done */ + return Status; } /* @@ -506,77 +549,104 @@ PIRP Irp; PIO_STACK_LOCATION IoStack; PDEVICE_OBJECT DeviceObject; - ULONG Code; NTSTATUS Status; LARGE_INTEGER Offset; PKSIOBJECT_HEADER ObjectHeader; - - - if (Flags == KSSTREAM_READ) - Code = IRP_MJ_READ; - else if (Flags == KSSTREAM_WRITE) - Code = IRP_MJ_WRITE; - else - return STATUS_INVALID_PARAMETER; - + BOOLEAN Ret; + + /* get related device object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); - if (!DeviceObject) - return STATUS_INVALID_PARAMETER; - + /* sanity check */ + ASSERT(DeviceObject != NULL); + + /* is there a event provided */ if (Event) { - KeResetEvent(Event); - } - - //ASSERT(DeviceObject->DeviceType == FILE_DEVICE_KS); - ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; - ASSERT(ObjectHeader); - if (Code == IRP_MJ_READ) - { - if (ObjectHeader->DispatchTable.FastRead) - { - if (ObjectHeader->DispatchTable.FastRead(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject)) + /* reset event */ + KeClearEvent(Event); + } + + if (RequestorMode || ExGetPreviousMode() == KernelMode) + { + /* requestor is from kernel land */ + ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; + + if (ObjectHeader) + { + /* there is a object header */ + if (Flags == KSSTREAM_READ) { - return STATUS_SUCCESS; + /* is fast read supported */ + if (ObjectHeader->DispatchTable.FastRead) + { + /* call fast read dispatch routine */ + Ret = ObjectHeader->DispatchTable.FastRead(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject); + + if (Ret) + { + /* the request was handeled */ + return IoStatusBlock->Status; + } + } } - } - } - else - { - if (ObjectHeader->DispatchTable.FastWrite) - { - if (ObjectHeader->DispatchTable.FastWrite(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject)) + else if (Flags == KSSTREAM_WRITE) { - return STATUS_SUCCESS; + /* is fast write supported */ + if (ObjectHeader->DispatchTable.FastWrite) + { + /* call fast write dispatch routine */ + Ret = ObjectHeader->DispatchTable.FastWrite(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject); + + if (Ret) + { + /* the request was handeled */ + return IoStatusBlock->Status; + } + } } } } + /* clear file object event */ + KeClearEvent(&FileObject->Event); + + /* set the offset to zero */ Offset.QuadPart = 0LL; - Irp = IoBuildSynchronousFsdRequest(Code, DeviceObject, (PVOID)StreamHeaders, Length, &Offset, Event, IoStatusBlock); + + /* now build the irp */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_DEVICE_CONTROL, + DeviceObject, (PVOID)StreamHeaders, Length, &Offset, Event, IoStatusBlock); if (!Irp) { - return STATUS_UNSUCCESSFUL; - } - + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* setup irp parameters */ + Irp->RequestorMode = RequestorMode; + Irp->Overlay.AsynchronousParameters.UserApcContext = PortContext; + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->UserBuffer = StreamHeaders; + + /* get next irp stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + /* setup stack parameters */ + IoStack->FileObject = FileObject; + IoStack->Parameters.DeviceIoControl.InputBufferLength = Length; + IoStack->Parameters.DeviceIoControl.Type3InputBuffer = StreamHeaders; + IoStack->Parameters.DeviceIoControl.IoControlCode = (Flags == KSSTREAM_READ ? IOCTL_KS_READ_STREAM : IOCTL_KS_WRITE_STREAM); if (CompletionRoutine) { - IoSetCompletionRoutine(Irp, - CompletionRoutine, - CompletionContext, - (CompletionInvocationFlags & KsInvokeOnSuccess), - (CompletionInvocationFlags & KsInvokeOnError), - (CompletionInvocationFlags & KsInvokeOnCancel)); - } - - IoStack = IoGetNextIrpStackLocation(Irp); - IoStack->FileObject = FileObject; - + /* setup completion routine for async processing */ + IoSetCompletionRoutine(Irp, CompletionRoutine, CompletionContext, (CompletionInvocationFlags & KsInvokeOnSuccess), (CompletionInvocationFlags & KsInvokeOnError), (CompletionInvocationFlags & KsInvokeOnCancel)); + } + + /* now call the driver */ Status = IoCallDriver(DeviceObject, Irp); + /* done */ return Status; } - /* @unimplemented @@ -933,7 +1003,7 @@ } /* get irp offset */ - Irp = (PIRP)CONTAINING_RECORD(Irp, IRP, Tail.Overlay.ListEntry); + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); if (Irp->Cancel) { @@ -988,7 +1058,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1002,8 +1072,114 @@ IN PFNKSIRPLISTCALLBACK ListCallback, IN PVOID Context) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + KIRQL OldLevel; + PLIST_ENTRY SrcEntry; + PIRP Irp; + NTSTATUS Status; + + if (!DestinationLock) + { + /* no destination lock just acquire the source lock */ + KeAcquireSpinLock(SourceLock, &OldLevel); + } + else + { + /* acquire cancel spinlock */ + IoAcquireCancelSpinLock(&OldLevel); + + /* now acquire source lock */ + KeAcquireSpinLockAtDpcLevel(SourceLock); + + /* now acquire destination lock */ + KeAcquireSpinLockAtDpcLevel(DestinationLock); + } + + /* point to list head */ + SrcEntry = SourceList; + + /* now move all irps */ + while(TRUE) + { + if (ListLocation == KsListEntryTail) + { + /* move queue downwards */ + SrcEntry = SrcEntry->Flink; + } + else + { + /* move queue upwards */ + SrcEntry = SrcEntry->Blink; + } + + if (SrcEntry == DestinationList) + { + /* eof list reached */ + break; + } + + /* get irp offset */ + Irp = (PIRP)CONTAINING_RECORD(SrcEntry, IRP, Tail.Overlay.ListEntry); + + /* now check if irp can be moved */ + Status = ListCallback(Irp, Context); + + /* check if irp can be moved */ + if (Status == STATUS_SUCCESS) + { + /* remove irp from src list */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + if (ListLocation == KsListEntryTail) + { + /* insert irp end of list */ + InsertTailList(DestinationList, &Irp->Tail.Overlay.ListEntry); + } + else + { + /* insert irp head of list */ + InsertHeadList(DestinationList, &Irp->Tail.Overlay.ListEntry); + } + + /* do we need to update the irp lock */ + if (DestinationLock) + { + /* update irp lock */ + KSQUEUE_SPINLOCK_IRP_STORAGE(Irp) = DestinationLock; + } + } + else + { + if (Status != STATUS_NO_MATCH) + { + /* callback decided to stop enumeration */ + break; + } + + /* reset return value */ + Status = STATUS_SUCCESS; + } + } + + if (!DestinationLock) + { + /* release source lock */ + KeReleaseSpinLock(SourceLock, OldLevel); + } + else + { + /* now release destination lock */ + KeReleaseSpinLockFromDpcLevel(DestinationLock); + + /* now release source lock */ + KeReleaseSpinLockFromDpcLevel(SourceLock); + + + /* now release cancel spinlock */ + IoReleaseCancelSpinLock(OldLevel); + } + + /* done */ + return Status; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -197,7 +197,8 @@ IN PKSDATAFORMAT DataFormat, IN PDEVICE_OBJECT DeviceObject, IN ULONG FrameSize, - IN ULONG Alignment); + IN ULONG Alignment, + IN PVOID SilenceBuffer); STDMETHOD_(NTSTATUS, AddMapping)(THIS_ IN PUCHAR Buffer, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -8,17 +8,6 @@ #include "private.h" -typedef struct _IRP_MAPPING_ -{ - LIST_ENTRY Entry; - PVOID Buffer; - ULONG BufferSize; - ULONG OriginalBufferSize; - PVOID OriginalBuffer; - PIRP Irp; - - PVOID Tag; -}IRP_MAPPING, *PIRP_MAPPING; typedef struct { @@ -33,9 +22,11 @@ KSPIN_CONNECT *ConnectDetails; PKSDATAFORMAT_WAVEFORMATEX DataFormat; - KSPIN_LOCK Lock; - LIST_ENTRY ListHead; - LIST_ENTRY FreeHead; + KSPIN_LOCK IrpListLock; + LIST_ENTRY IrpList; + LIST_ENTRY FreeIrpList; + PIRP Irp; + PVOID SilenceBuffer; ULONG OutOfMapping; ULONG MaxFrameSize; @@ -44,28 +35,6 @@ }IIrpQueueImpl; -VOID -NTAPI -FreeMappingRoutine( - PIRP_MAPPING CurMapping) -{ - ASSERT(CurMapping); - - if (CurMapping->Irp) - { - CurMapping->Irp->IoStatus.Information = CurMapping->OriginalBufferSize; - CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); - } - - if (CurMapping->OriginalBuffer) - { - ExFreePool(CurMapping->OriginalBuffer); - } - - ExFreePool(CurMapping); -} - NTSTATUS NTAPI IIrpQueue_fnQueryInterface( @@ -121,19 +90,21 @@ IN PKSDATAFORMAT DataFormat, IN PDEVICE_OBJECT DeviceObject, IN ULONG FrameSize, - IN ULONG Alignment) + IN ULONG Alignment, + IN PVOID SilenceBuffer) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; This->MaxFrameSize = FrameSize; + This->SilenceBuffer = SilenceBuffer; This->Alignment = Alignment; This->MinimumDataThreshold = ((PKSDATAFORMAT_WAVEFORMATEX)DataFormat)->WaveFormatEx.nAvgBytesPerSec / 3; - InitializeListHead(&This->ListHead); - InitializeListHead(&This->FreeHead); - KeInitializeSpinLock(&This->Lock); + InitializeListHead(&This->IrpList); + InitializeListHead(&This->FreeIrpList); + KeInitializeSpinLock(&This->IrpListLock); return STATUS_SUCCESS; } @@ -146,84 +117,35 @@ IN ULONG BufferSize, IN PIRP Irp) { - PIRP_MAPPING Mapping = NULL; - KSSTREAM_HEADER * Header = (KSSTREAM_HEADER*)Buffer; - ULONG Index, NumMappings, Offset; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - - if (This->MaxFrameSize) - { - if (This->MaxFrameSize > Header->DataUsed) - { - /* small mapping */ - NumMappings = 1; - } - else - { - ULONG Rest = Header->DataUsed % This->MaxFrameSize; - - NumMappings = Header->DataUsed / This->MaxFrameSize; - if (Rest) - { - NumMappings++; - } - } - } - else - { - /* no framesize restriction */ - NumMappings = 1; - } - - for(Index = 0; Index < NumMappings; Index++) - { - Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); - if (!Mapping) - { - DPRINT("OutOfMemory\n"); - return STATUS_UNSUCCESSFUL; - } - - if (Index) - Offset = Index * This->MaxFrameSize; - else - Offset = 0; - - Mapping->Buffer = (PVOID)UlongToPtr((PtrToUlong(Header->Data) + Offset + 3) & ~(0x3)); - - if (This->MaxFrameSize) - Mapping->BufferSize = min(Header->DataUsed - Offset, This->MaxFrameSize); - else - Mapping->BufferSize = Header->DataUsed; - - Mapping->OriginalBufferSize = Header->FrameExtent; - Mapping->OriginalBuffer = NULL; - Mapping->Irp = NULL; - Mapping->Tag = NULL; - - This->NumDataAvailable += Mapping->BufferSize; - - if (Index == NumMappings - 1) - { - /* last mapping should free the irp if provided */ - Mapping->OriginalBuffer = Header->Data; - Mapping->Irp = Irp; - } - - ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); - (void)InterlockedIncrement((volatile long*)&This->NumMappings); - - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p FrameSize %u\n", This->NumMappings, Mapping->BufferSize, This->NumDataAvailable, Mapping, This->MaxFrameSize); - } - - if (Irp) - { - Irp->IoStatus.Status = STATUS_PENDING; - Irp->IoStatus.Information = 0; - IoMarkIrpPending(Irp); - } - + PKSSTREAM_HEADER Header; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + /* FIXME + * irp should contain the stream header... + */ + + /* get stream header */ + Header = (KSSTREAM_HEADER*)Buffer; + + /* dont exceed max frame size */ + ASSERT(This->MaxFrameSize >= Header->DataUsed); + + /* hack untill stream probing is ready */ + Irp->Tail.Overlay.DriverContext[2] = (PVOID)Header; + + /* increment num mappings */ + InterlockedIncrement(&This->NumMappings); + + /* increment num data available */ + This->NumDataAvailable += Header->DataUsed; + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* add irp to cancelable queue */ + KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL); + + /* done */ return STATUS_SUCCESS; } @@ -234,55 +156,102 @@ OUT PUCHAR * Buffer, OUT PULONG BufferSize) { - - PIRP_MAPPING CurMapping; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - PLIST_ENTRY CurEntry; - - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - if (!CurEntry) - { + PIRP Irp; + ULONG Offset; + PKSSTREAM_HEADER StreamHeader; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + /* check if there is an irp in the partially processed */ + if (This->Irp) + { + /* use last irp */ + Irp = This->Irp; + Offset = This->CurrentOffset; + /* TODO cancel irp when required */ + ASSERT(Irp->Cancel == FALSE); + } + else + { + /* get a fresh new irp from the queue */ + This->Irp = Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + This->CurrentOffset = Offset = 0; + } + + if (!Irp) + { + /* no irp available, use silence buffer */ + *Buffer = This->SilenceBuffer; + *BufferSize = This->MaxFrameSize; + /* flag for port wave pci driver */ + This->OutOfMapping = TRUE; + /* indicate flag to restart fast buffering */ This->StartStream = FALSE; - This->OutOfMapping = TRUE; - return STATUS_UNSUCCESSFUL; - } - - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - *Buffer = (PUCHAR)CurMapping->Buffer + This->CurrentOffset; - *BufferSize = CurMapping->BufferSize - This->CurrentOffset; - ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); + return STATUS_SUCCESS; + } + + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; + + /* sanity check */ + ASSERT(StreamHeader); + + /* store buffersize */ + *BufferSize = StreamHeader->DataUsed - Offset; + + /* store buffer */ + *Buffer = &((PUCHAR)StreamHeader->Data)[Offset]; + + /* unset flag that no irps are available */ This->OutOfMapping = FALSE; return STATUS_SUCCESS; } - - VOID NTAPI IIrpQueue_fnUpdateMapping( IN IIrpQueue *iface, IN ULONG BytesWritten) { - PLIST_ENTRY CurEntry; - PIRP_MAPPING CurMapping; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - + PKSSTREAM_HEADER StreamHeader; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + if (!This->Irp) + { + /* silence buffer was used */ + return; + } + + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)This->Irp->Tail.Overlay.DriverContext[2]; + + /* add to current offset */ This->CurrentOffset += BytesWritten; + + /* decrement available data counter */ This->NumDataAvailable -= BytesWritten; - if (CurMapping->BufferSize <= This->CurrentOffset) - { + if (This->CurrentOffset >= StreamHeader->DataUsed) + { + /* irp has been processed completly */ + This->Irp->IoStatus.Status = STATUS_SUCCESS; + + /* frame extend contains the original request size, DataUsed contains the real buffer size + * is different when kmixer performs channel conversion, upsampling etc + */ + This->Irp->IoStatus.Information = StreamHeader->FrameExtent; + + /* free stream data, no tag as wdmaud.drv does it atm */ + ExFreePool(StreamHeader->Data); + + /* free stream header, no tag as wdmaud.drv allocates it atm */ + ExFreePool(StreamHeader); + + /* complete the request */ + IoCompleteRequest(This->Irp, IO_SOUND_INCREMENT); + /* remove irp as it is complete */ + This->Irp = NULL; This->CurrentOffset = 0; - InterlockedDecrement(&This->NumMappings); - FreeMappingRoutine(CurMapping); - } - else - { - ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); } } @@ -293,6 +262,7 @@ { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + /* returns the amount of mappings available */ return This->NumMappings; } @@ -302,6 +272,7 @@ IN IIrpQueue *iface) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + /* returns the amount of audio stream data available */ return This->NumDataAvailable; } @@ -363,50 +334,45 @@ OUT PULONG ByteCount, OUT PULONG Flags) { - PIRP_MAPPING CurMapping; - PLIST_ENTRY CurEntry; + PKSSTREAM_HEADER StreamHeader; + PIRP Irp; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; ASSERT(Tag != NULL); - - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - if (!CurEntry) - { + /* get an irp from the queue */ + Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + + /* check if there is an irp */ + if (!Irp) + { + /* no irp available */ This->OutOfMapping = TRUE; This->StartStream = FALSE; return STATUS_UNSUCCESSFUL; } - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - - *PhysicalAddress = MmGetPhysicalAddress(CurMapping->Buffer); - *VirtualAddress = CurMapping->Buffer; - *ByteCount = CurMapping->BufferSize; - + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; + + /* store mapping in the free list */ + ExInterlockedInsertTailList(&This->FreeIrpList, &Irp->Tail.Overlay.ListEntry, &This->IrpListLock); + + /* return mapping */ + *PhysicalAddress = MmGetPhysicalAddress(StreamHeader->Data); + *VirtualAddress = StreamHeader->Data; + *ByteCount = StreamHeader->DataUsed; + + /* decrement mapping count */ InterlockedDecrement(&This->NumMappings); - This->NumDataAvailable -= CurMapping->BufferSize; - - if (CurMapping->OriginalBuffer) - { - /* last partial buffer */ - *Flags = 1; - - /* store tag */ - CurMapping->Tag = Tag; - - /* insert into list to free later */ - ExInterlockedInsertTailList(&This->FreeHead, &CurMapping->Entry, &This->Lock); - DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p\n", Tag, CurMapping); - } - else - { - /* we can free this entry now */ - FreeItem(CurMapping, TAG_PORTCLASS); - DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p FREED\n", Tag, CurMapping); - } - + /* decrement num data available */ + This->NumDataAvailable -= StreamHeader->DataUsed; + + /* store tag in irp */ + Irp->Tail.Overlay.DriverContext[3] = Tag; + + /* done */ return STATUS_SUCCESS; } @@ -416,30 +382,44 @@ IN IIrpQueue *iface, IN PVOID Tag) { - PIRP_MAPPING CurMapping = NULL; + PIRP Irp; PLIST_ENTRY CurEntry; + PKSSTREAM_HEADER StreamHeader; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p\n", Tag); - CurEntry = ExInterlockedRemoveHeadList(&This->FreeHead, &This->Lock); - if (!CurMapping) - { - return STATUS_SUCCESS; - } - - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - if (CurMapping->Tag != Tag) - { - /* the released mapping is not the last one */ - ExInterlockedInsertHeadList(&This->FreeHead, &CurMapping->Entry, &This->Lock); - return STATUS_SUCCESS; - } - - /* last mapping of the irp, free irp */ - DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p Mapping %p FREED\n", Tag, CurMapping); - - FreeMappingRoutine(CurMapping); + /* remove irp from used list */ + CurEntry = ExInterlockedRemoveHeadList(&This->FreeIrpList, &This->IrpListLock); + /* sanity check */ + ASSERT(CurEntry); + + /* get irp from list entry */ + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; + + /* driver must release items in the same order */ + ASSERT(Irp->Tail.Overlay.DriverContext[3] == Tag); + + /* irp has been processed completly */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* frame extend contains the original request size, DataUsed contains the real buffer size + * is different when kmixer performs channel conversion, upsampling etc + */ + Irp->IoStatus.Information = StreamHeader->FrameExtent; + + /* free stream data, no tag as wdmaud.drv does it atm */ + ExFreePool(StreamHeader->Data); + + /* free stream header, no tag as wdmaud.drv allocates it atm */ + ExFreePool(StreamHeader); + + /* complete the request */ + IoCompleteRequest(Irp, IO_SOUND_INCREMENT); + return STATUS_SUCCESS; } @@ -457,24 +437,7 @@ IIrpQueue_fnPrintQueueStatus( IN IIrpQueue *iface) { - PIRP_MAPPING CurMapping = NULL; - PLIST_ENTRY CurEntry; - - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - CurEntry = This->ListHead.Flink; - DPRINT("IIrpQueue_fnPrintQueueStatus % u ===============\n", This->NumMappings); - - while (CurEntry != &This->ListHead) - { - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - DPRINT("Mapping %p Size %u Original %p\n", CurMapping, CurMapping->BufferSize, CurMapping->OriginalBuffer); - CurEntry = CurEntry->Flink; - } - - KeReleaseSpinLockFromDpcLevel(&This->Lock); - DPRINT("IIrpQueue_fnPrintQueueStatus ===============\n"); + } VOID 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] Sun Aug 2 13:40:38 2009 @@ -1135,7 +1135,7 @@ This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); } - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, 0, 0); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, 0, 0, NULL /*FIXME*/); if (!NT_SUCCESS(Status)) { DPRINT1("IrpQueue_Init failed with %x\n", Status); 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] Sun Aug 2 13:40:38 2009 @@ -970,37 +970,24 @@ PrePostRatio = (This->PreCompleted * 100) / This->TotalPackets; MinData = This->IrpQueue->lpVtbl->NumData(This->IrpQueue); - 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); + 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); Packet = (PCONTEXT_WRITE)Buffer; - - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)) - { - Irp = Packet->Irp; - StatusBlock->Status = STATUS_PENDING; - InterlockedIncrement((PLONG)&This->PostCompleted); - } - else - { - Irp = NULL; - Packet->Irp->IoStatus.Status = STATUS_SUCCESS; - Packet->Irp->IoStatus.Information = Packet->Header.FrameExtent; - IoCompleteRequest(Packet->Irp, IO_SOUND_INCREMENT); - StatusBlock->Status = STATUS_SUCCESS; - InterlockedIncrement((PLONG)&This->PreCompleted); - } + Irp = Packet->Irp; Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); if (!NT_SUCCESS(Status)) return FALSE; - if (This->State != KSSTATE_RUN && This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE) + if (This->State != KSSTATE_RUN) { SetStreamState(This, KSSTATE_RUN); /* some should initiate a state request but didnt do it */ DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); } + + StatusBlock->Status = STATUS_PENDING; return TRUE; } @@ -1021,6 +1008,7 @@ PKSDATAFORMAT DataFormat; PDEVICE_OBJECT DeviceObject; BOOL Capture; + PVOID SilenceBuffer; //IDrmAudioStream * DrmAudio = NULL; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; @@ -1114,13 +1102,18 @@ Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, This->FrameSize, 0); + SilenceBuffer = AllocateItem(NonPagedPool, This->FrameSize, TAG_PORTCLASS); + if (!SilenceBuffer) + return STATUS_INSUFFICIENT_RESOURCES; + + This->Stream->lpVtbl->Silence(This->Stream, SilenceBuffer, This->FrameSize); + + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, This->FrameSize, 0, SilenceBuffer); if (!NT_SUCCESS(Status)) { This->IrpQueue->lpVtbl->Release(This->IrpQueue); return Status; } - //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); 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] Sun Aug 2 13:40:38 2009 @@ -1069,7 +1069,7 @@ if (!NT_SUCCESS(Status)) return Status; - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, This->AllocatorFraming.FrameSize, This->AllocatorFraming.FileAlignment); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, This->AllocatorFraming.FrameSize, This->AllocatorFraming.FileAlignment, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("IrpQueue_Init failed with %x\n", Status); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -992,7 +992,7 @@ goto cleanup; } - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0, 0); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0, 0, NULL); if (!NT_SUCCESS(Status)) { goto cleanup; Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -668,6 +668,8 @@ } } + IoStatus->Status = Status; + if (NT_SUCCESS(Status)) return TRUE; else Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -706,6 +706,28 @@ NTSTATUS NTAPI +WdmAudWriteCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP LowerIrp, + IN PVOID Context) +{ + PIRP Irp; + ASSERT(LowerIrp->PendingReturned == FALSE); + /* get original irp */ + Irp = (PIRP)Context; + + /* save status */ + Irp->IoStatus.Status = LowerIrp->IoStatus.Status; + Irp->IoStatus.Information = LowerIrp->IoStatus.Information; + /* complete request */ + IoCompleteRequest(Irp, IO_SOUND_INCREMENT); + /* return success to free irp */ + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI WdmAudWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -715,11 +737,13 @@ PWDMAUD_CLIENT ClientInfo; NTSTATUS Status = STATUS_SUCCESS; PUCHAR Buffer; + PFILE_OBJECT FileObject; + PMDL Mdl; + //PIRP LowerIrp; PCONTEXT_WRITE Packet; - PFILE_OBJECT FileObject; + PVOID SystemBuffer; + //LARGE_INTEGER Offset; IO_STATUS_BLOCK IoStatusBlock; - PMDL Mdl; - PVOID SystemBuffer; IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -826,14 +850,51 @@ ExFreePool(Packet); IoFreeMdl(Mdl); ObDereferenceObject(FileObject); - return SetIrpIoStatus(Irp, Status, 0); + return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); } RtlMoveMemory(Buffer, SystemBuffer, DeviceInfo->BufferSize); MmUnlockPages(Mdl); IoFreeMdl(Mdl); - KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, KernelMode); +#if 1 + KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, UserMode); + /* dereference file object */ ObDereferenceObject(FileObject); return IoStatusBlock.Status; -} +#else + Offset.QuadPart = 0L; + + /* now build the irp */ + LowerIrp = IoBuildAsynchronousFsdRequest (IRP_MJ_WRITE, + IoGetRelatedDeviceObject(FileObject), + Packet, + sizeof(KSSTREAM_HEADER), + &Offset, + NULL); + + if (!LowerIrp) + { + /* failed to create an associated irp */ + ExFreePool(Buffer); + ExFreePool(Packet); + ObDereferenceObject(FileObject); + + return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + } + + /* set a completion routine */ + IoSetCompletionRoutine(LowerIrp, WdmAudWriteCompletion, (PVOID)Irp, TRUE, TRUE, TRUE); + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* call the driver */ + Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), LowerIrp); + + /* dereference file object */ + ObDereferenceObject(FileObject); + + return STATUS_PENDING; +#endif +} Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -56,15 +56,6 @@ PIRP Irp; }CONTEXT_WRITE, *PCONTEXT_WRITE; - -typedef struct -{ - PIRP Irp; - IO_STATUS_BLOCK StatusBlock; - ULONG Length; -}WRITE_CONTEXT, *PWRITE_CONTEXT; - - NTSTATUS WdmAudRegisterDeviceInterface( IN PDEVICE_OBJECT PhysicalDeviceObject, 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] Sun Aug 2 13:40:38 2009 @@ -161,7 +161,7 @@ /* call the portcls audio pin */ Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, - MmGetMdlVirtualAddress(Irp->MdlAddress), + Irp->UserBuffer, IoStack->Parameters.Write.Length, NULL, 0, @@ -379,13 +379,14 @@ Status = ObReferenceObjectByHandle(Context->hMixerPin, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); if (NT_SUCCESS(Status)) { - Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); ObDereferenceObject(RealFileObject); } if (!NT_SUCCESS(Status)) { DPRINT1("Mixing stream failed with %lx\n", Status); + DbgBreakPoint(); return FALSE; } } @@ -394,11 +395,11 @@ if (!NT_SUCCESS(Status)) return FALSE; - Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); ObDereferenceObject(RealFileObject); - if (Status == STATUS_SUCCESS) + if (NT_SUCCESS(Status)) return TRUE; else return FALSE;

1 0

[fireball] 42333: - Handle case when RosGdiSetDeviceClipping is being called without rects at all (with a respective DPRINT1). - Use combined clipping object everywhere to ensure drawing happens only in allowed rectangle, see arwinss nr. 15. As a side effect, it fixes FireFox and other apps which would corrupt memory if trying to blit to area outside of DC. - Enable commented out XLATE object creation in GreStretchBltMask. Start menu icons now get masked properly too, but still are black.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 12:32:57 2009 New Revision: 42333 URL: http://svn.reactos.org/svn/reactos?rev=42333&view=rev Log: - Handle case when RosGdiSetDeviceClipping is being called without rects at all (with a respective DPRINT1). - Use combined clipping object everywhere to ensure drawing happens only in allowed rectangle, see arwinss nr. 15. As a side effect, it fixes FireFox and other apps which would corrupt memory if trying to blit to area outside of DC. - Enable commented out XLATE object creation in GreStretchBltMask. Start menu icons now get masked properly too, but still are black. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -373,14 +373,17 @@ /* Capture the rects buffer */ _SEH2_TRY { - ProbeForRead(pRects, count * sizeof(RECTL), 1); - - /* Use pool allocated buffer if data doesn't fit */ - if (count > sizeof(*pStackBuf) / sizeof(RECTL)) - pSafeRects = ExAllocatePool(PagedPool, sizeof(RECTL) * count); - - /* Copy points data */ - RtlCopyMemory(pSafeRects, pRects, count * sizeof(RECTL)); + if (count > 0) + { + ProbeForRead(pRects, count * sizeof(RECTL), 1); + + /* Use pool allocated buffer if data doesn't fit */ + if (count > sizeof(*pStackBuf) / sizeof(RECTL)) + pSafeRects = ExAllocatePool(PagedPool, sizeof(RECTL) * count); + + /* Copy points data */ + RtlCopyMemory(pSafeRects, pRects, count * sizeof(RECTL)); + } /* Copy bounding rect */ ProbeForRead(rcBounds, sizeof(RECTL), 1); @@ -421,8 +424,25 @@ if (pDC->CombinedClip) IntEngDeleteClipRegion(pDC->CombinedClip); - /* Set the clipping object */ - pDC->CombinedClip = IntEngCreateClipRegion(count, pSafeRects, &rcSafeBounds); + if (count == 0) + { + /* Special case, set it to full screen then */ + RECTL_vSetRect(&rcSafeBounds, + pDC->rcVport.left, + pDC->rcVport.top, + pDC->rcVport.right, + pDC->rcVport.bottom); + + /* Set the clipping object */ + pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); + + DPRINT1("FIXME: Setting device clipping to NULL region, using full screen instead\n"); + } + else + { + /* Set the clipping object */ + pDC->CombinedClip = IntEngCreateClipRegion(count, pSafeRects, &rcSafeBounds); + } DPRINT("RosGdiSetDeviceClipping() for DC %x, bounding rect (%d,%d)-(%d, %d)\n", physDev, rcSafeBounds.left, rcSafeBounds.top, rcSafeBounds.right, rcSafeBounds.bottom); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -71,7 +71,6 @@ BOOL APIENTRY RosGdiLineTo( HDC physDev, INT x1, INT y1, INT x2, INT y2 ) { PDC pDC; - CLIPOBJ *pClipObj; RECTL scrRect; POINT pt[2]; @@ -80,12 +79,7 @@ /* Get a pointer to the DC */ pDC = DC_Lock(physDev); - scrRect.left = scrRect.top = 0; - scrRect.right = PrimarySurface.GDIInfo.ulHorzRes; - scrRect.bottom = PrimarySurface.GDIInfo.ulVertRes; - - pClipObj = IntEngCreateClipRegion(1, NULL, &scrRect); - + /* Set points */ pt[0].x = x1; pt[0].y = y1; pt[1].x = x2; pt[1].y = y2; @@ -96,16 +90,13 @@ pt[1].y += pDC->rcVport.top + pDC->rcDcRect.top; GreLineTo(&pDC->pBitmap->SurfObj, - pClipObj, - //pDC->CombinedClip, + pDC->CombinedClip, &(pDC->pLineBrush->BrushObj), pt[0].x, pt[0].y, pt[1].x, pt[1].y, &scrRect, 0); - IntEngDeleteClipRegion(pClipObj); - /* Release the object */ DC_Unlock(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -111,14 +111,12 @@ /* Is the source surface device managed? */ else if (psoSrc && psurfSrc->flHooks & HOOK_BITBLT) { - DPRINT1("psoSrc %p\n", psoSrc); pfnBitBlt = GDIDEVFUNCS(psoSrc).BitBlt; } else { pfnBitBlt = EngBitBlt; } - bResult = pfnBitBlt(psoTrg, psoSrc, psoMask, @@ -204,7 +202,7 @@ &pDest->pBitmap->SurfObj, pSrc ? &pSrc->pBitmap->SurfObj : NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + pDest->CombinedClip, XlateObj, &DestRect, &SourcePoint, @@ -231,6 +229,8 @@ POINTL BrushOrigin = {0, 0}; BOOLEAN bRet = FALSE; + DPRINT("GrePatBlt %p %d %d %d %d %x %p\n", pDC, XLeft, YLeft, Width, Height, ROP, BrushObj); + if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) { if (Width > 0) @@ -267,7 +267,7 @@ &pDC->pBitmap->SurfObj, NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, NULL, &DestRect, NULL, @@ -354,13 +354,13 @@ } /* Create the XLATEOBJ. */ - XlateObj = NULL;/*IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); if (XlateObj == (XLATEOBJ*)-1) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; goto failed; - }*/ + } } /* Offset the brush */ @@ -384,7 +384,7 @@ Status = EngpStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, BitmapMask ? &BitmapMask->SurfObj : NULL, - NULL,//DCDest->CombinedClip, + DCDest->CombinedClip, XlateObj, &DestRect, &SourceRect, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -124,7 +124,7 @@ for (i=0; i<count-1; i++) { bRet = GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, ptPoints[i].x + pDC->rcDcRect.left + pDC->rcVport.left, ptPoints[i].y + pDC->rcDcRect.top + pDC->rcVport.top, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -431,7 +431,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); GreLineTo(&psurf->SurfObj, - NULL,//dc->rosdc.CombinedClip, + dc->CombinedClip, BrushObj, x1, ScanLine, @@ -503,7 +503,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); GreLineTo(&psurf->SurfObj, - NULL,//dc->rosdc.CombinedClip, + dc->CombinedClip, BrushObj, x1, ScanLine, @@ -526,7 +526,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); GreLineTo(&psurf->SurfObj, - NULL, //dc->rosdc.CombinedClip, + dc->CombinedClip, BrushObj, x1, ScanLine, @@ -649,7 +649,7 @@ GrepBitBltEx(psurf, NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + dc->CombinedClip, NULL, &LineRect, NULL, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -45,7 +45,7 @@ bRet = GrepBitBltEx(&pDC->pBitmap->SurfObj, NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, NULL, &DestRect, NULL, @@ -63,28 +63,28 @@ { Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.left, DestRect.top, DestRect.right, DestRect.top, &DestRect, // Bounding rectangle Mix); GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, &DestRect, // Bounding rectangle Mix); GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, &DestRect, // Bounding rectangle Mix); GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, &DestRect, // Bounding rectangle @@ -135,7 +135,7 @@ for (i=0; i<count-1; i++) { bRet = GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, ptPoints[i].x, ptPoints[i].y,

1 0

[fireball] 42332: - Capture user's buffer using SEH in RosGdiSetDeviceClipping. - Offset combined clipping region by DC and viewport origins, which was the problem preventing its usage. - Remove unneeded stuff from RosGdiSetDcRects. Setting DC rects to fullscreen dimensions is done in usermode.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 11:56:44 2009 New Revision: 42332 URL: http://svn.reactos.org/svn/reactos?rev=42332&view=rev Log: - Capture user's buffer using SEH in RosGdiSetDeviceClipping. - Offset combined clipping region by DC and viewport origins, which was the problem preventing its usage. - Remove unneeded stuff from RosGdiSetDcRects. Setting DC rects to fullscreen dimensions is done in usermode. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sun Aug 2 11:56:44 2009 @@ -140,6 +140,9 @@ pNewDC->rcDcRect = pNewDC->rcVport; } + + /* Create an empty combined clipping region */ + pNewDC->CombinedClip = EngCreateClip(); /* Give handle to the caller */ *pdev = hNewDC; @@ -358,22 +361,83 @@ void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ) { PDC pDC; - - /* Get a pointer to the DC */ - pDC = DC_Lock(physDev); + RECTL pStackBuf[8]; + RECTL *pSafeRects = pStackBuf; + RECTL rcSafeBounds; + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get a pointer to the DC */ + pDC = DC_Lock(physDev); + + /* Capture the rects buffer */ + _SEH2_TRY + { + ProbeForRead(pRects, count * sizeof(RECTL), 1); + + /* Use pool allocated buffer if data doesn't fit */ + if (count > sizeof(*pStackBuf) / sizeof(RECTL)) + pSafeRects = ExAllocatePool(PagedPool, sizeof(RECTL) * count); + + /* Copy points data */ + RtlCopyMemory(pSafeRects, pRects, count * sizeof(RECTL)); + + /* Copy bounding rect */ + ProbeForRead(rcBounds, sizeof(RECTL), 1); + rcSafeBounds = *rcBounds; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Release the object */ + DC_Unlock(pDC); + + /* Free the buffer if it was allocated */ + if (pSafeRects != pStackBuf) ExFreePool(pSafeRects); + + /* Return failure */ + return; + } + + /* Offset all rects */ + for (i=0; i<count; i++) + { + RECTL_vOffsetRect(&pSafeRects[i], + pDC->rcDcRect.left + pDC->rcVport.left, + pDC->rcDcRect.top + pDC->rcVport.top); + } + + /* Offset bounding rect */ + RECTL_vOffsetRect(&rcSafeBounds, + pDC->rcDcRect.left + pDC->rcVport.left, + pDC->rcDcRect.top + pDC->rcVport.top); /* Delete old clipping region */ if (pDC->CombinedClip) IntEngDeleteClipRegion(pDC->CombinedClip); /* Set the clipping object */ - pDC->CombinedClip = IntEngCreateClipRegion(count, pRects, rcBounds); + pDC->CombinedClip = IntEngCreateClipRegion(count, pSafeRects, &rcSafeBounds); DPRINT("RosGdiSetDeviceClipping() for DC %x, bounding rect (%d,%d)-(%d, %d)\n", - physDev, rcBounds->left, rcBounds->bottom, rcBounds->right, rcBounds->top); - - /* Release the object */ - DC_Unlock(pDC); + physDev, rcSafeBounds.left, rcSafeBounds.top, rcSafeBounds.right, rcSafeBounds.bottom); + + DPRINT("rects: %d\n", count); + for (i=0; i<count; i++) + { + DPRINT("%d: (%d,%d)-(%d, %d)\n", i, pSafeRects[i].left, pSafeRects[i].top, pSafeRects[i].right, pSafeRects[i].bottom); + } + + /* Release the object */ + DC_Unlock(pDC); + + /* Free the buffer if it was allocated */ + if (pSafeRects != pStackBuf) ExFreePool(pSafeRects); } BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp) @@ -422,23 +486,11 @@ /* Set DC rectangle */ if (rcDcRect) - { pDC->rcDcRect = *rcDcRect; - -#if 0 - /* Set back to full screen */ - pDC->rcDcRect.top = 0; - pDC->rcDcRect.left = 0; - pDC->rcDcRect.right = pDC->szVportExt.cx; - pDC->rcDcRect.top = pDC->szVportExt.cy; -#endif - } /* Set viewport rectangle */ if (rcVport) - { pDC->rcVport = *rcVport; - } /* Release the object */ DC_Unlock(pDC);

1 0

[fireball] 42331: - Set drawable rect back to full screen size when releasing a DC.
by fireball＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: fireball Date: Sun Aug 2 10:45:28 2009 New Revision: 42331 URL: http://svn.reactos.org/svn/reactos?rev=42331&view=rev Log: - Set drawable rect back to full screen size when releasing a DC. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 2 10:45:28 2009 @@ -552,8 +552,8 @@ escape.dc_rect.bottom = 0; escape.drawable_rect.left = 0; escape.drawable_rect.top = 0; - escape.drawable_rect.right = 0; - escape.drawable_rect.bottom = 0; + escape.drawable_rect.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + escape.drawable_rect.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); ExtEscape( hdc, NTDRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); }

1 0

[hpoussin] 42330: [rbuild] Copy files to livecd output directory only if they have changed
by hpoussin＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: hpoussin Date: Sun Aug 2 10:06:17 2009 New Revision: 42330 URL: http://svn.reactos.org/svn/reactos?rev=42330&view=rev Log: [rbuild] Copy files to livecd output directory only if they have changed Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Aug 2 10:06:17 2009 @@ -336,6 +336,22 @@ backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } +void +MingwModuleHandler::OutputCopyCommandSingle ( const FileLocation& source, + const FileLocation& destination ) +{ + fprintf ( fMakefile, + "%s : %s\n", + backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str (), + backend->GetFullName ( source ).c_str () ); + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s 1>$(NUL)\n", + backend->GetFullName ( source ).c_str (), + backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); +} + string MingwModuleHandler::GetImportLibraryDependency ( const Module& importedModule, @@ -3196,7 +3212,8 @@ void MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) + string& reactosDirectory, + std::vector<FileLocation>& destinations ) { for ( std::map<std::string, Module*>::const_iterator p = module.project.modules.begin (); p != module.project.modules.end (); ++ p ) { @@ -3211,15 +3228,17 @@ ? livecdDirectory + sSep + reactosDirectory + sSep + m.install->relative_path : livecdDirectory + sSep + reactosDirectory, m.install->name ); - OutputCopyCommand ( *aliasedModule.output, - destination); + OutputCopyCommandSingle ( *aliasedModule.output, + destination); + destinations.push_back ( destination ); } } } void MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) + string& reactosDirectory, + std::vector<FileLocation>& destinations ) { for ( size_t i = 0; i < module.project.installfiles.size (); i++ ) { @@ -3229,12 +3248,14 @@ ? livecdDirectory + sSep + reactosDirectory + sSep + installfile.target->relative_path : livecdDirectory + sSep + reactosDirectory, installfile.target->name ); - OutputCopyCommand ( *installfile.source, target ); - } -} - -void -MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory ) + OutputCopyCommandSingle ( *installfile.source, target ); + destinations.push_back ( target ); + } +} + +void +MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory, + vector<FileLocation>& destinations ) { CreateDirectory ( livecdDirectory + sSep + "Profiles" ); CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "All Users") ; @@ -3249,12 +3270,14 @@ FileLocation destination ( OutputDirectory, livecdDirectory, "freeldr.ini" ); - OutputCopyCommand ( livecdIni, - destination ); -} - -void -MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory ) + OutputCopyCommandSingle ( livecdIni, + destination ); + destinations.push_back ( destination ); +} + +void +MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory, + std::vector<FileLocation>& destinations ) { FileLocation freeldr ( OutputDirectory, "boot" + sSep + "freeldr" + sSep + "freeldr", @@ -3262,8 +3285,9 @@ FileLocation destination ( OutputDirectory, livecdDirectory + sSep + "loader", "setupldr.sys" ); - OutputCopyCommand ( freeldr, - destination ); + OutputCopyCommandSingle ( freeldr, + destination ); + destinations.push_back ( destination ); } void @@ -3316,19 +3340,31 @@ "" ); CLEAN_FILE ( livecdReactos ); + std::vector<FileLocation> sourceFiles; + OutputModuleCopyCommands ( livecdDirectory, + reactosDirectory, + sourceFiles ); + OutputNonModuleCopyCommands ( livecdDirectory, + reactosDirectory, + sourceFiles ); + OutputProfilesDirectoryCommands ( livecdDirectory, sourceFiles ); + OutputLoaderCommands ( livecdDirectory, sourceFiles ); + + fprintf( fMakefile, + "\n%s_OBJS := %s\n\n", + module.name.c_str (), + v2s ( backend, sourceFiles, 5 ).c_str () ); + fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, - "%s: all %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", + "%s : $(%s_OBJS) %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", + module.name.c_str (), module.name.c_str (), backend->GetFullName ( *isoboot) .c_str (), - backend->GetFullPath ( livecdReactos ).c_str () ); - OutputModuleCopyCommands ( livecdDirectory, - reactosDirectory ); - OutputNonModuleCopyCommands ( livecdDirectory, - reactosDirectory ); - OutputProfilesDirectoryCommands ( livecdDirectory ); - OutputLoaderCommands ( livecdDirectory ); + backend->GetFullPath ( FileLocation ( OutputDirectory, + livecdDirectory, + "" ) ).c_str () ); OutputRegistryCommands ( livecdDirectory ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Aug 2 10:06:17 2009 @@ -90,6 +90,8 @@ void OutputCopyCommand ( const FileLocation& source, const FileLocation& destination ); + void OutputCopyCommandSingle ( const FileLocation& source, + const FileLocation& destination ); protected: virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); std::string GetWorkingDirectory () const; @@ -335,11 +337,15 @@ void GenerateLiveIsoModuleTarget (); void CreateDirectory ( const std::string& directory ); void OutputModuleCopyCommands ( std::string& livecdDirectory, - std::string& livecdReactos ); + std::string& livecdReactos, + std::vector<FileLocation>& destinations ); void OutputNonModuleCopyCommands ( std::string& livecdDirectory, - std::string& livecdReactos ); - void OutputProfilesDirectoryCommands ( std::string& livecdDirectory ); - void OutputLoaderCommands ( std::string& livecdDirectory ); + std::string& livecdReactos, + std::vector<FileLocation>& destinations ); + void OutputProfilesDirectoryCommands ( std::string& livecdDirectory, + std::vector<FileLocation>& destinations ); + void OutputLoaderCommands ( std::string& livecdDirectory, + std::vector<FileLocation>& destinations ); void OutputRegistryCommands ( std::string& livecdDirectory ); };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs