Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[tkreuzer] 30259: IntGdiPolygon: close the polygon outline See issue #2782 for more details.
by tkreuzer＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: tkreuzer Date: Thu Nov 8 05:19:25 2007 New Revision: 30259 URL: http://svn.reactos.org/svn/reactos?rev=30259&view=rev Log: IntGdiPolygon: close the polygon outline See issue #2782 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Thu Nov 8 05:19:25 2007 @@ -104,9 +104,11 @@ // Draw the Polygon Edges with the current pen ( if not a NULL pen ) if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { + int i; + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - while (Count-- >1) + for (i = 0; i < Count-1; i++) { // DPRINT1("Polygon Making line from (%d,%d) to (%d,%d)\n", @@ -116,14 +118,26 @@ ret = IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - UnsafePoints[0].x, /* From */ - UnsafePoints[0].y, - UnsafePoints[1].x, /* To */ - UnsafePoints[1].y, + UnsafePoints[i].x, /* From */ + UnsafePoints[i].y, + UnsafePoints[i+1].x, /* To */ + UnsafePoints[i+1].y, &DestRect, ROP2_TO_MIX(dc->Dc_Attr.jROP2)); /* MIX */ if (!ret) break; - UnsafePoints++; + } + /* Close the polygon */ + if (ret) + { + ret = IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + UnsafePoints[Count-1].x, /* From */ + UnsafePoints[Count-1].y, + UnsafePoints[0].x, /* To */ + UnsafePoints[0].y, + &DestRect, + ROP2_TO_MIX(dc->Dc_Attr.jROP2)); /* MIX */ } } PENOBJ_UnlockPen(PenBrushObj);

1 0

[greatlrd] 30258: start fixing wdmguid.a 50% is done
by greatlrd＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: greatlrd Date: Thu Nov 8 04:49:53 2007 New Revision: 30258 URL: http://svn.reactos.org/svn/reactos?rev=30258&view=rev Log: start fixing wdmguid.a 50% is done Modified: branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c Modified: branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/wdmguid/… ============================================================================== --- branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c (original) +++ branches/reactx/reactos/lib/sdk/wdmguid/wdmguid.c Thu Nov 8 04:49:53 2007 @@ -1,11 +1,29 @@ -#include <stdarg.h> +#define INITGUID +#include <basetyps.h> +#include <guiddef.h> -#define COM_NO_WINDOWS_H -#include "initguid.h" +DEFINE_GUID(GUID_LEGACY_DEVICE_DETECTION_STANDARD, 0x50FEB0DE, 0x596A, 0x11D2, 0xA5, 0xB8, 0x00, 0x00, 0xF8, 0x1A, 0x46, 0x19); +DEFINE_GUID(GUID_ACPI_REGS_INTERFACE_STANDARD, 0x06141966, 0x7245, 0x6369, 0x46, 0x2E, 0x4E, 0x65, 0x6C, 0x73, 0x6F, 0x6E); +DEFINE_GUID(GUID_PCMCIA_BUS_INTERFACE_STANDARD, 0x76173AF0, 0xC504, 0x11D1, 0x94, 0x7F, 0x00, 0xC0, 0x4F, 0xB9, 0x60, 0xEE); +DEFINE_GUID(GUID_INT_ROUTE_INTERFACE_STANDARD, 0x70941BF4, 0x0073, 0x11D1, 0xA0, 0x9E, 0x00, 0xC0, 0x4F, 0xC3, 0x40, 0xB1); +DEFINE_GUID(GUID_ACPI_INTERFACE_STANDARD, 0xB091A08A, 0xBA97, 0x11D0, 0xBD, 0x14, 0x00, 0xAA, 0x00, 0xB7, 0xB3, 0x2A); +DEFINE_GUID(GUID_TRANSLATOR_INTERFACE_STANDARD, 0x6C154A92, 0xAACF, 0x11D0, 0x8D, 0x2A, 0x00, 0xA0, 0xC9, 0x06, 0xB2, 0x44); +DEFINE_GUID(GUID_ARBITER_INTERFACE_STANDARD, 0xE644F185, 0x8C0E, 0x11D0, 0xBE, 0xCF, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_AGP_TARGET_BUS_INTERFACE_STANDARD, 0xB15CFCE8, 0x06D1, 0x4D37, 0x9D, 0x4C, 0xBE, 0xDD, 0xE0, 0xC2, 0xA6, 0xFF); +DEFINE_GUID(GUID_PCI_BUS_INTERFACE_STANDARD, 0x496B8281, 0x6F25, 0x11D0, 0xBE, 0xAF, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_BUS_INTERFACE_STANDARD, 0x496B8280, 0x6F25, 0x11D0, 0xBE, 0xAF, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F); +DEFINE_GUID(GUID_PNP_POWER_NOTIFICATION, 0xC2CF0660, 0xEB7A, 0x11D1, 0xBD, 0x7F, 0x00, 0x00, 0xF8, 0x75, 0x71, 0xD0); +DEFINE_GUID(GUID_PNP_CUSTOM_NOTIFICATION, 0xACA73F8E, 0x8D23, 0x11D1, 0xAC, 0x7D, 0x00, 0x00, 0xF8, 0x75, 0x71, 0xD0); +DEFINE_GUID(GUID_TARGET_DEVICE_REMOVE_COMPLETE, 0xCB3A4008, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_TARGET_DEVICE_REMOVE_CANCELLED, 0xCB3A4007, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_TARGET_DEVICE_QUERY_REMOVE, 0xCB3A4006, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_INTERFACE_REMOVAL, 0xCB3A4005, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_DEVICE_INTERFACE_ARRIVAL, 0xCB3A4004, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_HWPROFILE_CHANGE_COMPLETE, 0xCB3A4003, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_HWPROFILE_CHANGE_CANCELLED, 0xCB3A4002, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); +DEFINE_GUID(GUID_HWPROFILE_QUERY_CHANGE, 0xCB3A4001, 0x46F0, 0x11D0, 0xB0, 0x8F, 0x00, 0x60, 0x97, 0x13, 0x05, 0x3F); -#include <wdmguid.h> -#include <umpnpmgr/sysguid.h> /* FIXME: shouldn't go there! */ DEFINE_GUID(GUID_DEVICE_SYS_BUTTON,

1 0

