Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[fireball] 42656: - Implement hatched brushes support. - Convert brush's pattern bitmap handle to a kernel GDI handle.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 19:29:50 2009 New Revision: 42656 URL: http://svn.reactos.org/svn/reactos?rev=42656&view=rev Log: - Implement hatched brushes support. - Convert brush's pattern bitmap handle to a kernel GDI handle. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h 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] Thu Aug 13 19:29:50 2009 @@ -260,9 +260,8 @@ break; case BS_HATCHED: - DPRINT1("BS_HATCHED\n" ); - //GreCreateHatchedBrush(); - UNIMPLEMENTED; + DPRINT("BS_HATCHED\n" ); + pDC->pFillBrush = GreCreateHatchedBrush(pLogBrush->lbHatch, pLogBrush->lbColor); break; case BS_PATTERN: @@ -273,6 +272,7 @@ DPRINT1("Trying to select an unknown bitmap %x to the DC %x!\n", pLogBrush->lbHatch, physDev); break; } + GDIOBJ_SetOwnership(hBmpKern, NULL); pDC->pFillBrush = GreCreatePatternBrush(hBmpKern); break; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Thu Aug 13 19:29:50 2009 @@ -11,6 +11,17 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + + +static const USHORT HatchBrushes[NB_HATCH_STYLES][8] = +{ + {0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00}, /* HS_HORIZONTAL */ + {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08}, /* HS_VERTICAL */ + {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}, /* HS_FDIAGONAL */ + {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}, /* HS_BDIAGONAL */ + {0x08, 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08}, /* HS_CROSS */ + {0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81} /* HS_DIAGCROSS */ +}; /* PUBLIC FUNCTIONS **********************************************************/ @@ -220,13 +231,50 @@ return pBrush; } +PBRUSHGDI +NTAPI +GreCreateHatchedBrush(INT iHatchStyle, COLORREF crColor) +{ + PBRUSHGDI pBrush; + SIZEL szPatSize; + PSURFACE pPattern; + + /* Make sure hatch style is in range */ + if (iHatchStyle < 0 || iHatchStyle >= NB_HATCH_STYLES) + return NULL; + + /* Allocate memory for the object */ + pBrush = EngAllocMem(FL_ZERO_MEMORY, sizeof(BRUSHGDI), TAG_BRUSHOBJ); + if (!pBrush) return NULL; + + /* Set HATCH flag */ + pBrush->flAttrs |= GDIBRUSH_IS_HATCH; + + /* Create and set pattern bitmap */ + szPatSize.cx = 8; szPatSize.cy = 8; + pBrush->hbmPattern = GreCreateBitmap(szPatSize, 0, BMF_1BPP, BMF_NOZEROINIT, NULL); + GDIOBJ_SetOwnership(pBrush->hbmPattern, NULL); + pPattern = SURFACE_Lock(pBrush->hbmPattern); + GreSetBitmapBits(pPattern, 8, (PVOID)HatchBrushes[iHatchStyle]); + SURFACE_Unlock(pPattern); + + /* Set color to the reserved value */ + pBrush->BrushObj.iSolidColor = crColor & 0xFFFFFF; + + /* Return newly created brush */ + return pBrush; +} + VOID NTAPI GreFreeBrush(PBRUSHGDI pBrush) { /* Free the pattern bitmap if any */ if (pBrush->hbmPattern) + { + GDIOBJ_SetOwnership(pBrush->hbmPattern, PsGetCurrentProcess()); GreDeleteBitmap(pBrush->hbmPattern); + } /* Free the memory */ EngFreeMem(pBrush); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] Thu Aug 13 19:29:50 2009 @@ -20,6 +20,9 @@ #define GDIBRUSH_IS_INSIDEFRAME 0x00010000 #define GDIBRUSH_CACHED_ENGINE 0x00040000 #define GDIBRUSH_CACHED_IS_SOLID 0x80000000 + +/* Total amount of hatch brush styles */ +#define NB_HATCH_STYLES 6 /* BRUSHGDI is a handleless GDI object */ typedef struct _BRUSHGDI @@ -50,6 +53,9 @@ IN BOOL bOldStylePen); PBRUSHGDI NTAPI +GreCreateHatchedBrush(INT iHatchStyle, COLORREF crColor); + +PBRUSHGDI NTAPI GreCreateSolidBrush(COLORREF crColor); PBRUSHGDI NTAPI

1 0

[fireball] 42655: - If SetDeviceClipping is called without any rectangles, set clip region to cover whole surface, and remove annoying debug message related to that.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 15:13:54 2009 New Revision: 42655 URL: http://svn.reactos.org/svn/reactos?rev=42655&view=rev Log: - If SetDeviceClipping is called without any rectangles, set clip region to cover whole surface, and remove annoying debug message related to that. 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] Thu Aug 13 15:13:54 2009 @@ -445,16 +445,20 @@ if (count == 0) { /* Special case, set it to full screen then */ - RECTL_vSetRect(&rcSafeBounds, + /*RECTL_vSetRect(&rcSafeBounds, pDC->rcVport.left, pDC->rcVport.top, pDC->rcVport.right, - pDC->rcVport.bottom); + pDC->rcVport.bottom);*/ + + RECTL_vSetRect(&rcSafeBounds, + 0, + 0, + pDC->pBitmap->SurfObj.sizlBitmap.cx, + pDC->pBitmap->SurfObj.sizlBitmap.cy); /* Set the clipping object */ pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); - - DPRINT1("FIXME: Setting device clipping to NULL region, using full screen instead\n"); } else {

1 0

[fireball] 42654: - Lock cursor's mask bitmap exclusively instead of shared.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 14:58:19 2009 New Revision: 42654 URL: http://svn.reactos.org/svn/reactos?rev=42654&view=rev Log: - Lock cursor's mask bitmap exclusively instead of shared. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Thu Aug 13 14:58:19 2009 @@ -97,7 +97,7 @@ GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo) { SURFOBJ *pso; - SURFOBJ *MaskBmpObj = NULL; + SURFACE *MaskBmpObj = NULL; HBITMAP hMask = 0; SURFOBJ *soMask = NULL, *soColor = NULL; XLATEOBJ *XlateObj = NULL; @@ -121,11 +121,11 @@ return TRUE; } - MaskBmpObj = EngLockSurface((HSURF)NewCursor->hbmMask); + MaskBmpObj = SURFACE_Lock(NewCursor->hbmMask); if (MaskBmpObj) { - const int maskBpp = BitsPerFormat(MaskBmpObj->iBitmapFormat); - EngUnlockSurface(MaskBmpObj); + const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat); + SURFACE_Unlock(MaskBmpObj); if (maskBpp != 1) { DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); @@ -154,10 +154,10 @@ } else { - MaskBmpObj = EngLockSurface((HSURF)NewCursor->hbmMask); + MaskBmpObj = SURFACE_Lock((HSURF)NewCursor->hbmMask); if(MaskBmpObj) { - RECTL DestRect = {0, 0, MaskBmpObj->sizlBitmap.cx, MaskBmpObj->sizlBitmap.cy}; + RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy}; POINTL SourcePoint = {0, 0}; /* @@ -166,19 +166,19 @@ * be fixed later. */ hMask = EngCreateBitmap( - MaskBmpObj->sizlBitmap, abs(MaskBmpObj->lDelta), - MaskBmpObj->iBitmapFormat, BMF_TOPDOWN, + MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta), + MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN, NULL); if ( !hMask ) { - EngUnlockSurface(MaskBmpObj); + SURFACE_Unlock(MaskBmpObj); EngUnlockSurface(pso); return FALSE; } soMask = EngLockSurface((HSURF)hMask); - GreCopyBits(soMask, MaskBmpObj, NULL, NULL, + GreCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, &DestRect, &SourcePoint); - EngUnlockSurface(MaskBmpObj); + SURFACE_Unlock(MaskBmpObj); } } }