[tkreuzer] 30257: clean up indentation, no code change
by tkreuzer＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: tkreuzer Date: Thu Nov 8 04:22:40 2007 New Revision: 30257 URL: http://svn.reactos.org/svn/reactos?rev=30257&view=rev Log: clean up indentation, no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Thu Nov 8 04:22:40 2007 @@ -46,91 +46,91 @@ PPOINT UnsafePoints, int Count) { - BITMAPOBJ *BitmapObj; - PGDIBRUSHOBJ PenBrushObj, FillBrushObj; - GDIBRUSHINST PenBrushInst, FillBrushInst; - BOOL ret = FALSE; // default to failure - RECTL DestRect; - int CurrentPoint; - - ASSERT(dc); // caller's responsibility to pass a valid dc - - if ( NULL == UnsafePoints || Count < 2 ) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - /* FIXME - BitmapObj can be NULL!!!! don't assert but handle this case gracefully! */ - ASSERT(BitmapObj); - - /* Convert to screen coordinates */ - IntLPtoDP(dc, UnsafePoints, Count); - for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++) - { - UnsafePoints[CurrentPoint].x += dc->w.DCOrgX; - UnsafePoints[CurrentPoint].y += dc->w.DCOrgY; - } - - if (PATH_IsPathOpen(dc->w.path)) - ret = PATH_Polygon(dc, UnsafePoints, Count ); - else - { - DestRect.left = UnsafePoints[0].x; - DestRect.right = UnsafePoints[0].x; - DestRect.top = UnsafePoints[0].y; - DestRect.bottom = UnsafePoints[0].y; - - for (CurrentPoint = 1; CurrentPoint < Count; ++CurrentPoint) - { - DestRect.left = min(DestRect.left, UnsafePoints[CurrentPoint].x); - DestRect.right = max(DestRect.right, UnsafePoints[CurrentPoint].x); - DestRect.top = min(DestRect.top, UnsafePoints[CurrentPoint].y); - DestRect.bottom = max(DestRect.bottom, UnsafePoints[CurrentPoint].y); - } - - /* Now fill the polygon with the current brush. */ - FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); - if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->Dc_Attr.jROP2), UnsafePoints, Count, DestRect ); - } - BRUSHOBJ_UnlockBrush(FillBrushObj); - - /* get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); - // Draw the Polygon Edges with the current pen ( if not a NULL pen ) - if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - - while(Count-- >1) - { + BITMAPOBJ *BitmapObj; + PGDIBRUSHOBJ PenBrushObj, FillBrushObj; + GDIBRUSHINST PenBrushInst, FillBrushInst; + BOOL ret = FALSE; // default to failure + RECTL DestRect; + int CurrentPoint; + + ASSERT(dc); // caller's responsibility to pass a valid dc + + if ( NULL == UnsafePoints || Count < 2 ) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + /* FIXME - BitmapObj can be NULL!!!! don't assert but handle this case gracefully! */ + ASSERT(BitmapObj); + + /* Convert to screen coordinates */ + IntLPtoDP(dc, UnsafePoints, Count); + for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++) + { + UnsafePoints[CurrentPoint].x += dc->w.DCOrgX; + UnsafePoints[CurrentPoint].y += dc->w.DCOrgY; + } + + if (PATH_IsPathOpen(dc->w.path)) + ret = PATH_Polygon(dc, UnsafePoints, Count ); + else + { + DestRect.left = UnsafePoints[0].x; + DestRect.right = UnsafePoints[0].x; + DestRect.top = UnsafePoints[0].y; + DestRect.bottom = UnsafePoints[0].y; + + for (CurrentPoint = 1; CurrentPoint < Count; ++CurrentPoint) + { + DestRect.left = min(DestRect.left, UnsafePoints[CurrentPoint].x); + DestRect.right = max(DestRect.right, UnsafePoints[CurrentPoint].x); + DestRect.top = min(DestRect.top, UnsafePoints[CurrentPoint].y); + DestRect.bottom = max(DestRect.bottom, UnsafePoints[CurrentPoint].y); + } + + /* Now fill the polygon with the current brush. */ + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); + if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(dc->Dc_Attr.jROP2), UnsafePoints, Count, DestRect ); + } + BRUSHOBJ_UnlockBrush(FillBrushObj); + + /* get BRUSHOBJ from current pen. */ + PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); + // Draw the Polygon Edges with the current pen ( if not a NULL pen ) + if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); + + while (Count-- >1) + { // DPRINT1("Polygon Making line from (%d,%d) to (%d,%d)\n", // UnsafePoints[0].x, UnsafePoints[0].y, // UnsafePoints[1].x, UnsafePoints[1].y ); - ret = IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - UnsafePoints[0].x, /* From */ - UnsafePoints[0].y, - UnsafePoints[1].x, /* To */ - UnsafePoints[1].y, - &DestRect, - ROP2_TO_MIX(dc->Dc_Attr.jROP2)); /* MIX */ - if(!ret) break; - UnsafePoints++; - } - } - PENOBJ_UnlockPen(PenBrushObj); - } - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return ret; + ret = IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + UnsafePoints[0].x, /* From */ + UnsafePoints[0].y, + UnsafePoints[1].x, /* To */ + UnsafePoints[1].y, + &DestRect, + ROP2_TO_MIX(dc->Dc_Attr.jROP2)); /* MIX */ + if (!ret) break; + UnsafePoints++; + } + } + PENOBJ_UnlockPen(PenBrushObj); + } + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return ret; } BOOL FASTCALL @@ -139,12 +139,13 @@ LPINT PolyCounts, int Count) { - while(--Count >=0) - { - if(!IntGdiPolygon ( dc, Points, *PolyCounts )) return FALSE; - Points+=*PolyCounts++; - } - return TRUE; + while (--Count >=0) + { + if (!IntGdiPolygon ( dc, Points, *PolyCounts )) + return FALSE; + Points+=*PolyCounts++; + } + return TRUE; } /******************************************************************************/ @@ -165,216 +166,216 @@ BOOL STDCALL NtGdiEllipse( - HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect) + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect) { - int ix, iy; - int A, B, C, D; - int da, db; - int NewA, NewB, NewC, NewD; - int nx, ny; - int CenterX, CenterY; - int RadiusX, RadiusY; - int Temp; - PGDIBRUSHOBJ FillBrush, PenBrush; - GDIBRUSHINST FillBrushInst, PenBrushInst; - BITMAPOBJ *BitmapObj; - RECTL RectBounds; - PDC dc; - BOOL ret = TRUE, Cond1, Cond2; - - /* - * Check the parameters. - */ - - if (nRightRect <= nLeftRect || nBottomRect <= nTopRect) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - /* - * Get pointers to all necessary GDI objects. - */ - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - FillBrush = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); - if (NULL == FillBrush) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - PenBrush = PENOBJ_LockPen(dc->Dc_Attr.hpen); - if (NULL == PenBrush) - { - BRUSHOBJ_UnlockBrush(FillBrush); - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (NULL == BitmapObj) - { - BRUSHOBJ_UnlockBrush(FillBrush); - PENOBJ_UnlockPen(PenBrush); - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - IntGdiInitBrushInstance(&FillBrushInst, FillBrush, dc->XlateBrush); - IntGdiInitBrushInstance(&PenBrushInst, PenBrush, dc->XlatePen); - - RectBounds.left = nLeftRect; - RectBounds.right = nRightRect; - RectBounds.top = nTopRect; - RectBounds.bottom = nBottomRect; - - IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); - - RectBounds.left += dc->w.DCOrgX; - RectBounds.right += dc->w.DCOrgX; - RectBounds.top += dc->w.DCOrgY; - RectBounds.bottom += dc->w.DCOrgY; - - RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); - RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); - CenterX = RectBounds.left + RadiusX; - CenterY = RectBounds.top + RadiusY; - - if (RadiusX > RadiusY) - { - nx = RadiusX; - ny = RadiusY; - } - else - { - nx = RadiusY; - ny = RadiusX; - } - - da = -1; - db = 0xFFFF; - ix = 0; - iy = nx * 64; - NewA = 0; - NewB = (iy + 32) >> 6; - NewC = 0; - NewD = (NewB * ny) / nx; - - do { - A = NewA; - B = NewB; - C = NewC; - D = NewD; - - ix += iy / nx; - iy -= ix / nx; - NewA = (ix + 32) >> 6; - NewB = (iy + 32) >> 6; - NewC = (NewA * ny) / nx; - NewD = (NewB * ny) / nx; - - if (RadiusX > RadiusY) - { - Temp = A; A = C; C = Temp; - Temp = B; B = D; D = Temp; - Cond1 = ((C != NewA) || (B != NewD)) && (NewC <= NewD); - Cond2 = ((D != NewB) || (A != NewC)) && (NewC <= B); - } - else - { - Cond1 = ((C != NewC) || (B != NewB)) && (NewA <= NewB); - Cond2 = ((D != NewD) || (A != NewA)) && (NewA <= B); - } - - /* - * Draw the lines going from inner to outer (+ mirrored). - */ - - if ((A > da) && (A < db)) - { - PUTLINE(CenterX - D, CenterY + A, CenterX + D, CenterY + A, FillBrushInst); - if (A) - { - PUTLINE(CenterX - D, CenterY - A, CenterX + D, CenterY - A, FillBrushInst); - } - da = A; - } - - /* - * Draw the lines going from outer to inner (+ mirrored). - */ - - if ((B < db) && (B > da)) - { - PUTLINE(CenterX - C, CenterY + B, CenterX + C, CenterY + B, FillBrushInst); - PUTLINE(CenterX - C, CenterY - B, CenterX + C, CenterY - B, FillBrushInst); - db = B; - } - - /* - * Draw the pixels on the margin. - */ - - if (Cond1) - { - PUTPIXEL(CenterX + C, CenterY + B, PenBrushInst); - if (C) - PUTPIXEL(CenterX - C, CenterY + B, PenBrushInst); - if (B) - { - PUTPIXEL(CenterX + C, CenterY - B, PenBrushInst); + int ix, iy; + int A, B, C, D; + int da, db; + int NewA, NewB, NewC, NewD; + int nx, ny; + int CenterX, CenterY; + int RadiusX, RadiusY; + int Temp; + PGDIBRUSHOBJ FillBrush, PenBrush; + GDIBRUSHINST FillBrushInst, PenBrushInst; + BITMAPOBJ *BitmapObj; + RECTL RectBounds; + PDC dc; + BOOL ret = TRUE, Cond1, Cond2; + + /* + * Check the parameters. + */ + + if (nRightRect <= nLeftRect || nBottomRect <= nTopRect) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* + * Get pointers to all necessary GDI objects. + */ + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + FillBrush = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); + if (NULL == FillBrush) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + + PenBrush = PENOBJ_LockPen(dc->Dc_Attr.hpen); + if (NULL == PenBrush) + { + BRUSHOBJ_UnlockBrush(FillBrush); + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (NULL == BitmapObj) + { + BRUSHOBJ_UnlockBrush(FillBrush); + PENOBJ_UnlockPen(PenBrush); + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + + IntGdiInitBrushInstance(&FillBrushInst, FillBrush, dc->XlateBrush); + IntGdiInitBrushInstance(&PenBrushInst, PenBrush, dc->XlatePen); + + RectBounds.left = nLeftRect; + RectBounds.right = nRightRect; + RectBounds.top = nTopRect; + RectBounds.bottom = nBottomRect; + + IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); + + RectBounds.left += dc->w.DCOrgX; + RectBounds.right += dc->w.DCOrgX; + RectBounds.top += dc->w.DCOrgY; + RectBounds.bottom += dc->w.DCOrgY; + + RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); + RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); + CenterX = RectBounds.left + RadiusX; + CenterY = RectBounds.top + RadiusY; + + if (RadiusX > RadiusY) + { + nx = RadiusX; + ny = RadiusY; + } + else + { + nx = RadiusY; + ny = RadiusX; + } + + da = -1; + db = 0xFFFF; + ix = 0; + iy = nx * 64; + NewA = 0; + NewB = (iy + 32) >> 6; + NewC = 0; + NewD = (NewB * ny) / nx; + + do { + A = NewA; + B = NewB; + C = NewC; + D = NewD; + + ix += iy / nx; + iy -= ix / nx; + NewA = (ix + 32) >> 6; + NewB = (iy + 32) >> 6; + NewC = (NewA * ny) / nx; + NewD = (NewB * ny) / nx; + + if (RadiusX > RadiusY) + { + Temp = A; A = C; C = Temp; + Temp = B; B = D; D = Temp; + Cond1 = ((C != NewA) || (B != NewD)) && (NewC <= NewD); + Cond2 = ((D != NewB) || (A != NewC)) && (NewC <= B); + } + else + { + Cond1 = ((C != NewC) || (B != NewB)) && (NewA <= NewB); + Cond2 = ((D != NewD) || (A != NewA)) && (NewA <= B); + } + + /* + * Draw the lines going from inner to outer (+ mirrored). + */ + + if ((A > da) && (A < db)) + { + PUTLINE(CenterX - D, CenterY + A, CenterX + D, CenterY + A, FillBrushInst); + if (A) + { + PUTLINE(CenterX - D, CenterY - A, CenterX + D, CenterY - A, FillBrushInst); + } + da = A; + } + + /* + * Draw the lines going from outer to inner (+ mirrored). + */ + + if ((B < db) && (B > da)) + { + PUTLINE(CenterX - C, CenterY + B, CenterX + C, CenterY + B, FillBrushInst); + PUTLINE(CenterX - C, CenterY - B, CenterX + C, CenterY - B, FillBrushInst); + db = B; + } + + /* + * Draw the pixels on the margin. + */ + + if (Cond1) + { + PUTPIXEL(CenterX + C, CenterY + B, PenBrushInst); if (C) - PUTPIXEL(CenterX - C, CenterY - B, PenBrushInst); - } - } - - if (Cond2) - { - PUTPIXEL(CenterX + D, CenterY + A, PenBrushInst); - if (D) - PUTPIXEL(CenterX - D, CenterY + A, PenBrushInst); - if (A) - { - PUTPIXEL(CenterX + D, CenterY - A, PenBrushInst); + PUTPIXEL(CenterX - C, CenterY + B, PenBrushInst); + if (B) + { + PUTPIXEL(CenterX + C, CenterY - B, PenBrushInst); + if (C) + PUTPIXEL(CenterX - C, CenterY - B, PenBrushInst); + } + } + + if (Cond2) + { + PUTPIXEL(CenterX + D, CenterY + A, PenBrushInst); if (D) - PUTPIXEL(CenterX - D, CenterY - A, PenBrushInst); - } - } - } while (B > A); - - BITMAPOBJ_UnlockBitmap(BitmapObj); - BRUSHOBJ_UnlockBrush(FillBrush); - PENOBJ_UnlockPen(PenBrush); - DC_UnlockDc(dc); - - return ret; + PUTPIXEL(CenterX - D, CenterY + A, PenBrushInst); + if (A) + { + PUTPIXEL(CenterX + D, CenterY - A, PenBrushInst); + if (D) + PUTPIXEL(CenterX - D, CenterY - A, PenBrushInst); + } + } + } while (B > A); + + BITMAPOBJ_UnlockBitmap(BitmapObj); + BRUSHOBJ_UnlockBrush(FillBrush); + PENOBJ_UnlockPen(PenBrush); + DC_UnlockDc(dc); + + return ret; } typedef struct tagSHAPEPOINT { - int X; - int Y; - int Type; + int X; + int Y; + int Type; } SHAPEPOINT, *PSHAPEPOINT; #define SHAPEPOINT_TYPE_CIRCLE 'C' @@ -396,93 +397,93 @@ CirclePoints(UINT *PointCount, PSHAPEPOINT ShapePoints, int Left, int Top, int Right, int Bottom) { - int X, X18, X27, X36, X45; - int Y, Y14, Y23, Y58, Y67; - int d, Radius; - BOOL Even; - - Even = (0 == (Right - Left) % 2); - Right--; - Bottom--; - Radius = (Right - Left) >> 1; - - if (Even) - { - X = 0; - Y = Radius; - d = 2 - Radius; - X18 = Right; - X27 = ((Left + Right) >> 1) + 1; - X36 = (Left + Right) >> 1; - X45 = Left; - Y14 = Top + Radius; - Y23 = Top; - Y58 = Top + Radius + 1; - Y67 = Top + (Right - Left); - ShapePoints[*PointCount].X = X27; - SETCIRCLEPOINT(X27, Y23); - SETCIRCLEPOINT(X36, Y23); - SETCIRCLEPOINT(X18, Y14); - SETCIRCLEPOINT(X45, Y14); - SETCIRCLEPOINT(X18, Y58); - SETCIRCLEPOINT(X45, Y58); - SETCIRCLEPOINT(X27, Y67); - SETCIRCLEPOINT(X36, Y67); - } - else - { - X = 0; - Y = Radius; - d = 1 - Radius; - X18 = Right; - X27 = (Left + Right) >> 1; - X36 = (Left + Right) >> 1; - X45 = Left; - Y14 = Top + Radius; - Y23 = Top; - Y58 = Top + Radius; - Y67 = Top + (Right - Left); - SETCIRCLEPOINT(X27, Y23); - SETCIRCLEPOINT(X45, Y14); - SETCIRCLEPOINT(X18, Y58); - SETCIRCLEPOINT(X27, Y67); - } - - while (X < Y) - { - if (d < 0) - { - d += (X << 1) + (Even ? 4 : 3); - - X27++; - X36--; - Y14--; - Y58++; - } - else - { - d += ((X - Y) << 1) + 5; - Y--; - - Y23++; - Y67--; - X18--; - X45++; - X27++; - X36--; - Y14--; - Y58++; - } - X++; - - SETCIRCLEPOINT(X27, Y23); - SETCIRCLEPOINT(X36, Y23); - SETCIRCLEPOINT(X18, Y14); - SETCIRCLEPOINT(X45, Y14); - SETCIRCLEPOINT(X18, Y58); - SETCIRCLEPOINT(X45, Y58); - SETCIRCLEPOINT(X27, Y67); - SETCIRCLEPOINT(X36, Y67); + int X, X18, X27, X36, X45; + int Y, Y14, Y23, Y58, Y67; + int d, Radius; + BOOL Even; + + Even = (0 == (Right - Left) % 2); + Right--; + Bottom--; + Radius = (Right - Left) >> 1; + + if (Even) + { + X = 0; + Y = Radius; + d = 2 - Radius; + X18 = Right; + X27 = ((Left + Right) >> 1) + 1; + X36 = (Left + Right) >> 1; + X45 = Left; + Y14 = Top + Radius; + Y23 = Top; + Y58 = Top + Radius + 1; + Y67 = Top + (Right - Left); + ShapePoints[*PointCount].X = X27; + SETCIRCLEPOINT(X27, Y23); + SETCIRCLEPOINT(X36, Y23); + SETCIRCLEPOINT(X18, Y14); + SETCIRCLEPOINT(X45, Y14); + SETCIRCLEPOINT(X18, Y58); + SETCIRCLEPOINT(X45, Y58); + SETCIRCLEPOINT(X27, Y67); + SETCIRCLEPOINT(X36, Y67); + } + else + { + X = 0; + Y = Radius; + d = 1 - Radius; + X18 = Right; + X27 = (Left + Right) >> 1; + X36 = (Left + Right) >> 1; + X45 = Left; + Y14 = Top + Radius; + Y23 = Top; + Y58 = Top + Radius; + Y67 = Top + (Right - Left); + SETCIRCLEPOINT(X27, Y23); + SETCIRCLEPOINT(X45, Y14); + SETCIRCLEPOINT(X18, Y58); + SETCIRCLEPOINT(X27, Y67); + } + + while (X < Y) + { + if (d < 0) + { + d += (X << 1) + (Even ? 4 : 3); + + X27++; + X36--; + Y14--; + Y58++; + } + else + { + d += ((X - Y) << 1) + 5; + Y--; + + Y23++; + Y67--; + X18--; + X45++; + X27++; + X36--; + Y14--; + Y58++; + } + X++; + + SETCIRCLEPOINT(X27, Y23); + SETCIRCLEPOINT(X36, Y23); + SETCIRCLEPOINT(X18, Y14); + SETCIRCLEPOINT(X45, Y14); + SETCIRCLEPOINT(X18, Y58); + SETCIRCLEPOINT(X45, Y58); + SETCIRCLEPOINT(X27, Y67); + SETCIRCLEPOINT(X36, Y67); } } @@ -490,85 +491,85 @@ LinePoints(UINT *PointCount, PSHAPEPOINT ShapePoints, int Left, int Top, int Right, int Bottom, int XTo, int YTo, BOOL Start) { - LONG x, y, deltax, deltay, i, xchange, ychange, error; - int Type; - - x = (Right + Left) >> 1; - y = (Bottom + Top) >> 1; - deltax = XTo - x; - deltay = YTo - y; - - if (deltax < 0) - { - xchange = -1; - deltax = - deltax; - x--; - } - else - { - xchange = 1; - } - - if (deltay < 0) - { - ychange = -1; - deltay = - deltay; - y--; - Type = (Start ? SHAPEPOINT_TYPE_LINE_LEFT : SHAPEPOINT_TYPE_LINE_RIGHT); - } - else - { - ychange = 1; - Type = (Start ? SHAPEPOINT_TYPE_LINE_RIGHT : SHAPEPOINT_TYPE_LINE_LEFT); - } - - if (y == YTo) - { - for (i = x; i <= XTo; i++) - { - SETPOINT(i, y, Type); - } - } - else if (x == XTo) - { - for (i = y; i <= YTo; i++) - { - SETPOINT(x, i, Type); - } - } - else - { - error = 0; - - if (deltax < deltay) - { - for (i = 0; i < deltay; i++) - { - SETPOINT(x, y, Type); - y = y + ychange; - error = error + deltax; - - if (deltay <= error) - { - x = x + xchange; - error = error - deltay; - } - } - } - else - { - for (i = 0; i < deltax; i++) - { - SETPOINT(x, y, Type); - x = x + xchange; - error = error + deltay; - if (deltax <= error) - { - y = y + ychange; - error = error - deltax; - } - } - } + LONG x, y, deltax, deltay, i, xchange, ychange, error; + int Type; + + x = (Right + Left) >> 1; + y = (Bottom + Top) >> 1; + deltax = XTo - x; + deltay = YTo - y; + + if (deltax < 0) + { + xchange = -1; + deltax = - deltax; + x--; + } + else + { + xchange = 1; + } + + if (deltay < 0) + { + ychange = -1; + deltay = - deltay; + y--; + Type = (Start ? SHAPEPOINT_TYPE_LINE_LEFT : SHAPEPOINT_TYPE_LINE_RIGHT); + } + else + { + ychange = 1; + Type = (Start ? SHAPEPOINT_TYPE_LINE_RIGHT : SHAPEPOINT_TYPE_LINE_LEFT); + } + + if (y == YTo) + { + for (i = x; i <= XTo; i++) + { + SETPOINT(i, y, Type); + } + } + else if (x == XTo) + { + for (i = y; i <= YTo; i++) + { + SETPOINT(x, i, Type); + } + } + else + { + error = 0; + + if (deltax < deltay) + { + for (i = 0; i < deltay; i++) + { + SETPOINT(x, y, Type); + y = y + ychange; + error = error + deltax; + + if (deltay <= error) + { + x = x + xchange; + error = error - deltay; + } + } + } + else + { + for (i = 0; i < deltax; i++) + { + SETPOINT(x, y, Type); + x = x + xchange; + error = error + deltay; + if (deltax <= error) + { + y = y + ychange; + error = error - deltax; + } + } + } } } @@ -576,25 +577,25 @@ CDECL CompareShapePoints(const void *pv1, const void *pv2) { - if (((const PSHAPEPOINT) pv1)->Y < ((const PSHAPEPOINT) pv2)->Y) - { - return -1; - } - else if (((const PSHAPEPOINT) pv2)->Y < ((const PSHAPEPOINT) pv1)->Y) - { - return +1; - } - else if (((const PSHAPEPOINT) pv1)->X < ((const PSHAPEPOINT) pv2)->X) - { - return -1; - } - else if (((const PSHAPEPOINT) pv2)->X < ((const PSHAPEPOINT) pv1)->X) - { - return +1; - } - else - { - return 0; + if (((const PSHAPEPOINT) pv1)->Y < ((const PSHAPEPOINT) pv2)->Y) + { + return -1; + } + else if (((const PSHAPEPOINT) pv2)->Y < ((const PSHAPEPOINT) pv1)->Y) + { + return +1; + } + else if (((const PSHAPEPOINT) pv1)->X < ((const PSHAPEPOINT) pv2)->X) + { + return -1; + } + else if (((const PSHAPEPOINT) pv2)->X < ((const PSHAPEPOINT) pv1)->X) + { + return +1; + } + else + { + return 0; } } #endif @@ -603,184 +604,184 @@ BOOL STDCALL NtGdiPie(HDC hDC, - int Left, - int Top, - int Right, - int Bottom, - int XRadialStart, - int YRadialStart, - int XRadialEnd, - int YRadialEnd) + int Left, + int Top, + int Right, + int Bottom, + int XRadialStart, + int YRadialStart, + int XRadialEnd, + int YRadialEnd) { #ifdef TODO - PDC dc; - RECTL RectBounds; - SURFOBJ *SurfObj; - BRUSHOBJ PenBrushObj; - PBRUSHOBJ FillBrushObj; - PSHAPEPOINT ShapePoints; - UINT Point, PointCount; - BOOL ret = TRUE; - int Y, CircleStart, CircleEnd, LineStart, LineEnd; - BOOL FullFill; - - if (Right <= Left || Bottom <= Top) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (Right - Left != Bottom - Top) - { - UNIMPLEMENTED; - } - - dc = DC_LockDc ( hDC ); - if (NULL == dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); - if (NULL == FillBrushObj) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - Left += dc->w.DCOrgX; - Right += dc->w.DCOrgX; - Top += dc->w.DCOrgY; - Bottom += dc->w.DCOrgY; - XRadialStart += dc->w.DCOrgX; - YRadialStart += dc->w.DCOrgY; - XRadialEnd += dc->w.DCOrgX; - YRadialEnd += dc->w.DCOrgY; - - RectBounds.left = Left; - RectBounds.right = Right; - RectBounds.top = Top; - RectBounds.bottom = Bottom; - - SurfObj = (SURFOBJ*) AccessUserObject((ULONG)dc->Surface); - HPenToBrushObj(&PenBrushObj, dc->Dc_Attr.hpen); - - /* Number of points for the circle is 4 * sqrt(2) * Radius, start - and end line have at most Radius points, so allocate at least - that much */ - ShapePoints = ExAllocatePoolWithTag(PagedPool, 8 * (Right - Left + 1) / 2 * sizeof(SHAPEPOINT), TAG_SHAPE); - if (NULL == ShapePoints) - { - BRUSHOBJ_UnlockBrush(FillBrushObj); - DC_UnlockDc(dc); - - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (Left == Right) - { - PUTPIXEL(Left, Top, &PenBrushObj); - BRUSHOBJ_UnlockBrush(FillBrushObj); - DC_UnlockDc(dc); - - return ret; - } - - PointCount = 0; - CirclePoints(&PointCount, ShapePoints, Left, Top, Right, Bottom); - LinePoints(&PointCount, ShapePoints, Left, Top, Right, Bottom, - XRadialStart, YRadialStart, TRUE); - LinePoints(&PointCount, ShapePoints, Left, Top, Right, Bottom, - XRadialEnd, YRadialEnd, FALSE); - ASSERT(PointCount <= 8 * (Right - Left + 1) / 2); - EngSort((PBYTE) ShapePoints, sizeof(SHAPEPOINT), PointCount, CompareShapePoints); - - FullFill = TRUE; - Point = 0; - while (Point < PointCount) - { - Y = ShapePoints[Point].Y; - - /* Skip any line pixels before circle */ - while (Point < PointCount && ShapePoints[Point].Y == Y - && SHAPEPOINT_TYPE_CIRCLE != ShapePoints[Point].Type) - { - Point++; - } - - /* Handle left side of circle */ - if (Point < PointCount && ShapePoints[Point].Y == Y) - { - CircleStart = ShapePoints[Point].X; - Point++; - while (Point < PointCount && ShapePoints[Point].Y == Y - && ShapePoints[Point].X == ShapePoints[Point - 1].X + 1 - && SHAPEPOINT_TYPE_CIRCLE == ShapePoints[Point].Type) - { - Point++; - } - CircleEnd = ShapePoints[Point - 1].X; - - PUTLINE(CircleStart, Y, CircleEnd + 1, Y, &PenBrushObj); - } - - /* Handle line(s) (max 2) inside the circle */ - while (Point < PointCount && ShapePoints[Point].Y == Y - && SHAPEPOINT_TYPE_CIRCLE != ShapePoints[Point].Type) - { - LineStart = ShapePoints[Point].X; - Point++; - while (Point < PointCount && ShapePoints[Point].Y == Y - && ShapePoints[Point].X == ShapePoints[Point - 1].X + 1 - && ShapePoints[Point].Type == ShapePoints[Point - 1].Type) - { - Point++; - } - LineEnd = ShapePoints[Point - 1].X; - - PUTLINE(LineStart, Y, LineEnd + 1, Y, &PenBrushObj); - } - - /* Handle right side of circle */ - while (Point < PointCount && ShapePoints[Point].Y == Y - && SHAPEPOINT_TYPE_CIRCLE == ShapePoints[Point].Type) - { - CircleStart = ShapePoints[Point].X; - Point++; - while (Point < PointCount && ShapePoints[Point].Y == Y - && ShapePoints[Point].X == ShapePoints[Point - 1].X + 1 - && SHAPEPOINT_TYPE_CIRCLE == ShapePoints[Point].Type) - { - Point++; - } - CircleEnd = ShapePoints[Point - 1].X; - - PUTLINE(CircleStart, Y, CircleEnd + 1, Y, &PenBrushObj); - } - - /* Skip any line pixels after circle */ - while (Point < PointCount && ShapePoints[Point].Y == Y) - { - Point++; - } - } - - ExFreePool(ShapePoints); - BRUSHOBJ_UnlockBrush(FillBrushObj); - DC_UnlockDc(dc); - - return ret; + PDC dc; + RECTL RectBounds; + SURFOBJ *SurfObj; + BRUSHOBJ PenBrushObj; + PBRUSHOBJ FillBrushObj; + PSHAPEPOINT ShapePoints; + UINT Point, PointCount; + BOOL ret = TRUE; + int Y, CircleStart, CircleEnd, LineStart, LineEnd; + BOOL FullFill; + + if (Right <= Left || Bottom <= Top) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (Right - Left != Bottom - Top) + { + UNIMPLEMENTED; + } + + dc = DC_LockDc ( hDC ); + if (NULL == dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); + if (NULL == FillBrushObj) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + + Left += dc->w.DCOrgX; + Right += dc->w.DCOrgX; + Top += dc->w.DCOrgY; + Bottom += dc->w.DCOrgY; + XRadialStart += dc->w.DCOrgX; + YRadialStart += dc->w.DCOrgY; + XRadialEnd += dc->w.DCOrgX; + YRadialEnd += dc->w.DCOrgY; + + RectBounds.left = Left; + RectBounds.right = Right; + RectBounds.top = Top; + RectBounds.bottom = Bottom; + + SurfObj = (SURFOBJ*) AccessUserObject((ULONG)dc->Surface); + HPenToBrushObj(&PenBrushObj, dc->Dc_Attr.hpen); + + /* Number of points for the circle is 4 * sqrt(2) * Radius, start + and end line have at most Radius points, so allocate at least + that much */ + ShapePoints = ExAllocatePoolWithTag(PagedPool, 8 * (Right - Left + 1) / 2 * sizeof(SHAPEPOINT), TAG_SHAPE); + if (NULL == ShapePoints) + { + BRUSHOBJ_UnlockBrush(FillBrushObj); + DC_UnlockDc(dc); + + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (Left == Right) + { + PUTPIXEL(Left, Top, &PenBrushObj); + BRUSHOBJ_UnlockBrush(FillBrushObj); + DC_UnlockDc(dc); + + return ret; + } + + PointCount = 0; + CirclePoints(&PointCount, ShapePoints, Left, Top, Right, Bottom); + LinePoints(&PointCount, ShapePoints, Left, Top, Right, Bottom, + XRadialStart, YRadialStart, TRUE); + LinePoints(&PointCount, ShapePoints, Left, Top, Right, Bottom, + XRadialEnd, YRadialEnd, FALSE); + ASSERT(PointCount <= 8 * (Right - Left + 1) / 2); + EngSort((PBYTE) ShapePoints, sizeof(SHAPEPOINT), PointCount, CompareShapePoints); + + FullFill = TRUE; + Point = 0; + while (Point < PointCount) + { + Y = ShapePoints[Point].Y; + + /* Skip any line pixels before circle */ + while (Point < PointCount && ShapePoints[Point].Y == Y + && SHAPEPOINT_TYPE_CIRCLE != ShapePoints[Point].Type) + { + Point++; + } + + /* Handle left side of circle */ + if (Point < PointCount && ShapePoints[Point].Y == Y) + { + CircleStart = ShapePoints[Point].X; + Point++; + while (Point < PointCount && ShapePoints[Point].Y == Y + && ShapePoints[Point].X == ShapePoints[Point - 1].X + 1 + && SHAPEPOINT_TYPE_CIRCLE == ShapePoints[Point].Type) + { + Point++; + } + CircleEnd = ShapePoints[Point - 1].X; + + PUTLINE(CircleStart, Y, CircleEnd + 1, Y, &PenBrushObj); + } + + /* Handle line(s) (max 2) inside the circle */ + while (Point < PointCount && ShapePoints[Point].Y == Y + && SHAPEPOINT_TYPE_CIRCLE != ShapePoints[Point].Type) + { + LineStart = ShapePoints[Point].X; + Point++; + while (Point < PointCount && ShapePoints[Point].Y == Y + && ShapePoints[Point].X == ShapePoints[Point - 1].X + 1 + && ShapePoints[Point].Type == ShapePoints[Point - 1].Type) + { + Point++; + } + LineEnd = ShapePoints[Point - 1].X; + + PUTLINE(LineStart, Y, LineEnd + 1, Y, &PenBrushObj); + } + + /* Handle right side of circle */ + while (Point < PointCount && ShapePoints[Point].Y == Y + && SHAPEPOINT_TYPE_CIRCLE == ShapePoints[Point].Type) + { + CircleStart = ShapePoints[Point].X; + Point++; + while (Point < PointCount && ShapePoints[Point].Y == Y + && ShapePoints[Point].X == ShapePoints[Point - 1].X + 1 + && SHAPEPOINT_TYPE_CIRCLE == ShapePoints[Point].Type) + { + Point++; + } + CircleEnd = ShapePoints[Point - 1].X; + + PUTLINE(CircleStart, Y, CircleEnd + 1, Y, &PenBrushObj); + } + + /* Skip any line pixels after circle */ + while (Point < PointCount && ShapePoints[Point].Y == Y) + { + Point++; + } + } + + ExFreePool(ShapePoints); + BRUSHOBJ_UnlockBrush(FillBrushObj); + DC_UnlockDc(dc); + + return ret; #else -return TRUE; + return TRUE; #endif } @@ -796,12 +797,12 @@ //The direction of each edge of the polygon is important. extern BOOL FillPolygon(PDC dc, - SURFOBJ *SurfObj, - PBRUSHOBJ BrushObj, - MIX RopMode, - CONST PPOINT Points, - int Count, - RECTL BoundRect); + SURFOBJ *SurfObj, + PBRUSHOBJ BrushObj, + MIX RopMode, + CONST PPOINT Points, + int Count, + RECTL BoundRect); #endif @@ -814,859 +815,859 @@ IN ULONG Count, IN INT iFunc ) { - DC *dc; - LPPOINT Safept; - LPINT SafePolyPoints; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret = TRUE; - INT nPoints, nEmpty, nInvalid, i; - - if (iFunc == GdiPolyPolyRgn) - { - return (ULONG_PTR) GdiCreatePolyPolygonRgn((CONST PPOINT) Points, - (CONST PINT) PolyCounts, - Count, - (INT) hDC); - } - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { + DC *dc; + LPPOINT Safept; + LPINT SafePolyPoints; + NTSTATUS Status = STATUS_SUCCESS; + BOOL Ret = TRUE; + INT nPoints, nEmpty, nInvalid, i; + + if (iFunc == GdiPolyPolyRgn) + { + return (ULONG_PTR) GdiCreatePolyPolygonRgn((CONST PPOINT) Points, + (CONST PINT) PolyCounts, + Count, + (INT) hDC); + } + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + if (Count > 0) + { + _SEH_TRY + { + ProbeForRead(Points, + Count * sizeof(POINT), + 1); + ProbeForRead(PolyCounts, + Count * sizeof(INT), + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + SetLastNtError(Status); + return FALSE; + } + + SafePolyPoints = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_SHAPE); + if (!SafePolyPoints) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + _SEH_TRY + { + /* pointers already probed! */ + RtlCopyMemory(SafePolyPoints, + PolyCounts, + Count * sizeof(INT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + ExFreePool(SafePolyPoints); + SetLastNtError(Status); + return FALSE; + } + /* validate poligons */ + nPoints = 0; + nEmpty = 0; + nInvalid = 0; + for (i = 0; i < Count; i++) + { + if (SafePolyPoints[i] == 0) + { + nEmpty++; + } + if (SafePolyPoints[i] == 1) + { + nInvalid++; + } + nPoints += SafePolyPoints[i]; + } + + if (nEmpty == Count) + { + /* if all polygon counts are zero, return without setting a last error code. */ + ExFreePool(SafePolyPoints); + return FALSE; + } + if (nInvalid != 0) + { + /* if at least one poly count is 1, fail */ + ExFreePool(SafePolyPoints); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Safept = ExAllocatePoolWithTag(PagedPool, nPoints * sizeof(POINT), TAG_SHAPE); + if (!Safept) + { + DC_UnlockDc(dc); + ExFreePool(SafePolyPoints); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + _SEH_TRY + { + /* pointers already probed! */ + RtlCopyMemory(Safept, + Points, + nPoints * sizeof(POINT)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + ExFreePool(SafePolyPoints); + ExFreePool(Safept); + SetLastNtError(Status); + return FALSE; + } + } + else + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (iFunc) + { + case GdiPolyPolygon: + Ret = IntGdiPolyPolygon(dc, Safept, SafePolyPoints, Count); + break; + case GdiPolyPolyLine: + Ret = IntGdiPolyPolyline(dc, Safept, (LPDWORD) SafePolyPoints, Count); + break; + case GdiPolyBezier: + Ret = IntGdiPolyBezier(dc, Safept, *PolyCounts); + break; + case GdiPolyLineTo: + Ret = IntGdiPolylineTo(dc, Safept, *PolyCounts); + break; + case GdiPolyBezierTo: + Ret = IntGdiPolyBezierTo(dc, Safept, *PolyCounts); + break; + default: + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = FALSE; + } + ExFreePool(SafePolyPoints); + ExFreePool(Safept); DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if(Count > 0) - { - _SEH_TRY - { - ProbeForRead(Points, - Count * sizeof(POINT), - 1); - ProbeForRead(PolyCounts, - Count * sizeof(INT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - SafePolyPoints = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_SHAPE); - if(!SafePolyPoints) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers already probed! */ - RtlCopyMemory(SafePolyPoints, - PolyCounts, - Count * sizeof(INT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(SafePolyPoints); - SetLastNtError(Status); - return FALSE; - } - /* validate poligons */ - nPoints = 0; - nEmpty = 0; - nInvalid = 0; - for (i = 0; i < Count; i++) - { - if (SafePolyPoints[i] == 0) - { - nEmpty++; - } - if (SafePolyPoints[i] == 1) - { - nInvalid++; - } - nPoints += SafePolyPoints[i]; - } - - if (nEmpty == Count) - { - /* if all polygon counts are zero, return without setting a last error code. */ - ExFreePool(SafePolyPoints); - return FALSE; - } - if (nInvalid != 0) - { - /* if at least one poly count is 1, fail */ - ExFreePool(SafePolyPoints); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, nPoints * sizeof(POINT), TAG_SHAPE); - if(!Safept) - { - DC_UnlockDc(dc); - ExFreePool(SafePolyPoints); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers already probed! */ - RtlCopyMemory(Safept, - Points, - nPoints * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(SafePolyPoints); - ExFreePool(Safept); - SetLastNtError(Status); - return FALSE; - } - } - else - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch(iFunc) - { - case GdiPolyPolygon: - Ret = IntGdiPolyPolygon(dc, Safept, SafePolyPoints, Count); - break; - case GdiPolyPolyLine: - Ret = IntGdiPolyPolyline(dc, Safept, (LPDWORD) SafePolyPoints, Count); - break; - case GdiPolyBezier: - Ret = IntGdiPolyBezier(dc, Safept, *PolyCounts); - break; - case GdiPolyLineTo: - Ret = IntGdiPolylineTo(dc, Safept, *PolyCounts); - break; - case GdiPolyBezierTo: - Ret = IntGdiPolyBezierTo(dc, Safept, *PolyCounts); - break; - default: - SetLastWin32Error(ERROR_INVALID_PARAMETER); - Ret = FALSE; - } - ExFreePool(SafePolyPoints); - ExFreePool(Safept); - DC_UnlockDc(dc); - - return (ULONG_PTR) Ret; + + return (ULONG_PTR) Ret; } BOOL FASTCALL IntRectangle(PDC dc, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect) + int LeftRect, + int TopRect, + int RightRect, + int BottomRect) { - BITMAPOBJ *BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - PGDIBRUSHOBJ PenBrushObj, FillBrushObj; - GDIBRUSHINST PenBrushInst, FillBrushInst; - BOOL ret = FALSE; // default to failure - RECTL DestRect; - MIX Mix; - - ASSERT ( dc ); // caller's responsibility to set this up - /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT ( BitmapObj ); - - if ( PATH_IsPathOpen(dc->w.path) ) - { - ret = PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); - } - else - { - LeftRect += dc->w.DCOrgX; - RightRect += dc->w.DCOrgX - 1; - TopRect += dc->w.DCOrgY; - BottomRect += dc->w.DCOrgY - 1; - - DestRect.left = LeftRect; - DestRect.right = RightRect; - DestRect.top = TopRect; - DestRect.bottom = BottomRect; - - FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); - - if ( FillBrushObj ) - { - if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = IntEngBitBlt(&BitmapObj->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &FillBrushInst.BrushObject, - NULL, - ROP3_TO_ROP4(PATCOPY)); - } - } - - BRUSHOBJ_UnlockBrush(FillBrushObj); - - /* get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); - if (PenBrushObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - BITMAPOBJ_UnlockBitmap(BitmapObj); - return FALSE; - } - - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - - // Draw the rectangle with the current pen - - ret = TRUE; // change default to success - - if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - Mix = ROP2_TO_MIX(dc->Dc_Attr.jROP2); - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - LeftRect, TopRect, RightRect, TopRect, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - RightRect, TopRect, RightRect, BottomRect, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - RightRect, BottomRect, LeftRect, BottomRect, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&BitmapObj->SurfObj, - dc->CombinedClip, - &PenBrushInst.BrushObject, - LeftRect, BottomRect, LeftRect, TopRect, - &DestRect, // Bounding rectangle - Mix); - } - - PENOBJ_UnlockPen(PenBrushObj); - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - /* Move current position in DC? - MSDN: The current position is neither used nor updated by Rectangle. */ - - return TRUE; + BITMAPOBJ *BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + PGDIBRUSHOBJ PenBrushObj, FillBrushObj; + GDIBRUSHINST PenBrushInst, FillBrushInst; + BOOL ret = FALSE; // default to failure + RECTL DestRect; + MIX Mix; + + ASSERT ( dc ); // caller's responsibility to set this up + /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ + ASSERT ( BitmapObj ); + + if ( PATH_IsPathOpen(dc->w.path) ) + { + ret = PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); + } + else + { + LeftRect += dc->w.DCOrgX; + RightRect += dc->w.DCOrgX - 1; + TopRect += dc->w.DCOrgY; + BottomRect += dc->w.DCOrgY - 1; + + DestRect.left = LeftRect; + DestRect.right = RightRect; + DestRect.top = TopRect; + DestRect.bottom = BottomRect; + + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); + + if ( FillBrushObj ) + { + if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + ret = IntEngBitBlt(&BitmapObj->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &FillBrushInst.BrushObject, + NULL, + ROP3_TO_ROP4(PATCOPY)); + } + } + + BRUSHOBJ_UnlockBrush(FillBrushObj); + + /* get BRUSHOBJ from current pen. */ + PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); + if (PenBrushObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + BITMAPOBJ_UnlockBitmap(BitmapObj); + return FALSE; + } + + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); + + // Draw the rectangle with the current pen + + ret = TRUE; // change default to success + + if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + Mix = ROP2_TO_MIX(dc->Dc_Attr.jROP2); + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + LeftRect, TopRect, RightRect, TopRect, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + RightRect, TopRect, RightRect, BottomRect, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + RightRect, BottomRect, LeftRect, BottomRect, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&BitmapObj->SurfObj, + dc->CombinedClip, + &PenBrushInst.BrushObject, + LeftRect, BottomRect, LeftRect, TopRect, + &DestRect, // Bounding rectangle + Mix); + } + + PENOBJ_UnlockPen(PenBrushObj); + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + /* Move current position in DC? + MSDN: The current position is neither used nor updated by Rectangle. */ + + return TRUE; } BOOL STDCALL NtGdiRectangle(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect) + int LeftRect, + int TopRect, + int RightRect, + int BottomRect) { - DC *dc; - BOOL ret; // default to failure - - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - ret = IntRectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); - DC_UnlockDc ( dc ); - - return ret; + DC *dc; + BOOL ret; // default to failure + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + ret = IntRectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); + DC_UnlockDc ( dc ); + + return ret; } BOOL FASTCALL IntRoundRect( - PDC dc, - int left, - int top, - int right, - int bottom, - int xCurveDiameter, - int yCurveDiameter) + PDC dc, + int left, + int top, + int right, + int bottom, + int xCurveDiameter, + int yCurveDiameter) { - BITMAPOBJ *BitmapObj; - PGDIBRUSHOBJ PenBrushObj, FillBrushObj; - GDIBRUSHINST FillBrushInst, PenBrushInst; - RECTL RectBounds; - int potential_steps; - int i, col, row, width, height, x1, x1start, x2, x2start, y1, y2; - int xradius, yradius; - //float aspect_square; - long a_square, b_square, + BITMAPOBJ *BitmapObj; + PGDIBRUSHOBJ PenBrushObj, FillBrushObj; + GDIBRUSHINST FillBrushInst, PenBrushInst; + RECTL RectBounds; + int potential_steps; + int i, col, row, width, height, x1, x1start, x2, x2start, y1, y2; + int xradius, yradius; + //float aspect_square; + long a_square, b_square, two_a_square, two_b_square, four_a_square, four_b_square, d, dinc, ddec; - BOOL first, + BOOL first, ret = TRUE; // default to success - ASSERT ( dc ); // caller's responsibility to set this up - - if ( PATH_IsPathOpen(dc->w.path) ) - return PATH_RoundRect ( dc, left, top, right, bottom, - xCurveDiameter, yCurveDiameter ); - - xradius = xCurveDiameter >> 1; - yradius = yCurveDiameter >> 1; - - left += dc->w.DCOrgX; - right += dc->w.DCOrgX; - top += dc->w.DCOrgY; - bottom += dc->w.DCOrgY; - - RectBounds.left = left; - RectBounds.right = right; - RectBounds.top = top; - RectBounds.bottom = bottom; - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - if (!BitmapObj) - { - /* Nothing to do, as we don't have a bitmap */ - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - - FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); - if (FillBrushObj) - { - if (FillBrushObj->flAttrs & GDIBRUSH_IS_NULL) - { - /* make null brush check simpler... */ - BRUSHOBJ_UnlockBrush(FillBrushObj); - FillBrushObj = NULL; - } - else - { - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - } - } - - PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); - if (PenBrushObj) - { - if (PenBrushObj->flAttrs & GDIBRUSH_IS_NULL) - { - /* make null pen check simpler... */ - PENOBJ_UnlockPen(PenBrushObj); - PenBrushObj = NULL; - } - else - { - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); - } - } - - right--; - bottom--; - - width = right - left; - height = bottom - top; - - if ( (xradius<<1) > width ) - xradius = width >> 1; - if ( (yradius<<1) > height ) - yradius = height >> 1; - - b_square = yradius * yradius; - a_square = xradius * xradius; - row = yradius; - col = 0; - two_a_square = a_square << 1; - four_a_square = a_square << 2; - four_b_square = b_square << 2; - two_b_square = b_square << 1; - d = two_a_square * ((row - 1) * (row)) - + a_square - + two_b_square * (1 - a_square); - - x1 = left+xradius; - x2 = right-xradius; - y1 = top; - y2 = bottom; - - x1start = x1; - x2start = x2; - - dinc = two_b_square*3; /* two_b_square * (3 + (col << 1)); */ - ddec = four_a_square * row; - - first = TRUE; - for ( ;; ) - { - if ( d >= 0 ) - { - if ( FillBrushObj ) - PUTLINE ( x1, y1, x2, y1, FillBrushInst ); - if ( first ) - { - if ( PenBrushObj ) - { - if ( x1start > x1 ) - { - PUTLINE ( x1, y1, x1start, y1, PenBrushInst ); - PUTLINE ( x2start+1, y2, x2+1, y2, PenBrushInst ); - } - else - { - PUTPIXEL ( x1, y1, PenBrushInst ); - PUTPIXEL ( x2, y2, PenBrushInst ); - } - } - first = FALSE; - } - else - { - if ( FillBrushObj ) - PUTLINE ( x1, y2, x2, y2, FillBrushInst ); - if ( PenBrushObj ) - { - if ( x1start >= x1 ) - { - PUTLINE ( x1, y1, x1start+1, y1, PenBrushInst ); - PUTLINE ( x2start, y2, x2+1, y2, PenBrushInst ); - } - else - { - PUTPIXEL ( x1, y1, PenBrushInst ); - PUTPIXEL ( x2, y2, PenBrushInst ); - } - } - } - if ( PenBrushObj ) - { - if ( x1start > x1 ) - { - PUTLINE ( x1, y2, x1start+1, y2, PenBrushInst ); - PUTLINE ( x2start, y1, x2+1, y1, PenBrushInst ); - } - else - { - PUTPIXEL ( x1, y2, PenBrushInst ); - PUTPIXEL ( x2, y1, PenBrushInst ); - } - } - x1start = x1-1; - x2start = x2+1; - row--, y1++, y2--, ddec -= four_a_square; - d -= ddec; - } - - potential_steps = ( a_square * row ) / b_square - col + 1; - while ( d < 0 && potential_steps-- ) - { - d += dinc; /* two_b_square * (3 + (col << 1)); */ - col++, x1--, x2++, dinc += four_b_square; - } - - if ( a_square * row <= b_square * col ) - break; - }; - - d = two_b_square * (col + 1) * col - + two_a_square * (row * (row - 2) + 1) - + (1 - two_a_square) * b_square; - dinc = ddec; /* four_b_square * col; */ - ddec = two_a_square * ((row << 1) - 3); - - while ( row ) - { + ASSERT ( dc ); // caller's responsibility to set this up + + if ( PATH_IsPathOpen(dc->w.path) ) + return PATH_RoundRect ( dc, left, top, right, bottom, + xCurveDiameter, yCurveDiameter ); + + xradius = xCurveDiameter >> 1; + yradius = yCurveDiameter >> 1; + + left += dc->w.DCOrgX; + right += dc->w.DCOrgX; + top += dc->w.DCOrgY; + bottom += dc->w.DCOrgY; + + RectBounds.left = left; + RectBounds.right = right; + RectBounds.top = top; + RectBounds.bottom = bottom; + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (!BitmapObj) + { + /* Nothing to do, as we don't have a bitmap */ + SetLastWin32Error(ERROR_INTERNAL_ERROR); + return FALSE; + } + + FillBrushObj = BRUSHOBJ_LockBrush(dc->Dc_Attr.hbrush); + if (FillBrushObj) + { + if (FillBrushObj->flAttrs & GDIBRUSH_IS_NULL) + { + /* make null brush check simpler... */ + BRUSHOBJ_UnlockBrush(FillBrushObj); + FillBrushObj = NULL; + } + else + { + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + } + } + + PenBrushObj = PENOBJ_LockPen(dc->Dc_Attr.hpen); + if (PenBrushObj) + { + if (PenBrushObj->flAttrs & GDIBRUSH_IS_NULL) + { + /* make null pen check simpler... */ + PENOBJ_UnlockPen(PenBrushObj); + PenBrushObj = NULL; + } + else + { + IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); + } + } + + right--; + bottom--; + + width = right - left; + height = bottom - top; + + if ( (xradius<<1) > width ) + xradius = width >> 1; + if ( (yradius<<1) > height ) + yradius = height >> 1; + + b_square = yradius * yradius; + a_square = xradius * xradius; + row = yradius; + col = 0; + two_a_square = a_square << 1; + four_a_square = a_square << 2; + four_b_square = b_square << 2; + two_b_square = b_square << 1; + d = two_a_square * ((row - 1) * (row)) + + a_square + + two_b_square * (1 - a_square); + + x1 = left+xradius; + x2 = right-xradius; + y1 = top; + y2 = bottom; + + x1start = x1; + x2start = x2; + + dinc = two_b_square*3; /* two_b_square * (3 + (col << 1)); */ + ddec = four_a_square * row; + + first = TRUE; + for ( ;; ) + { + if ( d >= 0 ) + { + if ( FillBrushObj ) + PUTLINE ( x1, y1, x2, y1, FillBrushInst ); + if ( first ) + { + if ( PenBrushObj ) + { + if ( x1start > x1 ) + { + PUTLINE ( x1, y1, x1start, y1, PenBrushInst ); + PUTLINE ( x2start+1, y2, x2+1, y2, PenBrushInst ); + } + else + { + PUTPIXEL ( x1, y1, PenBrushInst ); + PUTPIXEL ( x2, y2, PenBrushInst ); + } + } + first = FALSE; + } + else + { + if ( FillBrushObj ) + PUTLINE ( x1, y2, x2, y2, FillBrushInst ); + if ( PenBrushObj ) + { + if ( x1start >= x1 ) + { + PUTLINE ( x1, y1, x1start+1, y1, PenBrushInst ); + PUTLINE ( x2start, y2, x2+1, y2, PenBrushInst ); + } + else + { + PUTPIXEL ( x1, y1, PenBrushInst ); + PUTPIXEL ( x2, y2, PenBrushInst ); + } + } + } + if ( PenBrushObj ) + { + if ( x1start > x1 ) + { + PUTLINE ( x1, y2, x1start+1, y2, PenBrushInst ); + PUTLINE ( x2start, y1, x2+1, y1, PenBrushInst ); + } + else + { + PUTPIXEL ( x1, y2, PenBrushInst ); + PUTPIXEL ( x2, y1, PenBrushInst ); + } + } + x1start = x1-1; + x2start = x2+1; + row--, y1++, y2--, ddec -= four_a_square; + d -= ddec; + } + + potential_steps = ( a_square * row ) / b_square - col + 1; + while ( d < 0 && potential_steps-- ) + { + d += dinc; /* two_b_square * (3 + (col << 1)); */ + col++, x1--, x2++, dinc += four_b_square; + } + + if ( a_square * row <= b_square * col ) + break; + }; + + d = two_b_square * (col + 1) * col + + two_a_square * (row * (row - 2) + 1) + + (1 - two_a_square) * b_square; + dinc = ddec; /* four_b_square * col; */ + ddec = two_a_square * ((row << 1) - 3); + + while ( row ) + { + if ( FillBrushObj ) + { + PUTLINE ( x1, y1, x2, y1, FillBrushInst ); + PUTLINE ( x1, y2, x2, y2, FillBrushInst ); + } + if ( PenBrushObj ) + { + PUTPIXEL ( x2, y1, PenBrushInst ); + PUTPIXEL ( x1, y2, PenBrushInst ); + PUTPIXEL ( x2, y2, PenBrushInst ); + PUTPIXEL ( x1, y1, PenBrushInst ); + } + + if ( d <= 0 ) + { + col++, x1--, x2++, dinc += four_b_square; + d += dinc; //four_b_square * col; + } + + row--, y1++, y2--, ddec -= four_a_square; + d -= ddec; //two_a_square * ((row << 1) - 3); + } + if ( FillBrushObj ) { - PUTLINE ( x1, y1, x2, y1, FillBrushInst ); - PUTLINE ( x1, y2, x2, y2, FillBrushInst ); + PUTLINE ( left, y1, right, y1, FillBrushInst ); + PUTLINE ( left, y2, right, y2, FillBrushInst ); } if ( PenBrushObj ) { - PUTPIXEL ( x2, y1, PenBrushInst ); - PUTPIXEL ( x1, y2, PenBrushInst ); - PUTPIXEL ( x2, y2, PenBrushInst ); - PUTPIXEL ( x1, y1, PenBrushInst ); - } - - if ( d <= 0 ) - { - col++, x1--, x2++, dinc += four_b_square; - d += dinc; //four_b_square * col; - } - - row--, y1++, y2--, ddec -= four_a_square; - d -= ddec; //two_a_square * ((row << 1) - 3); - } - - if ( FillBrushObj ) - { - PUTLINE ( left, y1, right, y1, FillBrushInst ); - PUTLINE ( left, y2, right, y2, FillBrushInst ); - } - if ( PenBrushObj ) - { - if ( x1 > (left+1) ) - { - PUTLINE ( left, y1, x1, y1, PenBrushInst ); - PUTLINE ( x2+1, y1, right, y1, PenBrushInst ); - PUTLINE ( left+1, y2, x1, y2, PenBrushInst ); - PUTLINE ( x2+1, y2, right+1, y2, PenBrushInst ); - } - else - { - PUTPIXEL ( left, y1, PenBrushInst ); - PUTPIXEL ( right, y2, PenBrushInst ); - } - } - - x1 = left+xradius; - x2 = right-xradius; - y1 = top+yradius; - y2 = bottom-yradius; - - if ( FillBrushObj ) - { - for ( i = y1+1; i < y2; i++ ) - PUTLINE ( left, i, right, i, FillBrushInst ); - } - - if ( PenBrushObj ) - { - PUTLINE ( x1, top, x2, top, PenBrushInst ); - PUTLINE ( right, y1, right, y2, PenBrushInst ); - PUTLINE ( x2, bottom, x1, bottom, PenBrushInst ); - PUTLINE ( left, y2, left, y1, PenBrushInst ); - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - if(PenBrushObj != NULL) - PENOBJ_UnlockPen(PenBrushObj); - if(FillBrushObj != NULL) - BRUSHOBJ_UnlockBrush(FillBrushObj); - - return ret; + if ( x1 > (left+1) ) + { + PUTLINE ( left, y1, x1, y1, PenBrushInst ); + PUTLINE ( x2+1, y1, right, y1, PenBrushInst ); + PUTLINE ( left+1, y2, x1, y2, PenBrushInst ); + PUTLINE ( x2+1, y2, right+1, y2, PenBrushInst ); + } + else + { + PUTPIXEL ( left, y1, PenBrushInst ); + PUTPIXEL ( right, y2, PenBrushInst ); + } + } + + x1 = left+xradius; + x2 = right-xradius; + y1 = top+yradius; + y2 = bottom-yradius; + + if ( FillBrushObj ) + { + for ( i = y1+1; i < y2; i++ ) + PUTLINE ( left, i, right, i, FillBrushInst ); + } + + if ( PenBrushObj ) + { + PUTLINE ( x1, top, x2, top, PenBrushInst ); + PUTLINE ( right, y1, right, y2, PenBrushInst ); + PUTLINE ( x2, bottom, x1, bottom, PenBrushInst ); + PUTLINE ( left, y2, left, y1, PenBrushInst ); + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + if (PenBrushObj != NULL) + PENOBJ_UnlockPen(PenBrushObj); + if (FillBrushObj != NULL) + BRUSHOBJ_UnlockBrush(FillBrushObj); + + return ret; } BOOL STDCALL NtGdiRoundRect( - HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int Width, - int Height) + HDC hDC, + int LeftRect, + int TopRect, + int RightRect, + int BottomRect, + int Width, + int Height) { - DC *dc = DC_LockDc(hDC); - BOOL ret = FALSE; /* default to failure */ - - DPRINT("NtGdiRoundRect(0x%x,%i,%i,%i,%i,%i,%i)\n",hDC,LeftRect,TopRect,RightRect,BottomRect,Width,Height); - if ( !dc ) - { - DPRINT1("NtGdiRoundRect() - hDC is invalid\n"); - SetLastWin32Error(ERROR_INVALID_HANDLE); - } - else if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - ret = TRUE; - } - else - { - ret = IntRoundRect ( dc, LeftRect, TopRect, RightRect, BottomRect, Width, Height ); - DC_UnlockDc ( dc ); - } - - return ret; + DC *dc = DC_LockDc(hDC); + BOOL ret = FALSE; /* default to failure */ + + DPRINT("NtGdiRoundRect(0x%x,%i,%i,%i,%i,%i,%i)\n",hDC,LeftRect,TopRect,RightRect,BottomRect,Width,Height); + if ( !dc ) + { + DPRINT1("NtGdiRoundRect() - hDC is invalid\n"); + SetLastWin32Error(ERROR_INVALID_HANDLE); + } + else if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + ret = TRUE; + } + else + { + ret = IntRoundRect ( dc, LeftRect, TopRect, RightRect, BottomRect, Width, Height ); + DC_UnlockDc ( dc ); + } + + return ret; } BOOL FASTCALL IntGdiGradientFill( - DC *dc, - PTRIVERTEX pVertex, - ULONG uVertex, - PVOID pMesh, - ULONG uMesh, - ULONG ulMode) + DC *dc, + PTRIVERTEX pVertex, + ULONG uVertex, + PVOID pMesh, + ULONG uMesh, + ULONG ulMode) { - BITMAPOBJ *BitmapObj; - PPALGDI PalDestGDI; - XLATEOBJ *XlateObj; - RECTL Extent; - POINTL DitherOrg; - ULONG Mode, i; - BOOL Ret; - - ASSERT(dc); - ASSERT(pVertex); - ASSERT(uVertex); - ASSERT(pMesh); - ASSERT(uMesh); - - /* check parameters */ - if(ulMode & GRADIENT_FILL_TRIANGLE) - { - PGRADIENT_TRIANGLE tr = (PGRADIENT_TRIANGLE)pMesh; - - for(i = 0; i < uMesh; i++, tr++) - { - if(tr->Vertex1 >= uVertex || - tr->Vertex2 >= uVertex || - tr->Vertex3 >= uVertex) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - } - else - { - PGRADIENT_RECT rc = (PGRADIENT_RECT)pMesh; - for(i = 0; i < uMesh; i++, rc++) - { - if(rc->UpperLeft >= uVertex || rc->LowerRight >= uVertex) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - } - - /* calculate extent */ - Extent.left = Extent.right = pVertex->x; - Extent.top = Extent.bottom = pVertex->y; - for(i = 0; i < uVertex; i++) - { - Extent.left = min(Extent.left, (pVertex + i)->x); - Extent.right = max(Extent.right, (pVertex + i)->x); - Extent.top = min(Extent.top, (pVertex + i)->y); - Extent.bottom = max(Extent.bottom, (pVertex + i)->y); - } - - DitherOrg.x = dc->w.DCOrgX; - DitherOrg.y = dc->w.DCOrgY; - Extent.left += DitherOrg.x; - Extent.right += DitherOrg.x; - Extent.top += DitherOrg.y; - Extent.bottom += DitherOrg.y; - - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT(BitmapObj); - - PalDestGDI = PALETTE_LockPalette(dc->w.hPalette); - /* FIXME - PalDestGDI can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT(PalDestGDI); - Mode = PalDestGDI->Mode; - PALETTE_UnlockPalette(PalDestGDI); - - XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL); - ASSERT(XlateObj); - - Ret = IntEngGradientFill(&BitmapObj->SurfObj, - dc->CombinedClip, - XlateObj, - pVertex, - uVertex, - pMesh, - uMesh, - &Extent, - &DitherOrg, - ulMode); - - BITMAPOBJ_UnlockBitmap(BitmapObj); - EngDeleteXlate(XlateObj); - - return Ret; + BITMAPOBJ *BitmapObj; + PPALGDI PalDestGDI; + XLATEOBJ *XlateObj; + RECTL Extent; + POINTL DitherOrg; + ULONG Mode, i; + BOOL Ret; + + ASSERT(dc); + ASSERT(pVertex); + ASSERT(uVertex); + ASSERT(pMesh); + ASSERT(uMesh); + + /* check parameters */ + if (ulMode & GRADIENT_FILL_TRIANGLE) + { + PGRADIENT_TRIANGLE tr = (PGRADIENT_TRIANGLE)pMesh; + + for (i = 0; i < uMesh; i++, tr++) + { + if (tr->Vertex1 >= uVertex || + tr->Vertex2 >= uVertex || + tr->Vertex3 >= uVertex) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + } + else + { + PGRADIENT_RECT rc = (PGRADIENT_RECT)pMesh; + for (i = 0; i < uMesh; i++, rc++) + { + if (rc->UpperLeft >= uVertex || rc->LowerRight >= uVertex) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + } + + /* calculate extent */ + Extent.left = Extent.right = pVertex->x; + Extent.top = Extent.bottom = pVertex->y; + for (i = 0; i < uVertex; i++) + { + Extent.left = min(Extent.left, (pVertex + i)->x); + Extent.right = max(Extent.right, (pVertex + i)->x); + Extent.top = min(Extent.top, (pVertex + i)->y); + Extent.bottom = max(Extent.bottom, (pVertex + i)->y); + } + + DitherOrg.x = dc->w.DCOrgX; + DitherOrg.y = dc->w.DCOrgY; + Extent.left += DitherOrg.x; + Extent.right += DitherOrg.x; + Extent.top += DitherOrg.y; + Extent.bottom += DitherOrg.y; + + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ + ASSERT(BitmapObj); + + PalDestGDI = PALETTE_LockPalette(dc->w.hPalette); + /* FIXME - PalDestGDI can be NULL!!! Don't assert but handle this case gracefully! */ + ASSERT(PalDestGDI); + Mode = PalDestGDI->Mode; + PALETTE_UnlockPalette(PalDestGDI); + + XlateObj = (XLATEOBJ*)IntEngCreateXlate(Mode, PAL_RGB, dc->w.hPalette, NULL); + ASSERT(XlateObj); + + Ret = IntEngGradientFill(&BitmapObj->SurfObj, + dc->CombinedClip, + XlateObj, + pVertex, + uVertex, + pMesh, + uMesh, + &Extent, + &DitherOrg, + ulMode); + + BITMAPOBJ_UnlockBitmap(BitmapObj); + EngDeleteXlate(XlateObj); + + return Ret; } BOOL STDCALL NtGdiGradientFill( - HDC hdc, - PTRIVERTEX pVertex, - ULONG uVertex, - PVOID pMesh, - ULONG uMesh, - ULONG ulMode) + HDC hdc, + PTRIVERTEX pVertex, + ULONG uVertex, + PVOID pMesh, + ULONG uMesh, + ULONG ulMode) { - DC *dc; - BOOL Ret; - PTRIVERTEX SafeVertex; - PVOID SafeMesh; - ULONG SizeMesh; - NTSTATUS Status = STATUS_SUCCESS; - - dc = DC_LockDc(hdc); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - if(!pVertex || !uVertex || !pMesh || !uMesh) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch(ulMode) - { - case GRADIENT_FILL_RECT_H: - case GRADIENT_FILL_RECT_V: - SizeMesh = uMesh * sizeof(GRADIENT_RECT); - break; - case GRADIENT_FILL_TRIANGLE: - SizeMesh = uMesh * sizeof(TRIVERTEX); - break; - default: - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - _SEH_TRY - { - ProbeForRead(pVertex, - uVertex * sizeof(TRIVERTEX), - 1); - ProbeForRead(pMesh, - SizeMesh, - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastWin32Error(Status); - return FALSE; - } - - if(!(SafeVertex = ExAllocatePoolWithTag(PagedPool, (uVertex * sizeof(TRIVERTEX)) + SizeMesh, TAG_SHAPE))) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - SafeMesh = (PTRIVERTEX)(SafeVertex + uVertex); - - _SEH_TRY - { - /* pointers were already probed! */ - RtlCopyMemory(SafeVertex, - pVertex, - uVertex * sizeof(TRIVERTEX)); - RtlCopyMemory(SafeMesh, - pMesh, - SizeMesh); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { + DC *dc; + BOOL Ret; + PTRIVERTEX SafeVertex; + PVOID SafeMesh; + ULONG SizeMesh; + NTSTATUS Status = STATUS_SUCCESS; + + dc = DC_LockDc(hdc); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->IsIC) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + if (!pVertex || !uVertex || !pMesh || !uMesh) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (ulMode) + { + case GRADIENT_FILL_RECT_H: + case GRADIENT_FILL_RECT_V: + SizeMesh = uMesh * sizeof(GRADIENT_RECT); + break; + case GRADIENT_FILL_TRIANGLE: + SizeMesh = uMesh * sizeof(TRIVERTEX); + break; + default: + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + _SEH_TRY + { + ProbeForRead(pVertex, + uVertex * sizeof(TRIVERTEX), + 1); + ProbeForRead(pMesh, + SizeMesh, + 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + SetLastWin32Error(Status); + return FALSE; + } + + if (!(SafeVertex = ExAllocatePoolWithTag(PagedPool, (uVertex * sizeof(TRIVERTEX)) + SizeMesh, TAG_SHAPE))) + { + DC_UnlockDc(dc); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + SafeMesh = (PTRIVERTEX)(SafeVertex + uVertex); + + _SEH_TRY + { + /* pointers were already probed! */ + RtlCopyMemory(SafeVertex, + pVertex, + uVertex * sizeof(TRIVERTEX)); + RtlCopyMemory(SafeMesh, + pMesh, + SizeMesh); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + ExFreePool(SafeVertex); + SetLastNtError(Status); + return FALSE; + } + + Ret = IntGdiGradientFill(dc, SafeVertex, uVertex, SafeMesh, uMesh, ulMode); + DC_UnlockDc(dc); ExFreePool(SafeVertex); - SetLastNtError(Status); - return FALSE; - } - - Ret = IntGdiGradientFill(dc, SafeVertex, uVertex, SafeMesh, uMesh, ulMode); - - DC_UnlockDc(dc); - ExFreePool(SafeVertex); - return Ret; + return Ret; } BOOL STDCALL NtGdiExtFloodFill( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Color, - UINT FillType) + HDC hDC, + INT XStart, + INT YStart, + COLORREF Color, + UINT FillType) { - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); - - /* lie and say we succeded */ - return TRUE; + DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); + + /* lie and say we succeded */ + return TRUE; } /* EOF */

1 0

[greatlrd] 30256: add last guids for ksguid.a This lib are now completed against ddk version 3790.1830
by greatlrd＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: greatlrd Date: Thu Nov 8 03:59:17 2007 New Revision: 30256 URL: http://svn.reactos.org/svn/reactos?rev=30256&view=rev Log: add last guids for ksguid.a This lib are now completed against ddk version 3790.1830 Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Thu Nov 8 03:59:17 2007 @@ -13,6 +13,7 @@ #define INITGUID #include <basetyps.h> #include <guiddef.h> + DEFINE_GUID(BUSID_SoftwareDeviceEnumerator, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); @@ -147,14 +148,17 @@ DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); DEFINE_GUID(KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); DEFINE_GUID(KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_VBICODEC, 0x07DAD660, 0x22F1, 0x11D1, 0xA9, 0xF4, 0x00, 0xC0, 0x4F, 0xBB, 0xDE, 0x8F); DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); DEFINE_GUID(KSCATEGORY_WDMAUD, 0x3E227E76, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1); DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSCATEGORY_VIRTUAL, 0x3503EAC4, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_VPMUX, 0xA799A803, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_AC3_AUDIO, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_ANALOGVIDEO, 0x0482DDE0, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO, 0x36523B35, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO, 0x36523B32, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO, 0x36523B31, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); @@ -169,11 +173,15 @@ DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VBI, 0xF72A76E0, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VIDEOINFO, 0x05589F80, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VIDEOINFO2, 0xF72A76A0, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_AC3_AUDIO, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_CC, 0x33214CC1, 0x011F, 0x11D2, 0xB4, 0xB1, 0x00, 0xA0, 0xD1, 0x02, 0xCF, 0xBE); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_AUDIO, 0xA0AF4F82, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_VIDEO, 0xA0AF4F81, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); @@ -191,9 +199,12 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NABTS_FEC, 0xE757BCA1, 0x39AC, 0x11D1, 0xA9, 0xF5, 0x00, 0xC0, 0x4F, 0xBB, 0xDE, 0x8F); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NABTS, 0xF72A76E2, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_OVERLAY, 0xE436EB7F, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RAW8, 0xCA20D9A0, 0x3E3E, 0x11D1, 0x9B, 0xF9, 0x00, 0xC0, 0x4F, 0xBB, 0xDE, 0xBF); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFMIDI, 0x4995DAF0, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); @@ -204,7 +215,12 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO, 0x36523B24, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO, 0x36523B23, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_TELETEXT, 0xF72A76E3, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_VPVBI, 0x5A9B6A41, 0x1A22, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_VPVideo, 0x5A9B6A40, 0x1A22, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSDATAFORMAT_TYPE_ANALOGAUDIO, 0x0482DEE1, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65); +DEFINE_GUID(KSDATAFORMAT_TYPE_ANALOGVIDEO, 0x0482DDE1, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65); DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); @@ -213,11 +229,13 @@ DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); DEFINE_GUID(KSDATAFORMAT_TYPE_MUSIC, 0xE725D360, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_TYPE_NABTS, 0xE757BCA0, 0x39AC, 0x11D1, 0xA9, 0xF5, 0x00, 0xC0, 0x4F, 0xBB, 0xDE, 0x8F); DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM, 0x36523B11, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PES_PACKET, 0x36523B12, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); DEFINE_GUID(KSDATAFORMAT_TYPE_TEXT, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_VBI, 0xF72A76E1, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); DEFINE_GUID(KSDATAFORMAT_TYPE_VIDEO, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); @@ -387,6 +405,8 @@ DEFINE_GUID(KSPROPSETID_Wave_Queued, 0x16A15B10, 0x16F0, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSPROPSETID_Wave, 0x924E54B0, 0x630F, 0x11CF, 0xAD, 0xA7, 0x08, 0x00, 0x3E, 0x30, 0x49, 0x4A); DEFINE_GUID(KSPROPSETID_WaveTable, 0x8539E660, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_VBICAP_PROPERTIES, 0xF162C607, 0x7B35, 0x496F, 0xAD, 0x7F, 0x2D, 0xCA, 0x3B, 0x46, 0xB7, 0x18); +DEFINE_GUID(KSPROPSETID_VBICodecFiltering, 0xCAFEB0CA, 0x8715, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0xC0, 0xED, 0xBA, 0xBE); DEFINE_GUID(KSPROPSETID_VPConfig, 0xBC29A660, 0x30E3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B); DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A);

1 0