1 0

[fireball] 42653: - Intersect cursor clipping rectangle with virtual screen rectangle to get a real clipping. Now mouse cursor movements are fully clipped as expected. - Update windows Z order when window position changed. Experimental.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 14:49:49 2009 New Revision: 42653 URL: http://svn.reactos.org/svn/reactos?rev=42653&view=rev Log: - Intersect cursor clipping rectangle with virtual screen rectangle to get a real clipping. Now mouse cursor movements are fully clipped as expected. - Update windows Z order when window position changed. Experimental. 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] Thu Aug 13 14:49:49 2009 @@ -280,7 +280,19 @@ BOOL CDECL RosDrv_ClipCursor( LPCRECT clip ) { - return RosUserClipCursor( clip ); + RECT rcScreen, cursor_clip; + + /* Make up virtual screen rectangle*/ + rcScreen.left = 0; rcScreen.top = 0; + rcScreen.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + rcScreen.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); + + /* Intersect with screen rectangle */ + if (!IntersectRect( &cursor_clip, &rcScreen, clip )) + return RosUserClipCursor(&rcScreen); + + /* Set clipping */ + return RosUserClipCursor( &cursor_clip ); } BOOL CDECL RosDrv_GetScreenSaveActive(void) @@ -863,6 +875,8 @@ move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); } } + + RosDrv_UpdateZOrder(hwnd, visible_rect); } /* EOF */

1 0

[fireball] 42652: - Add GreCopyBits function for copying bitmap bits, and use it inside graphics engine. The function is a simple wrapper around EngCopyBits but with mouse cursor safety functions (if it actually gives a visible benefit, if any).
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 12:35:29 2009 New Revision: 42652 URL: http://svn.reactos.org/svn/reactos?rev=42652&view=rev Log: - Add GreCopyBits function for copying bitmap bits, and use it inside graphics engine. The function is a simple wrapper around EngCopyBits but with mouse cursor safety functions (if it actually gives a visible benefit, if any). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h 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] Thu Aug 13 12:35:29 2009 @@ -563,7 +563,7 @@ DestRect.right = SourceSize.cx; DestRect.bottom = DestRect.top + ScanLines; - copyBitsResult = EngCopyBits(DestSurf, SourceSurf, NULL, XlateObj, &DestRect, &ZeroPoint); + copyBitsResult = GreCopyBits(DestSurf, SourceSurf, NULL, XlateObj, &DestRect, &ZeroPoint); // If it succeeded, return number of scanlines copies if (copyBitsResult == TRUE) @@ -934,7 +934,7 @@ DestSurfObj = EngLockSurface((HSURF)hDestBitmap); - if (EngCopyBits(DestSurfObj, + if (GreCopyBits(DestSurfObj, &psurf->SurfObj, NULL, XlateObj, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Thu Aug 13 12:35:29 2009 @@ -176,7 +176,7 @@ return FALSE; } soMask = EngLockSurface((HSURF)hMask); - EngCopyBits(soMask, MaskBmpObj, NULL, NULL, + GreCopyBits(soMask, MaskBmpObj, NULL, NULL, &DestRect, &SourcePoint); EngUnlockSurface(MaskBmpObj); } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Thu Aug 13 12:35:29 2009 @@ -339,3 +339,31 @@ /* Restore the old brush */ pDC->pFillBrush = pOldBrush; } + +BOOL +APIENTRY +GreCopyBits(SURFOBJ *psoDest, + SURFOBJ *psoSource, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclDest, + POINTL *ptlSource) +{ + BOOL bResult; + + /* Start mouse safety */ + MouseSafetyOnDrawStart(psoSource, ptlSource->x, ptlSource->y, + (ptlSource->x + abs(prclDest->right - prclDest->left)), + (ptlSource->y + abs(prclDest->bottom - prclDest->top))); + + MouseSafetyOnDrawStart(psoDest, prclDest->left, prclDest->top, prclDest->right, prclDest->bottom); + + /* Copy bits using Eng function */ + bResult = EngCopyBits(psoDest, psoSource, pco, pxlo, prclDest, ptlSource); + + /* Finish mouse safety */ + MouseSafetyOnDrawEnd(psoDest); + MouseSafetyOnDrawEnd(psoSource); + + return bResult; +} Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Thu Aug 13 12:35:29 2009 @@ -188,6 +188,15 @@ UINT y, COLORREF crColor); +BOOL +APIENTRY +GreCopyBits( + SURFOBJ *psoDest, + SURFOBJ *psoSource, + CLIPOBJ *Clip, + XLATEOBJ *ColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint); /* Private Eng functions */ BOOL APIENTRY