[tkreuzer] 30255: clean up indentation, no code change
by tkreuzer＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: tkreuzer Date: Thu Nov 8 03:36:15 2007 New Revision: 30255 URL: http://svn.reactos.org/svn/reactos?rev=30255&view=rev Log: clean up indentation, no code change Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Thu Nov 8 03:36:15 2007 @@ -34,7 +34,7 @@ /* GLOBALS *******************************************************************/ -#define DSS_DEFAULT 0x0040 /* Make it bold */ +#define DSS_DEFAULT 0x0040 /* Make it bold */ static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 }; @@ -44,76 +44,76 @@ * UITOOLS_DrawRectEdge() */ static const signed char LTInnerNormal[] = { - -1, -1, -1, -1, - -1, COLOR_BTNHIGHLIGHT, COLOR_BTNHIGHLIGHT, -1, - -1, COLOR_3DDKSHADOW, COLOR_3DDKSHADOW, -1, - -1, -1, -1, -1 + -1, -1, -1, -1, + -1, COLOR_BTNHIGHLIGHT, COLOR_BTNHIGHLIGHT, -1, + -1, COLOR_3DDKSHADOW, COLOR_3DDKSHADOW, -1, + -1, -1, -1, -1 }; static const signed char LTOuterNormal[] = { - -1, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, - COLOR_BTNHIGHLIGHT, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, - COLOR_3DDKSHADOW, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, - -1, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1 + -1, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, + COLOR_BTNHIGHLIGHT, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, + COLOR_3DDKSHADOW, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1, + -1, COLOR_3DLIGHT, COLOR_BTNSHADOW, -1 }; static const signed char RBInnerNormal[] = { - -1, -1, -1, -1, - -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, -1, - -1, COLOR_3DLIGHT, COLOR_3DLIGHT, -1, - -1, -1, -1, -1 + -1, -1, -1, -1, + -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, -1, + -1, COLOR_3DLIGHT, COLOR_3DLIGHT, -1, + -1, -1, -1, -1 }; static const signed char RBOuterNormal[] = { - -1, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, - COLOR_BTNSHADOW, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, - COLOR_3DLIGHT, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, - -1, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1 + -1, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, + COLOR_BTNSHADOW, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, + COLOR_3DLIGHT, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1, + -1, COLOR_3DDKSHADOW, COLOR_BTNHIGHLIGHT, -1 }; static const signed char LTInnerSoft[] = { - -1, -1, -1, -1, - -1, COLOR_3DLIGHT, COLOR_3DLIGHT, -1, - -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, -1, - -1, -1, -1, -1 + -1, -1, -1, -1, + -1, COLOR_3DLIGHT, COLOR_3DLIGHT, -1, + -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, -1, + -1, -1, -1, -1 }; static const signed char LTOuterSoft[] = { - -1, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, - COLOR_3DLIGHT, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, - COLOR_BTNSHADOW, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, - -1, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1 + -1, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, + COLOR_3DLIGHT, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, + COLOR_BTNSHADOW, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1, + -1, COLOR_BTNHIGHLIGHT, COLOR_3DDKSHADOW, -1 }; #define RBInnerSoft RBInnerNormal /* These are the same */ #define RBOuterSoft RBOuterNormal static const signed char LTRBOuterMono[] = { - -1, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, - COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, - COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, - COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, + -1, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, + COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, + COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, + COLOR_WINDOW, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, COLOR_WINDOWFRAME, }; static const signed char LTRBInnerMono[] = { - -1, -1, -1, -1, - -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, - -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, - -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, + -1, -1, -1, -1, + -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, + -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, + -1, COLOR_WINDOW, COLOR_WINDOW, COLOR_WINDOW, }; static const signed char LTRBOuterFlat[] = { - -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, - COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, - COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, - COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, + -1, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, + COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, + COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, + COLOR_BTNFACE, COLOR_BTNSHADOW, COLOR_BTNSHADOW, COLOR_BTNSHADOW, }; static const signed char LTRBInnerFlat[] = { - -1, -1, -1, -1, - -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, - -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, - -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, + -1, -1, -1, -1, + -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, + -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, + -1, COLOR_BTNFACE, COLOR_BTNFACE, COLOR_BTNFACE, }; /* FUNCTIONS *****************************************************************/ @@ -136,10 +136,10 @@ int Height= rc->bottom - rc->top; int SmallDiam = Width > Height ? Height : Width; BOOL retval = !( ((uType & BDR_INNER) == BDR_INNER - || (uType & BDR_OUTER) == BDR_OUTER) - && !(uFlags & (BF_FLAT|BF_MONO)) ); + || (uType & BDR_OUTER) == BDR_OUTER) + && !(uFlags & (BF_FLAT|BF_MONO)) ); int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) - + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); /* Init some vars */ OuterPen = InnerPen = (HPEN)GetStockObject(NULL_PEN); @@ -184,8 +184,10 @@ } } - if(InnerI != -1) InnerPen = GetSysColorPen(InnerI); - if(OuterI != -1) OuterPen = GetSysColorPen(OuterI); + if(InnerI != -1) + InnerPen = GetSysColorPen(InnerI); + if(OuterI != -1) + OuterPen = GetSysColorPen(OuterI); MoveToEx(hdc, 0, 0, &SavePoint); @@ -197,42 +199,42 @@ switch(uFlags & BF_RECT) { - case 0: - case BF_LEFT: - case BF_BOTTOM: - case BF_BOTTOMLEFT: - /* Left bottom endpoint */ - epx = rc->left-1; - spx = epx + SmallDiam; - epy = rc->bottom; - spy = epy - SmallDiam; - break; - - case BF_TOPLEFT: - case BF_BOTTOMRIGHT: - /* Left top endpoint */ - epx = rc->left-1; - spx = epx + SmallDiam; - epy = rc->top-1; - spy = epy + SmallDiam; - break; - - case BF_TOP: - case BF_RIGHT: - case BF_TOPRIGHT: - case BF_RIGHT|BF_LEFT: - case BF_RIGHT|BF_LEFT|BF_TOP: - case BF_BOTTOM|BF_TOP: - case BF_BOTTOM|BF_TOP|BF_LEFT: - case BF_BOTTOMRIGHT|BF_LEFT: - case BF_BOTTOMRIGHT|BF_TOP: - case BF_RECT: - /* Right top endpoint */ - spx = rc->left; - epx = spx + SmallDiam; - spy = rc->bottom-1; - epy = spy - SmallDiam; - break; + case 0: + case BF_LEFT: + case BF_BOTTOM: + case BF_BOTTOMLEFT: + /* Left bottom endpoint */ + epx = rc->left-1; + spx = epx + SmallDiam; + epy = rc->bottom; + spy = epy - SmallDiam; + break; + + case BF_TOPLEFT: + case BF_BOTTOMRIGHT: + /* Left top endpoint */ + epx = rc->left-1; + spx = epx + SmallDiam; + epy = rc->top-1; + spy = epy + SmallDiam; + break; + + case BF_TOP: + case BF_RIGHT: + case BF_TOPRIGHT: + case BF_RIGHT|BF_LEFT: + case BF_RIGHT|BF_LEFT|BF_TOP: + case BF_BOTTOM|BF_TOP: + case BF_BOTTOM|BF_TOP|BF_LEFT: + case BF_BOTTOMRIGHT|BF_LEFT: + case BF_BOTTOMRIGHT|BF_TOP: + case BF_RECT: + /* Right top endpoint */ + spx = rc->left; + epx = spx + SmallDiam; + spy = rc->bottom-1; + epy = spy - SmallDiam; + break; } MoveToEx(hdc, spx, spy, NULL); @@ -243,90 +245,90 @@ switch(uFlags & (BF_RECT|BF_DIAGONAL)) { - case BF_DIAGONAL_ENDBOTTOMLEFT: - case (BF_DIAGONAL|BF_BOTTOM): - case BF_DIAGONAL: - case (BF_DIAGONAL|BF_LEFT): - MoveToEx(hdc, spx-1, spy, NULL); - LineTo(hdc, epx, epy-1); - Points[0].x = spx-add; - Points[0].y = spy; - Points[1].x = rc->left; - Points[1].y = rc->top; - Points[2].x = epx+1; - Points[2].y = epy-1-add; - Points[3] = Points[2]; - break; - - case BF_DIAGONAL_ENDBOTTOMRIGHT: - MoveToEx(hdc, spx-1, spy, NULL); - LineTo(hdc, epx, epy+1); - Points[0].x = spx-add; - Points[0].y = spy; - Points[1].x = rc->left; - Points[1].y = rc->bottom-1; - Points[2].x = epx+1; - Points[2].y = epy+1+add; - Points[3] = Points[2]; - break; - - case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP): - case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP|BF_LEFT): - case BF_DIAGONAL_ENDTOPRIGHT: - case (BF_DIAGONAL|BF_RIGHT|BF_TOP|BF_LEFT): - MoveToEx(hdc, spx+1, spy, NULL); - LineTo(hdc, epx, epy+1); - Points[0].x = epx-1; - Points[0].y = epy+1+add; - Points[1].x = rc->right-1; - Points[1].y = rc->top+add; - Points[2].x = rc->right-1; - Points[2].y = rc->bottom-1; - Points[3].x = spx+add; - Points[3].y = spy; - break; - - case BF_DIAGONAL_ENDTOPLEFT: - MoveToEx(hdc, spx, spy-1, NULL); - LineTo(hdc, epx+1, epy); - Points[0].x = epx+1+add; - Points[0].y = epy+1; - Points[1].x = rc->right-1; - Points[1].y = rc->top; - Points[2].x = rc->right-1; - Points[2].y = rc->bottom-1-add; - Points[3].x = spx; - Points[3].y = spy-add; - break; - - case (BF_DIAGONAL|BF_TOP): - case (BF_DIAGONAL|BF_BOTTOM|BF_TOP): - case (BF_DIAGONAL|BF_BOTTOM|BF_TOP|BF_LEFT): - MoveToEx(hdc, spx+1, spy-1, NULL); - LineTo(hdc, epx, epy); - Points[0].x = epx-1; - Points[0].y = epy+1; - Points[1].x = rc->right-1; - Points[1].y = rc->top; - Points[2].x = rc->right-1; - Points[2].y = rc->bottom-1-add; - Points[3].x = spx+add; - Points[3].y = spy-add; - break; - - case (BF_DIAGONAL|BF_RIGHT): - case (BF_DIAGONAL|BF_RIGHT|BF_LEFT): - case (BF_DIAGONAL|BF_RIGHT|BF_LEFT|BF_BOTTOM): - MoveToEx(hdc, spx, spy, NULL); - LineTo(hdc, epx-1, epy+1); - Points[0].x = spx; - Points[0].y = spy; - Points[1].x = rc->left; - Points[1].y = rc->top+add; - Points[2].x = epx-1-add; - Points[2].y = epy+1+add; - Points[3] = Points[2]; - break; + case BF_DIAGONAL_ENDBOTTOMLEFT: + case (BF_DIAGONAL|BF_BOTTOM): + case BF_DIAGONAL: + case (BF_DIAGONAL|BF_LEFT): + MoveToEx(hdc, spx-1, spy, NULL); + LineTo(hdc, epx, epy-1); + Points[0].x = spx-add; + Points[0].y = spy; + Points[1].x = rc->left; + Points[1].y = rc->top; + Points[2].x = epx+1; + Points[2].y = epy-1-add; + Points[3] = Points[2]; + break; + + case BF_DIAGONAL_ENDBOTTOMRIGHT: + MoveToEx(hdc, spx-1, spy, NULL); + LineTo(hdc, epx, epy+1); + Points[0].x = spx-add; + Points[0].y = spy; + Points[1].x = rc->left; + Points[1].y = rc->bottom-1; + Points[2].x = epx+1; + Points[2].y = epy+1+add; + Points[3] = Points[2]; + break; + + case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP): + case (BF_DIAGONAL|BF_BOTTOM|BF_RIGHT|BF_TOP|BF_LEFT): + case BF_DIAGONAL_ENDTOPRIGHT: + case (BF_DIAGONAL|BF_RIGHT|BF_TOP|BF_LEFT): + MoveToEx(hdc, spx+1, spy, NULL); + LineTo(hdc, epx, epy+1); + Points[0].x = epx-1; + Points[0].y = epy+1+add; + Points[1].x = rc->right-1; + Points[1].y = rc->top+add; + Points[2].x = rc->right-1; + Points[2].y = rc->bottom-1; + Points[3].x = spx+add; + Points[3].y = spy; + break; + + case BF_DIAGONAL_ENDTOPLEFT: + MoveToEx(hdc, spx, spy-1, NULL); + LineTo(hdc, epx+1, epy); + Points[0].x = epx+1+add; + Points[0].y = epy+1; + Points[1].x = rc->right-1; + Points[1].y = rc->top; + Points[2].x = rc->right-1; + Points[2].y = rc->bottom-1-add; + Points[3].x = spx; + Points[3].y = spy-add; + break; + + case (BF_DIAGONAL|BF_TOP): + case (BF_DIAGONAL|BF_BOTTOM|BF_TOP): + case (BF_DIAGONAL|BF_BOTTOM|BF_TOP|BF_LEFT): + MoveToEx(hdc, spx+1, spy-1, NULL); + LineTo(hdc, epx, epy); + Points[0].x = epx-1; + Points[0].y = epy+1; + Points[1].x = rc->right-1; + Points[1].y = rc->top; + Points[2].x = rc->right-1; + Points[2].y = rc->bottom-1-add; + Points[3].x = spx+add; + Points[3].y = spy-add; + break; + + case (BF_DIAGONAL|BF_RIGHT): + case (BF_DIAGONAL|BF_RIGHT|BF_LEFT): + case (BF_DIAGONAL|BF_RIGHT|BF_LEFT|BF_BOTTOM): + MoveToEx(hdc, spx, spy, NULL); + LineTo(hdc, epx-1, epy+1); + Points[0].x = spx; + Points[0].y = spy; + Points[1].x = rc->left; + Points[1].y = rc->top+add; + Points[2].x = epx-1-add; + Points[2].y = epy+1+add; + Points[3] = Points[2]; + break; } /* Fill the interior if asked */ @@ -346,10 +348,14 @@ /* Adjust rectangle if asked */ if(uFlags & BF_ADJUST) { - if(uFlags & BF_LEFT) rc->left += add; - if(uFlags & BF_RIGHT) rc->right -= add; - if(uFlags & BF_TOP) rc->top += add; - if(uFlags & BF_BOTTOM) rc->bottom -= add; + if(uFlags & BF_LEFT) + rc->left += add; + if(uFlags & BF_RIGHT) + rc->right -= add; + if(uFlags & BF_TOP) + rc->top += add; + if(uFlags & BF_BOTTOM) + rc->bottom -= add; } /* Cleanup */ @@ -443,8 +449,8 @@ int RTpenplus = 0; int RBpenplus = 0; BOOL retval = !( ((uType & BDR_INNER) == BDR_INNER - || (uType & BDR_OUTER) == BDR_OUTER) - && !(uFlags & (BF_FLAT|BF_MONO)) ); + || (uType & BDR_OUTER) == BDR_OUTER) + && !(uFlags & (BF_FLAT|BF_MONO)) ); /* Init some vars */ LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)GetStockObject(NULL_PEN); SavePen = (HPEN)SelectObject(hdc, LTInnerPen); @@ -462,12 +468,12 @@ /* Bertho Stultiens states above that this function exactly matches win95 * In win98 BF_FLAT rectangles have an inner border same color as the - * middle (COLOR_BTNFACE). I believe it's the same for win95 but since - * I don't know I go with Bertho and just sets it for win98 until proven - * otherwise. - * Dennis BjÃ¶rklund, 10 June, 99 - */ - if( LTInnerI != -1 ) + * middle (COLOR_BTNFACE). I believe it's the same for win95 but since + * I don't know I go with Bertho and just sets it for win98 until proven + * otherwise. + * Dennis BjÃ¶rklund, 10 June, 99 + */ + if( LTInnerI != -1 ) LTInnerI = RBInnerI = COLOR_BTNFACE; } else if(uFlags & BF_SOFT) @@ -485,20 +491,28 @@ RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; } - if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) LBpenplus = 1; - if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) RTpenplus = 1; - if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) RBpenplus = 1; - if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) LTpenplus = 1; - - if(LTInnerI != -1) LTInnerPen = GetSysColorPen(LTInnerI); - if(LTOuterI != -1) LTOuterPen = GetSysColorPen(LTOuterI); - if(RBInnerI != -1) RBInnerPen = GetSysColorPen(RBInnerI); - if(RBOuterI != -1) RBOuterPen = GetSysColorPen(RBOuterI); + if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) + LBpenplus = 1; + if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) + RTpenplus = 1; + if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) + RBpenplus = 1; + if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) + LTpenplus = 1; + + if(LTInnerI != -1) + LTInnerPen = GetSysColorPen(LTInnerI); + if(LTOuterI != -1) + LTOuterPen = GetSysColorPen(LTOuterI); + if(RBInnerI != -1) + RBInnerPen = GetSysColorPen(RBInnerI); + if(RBOuterI != -1) + RBOuterPen = GetSysColorPen(RBOuterI); if((uFlags & BF_MIDDLE) && retval) - { - FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ? - COLOR_WINDOW : COLOR_BTNFACE)); - } + { + FillRect(hdc, &InnerRect, GetSysColorBrush(uFlags & BF_MONO ? + COLOR_WINDOW : COLOR_BTNFACE)); + } MoveToEx(hdc, 0, 0, &SavePoint); /* Draw the outer edge */ @@ -552,15 +566,19 @@ if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) ) { int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) - + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); - - if(uFlags & BF_LEFT) InnerRect.left += add; - if(uFlags & BF_RIGHT) InnerRect.right -= add; - if(uFlags & BF_TOP) InnerRect.top += add; - if(uFlags & BF_BOTTOM) InnerRect.bottom -= add; - - if(uFlags & BF_ADJUST) - *rc = InnerRect; + + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); + + if(uFlags & BF_LEFT) + InnerRect.left += add; + if(uFlags & BF_RIGHT) + InnerRect.right -= add; + if(uFlags & BF_TOP) + InnerRect.top += add; + if(uFlags & BF_BOTTOM) + InnerRect.bottom -= add; + + if(uFlags & BF_ADJUST) + *rc = InnerRect; } /* Cleanup */ @@ -591,7 +609,7 @@ dst->right = dst->left + SmallDiam; } - return SmallDiam; + return SmallDiam; } /* Ported from WINE20020904 */ @@ -599,19 +617,19 @@ { if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255)) { - HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55); - HBRUSH hbsave; - HBRUSH hb = CreatePatternBrush(hbm); - COLORREF bg; - - FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); - bg = SetBkColor(dc, RGB(255, 255, 255)); - hbsave = (HBRUSH)SelectObject(dc, hb); - PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); - SelectObject(dc, hbsave); - SetBkColor(dc, bg); - DeleteObject(hb); - DeleteObject(hbm); + HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55); + HBRUSH hbsave; + HBRUSH hb = CreatePatternBrush(hbm); + COLORREF bg; + + FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); + bg = SetBkColor(dc, RGB(255, 255, 255)); + hbsave = (HBRUSH)SelectObject(dc, hb); + PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); + SelectObject(dc, hbsave); + SetBkColor(dc, bg); + DeleteObject(hb); + DeleteObject(hbm); } else { @@ -683,8 +701,10 @@ UINT flags = BF_RECT | BF_ADJUST; UITOOLS_MakeSquareRect(r, &myr); - if(uFlags & DFCS_FLAT) flags |= BF_FLAT; - else if(uFlags & DFCS_MONO) flags |= BF_MONO; + if(uFlags & DFCS_FLAT) + flags |= BF_FLAT; + else if(uFlags & DFCS_MONO) + flags |= BF_MONO; IntDrawRectEdge( dc, &myr, EDGE_SUNKEN, flags ); @@ -701,18 +721,18 @@ { int i, k; i = (uFlags & DFCS_INACTIVE) || (uFlags & 0xff) == DFCS_BUTTON3STATE ? - COLOR_BTNSHADOW : COLOR_WINDOWTEXT; + COLOR_BTNSHADOW : COLOR_WINDOWTEXT; /* draw 7 bars, with h=3w to form the check */ bar.left = myr.left; - bar.top = myr.top + 2; + bar.top = myr.top + 2; for (k = 0; k < 7; k++) { bar.left = bar.left + 1; - bar.top = (k < 3) ? bar.top + 1 : bar.top - 1; - bar.bottom = bar.top + 3; - bar.right = bar.left + 1; + bar.top = (k < 3) ? bar.top + 1 : bar.top - 1; + bar.bottom = bar.top + 3; + bar.right = bar.left + 1; FillRect(dc, &bar, GetSysColorBrush(i)); - } + } } return TRUE; } @@ -801,21 +821,21 @@ { switch(uState & 0xff) { - case DFCS_BUTTONPUSH: - return UITOOLS95_DFC_ButtonPush(hdc, rc, uState); - - case DFCS_BUTTONCHECK: - case DFCS_BUTTON3STATE: - return UITOOLS95_DFC_ButtonCheck(hdc, rc, uState); - - case DFCS_BUTTONRADIOIMAGE: - case DFCS_BUTTONRADIOMASK: - case DFCS_BUTTONRADIO: - return UITOOLS95_DFC_ButtonRadio(hdc, rc, uState); + case DFCS_BUTTONPUSH: + return UITOOLS95_DFC_ButtonPush(hdc, rc, uState); + + case DFCS_BUTTONCHECK: + case DFCS_BUTTON3STATE: + return UITOOLS95_DFC_ButtonCheck(hdc, rc, uState); + + case DFCS_BUTTONRADIOIMAGE: + case DFCS_BUTTONRADIOMASK: + case DFCS_BUTTONRADIO: + return UITOOLS95_DFC_ButtonRadio(hdc, rc, uState); /* - default: - DbgPrint("Invalid button state=0x%04x\n", uState); + default: + DbgPrint("Invalid button state=0x%04x\n", uState); */ } @@ -846,102 +866,102 @@ COLORREF clrsave; SIZE size; - if(uFlags & DFCS_PUSHED) - IntDrawRectEdge(dc,r,EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_SOFT); + if(uFlags & DFCS_PUSHED) + IntDrawRectEdge(dc,r,EDGE_SUNKEN, BF_RECT | BF_MIDDLE | BF_SOFT); else - IntDrawRectEdge(dc,r,BDR_RAISEDINNER | BDR_RAISEDOUTER, BF_RECT | - BF_SOFT | BF_MIDDLE); + IntDrawRectEdge(dc,r,BDR_RAISEDINNER | BDR_RAISEDOUTER, BF_RECT | + BF_SOFT | BF_MIDDLE); switch(uFlags & 0xff) { - case DFCS_CAPTIONCLOSE: - { - /* The "X" is made by drawing a series of lines. - * The number of lines drawn depends on the size - * of the bounding rect. e.g. For a 6x5 inside rect, - * two lines are drawn from top-left to bottom-right, - * and two lines from top-right to bottom-left. - * - * 0 1 2 3 4 5 0 1 2 3 4 5 - * 1 * * * * - * 2 * * * * - * 3 * * * * - * 4 * * * * - * - * Drawing one line for every 6 pixels in width - * seems to provide the best proportions. - */ - - POINT start, oldPos; - INT width = myr.right - (++myr.left) - 5; - INT height = (--myr.bottom) - myr.top - 6; - INT numLines = (width / 6) + 1; - - hpsave = (HPEN)SelectObject(dc, GetSysColorPen(colorIdx)); - - start.x = myr.left + 2; - start.y = myr.top + 2; - - if (width < 6) - height = width; - else - start.y++; - - if (uFlags & DFCS_PUSHED) + case DFCS_CAPTIONCLOSE: { - start.x++; - start.y++; + /* The "X" is made by drawing a series of lines. + * The number of lines drawn depends on the size + * of the bounding rect. e.g. For a 6x5 inside rect, + * two lines are drawn from top-left to bottom-right, + * and two lines from top-right to bottom-left. + * + * 0 1 2 3 4 5 0 1 2 3 4 5 + * 1 * * * * + * 2 * * * * + * 3 * * * * + * 4 * * * * + * + * Drawing one line for every 6 pixels in width + * seems to provide the best proportions. + */ + + POINT start, oldPos; + INT width = myr.right - (++myr.left) - 5; + INT height = (--myr.bottom) - myr.top - 6; + INT numLines = (width / 6) + 1; + + hpsave = (HPEN)SelectObject(dc, GetSysColorPen(colorIdx)); + + start.x = myr.left + 2; + start.y = myr.top + 2; + + if (width < 6) + height = width; + else + start.y++; + + if (uFlags & DFCS_PUSHED) + { + start.x++; + start.y++; + } + + /* now use the width of each line */ + width -= numLines - 1; + + for (i = 0; i < numLines; i++) + { + MoveToEx(dc, start.x + i, start.y, &oldPos); + LineTo(dc, start.x + i + width, start.y + height); + + MoveToEx(dc, start.x + i, start.y + height - 1, &oldPos); + LineTo(dc, start.x + i + width, start.y - 1); + } + + SelectObject(dc, hpsave); + return TRUE; } - /* now use the width of each line */ - width -= numLines - 1; - - for (i = 0; i < numLines; i++) - { - MoveToEx(dc, start.x + i, start.y, &oldPos); - LineTo(dc, start.x + i + width, start.y + height); - - MoveToEx(dc, start.x + i, start.y + height - 1, &oldPos); - LineTo(dc, start.x + i + width, start.y - 1); - } - - SelectObject(dc, hpsave); - return TRUE; - } - - case DFCS_CAPTIONHELP: - /* This one breaks the flow */ - /* FIXME: We need the Marlett font in order to get this right. */ - - hf = CreateFontA(-SmallDiam, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, "System"); - alignsave = SetTextAlign(dc, TA_TOP|TA_LEFT); - bksave = SetBkMode(dc, TRANSPARENT); - clrsave = GetTextColor(dc); - hfsave = (HFONT)SelectObject(dc, hf); - GetTextExtentPoint32A(dc, str, 1, &size); - - if(uFlags & DFCS_INACTIVE) - { - SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); - TextOutA(dc, xc-size.cx/2+1, yc-size.cy/2+1, str, 1); - } - SetTextColor(dc, GetSysColor(colorIdx)); - TextOutA(dc, xc-size.cx/2, yc-size.cy/2, str, 1); - - SelectObject(dc, hfsave); - SetTextColor(dc, clrsave); - SetBkMode(dc, bksave); - SetTextAlign(dc, alignsave); - DeleteObject(hf); - return TRUE; - - case DFCS_CAPTIONMIN: - /* - * If the button goes from x 0 -- w-1, the leftmost point of the - * minimize line always starts at x>=4. - */ + case DFCS_CAPTIONHELP: + /* This one breaks the flow */ + /* FIXME: We need the Marlett font in order to get this right. */ + + hf = CreateFontA(-SmallDiam, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, "System"); + alignsave = SetTextAlign(dc, TA_TOP|TA_LEFT); + bksave = SetBkMode(dc, TRANSPARENT); + clrsave = GetTextColor(dc); + hfsave = (HFONT)SelectObject(dc, hf); + GetTextExtentPoint32A(dc, str, 1, &size); + + if(uFlags & DFCS_INACTIVE) + { + SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); + TextOutA(dc, xc-size.cx/2+1, yc-size.cy/2+1, str, 1); + } + SetTextColor(dc, GetSysColor(colorIdx)); + TextOutA(dc, xc-size.cx/2, yc-size.cy/2, str, 1); + + SelectObject(dc, hfsave); + SetTextColor(dc, clrsave); + SetBkMode(dc, bksave); + SetTextAlign(dc, alignsave); + DeleteObject(hf); + return TRUE; + + case DFCS_CAPTIONMIN: + /* + * If the button goes from x 0 -- w-1, the leftmost point of the + * minimize line always starts at x>=4. + */ { const int width = myr.right - myr.left; const int xInsetPixels = (width>=9 ? width - 9 : 0) / 8 + 4; @@ -954,54 +974,54 @@ } break; - case DFCS_CAPTIONMAX: - edge = 47*SmallDiam/750; - Line1[0].x = Line1[5].x = myr.left + 57*SmallDiam/750+3; - Line1[0].y = Line1[1].y = myr.top + 143*SmallDiam/750+1; - Line1[1].x = Line1[2].x = Line1[0].x + 562*SmallDiam/750; - Line1[5].y = Line1[4].y = Line1[0].y + 93*SmallDiam/750; - Line1[2].y = Line1[3].y = Line1[0].y + 513*SmallDiam/750; - Line1[3].x = Line1[4].x = Line1[1].x - edge; - - Line2[0].x = Line2[5].x = Line1[0].x; - Line2[3].x = Line2[4].x = Line1[1].x; - Line2[1].x = Line2[2].x = Line1[0].x + edge; - Line2[0].y = Line2[1].y = Line1[0].y; - Line2[4].y = Line2[5].y = Line1[2].y; - Line2[2].y = Line2[3].y = Line1[2].y - edge; - Line1N = 6; - Line2N = 6; - break; - - case DFCS_CAPTIONRESTORE: - /* FIXME: this one looks bad at small sizes < 15x15 :( */ - edge = 47*SmallDiam/750; - move = 420*SmallDiam/750; - Line1[0].x = Line1[9].x = myr.left + 198*SmallDiam/750+2; - Line1[0].y = Line1[1].y = myr.top + 169*SmallDiam/750+1; - Line1[6].y = Line1[7].y = Line1[0].y + 93*SmallDiam/750; - Line1[7].x = Line1[8].x = Line1[0].x + edge; - Line1[1].x = Line1[2].x = Line1[0].x + move; - Line1[5].x = Line1[6].x = Line1[1].x - edge; - Line1[9].y = Line1[8].y = Line1[0].y + 187*SmallDiam/750; - Line1[2].y = Line1[3].y = Line1[0].y + 327*SmallDiam/750; - Line1[4].y = Line1[5].y = Line1[2].y - edge; - Line1[3].x = Line1[4].x = Line1[2].x - 140*SmallDiam/750; - - Line2[1].x = Line2[2].x = Line1[3].x; - Line2[7].x = Line2[8].x = Line2[1].x - edge; - Line2[0].x = Line2[9].x = Line2[3].x = Line2[4].x = Line2[1].x - move; - Line2[5].x = Line2[6].x = Line2[0].x + edge; - Line2[0].y = Line2[1].y = Line1[9].y + 93*SmallDiam/750; - Line2[4].y = Line2[5].y = Line2[8].y = Line2[9].y = Line2[0].y + 93*SmallDiam/750; - Line2[2].y = Line2[3].y = Line2[0].y + 327*SmallDiam/750; - Line2[6].y = Line2[7].y = Line2[2].y - edge; - Line1N = 10; - Line2N = 10; - break; - - default: - return FALSE; + case DFCS_CAPTIONMAX: + edge = 47*SmallDiam/750; + Line1[0].x = Line1[5].x = myr.left + 57*SmallDiam/750+3; + Line1[0].y = Line1[1].y = myr.top + 143*SmallDiam/750+1; + Line1[1].x = Line1[2].x = Line1[0].x + 562*SmallDiam/750; + Line1[5].y = Line1[4].y = Line1[0].y + 93*SmallDiam/750; + Line1[2].y = Line1[3].y = Line1[0].y + 513*SmallDiam/750; + Line1[3].x = Line1[4].x = Line1[1].x - edge; + + Line2[0].x = Line2[5].x = Line1[0].x; + Line2[3].x = Line2[4].x = Line1[1].x; + Line2[1].x = Line2[2].x = Line1[0].x + edge; + Line2[0].y = Line2[1].y = Line1[0].y; + Line2[4].y = Line2[5].y = Line1[2].y; + Line2[2].y = Line2[3].y = Line1[2].y - edge; + Line1N = 6; + Line2N = 6; + break; + + case DFCS_CAPTIONRESTORE: + /* FIXME: this one looks bad at small sizes < 15x15 :( */ + edge = 47*SmallDiam/750; + move = 420*SmallDiam/750; + Line1[0].x = Line1[9].x = myr.left + 198*SmallDiam/750+2; + Line1[0].y = Line1[1].y = myr.top + 169*SmallDiam/750+1; + Line1[6].y = Line1[7].y = Line1[0].y + 93*SmallDiam/750; + Line1[7].x = Line1[8].x = Line1[0].x + edge; + Line1[1].x = Line1[2].x = Line1[0].x + move; + Line1[5].x = Line1[6].x = Line1[1].x - edge; + Line1[9].y = Line1[8].y = Line1[0].y + 187*SmallDiam/750; + Line1[2].y = Line1[3].y = Line1[0].y + 327*SmallDiam/750; + Line1[4].y = Line1[5].y = Line1[2].y - edge; + Line1[3].x = Line1[4].x = Line1[2].x - 140*SmallDiam/750; + + Line2[1].x = Line2[2].x = Line1[3].x; + Line2[7].x = Line2[8].x = Line2[1].x - edge; + Line2[0].x = Line2[9].x = Line2[3].x = Line2[4].x = Line2[1].x - move; + Line2[5].x = Line2[6].x = Line2[0].x + edge; + Line2[0].y = Line2[1].y = Line1[9].y + 93*SmallDiam/750; + Line2[4].y = Line2[5].y = Line2[8].y = Line2[9].y = Line2[0].y + 93*SmallDiam/750; + Line2[2].y = Line2[3].y = Line2[0].y + 327*SmallDiam/750; + Line2[6].y = Line2[7].y = Line2[2].y - edge; + Line1N = 10; + Line2N = 10; + break; + + default: + return FALSE; } /* Here the drawing takes place */ @@ -1062,128 +1082,128 @@ * Making sure that the arrow is as least 3 pixels wide (or high). */ if (tri == 0) - tri = 1; + tri = 1; switch(uFlags & 0xff) { - case DFCS_SCROLLCOMBOBOX: - case DFCS_SCROLLDOWN: - Line[2].x = myr.left + 470*SmallDiam/1000 + 2; - Line[2].y = myr.top + 687*SmallDiam/1000 + 1; - Line[0].x = Line[2].x - tri; - Line[1].x = Line[2].x + tri; - Line[0].y = Line[1].y = Line[2].y - tri; - break; - - case DFCS_SCROLLUP: - Line[2].x = myr.left + 470*SmallDiam/1000 + 2; - Line[2].y = myr.bottom - (687*SmallDiam/1000 + 1); - Line[0].x = Line[2].x - tri; - Line[1].x = Line[2].x + tri; - Line[0].y = Line[1].y = Line[2].y + tri; - break; - - case DFCS_SCROLLLEFT: - Line[2].x = myr.right - (687*SmallDiam/1000 + 1); - Line[2].y = myr.top + 470*SmallDiam/1000 + 2; - Line[0].y = Line[2].y - tri; - Line[1].y = Line[2].y + tri; - Line[0].x = Line[1].x = Line[2].x + tri; - break; - - case DFCS_SCROLLRIGHT: - Line[2].x = myr.left + 687*SmallDiam/1000 + 1; - Line[2].y = myr.top + 470*SmallDiam/1000 + 2; - Line[0].y = Line[2].y - tri; - Line[1].y = Line[2].y + tri; - Line[0].x = Line[1].x = Line[2].x - tri; - break; - - case DFCS_SCROLLSIZEGRIP: - /* This one breaks the flow... */ - IntDrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); - hpsave = (HPEN)SelectObject(dc, GetStockObject(NULL_PEN)); - hbsave = (HBRUSH)SelectObject(dc, GetStockObject(NULL_BRUSH)); - if(uFlags & (DFCS_MONO|DFCS_FLAT)) - { - hp = hp2 = GetSysColorPen(COLOR_WINDOWFRAME); - hb = hb2 = GetSysColorBrush(COLOR_WINDOWFRAME); - } - else - { - hp = GetSysColorPen(COLOR_BTNHIGHLIGHT); - hp2 = GetSysColorPen(COLOR_BTNSHADOW); - hb = GetSysColorBrush(COLOR_BTNHIGHLIGHT); - hb2 = GetSysColorBrush(COLOR_BTNSHADOW); - } - Line[0].x = Line[1].x = r->right-1; - Line[2].y = Line[3].y = r->bottom-1; - d46 = 46*SmallDiam/750; - d93 = 93*SmallDiam/750; - - i = 586*SmallDiam/750; - Line[0].y = r->bottom - i - 1; - Line[3].x = r->right - i - 1; - Line[1].y = Line[0].y + d46; - Line[2].x = Line[3].x + d46; - SelectObject(dc, hb); - SelectObject(dc, hp); - Polygon(dc, Line, 4); - - Line[1].y++; Line[2].x++; - Line[0].y = Line[1].y + d93; - Line[3].x = Line[2].x + d93; - SelectObject(dc, hb2); - SelectObject(dc, hp2); - Polygon(dc, Line, 4); - - i = 398*SmallDiam/750; - Line[0].y = r->bottom - i - 1; - Line[3].x = r->right - i - 1; - Line[1].y = Line[0].y + d46; - Line[2].x = Line[3].x + d46; - SelectObject(dc, hb); - SelectObject(dc, hp); - Polygon(dc, Line, 4); - - Line[1].y++; Line[2].x++; - Line[0].y = Line[1].y + d93; - Line[3].x = Line[2].x + d93; - SelectObject(dc, hb2); - SelectObject(dc, hp2); - Polygon(dc, Line, 4); - - i = 210*SmallDiam/750; - Line[0].y = r->bottom - i - 1; - Line[3].x = r->right - i - 1; - Line[1].y = Line[0].y + d46; - Line[2].x = Line[3].x + d46; - SelectObject(dc, hb); - SelectObject(dc, hp); - Polygon(dc, Line, 4); - - Line[1].y++; Line[2].x++; - Line[0].y = Line[1].y + d93; - Line[3].x = Line[2].x + d93; - SelectObject(dc, hb2); - SelectObject(dc, hp2); - Polygon(dc, Line, 4); - - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); - return TRUE; - - default: - return FALSE; + case DFCS_SCROLLCOMBOBOX: + case DFCS_SCROLLDOWN: + Line[2].x = myr.left + 470*SmallDiam/1000 + 2; + Line[2].y = myr.top + 687*SmallDiam/1000 + 1; + Line[0].x = Line[2].x - tri; + Line[1].x = Line[2].x + tri; + Line[0].y = Line[1].y = Line[2].y - tri; + break; + + case DFCS_SCROLLUP: + Line[2].x = myr.left + 470*SmallDiam/1000 + 2; + Line[2].y = myr.bottom - (687*SmallDiam/1000 + 1); + Line[0].x = Line[2].x - tri; + Line[1].x = Line[2].x + tri; + Line[0].y = Line[1].y = Line[2].y + tri; + break; + + case DFCS_SCROLLLEFT: + Line[2].x = myr.right - (687*SmallDiam/1000 + 1); + Line[2].y = myr.top + 470*SmallDiam/1000 + 2; + Line[0].y = Line[2].y - tri; + Line[1].y = Line[2].y + tri; + Line[0].x = Line[1].x = Line[2].x + tri; + break; + + case DFCS_SCROLLRIGHT: + Line[2].x = myr.left + 687*SmallDiam/1000 + 1; + Line[2].y = myr.top + 470*SmallDiam/1000 + 2; + Line[0].y = Line[2].y - tri; + Line[1].y = Line[2].y + tri; + Line[0].x = Line[1].x = Line[2].x - tri; + break; + + case DFCS_SCROLLSIZEGRIP: + /* This one breaks the flow... */ + IntDrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); + hpsave = (HPEN)SelectObject(dc, GetStockObject(NULL_PEN)); + hbsave = (HBRUSH)SelectObject(dc, GetStockObject(NULL_BRUSH)); + if(uFlags & (DFCS_MONO|DFCS_FLAT)) + { + hp = hp2 = GetSysColorPen(COLOR_WINDOWFRAME); + hb = hb2 = GetSysColorBrush(COLOR_WINDOWFRAME); + } + else + { + hp = GetSysColorPen(COLOR_BTNHIGHLIGHT); + hp2 = GetSysColorPen(COLOR_BTNSHADOW); + hb = GetSysColorBrush(COLOR_BTNHIGHLIGHT); + hb2 = GetSysColorBrush(COLOR_BTNSHADOW); + } + Line[0].x = Line[1].x = r->right-1; + Line[2].y = Line[3].y = r->bottom-1; + d46 = 46*SmallDiam/750; + d93 = 93*SmallDiam/750; + + i = 586*SmallDiam/750; + Line[0].y = r->bottom - i - 1; + Line[3].x = r->right - i - 1; + Line[1].y = Line[0].y + d46; + Line[2].x = Line[3].x + d46; + SelectObject(dc, hb); + SelectObject(dc, hp); + Polygon(dc, Line, 4); + + Line[1].y++; Line[2].x++; + Line[0].y = Line[1].y + d93; + Line[3].x = Line[2].x + d93; + SelectObject(dc, hb2); + SelectObject(dc, hp2); + Polygon(dc, Line, 4); + + i = 398*SmallDiam/750; + Line[0].y = r->bottom - i - 1; + Line[3].x = r->right - i - 1; + Line[1].y = Line[0].y + d46; + Line[2].x = Line[3].x + d46; + SelectObject(dc, hb); + SelectObject(dc, hp); + Polygon(dc, Line, 4); + + Line[1].y++; Line[2].x++; + Line[0].y = Line[1].y + d93; + Line[3].x = Line[2].x + d93; + SelectObject(dc, hb2); + SelectObject(dc, hp2); + Polygon(dc, Line, 4); + + i = 210*SmallDiam/750; + Line[0].y = r->bottom - i - 1; + Line[3].x = r->right - i - 1; + Line[1].y = Line[0].y + d46; + Line[2].x = Line[3].x + d46; + SelectObject(dc, hb); + SelectObject(dc, hp); + Polygon(dc, Line, 4); + + Line[1].y++; Line[2].x++; + Line[0].y = Line[1].y + d93; + Line[3].x = Line[2].x + d93; + SelectObject(dc, hb2); + SelectObject(dc, hp2); + Polygon(dc, Line, 4); + + SelectObject(dc, hpsave); + SelectObject(dc, hbsave); + return TRUE; + + default: + return FALSE; } /* Here do the real scroll-bar controls end up */ if( ! (uFlags & (0xff00 & ~DFCS_ADJUSTRECT)) ) - /* UITOOLS95_DFC_ButtonPush always uses BF_SOFT which we don't */ - /* want for the normal scroll-arrow button. */ - IntDrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT); + /* UITOOLS95_DFC_ButtonPush always uses BF_SOFT which we don't */ + /* want for the normal scroll-arrow button. */ + IntDrawRectEdge( dc, r, EDGE_RAISED, (uFlags&DFCS_ADJUSTRECT) | BF_MIDDLE | BF_RECT); else - UITOOLS95_DFC_ButtonPush(dc, r, (uFlags & 0xff00) ); + UITOOLS95_DFC_ButtonPush(dc, r, (uFlags & 0xff00) ); if(uFlags & DFCS_INACTIVE) { @@ -1195,11 +1215,11 @@ } if( (uFlags & DFCS_INACTIVE) || !(uFlags & DFCS_PUSHED) ) - for(i = 0; i < 3; i++) - { - Line[i].x--; - Line[i].y--; - } + for(i = 0; i < 3; i++) + { + Line[i].x--; + Line[i].y--; + } i = uFlags & DFCS_INACTIVE ? COLOR_BTNSHADOW : COLOR_BTNTEXT; hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i)); @@ -1237,52 +1257,52 @@ switch(uFlags & 0xff) { - case DFCS_MENUARROW: - i = 187*SmallDiam/750; - Points[2].x = myr.left + 468*SmallDiam/750; - Points[2].y = myr.top + 352*SmallDiam/750+1; - Points[0].y = Points[2].y - i; - Points[1].y = Points[2].y + i; - Points[0].x = Points[1].x = Points[2].x - i; - Polygon(dc, Points, 3); - break; - - case DFCS_MENUBULLET: - xe = myr.left; - ye = myr.top + SmallDiam - SmallDiam/2; - xc = myr.left + SmallDiam - SmallDiam/2; - yc = myr.top + SmallDiam - SmallDiam/2; - i = 234*SmallDiam/750; - i = i < 1 ? 1 : i; - myr.left = xc - i+i/2; - myr.right = xc + i/2; - myr.top = yc - i+i/2; - myr.bottom = yc + i/2; - Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye); - break; - - case DFCS_MENUCHECK: - Points[0].x = myr.left + 253*SmallDiam/1000; - Points[0].y = myr.top + 445*SmallDiam/1000; - Points[1].x = myr.left + 409*SmallDiam/1000; - Points[1].y = Points[0].y + (Points[1].x-Points[0].x); - Points[2].x = myr.left + 690*SmallDiam/1000; - Points[2].y = Points[1].y - (Points[2].x-Points[1].x); - Points[3].x = Points[2].x; - Points[3].y = Points[2].y + 3*SmallDiam/16; - Points[4].x = Points[1].x; - Points[4].y = Points[1].y + 3*SmallDiam/16; - Points[5].x = Points[0].x; - Points[5].y = Points[0].y + 3*SmallDiam/16; - Polygon(dc, Points, 6); - break; - - default: + case DFCS_MENUARROW: + i = 187*SmallDiam/750; + Points[2].x = myr.left + 468*SmallDiam/750; + Points[2].y = myr.top + 352*SmallDiam/750+1; + Points[0].y = Points[2].y - i; + Points[1].y = Points[2].y + i; + Points[0].x = Points[1].x = Points[2].x - i; + Polygon(dc, Points, 3); + break; + + case DFCS_MENUBULLET: + xe = myr.left; + ye = myr.top + SmallDiam - SmallDiam/2; + xc = myr.left + SmallDiam - SmallDiam/2; + yc = myr.top + SmallDiam - SmallDiam/2; + i = 234*SmallDiam/750; + i = i < 1 ? 1 : i; + myr.left = xc - i+i/2; + myr.right = xc + i/2; + myr.top = yc - i+i/2; + myr.bottom = yc + i/2; + Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye); + break; + + case DFCS_MENUCHECK: + Points[0].x = myr.left + 253*SmallDiam/1000; + Points[0].y = myr.top + 445*SmallDiam/1000; + Points[1].x = myr.left + 409*SmallDiam/1000; + Points[1].y = Points[0].y + (Points[1].x-Points[0].x); + Points[2].x = myr.left + 690*SmallDiam/1000; + Points[2].y = Points[1].y - (Points[2].x-Points[1].x); + Points[3].x = Points[2].x; + Points[3].y = Points[2].y + 3*SmallDiam/16; + Points[4].x = Points[1].x; + Points[4].y = Points[1].y + 3*SmallDiam/16; + Points[5].x = Points[0].x; + Points[5].y = Points[0].y + 3*SmallDiam/16; + Polygon(dc, Points, 6); + break; + + default: /* - DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); + DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); */ - retval = FALSE; - break; + retval = FALSE; + break; } SelectObject(dc, hpsave); @@ -1294,16 +1314,16 @@ BOOL STDCALL IntGrayString( - HDC hDC, - HBRUSH hBrush, - GRAYSTRINGPROC lpOutputFunc, - LPARAM lpData, - int nCount, - int X, - int Y, - int nWidth, - int nHeight, - BOOL unicode) + HDC hDC, + HBRUSH hBrush, + GRAYSTRINGPROC lpOutputFunc, + LPARAM lpData, + int nCount, + int X, + int Y, + int nWidth, + int nHeight, + BOOL unicode) { // AG: Mostly implemented, but probably won't work properly or return // correct error codes. I doubt it grays strings either... Untested! @@ -1311,7 +1331,7 @@ BOOL success = FALSE; HDC MemDC = NULL; HBITMAP MemBMP = NULL, - OldBMP = NULL; + OldBMP = NULL; HBRUSH OldBrush = NULL; HFONT OldFont = NULL; RECT r; @@ -1404,20 +1424,20 @@ if (! BitBlt(hDC, X, Y, nWidth, nHeight, MemDC, 0, 0, SRCCOPY)) goto cleanup; - cleanup : - SetTextColor(hDC, ForeColor); - SetBkColor(hDC, BackColor); - - if (MemDC) - { - if (OldFont) SelectObject(MemDC, OldFont); - if (OldBrush) SelectObject(MemDC, OldBrush); - if (OldBMP) SelectObject(MemDC, OldBMP); - if (MemBMP) DeleteObject(MemBMP); - DeleteDC(MemDC); - } - - return success; +cleanup: + SetTextColor(hDC, ForeColor); + SetBkColor(hDC, BackColor); + + if (MemDC) + { + if (OldFont) SelectObject(MemDC, OldFont); + if (OldBrush) SelectObject(MemDC, OldBrush); + if (OldBMP) SelectObject(MemDC, OldBMP); + if (MemBMP) DeleteObject(MemBMP); + DeleteDC(MemDC); + } + + return success; } /********************************************************************** @@ -1437,49 +1457,54 @@ switch(opcode) { - case DST_TEXT: - case DST_PREFIXTEXT: - if(unicode) - return DrawTextW(hdc, (LPWSTR)lp, (INT)wp, rc, dtflags); - else - return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags); - - case DST_ICON: - return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, cx, cy, 0, NULL, DI_NORMAL); - - case DST_BITMAP: - memdc = CreateCompatibleDC(hdc); - if(!memdc) return FALSE; - hbmsave = (HBITMAP)SelectObject(memdc, (HBITMAP)lp); - if(!hbmsave) - { + case DST_TEXT: + case DST_PREFIXTEXT: + if(unicode) + return DrawTextW(hdc, (LPWSTR)lp, (INT)wp, rc, dtflags); + else + return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags); + + case DST_ICON: + return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, cx, cy, 0, NULL, DI_NORMAL); + + case DST_BITMAP: + memdc = CreateCompatibleDC(hdc); + if(!memdc) + return FALSE; + hbmsave = (HBITMAP)SelectObject(memdc, (HBITMAP)lp); + if(!hbmsave) + { + DeleteDC(memdc); + return FALSE; + } + retval = BitBlt(hdc, rc->left, rc->top, cx, cy, memdc, 0, 0, SRCCOPY); + SelectObject(memdc, hbmsave); DeleteDC(memdc); - return FALSE; - } - retval = BitBlt(hdc, rc->left, rc->top, cx, cy, memdc, 0, 0, SRCCOPY); - SelectObject(memdc, hbmsave); - DeleteDC(memdc); - return retval; - - case DST_COMPLEX: - if(func) { - BOOL bRet; - /* DRAWSTATEPROC assumes that it draws at the center of coordinates */ - - OffsetViewportOrgEx(hdc, rc->left, rc->top, NULL); - bRet = func(hdc, lp, wp, cx, cy); - /* Restore origin */ - OffsetViewportOrgEx(hdc, -rc->left, -rc->top, NULL); - return bRet; - } else - return FALSE; + return retval; + + case DST_COMPLEX: + if(func) + { + BOOL bRet; + /* DRAWSTATEPROC assumes that it draws at the center of coordinates */ + + OffsetViewportOrgEx(hdc, rc->left, rc->top, NULL); + bRet = func(hdc, lp, wp, cx, cy); + /* Restore origin */ + OffsetViewportOrgEx(hdc, -rc->left, -rc->top, NULL); + return bRet; + } + else + { + return FALSE; + } } return FALSE; } static BOOL IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp, - INT x, INT y, INT cx, INT cy, UINT flags, BOOL unicode) + INT x, INT y, INT cx, INT cy, UINT flags, BOOL unicode) { HBITMAP hbm, hbmsave; HFONT hfsave; @@ -1505,41 +1530,44 @@ { SIZE s; ICONINFO ici; - BITMAP bm; + BITMAP bm; switch(opcode) { - case DST_TEXT: - case DST_PREFIXTEXT: - if(unicode) - retval = GetTextExtentPoint32W(hdc, (LPWSTR)lp, len, &s); - else - retval = GetTextExtentPoint32A(hdc, (LPSTR)lp, len, &s); - if(!retval) return FALSE; - break; - - case DST_ICON: - if(!GetIconInfo((HICON)lp, &ici)) + case DST_TEXT: + case DST_PREFIXTEXT: + if(unicode) + retval = GetTextExtentPoint32W(hdc, (LPWSTR)lp, len, &s); + else + retval = GetTextExtentPoint32A(hdc, (LPSTR)lp, len, &s); + if(!retval) + return FALSE; + break; + + case DST_ICON: + if(!GetIconInfo((HICON)lp, &ici)) + return FALSE; + if(!GetObjectW(ici.hbmColor, sizeof(bm), &bm)) + return FALSE; + s.cx = bm.bmWidth; + s.cy = bm.bmHeight; + break; + + case DST_BITMAP: + if(!GetObjectW((HBITMAP)lp, sizeof(bm), &bm)) + return FALSE; + s.cx = bm.bmWidth; + s.cy = bm.bmHeight; + break; + + case DST_COMPLEX: /* cx and cy must be set in this mode */ return FALSE; - if(!GetObjectW(ici.hbmColor, sizeof(bm), &bm)) - return FALSE; - s.cx = bm.bmWidth; - s.cy = bm.bmHeight; - break; - - case DST_BITMAP: - if(!GetObjectW((HBITMAP)lp, sizeof(bm), &bm)) - return FALSE; - s.cx = bm.bmWidth; - s.cy = bm.bmHeight; - break; - - case DST_COMPLEX: /* cx and cy must be set in this mode */ - return FALSE; - } - - if(!cx) cx = s.cx; - if(!cy) cy = s.cy; + } + + if(!cx) + cx = s.cx; + if(!cy) + cy = s.cy; } rc.left = x; @@ -1568,15 +1596,19 @@ /* From here on we must use "goto cleanup" when something goes wrong */ hbm = CreateBitmap(cx, cy, 1, 1, NULL); - if(!hbm) goto cleanup; + if(!hbm) + goto cleanup; memdc = CreateCompatibleDC(hdc); - if(!memdc) goto cleanup; + if(!memdc) + goto cleanup; hbmsave = (HBITMAP)SelectObject(memdc, hbm); - if(!hbmsave) goto cleanup; + if(!hbmsave) + goto cleanup; rc.left = rc.top = 0; rc.right = cx; rc.bottom = cy; - if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup; + if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) + goto cleanup; SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); hfsave = (HFONT)SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT)); @@ -1584,55 +1616,65 @@ /* DST_COMPLEX may draw text as well, * so we must be sure that correct font is selected */ - if(!hfsave && (opcode <= DST_PREFIXTEXT)) goto cleanup; + if(!hfsave && (opcode <= DST_PREFIXTEXT)) + goto cleanup; tmp = PAINTING_DrawStateJam(memdc, opcode, func, lp, len, &rc, dtflags, unicode); - if(hfsave) SelectObject(memdc, hfsave); - if(!tmp) goto cleanup; + if(hfsave) + SelectObject(memdc, hfsave); + if(!tmp) + goto cleanup; /* This state cause the image to be dithered */ if(flags & DSS_UNION) { #if 0 hbsave = (HBRUSH)SelectObject(memdc, CACHE_GetPattern55AABrush()); - if(!hbsave) goto cleanup; + if(!hbsave) + goto cleanup; tmp = PatBlt(memdc, 0, 0, cx, cy, 0x00FA0089); SelectObject(memdc, hbsave); - if(!tmp) goto cleanup; + if(!tmp) + goto cleanup; #else UNIMPLEMENTED; #endif } if (flags & DSS_DISABLED) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT)); + hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT)); else if (flags & DSS_DEFAULT) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); /* Draw light or dark shadow */ if (flags & (DSS_DISABLED|DSS_DEFAULT)) { - if(!hbrtmp) goto cleanup; - hbsave = (HBRUSH)SelectObject(hdc, hbrtmp); - if(!hbsave) goto cleanup; - if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; - SelectObject(hdc, hbsave); - DeleteObject(hbrtmp); - hbrtmp = 0; + if(!hbrtmp) + goto cleanup; + hbsave = (HBRUSH)SelectObject(hdc, hbrtmp); + if(!hbsave) + goto cleanup; + if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) + goto cleanup; + SelectObject(hdc, hbsave); + DeleteObject(hbrtmp); + hbrtmp = 0; } if (flags & DSS_DISABLED) { - hbr = hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); - if(!hbrtmp) goto cleanup; + hbr = hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + if(!hbrtmp) + goto cleanup; } else if (!hbr) { - hbr = (HBRUSH)GetStockObject(BLACK_BRUSH); + hbr = (HBRUSH)GetStockObject(BLACK_BRUSH); } hbsave = (HBRUSH)SelectObject(hdc, hbr); - if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; + if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) + goto cleanup; retval = TRUE; /* We succeeded */ @@ -1640,11 +1682,16 @@ SetTextColor(hdc, fg); SetBkColor(hdc, bg); - if(hbsave) SelectObject(hdc, hbsave); - if(hbmsave) SelectObject(memdc, hbmsave); - if(hbrtmp) DeleteObject(hbrtmp); - if(hbm) DeleteObject(hbm); - if(memdc) DeleteDC(memdc); + if(hbsave) + SelectObject(hdc, hbsave); + if(hbmsave) + SelectObject(memdc, hbmsave); + if(hbrtmp) + DeleteObject(hbrtmp); + if(hbm) + DeleteObject(hbm); + if(memdc) + DeleteDC(memdc); return retval; } @@ -1655,26 +1702,26 @@ BOOL STDCALL DrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState) { - if (GetMapMode(hDC) != MM_TEXT) - return FALSE; - - switch(uType) - { - case DFC_BUTTON: - return UITOOLS95_DrawFrameButton(hDC, rc, uState); - case DFC_CAPTION: - return UITOOLS95_DrawFrameCaption(hDC, rc, uState); - case DFC_MENU: - return UITOOLS95_DrawFrameMenu(hDC, rc, uState); + if (GetMapMode(hDC) != MM_TEXT) + return FALSE; + + switch(uType) + { + case DFC_BUTTON: + return UITOOLS95_DrawFrameButton(hDC, rc, uState); + case DFC_CAPTION: + return UITOOLS95_DrawFrameCaption(hDC, rc, uState); + case DFC_MENU: + return UITOOLS95_DrawFrameMenu(hDC, rc, uState); #if 0 - case DFC_POPUPMENU: - UNIMPLEMENTED; - break; + case DFC_POPUPMENU: + UNIMPLEMENTED; + break; #endif - case DFC_SCROLL: - return UITOOLS95_DrawFrameScroll(hDC, rc, uState); - } - return FALSE; + case DFC_SCROLL: + return UITOOLS95_DrawFrameScroll(hDC, rc, uState); + } + return FALSE; } /* @@ -1683,10 +1730,10 @@ BOOL STDCALL DrawEdge(HDC hDC, LPRECT rc, UINT edge, UINT flags) { - if (flags & BF_DIAGONAL) - return IntDrawDiagEdge(hDC, rc, edge, flags); - else - return IntDrawRectEdge(hDC, rc, edge, flags); + if (flags & BF_DIAGONAL) + return IntDrawDiagEdge(hDC, rc, edge, flags); + else + return IntDrawRectEdge(hDC, rc, edge, flags); } /* @@ -1694,9 +1741,9 @@ */ BOOL STDCALL GrayStringA(HDC hDC, HBRUSH hBrush, GRAYSTRINGPROC lpOutputFunc, LPARAM lpData, - int nCount, int X, int Y, int nWidth, int nHeight) -{ - return IntGrayString(hDC, hBrush, lpOutputFunc, lpData, nCount, X, Y, nWidth, nHeight, FALSE); + int nCount, int X, int Y, int nWidth, int nHeight) +{ + return IntGrayString(hDC, hBrush, lpOutputFunc, lpData, nCount, X, Y, nWidth, nHeight, FALSE); } /* @@ -1704,9 +1751,9 @@ */ BOOL STDCALL GrayStringW(HDC hDC, HBRUSH hBrush, GRAYSTRINGPROC lpOutputFunc, LPARAM lpData, - int nCount, int X, int Y, int nWidth, int nHeight) -{ - return IntGrayString(hDC, hBrush, lpOutputFunc, lpData, nCount, X, Y, nWidth, nHeight, TRUE); + int nCount, int X, int Y, int nWidth, int nHeight) +{ + return IntGrayString(hDC, hBrush, lpOutputFunc, lpData, nCount, X, Y, nWidth, nHeight, TRUE); } /* @@ -1715,8 +1762,8 @@ BOOL STDCALL InvertRect(HDC hDC, CONST RECT *lprc) { - return PatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, - lprc->bottom - lprc->top, DSTINVERT); + return PatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, + lprc->bottom - lprc->top, DSTINVERT); } /* @@ -1725,19 +1772,19 @@ INT STDCALL FrameRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr) { - HBRUSH oldbrush; - RECT r = *lprc; - - if ((r.right <= r.left) || (r.bottom <= r.top)) return 0; - if (!(oldbrush = SelectObject(hDC, hbr))) return 0; - - PatBlt(hDC, r.left, r.top, 1, r.bottom - r.top, PATCOPY); - PatBlt(hDC, r.right - 1, r.top, 1, r.bottom - r.top, PATCOPY); - PatBlt(hDC, r.left, r.top, r.right - r.left, 1, PATCOPY); - PatBlt(hDC, r.left, r.bottom - 1, r.right - r.left, 1, PATCOPY); - - SelectObject(hDC, oldbrush); - return TRUE; + HBRUSH oldbrush; + RECT r = *lprc; + + if ((r.right <= r.left) || (r.bottom <= r.top)) return 0; + if (!(oldbrush = SelectObject(hDC, hbr))) return 0; + + PatBlt(hDC, r.left, r.top, 1, r.bottom - r.top, PATCOPY); + PatBlt(hDC, r.right - 1, r.top, 1, r.bottom - r.top, PATCOPY); + PatBlt(hDC, r.left, r.top, r.right - r.left, 1, PATCOPY); + PatBlt(hDC, r.left, r.bottom - 1, r.right - r.left, 1, PATCOPY); + + SelectObject(hDC, oldbrush); + return TRUE; } /* @@ -1746,8 +1793,8 @@ BOOL STDCALL FlashWindow(HWND hWnd, BOOL bInvert) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } /* @@ -1756,8 +1803,8 @@ BOOL STDCALL FlashWindowEx(PFLASHWINFO pfwi) { - UNIMPLEMENTED; - return FALSE; + UNIMPLEMENTED; + return FALSE; } /* @@ -1766,20 +1813,20 @@ INT STDCALL FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr) { - HBRUSH prevhbr; - - if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) - { - hbr = GetSysColorBrush((int)hbr - 1); - } - if ((prevhbr = NtGdiSelectObject(hDC, hbr)) == NULL) - { - return FALSE; - } - NtGdiPatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, - lprc->bottom - lprc->top, PATCOPY); - NtGdiSelectObject(hDC, prevhbr); - return TRUE; + HBRUSH prevhbr; + + if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) + { + hbr = GetSysColorBrush((int)hbr - 1); + } + if ((prevhbr = NtGdiSelectObject(hDC, hbr)) == NULL) + { + return FALSE; + } + NtGdiPatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, + lprc->bottom - lprc->top, PATCOPY); + NtGdiSelectObject(hDC, prevhbr); + return TRUE; } /* @@ -1787,10 +1834,10 @@ */ BOOL STDCALL DrawAnimatedRects(HWND hWnd, int idAni, CONST RECT *lprcFrom, - CONST RECT *lprcTo) -{ - UNIMPLEMENTED; - return FALSE; + CONST RECT *lprcTo) +{ + UNIMPLEMENTED; + return FALSE; } /* @@ -1799,35 +1846,35 @@ BOOL STDCALL DrawFocusRect(HDC hdc, CONST RECT *rect) { - static HBRUSH hFocusRectBrush = NULL; - HGDIOBJ OldObj; - UINT cx, cy; - - if(!hFocusRectBrush) - { - static HBITMAP hFocusPattern = NULL; - const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA}; - - hFocusPattern = CreateBitmap(8, 8, 1, 1, Pattern); - hFocusRectBrush = CreatePatternBrush(hFocusPattern); - } - - NtUserSystemParametersInfo(SPI_GETFOCUSBORDERWIDTH, 0, &cx, 0); - NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, &cy, 0); - - OldObj = SelectObject(hdc, hFocusRectBrush); - - /* top */ - PatBlt(hdc, rect->left, rect->top, rect->right - rect->left, cy, PATINVERT); - /* bottom */ - PatBlt(hdc, rect->left, rect->bottom - cy, rect->right - rect->left, cy, PATINVERT); - /* left */ - PatBlt(hdc, rect->left, rect->top + cy, cx, rect->bottom - rect->top - (2 * cy), PATINVERT); - /* right */ - PatBlt(hdc, rect->right - cx, rect->top + cy, cx, rect->bottom - rect->top - (2 * cy), PATINVERT); - - SelectObject(hdc, OldObj); - return TRUE; + static HBRUSH hFocusRectBrush = NULL; + HGDIOBJ OldObj; + UINT cx, cy; + + if(!hFocusRectBrush) + { + static HBITMAP hFocusPattern = NULL; + const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA}; + + hFocusPattern = CreateBitmap(8, 8, 1, 1, Pattern); + hFocusRectBrush = CreatePatternBrush(hFocusPattern); + } + + NtUserSystemParametersInfo(SPI_GETFOCUSBORDERWIDTH, 0, &cx, 0); + NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, &cy, 0); + + OldObj = SelectObject(hdc, hFocusRectBrush); + + /* top */ + PatBlt(hdc, rect->left, rect->top, rect->right - rect->left, cy, PATINVERT); + /* bottom */ + PatBlt(hdc, rect->left, rect->bottom - cy, rect->right - rect->left, cy, PATINVERT); + /* left */ + PatBlt(hdc, rect->left, rect->top + cy, cx, rect->bottom - rect->top - (2 * cy), PATINVERT); + /* right */ + PatBlt(hdc, rect->right - cx, rect->top + cy, cx, rect->bottom - rect->top - (2 * cy), PATINVERT); + + SelectObject(hdc, OldObj); + return TRUE; } /* @@ -1835,9 +1882,9 @@ */ BOOL STDCALL DrawStateA(HDC hDC, HBRUSH hBrush, DRAWSTATEPROC lpOutputFunc, LPARAM lData, - WPARAM wData, int x, int y, int cx, int cy, UINT fuFlags) -{ - return IntDrawState(hDC, hBrush, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags, FALSE); + WPARAM wData, int x, int y, int cx, int cy, UINT fuFlags) +{ + return IntDrawState(hDC, hBrush, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags, FALSE); } /* @@ -1845,7 +1892,7 @@ */ BOOL STDCALL DrawStateW(HDC hDC, HBRUSH hBrush, DRAWSTATEPROC lpOutputFunc, LPARAM lData, - WPARAM wData, int x, int y, int cx, int cy, UINT fuFlags) -{ - return IntDrawState(hDC, hBrush, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags, TRUE); -} + WPARAM wData, int x, int y, int cx, int cy, UINT fuFlags) +{ + return IntDrawState(hDC, hBrush, lpOutputFunc, lData, wData, x, y, cx, cy, fuFlags, TRUE); +}