1 0

[pschweitzer] 42651: Fixed rtl lib, and got back some deleted stuff by sync.
by pschweitzer＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: pschweitzer Date: Thu Aug 13 12:30:12 2009 New Revision: 42651 URL: http://svn.reactos.org/svn/reactos?rev=42651&view=rev Log: Fixed rtl lib, and got back some deleted stuff by sync. Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c branches/pierre-fsd/lib/rtl/nls.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Thu Aug 13 12:30:12 2009 @@ -11,11 +11,6 @@ #define NDEBUG #include <debug.h> - -/* GLOBALS *******************************************************************/ - -extern BOOLEAN NlsMbOemCodePageTag; -extern PUSHORT NlsOemLeadByteInfo; /* CONSTANTS *****************************************************************/ @@ -274,29 +269,20 @@ for (i = 0; i < AnsiName->Length; i++) { - /* First make sure the character it's not the Lead DBCS */ - if (NlsMbOemCodePageTag && NlsOemLeadByteInfo[(UCHAR)AnsiName->Buffer[i]]) + switch (AnsiName->Buffer[i]) { - if (i == AnsiName->Length - 1) return FALSE; - i++; - } - else - { - switch (AnsiName->Buffer[i]) - { - case ' ': - /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; - GotSpace = TRUE; - break; - case '.': - if (Dot != -1) return FALSE; - Dot = i; - break; - default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; - break; - } + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; } } /* check file part is shorter than 8, extension shorter than 3 Modified: branches/pierre-fsd/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/nls.c?rev=42… ============================================================================== --- branches/pierre-fsd/lib/rtl/nls.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/nls.c [iso-8859-1] Thu Aug 13 12:30:12 2009 @@ -31,8 +31,9 @@ PWCHAR NlsOemToUnicodeTable = NULL; PCHAR NlsUnicodeToOemTable =NULL; PWCHAR NlsDbcsUnicodeToOemTable = NULL; -PUSHORT NlsOemLeadByteInfo = NULL; /* exported */ - +PUSHORT _NlsOemLeadByteInfo = NULL; /* exported */ + +#define NlsOemLeadByteInfo _NlsOemLeadByteInfo #define INIT_FUNCTION /* FUNCTIONS *****************************************************************/

1 0