1 0

[gedmurphy] 30254: - convert dialog to unicode - fix /W4 warnings
by gedmurphy＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: gedmurphy Date: Thu Nov 8 03:23:55 2007 New Revision: 30254 URL: http://svn.reactos.org/svn/reactos?rev=30254&view=rev Log: - convert dialog to unicode - fix /W4 warnings Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj trunk/reactos/base/applications/mstsc/rdpfile.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Thu Nov 8 03:23:55 2007 @@ -21,7 +21,6 @@ #include <windows.h> #include <commctrl.h> #include <stdio.h> -#include <tchar.h> #include <todo.h> #include "resource.h" @@ -49,10 +48,10 @@ typedef struct _DISPLAY_DEVICE_ENTRY { struct _DISPLAY_DEVICE_ENTRY *Flink; - LPTSTR DeviceDescription; - LPTSTR DeviceName; - LPTSTR DeviceKey; - LPTSTR DeviceID; + LPWSTR DeviceDescription; + LPWSTR DeviceName; + LPWSTR DeviceKey; + LPWSTR DeviceID; DWORD DeviceStateFlags; PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ DWORD SettingsCount; @@ -82,7 +81,6 @@ } INFO, *PINFO; HINSTANCE hInst; -extern char g_servername[]; static VOID OnTabWndSelChange(PINFO pInfo) @@ -107,56 +105,56 @@ FillServerAddesssCombo(PINFO pInfo) { HKEY hKey; - TCHAR KeyName[] = _T("Software\\Microsoft\\Terminal Server Client\\Default"); - TCHAR Name[MAX_KEY_NAME]; + WCHAR KeyName[] = L"Software\\Microsoft\\Terminal Server Client\\Default"; + WCHAR Name[MAX_KEY_NAME]; LONG ret = ERROR_SUCCESS; DWORD size; INT i = 0; - if (RegOpenKeyEx(HKEY_CURRENT_USER, - KeyName, - 0, - KEY_READ, - &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_CURRENT_USER, + KeyName, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) { while (ret == ERROR_SUCCESS) { size = MAX_KEY_NAME; - ret = RegEnumValue(hKey, - i, - Name, - &size, - NULL, - NULL, - NULL, - NULL); + ret = RegEnumValueW(hKey, + i, + Name, + &size, + NULL, + NULL, + NULL, + NULL); if (ret == ERROR_SUCCESS) { size = MAX_KEY_NAME; - if (RegQueryValueEx(hKey, - Name, - 0, - NULL, - NULL, - &size) == ERROR_SUCCESS) + if (RegQueryValueExW(hKey, + Name, + 0, + NULL, + NULL, + &size) == ERROR_SUCCESS) { - LPTSTR lpAddress = HeapAlloc(GetProcessHeap(), + LPWSTR lpAddress = HeapAlloc(GetProcessHeap(), 0, size); if (lpAddress) { - if (RegQueryValueEx(hKey, - Name, - 0, - NULL, - lpAddress, - &size) == ERROR_SUCCESS) + if (RegQueryValueExW(hKey, + Name, + 0, + NULL, + (LPBYTE)lpAddress, + &size) == ERROR_SUCCESS) { - SendDlgItemMessage(pInfo->hGeneralPage, - IDC_SERVERCOMBO, - CB_ADDSTRING, - 0, - (LPARAM)lpAddress); + SendDlgItemMessageW(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + CB_ADDSTRING, + 0, + (LPARAM)lpAddress); } HeapFree(GetProcessHeap(), @@ -170,16 +168,16 @@ } } - if (LoadString(hInst, - IDS_BROWSESERVER, - Name, - sizeof(Name) / sizeof(TCHAR))) - { - SendDlgItemMessage(pInfo->hGeneralPage, - IDC_SERVERCOMBO, - CB_ADDSTRING, - 0, - (LPARAM)Name); + if (LoadStringW(hInst, + IDS_BROWSESERVER, + Name, + sizeof(Name) / sizeof(WCHAR))) + { + SendDlgItemMessageW(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + CB_ADDSTRING, + 0, + (LPARAM)Name); } } @@ -197,34 +195,34 @@ 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - pInfo->hLogon = LoadImage(hInst, - MAKEINTRESOURCE(IDI_LOGON), + pInfo->hLogon = LoadImageW(hInst, + MAKEINTRESOURCEW(IDI_LOGON), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); + if (pInfo->hLogon) + { + SendDlgItemMessageW(pInfo->hGeneralPage, + IDC_LOGONICON, + STM_SETICON, + (WPARAM)pInfo->hLogon, + 0); + } + + pInfo->hConn = LoadImageW(hInst, + MAKEINTRESOURCEW(IDI_CONN), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - if (pInfo->hLogon) - { - SendDlgItemMessage(pInfo->hGeneralPage, - IDC_LOGONICON, - STM_SETICON, - (WPARAM)pInfo->hLogon, - 0); - } - - pInfo->hConn = LoadImage(hInst, - MAKEINTRESOURCE(IDI_CONN), - IMAGE_ICON, - 32, - 32, - LR_DEFAULTCOLOR); if (pInfo->hConn) { - SendDlgItemMessage(pInfo->hGeneralPage, - IDC_CONNICON, - STM_SETICON, - (WPARAM)pInfo->hConn, - 0); + SendDlgItemMessageW(pInfo->hGeneralPage, + IDC_CONNICON, + STM_SETICON, + (WPARAM)pInfo->hConn, + 0); } FillServerAddesssCombo(pInfo); @@ -248,8 +246,8 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtr(GetParent(hDlg), - GWLP_USERDATA); + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), + GWLP_USERDATA); switch (message) { @@ -267,20 +265,20 @@ { INT last, cur; - cur = SendDlgItemMessage(hDlg, - IDC_SERVERCOMBO, - CB_GETCURSEL, - 0, - 0); - cur++; - - last = SendDlgItemMessage(hDlg, + cur = SendDlgItemMessageW(hDlg, IDC_SERVERCOMBO, - CB_GETCOUNT, + CB_GETCURSEL, 0, 0); + cur++; + + last = SendDlgItemMessageW(hDlg, + IDC_SERVERCOMBO, + CB_GETCOUNT, + 0, + 0); if (cur == last) - MessageBox(hDlg, _T("SMB is not yet supported"), _T("RDP error"), MB_ICONERROR); + MessageBoxW(hDlg, L"SMB is not yet supported", L"RDP error", MB_ICONERROR); } break; @@ -309,11 +307,11 @@ static PSETTINGS_ENTRY -GetPossibleSettings(IN LPCTSTR DeviceName, +GetPossibleSettings(IN LPCWSTR lpDeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) { - DEVMODE devmode; + DEVMODEW devmode; DWORD NbSettings = 0; DWORD iMode = 0; DWORD dwFlags = 0; @@ -324,7 +322,7 @@ /* Get current settings */ *CurrentSettings = NULL; - hDC = CreateIC(NULL, DeviceName, NULL, NULL); + hDC = CreateICW(NULL, lpDeviceName, NULL, NULL); bpp = GetDeviceCaps(hDC, PLANES); bpp *= GetDeviceCaps(hDC, BITSPIXEL); xres = GetDeviceCaps(hDC, HORZRES); @@ -335,10 +333,10 @@ devmode.dmSize = (WORD)sizeof(DEVMODE); devmode.dmDriverExtra = 0; - if (!EnumDisplaySettingsEx(DeviceName, ENUM_CURRENT_SETTINGS, &devmode, dwFlags)) + if (!EnumDisplaySettingsExW(lpDeviceName, ENUM_CURRENT_SETTINGS, &devmode, dwFlags)) return NULL; - while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) + while (EnumDisplaySettingsExW(lpDeviceName, iMode, &devmode, dwFlags)) { if (devmode.dmBitsPerPel==8 || devmode.dmBitsPerPel==16 || @@ -399,13 +397,13 @@ static BOOL -AddDisplayDevice(PINFO pInfo, PDISPLAY_DEVICE DisplayDevice) +AddDisplayDevice(PINFO pInfo, PDISPLAY_DEVICEW DisplayDevice) { PDISPLAY_DEVICE_ENTRY newEntry = NULL; - LPTSTR description = NULL; - LPTSTR name = NULL; - LPTSTR key = NULL; - LPTSTR devid = NULL; + LPWSTR description = NULL; + LPWSTR name = NULL; + LPWSTR key = NULL; + LPWSTR devid = NULL; DWORD descriptionSize, nameSize, keySize, devidSize; PSETTINGS_ENTRY Current; DWORD ResolutionsCount = 1; @@ -457,19 +455,19 @@ i++; } } - descriptionSize = (_tcslen(DisplayDevice->DeviceString) + 1) * sizeof(TCHAR); + descriptionSize = (wcslen(DisplayDevice->DeviceString) + 1) * sizeof(WCHAR); description = HeapAlloc(GetProcessHeap(), 0, descriptionSize); if (!description) goto ByeBye; - nameSize = (_tcslen(DisplayDevice->DeviceName) + 1) * sizeof(TCHAR); + nameSize = (wcslen(DisplayDevice->DeviceName) + 1) * sizeof(WCHAR); name = HeapAlloc(GetProcessHeap(), 0, nameSize); if (!name) goto ByeBye; - keySize = (_tcslen(DisplayDevice->DeviceKey) + 1) * sizeof(TCHAR); + keySize = (wcslen(DisplayDevice->DeviceKey) + 1) * sizeof(WCHAR); key = HeapAlloc(GetProcessHeap(), 0, keySize); if (!key) goto ByeBye; - devidSize = (_tcslen(DisplayDevice->DeviceID) + 1) * sizeof(TCHAR); + devidSize = (wcslen(DisplayDevice->DeviceID) + 1) * sizeof(WCHAR); devid = HeapAlloc(GetProcessHeap(), 0, devidSize); if (!devid) goto ByeBye; @@ -516,9 +514,9 @@ static VOID -OnResolutionChanged(PINFO pInfo, DWORD position) -{ - TCHAR Buffer[64]; +OnResolutionChanged(PINFO pInfo, INT position) +{ + WCHAR Buffer[64]; INT MaxSlider; MaxSlider = SendDlgItemMessageW(pInfo->hDisplayPage, @@ -529,33 +527,33 @@ if (position == MaxSlider) { - LoadString(hInst, - IDS_FULLSCREEN, - Buffer, - sizeof(Buffer) / sizeof(TCHAR)); + LoadStringW(hInst, + IDS_FULLSCREEN, + Buffer, + sizeof(Buffer) / sizeof(WCHAR)); } else { - TCHAR Pixel[64]; - - if (LoadString(hInst, - IDS_PIXEL, + WCHAR Pixel[64]; + + if (LoadStringW(hInst, + IDS_PIXEL, + Pixel, + sizeof(Pixel) / sizeof(WCHAR))) + { + _swprintf(Buffer, Pixel, - sizeof(Pixel) / sizeof(TCHAR))) - { - _stprintf(Buffer, - Pixel, - pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, - pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, - Pixel); - } - } - - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_SETTINGS_RESOLUTION_TEXT, - WM_SETTEXT, - 0, - (LPARAM)Buffer); + pInfo->DisplayDeviceList->Resolutions[position].dmPelsWidth, + pInfo->DisplayDeviceList->Resolutions[position].dmPelsHeight, + Pixel); + } + } + + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_SETTINGS_RESOLUTION_TEXT, + WM_SETTEXT, + 0, + (LPARAM)Buffer); /* save new settings */ SetIntegerToSettings(pInfo->pRdpSettings, @@ -572,8 +570,8 @@ FillResolutionsAndColors(PINFO pInfo) { PSETTINGS_ENTRY Current; - TCHAR Buffer[64]; - TCHAR Pixel[64]; + WCHAR Buffer[64]; + WCHAR Pixel[64]; DWORD index, i, num; DWORD MaxBpp = 0; DWORD width, height; @@ -582,11 +580,11 @@ pInfo->CurrentDisplayDevice = pInfo->DisplayDeviceList; /* Update global variable */ /* find max bpp */ - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_RESETCONTENT, - 0, - 0); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_RESETCONTENT, + 0, + 0); for (Current = pInfo->DisplayDeviceList->Settings; Current != NULL; Current = Current->Flink) { if (Current->dmBitsPerPel > MaxBpp) @@ -598,6 +596,7 @@ case 24: num = 4; break; case 16: num = 3; break; case 8: num = 1; break; + default: num = 0; break; } types[0] = IDS_256COLORS; @@ -606,54 +605,54 @@ types[3] = IDS_HIGHCOLOR24; /* Fill color depths combo box */ - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_RESETCONTENT, - 0, - 0); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_RESETCONTENT, + 0, + 0); for (i = 0, Current = pInfo->DisplayDeviceList->Settings; i <= num && Current != NULL; i++, Current = Current->Flink) { - TCHAR Buffer[64]; - if (LoadString(hInst, - types[i], - Buffer, - sizeof(Buffer) / sizeof(TCHAR))) - { - index = (DWORD)SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_FINDSTRINGEXACT, - -1, - (LPARAM)Buffer); + WCHAR Buffer[64]; + if (LoadStringW(hInst, + types[i], + Buffer, + sizeof(Buffer) / sizeof(WCHAR))) + { + index = (DWORD)SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_FINDSTRINGEXACT, + (WPARAM)-1, + (LPARAM)Buffer); if (index == (DWORD)CB_ERR) { - index = (DWORD)SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_ADDSTRING, - 0, - (LPARAM)Buffer); - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_SETITEMDATA, - index, - types[i]); + index = (DWORD)SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_SETITEMDATA, + index, + types[i]); } } } /* Fill resolutions slider */ - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_GEOSLIDER, - TBM_CLEARTICS, - TRUE, - 0); - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_GEOSLIDER, - TBM_SETRANGE, - TRUE, - MAKELONG(0, pInfo->DisplayDeviceList->ResolutionsCount)); //extra 1 for full screen + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_CLEARTICS, + TRUE, + 0); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_SETRANGE, + TRUE, + MAKELONG(0, pInfo->DisplayDeviceList->ResolutionsCount)); //extra 1 for full screen width = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopwidth"); height = GetIntegerFromSettings(pInfo->pRdpSettings, L"desktopheight"); @@ -665,30 +664,30 @@ if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == width && pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == height) { - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_GEOSLIDER, - TBM_SETPOS, - TRUE, - index); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_GEOSLIDER, + TBM_SETPOS, + TRUE, + index); break; } } - if (LoadString(hInst, - IDS_PIXEL, - Pixel, - sizeof(Pixel) / sizeof(TCHAR))) - { - _stprintf(Buffer, + if (LoadStringW(hInst, + IDS_PIXEL, + Pixel, + sizeof(Pixel) / sizeof(WCHAR))) + { + _swprintf(Buffer, Pixel, width, height, Pixel); - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_SETTINGS_RESOLUTION_TEXT, - WM_SETTEXT, - 0, - (LPARAM)Buffer); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_SETTINGS_RESOLUTION_TEXT, + WM_SETTEXT, + 0, + (LPARAM)Buffer); } } } @@ -697,7 +696,7 @@ static VOID DisplayOnInit(PINFO pInfo) { - DISPLAY_DEVICE displayDevice; + DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; @@ -709,52 +708,52 @@ 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - pInfo->hRemote = LoadImage(hInst, - MAKEINTRESOURCE(IDI_REMOTE), + pInfo->hRemote = LoadImageW(hInst, + MAKEINTRESOURCEW(IDI_REMOTE), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); + if (pInfo->hRemote) + { + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_REMICON, + STM_SETICON, + (WPARAM)pInfo->hRemote, + 0); + } + + pInfo->hColor = LoadImageW(hInst, + MAKEINTRESOURCEW(IDI_COLORS), IMAGE_ICON, 32, 32, - LR_DEFAULTCOLOR); - if (pInfo->hRemote) - { - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_REMICON, - STM_SETICON, - (WPARAM)pInfo->hRemote, - 0); - } - - pInfo->hColor = LoadImage(hInst, - MAKEINTRESOURCE(IDI_COLORS), - IMAGE_ICON, - 32, - 32, LR_DEFAULTCOLOR); if (pInfo->hColor) { - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_COLORSICON, - STM_SETICON, - (WPARAM)pInfo->hColor, - 0); - } - - pInfo->hSpectrum = LoadImage(hInst, - MAKEINTRESOURCE(IDB_SPECT), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_COLORSICON, + STM_SETICON, + (WPARAM)pInfo->hColor, + 0); + } + + pInfo->hSpectrum = LoadImageW(hInst, + MAKEINTRESOURCEW(IDB_SPECT), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); if (pInfo->hSpectrum) { - GetObject(pInfo->hSpectrum, - sizeof(BITMAP), - &pInfo->bitmap); + GetObjectW(pInfo->hSpectrum, + sizeof(BITMAP), + &pInfo->bitmap); } /* Get video cards list */ displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); - while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1)) + while (EnumDisplayDevicesW(NULL, iDevNum, &displayDevice, 0x1)) { if ((displayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) != 0) { @@ -774,25 +773,25 @@ /* set color combo */ bpp = GetIntegerFromSettings(pInfo->pRdpSettings, L"session bpp"); - num = SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_GETCOUNT, - 0, - 0); + num = SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_GETCOUNT, + 0, + 0); for (i = 0; i < num; i++) { - INT data = SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_GETITEMDATA, - i, - 0); + INT data = SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_GETITEMDATA, + i, + 0); if (data == bpp) { - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_SETCURSEL, - i, - 0); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_SETCURSEL, + i, + 0); bSet = TRUE; break; } @@ -800,11 +799,11 @@ if (!bSet) { - SendDlgItemMessage(pInfo->hDisplayPage, - IDC_BPPCOMBO, - CB_SETCURSEL, - num - 1, - 0); + SendDlgItemMessageW(pInfo->hDisplayPage, + IDC_BPPCOMBO, + CB_SETCURSEL, + num - 1, + 0); } } } @@ -816,8 +815,8 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtr(GetParent(hDlg), - GWLP_USERDATA); + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), + GWLP_USERDATA); switch (message) { @@ -866,7 +865,7 @@ case TB_BOTTOM: case TB_ENDTRACK: { - DWORD newPosition = (DWORD)SendDlgItemMessage(hDlg, IDC_GEOSLIDER, TBM_GETPOS, 0, 0); + INT newPosition = (DWORD)SendDlgItemMessageW(hDlg, IDC_GEOSLIDER, TBM_GETPOS, 0, 0); OnResolutionChanged(pInfo, newPosition); break; } @@ -904,7 +903,7 @@ PRDPSETTINGS pRdpSettings) { PINFO pInfo; - TCITEM item; + TCITEMW item; BOOL bRet = FALSE; pInfo = HeapAlloc(GetProcessHeap(), @@ -912,34 +911,36 @@ sizeof(INFO)); if (pInfo) { - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); + SetWindowLongPtrW(hwnd, + GWLP_USERDATA, + (LONG_PTR)pInfo); /* add main settings pointer */ pInfo->pRdpSettings = pRdpSettings; - pInfo->hHeader = (HBITMAP)LoadImage(hInst, - MAKEINTRESOURCE(IDB_HEADER), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); + pInfo->hHeader = (HBITMAP)LoadImageW(hInst, + MAKEINTRESOURCEW(IDB_HEADER), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); if (pInfo->hHeader) { - GetObject(pInfo->hHeader, sizeof(BITMAP), &pInfo->headerbitmap); + GetObjectW(pInfo->hHeader, + sizeof(BITMAP), + &pInfo->headerbitmap); } pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialog(hInst, - MAKEINTRESOURCE(IDD_GENERAL), - hwnd, - (DLGPROC)GeneralDlgProc)) - { - char str[256]; - LoadString(hInst, IDS_TAB_GENERAL, str, 256); + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) + { + WCHAR str[256]; + LoadStringW(hInst, IDS_TAB_GENERAL, str, 256); ZeroMemory(&item, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = str; @@ -947,13 +948,13 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialog(hInst, - MAKEINTRESOURCE(IDD_DISPLAY), - hwnd, - (DLGPROC)DisplayDlgProc)) - { - char str[256]; - LoadString(hInst, IDS_TAB_DISPLAY, str, 256); + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) + { + WCHAR str[256]; + LoadStringW(hInst, IDS_TAB_DISPLAY, str, 256); ZeroMemory(&item, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = str; @@ -978,8 +979,8 @@ PINFO pInfo; /* Get the window context */ - pInfo = (PINFO)GetWindowLongPtr(hDlg, - GWLP_USERDATA); + pInfo = (PINFO)GetWindowLongPtrW(hDlg, + GWLP_USERDATA); if (pInfo == NULL && Message != WM_INITDIALOG) { goto HandleDefaultMessage; @@ -1004,13 +1005,6 @@ EndDialog(hDlg, LOWORD(wParam)); } - - switch(LOWORD(wParam)) - { - - } - - break; } case WM_NOTIFY: @@ -1032,7 +1026,7 @@ case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc, hdcMem; + HDC hdc; hdc = BeginPaint(hDlg, &ps); if (hdc != NULL) @@ -1080,6 +1074,7 @@ return FALSE; } + BOOL OpenRDPConnectDialog(HINSTANCE hInstance, PRDPSETTINGS pRdpSettings) @@ -1092,9 +1087,9 @@ iccx.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&iccx); - return (DialogBoxParam(hInst, - MAKEINTRESOURCE(IDD_CONNECTDIALOG), - NULL, - (DLGPROC)DlgProc, - pRdpSettings) == IDOK); -} + return (DialogBoxParamW(hInst, + MAKEINTRESOURCEW(IDD_CONNECTDIALOG), + NULL, + (DLGPROC)DlgProc, + (LPARAM)pRdpSettings) == IDOK); +} Modified: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… ============================================================================== --- trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj (original) +++ trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj Thu Nov 8 03:23:55 2007 @@ -41,14 +41,14 @@ Optimization="0" WholeProgramOptimization="false" AdditionalIncludeDirectories="./;../../../.;../../../include;../../../include;../../../include/dxsdk;../../../include/ndk;../../../include/reactos;../../../include/reactos;../../../include/reactos/libs;..\..\..\obj-i386\include\reactos" - PreprocessorDefinitions=";DBG=1;KDBG=1;STDCALL=__stdcall;_DEBUG;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__" + PreprocessorDefinitions="DBG=1;KDBG=1;STDCALL=__stdcall;_DEBUG;_LIB;_M_IX86;_SEH_ENABLE_TRACE;_WIN32_IE=0x600;_WIN32_WINNT=0x501;_X86_;__REACTOS__;__i386__;_CRT_SECURE_NO_DEPRECATE;UNICODE" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="1" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" CallingConvention="0" Modified: trunk/reactos/base/applications/mstsc/rdpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdpfile.c (original) +++ trunk/reactos/base/applications/mstsc/rdpfile.c Thu Nov 8 03:23:55 2007 @@ -1,6 +1,5 @@ #include <windows.h> #include <stdio.h> -#include <tchar.h> #include <shlobj.h> #include <todo.h> #include "resource.h" @@ -64,7 +63,7 @@ { if (pRdpSettings->pSettings[i].Type == L's') { - wcscpy(pRdpSettings->pSettings[i].Value.i, lpValue); + wcscpy(pRdpSettings->pSettings[i].Value.s, lpValue); bRet = TRUE; break; } @@ -184,7 +183,7 @@ WCHAR lpKey[MAXKEY]; WCHAR lpValue[MAXVALUE]; INT NumSettings = 0; - INT s, structsize; + INT s; if (lpStr) { @@ -213,7 +212,7 @@ for (s = 0; s < NumSettings; s++) { - INT i = 0, k, temp; + INT i = 0, k; /* get a key */ while (*lpStr != L':') @@ -271,7 +270,7 @@ static LPWSTR ReadRdpFile(HANDLE hFile) { - LPWSTR lpBuffer; + LPWSTR lpBuffer = NULL; DWORD BytesToRead, BytesRead; BOOL bRes; @@ -313,7 +312,7 @@ static HANDLE OpenRdpFile(LPWSTR path, BOOL bWrite) { - HANDLE hFile; + HANDLE hFile = NULL; if (path) { @@ -389,7 +388,7 @@ PRDPSETTINGS LoadRdpSettingsFromFile(LPWSTR lpFile) { - PRDPSETTINGS pRdpSettings; + PRDPSETTINGS pRdpSettings = NULL; WCHAR pszPath[MAX_PATH]; HANDLE hFile;