[janderwald] 42650: [SPLITTER] - Implement Splitter (WIP)
by janderwald＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: janderwald Date: Thu Aug 13 12:05:42 2009 New Revision: 42650 URL: http://svn.reactos.org/svn/reactos?rev=42650&view=rev Log: [SPLITTER] - Implement Splitter (WIP) Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -14,7 +14,48 @@ IN PKSFILTER Filter, IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + ULONG Index; + PKSPROCESSPIN CurPin, Pin; + BOOLEAN PendingFrames = FALSE; + + if (ProcessPinsIndex->Count) + { + /* check if there are outstanding frames */ + for(Index = 1; Index < ProcessPinsIndex->Count; Index++) + { + /* get current pin */ + CurPin = ProcessPinsIndex->Pins[Index]; + + if (CurPin->BytesAvailable && CurPin->Pin->DeviceState == KSSTATE_RUN) + { + /* pin has pending frames + * to keep all pins synchronized, every pin has to wait untill each chained pin has send its frames downwards + */ + PendingFrames = TRUE; + } + } + } + + if (!PendingFrames && ProcessPinsIndex->Count) + { + /* get first pin */ + Pin = ProcessPinsIndex->Pins[0]; + + /* check if there is new data available */ + if (Pin->BytesAvailable) + { + for(Index = 1; Index < ProcessPinsIndex->Count; Index++) + { + /* get current pin */ + CurPin = ProcessPinsIndex->Pins[Index]; + + /* copy the frame to pin */ + RtlMoveMemory(CurPin->Data, Pin->Data, Pin->BytesAvailable); + CurPin->BytesUsed = Pin->BytesAvailable; + } + } + } + /* done */ + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -14,8 +14,45 @@ IN PKSPIN Pin, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSFILTER Filter; + PKSPIN FirstPin; + PPIN_CONTEXT PinContext; + + /* first get the parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* now get first child pin */ + FirstPin = KsFilterGetFirstChildPin(Filter, Pin->Id); + + /* sanity check */ + ASSERT(FirstPin); + + if (FirstPin != Pin) + { + /* a previous pin already exists */ + if (RtlCompareMemory(FirstPin->ConnectionFormat, Pin->ConnectionFormat, Pin->ConnectionFormat->FormatSize) != Pin->ConnectionFormat->FormatSize) + { + /* each instantiated pin must have the same connection format */ + return STATUS_INVALID_PARAMETER; + } + } + + /* allocate pin context */ + PinContext = ExAllocatePool(NonPagedPool, sizeof(PIN_CONTEXT)); + if (!PinContext) + return STATUS_INSUFFICIENT_RESOURCES; + + /* store pin context */ + Pin->Context = PinContext; + + /* clear pin context */ + RtlZeroMemory(PinContext, sizeof(PIN_CONTEXT)); + + /* FIXME + * check allocator framing and apply to all pins + */ + + return STATUS_SUCCESS; } NTSTATUS @@ -24,8 +61,14 @@ IN PKSPIN Pin, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + /* is there a context */ + if (Pin->Context) + { + /* free pin context */ + ExFreePool(Pin->Context); + } + + return STATUS_SUCCESS; } VOID @@ -33,7 +76,22 @@ PinReset( IN PKSPIN Pin) { - UNIMPLEMENTED + PKSFILTER Filter; + + /* sanity check */ + ASSERT(Pin->Context); + + /* clear pin context */ + RtlZeroMemory(Pin->Context, sizeof(PIN_CONTEXT)); + + /* get parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* sanity check */ + ASSERT(Filter); + + /* attempt processing */ + KsFilterAttemptProcessing(Filter, TRUE); } NTSTATUS @@ -43,8 +101,25 @@ IN KSSTATE ToState, IN KSSTATE FromState) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSFILTER Filter; + + /* should the pin stop */ + if (ToState == KSSTATE_STOP) + { + /* clear pin context */ + RtlZeroMemory(Pin->Context, sizeof(PIN_CONTEXT)); + } + + /* get parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* sanity check */ + ASSERT(Filter); + + /* attempt processing */ + KsFilterAttemptProcessing(Filter, TRUE); + + return STATUS_SUCCESS; } NTSTATUS @@ -54,8 +129,49 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSFILTER Filter; + PKSPIN Pin, FirstPin; + PFILE_OBJECT FileObject; + NTSTATUS Status; + ULONG BytesReturned; + + /* first get the pin */ + Pin = KsGetPinFromIrp(Irp); + + /* sanity check */ + ASSERT(Pin); + + /* get parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* acquire filter control mutex */ + KsFilterAcquireControl(Filter); + + /* get first pin */ + FirstPin = KsFilterGetFirstChildPin(Filter, Pin->Id); + + /* get connected pin of first pin */ + FileObject = KsPinGetConnectedPinFileObject(FirstPin); + + if (!FileObject) + { + /* no pin connected */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* perform request */ + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)Request, sizeof(KSPROPERTY), Data, sizeof(KSAUDIO_POSITION), &BytesReturned); + + /* store result size */ + Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); + } + + /* release control */ + KsFilterReleaseControl(Filter); + + /* done */ + return Status; } NTSTATUS @@ -70,7 +186,54 @@ OUT PVOID Data OPTIONAL, OUT PULONG DataSize) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - + PKSPIN FirstPin; + NTSTATUS Status; + + /* get first pin */ + FirstPin = KsFilterGetFirstChildPin((PKSFILTER)Context, Pin->PinId); + + /* sanity check */ + ASSERT(FirstPin); + + /* check for matching dataformat */ + if (!IsEqualGUIDAligned(&FirstPin->ConnectionFormat->SubFormat, &DataRange->SubFormat) || + !IsEqualGUIDAligned(&FirstPin->ConnectionFormat->Specifier, &DataRange->Specifier) || + !IsEqualGUIDAligned(&GUID_NULL, &DataRange->SubFormat) || + !IsEqualGUIDAligned(&GUID_NULL, &DataRange->Specifier)) + { + /* no match */ + return STATUS_NO_MATCH; + } + + + if (DataBufferSize) + { + /* there is output buffer */ + if (DataBufferSize >= FirstPin->ConnectionFormat->FormatSize) + { + /* copy dataformat */ + RtlMoveMemory(Data, FirstPin->ConnectionFormat, FirstPin->ConnectionFormat->FormatSize); + + /* store output length */ + *DataSize = FirstPin->ConnectionFormat->FormatSize; + + Status = STATUS_SUCCESS; + } + else + { + /* buffer too small */ + Status = STATUS_BUFFER_TOO_SMALL; + } + } + else + { + /* store output length */ + *DataSize = FirstPin->ConnectionFormat->FormatSize; + + Status = STATUS_BUFFER_OVERFLOW; + } + + /* done */ + return Status; +} + Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -58,4 +58,13 @@ OUT PVOID Data OPTIONAL, OUT PULONG DataSize); + + +typedef struct +{ + ULONG BytesAvailable; + ULONG BytesProcessed; +}PIN_CONTEXT, *PPIN_CONTEXT; + + #endif Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -12,6 +12,8 @@ const GUID KSPROPSETID_Audio = {0x45FFAAA0, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; const GUID KSCATEGORY_AUDIO_SPLITTER = {0x9EA331FA, 0xB91B, 0x45F8, {0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE}}; const GUID KSNAME_Filter = {0x9b365890, 0x165f, 0x11d0, {0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4}}; +const GUID GUID_NULL = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; + KSPROPERTY_ITEM PinPropertyTable[] =

1 0

[janderwald] 42649: [KS] - Check if irp was allocated - Unimplement KsPinGetConnectedPinFileObject
by janderwald＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: janderwald Date: Thu Aug 13 11:54:51 2009 New Revision: 42649 URL: http://svn.reactos.org/svn/reactos?rev=42649&view=rev Log: [KS] - Check if irp was allocated - Unimplement KsPinGetConnectedPinFileObject Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/pin.c 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 Aug 13 11:54:51 2009 @@ -1147,6 +1147,13 @@ /* create the irp */ Irp = IoBuildDeviceIoControlRequest(IoControl, DeviceObject, InBuffer, InSize, OutBuffer, OutSize, FALSE, &Event, &IoStatusBlock); + + if (!Irp) + { + /* no memory to allocate the irp */ + return STATUS_INSUFFICIENT_RESOURCES; + } + /* HACK */ IoStack = IoGetNextIrpStackLocation(Irp); 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] Thu Aug 13 11:54:51 2009 @@ -384,16 +384,14 @@ } /* - @implemented + @unimplemented */ PFILE_OBJECT NTAPI KsPinGetConnectedPinFileObject( IN PKSPIN Pin) { - IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); - - return This->FileObject; + return NULL; } /* @@ -1188,8 +1186,12 @@ This->ObjectHeader->Unknown = (PUNKNOWN)&This->lpVtbl; This->ObjectHeader->ObjectType = (PVOID)&This->Pin; - /* now inform the driver to create a new pin */ - Status = Descriptor->Dispatch->Create(&This->Pin, Irp); + /* does the driver have a pin dispatch */ + if (Descriptor->Dispatch && Descriptor->Dispatch->Create) + { + /* now inform the driver to create a new pin */ + Status = Descriptor->Dispatch->Create(&This->Pin, Irp); + } if (!NT_SUCCESS(Status) && Status != STATUS_PENDING) {