1 0

[greatlrd] 30253: add 20 more guids for ksguid.a
by greatlrd＠svn.reactos.org 08 Nov '07

08 Nov '07

Author: greatlrd Date: Thu Nov 8 03:18:34 2007 New Revision: 30253 URL: http://svn.reactos.org/svn/reactos?rev=30253&view=rev Log: add 20 more guids for ksguid.a Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Thu Nov 8 03:18:34 2007 @@ -32,6 +32,7 @@ DEFINE_GUID(ENCAPIPARAM_PEAK_BITRATE, 0x703F16A9, 0x3D48, 0x44A1, 0xB0, 0x77, 0x01, 0x8D, 0xFF, 0x91, 0x5D, 0x19); DEFINE_GUID(EVENTSETID_CROSSBAR, 0x6A2E0641, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(EVENTSETID_TUNER, 0x6A2E0606, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(EVENTSETID_VIDEODECODER, 0x6A2E0621, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(GUID_BUS_INTERFACE_MEDIUMS, 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); @@ -346,6 +347,7 @@ DEFINE_GUID(KSNODETYPE_VIDEO_OUTPUT_TERMINAL, 0xDFF229E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_VIDEO_PROCESSING, 0xDFF229E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_VIDEO_SELECTOR, 0xDFF229E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_STREAMING, 0xDFF229E1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); @@ -387,6 +389,7 @@ DEFINE_GUID(KSPROPSETID_WaveTable, 0x8539E660, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_VPConfig, 0xBC29A660, 0x30E3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B); DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); + DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); @@ -395,15 +398,34 @@ DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(PINNAME_VIDEO_ANALOGVIDEOIN, 0xFB6C4283, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_CAPTURE, 0xFB6C4281, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_CC_CAPTURE, 0x1AAD8061, 0x012D, 0x11D2, 0xB4, 0xB1, 0x00, 0xA0, 0xD1, 0x02, 0xCF, 0xBE); +DEFINE_GUID(PINNAME_VIDEO_CC, 0xFB6C4289, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_EDS, 0xFB6C4287, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_NABTS_CAPTURE, 0x29703660, 0x498A, 0x11D2, 0xB4, 0xB1, 0x00, 0xA0, 0xD1, 0x02, 0xCF, 0xBE); +DEFINE_GUID(PINNAME_VIDEO_NABTS, 0xFB6C4286, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_PREVIEW, 0xFB6C4282, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_STILL, 0xFB6C428A, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_TELETEXT, 0xFB6C4288, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_TIMECODE, 0xFB6C4208, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_VBI, 0xFB6C4284, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_VIDEOPORT_VBI, 0xFB6C428C, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); +DEFINE_GUID(PINNAME_VIDEO_VIDEOPORT, 0xFB6C4285, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); + +DEFINE_GUID(PROPSETID_ALLOCATOR_CONTROL, 0x53171960, 0x148E, 0x11D2, 0x99, 0x79, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA); DEFINE_GUID(PROPSETID_EXT_DEVICE, 0xB5730A90, 0x1A2C, 0x11CF, 0x8C, 0x23, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); DEFINE_GUID(PROPSETID_EXT_TRANSPORT, 0xA03CD5F0, 0x3045, 0x11CF, 0x8C, 0x44, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); DEFINE_GUID(PROPSETID_TIMECODE_READER, 0x9B496CE1, 0x811B, 0x11CF, 0x8C, 0x77, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); +DEFINE_GUID(PROPSETID_TUNER, 0x6A2E0605, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_CAMERACONTROL, 0xC6E13370, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_CROSSBAR, 0x6A2E0640, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_DROPPEDFRAMES, 0xC6E13344, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_SELECTOR, 0x1ABDAECA, 0x68B6, 0x4F83, 0x93, 0x71, 0xB4, 0x13, 0x90, 0x7C, 0x7B, 0x9F); DEFINE_GUID(PROPSETID_VIDCAP_TVAUDIO, 0x6A2E0650, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCOMPRESSION, 0xC6E13343, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCONTROL, 0x6A2E0670, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEODECODER, 0xC6E13350, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOENCODER, 0x6A2E0610, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); - +DEFINE_GUID(PROPSETID_VIDCAP_VIDEOPROCAMP, 0xC6E13360, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +

1 0