1 0

[janderwald] 42648: - Implement IPortDMus_fnNewRegistryKey
by janderwald＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: janderwald Date: Thu Aug 13 11:53:13 2009 New Revision: 42648 URL: http://svn.reactos.org/svn/reactos?rev=42648&view=rev Log: - Implement IPortDMus_fnNewRegistryKey Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Thu Aug 13 11:53:13 2009 @@ -219,6 +219,12 @@ } } + /* Initialize port object */ + This->pMiniport = Miniport; + This->pMiniportMidi = MidiMiniport; + This->pDeviceObject = DeviceObject; + This->bInitialized = TRUE; + if (Miniport) { /* initialize IMiniportDMus */ @@ -226,6 +232,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IMiniportDMus_Init failed with %x\n", Status); + This->bInitialized = FALSE; return Status; } @@ -235,6 +242,7 @@ { DPRINT1("failed to get description\n"); Miniport->lpVtbl->Release(Miniport); + This->bInitialized = FALSE; return Status; } @@ -249,6 +257,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IMiniportMidi_Init failed with %x\n", Status); + This->bInitialized = FALSE; return Status; } @@ -258,6 +267,7 @@ { DPRINT1("failed to get description\n"); MidiMiniport->lpVtbl->Release(MidiMiniport); + This->bInitialized = FALSE; return Status; } @@ -290,6 +300,7 @@ else MidiMiniport->lpVtbl->Release(MidiMiniport); + This->bInitialized = FALSE; return Status; } @@ -298,12 +309,6 @@ /* register service group */ This->ServiceGroup = ServiceGroup; } - - /* Initialize port object */ - This->pMiniport = Miniport; - This->pMiniportMidi = MidiMiniport; - This->pDeviceObject = DeviceObject; - This->bInitialized = TRUE; /* check if it supports IPinCount interface */ Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPinCount, (PVOID*)&PinCount); @@ -346,7 +351,16 @@ DPRINT("IPortDMus_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return STATUS_UNSUCCESSFUL; + + return PcNewRegistryKey(OutRegistryKey, + OuterUnknown, + RegistryKeyType, + DesiredAccess, + This->pDeviceObject, + NULL,//FIXME + ObjectAttributes, + CreateOptions, + Disposition); } VOID

1 0

[sginsberg] 42647: - Re-disallow warnings for gdi32, user32 and lsasrv
by sginsberg＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: sginsberg Date: Thu Aug 13 11:34:37 2009 New Revision: 42647 URL: http://svn.reactos.org/svn/reactos?rev=42647&view=rev Log: - Re-disallow warnings for gdi32, user32 and lsasrv Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/user32/user32.rbuild Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Thu Aug 13 11:34:37 2009 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll" allowwarnings="true"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll"> <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <define name="LANGPACK" /> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Thu Aug 13 11:34:37 2009 @@ -1,4 +1,4 @@ -<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes" allowwarnings="true"> +<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes"> <importlibrary definition="lsasrv.spec" /> <include base="lsasrv">.</include> <include base="lsa_server">.</include> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Thu Aug 13 11:34:37 2009 @@ -1,4 +1,4 @@ -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll" allowwarnings="true"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll"> <importlibrary definition="user32.pspec" /> <include base="user32">.</include> <include base="user32">include</include>

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009