[greatlrd] 30252: smaller cleanup/sort in the guids define list bit
by greatlrd＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: greatlrd Date: Thu Nov 8 02:46:50 2007 New Revision: 30252 URL: http://svn.reactos.org/svn/reactos?rev=30252&view=rev Log: smaller cleanup/sort in the guids define list bit Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Thu Nov 8 02:46:50 2007 @@ -16,391 +16,394 @@ DEFINE_GUID(BUSID_SoftwareDeviceEnumerator, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(CLSID_KsIBasicAudioInterfaceHandler, 0xB9F8AC3E, 0x0F71, 0x11D2, 0xB7, 0x2C, 0x00, 0xC0, 0x4F, 0xB6, 0xBD, 0x3D); +DEFINE_GUID(CLSID_Proxy, 0x17CCA71B, 0xECD7, 0x11D0, 0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(CODECAPI_ALLSETTINGS, 0x6A577E92, 0x83E1, 0x4113, 0xAD, 0xC2, 0x4F, 0xCE, 0xC3, 0x2F, 0x83, 0xA1); +DEFINE_GUID(CODECAPI_AUDIO_ENCODER, 0xB9D19A3E, 0xF897, 0x429C, 0xBC, 0x46, 0x81, 0x38, 0xB7, 0x27, 0x2B, 0x2D); +DEFINE_GUID(CODECAPI_CHANGELISTS, 0x62B12ACF, 0xF6B0, 0x47D9, 0x94, 0x56, 0x96, 0xF2, 0x2C, 0x4E, 0x0B, 0x9D); +DEFINE_GUID(CODECAPI_CURRENTCHANGELIST, 0x1CB14E83, 0x7D72, 0x4657, 0x83, 0xFD, 0x47, 0xA2, 0xC5, 0xB9, 0xD1, 0x3D); +DEFINE_GUID(CODECAPI_SETALLDEFAULTS, 0x6C5E6A7C, 0xACF8, 0x4F55, 0xA9, 0x99, 0x1A, 0x62, 0x81, 0x09, 0x05, 0x1B); +DEFINE_GUID(CODECAPI_SUPPORTSEVENTS, 0x0581AF97, 0x7693, 0x4DBD, 0x9D, 0xCA, 0x3F, 0x9E, 0xBD, 0x65, 0x85, 0xA1); +DEFINE_GUID(CODECAPI_VIDEO_ENCODER, 0x7112E8E1, 0x3D03, 0x47EF, 0x8E, 0x60, 0x03, 0xF1, 0xCF, 0x53, 0x73, 0x01); + +DEFINE_GUID(ENCAPIPARAM_BITRATE_MODE, 0xEE5FB25C, 0xC713, 0x40D1, 0x9D, 0x58, 0xC0, 0xD7, 0x24, 0x1E, 0x25, 0x0F); +DEFINE_GUID(ENCAPIPARAM_BITRATE, 0x49CC4C43, 0xCA83, 0x4AD4, 0xA9, 0xAF, 0xF3, 0x69, 0x6A, 0xF6, 0x66, 0xDF); +DEFINE_GUID(ENCAPIPARAM_PEAK_BITRATE, 0x703F16A9, 0x3D48, 0x44A1, 0xB0, 0x77, 0x01, 0x8D, 0xFF, 0x91, 0x5D, 0x19); + +DEFINE_GUID(EVENTSETID_CROSSBAR, 0x6A2E0641, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(EVENTSETID_VIDEODECODER, 0x6A2E0621, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); + +DEFINE_GUID(GUID_BUS_INTERFACE_MEDIUMS, 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); + DEFINE_GUID(IID_IKoInitializeParentDeviceObject, 0x21B36996, 0x8DE3, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); -DEFINE_GUID(IID_IKsTopology, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(IID_IKsAggregateControl, 0x7F40EAC0, 0x3947, 0x11D2, 0x87, 0x4E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsAllocator, 0x8DA64899, 0xC0D9, 0x11D0, 0x84, 0x13, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); +DEFINE_GUID(IID_IKsAllocatorEx, 0x091BB60A, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(IID_IKsClockPropertySet, 0x5C5CBD84, 0xE755, 0x11D0, 0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(IID_IKsControl, 0x28F54685, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsPropertySet, 0x31EFAC30, 0x515C, 0x11D0, 0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93); -DEFINE_GUID(IID_IKsAllocatorEx, 0x091BB60A, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(IID_IKsAllocator, 0x8DA64899, 0xC0D9, 0x11D0, 0x84, 0x13, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); -DEFINE_GUID(IID_IKsClockPropertySet, 0x5C5CBD84, 0xE755, 0x11D0, 0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(IID_IKsInterfaceHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(IID_IKsDataTypeCompletion, 0x827D1A0E, 0x0F73, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(IID_IKsDataTypeHandler, 0x5FFBAA02, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); +DEFINE_GUID(IID_IKsInterfaceHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsObject, 0x423C13A2, 0x2070, 0x11D0, 0x9E, 0xF7, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); +DEFINE_GUID(IID_IKsPin, 0xB611780D, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); +DEFINE_GUID(IID_IKsPinEx, 0x7BB38260, 0xD19C, 0x11D2, 0xB3, 0x8A, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); DEFINE_GUID(IID_IKsPinPipe, 0xE539CD90, 0xA8B4, 0x11D1, 0x81, 0x89, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(IID_IKsPinEx, 0x7BB38260, 0xD19C, 0x11D2, 0xB3, 0x8A, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); -DEFINE_GUID(IID_IKsPin, 0xB611780D, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); -DEFINE_GUID(IID_IKsObject, 0x423C13A2, 0x2070, 0x11D0, 0x9E, 0xF7, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1); - -DEFINE_GUID(CLSID_KsIBasicAudioInterfaceHandler, 0xB9F8AC3E, 0x0F71, 0x11D2, 0xB7, 0x2C, 0x00, 0xC0, 0x4F, 0xB6, 0xBD, 0x3D); -DEFINE_GUID(CLSID_Proxy, 0x17CCA71B, 0xECD7, 0x11D0, 0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); - -DEFINE_GUID(CODECAPI_CURRENTCHANGELIST, 0x1CB14E83, 0x7D72, 0x4657, 0x83, 0xFD, 0x47, 0xA2, 0xC5, 0xB9, 0xD1, 0x3D); -DEFINE_GUID(CODECAPI_SUPPORTSEVENTS, 0x0581AF97, 0x7693, 0x4DBD, 0x9D, 0xCA, 0x3F, 0x9E, 0xBD, 0x65, 0x85, 0xA1); -DEFINE_GUID(CODECAPI_ALLSETTINGS, 0x6A577E92, 0x83E1, 0x4113, 0xAD, 0xC2, 0x4F, 0xCE, 0xC3, 0x2F, 0x83, 0xA1); -DEFINE_GUID(CODECAPI_SETALLDEFAULTS, 0x6C5E6A7C, 0xACF8, 0x4F55, 0xA9, 0x99, 0x1A, 0x62, 0x81, 0x09, 0x05, 0x1B); -DEFINE_GUID(CODECAPI_AUDIO_ENCODER, 0xB9D19A3E, 0xF897, 0x429C, 0xBC, 0x46, 0x81, 0x38, 0xB7, 0x27, 0x2B, 0x2D); -DEFINE_GUID(CODECAPI_VIDEO_ENCODER, 0x7112E8E1, 0x3D03, 0x47EF, 0x8E, 0x60, 0x03, 0xF1, 0xCF, 0x53, 0x73, 0x01); -DEFINE_GUID(CODECAPI_CHANGELISTS, 0x62B12ACF, 0xF6B0, 0x47D9, 0x94, 0x56, 0x96, 0xF2, 0x2C, 0x4E, 0x0B, 0x9D); - -DEFINE_GUID(ENCAPIPARAM_BITRATE_MODE, 0xEE5FB25C, 0xC713, 0x40D1, 0x9D, 0x58, 0xC0, 0xD7, 0x24, 0x1E, 0x25, 0x0F); -DEFINE_GUID(ENCAPIPARAM_PEAK_BITRATE, 0x703F16A9, 0x3D48, 0x44A1, 0xB0, 0x77, 0x01, 0x8D, 0xFF, 0x91, 0x5D, 0x19); -DEFINE_GUID(ENCAPIPARAM_BITRATE, 0x49CC4C43, 0xCA83, 0x4AD4, 0xA9, 0xAF, 0xF3, 0x69, 0x6A, 0xF6, 0x66, 0xDF); -DEFINE_GUID(EVENTSETID_CROSSBAR, 0x6A2E0641, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(EVENTSETID_VIDEODECODER, 0x6A2E0621, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); - -DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); -DEFINE_GUID(GUID_BUS_INTERFACE_MEDIUMS, 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsPropertySet, 0x31EFAC30, 0x515C, 0x11D0, 0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93); +DEFINE_GUID(IID_IKsTopology, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); DEFINE_GUID(KoCreateObject, 0x72CF721C, 0x525A, 0x11D1, 0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL, 0x1C22C56D, 0x9879, 0x4F5B, 0xA3, 0x89, 0x27, 0x99, 0x6D, 0xDC, 0x28, 0x10); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_AGC, 0x950E55B9, 0x877C, 0x4C67, 0xBE, 0x08, 0xE4, 0x7B, 0x56, 0x11, 0x13, 0x0A); DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR, 0xB6F5A0A0, 0x9E61, 0x4F8C, 0x91, 0xE3, 0x76, 0xCF, 0x0F, 0x3C, 0x47, 0x1F); -DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_AGC, 0x950E55B9, 0x877C, 0x4C67, 0xBE, 0x08, 0xE4, 0x7B, 0x56, 0x11, 0x13, 0x0A); DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS, 0x5AB0882E, 0x7274, 0x4516, 0x87, 0x7D, 0x4E, 0xEE, 0x99, 0xBA, 0x4F, 0xD0); -DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL, 0x1C22C56D, 0x9879, 0x4F5B, 0xA3, 0x89, 0x27, 0x99, 0x6D, 0xDC, 0x28, 0x10); - + +DEFINE_GUID(KSAUDFNAME_3D_CENTER, 0x9F0670B4, 0x991F, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_3D_DEPTH, 0x63FF5747, 0x991F, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_3D_STEREO, 0x185FEDE2, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_ALTERNATE_MICROPHONE, 0x2BC31D6B, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_AUX_MUTE, 0x185FEDFD, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_AUX_VOLUME, 0x185FEDFC, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_AUX, 0x185FEDFE, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_BASS, 0x185FEDE0, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_AUDIO, 0x185FEDFB, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_IN_VOLUME, 0x185FEDF3, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_MUTE, 0x185FEDEA, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_CD_VOLUME, 0x185FEDE9, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_IN_VOLUME, 0x185FEDF4, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_IN, 0x185FEDF9, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_MUTE, 0x185FEDEC, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_LINE_VOLUME, 0x185FEDEB, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MASTER_MUTE, 0x185FEDE4, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MASTER_VOLUME, 0x185FEDE3, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIC_IN_VOLUME, 0x185FEDF5, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIC_MUTE, 0x185FEDEE, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIC_VOLUME, 0x185FEDED, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MICROPHONE_BOOST, 0x2BC31D6A, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MIDI_IN_VOLUME, 0x185FEDF2, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIDI_MUTE, 0x185FEDE8, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIDI_VOLUME, 0x185FEDE7, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MIDI, 0x185FEDF8, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_MONO_MIX_MUTE, 0x2BC31D69, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_MIX_VOLUME, 0x22B0EAFE, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_MIX, 0x00DFF078, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_OUT_MUTE, 0x1AD247EC, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_OUT_VOLUME, 0x1AD247EB, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_MONO_OUT, 0xF9B41DC3, 0x96E2, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_PC_SPEAKER_MUTE, 0x185FEDF1, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_PC_SPEAKER_VOLUME, 0x185FEDF0, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_PC_SPEAKER, 0x185FEDFF, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DEFINE_GUID(KSAUDFNAME_PEAKMETER, 0x57E24340, 0xFC5B, 0x4612, 0xA5, 0x62, 0x72, 0xB1, 0x1A, 0x29, 0xDF, 0xAE); -DEFINE_GUID(KSAUDFNAME_VIDEO, 0x915DAEC4, 0xA434, 0x11D2, 0xAC, 0x52, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_RECORDING_CONTROL, 0x185FEDFA, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_RECORDING_SOURCE, 0x185FEDEF, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_STEREO_MIX_MUTE, 0x22B0EAFD, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_STEREO_MIX_VOLUME, 0x1AD247ED, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_STEREO_MIX, 0x00DFF077, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); +DEFINE_GUID(KSAUDFNAME_TREBLE, 0x185FEDE1, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_WAVE_IN_VOLUME, 0x185FEDF6, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_WAVE_MUTE, 0x185FEDE6, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_WAVE_OUT_MIX, 0x185FEE00, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_WAVE_VOLUME, 0x185FEDE5, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DEFINE_GUID(KSAUDFNAME_VIDEO_MUTE, 0x9B46E709, 0x992A, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); DEFINE_GUID(KSAUDFNAME_VIDEO_VOLUME, 0x9B46E708, 0x992A, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_3D_CENTER, 0x9F0670B4, 0x991F, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_3D_DEPTH, 0x63FF5747, 0x991F, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_ALTERNATE_MICROPHONE, 0x2BC31D6B, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_MICROPHONE_BOOST, 0x2BC31D6A, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_MONO_MIX_MUTE, 0x2BC31D69, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_MONO_MIX_VOLUME, 0x22B0EAFE, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_STEREO_MIX_MUTE, 0x22B0EAFD, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_STEREO_MIX_VOLUME, 0x1AD247ED, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_MONO_OUT_MUTE, 0x1AD247EC, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_MONO_OUT_VOLUME, 0x1AD247EB, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_MONO_MIX, 0x00DFF078, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_STEREO_MIX, 0x00DFF077, 0x96E3, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_MONO_OUT, 0xF9B41DC3, 0x96E2, 0x11D2, 0xAC, 0x4C, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); -DEFINE_GUID(KSAUDFNAME_WAVE_OUT_MIX, 0x185FEE00, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_PC_SPEAKER, 0x185FEDFF, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_AUX, 0x185FEDFE, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_AUX_MUTE, 0x185FEDFD, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_AUX_VOLUME, 0x185FEDFC, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_CD_AUDIO, 0x185FEDFB, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_RECORDING_CONTROL, 0x185FEDFA, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_LINE_IN, 0x185FEDF9, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MIDI, 0x185FEDF8, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSAUDFNAME_VIDEO, 0x915DAEC4, 0xA434, 0x11D2, 0xAC, 0x52, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); DEFINE_GUID(KSAUDFNAME_VOLUME_CONTROL, 0x185FEDF7, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_WAVE_IN_VOLUME, 0x185FEDF6, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MIC_IN_VOLUME, 0x185FEDF5, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_LINE_IN_VOLUME, 0x185FEDF4, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_CD_IN_VOLUME, 0x185FEDF3, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MIDI_IN_VOLUME, 0x185FEDF2, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_PC_SPEAKER_MUTE, 0x185FEDF1, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_PC_SPEAKER_VOLUME, 0x185FEDF0, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_RECORDING_SOURCE, 0x185FEDEF, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MIC_MUTE, 0x185FEDEE, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MIC_VOLUME, 0x185FEDED, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_LINE_MUTE, 0x185FEDEC, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_LINE_VOLUME, 0x185FEDEB, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_CD_MUTE, 0x185FEDEA, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_CD_VOLUME, 0x185FEDE9, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MIDI_MUTE, 0x185FEDE8, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MIDI_VOLUME, 0x185FEDE7, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_WAVE_MUTE, 0x185FEDE6, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_WAVE_VOLUME, 0x185FEDE5, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MASTER_MUTE, 0x185FEDE4, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_MASTER_VOLUME, 0x185FEDE3, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_3D_STEREO, 0x185FEDE2, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_TREBLE, 0x185FEDE1, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSAUDFNAME_BASS, 0x185FEDE0, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); - + +DEFINE_GUID(KSCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSCATEGORY_AUDIO_DEVICE, 0xFBF6F530, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_AUDIO_GFX, 0x9BAF9572, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F); +DEFINE_GUID(KSCATEGORY_AUDIO_SPLITTER, 0x9EA331FA, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE); +DEFINE_GUID(KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_ENCODER, 0x19689BF6, 0xC384, 0x48FD, 0xAD, 0x51, 0x90, 0xE5, 0x8C, 0x79, 0xF7, 0x0B); +DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER, 0x74F3AEA8, 0x9768, 0x11D1, 0x8E, 0x07, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); +DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR, 0x830A44F2, 0xA32D, 0x476B, 0xBE, 0x97, 0x42, 0x84, 0x56, 0x73, 0xB3, 0x5A); +DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSCATEGORY_MULTIPLEXER, 0x7A5DE1D3, 0x01A1, 0x452C, 0xB4, 0x81, 0x4F, 0xA2, 0xB9, 0x62, 0x71, 0xE8); -DEFINE_GUID(KSCATEGORY_ENCODER, 0x19689BF6, 0xC384, 0x48FD, 0xAD, 0x51, 0x90, 0xE5, 0x8C, 0x79, 0xF7, 0x0B); -DEFINE_GUID(KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); -DEFINE_GUID(KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); -DEFINE_GUID(KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); -DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER, 0x74F3AEA8, 0x9768, 0x11D1, 0x8E, 0x07, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); -DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_NETWORK, 0x67C9CC3C, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, 0xD6C50674, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEIN_DEVICE, 0xD6C50671, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, 0xD6C5066E, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_AUDIO_DEVICE, 0xFBF6F530, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_AUDIO_SPLITTER, 0x9EA331FA, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE); -DEFINE_GUID(KSCATEGORY_AUDIO_GFX, 0x9BAF9572, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F); +DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_SYSAUDIO, 0xA7C7A5B1, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07); +DEFINE_GUID(KSCATEGORY_TEXT, 0x6994AD06, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); DEFINE_GUID(KSCATEGORY_WDMAUD, 0x3E227E76, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1); -DEFINE_GUID(KSCATEGORY_SYSAUDIO, 0xA7C7A5B1, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07); -DEFINE_GUID(KSCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSCATEGORY_VIRTUAL, 0x3503EAC4, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_NETWORK, 0x67C9CC3C, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_TEXT, 0x6994AD06, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR, 0x830A44F2, 0xA32D, 0x476B, 0xBE, 0x97, 0x42, 0x84, 0x56, 0x73, 0xB3, 0x5A); - -DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_OVERLAY, 0xE436EB7F, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); + +DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); + DEFINE_GUID(KSDATAFORMAT_SPECIFIER_AC3_AUDIO, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO, 0x36523B35, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO, 0x36523B32, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO, 0x36523B31, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO, 0x36523B34, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO, 0x36523B33, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_LPCM_AUDIO, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO, 0x05589F82, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_AC3_AUDIO, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_LPCM_AUDIO, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO, 0x05589F82, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Video, 0xE436EB86, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Payload, 0xE436EB81, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Packet, 0xE436EB80, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_AUDIO, 0xA0AF4F82, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_VIDEO, 0xA0AF4F81, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO, 0x36523B35, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO, 0x36523B34, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO, 0x36523B33, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO, 0x36523B32, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO, 0x36523B31, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DTS_AUDIO, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI_BUS, 0x2CA15FA0, 0x6CFE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI, 0x1D262760, 0xE957, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Packet, 0xE436EB80, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Payload, 0xE436EB81, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Video, 0xE436EB86, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_OVERLAY, 0xE436EB7F, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFMIDI, 0x4995DAF0, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SDDS_AUDIO, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO, 0x36523B25, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO, 0x36523B22, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO, 0x36523B21, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO, 0x36523B24, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO, 0x36523B23, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO, 0x36523B22, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO, 0x36523B21, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); +DEFINE_GUID(KSDATAFORMAT_TYPE_MIDI, 0x7364696D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MUSIC, 0xE725D360, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM, 0x36523B11, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PES_PACKET, 0x36523B12, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM, 0x36523B11, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFMIDI, 0x4995DAF0, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI_BUS, 0x2CA15FA0, 0x6CFE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI, 0x1D262760, 0xE957, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_TYPE_MIDI, 0x7364696D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_MUSIC, 0xE725D360, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SDDS_AUDIO, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DTS_AUDIO, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); DEFINE_GUID(KSDATAFORMAT_TYPE_TEXT, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); DEFINE_GUID(KSDATAFORMAT_TYPE_VIDEO, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); - -DEFINE_GUID(KSEVENTSETID_VPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); + +DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); + +DEFINE_GUID(KSEVENTSETID_AudioControlChange, 0xE85E9698, 0xFA2F, 0x11D1, 0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Cyclic, 0x142C1AC0, 0x072A, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_EXTDEV_Command, 0x109C7988, 0xB3CB, 0x11D2, 0xB4, 0x8E, 0x00, 0x60, 0x97, 0xB3, 0x39, 0x1B); +DEFINE_GUID(KSEVENTSETID_LoopedStreaming, 0x4682B940, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D); +DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSEVENTSETID_Sysaudio, 0x04800320, 0x4491, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_VIDCAP_TVAUDIO, 0x6A2E0651, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(KSEVENTSETID_VIDCAPTOSTI, 0xDB47DE20, 0xF628, 0x11D1, 0xBA, 0x41, 0x00, 0xA0, 0xC9, 0x0D, 0x2B, 0x05); DEFINE_GUID(KSEVENTSETID_VPNotify, 0x20C5598E, 0xD3C8, 0x11D0, 0x8D, 0xFC, 0x00, 0xC0, 0x4F, 0xD7, 0xC0, 0x8B); -DEFINE_GUID(KSEVENTSETID_VIDCAP_TVAUDIO, 0x6A2E0651, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(KSEVENTSETID_EXTDEV_Command, 0x109C7988, 0xB3CB, 0x11D2, 0xB4, 0x8E, 0x00, 0x60, 0x97, 0xB3, 0x39, 0x1B); -DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSEVENTSETID_Sysaudio, 0x04800320, 0x4491, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_LoopedStreaming, 0x4682B940, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D); -DEFINE_GUID(KSEVENTSETID_AudioControlChange, 0xE85E9698, 0xFA2F, 0x11D1, 0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSEVENTSETID_Cyclic, 0x142C1AC0, 0x072A, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); - -DEFINE_GUID(KSMEDIUMSETID_VPBus, 0xA18C15EC, 0xCE43, 0x11D0, 0xAB, 0xE7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSEVENTSETID_VPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); + +DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSINTERFACESETID_Media, 0x3A13EB40, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); + DEFINE_GUID(KSMEDIUMSETID_MidiBus, 0x05908040, 0x3246, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMETHODSETID_Wave_Queued, 0x7432C160, 0x8827, 0x11CF, 0xA1, 0x02, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMETHODSETID_Wavetable, 0xDCEF31EB, 0xD907, 0x11D0, 0x95, 0x83, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSMEDIUMSETID_VPBus, 0xA18C15EC, 0xCE43, 0x11D0, 0xAB, 0xE7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); - + +DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSMETHODSETID_Wave_Queued, 0x7432C160, 0x8827, 0x11CF, 0xA1, 0x02, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMETHODSETID_Wavetable, 0xDCEF31EB, 0xD907, 0x11D0, 0x95, 0x83, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); + +DEFINE_GUID(KSMUSIC_TECHNOLOGY_FMSYNTH, 0x252C5C80, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_PORT, 0x86C92E60, 0x62E8, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_SQSYNTH, 0x0ECF4380, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSMUSIC_TECHNOLOGY_SWSYNTH, 0x37407736, 0x3620, 0x11D1, 0x85, 0xD3, 0x00, 0x00, 0xF8, 0x75, 0x43, 0x80); DEFINE_GUID(KSMUSIC_TECHNOLOGY_WAVETABLE, 0x394EC7C0, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_FMSYNTH, 0x252C5C80, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_SQSYNTH, 0x0ECF4380, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_PORT, 0x86C92E60, 0x62E8, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); - -DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSNAME_Server, 0x3C0D501A, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); - -DEFINE_GUID(KSNODETYPE_VIDEO_OUTPUT_MTT, 0xDFF229E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VIDEO_INPUT_MTT, 0xDFF229E7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VIDEO_CAMERA_TERMINAL, 0xDFF229E6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VIDEO_PROCESSING, 0xDFF229E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VIDEO_SELECTOR, 0xDFF229E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VIDEO_OUTPUT_TERMINAL, 0xDFF229E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VIDEO_INPUT_TERMINAL, 0xDFF229E2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(KSNODETYPE_1394_DA_STREAM, 0xDFF21FE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_1394_DV_STREAM_SOUNDTRACK, 0xDFF21FE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_3D_EFFECTS, 0x55515860, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_ADC, 0x4D837FE0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_AG, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_ANALOG_CONNECTOR, 0xDFF21FE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ANALOG_TAPE, 0xDFF220E7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_CABLE_TUNER_AUDIO, 0xDFF220EE, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_CD_PLAYER, 0xDFF220E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_CHORUS, 0x20173F20, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_COMMUNICATION_SPEAKER, 0xDFF21CE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DAC, 0x507AE360, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE, 0xDFF220E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE, 0xDFF220E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DELAY, 0x144981E0, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DEMUX, 0xC0EB67D4, 0xE807, 0x11D0, 0x95, 0x8A, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSNODETYPE_DESKTOP_MICROPHONE, 0xDFF21BE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DESKTOP_SPEAKER, 0xDFF21CE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DEV_SPECIFIC, 0x941C7AC0, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_DIGITAL_AUDIO_INTERFACE, 0xDFF21FE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DOWN_LINE_PHONE, 0xDFF21EE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DRM_DESCRAMBLE, 0xFFBB6E3F, 0xCCFE, 0x4D84, 0x90, 0xD9, 0x42, 0x14, 0x18, 0xB0, 0x3A, 0x8E); +DEFINE_GUID(KSNODETYPE_DSS_AUDIO, 0xDFF220EF, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_DVD_AUDIO, 0xDFF220EB, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE, 0xDFF21DE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE, 0xDFF21DE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_EQUALIZATION_NOISE, 0xDFF220E2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_EQUALIZER, 0x9D41B4A0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_HANDSET, 0xDFF21DE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO, 0xDFF21CE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEADPHONES, 0xDFF21CE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_HEADSET, 0xDFF21DE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LEGACY_AUDIO_CONNECTOR, 0xDFF21FE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE, 0xDFF220E1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LINE_CONNECTOR, 0xDFF21FE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_LOUDNESS, 0x41887440, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER, 0xDFF21CE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MICROPHONE_ARRAY, 0xDFF21BE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MICROPHONE, 0xDFF21BE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MINIDISK, 0xDFF220E6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MULTITRACK_RECORDER, 0xDFF220F2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_MUTE, 0x02B223C0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_MUX, 0x2CEAF780, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_NOISE_SUPPRESS, 0xE07F903F, 0x62FD, 0x4E60, 0x8C, 0xDD, 0xDE, 0xA7, 0x23, 0x66, 0x65, 0xB5); +DEFINE_GUID(KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE, 0xDFF21BE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PEAKMETER, 0xA085651E, 0x5F0D, 0x4B36, 0xA8, 0x69, 0xD1, 0x95, 0xD6, 0xAB, 0x4B, 0x9E); +DEFINE_GUID(KSNODETYPE_PERSONAL_MICROPHONE, 0xDFF21BE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PHONE_LINE, 0xDFF21EE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PHONOGRAPH, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PROCESSING_MICROPHONE_ARRAY, 0xDFF21BE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_PROLOGIC_DECODER, 0x831C2C80, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_PROLOGIC_ENCODER, 0x8074C5B2, 0x3C66, 0x11D2, 0xB4, 0x5A, 0x30, 0x78, 0x30, 0x2C, 0x20, 0x30); +DEFINE_GUID(KSNODETYPE_RADIO_RECEIVER, 0xDFF220F0, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_RADIO_TRANSMITTER, 0xDFF220F1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_REVERB, 0xEF0328E0, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSNODETYPE_ROOM_SPEAKER, 0xDFF21CE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SATELLITE_RECEIVER_AUDIO, 0xDFF220ED, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPDIF_INTERFACE, 0xDFF21FE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPEAKER, 0xDFF21CE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION, 0xDFF21DE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_SRC, 0x9DB7B9E0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_STEREO_ENHANCE, 0xAF6878AC, 0xE83F, 0x11D0, 0x95, 0x8A, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DEFINE_GUID(KSNODETYPE_STEREO_WIDE, 0xA9E69800, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_PROLOGIC_DECODER, 0x831C2C80, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_LOUDNESS, 0x41887440, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_DELAY, 0x144981E0, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_NOISE_SUPPRESS, 0xE07F903F, 0x62FD, 0x4E60, 0x8C, 0xDD, 0xDE, 0xA7, 0x23, 0x66, 0x65, 0xB5); -DEFINE_GUID(KSNODETYPE_AG, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_EQUALIZER, 0x9D41B4A0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_TONE, 0x7607E580, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_MUTE, 0x02B223C0, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_SUM, 0xDA441A60, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_DEMUX, 0xC0EB67D4, 0xE807, 0x11D0, 0x95, 0x8A, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSNODETYPE_MUX, 0x2CEAF780, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_SUPERMIX, 0xE573ADC0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_SRC, 0x9DB7B9E0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_ADC, 0x4D837FE0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_DAC, 0x507AE360, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSNODETYPE_DRM_DESCRAMBLE, 0xFFBB6E3F, 0xCCFE, 0x4D84, 0x90, 0xD9, 0x42, 0x14, 0x18, 0xB0, 0x3A, 0x8E); DEFINE_GUID(KSNODETYPE_SWMIDI, 0xCB9BEFA0, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); DEFINE_GUID(KSNODETYPE_SWSYNTH, 0x423274A0, 0x8B81, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); DEFINE_GUID(KSNODETYPE_SYNTHESIZER, 0xDFF220F3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MULTITRACK_RECORDER, 0xDFF220F2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_RADIO_TRANSMITTER, 0xDFF220F1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_RADIO_RECEIVER, 0xDFF220F0, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DSS_AUDIO, 0xDFF220EF, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_CABLE_TUNER_AUDIO, 0xDFF220EE, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SATELLITE_RECEIVER_AUDIO, 0xDFF220ED, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_TELEPHONE, 0xDFF21EE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_TONE, 0x7607E580, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_TV_TUNER_AUDIO, 0xDFF220EC, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DVD_AUDIO, 0xDFF220EB, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VCR_AUDIO, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_CAMERA_TERMINAL, 0xDFF229E6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_VIDEO_DISC_AUDIO, 0xDFF220EA, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_VCR_AUDIO, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PHONOGRAPH, 0xDFF220E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ANALOG_TAPE, 0xDFF220E7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MINIDISK, 0xDFF220E6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DCC_IO_DIGITAL_COMPACT_CASSETTE, 0xDFF220E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DAT_IO_DIGITAL_AUDIO_TAPE, 0xDFF220E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_CD_PLAYER, 0xDFF220E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_EQUALIZATION_NOISE, 0xDFF220E2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LEVEL_CALIBRATION_NOISE_SOURCE, 0xDFF220E1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_1394_DV_STREAM_SOUNDTRACK, 0xDFF21FE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_1394_DA_STREAM, 0xDFF21FE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SPDIF_INTERFACE, 0xDFF21FE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LEGACY_AUDIO_CONNECTOR, 0xDFF21FE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LINE_CONNECTOR, 0xDFF21FE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DIGITAL_AUDIO_INTERFACE, 0xDFF21FE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ANALOG_CONNECTOR, 0xDFF21FE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DOWN_LINE_PHONE, 0xDFF21EE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_TELEPHONE, 0xDFF21EE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PHONE_LINE, 0xDFF21EE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ECHO_CANCELING_SPEAKERPHONE, 0xDFF21DE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ECHO_SUPPRESSING_SPEAKERPHONE, 0xDFF21DE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SPEAKERPHONE_NO_ECHO_REDUCTION, 0xDFF21DE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HEADSET, 0xDFF21DE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HANDSET, 0xDFF21DE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_LOW_FREQUENCY_EFFECTS_SPEAKER, 0xDFF21CE7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_COMMUNICATION_SPEAKER, 0xDFF21CE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_ROOM_SPEAKER, 0xDFF21CE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DESKTOP_SPEAKER, 0xDFF21CE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO, 0xDFF21CE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_HEADPHONES, 0xDFF21CE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_SPEAKER, 0xDFF21CE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PROCESSING_MICROPHONE_ARRAY, 0xDFF21BE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MICROPHONE_ARRAY, 0xDFF21BE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE, 0xDFF21BE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PERSONAL_MICROPHONE, 0xDFF21BE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_DESKTOP_MICROPHONE, 0xDFF21BE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_MICROPHONE, 0xDFF21BE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNODETYPE_PEAKMETER, 0xA085651E, 0x5F0D, 0x4B36, 0xA8, 0x69, 0xD1, 0x95, 0xD6, 0xAB, 0x4B, 0x9E); -DEFINE_GUID(KSNODETYPE_PROLOGIC_ENCODER, 0x8074C5B2, 0x3C66, 0x11D2, 0xB4, 0x5A, 0x30, 0x78, 0x30, 0x2C, 0x20, 0x30); -DEFINE_GUID(KSNODETYPE_DEV_SPECIFIC, 0x941C7AC0, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); - -DEFINE_GUID(KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); -DEFINE_GUID(KSPROPSETID_VPConfig, 0xBC29A660, 0x30E3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B); +DEFINE_GUID(KSNODETYPE_VIDEO_INPUT_MTT, 0xDFF229E7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_INPUT_TERMINAL, 0xDFF229E2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_OUTPUT_MTT, 0xDFF229E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_OUTPUT_TERMINAL, 0xDFF229E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_PROCESSING, 0xDFF229E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_SELECTOR, 0xDFF229E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); + +DEFINE_GUID(KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Acoustic_Echo_Cancel, 0xD7A4AF8B, 0x3DC1, 0x4902, 0x91, 0xEA, 0x8A, 0x15, 0xC9, 0x0E, 0x05, 0xB2); +DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_AudioDecoderOut, 0x6CA6E020, 0x43BD, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSPROPSETID_AudioGfx, 0x79A9312E, 0x59AE, 0x43B0, 0xA3, 0x50, 0x8B, 0x05, 0x28, 0x4C, 0xAB, 0x24); +DEFINE_GUID(KSPROPSETID_Bibliographic, 0x07BA150E, 0xE2B1, 0x11D0, 0xAC, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3); +DEFINE_GUID(KSPROPSETID_Cyclic, 0x3FFEAEA0, 0x2BEE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DirectSound3DListener, 0x437B3414, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DrmAudioStream, 0x2F2C8DDD, 0x4198, 0x4FAC, 0xBA, 0x29, 0x61, 0xBB, 0x05, 0xB7, 0xDE, 0x06); +DEFINE_GUID(KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); +DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); +DEFINE_GUID(KSPROPSETID_Linear, 0x5A2FFE80, 0x16B9, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_Mpeg2Vid, 0xC8E11B60, 0x0CC9, 0x11D0, 0xBD, 0x69, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); DEFINE_GUID(KSPROPSETID_OverlayUpdate, 0x490EA5CF, 0x7681, 0x11D1, 0xA2, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3); -DEFINE_GUID(KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); -DEFINE_GUID(KSPROPSETID_AudioDecoderOut, 0x6CA6E020, 0x43BD, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); -DEFINE_GUID(KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Mpeg2Vid, 0xC8E11B60, 0x0CC9, 0x11D0, 0xBD, 0x69, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); -DEFINE_GUID(KSPROPSETID_Linear, 0x5A2FFE80, 0x16B9, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_AudioGfx, 0x79A9312E, 0x59AE, 0x43B0, 0xA3, 0x50, 0x8B, 0x05, 0x28, 0x4C, 0xAB, 0x24); +DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_RtAudio, 0xA855A48C, 0x2F78, 0x4729, 0x90, 0x51, 0x19, 0x68, 0x74, 0x6B, 0x9E, 0xEF); +DEFINE_GUID(KSPROPSETID_Service, 0x3C0D501B, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); DEFINE_GUID(KSPROPSETID_Sysaudio_Pin, 0xA3A53220, 0xC6E4, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); DEFINE_GUID(KSPROPSETID_Sysaudio, 0xCBE3FAA0, 0xCC75, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); -DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); -DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSPROPSETID_DirectSound3DListener, 0x437B3414, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); -DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_DrmAudioStream, 0x2F2C8DDD, 0x4198, 0x4FAC, 0xBA, 0x29, 0x61, 0xBB, 0x05, 0xB7, 0xDE, 0x06); -DEFINE_GUID(KSPROPSETID_RtAudio, 0xA855A48C, 0x2F78, 0x4729, 0x90, 0x51, 0x19, 0x68, 0x74, 0x6B, 0x9E, 0xEF); +DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_TopologyNode, 0x45FFAAA1, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Bibliographic, 0x07BA150E, 0xE2B1, 0x11D0, 0xAC, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_Service, 0x3C0D501B, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); -DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_Cyclic, 0x3FFEAEA0, 0x2BEE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Wave_Queued, 0x16A15B10, 0x16F0, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_Wave, 0x924E54B0, 0x630F, 0x11CF, 0xAD, 0xA7, 0x08, 0x00, 0x3E, 0x30, 0x49, 0x4A); DEFINE_GUID(KSPROPSETID_WaveTable, 0x8539E660, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Wave, 0x924E54B0, 0x630F, 0x11CF, 0xAD, 0xA7, 0x08, 0x00, 0x3E, 0x30, 0x49, 0x4A); -DEFINE_GUID(KSPROPSETID_Wave_Queued, 0x16A15B10, 0x16F0, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_Acoustic_Echo_Cancel, 0xD7A4AF8B, 0x3DC1, 0x4902, 0x91, 0xEA, 0x8A, 0x15, 0xC9, 0x0E, 0x05, 0xB2); -DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_VPConfig, 0xBC29A660, 0x30E3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B); +DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); +DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(PROPSETID_EXT_DEVICE, 0xB5730A90, 0x1A2C, 0x11CF, 0x8C, 0x23, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); DEFINE_GUID(PROPSETID_EXT_TRANSPORT, 0xA03CD5F0, 0x3045, 0x11CF, 0x8C, 0x44, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); DEFINE_GUID(PROPSETID_TIMECODE_READER, 0x9B496CE1, 0x811B, 0x11CF, 0x8C, 0x77, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); DEFINE_GUID(PROPSETID_VIDCAP_CAMERACONTROL, 0xC6E13370, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_CROSSBAR, 0x6A2E0640, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_DROPPEDFRAMES, 0xC6E13344, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_TVAUDIO, 0x6A2E0650, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCOMPRESSION, 0xC6E13343, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCONTROL, 0x6A2E0670, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEODECODER, 0xC6E13350, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOENCODER, 0x6A2E0610, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(PROPSETID_VIDCAP_DROPPEDFRAMES, 0xC6E13344, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCONTROL, 0x6A2E0670, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCOMPRESSION, 0xC6E13343, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(PROPSETID_VIDCAP_TVAUDIO, 0x6A2E0650, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(PROPSETID_VIDCAP_CROSSBAR, 0x6A2E0640, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); - - -DEFINE_GUID(KSINTERFACESETID_Media, 0x3A13EB40, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); -DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); - +

1 0

[fireball] 30251: - SVN Maintenance.
by fireball＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: fireball Date: Thu Nov 8 01:59:56 2007 New Revision: 30251 URL: http://svn.reactos.org/svn/reactos?rev=30251&view=rev Log: - SVN Maintenance. Modified: trunk/reactos/base/applications/games/solitaire/cardlib/card.h (props changed) trunk/reactos/base/applications/regedit/clb/clb.c (props changed) trunk/reactos/base/applications/regedit/clb/clbdll.h (props changed) trunk/reactos/base/applications/regedit/clb/precomp.h (props changed) trunk/reactos/base/applications/regedit/clb/resource.h (props changed) trunk/reactos/dll/ntdll/csr/api.c (props changed) trunk/reactos/dll/ntdll/csr/capture.c (props changed) trunk/reactos/dll/ntdll/csr/connect.c (props changed) trunk/reactos/dll/ntdll/main/dispatch.c (props changed) trunk/reactos/dll/ntdll/main/i386/dispatch.S (props changed) trunk/reactos/dll/ntdll/rtl/version.c (props changed) trunk/reactos/dll/win32/devmgr/resources/devmgr.ico (props changed) trunk/reactos/dll/win32/kernel32/debug/output.c (props changed) trunk/reactos/dll/win32/kernel32/file/backup.c (props changed) trunk/reactos/dll/win32/kernel32/file/cnotify.c (props changed) trunk/reactos/dll/win32/kernel32/file/copy.c (props changed) trunk/reactos/dll/win32/kernel32/file/create.c (props changed) trunk/reactos/dll/win32/kernel32/file/curdir.c (props changed) trunk/reactos/dll/win32/kernel32/file/delete.c (props changed) trunk/reactos/dll/win32/kernel32/file/deviceio.c (props changed) trunk/reactos/dll/win32/kernel32/file/dosdev.c (props changed) trunk/reactos/dll/win32/kernel32/file/find.c (props changed) trunk/reactos/dll/win32/kernel32/file/hardlink.c (props changed) trunk/reactos/dll/win32/kernel32/file/lfile.c (props changed) trunk/reactos/dll/win32/kernel32/file/lock.c (props changed) trunk/reactos/dll/win32/kernel32/file/move.c (props changed) trunk/reactos/dll/win32/kernel32/file/pipe.c (props changed) trunk/reactos/dll/win32/kernel32/file/rw.c (props changed) trunk/reactos/dll/win32/kernel32/file/tape.c (props changed) trunk/reactos/dll/win32/kernel32/file/volume.c (props changed) trunk/reactos/dll/win32/kernel32/include/kernel32.h (props changed) trunk/reactos/dll/win32/kernel32/k32.h (props changed) trunk/reactos/dll/win32/kernel32/kernel32.def (props changed) trunk/reactos/dll/win32/kernel32/kernel32.mc (props changed) trunk/reactos/dll/win32/kernel32/kernel32.rc (props changed) trunk/reactos/dll/win32/kernel32/misc/atom.c (props changed) trunk/reactos/dll/win32/kernel32/misc/comm.c (props changed) trunk/reactos/dll/win32/kernel32/misc/computername.c (props changed) trunk/reactos/dll/win32/kernel32/misc/console.c (props changed) trunk/reactos/dll/win32/kernel32/misc/dllmain.c (props changed) trunk/reactos/dll/win32/kernel32/misc/env.c (props changed) trunk/reactos/dll/win32/kernel32/misc/handle.c (props changed) trunk/reactos/dll/win32/kernel32/misc/lang.c (props changed) trunk/reactos/dll/win32/kernel32/misc/ldr.c (props changed) trunk/reactos/dll/win32/kernel32/misc/timerqueue.c (props changed) trunk/reactos/dll/win32/kernel32/misc/toolhelp.c (props changed) trunk/reactos/dll/win32/kernel32/misc/utils.c (props changed) trunk/reactos/dll/win32/kernel32/misc/version.c (props changed) trunk/reactos/dll/win32/kernel32/process/cmdline.c (props changed) trunk/reactos/dll/win32/kernel32/process/job.c (props changed) trunk/reactos/dll/win32/kernel32/process/proc.c (props changed) trunk/reactos/dll/win32/kernel32/process/procsup.c (props changed) trunk/reactos/dll/win32/kernel32/process/session.c (props changed) trunk/reactos/dll/win32/kernel32/thread/fiber.c (props changed) trunk/reactos/dll/win32/kernel32/thread/fls.c (props changed) trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S (props changed) trunk/reactos/dll/win32/kernel32/thread/i386/thread.S (props changed) trunk/reactos/dll/win32/kernel32/thread/thread.c (props changed) trunk/reactos/dll/win32/kernel32/thread/tls.c (props changed) trunk/reactos/dll/win32/lsasrv/lsarpc.c (props changed) trunk/reactos/dll/win32/lsasrv/lsasrv.c (props changed) trunk/reactos/dll/win32/lsasrv/lsasrv.def (props changed) trunk/reactos/dll/win32/lsasrv/lsasrv.rc (props changed) trunk/reactos/dll/win32/mmdrv/auxil.c (props changed) trunk/reactos/dll/win32/mmdrv/entry.c (props changed) trunk/reactos/dll/win32/mmdrv/midi.c (props changed) trunk/reactos/dll/win32/mmdrv/mmddk.h (props changed) trunk/reactos/dll/win32/mmdrv/mmdef.h (props changed) trunk/reactos/dll/win32/mmdrv/mmdrv.def (props changed) trunk/reactos/dll/win32/mmdrv/mmdrv.h (props changed) trunk/reactos/dll/win32/mmdrv/utils.c (props changed) trunk/reactos/dll/win32/mmdrv/wave.c (props changed) trunk/reactos/dll/win32/mmdrv/wave.h (props changed) trunk/reactos/dll/win32/msafd/include/debug.h (props changed) trunk/reactos/dll/win32/msafd/include/helpers.h (props changed) trunk/reactos/dll/win32/msafd/misc/dllmain.c (props changed) trunk/reactos/dll/win32/msafd/misc/event.c (props changed) trunk/reactos/dll/win32/msafd/misc/helpers.c (props changed) trunk/reactos/dll/win32/msafd/misc/sndrcv.c (props changed) trunk/reactos/dll/win32/msafd/misc/stubs.c (props changed) trunk/reactos/dll/win32/msafd/msafd.def (props changed) trunk/reactos/dll/win32/msafd/msafd.h (props changed) trunk/reactos/dll/win32/msafd/msafd.rc (props changed) trunk/reactos/dll/win32/secur32/secur32.rc (props changed) trunk/reactos/drivers/network/dd/pcnet/pci.h (props changed) trunk/reactos/drivers/network/dd/pcnet/pcnet.c (props changed) trunk/reactos/drivers/network/dd/pcnet/pcnet.h (props changed) trunk/reactos/drivers/network/dd/pcnet/pcnet.rc (props changed) trunk/reactos/drivers/network/dd/pcnet/pcnethw.h (props changed) trunk/reactos/drivers/network/dd/pcnet/requests.c (props changed) trunk/reactos/drivers/storage/ide/pciide/pciide.c (props changed) trunk/reactos/drivers/storage/ide/pciide/pciide.h (props changed) trunk/reactos/drivers/storage/ide/pciide/pciide.rc (props changed) trunk/reactos/drivers/storage/port/buslogic/BusLogic958.rc (props changed) trunk/reactos/hal/halx86/mp/apic.c (props changed) trunk/reactos/hal/halx86/mp/halinit_mp.c (props changed) trunk/reactos/hal/halx86/mp/halmp.rc (props changed) trunk/reactos/hal/halx86/mp/ioapic.c (props changed) trunk/reactos/hal/halx86/mp/ipi_mp.c (props changed) trunk/reactos/hal/halx86/mp/mpconfig.c (props changed) trunk/reactos/hal/halx86/mp/mps.S (props changed) trunk/reactos/hal/halx86/mp/mpsboot.asm (props changed) trunk/reactos/hal/halx86/mp/mpsirql.c (props changed) trunk/reactos/hal/halx86/mp/processor_mp.c (props changed) Propchange: trunk/reactos/base/applications/games/solitaire/cardlib/card.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/regedit/clb/clb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/regedit/clb/clbdll.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/regedit/clb/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/regedit/clb/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/csr/api.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/csr/capture.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/csr/connect.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/main/dispatch.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/main/i386/dispatch.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/rtl/version.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/devmgr/resources/devmgr.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/debug/output.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/backup.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/cnotify.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/copy.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/create.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/curdir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/delete.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/deviceio.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/dosdev.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/find.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/hardlink.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/lfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/lock.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/move.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/pipe.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/rw.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/tape.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/file/volume.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/include/kernel32.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/k32.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/kernel32.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/kernel32.mc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/kernel32.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/atom.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/comm.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/computername.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/console.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/env.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/handle.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/lang.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/ldr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/timerqueue.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/toolhelp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/utils.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/misc/version.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/process/cmdline.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/process/job.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/process/proc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/process/procsup.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/process/session.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/thread/fiber.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/thread/fls.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/thread/i386/thread.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/thread/thread.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/thread/tls.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/lsasrv/lsarpc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/lsasrv/lsasrv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/lsasrv/lsasrv.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/lsasrv/lsasrv.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/auxil.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/entry.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/midi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/mmddk.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/mmdef.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/mmdrv.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/mmdrv.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/utils.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/wave.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/mmdrv/wave.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/include/debug.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/include/helpers.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/misc/dllmain.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/misc/event.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/misc/helpers.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/misc/sndrcv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/misc/stubs.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/msafd.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/msafd.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/msafd/msafd.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/secur32/secur32.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/network/dd/pcnet/pci.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/network/dd/pcnet/pcnet.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/network/dd/pcnet/pcnet.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/network/dd/pcnet/pcnet.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/network/dd/pcnet/pcnethw.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/network/dd/pcnet/requests.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/storage/ide/pciide/pciide.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/storage/ide/pciide/pciide.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/storage/ide/pciide/pciide.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/storage/port/buslogic/BusLogic958.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/apic.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/halinit_mp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/halmp.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/ioapic.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/ipi_mp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/mpconfig.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/mps.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/mpsboot.asm ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/mpsirql.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/hal/halx86/mp/processor_mp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 30250: add some more guids id to ksguid smaller cleanup/sort in the guids define list bit
by greatlrd＠svn.reactos.org 07 Nov '07

07 Nov '07

Author: greatlrd Date: Thu Nov 8 01:47:20 2007 New Revision: 30250 URL: http://svn.reactos.org/svn/reactos?rev=30250&view=rev Log: add some more guids id to ksguid smaller cleanup/sort in the guids define list bit Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Modified: branches/reactx/reactos/lib/sdk/ksguid/ksguid.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/ksguid/k… ============================================================================== --- branches/reactx/reactos/lib/sdk/ksguid/ksguid.c (original) +++ branches/reactx/reactos/lib/sdk/ksguid/ksguid.c Thu Nov 8 01:47:20 2007 @@ -48,99 +48,18 @@ DEFINE_GUID(ENCAPIPARAM_PEAK_BITRATE, 0x703F16A9, 0x3D48, 0x44A1, 0xB0, 0x77, 0x01, 0x8D, 0xFF, 0x91, 0x5D, 0x19); DEFINE_GUID(ENCAPIPARAM_BITRATE, 0x49CC4C43, 0xCA83, 0x4AD4, 0xA9, 0xAF, 0xF3, 0x69, 0x6A, 0xF6, 0x66, 0xDF); DEFINE_GUID(EVENTSETID_CROSSBAR, 0x6A2E0641, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(EVENTSETID_VIDEODECODER, 0x6A2E0621, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(GUID_NULL, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); DEFINE_GUID(GUID_BUS_INTERFACE_MEDIUMS, 0x4EC35C3E, 0x201B, 0x11D2, 0x87, 0x45, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KoCreateObject, 0x72CF721C, 0x525A, 0x11D1, 0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_MULTIPLEXER, 0x7A5DE1D3, 0x01A1, 0x452C, 0xB4, 0x81, 0x4F, 0xA2, 0xB9, 0x62, 0x71, 0xE8); -DEFINE_GUID(KSCATEGORY_ENCODER, 0x19689BF6, 0xC384, 0x48FD, 0xAD, 0x51, 0x90, 0xE5, 0x8C, 0x79, 0xF7, 0x0B); -DEFINE_GUID(KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); -DEFINE_GUID(KSEVENTSETID_VPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); -DEFINE_GUID(KSEVENTSETID_VIDCAPTOSTI, 0xDB47DE20, 0xF628, 0x11D1, 0xBA, 0x41, 0x00, 0xA0, 0xC9, 0x0D, 0x2B, 0x05); -DEFINE_GUID(KSEVENTSETID_VPNotify, 0x20C5598E, 0xD3C8, 0x11D0, 0x8D, 0xFC, 0x00, 0xC0, 0x4F, 0xD7, 0xC0, 0x8B); -DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); -DEFINE_GUID(KSPROPSETID_VPConfig, 0xBC29A660, 0x30E3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B); -DEFINE_GUID(KSPROPSETID_OverlayUpdate, 0x490EA5CF, 0x7681, 0x11D1, 0xA2, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_OVERLAY, 0xE436EB7F, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSEVENTSETID_VIDCAP_TVAUDIO, 0x6A2E0651, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(KSEVENTSETID_EXTDEV_Command, 0x109C7988, 0xB3CB, 0x11D2, 0xB4, 0x8E, 0x00, 0x60, 0x97, 0xB3, 0x39, 0x1B); - - - - - -DEFINE_GUID(KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); -DEFINE_GUID(KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); -DEFINE_GUID(KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); -DEFINE_GUID(KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3); -DEFINE_GUID(KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSPROPSETID_AudioDecoderOut, 0x6CA6E020, 0x43BD, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SDDS_AUDIO, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DTS_AUDIO, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_AC3_AUDIO, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_AC3_AUDIO, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_LPCM_AUDIO, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSPROPSETID_Mpeg2Vid, 0xC8E11B60, 0x0CC9, 0x11D0, 0xBD, 0x69, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO, 0x05589F82, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Video, 0xE436EB86, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Payload, 0xE436EB81, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Packet, 0xE436EB80, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_AUDIO, 0xA0AF4F82, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_VIDEO, 0xA0AF4F81, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO, 0x36523B35, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO, 0x36523B34, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO, 0x36523B33, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO, 0x36523B32, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO, 0x36523B31, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO, 0x36523B25, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO, 0x36523B24, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO, 0x36523B23, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO, 0x36523B22, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO, 0x36523B21, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PES_PACKET, 0x36523B12, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM, 0x36523B11, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFMIDI, 0x4995DAF0, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI_BUS, 0x2CA15FA0, 0x6CFE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI, 0x1D262760, 0xE957, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_TYPE_MIDI, 0x7364696D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_MUSIC, 0xE725D360, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Linear, 0x5A2FFE80, 0x16B9, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_AudioGfx, 0x79A9312E, 0x59AE, 0x43B0, 0xA3, 0x50, 0x8B, 0x05, 0x28, 0x4C, 0xAB, 0x24); -DEFINE_GUID(KSPROPSETID_Sysaudio_Pin, 0xA3A53220, 0xC6E4, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); -DEFINE_GUID(KSPROPSETID_Sysaudio, 0xCBE3FAA0, 0xCC75, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); -DEFINE_GUID(KSEVENTSETID_Sysaudio, 0x04800320, 0x4491, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_LoopedStreaming, 0x4682B940, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D); -DEFINE_GUID(KSEVENTSETID_AudioControlChange, 0xE85E9698, 0xFA2F, 0x11D1, 0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSPROPSETID_Cyclic, 0x3FFEAEA0, 0x2BEE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Cyclic, 0x142C1AC0, 0x072A, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_WaveTable, 0x8539E660, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_SWSYNTH, 0x37407736, 0x3620, 0x11D1, 0x85, 0xD3, 0x00, 0x00, 0xF8, 0x75, 0x43, 0x80); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_WAVETABLE, 0x394EC7C0, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_FMSYNTH, 0x252C5C80, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_SQSYNTH, 0x0ECF4380, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMUSIC_TECHNOLOGY_PORT, 0x86C92E60, 0x62E8, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Wave, 0x924E54B0, 0x630F, 0x11CF, 0xAD, 0xA7, 0x08, 0x00, 0x3E, 0x30, 0x49, 0x4A); -DEFINE_GUID(KSMETHODSETID_Wave_Queued, 0x7432C160, 0x8827, 0x11CF, 0xA1, 0x02, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_Wave_Queued, 0x16A15B10, 0x16F0, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSPROPSETID_Acoustic_Echo_Cancel, 0xD7A4AF8B, 0x3DC1, 0x4902, 0x91, 0xEA, 0x8A, 0x15, 0xC9, 0x0E, 0x05, 0xB2); -DEFINE_GUID(KSMETHODSETID_Wavetable, 0xDCEF31EB, 0xD907, 0x11D0, 0x95, 0x83, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR, 0xB6F5A0A0, 0x9E61, 0x4F8C, 0x91, 0xE3, 0x76, 0xCF, 0x0F, 0x3C, 0x47, 0x1F); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_AGC, 0x950E55B9, 0x877C, 0x4C67, 0xBE, 0x08, 0xE4, 0x7B, 0x56, 0x11, 0x13, 0x0A); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS, 0x5AB0882E, 0x7274, 0x4516, 0x87, 0x7D, 0x4E, 0xEE, 0x99, 0xBA, 0x4F, 0xD0); +DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL, 0x1C22C56D, 0x9879, 0x4F5B, 0xA3, 0x89, 0x27, 0x99, 0x6D, 0xDC, 0x28, 0x10); + DEFINE_GUID(KSAUDFNAME_PEAKMETER, 0x57E24340, 0xFC5B, 0x4612, 0xA5, 0x62, 0x72, 0xB1, 0x1A, 0x29, 0xDF, 0xAE); DEFINE_GUID(KSAUDFNAME_VIDEO, 0x915DAEC4, 0xA434, 0x11D2, 0xAC, 0x52, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); DEFINE_GUID(KSAUDFNAME_VIDEO_MUTE, 0x9B46E709, 0x992A, 0x11D2, 0xAC, 0x4D, 0x00, 0xC0, 0x4F, 0x8E, 0xFB, 0x68); @@ -191,13 +110,159 @@ DEFINE_GUID(KSAUDFNAME_3D_STEREO, 0x185FEDE2, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DEFINE_GUID(KSAUDFNAME_TREBLE, 0x185FEDE1, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DEFINE_GUID(KSAUDFNAME_BASS, 0x185FEDE0, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); -DEFINE_GUID(KSNODETYPE_PEAKMETER, 0xA085651E, 0x5F0D, 0x4B36, 0xA8, 0x69, 0xD1, 0x95, 0xD6, 0xAB, 0x4B, 0x9E); -DEFINE_GUID(KSNODETYPE_PROLOGIC_ENCODER, 0x8074C5B2, 0x3C66, 0x11D2, 0xB4, 0x5A, 0x30, 0x78, 0x30, 0x2C, 0x20, 0x30); -DEFINE_GUID(KSNODETYPE_DEV_SPECIFIC, 0x941C7AC0, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_MICROPHONE_ARRAY_PROCESSOR, 0xB6F5A0A0, 0x9E61, 0x4F8C, 0x91, 0xE3, 0x76, 0xCF, 0x0F, 0x3C, 0x47, 0x1F); -DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_AGC, 0x950E55B9, 0x877C, 0x4C67, 0xBE, 0x08, 0xE4, 0x7B, 0x56, 0x11, 0x13, 0x0A); -DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_NOISE_SUPPRESS, 0x5AB0882E, 0x7274, 0x4516, 0x87, 0x7D, 0x4E, 0xEE, 0x99, 0xBA, 0x4F, 0xD0); -DEFINE_GUID(KSALGORITHMINSTANCE_SYSTEM_ACOUSTIC_ECHO_CANCEL, 0x1C22C56D, 0x9879, 0x4F5B, 0xA3, 0x89, 0x27, 0x99, 0x6D, 0xDC, 0x28, 0x10); + +DEFINE_GUID(KSCATEGORY_MULTIPLEXER, 0x7A5DE1D3, 0x01A1, 0x452C, 0xB4, 0x81, 0x4F, 0xA2, 0xB9, 0x62, 0x71, 0xE8); +DEFINE_GUID(KSCATEGORY_ENCODER, 0x19689BF6, 0xC384, 0x48FD, 0xAD, 0x51, 0x90, 0xE5, 0x8C, 0x79, 0xF7, 0x0B); +DEFINE_GUID(KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_CROSSBAR, 0xA799A801, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_TVTUNER, 0xA799A800, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xDC, 0xD4); +DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER, 0x74F3AEA8, 0x9768, 0x11D1, 0x8E, 0x07, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); +DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, 0xD6C50674, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEIN_DEVICE, 0xD6C50671, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, 0xD6C5066E, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_AUDIO_DEVICE, 0xFBF6F530, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); +DEFINE_GUID(KSCATEGORY_AUDIO_SPLITTER, 0x9EA331FA, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE); +DEFINE_GUID(KSCATEGORY_AUDIO_GFX, 0x9BAF9572, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F); +DEFINE_GUID(KSCATEGORY_WDMAUD, 0x3E227E76, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1); +DEFINE_GUID(KSCATEGORY_SYSAUDIO, 0xA7C7A5B1, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07); +DEFINE_GUID(KSCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); +DEFINE_GUID(KSCATEGORY_VIRTUAL, 0x3503EAC4, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_NETWORK, 0x67C9CC3C, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_TEXT, 0x6994AD06, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR, 0x830A44F2, 0xA32D, 0x476B, 0xBE, 0x97, 0x42, 0x84, 0x56, 0x73, 0xB3, 0x5A); + +DEFINE_GUID(KSDATAFORMAT_TYPE_DVD_ENCRYPTED_PACK, 0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x4F, 0xC3, 0x1D, 0x60); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUXLine21Data, 0x670AEA80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_OVERLAY, 0xE436EB7F, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_AC3_AUDIO, 0xE06D80E4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_AC3_AUDIO, 0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_LPCM_AUDIO, 0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_LPCM_AUDIO, 0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_AUDIO, 0xE06D80E5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_AUDIO, 0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SUBPICTURE, 0xE06D802D, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG2_VIDEO, 0xE06D80E3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG2_VIDEO, 0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_TRANSPORT, 0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PROGRAM, 0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_TYPE_MPEG2_PES, 0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_MPEG1_VIDEO, 0x05589F82, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Video, 0xE436EB86, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Payload, 0xE436EB81, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG1Packet, 0xE436EB80, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_AUDIO, 0xA0AF4F82, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DSS_VIDEO, 0xA0AF4F81, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_AC3_AUDIO, 0x36523B35, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_AUDIO, 0x36523B34, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG2_VIDEO, 0x36523B33, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_AUDIO, 0x36523B32, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DIALECT_MPEG1_VIDEO, 0x36523B31, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_AC3_AUDIO, 0x36523B25, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_AUDIO, 0x36523B24, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG2_VIDEO, 0x36523B23, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_AUDIO, 0x36523B22, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_STANDARD_MPEG1_VIDEO, 0x36523B21, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PACK_HEADER, 0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_PES_PACKET, 0x36523B12, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_TYPE_STANDARD_ELEMENTARY_STREAM, 0x36523B11, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFMIDI, 0x4995DAF0, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI_BUS, 0x2CA15FA0, 0x6CFE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI, 0x1D262760, 0xE957, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_TYPE_MIDI, 0x7364696D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_MUSIC, 0xE725D360, 0x62CC, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_SDDS_AUDIO, 0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DTS_AUDIO, 0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_TEXT, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_TYPE_VIDEO, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(KSEVENTSETID_VPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSEVENTSETID_VIDCAPTOSTI, 0xDB47DE20, 0xF628, 0x11D1, 0xBA, 0x41, 0x00, 0xA0, 0xC9, 0x0D, 0x2B, 0x05); +DEFINE_GUID(KSEVENTSETID_VPNotify, 0x20C5598E, 0xD3C8, 0x11D0, 0x8D, 0xFC, 0x00, 0xC0, 0x4F, 0xD7, 0xC0, 0x8B); +DEFINE_GUID(KSEVENTSETID_VIDCAP_TVAUDIO, 0x6A2E0651, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(KSEVENTSETID_EXTDEV_Command, 0x109C7988, 0xB3CB, 0x11D2, 0xB4, 0x8E, 0x00, 0x60, 0x97, 0xB3, 0x39, 0x1B); +DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSEVENTSETID_Sysaudio, 0x04800320, 0x4491, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSEVENTSETID_LoopedStreaming, 0x4682B940, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D); +DEFINE_GUID(KSEVENTSETID_AudioControlChange, 0xE85E9698, 0xFA2F, 0x11D1, 0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSEVENTSETID_Cyclic, 0x142C1AC0, 0x072A, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); + +DEFINE_GUID(KSMEDIUMSETID_VPBus, 0xA18C15EC, 0xCE43, 0x11D0, 0xAB, 0xE7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSMEDIUMSETID_MidiBus, 0x05908040, 0x3246, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMETHODSETID_Wave_Queued, 0x7432C160, 0x8827, 0x11CF, 0xA1, 0x02, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMETHODSETID_Wavetable, 0xDCEF31EB, 0xD907, 0x11D0, 0x95, 0x83, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); +DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); + +DEFINE_GUID(KSMUSIC_TECHNOLOGY_SWSYNTH, 0x37407736, 0x3620, 0x11D1, 0x85, 0xD3, 0x00, 0x00, 0xF8, 0x75, 0x43, 0x80); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_WAVETABLE, 0x394EC7C0, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_FMSYNTH, 0x252C5C80, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_SQSYNTH, 0x0ECF4380, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSMUSIC_TECHNOLOGY_PORT, 0x86C92E60, 0x62E8, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); + +DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSNAME_Server, 0x3C0D501A, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + +DEFINE_GUID(KSNODETYPE_VIDEO_OUTPUT_MTT, 0xDFF229E8, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_INPUT_MTT, 0xDFF229E7, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_CAMERA_TERMINAL, 0xDFF229E6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_PROCESSING, 0xDFF229E5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_SELECTOR, 0xDFF229E4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_OUTPUT_TERMINAL, 0xDFF229E3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSNODETYPE_VIDEO_INPUT_TERMINAL, 0xDFF229E2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_3D_EFFECTS, 0x55515860, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_CHORUS, 0x20173F20, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_REVERB, 0xEF0328E0, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); @@ -219,49 +284,6 @@ DEFINE_GUID(KSNODETYPE_SRC, 0x9DB7B9E0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_ADC, 0x4D837FE0, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_DAC, 0x507AE360, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_DrmAudioStream, 0x2F2C8DDD, 0x4198, 0x4FAC, 0xBA, 0x29, 0x61, 0xBB, 0x05, 0xB7, 0xDE, 0x06); -DEFINE_GUID(KSPROPSETID_RtAudio, 0xA855A48C, 0x2F78, 0x4729, 0x90, 0x51, 0x19, 0x68, 0x74, 0x6B, 0x9E, 0xEF); -DEFINE_GUID(KSPROPSETID_TopologyNode, 0x45FFAAA1, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Bibliographic, 0x07BA150E, 0xE2B1, 0x11D0, 0xAC, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFFWAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_RIFF, 0x4995DAEE, 0x9EE6, 0x11D0, 0xA4, 0x0E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); -DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSPROPSETID_DirectSound3DListener, 0x437B3414, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_DSOUND, 0x518590A2, 0xA184, 0x11D0, 0x85, 0x22, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_VC_ID, 0xAD98D184, 0xAAC3, 0x11D0, 0xA4, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF, 0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX, 0x00000000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_TEXT, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSDATAFORMAT_TYPE_VIDEO, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); -DEFINE_GUID(KSCATEGORY_ESCALANTE_PLATFORM_DRIVER, 0x74F3AEA8, 0x9768, 0x11D1, 0x8E, 0x07, 0x00, 0xA0, 0xC9, 0x5E, 0xC2, 0x2E); -DEFINE_GUID(KSCATEGORY_WDMAUD_USE_PIN_NAME, 0x47A4FA20, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_PREFERRED_MIDIOUT_DEVICE, 0xD6C50674, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEIN_DEVICE, 0xD6C50671, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_PREFERRED_WAVEOUT_DEVICE, 0xD6C5066E, 0x72C1, 0x11D2, 0x97, 0x55, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_AUDIO_DEVICE, 0xFBF6F530, 0x07B9, 0x11D2, 0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); -DEFINE_GUID(KSCATEGORY_AUDIO_SPLITTER, 0x9EA331FA, 0xB91B, 0x45F8, 0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE); -DEFINE_GUID(KSCATEGORY_AUDIO_GFX, 0x9BAF9572, 0x340C, 0x11D3, 0xAB, 0xDC, 0x00, 0xA0, 0xC9, 0x0A, 0xB1, 0x6F); -DEFINE_GUID(KSCATEGORY_WDMAUD, 0x3E227E76, 0x690D, 0x11D2, 0x81, 0x61, 0x00, 0x00, 0xF8, 0x77, 0x5B, 0xF1); -DEFINE_GUID(KSCATEGORY_SYSAUDIO, 0xA7C7A5B1, 0x5AF3, 0x11D1, 0x9C, 0xED, 0x00, 0xA0, 0x24, 0xBF, 0x04, 0x07); -DEFINE_GUID(KSCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); -DEFINE_GUID(KSCATEGORY_VIRTUAL, 0x3503EAC4, 0x1F26, 0x11D1, 0x8A, 0xB0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_TOPOLOGY, 0xDDA54A40, 0x1E4C, 0x11D1, 0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_NETWORK, 0x67C9CC3C, 0x69C4, 0x11D2, 0x87, 0x59, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_TEXT, 0x6994AD06, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_VIDEO, 0x6994AD05, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_AUDIO, 0x6994AD04, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_DRM_DESCRAMBLE, 0xFFBB6E3F, 0xCCFE, 0x4D84, 0x90, 0xD9, 0x42, 0x14, 0x18, 0xB0, 0x3A, 0x8E); DEFINE_GUID(KSNODETYPE_SWMIDI, 0xCB9BEFA0, 0xA251, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); DEFINE_GUID(KSNODETYPE_SWSYNTH, 0x423274A0, 0x8B81, 0x11D1, 0xA0, 0x50, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88); @@ -306,80 +328,79 @@ DEFINE_GUID(KSNODETYPE_HEAD_MOUNTED_DISPLAY_AUDIO, 0xDFF21CE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_HEADPHONES, 0xDFF21CE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_SPEAKER, 0xDFF21CE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_MICROPHONE_ARRAY_PROCESSOR, 0x830A44F2, 0xA32D, 0x476B, 0xBE, 0x97, 0x42, 0x84, 0x56, 0x73, 0xB3, 0x5A); DEFINE_GUID(KSNODETYPE_PROCESSING_MICROPHONE_ARRAY, 0xDFF21BE6, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_MICROPHONE_ARRAY, 0xDFF21BE5, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_OMNI_DIRECTIONAL_MICROPHONE, 0xDFF21BE4, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_PERSONAL_MICROPHONE, 0xDFF21BE3, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_DESKTOP_MICROPHONE, 0xDFF21BE2, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSNODETYPE_MICROPHONE, 0xDFF21BE1, 0xF70F, 0x11D0, 0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); -DEFINE_GUID(KSINTERFACESETID_Media, 0x3A13EB40, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMEDIUMSETID_VPBus, 0xA18C15EC, 0xCE43, 0x11D0, 0xAB, 0xE7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSMEDIUMSETID_MidiBus, 0x05908040, 0x3246, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_Service, 0x3C0D501B, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNAME_Server, 0x3C0D501A, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Connection, 0x7F4BCBE0, 0x9EA5, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSEVENTSETID_Clock, 0x364D8E20, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSNODETYPE_PEAKMETER, 0xA085651E, 0x5F0D, 0x4B36, 0xA8, 0x69, 0xD1, 0x95, 0xD6, 0xAB, 0x4B, 0x9E); +DEFINE_GUID(KSNODETYPE_PROLOGIC_ENCODER, 0x8074C5B2, 0x3C66, 0x11D2, 0xB4, 0x5A, 0x30, 0x78, 0x30, 0x2C, 0x20, 0x30); +DEFINE_GUID(KSNODETYPE_DEV_SPECIFIC, 0x941C7AC0, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); + +DEFINE_GUID(KSPROPSETID_TSRateChange, 0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_VPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A); +DEFINE_GUID(KSPROPSETID_VPConfig, 0xBC29A660, 0x30E3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B); +DEFINE_GUID(KSPROPSETID_OverlayUpdate, 0x490EA5CF, 0x7681, 0x11D1, 0xA2, 0x1C, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_CopyProt, 0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3); +DEFINE_GUID(KSPROPSETID_DvdSubPic, 0xAC390460, 0x43AF, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSPROPSETID_AudioDecoderOut, 0x6CA6E020, 0x43BD, 0x11D0, 0xBD, 0x6A, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSPROPSETID_AC3, 0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Mpeg2Vid, 0xC8E11B60, 0x0CC9, 0x11D0, 0xBD, 0x69, 0x00, 0x35, 0x05, 0xC1, 0x03, 0xA9); +DEFINE_GUID(KSPROPSETID_Linear, 0x5A2FFE80, 0x16B9, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_AudioGfx, 0x79A9312E, 0x59AE, 0x43B0, 0xA3, 0x50, 0x8B, 0x05, 0x28, 0x4C, 0xAB, 0x24); +DEFINE_GUID(KSPROPSETID_Sysaudio_Pin, 0xA3A53220, 0xC6E4, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); +DEFINE_GUID(KSPROPSETID_Sysaudio, 0xCBE3FAA0, 0xCC75, 0x11D0, 0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6); +DEFINE_GUID(KSPROPSETID_Itd3d, 0x6429F090, 0x9FD9, 0x11D0, 0xA7, 0x5B, 0x00, 0xA0, 0xC9, 0x03, 0x65, 0xE3); +DEFINE_GUID(KSPROPSETID_Hrtf3d, 0xB66DECB0, 0xA083, 0x11D0, 0x85, 0x1E, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DirectSound3DBuffer, 0x437B3411, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); +DEFINE_GUID(KSPROPSETID_DirectSound3DListener, 0x437B3414, 0xD060, 0x11D0, 0x85, 0x83, 0x00, 0xC0, 0x4F, 0xD9, 0xBA, 0xF3); DEFINE_GUID(KSPROPSETID_Clock, 0xDF12A4C0, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_Stream, 0x65AABA60, 0x98AE, 0x11CF, 0xA1, 0x0D, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSPROPSETID_StreamInterface, 0x1FDD8EE1, 0x9CD3, 0x11D0, 0x82, 0xAA, 0x00, 0x00, 0xF8, 0x22, 0xFE, 0x8A); DEFINE_GUID(KSPROPSETID_StreamAllocator, 0xCF6E4342, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMETHODSETID_StreamAllocator, 0xCF6E4341, 0xEC87, 0x11CF, 0xA1, 0x30, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSEVENTSETID_StreamAllocator, 0x75D95571, 0x073C, 0x11D0, 0xA1, 0x61, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); -DEFINE_GUID(KSMEMORY_TYPE_DEVICE_UNKNOWN, 0x091BB639, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_KERNEL_NONPAGED, 0x4A6D5FC4, 0x7895, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_KERNEL_PAGED, 0xD833F8F8, 0x7894, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_USER, 0x8CB0FC28, 0x7893, 0x11D1, 0xB0, 0x69, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); -DEFINE_GUID(KSMEMORY_TYPE_SYSTEM, 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x02); +DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_DrmAudioStream, 0x2F2C8DDD, 0x4198, 0x4FAC, 0xBA, 0x29, 0x61, 0xBB, 0x05, 0xB7, 0xDE, 0x06); +DEFINE_GUID(KSPROPSETID_RtAudio, 0xA855A48C, 0x2F78, 0x4729, 0x90, 0x51, 0x19, 0x68, 0x74, 0x6B, 0x9E, 0xEF); +DEFINE_GUID(KSPROPSETID_TopologyNode, 0x45FFAAA1, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Bibliographic, 0x07BA150E, 0xE2B1, 0x11D0, 0xAC, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_Service, 0x3C0D501B, 0x140B, 0x11D1, 0xB4, 0x0F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); DEFINE_GUID(KSPROPSETID_Connection, 0x1D58C920, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); DEFINE_GUID(KSPROPSETID_Quality, 0xD16AD380, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_NONE, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILEHANDLE, 0x65E8773C, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSDATAFORMAT_SPECIFIER_FILENAME, 0xAA797B40, 0xE974, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_NONE, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSDATAFORMAT_TYPE_STREAM, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70); -DEFINE_GUID(KSNAME_TopologyNode, 0x0621061A, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSNAME_Allocator, 0x642F5D00, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Clock, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Pin, 0x146F1A80, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSNAME_Filter, 0x9B365890, 0x165F, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); DEFINE_GUID(KSPROPSETID_Pin, 0x8C134960, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSMEDIUMSETID_Standard, 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); +DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPSETID_Cyclic, 0x3FFEAEA0, 0x2BEE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_WaveTable, 0x8539E660, 0x62E9, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSPROPSETID_Wave, 0x924E54B0, 0x630F, 0x11CF, 0xAD, 0xA7, 0x08, 0x00, 0x3E, 0x30, 0x49, 0x4A); +DEFINE_GUID(KSPROPSETID_Wave_Queued, 0x16A15B10, 0x16F0, 0x11D0, 0xA1, 0x95, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4); +DEFINE_GUID(KSPROPSETID_Acoustic_Echo_Cancel, 0xD7A4AF8B, 0x3DC1, 0x4902, 0x91, 0xEA, 0x8A, 0x15, 0xC9, 0x0E, 0x05, 0xB2); +DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); + DEFINE_GUID(KSTIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(KSTIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(KSTIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(KSTIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); DEFINE_GUID(KSTIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6); -DEFINE_GUID(KSCATEGORY_QUALITY, 0x97EBAACB, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_PROXY, 0x97EBAACA, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CLOCK, 0x53172480, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_FILESYSTEM, 0x760FED5E, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_MEDIUMTRANSFORM, 0xCF1DDA2E, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_INTERFACETRANSFORM, 0xCF1DDA2D, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_COMMUNICATIONSTRANSFORM, 0xCF1DDA2C, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_DATATRANSFORM, 0x2EB07EA0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATADECOMPRESSOR, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_DATACOMPRESSOR, 0x1E84C900, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_MIXER, 0xAD809C00, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSCATEGORY_RENDER, 0x65E8773E, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_CAPTURE, 0x65E8773D, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSCATEGORY_BRIDGE, 0x085AFF00, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_GM, 0xAF627536, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D); -DEFINE_GUID(KSPROPSETID_Topology, 0x720D4AC0, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); -DEFINE_GUID(KSPROPSETID_MediaSeeking, 0xEE904F0C, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSMETHODSETID_StreamIo, 0x65D003CA, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPSETID_General, 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); -DEFINE_GUID(KSPROPTYPESETID_General, 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); - + +DEFINE_GUID(PROPSETID_EXT_DEVICE, 0xB5730A90, 0x1A2C, 0x11CF, 0x8C, 0x23, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); +DEFINE_GUID(PROPSETID_EXT_TRANSPORT, 0xA03CD5F0, 0x3045, 0x11CF, 0x8C, 0x44, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); +DEFINE_GUID(PROPSETID_TIMECODE_READER, 0x9B496CE1, 0x811B, 0x11CF, 0x8C, 0x77, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); +DEFINE_GUID(PROPSETID_VIDCAP_CAMERACONTROL, 0xC6E13370, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_VIDEODECODER, 0xC6E13350, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); +DEFINE_GUID(PROPSETID_VIDCAP_VIDEOENCODER, 0x6A2E0610, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_DROPPEDFRAMES, 0xC6E13344, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCONTROL, 0x6A2E0670, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_VIDEOCOMPRESSION, 0xC6E13343, 0x30AC, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_TVAUDIO, 0x6A2E0650, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); DEFINE_GUID(PROPSETID_VIDCAP_CROSSBAR, 0x6A2E0640, 0x28E4, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56); -DEFINE_GUID(PROPSETID_TIMECODE_READER, 0x9B496CE1, 0x811B, 0x11CF, 0x8C, 0x77, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); -DEFINE_GUID(PROPSETID_EXT_TRANSPORT, 0xA03CD5F0, 0x3045, 0x11CF, 0x8C, 0x44, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14); + + +DEFINE_GUID(KSINTERFACESETID_Media, 0x3A13EB40, 0x30A7, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); +DEFINE_GUID(KSDEGRADESETID_Standard, 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +DEFINE_GUID(KSINTERFACESETID_FileIo, 0x8C6F932C, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(KSINTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00); +

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
89
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 November 2007