diff --git a/minidx12/Include/d2d1.h b/minidx12/Include/d2d1.h index 36d032e469..99e99c555f 100644 --- a/minidx12/Include/d2d1.h +++ b/minidx12/Include/d2d1.h @@ -4062,15 +4062,19 @@ interface ID2D1Resource #define ID2D1Resource_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Resource_QueryInterface") #define ID2D1Resource_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Resource_AddRef") #define ID2D1Resource_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Resource_Release") #define ID2D1Resource_GetFactory(This, factory) \ ((This)->lpVtbl->GetFactory(This, factory)) +#pragma deprecated("ID2D1Resource_GetFactory") typedef interface ID2D1Image ID2D1Image; @@ -4089,15 +4093,19 @@ interface ID2D1Image #define ID2D1Image_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Image_QueryInterface") #define ID2D1Image_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Image_AddRef") #define ID2D1Image_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Image_Release") #define ID2D1Image_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Image_GetFactory") typedef interface ID2D1Bitmap ID2D1Bitmap; @@ -4155,36 +4163,47 @@ interface ID2D1Bitmap #define ID2D1Bitmap_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Bitmap_QueryInterface") #define ID2D1Bitmap_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Bitmap_AddRef") #define ID2D1Bitmap_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Bitmap_Release") #define ID2D1Bitmap_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Bitmap_GetFactory") #define ID2D1Bitmap_GetSize(This) \ ((This)->lpVtbl->GetSize(This)) +#pragma deprecated("ID2D1Bitmap_GetSize") #define ID2D1Bitmap_GetPixelSize(This) \ ((This)->lpVtbl->GetPixelSize(This)) +#pragma deprecated("ID2D1Bitmap_GetPixelSize") #define ID2D1Bitmap_GetPixelFormat(This) \ ((This)->lpVtbl->GetPixelFormat(This)) +#pragma deprecated("ID2D1Bitmap_GetPixelFormat") #define ID2D1Bitmap_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->GetDpi(This, dpiX, dpiY)) +#pragma deprecated("ID2D1Bitmap_GetDpi") #define ID2D1Bitmap_CopyFromBitmap(This, destPoint, bitmap, srcRect) \ ((This)->lpVtbl->CopyFromBitmap(This, destPoint, bitmap, srcRect)) +#pragma deprecated("ID2D1Bitmap_CopyFromBitmap") #define ID2D1Bitmap_CopyFromRenderTarget(This, destPoint, renderTarget, srcRect) \ ((This)->lpVtbl->CopyFromRenderTarget(This, destPoint, renderTarget, srcRect)) +#pragma deprecated("ID2D1Bitmap_CopyFromRenderTarget") #define ID2D1Bitmap_CopyFromMemory(This, dstRect, srcData, pitch) \ ((This)->lpVtbl->CopyFromMemory(This, dstRect, srcData, pitch)) +#pragma deprecated("ID2D1Bitmap_CopyFromMemory") typedef interface ID2D1GradientStopCollection ID2D1GradientStopCollection; @@ -4221,27 +4240,35 @@ interface ID2D1GradientStopCollection #define ID2D1GradientStopCollection_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GradientStopCollection_QueryInterface") #define ID2D1GradientStopCollection_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GradientStopCollection_AddRef") #define ID2D1GradientStopCollection_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GradientStopCollection_Release") #define ID2D1GradientStopCollection_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1GradientStopCollection_GetFactory") #define ID2D1GradientStopCollection_GetGradientStopCount(This) \ ((This)->lpVtbl->GetGradientStopCount(This)) +#pragma deprecated("ID2D1GradientStopCollection_GetGradientStopCount") #define ID2D1GradientStopCollection_GetGradientStops(This, gradientStops, gradientStopsCount) \ ((This)->lpVtbl->GetGradientStops(This, gradientStops, gradientStopsCount)) +#pragma deprecated("ID2D1GradientStopCollection_GetGradientStops") #define ID2D1GradientStopCollection_GetColorInterpolationGamma(This) \ ((This)->lpVtbl->GetColorInterpolationGamma(This)) +#pragma deprecated("ID2D1GradientStopCollection_GetColorInterpolationGamma") #define ID2D1GradientStopCollection_GetExtendMode(This) \ ((This)->lpVtbl->GetExtendMode(This)) +#pragma deprecated("ID2D1GradientStopCollection_GetExtendMode") typedef interface ID2D1Brush ID2D1Brush; @@ -4279,27 +4306,35 @@ interface ID2D1Brush #define ID2D1Brush_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Brush_QueryInterface") #define ID2D1Brush_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Brush_AddRef") #define ID2D1Brush_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Brush_Release") #define ID2D1Brush_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Brush_GetFactory") #define ID2D1Brush_SetOpacity(This, opacity) \ ((This)->lpVtbl->SetOpacity(This, opacity)) +#pragma deprecated("ID2D1Brush_SetOpacity") #define ID2D1Brush_SetTransform(This, transform) \ ((This)->lpVtbl->SetTransform(This, transform)) +#pragma deprecated("ID2D1Brush_SetTransform") #define ID2D1Brush_GetOpacity(This) \ ((This)->lpVtbl->GetOpacity(This)) +#pragma deprecated("ID2D1Brush_GetOpacity") #define ID2D1Brush_GetTransform(This, transform) \ ((This)->lpVtbl->GetTransform(This, transform)) +#pragma deprecated("ID2D1Brush_GetTransform") typedef interface ID2D1BitmapBrush ID2D1BitmapBrush; @@ -4355,51 +4390,67 @@ interface ID2D1BitmapBrush #define ID2D1BitmapBrush_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1BitmapBrush_QueryInterface") #define ID2D1BitmapBrush_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1BitmapBrush_AddRef") #define ID2D1BitmapBrush_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1BitmapBrush_Release") #define ID2D1BitmapBrush_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1BitmapBrush_GetFactory") #define ID2D1BitmapBrush_SetOpacity(This, opacity) \ ((This)->lpVtbl->Base.SetOpacity((ID2D1Brush *)This, opacity)) +#pragma deprecated("ID2D1BitmapBrush_SetOpacity") #define ID2D1BitmapBrush_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1BitmapBrush_SetTransform") #define ID2D1BitmapBrush_GetOpacity(This) \ ((This)->lpVtbl->Base.GetOpacity((ID2D1Brush *)This)) +#pragma deprecated("ID2D1BitmapBrush_GetOpacity") #define ID2D1BitmapBrush_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1BitmapBrush_GetTransform") #define ID2D1BitmapBrush_SetExtendModeX(This, extendModeX) \ ((This)->lpVtbl->SetExtendModeX(This, extendModeX)) +#pragma deprecated("ID2D1BitmapBrush_SetExtendModeX") #define ID2D1BitmapBrush_SetExtendModeY(This, extendModeY) \ ((This)->lpVtbl->SetExtendModeY(This, extendModeY)) +#pragma deprecated("ID2D1BitmapBrush_SetExtendModeY") #define ID2D1BitmapBrush_SetInterpolationMode(This, interpolationMode) \ ((This)->lpVtbl->SetInterpolationMode(This, interpolationMode)) +#pragma deprecated("ID2D1BitmapBrush_SetInterpolationMode") #define ID2D1BitmapBrush_SetBitmap(This, bitmap) \ ((This)->lpVtbl->SetBitmap(This, bitmap)) +#pragma deprecated("ID2D1BitmapBrush_SetBitmap") #define ID2D1BitmapBrush_GetExtendModeX(This) \ ((This)->lpVtbl->GetExtendModeX(This)) +#pragma deprecated("ID2D1BitmapBrush_GetExtendModeX") #define ID2D1BitmapBrush_GetExtendModeY(This) \ ((This)->lpVtbl->GetExtendModeY(This)) +#pragma deprecated("ID2D1BitmapBrush_GetExtendModeY") #define ID2D1BitmapBrush_GetInterpolationMode(This) \ ((This)->lpVtbl->GetInterpolationMode(This)) +#pragma deprecated("ID2D1BitmapBrush_GetInterpolationMode") #define ID2D1BitmapBrush_GetBitmap(This, bitmap) \ ((This)->lpVtbl->GetBitmap(This, bitmap)) +#pragma deprecated("ID2D1BitmapBrush_GetBitmap") typedef interface ID2D1SolidColorBrush ID2D1SolidColorBrush; @@ -4427,33 +4478,43 @@ interface ID2D1SolidColorBrush #define ID2D1SolidColorBrush_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1SolidColorBrush_QueryInterface") #define ID2D1SolidColorBrush_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1SolidColorBrush_AddRef") #define ID2D1SolidColorBrush_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1SolidColorBrush_Release") #define ID2D1SolidColorBrush_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1SolidColorBrush_GetFactory") #define ID2D1SolidColorBrush_SetOpacity(This, opacity) \ ((This)->lpVtbl->Base.SetOpacity((ID2D1Brush *)This, opacity)) +#pragma deprecated("ID2D1SolidColorBrush_SetOpacity") #define ID2D1SolidColorBrush_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1SolidColorBrush_SetTransform") #define ID2D1SolidColorBrush_GetOpacity(This) \ ((This)->lpVtbl->Base.GetOpacity((ID2D1Brush *)This)) +#pragma deprecated("ID2D1SolidColorBrush_GetOpacity") #define ID2D1SolidColorBrush_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1SolidColorBrush_GetTransform") #define ID2D1SolidColorBrush_SetColor(This, color) \ ((This)->lpVtbl->SetColor(This, color)) +#pragma deprecated("ID2D1SolidColorBrush_SetColor") #define ID2D1SolidColorBrush_GetColor(This) \ ((This)->lpVtbl->GetColor(This)) +#pragma deprecated("ID2D1SolidColorBrush_GetColor") typedef interface ID2D1LinearGradientBrush ID2D1LinearGradientBrush; @@ -4495,42 +4556,55 @@ interface ID2D1LinearGradientBrush #define ID2D1LinearGradientBrush_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1LinearGradientBrush_QueryInterface") #define ID2D1LinearGradientBrush_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1LinearGradientBrush_AddRef") #define ID2D1LinearGradientBrush_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1LinearGradientBrush_Release") #define ID2D1LinearGradientBrush_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1LinearGradientBrush_GetFactory") #define ID2D1LinearGradientBrush_SetOpacity(This, opacity) \ ((This)->lpVtbl->Base.SetOpacity((ID2D1Brush *)This, opacity)) +#pragma deprecated("ID2D1LinearGradientBrush_SetOpacity") #define ID2D1LinearGradientBrush_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1LinearGradientBrush_SetTransform") #define ID2D1LinearGradientBrush_GetOpacity(This) \ ((This)->lpVtbl->Base.GetOpacity((ID2D1Brush *)This)) +#pragma deprecated("ID2D1LinearGradientBrush_GetOpacity") #define ID2D1LinearGradientBrush_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1LinearGradientBrush_GetTransform") #define ID2D1LinearGradientBrush_SetStartPoint(This, startPoint) \ ((This)->lpVtbl->SetStartPoint(This, startPoint)) +#pragma deprecated("ID2D1LinearGradientBrush_SetStartPoint") #define ID2D1LinearGradientBrush_SetEndPoint(This, endPoint) \ ((This)->lpVtbl->SetEndPoint(This, endPoint)) +#pragma deprecated("ID2D1LinearGradientBrush_SetEndPoint") #define ID2D1LinearGradientBrush_GetStartPoint(This) \ ((This)->lpVtbl->GetStartPoint(This)) +#pragma deprecated("ID2D1LinearGradientBrush_GetStartPoint") #define ID2D1LinearGradientBrush_GetEndPoint(This) \ ((This)->lpVtbl->GetEndPoint(This)) +#pragma deprecated("ID2D1LinearGradientBrush_GetEndPoint") #define ID2D1LinearGradientBrush_GetGradientStopCollection(This, gradientStopCollection) \ ((This)->lpVtbl->GetGradientStopCollection(This, gradientStopCollection)) +#pragma deprecated("ID2D1LinearGradientBrush_GetGradientStopCollection") typedef interface ID2D1RadialGradientBrush ID2D1RadialGradientBrush; @@ -4590,54 +4664,71 @@ interface ID2D1RadialGradientBrush #define ID2D1RadialGradientBrush_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1RadialGradientBrush_QueryInterface") #define ID2D1RadialGradientBrush_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1RadialGradientBrush_AddRef") #define ID2D1RadialGradientBrush_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1RadialGradientBrush_Release") #define ID2D1RadialGradientBrush_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1RadialGradientBrush_GetFactory") #define ID2D1RadialGradientBrush_SetOpacity(This, opacity) \ ((This)->lpVtbl->Base.SetOpacity((ID2D1Brush *)This, opacity)) +#pragma deprecated("ID2D1RadialGradientBrush_SetOpacity") #define ID2D1RadialGradientBrush_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1RadialGradientBrush_SetTransform") #define ID2D1RadialGradientBrush_GetOpacity(This) \ ((This)->lpVtbl->Base.GetOpacity((ID2D1Brush *)This)) +#pragma deprecated("ID2D1RadialGradientBrush_GetOpacity") #define ID2D1RadialGradientBrush_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1RadialGradientBrush_GetTransform") #define ID2D1RadialGradientBrush_SetCenter(This, center) \ ((This)->lpVtbl->SetCenter(This, center)) +#pragma deprecated("ID2D1RadialGradientBrush_SetCenter") #define ID2D1RadialGradientBrush_SetGradientOriginOffset(This, gradientOriginOffset) \ ((This)->lpVtbl->SetGradientOriginOffset(This, gradientOriginOffset)) +#pragma deprecated("ID2D1RadialGradientBrush_SetGradientOriginOffset") #define ID2D1RadialGradientBrush_SetRadiusX(This, radiusX) \ ((This)->lpVtbl->SetRadiusX(This, radiusX)) +#pragma deprecated("ID2D1RadialGradientBrush_SetRadiusX") #define ID2D1RadialGradientBrush_SetRadiusY(This, radiusY) \ ((This)->lpVtbl->SetRadiusY(This, radiusY)) +#pragma deprecated("ID2D1RadialGradientBrush_SetRadiusY") #define ID2D1RadialGradientBrush_GetCenter(This) \ ((This)->lpVtbl->GetCenter(This)) +#pragma deprecated("ID2D1RadialGradientBrush_GetCenter") #define ID2D1RadialGradientBrush_GetGradientOriginOffset(This) \ ((This)->lpVtbl->GetGradientOriginOffset(This)) +#pragma deprecated("ID2D1RadialGradientBrush_GetGradientOriginOffset") #define ID2D1RadialGradientBrush_GetRadiusX(This) \ ((This)->lpVtbl->GetRadiusX(This)) +#pragma deprecated("ID2D1RadialGradientBrush_GetRadiusX") #define ID2D1RadialGradientBrush_GetRadiusY(This) \ ((This)->lpVtbl->GetRadiusY(This)) +#pragma deprecated("ID2D1RadialGradientBrush_GetRadiusY") #define ID2D1RadialGradientBrush_GetGradientStopCollection(This, gradientStopCollection) \ ((This)->lpVtbl->GetGradientStopCollection(This, gradientStopCollection)) +#pragma deprecated("ID2D1RadialGradientBrush_GetGradientStopCollection") typedef interface ID2D1StrokeStyle ID2D1StrokeStyle; @@ -4694,42 +4785,55 @@ interface ID2D1StrokeStyle #define ID2D1StrokeStyle_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1StrokeStyle_QueryInterface") #define ID2D1StrokeStyle_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1StrokeStyle_AddRef") #define ID2D1StrokeStyle_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1StrokeStyle_Release") #define ID2D1StrokeStyle_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1StrokeStyle_GetFactory") #define ID2D1StrokeStyle_GetStartCap(This) \ ((This)->lpVtbl->GetStartCap(This)) +#pragma deprecated("ID2D1StrokeStyle_GetStartCap") #define ID2D1StrokeStyle_GetEndCap(This) \ ((This)->lpVtbl->GetEndCap(This)) +#pragma deprecated("ID2D1StrokeStyle_GetEndCap") #define ID2D1StrokeStyle_GetDashCap(This) \ ((This)->lpVtbl->GetDashCap(This)) +#pragma deprecated("ID2D1StrokeStyle_GetDashCap") #define ID2D1StrokeStyle_GetMiterLimit(This) \ ((This)->lpVtbl->GetMiterLimit(This)) +#pragma deprecated("ID2D1StrokeStyle_GetMiterLimit") #define ID2D1StrokeStyle_GetLineJoin(This) \ ((This)->lpVtbl->GetLineJoin(This)) +#pragma deprecated("ID2D1StrokeStyle_GetLineJoin") #define ID2D1StrokeStyle_GetDashOffset(This) \ ((This)->lpVtbl->GetDashOffset(This)) +#pragma deprecated("ID2D1StrokeStyle_GetDashOffset") #define ID2D1StrokeStyle_GetDashStyle(This) \ ((This)->lpVtbl->GetDashStyle(This)) +#pragma deprecated("ID2D1StrokeStyle_GetDashStyle") #define ID2D1StrokeStyle_GetDashesCount(This) \ ((This)->lpVtbl->GetDashesCount(This)) +#pragma deprecated("ID2D1StrokeStyle_GetDashesCount") #define ID2D1StrokeStyle_GetDashes(This, dashes, dashesCount) \ ((This)->lpVtbl->GetDashes(This, dashes, dashesCount)) +#pragma deprecated("ID2D1StrokeStyle_GetDashes") typedef interface ID2D1Geometry ID2D1Geometry; @@ -4852,54 +4956,71 @@ interface ID2D1Geometry #define ID2D1Geometry_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Geometry_QueryInterface") #define ID2D1Geometry_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Geometry_AddRef") #define ID2D1Geometry_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Geometry_Release") #define ID2D1Geometry_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Geometry_GetFactory") #define ID2D1Geometry_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->GetBounds(This, worldTransform, bounds)) +#pragma deprecated("ID2D1Geometry_GetBounds") #define ID2D1Geometry_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1Geometry_GetWidenedBounds") #define ID2D1Geometry_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1Geometry_StrokeContainsPoint") #define ID2D1Geometry_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1Geometry_FillContainsPoint") #define ID2D1Geometry_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1Geometry_CompareWithGeometry") #define ID2D1Geometry_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1Geometry_Simplify") #define ID2D1Geometry_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Tessellate(This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1Geometry_Tessellate") #define ID2D1Geometry_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1Geometry_CombineWithGeometry") #define ID2D1Geometry_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Outline(This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1Geometry_Outline") #define ID2D1Geometry_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->ComputeArea(This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1Geometry_ComputeArea") #define ID2D1Geometry_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->ComputeLength(This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1Geometry_ComputeLength") #define ID2D1Geometry_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1Geometry_ComputePointAtLength") #define ID2D1Geometry_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1Geometry_Widen") typedef interface ID2D1RectangleGeometry ID2D1RectangleGeometry; @@ -4923,57 +5044,75 @@ interface ID2D1RectangleGeometry #define ID2D1RectangleGeometry_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1RectangleGeometry_QueryInterface") #define ID2D1RectangleGeometry_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1RectangleGeometry_AddRef") #define ID2D1RectangleGeometry_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1RectangleGeometry_Release") #define ID2D1RectangleGeometry_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1RectangleGeometry_GetFactory") #define ID2D1RectangleGeometry_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->Base.GetBounds((ID2D1Geometry *)This, worldTransform, bounds)) +#pragma deprecated("ID2D1RectangleGeometry_GetBounds") #define ID2D1RectangleGeometry_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->Base.GetWidenedBounds((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1RectangleGeometry_GetWidenedBounds") #define ID2D1RectangleGeometry_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.StrokeContainsPoint((ID2D1Geometry *)This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1RectangleGeometry_StrokeContainsPoint") #define ID2D1RectangleGeometry_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.FillContainsPoint((ID2D1Geometry *)This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1RectangleGeometry_FillContainsPoint") #define ID2D1RectangleGeometry_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->Base.CompareWithGeometry((ID2D1Geometry *)This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1RectangleGeometry_CompareWithGeometry") #define ID2D1RectangleGeometry_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Simplify((ID2D1Geometry *)This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RectangleGeometry_Simplify") #define ID2D1RectangleGeometry_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Base.Tessellate((ID2D1Geometry *)This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1RectangleGeometry_Tessellate") #define ID2D1RectangleGeometry_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.CombineWithGeometry((ID2D1Geometry *)This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RectangleGeometry_CombineWithGeometry") #define ID2D1RectangleGeometry_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Outline((ID2D1Geometry *)This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RectangleGeometry_Outline") #define ID2D1RectangleGeometry_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->Base.ComputeArea((ID2D1Geometry *)This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1RectangleGeometry_ComputeArea") #define ID2D1RectangleGeometry_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->Base.ComputeLength((ID2D1Geometry *)This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1RectangleGeometry_ComputeLength") #define ID2D1RectangleGeometry_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->Base.ComputePointAtLength((ID2D1Geometry *)This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1RectangleGeometry_ComputePointAtLength") #define ID2D1RectangleGeometry_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Widen((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RectangleGeometry_Widen") #define ID2D1RectangleGeometry_GetRect(This, rect) \ ((This)->lpVtbl->GetRect(This, rect)) +#pragma deprecated("ID2D1RectangleGeometry_GetRect") typedef interface ID2D1RoundedRectangleGeometry ID2D1RoundedRectangleGeometry; @@ -4997,57 +5136,75 @@ interface ID2D1RoundedRectangleGeometry #define ID2D1RoundedRectangleGeometry_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_QueryInterface") #define ID2D1RoundedRectangleGeometry_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_AddRef") #define ID2D1RoundedRectangleGeometry_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_Release") #define ID2D1RoundedRectangleGeometry_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_GetFactory") #define ID2D1RoundedRectangleGeometry_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->Base.GetBounds((ID2D1Geometry *)This, worldTransform, bounds)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_GetBounds") #define ID2D1RoundedRectangleGeometry_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->Base.GetWidenedBounds((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_GetWidenedBounds") #define ID2D1RoundedRectangleGeometry_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.StrokeContainsPoint((ID2D1Geometry *)This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_StrokeContainsPoint") #define ID2D1RoundedRectangleGeometry_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.FillContainsPoint((ID2D1Geometry *)This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_FillContainsPoint") #define ID2D1RoundedRectangleGeometry_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->Base.CompareWithGeometry((ID2D1Geometry *)This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_CompareWithGeometry") #define ID2D1RoundedRectangleGeometry_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Simplify((ID2D1Geometry *)This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_Simplify") #define ID2D1RoundedRectangleGeometry_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Base.Tessellate((ID2D1Geometry *)This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_Tessellate") #define ID2D1RoundedRectangleGeometry_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.CombineWithGeometry((ID2D1Geometry *)This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_CombineWithGeometry") #define ID2D1RoundedRectangleGeometry_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Outline((ID2D1Geometry *)This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_Outline") #define ID2D1RoundedRectangleGeometry_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->Base.ComputeArea((ID2D1Geometry *)This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_ComputeArea") #define ID2D1RoundedRectangleGeometry_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->Base.ComputeLength((ID2D1Geometry *)This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_ComputeLength") #define ID2D1RoundedRectangleGeometry_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->Base.ComputePointAtLength((ID2D1Geometry *)This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_ComputePointAtLength") #define ID2D1RoundedRectangleGeometry_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Widen((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_Widen") #define ID2D1RoundedRectangleGeometry_GetRoundedRect(This, roundedRect) \ ((This)->lpVtbl->GetRoundedRect(This, roundedRect)) +#pragma deprecated("ID2D1RoundedRectangleGeometry_GetRoundedRect") typedef interface ID2D1EllipseGeometry ID2D1EllipseGeometry; @@ -5071,57 +5228,75 @@ interface ID2D1EllipseGeometry #define ID2D1EllipseGeometry_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1EllipseGeometry_QueryInterface") #define ID2D1EllipseGeometry_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1EllipseGeometry_AddRef") #define ID2D1EllipseGeometry_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1EllipseGeometry_Release") #define ID2D1EllipseGeometry_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1EllipseGeometry_GetFactory") #define ID2D1EllipseGeometry_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->Base.GetBounds((ID2D1Geometry *)This, worldTransform, bounds)) +#pragma deprecated("ID2D1EllipseGeometry_GetBounds") #define ID2D1EllipseGeometry_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->Base.GetWidenedBounds((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1EllipseGeometry_GetWidenedBounds") #define ID2D1EllipseGeometry_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.StrokeContainsPoint((ID2D1Geometry *)This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1EllipseGeometry_StrokeContainsPoint") #define ID2D1EllipseGeometry_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.FillContainsPoint((ID2D1Geometry *)This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1EllipseGeometry_FillContainsPoint") #define ID2D1EllipseGeometry_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->Base.CompareWithGeometry((ID2D1Geometry *)This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1EllipseGeometry_CompareWithGeometry") #define ID2D1EllipseGeometry_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Simplify((ID2D1Geometry *)This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1EllipseGeometry_Simplify") #define ID2D1EllipseGeometry_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Base.Tessellate((ID2D1Geometry *)This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1EllipseGeometry_Tessellate") #define ID2D1EllipseGeometry_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.CombineWithGeometry((ID2D1Geometry *)This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1EllipseGeometry_CombineWithGeometry") #define ID2D1EllipseGeometry_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Outline((ID2D1Geometry *)This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1EllipseGeometry_Outline") #define ID2D1EllipseGeometry_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->Base.ComputeArea((ID2D1Geometry *)This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1EllipseGeometry_ComputeArea") #define ID2D1EllipseGeometry_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->Base.ComputeLength((ID2D1Geometry *)This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1EllipseGeometry_ComputeLength") #define ID2D1EllipseGeometry_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->Base.ComputePointAtLength((ID2D1Geometry *)This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1EllipseGeometry_ComputePointAtLength") #define ID2D1EllipseGeometry_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Widen((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1EllipseGeometry_Widen") #define ID2D1EllipseGeometry_GetEllipse(This, ellipse) \ ((This)->lpVtbl->GetEllipse(This, ellipse)) +#pragma deprecated("ID2D1EllipseGeometry_GetEllipse") typedef interface ID2D1GeometryGroup ID2D1GeometryGroup; @@ -5154,63 +5329,83 @@ interface ID2D1GeometryGroup #define ID2D1GeometryGroup_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GeometryGroup_QueryInterface") #define ID2D1GeometryGroup_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GeometryGroup_AddRef") #define ID2D1GeometryGroup_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GeometryGroup_Release") #define ID2D1GeometryGroup_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1GeometryGroup_GetFactory") #define ID2D1GeometryGroup_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->Base.GetBounds((ID2D1Geometry *)This, worldTransform, bounds)) +#pragma deprecated("ID2D1GeometryGroup_GetBounds") #define ID2D1GeometryGroup_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->Base.GetWidenedBounds((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1GeometryGroup_GetWidenedBounds") #define ID2D1GeometryGroup_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.StrokeContainsPoint((ID2D1Geometry *)This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1GeometryGroup_StrokeContainsPoint") #define ID2D1GeometryGroup_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.FillContainsPoint((ID2D1Geometry *)This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1GeometryGroup_FillContainsPoint") #define ID2D1GeometryGroup_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->Base.CompareWithGeometry((ID2D1Geometry *)This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1GeometryGroup_CompareWithGeometry") #define ID2D1GeometryGroup_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Simplify((ID2D1Geometry *)This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1GeometryGroup_Simplify") #define ID2D1GeometryGroup_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Base.Tessellate((ID2D1Geometry *)This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1GeometryGroup_Tessellate") #define ID2D1GeometryGroup_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.CombineWithGeometry((ID2D1Geometry *)This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1GeometryGroup_CombineWithGeometry") #define ID2D1GeometryGroup_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Outline((ID2D1Geometry *)This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1GeometryGroup_Outline") #define ID2D1GeometryGroup_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->Base.ComputeArea((ID2D1Geometry *)This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1GeometryGroup_ComputeArea") #define ID2D1GeometryGroup_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->Base.ComputeLength((ID2D1Geometry *)This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1GeometryGroup_ComputeLength") #define ID2D1GeometryGroup_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->Base.ComputePointAtLength((ID2D1Geometry *)This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1GeometryGroup_ComputePointAtLength") #define ID2D1GeometryGroup_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Widen((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1GeometryGroup_Widen") #define ID2D1GeometryGroup_GetFillMode(This) \ ((This)->lpVtbl->GetFillMode(This)) +#pragma deprecated("ID2D1GeometryGroup_GetFillMode") #define ID2D1GeometryGroup_GetSourceGeometryCount(This) \ ((This)->lpVtbl->GetSourceGeometryCount(This)) +#pragma deprecated("ID2D1GeometryGroup_GetSourceGeometryCount") #define ID2D1GeometryGroup_GetSourceGeometries(This, geometries, geometriesCount) \ ((This)->lpVtbl->GetSourceGeometries(This, geometries, geometriesCount)) +#pragma deprecated("ID2D1GeometryGroup_GetSourceGeometries") typedef interface ID2D1TransformedGeometry ID2D1TransformedGeometry; @@ -5239,60 +5434,79 @@ interface ID2D1TransformedGeometry #define ID2D1TransformedGeometry_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1TransformedGeometry_QueryInterface") #define ID2D1TransformedGeometry_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1TransformedGeometry_AddRef") #define ID2D1TransformedGeometry_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1TransformedGeometry_Release") #define ID2D1TransformedGeometry_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1TransformedGeometry_GetFactory") #define ID2D1TransformedGeometry_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->Base.GetBounds((ID2D1Geometry *)This, worldTransform, bounds)) +#pragma deprecated("ID2D1TransformedGeometry_GetBounds") #define ID2D1TransformedGeometry_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->Base.GetWidenedBounds((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1TransformedGeometry_GetWidenedBounds") #define ID2D1TransformedGeometry_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.StrokeContainsPoint((ID2D1Geometry *)This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1TransformedGeometry_StrokeContainsPoint") #define ID2D1TransformedGeometry_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.FillContainsPoint((ID2D1Geometry *)This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1TransformedGeometry_FillContainsPoint") #define ID2D1TransformedGeometry_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->Base.CompareWithGeometry((ID2D1Geometry *)This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1TransformedGeometry_CompareWithGeometry") #define ID2D1TransformedGeometry_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Simplify((ID2D1Geometry *)This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1TransformedGeometry_Simplify") #define ID2D1TransformedGeometry_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Base.Tessellate((ID2D1Geometry *)This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1TransformedGeometry_Tessellate") #define ID2D1TransformedGeometry_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.CombineWithGeometry((ID2D1Geometry *)This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1TransformedGeometry_CombineWithGeometry") #define ID2D1TransformedGeometry_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Outline((ID2D1Geometry *)This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1TransformedGeometry_Outline") #define ID2D1TransformedGeometry_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->Base.ComputeArea((ID2D1Geometry *)This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1TransformedGeometry_ComputeArea") #define ID2D1TransformedGeometry_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->Base.ComputeLength((ID2D1Geometry *)This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1TransformedGeometry_ComputeLength") #define ID2D1TransformedGeometry_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->Base.ComputePointAtLength((ID2D1Geometry *)This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1TransformedGeometry_ComputePointAtLength") #define ID2D1TransformedGeometry_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Widen((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1TransformedGeometry_Widen") #define ID2D1TransformedGeometry_GetSourceGeometry(This, sourceGeometry) \ ((This)->lpVtbl->GetSourceGeometry(This, sourceGeometry)) +#pragma deprecated("ID2D1TransformedGeometry_GetSourceGeometry") #define ID2D1TransformedGeometry_GetTransform(This, transform) \ ((This)->lpVtbl->GetTransform(This, transform)) +#pragma deprecated("ID2D1TransformedGeometry_GetTransform") typedef interface ID2D1SimplifiedGeometrySink ID2D1SimplifiedGeometrySink; @@ -5348,33 +5562,43 @@ interface ID2D1SimplifiedGeometrySink #define ID2D1SimplifiedGeometrySink_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_QueryInterface") #define ID2D1SimplifiedGeometrySink_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_AddRef") #define ID2D1SimplifiedGeometrySink_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_Release") #define ID2D1SimplifiedGeometrySink_SetFillMode(This, fillMode) \ ((This)->lpVtbl->SetFillMode(This, fillMode)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_SetFillMode") #define ID2D1SimplifiedGeometrySink_SetSegmentFlags(This, vertexFlags) \ ((This)->lpVtbl->SetSegmentFlags(This, vertexFlags)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_SetSegmentFlags") #define ID2D1SimplifiedGeometrySink_BeginFigure(This, startPoint, figureBegin) \ ((This)->lpVtbl->BeginFigure(This, startPoint, figureBegin)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_BeginFigure") #define ID2D1SimplifiedGeometrySink_AddLines(This, points, pointsCount) \ ((This)->lpVtbl->AddLines(This, points, pointsCount)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_AddLines") #define ID2D1SimplifiedGeometrySink_AddBeziers(This, beziers, beziersCount) \ ((This)->lpVtbl->AddBeziers(This, beziers, beziersCount)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_AddBeziers") #define ID2D1SimplifiedGeometrySink_EndFigure(This, figureEnd) \ ((This)->lpVtbl->EndFigure(This, figureEnd)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_EndFigure") #define ID2D1SimplifiedGeometrySink_Close(This) \ ((This)->lpVtbl->Close(This)) +#pragma deprecated("ID2D1SimplifiedGeometrySink_Close") typedef interface ID2D1GeometrySink ID2D1GeometrySink; @@ -5419,48 +5643,63 @@ interface ID2D1GeometrySink #define ID2D1GeometrySink_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GeometrySink_QueryInterface") #define ID2D1GeometrySink_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GeometrySink_AddRef") #define ID2D1GeometrySink_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GeometrySink_Release") #define ID2D1GeometrySink_SetFillMode(This, fillMode) \ ((This)->lpVtbl->Base.SetFillMode((ID2D1SimplifiedGeometrySink *)This, fillMode)) +#pragma deprecated("ID2D1GeometrySink_SetFillMode") #define ID2D1GeometrySink_SetSegmentFlags(This, vertexFlags) \ ((This)->lpVtbl->Base.SetSegmentFlags((ID2D1SimplifiedGeometrySink *)This, vertexFlags)) +#pragma deprecated("ID2D1GeometrySink_SetSegmentFlags") #define ID2D1GeometrySink_BeginFigure(This, startPoint, figureBegin) \ ((This)->lpVtbl->Base.BeginFigure((ID2D1SimplifiedGeometrySink *)This, startPoint, figureBegin)) +#pragma deprecated("ID2D1GeometrySink_BeginFigure") #define ID2D1GeometrySink_AddLines(This, points, pointsCount) \ ((This)->lpVtbl->Base.AddLines((ID2D1SimplifiedGeometrySink *)This, points, pointsCount)) +#pragma deprecated("ID2D1GeometrySink_AddLines") #define ID2D1GeometrySink_AddBeziers(This, beziers, beziersCount) \ ((This)->lpVtbl->Base.AddBeziers((ID2D1SimplifiedGeometrySink *)This, beziers, beziersCount)) +#pragma deprecated("ID2D1GeometrySink_AddBeziers") #define ID2D1GeometrySink_EndFigure(This, figureEnd) \ ((This)->lpVtbl->Base.EndFigure((ID2D1SimplifiedGeometrySink *)This, figureEnd)) +#pragma deprecated("ID2D1GeometrySink_EndFigure") #define ID2D1GeometrySink_Close(This) \ ((This)->lpVtbl->Base.Close((ID2D1SimplifiedGeometrySink *)This)) +#pragma deprecated("ID2D1GeometrySink_Close") #define ID2D1GeometrySink_AddLine(This, point) \ ((This)->lpVtbl->AddLine(This, point)) +#pragma deprecated("ID2D1GeometrySink_AddLine") #define ID2D1GeometrySink_AddBezier(This, bezier) \ ((This)->lpVtbl->AddBezier(This, bezier)) +#pragma deprecated("ID2D1GeometrySink_AddBezier") #define ID2D1GeometrySink_AddQuadraticBezier(This, bezier) \ ((This)->lpVtbl->AddQuadraticBezier(This, bezier)) +#pragma deprecated("ID2D1GeometrySink_AddQuadraticBezier") #define ID2D1GeometrySink_AddQuadraticBeziers(This, beziers, beziersCount) \ ((This)->lpVtbl->AddQuadraticBeziers(This, beziers, beziersCount)) +#pragma deprecated("ID2D1GeometrySink_AddQuadraticBeziers") #define ID2D1GeometrySink_AddArc(This, arc) \ ((This)->lpVtbl->AddArc(This, arc)) +#pragma deprecated("ID2D1GeometrySink_AddArc") typedef interface ID2D1TessellationSink ID2D1TessellationSink; @@ -5489,18 +5728,23 @@ interface ID2D1TessellationSink #define ID2D1TessellationSink_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1TessellationSink_QueryInterface") #define ID2D1TessellationSink_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1TessellationSink_AddRef") #define ID2D1TessellationSink_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1TessellationSink_Release") #define ID2D1TessellationSink_AddTriangles(This, triangles, trianglesCount) \ ((This)->lpVtbl->AddTriangles(This, triangles, trianglesCount)) +#pragma deprecated("ID2D1TessellationSink_AddTriangles") #define ID2D1TessellationSink_Close(This) \ ((This)->lpVtbl->Close(This)) +#pragma deprecated("ID2D1TessellationSink_Close") typedef interface ID2D1PathGeometry ID2D1PathGeometry; @@ -5539,66 +5783,87 @@ interface ID2D1PathGeometry #define ID2D1PathGeometry_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1PathGeometry_QueryInterface") #define ID2D1PathGeometry_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1PathGeometry_AddRef") #define ID2D1PathGeometry_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1PathGeometry_Release") #define ID2D1PathGeometry_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1PathGeometry_GetFactory") #define ID2D1PathGeometry_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->Base.GetBounds((ID2D1Geometry *)This, worldTransform, bounds)) +#pragma deprecated("ID2D1PathGeometry_GetBounds") #define ID2D1PathGeometry_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->Base.GetWidenedBounds((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1PathGeometry_GetWidenedBounds") #define ID2D1PathGeometry_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.StrokeContainsPoint((ID2D1Geometry *)This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1PathGeometry_StrokeContainsPoint") #define ID2D1PathGeometry_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.FillContainsPoint((ID2D1Geometry *)This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1PathGeometry_FillContainsPoint") #define ID2D1PathGeometry_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->Base.CompareWithGeometry((ID2D1Geometry *)This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1PathGeometry_CompareWithGeometry") #define ID2D1PathGeometry_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Simplify((ID2D1Geometry *)This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry_Simplify") #define ID2D1PathGeometry_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Base.Tessellate((ID2D1Geometry *)This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1PathGeometry_Tessellate") #define ID2D1PathGeometry_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.CombineWithGeometry((ID2D1Geometry *)This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry_CombineWithGeometry") #define ID2D1PathGeometry_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Outline((ID2D1Geometry *)This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry_Outline") #define ID2D1PathGeometry_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->Base.ComputeArea((ID2D1Geometry *)This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1PathGeometry_ComputeArea") #define ID2D1PathGeometry_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->Base.ComputeLength((ID2D1Geometry *)This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1PathGeometry_ComputeLength") #define ID2D1PathGeometry_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->Base.ComputePointAtLength((ID2D1Geometry *)This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1PathGeometry_ComputePointAtLength") #define ID2D1PathGeometry_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Widen((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry_Widen") #define ID2D1PathGeometry_Open(This, geometrySink) \ ((This)->lpVtbl->Open(This, geometrySink)) +#pragma deprecated("ID2D1PathGeometry_Open") #define ID2D1PathGeometry_Stream(This, geometrySink) \ ((This)->lpVtbl->Stream(This, geometrySink)) +#pragma deprecated("ID2D1PathGeometry_Stream") #define ID2D1PathGeometry_GetSegmentCount(This, count) \ ((This)->lpVtbl->GetSegmentCount(This, count)) +#pragma deprecated("ID2D1PathGeometry_GetSegmentCount") #define ID2D1PathGeometry_GetFigureCount(This, count) \ ((This)->lpVtbl->GetFigureCount(This, count)) +#pragma deprecated("ID2D1PathGeometry_GetFigureCount") typedef interface ID2D1Mesh ID2D1Mesh; @@ -5622,18 +5887,23 @@ interface ID2D1Mesh #define ID2D1Mesh_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Mesh_QueryInterface") #define ID2D1Mesh_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Mesh_AddRef") #define ID2D1Mesh_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Mesh_Release") #define ID2D1Mesh_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Mesh_GetFactory") #define ID2D1Mesh_Open(This, tessellationSink) \ ((This)->lpVtbl->Open(This, tessellationSink)) +#pragma deprecated("ID2D1Mesh_Open") typedef interface ID2D1Layer ID2D1Layer; @@ -5656,18 +5926,23 @@ interface ID2D1Layer #define ID2D1Layer_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Layer_QueryInterface") #define ID2D1Layer_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Layer_AddRef") #define ID2D1Layer_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Layer_Release") #define ID2D1Layer_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Layer_GetFactory") #define ID2D1Layer_GetSize(This) \ ((This)->lpVtbl->GetSize(This)) +#pragma deprecated("ID2D1Layer_GetSize") typedef interface ID2D1DrawingStateBlock ID2D1DrawingStateBlock; @@ -5706,27 +5981,35 @@ interface ID2D1DrawingStateBlock #define ID2D1DrawingStateBlock_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1DrawingStateBlock_QueryInterface") #define ID2D1DrawingStateBlock_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1DrawingStateBlock_AddRef") #define ID2D1DrawingStateBlock_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1DrawingStateBlock_Release") #define ID2D1DrawingStateBlock_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1DrawingStateBlock_GetFactory") #define ID2D1DrawingStateBlock_GetDescription(This, stateDescription) \ ((This)->lpVtbl->GetDescription(This, stateDescription)) +#pragma deprecated("ID2D1DrawingStateBlock_GetDescription") #define ID2D1DrawingStateBlock_SetDescription(This, stateDescription) \ ((This)->lpVtbl->SetDescription(This, stateDescription)) +#pragma deprecated("ID2D1DrawingStateBlock_SetDescription") #define ID2D1DrawingStateBlock_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->SetTextRenderingParams(This, textRenderingParams)) +#pragma deprecated("ID2D1DrawingStateBlock_SetTextRenderingParams") #define ID2D1DrawingStateBlock_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->GetTextRenderingParams(This, textRenderingParams)) +#pragma deprecated("ID2D1DrawingStateBlock_GetTextRenderingParams") typedef interface ID2D1RenderTarget ID2D1RenderTarget; @@ -6080,174 +6363,231 @@ interface ID2D1RenderTarget #define ID2D1RenderTarget_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1RenderTarget_QueryInterface") #define ID2D1RenderTarget_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1RenderTarget_AddRef") #define ID2D1RenderTarget_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1RenderTarget_Release") #define ID2D1RenderTarget_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1RenderTarget_GetFactory") #define ID2D1RenderTarget_CreateBitmap(This, size, srcData, pitch, bitmapProperties, bitmap) \ ((This)->lpVtbl->CreateBitmap(This, size, srcData, pitch, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1RenderTarget_CreateBitmap") #define ID2D1RenderTarget_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \ ((This)->lpVtbl->CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1RenderTarget_CreateBitmapFromWicBitmap") #define ID2D1RenderTarget_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \ ((This)->lpVtbl->CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1RenderTarget_CreateSharedBitmap") #define ID2D1RenderTarget_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \ ((This)->lpVtbl->CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush)) +#pragma deprecated("ID2D1RenderTarget_CreateBitmapBrush") #define ID2D1RenderTarget_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \ ((This)->lpVtbl->CreateSolidColorBrush(This, color, brushProperties, solidColorBrush)) +#pragma deprecated("ID2D1RenderTarget_CreateSolidColorBrush") #define ID2D1RenderTarget_CreateGradientStopCollection(This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection) \ ((This)->lpVtbl->CreateGradientStopCollection(This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection)) +#pragma deprecated("ID2D1RenderTarget_CreateGradientStopCollection") #define ID2D1RenderTarget_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \ ((This)->lpVtbl->CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush)) +#pragma deprecated("ID2D1RenderTarget_CreateLinearGradientBrush") #define ID2D1RenderTarget_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \ ((This)->lpVtbl->CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush)) +#pragma deprecated("ID2D1RenderTarget_CreateRadialGradientBrush") #define ID2D1RenderTarget_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \ ((This)->lpVtbl->CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget)) +#pragma deprecated("ID2D1RenderTarget_CreateCompatibleRenderTarget") #define ID2D1RenderTarget_CreateLayer(This, size, layer) \ ((This)->lpVtbl->CreateLayer(This, size, layer)) +#pragma deprecated("ID2D1RenderTarget_CreateLayer") #define ID2D1RenderTarget_CreateMesh(This, mesh) \ ((This)->lpVtbl->CreateMesh(This, mesh)) +#pragma deprecated("ID2D1RenderTarget_CreateMesh") #define ID2D1RenderTarget_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1RenderTarget_DrawLine") #define ID2D1RenderTarget_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawRectangle(This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1RenderTarget_DrawRectangle") #define ID2D1RenderTarget_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->FillRectangle(This, rect, brush)) +#pragma deprecated("ID2D1RenderTarget_FillRectangle") #define ID2D1RenderTarget_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1RenderTarget_DrawRoundedRectangle") #define ID2D1RenderTarget_FillRoundedRectangle(This, roundedRect, brush) \ ((This)->lpVtbl->FillRoundedRectangle(This, roundedRect, brush)) +#pragma deprecated("ID2D1RenderTarget_FillRoundedRectangle") #define ID2D1RenderTarget_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1RenderTarget_DrawEllipse") #define ID2D1RenderTarget_FillEllipse(This, ellipse, brush) \ ((This)->lpVtbl->FillEllipse(This, ellipse, brush)) +#pragma deprecated("ID2D1RenderTarget_FillEllipse") #define ID2D1RenderTarget_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1RenderTarget_DrawGeometry") #define ID2D1RenderTarget_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->FillGeometry(This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1RenderTarget_FillGeometry") #define ID2D1RenderTarget_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->FillMesh(This, mesh, brush)) +#pragma deprecated("ID2D1RenderTarget_FillMesh") #define ID2D1RenderTarget_FillOpacityMask(This, opacityMask, brush, content, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->FillOpacityMask(This, opacityMask, brush, content, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1RenderTarget_FillOpacityMask") #define ID2D1RenderTarget_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle) \ ((This)->lpVtbl->DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle)) +#pragma deprecated("ID2D1RenderTarget_DrawBitmap") #define ID2D1RenderTarget_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \ ((This)->lpVtbl->DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode)) +#pragma deprecated("ID2D1RenderTarget_DrawText") #define ID2D1RenderTarget_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \ ((This)->lpVtbl->DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options)) +#pragma deprecated("ID2D1RenderTarget_DrawTextLayout") #define ID2D1RenderTarget_DrawGlyphRun(This, baselineOrigin, glyphRun, foregroundBrush, measuringMode) \ ((This)->lpVtbl->DrawGlyphRun(This, baselineOrigin, glyphRun, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1RenderTarget_DrawGlyphRun") #define ID2D1RenderTarget_SetTransform(This, transform) \ ((This)->lpVtbl->SetTransform(This, transform)) +#pragma deprecated("ID2D1RenderTarget_SetTransform") #define ID2D1RenderTarget_GetTransform(This, transform) \ ((This)->lpVtbl->GetTransform(This, transform)) +#pragma deprecated("ID2D1RenderTarget_GetTransform") #define ID2D1RenderTarget_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->SetAntialiasMode(This, antialiasMode)) +#pragma deprecated("ID2D1RenderTarget_SetAntialiasMode") #define ID2D1RenderTarget_GetAntialiasMode(This) \ ((This)->lpVtbl->GetAntialiasMode(This)) +#pragma deprecated("ID2D1RenderTarget_GetAntialiasMode") #define ID2D1RenderTarget_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->SetTextAntialiasMode(This, textAntialiasMode)) +#pragma deprecated("ID2D1RenderTarget_SetTextAntialiasMode") #define ID2D1RenderTarget_GetTextAntialiasMode(This) \ ((This)->lpVtbl->GetTextAntialiasMode(This)) +#pragma deprecated("ID2D1RenderTarget_GetTextAntialiasMode") #define ID2D1RenderTarget_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->SetTextRenderingParams(This, textRenderingParams)) +#pragma deprecated("ID2D1RenderTarget_SetTextRenderingParams") #define ID2D1RenderTarget_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->GetTextRenderingParams(This, textRenderingParams)) +#pragma deprecated("ID2D1RenderTarget_GetTextRenderingParams") #define ID2D1RenderTarget_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->SetTags(This, tag1, tag2)) +#pragma deprecated("ID2D1RenderTarget_SetTags") #define ID2D1RenderTarget_GetTags(This, tag1, tag2) \ ((This)->lpVtbl->GetTags(This, tag1, tag2)) +#pragma deprecated("ID2D1RenderTarget_GetTags") #define ID2D1RenderTarget_PushLayer(This, layerParameters, layer) \ ((This)->lpVtbl->PushLayer(This, layerParameters, layer)) +#pragma deprecated("ID2D1RenderTarget_PushLayer") #define ID2D1RenderTarget_PopLayer(This) \ ((This)->lpVtbl->PopLayer(This)) +#pragma deprecated("ID2D1RenderTarget_PopLayer") #define ID2D1RenderTarget_Flush(This, tag1, tag2) \ ((This)->lpVtbl->Flush(This, tag1, tag2)) +#pragma deprecated("ID2D1RenderTarget_Flush") #define ID2D1RenderTarget_SaveDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->SaveDrawingState(This, drawingStateBlock)) +#pragma deprecated("ID2D1RenderTarget_SaveDrawingState") #define ID2D1RenderTarget_RestoreDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->RestoreDrawingState(This, drawingStateBlock)) +#pragma deprecated("ID2D1RenderTarget_RestoreDrawingState") #define ID2D1RenderTarget_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->PushAxisAlignedClip(This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1RenderTarget_PushAxisAlignedClip") #define ID2D1RenderTarget_PopAxisAlignedClip(This) \ ((This)->lpVtbl->PopAxisAlignedClip(This)) +#pragma deprecated("ID2D1RenderTarget_PopAxisAlignedClip") #define ID2D1RenderTarget_Clear(This, clearColor) \ ((This)->lpVtbl->Clear(This, clearColor)) +#pragma deprecated("ID2D1RenderTarget_Clear") #define ID2D1RenderTarget_BeginDraw(This) \ ((This)->lpVtbl->BeginDraw(This)) +#pragma deprecated("ID2D1RenderTarget_BeginDraw") #define ID2D1RenderTarget_EndDraw(This, tag1, tag2) \ ((This)->lpVtbl->EndDraw(This, tag1, tag2)) +#pragma deprecated("ID2D1RenderTarget_EndDraw") #define ID2D1RenderTarget_GetPixelFormat(This) \ ((This)->lpVtbl->GetPixelFormat(This)) +#pragma deprecated("ID2D1RenderTarget_GetPixelFormat") #define ID2D1RenderTarget_SetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->SetDpi(This, dpiX, dpiY)) +#pragma deprecated("ID2D1RenderTarget_SetDpi") #define ID2D1RenderTarget_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->GetDpi(This, dpiX, dpiY)) +#pragma deprecated("ID2D1RenderTarget_GetDpi") #define ID2D1RenderTarget_GetSize(This) \ ((This)->lpVtbl->GetSize(This)) +#pragma deprecated("ID2D1RenderTarget_GetSize") #define ID2D1RenderTarget_GetPixelSize(This) \ ((This)->lpVtbl->GetPixelSize(This)) +#pragma deprecated("ID2D1RenderTarget_GetPixelSize") #define ID2D1RenderTarget_GetMaximumBitmapSize(This) \ ((This)->lpVtbl->GetMaximumBitmapSize(This)) +#pragma deprecated("ID2D1RenderTarget_GetMaximumBitmapSize") #define ID2D1RenderTarget_IsSupported(This, renderTargetProperties) \ ((This)->lpVtbl->IsSupported(This, renderTargetProperties)) +#pragma deprecated("ID2D1RenderTarget_IsSupported") typedef interface ID2D1BitmapRenderTarget ID2D1BitmapRenderTarget; @@ -6271,177 +6611,235 @@ interface ID2D1BitmapRenderTarget #define ID2D1BitmapRenderTarget_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1BitmapRenderTarget_QueryInterface") #define ID2D1BitmapRenderTarget_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_AddRef") #define ID2D1BitmapRenderTarget_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_Release") #define ID2D1BitmapRenderTarget_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetFactory") #define ID2D1BitmapRenderTarget_CreateBitmap(This, size, srcData, pitch, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmap((ID2D1RenderTarget *)This, size, srcData, pitch, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateBitmap") #define ID2D1BitmapRenderTarget_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmapFromWicBitmap((ID2D1RenderTarget *)This, wicBitmapSource, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateBitmapFromWicBitmap") #define ID2D1BitmapRenderTarget_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateSharedBitmap((ID2D1RenderTarget *)This, riid, data, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateSharedBitmap") #define ID2D1BitmapRenderTarget_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \ ((This)->lpVtbl->Base.CreateBitmapBrush((ID2D1RenderTarget *)This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateBitmapBrush") #define ID2D1BitmapRenderTarget_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \ ((This)->lpVtbl->Base.CreateSolidColorBrush((ID2D1RenderTarget *)This, color, brushProperties, solidColorBrush)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateSolidColorBrush") #define ID2D1BitmapRenderTarget_CreateGradientStopCollection(This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection) \ ((This)->lpVtbl->Base.CreateGradientStopCollection((ID2D1RenderTarget *)This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateGradientStopCollection") #define ID2D1BitmapRenderTarget_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \ ((This)->lpVtbl->Base.CreateLinearGradientBrush((ID2D1RenderTarget *)This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateLinearGradientBrush") #define ID2D1BitmapRenderTarget_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \ ((This)->lpVtbl->Base.CreateRadialGradientBrush((ID2D1RenderTarget *)This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateRadialGradientBrush") #define ID2D1BitmapRenderTarget_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \ ((This)->lpVtbl->Base.CreateCompatibleRenderTarget((ID2D1RenderTarget *)This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateCompatibleRenderTarget") #define ID2D1BitmapRenderTarget_CreateLayer(This, size, layer) \ ((This)->lpVtbl->Base.CreateLayer((ID2D1RenderTarget *)This, size, layer)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateLayer") #define ID2D1BitmapRenderTarget_CreateMesh(This, mesh) \ ((This)->lpVtbl->Base.CreateMesh((ID2D1RenderTarget *)This, mesh)) +#pragma deprecated("ID2D1BitmapRenderTarget_CreateMesh") #define ID2D1BitmapRenderTarget_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawLine((ID2D1RenderTarget *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawLine") #define ID2D1BitmapRenderTarget_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRectangle((ID2D1RenderTarget *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawRectangle") #define ID2D1BitmapRenderTarget_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.FillRectangle((ID2D1RenderTarget *)This, rect, brush)) +#pragma deprecated("ID2D1BitmapRenderTarget_FillRectangle") #define ID2D1BitmapRenderTarget_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawRoundedRectangle") #define ID2D1BitmapRenderTarget_FillRoundedRectangle(This, roundedRect, brush) \ ((This)->lpVtbl->Base.FillRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush)) +#pragma deprecated("ID2D1BitmapRenderTarget_FillRoundedRectangle") #define ID2D1BitmapRenderTarget_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawEllipse((ID2D1RenderTarget *)This, ellipse, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawEllipse") #define ID2D1BitmapRenderTarget_FillEllipse(This, ellipse, brush) \ ((This)->lpVtbl->Base.FillEllipse((ID2D1RenderTarget *)This, ellipse, brush)) +#pragma deprecated("ID2D1BitmapRenderTarget_FillEllipse") #define ID2D1BitmapRenderTarget_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawGeometry((ID2D1RenderTarget *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawGeometry") #define ID2D1BitmapRenderTarget_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.FillGeometry((ID2D1RenderTarget *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1BitmapRenderTarget_FillGeometry") #define ID2D1BitmapRenderTarget_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.FillMesh((ID2D1RenderTarget *)This, mesh, brush)) +#pragma deprecated("ID2D1BitmapRenderTarget_FillMesh") #define ID2D1BitmapRenderTarget_FillOpacityMask(This, opacityMask, brush, content, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->Base.FillOpacityMask((ID2D1RenderTarget *)This, opacityMask, brush, content, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1BitmapRenderTarget_FillOpacityMask") #define ID2D1BitmapRenderTarget_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle) \ ((This)->lpVtbl->Base.DrawBitmap((ID2D1RenderTarget *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawBitmap") #define ID2D1BitmapRenderTarget_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \ ((This)->lpVtbl->Base.DrawText((ID2D1RenderTarget *)This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawText") #define ID2D1BitmapRenderTarget_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \ ((This)->lpVtbl->Base.DrawTextLayout((ID2D1RenderTarget *)This, origin, textLayout, defaultForegroundBrush, options)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawTextLayout") #define ID2D1BitmapRenderTarget_DrawGlyphRun(This, baselineOrigin, glyphRun, foregroundBrush, measuringMode) \ ((This)->lpVtbl->Base.DrawGlyphRun((ID2D1RenderTarget *)This, baselineOrigin, glyphRun, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1BitmapRenderTarget_DrawGlyphRun") #define ID2D1BitmapRenderTarget_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1BitmapRenderTarget_SetTransform") #define ID2D1BitmapRenderTarget_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetTransform") #define ID2D1BitmapRenderTarget_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.SetAntialiasMode((ID2D1RenderTarget *)This, antialiasMode)) +#pragma deprecated("ID2D1BitmapRenderTarget_SetAntialiasMode") #define ID2D1BitmapRenderTarget_GetAntialiasMode(This) \ ((This)->lpVtbl->Base.GetAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetAntialiasMode") #define ID2D1BitmapRenderTarget_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.SetTextAntialiasMode((ID2D1RenderTarget *)This, textAntialiasMode)) +#pragma deprecated("ID2D1BitmapRenderTarget_SetTextAntialiasMode") #define ID2D1BitmapRenderTarget_GetTextAntialiasMode(This) \ ((This)->lpVtbl->Base.GetTextAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetTextAntialiasMode") #define ID2D1BitmapRenderTarget_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.SetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1BitmapRenderTarget_SetTextRenderingParams") #define ID2D1BitmapRenderTarget_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.GetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetTextRenderingParams") #define ID2D1BitmapRenderTarget_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.SetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1BitmapRenderTarget_SetTags") #define ID2D1BitmapRenderTarget_GetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.GetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetTags") #define ID2D1BitmapRenderTarget_PushLayer(This, layerParameters, layer) \ ((This)->lpVtbl->Base.PushLayer((ID2D1RenderTarget *)This, layerParameters, layer)) +#pragma deprecated("ID2D1BitmapRenderTarget_PushLayer") #define ID2D1BitmapRenderTarget_PopLayer(This) \ ((This)->lpVtbl->Base.PopLayer((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_PopLayer") #define ID2D1BitmapRenderTarget_Flush(This, tag1, tag2) \ ((This)->lpVtbl->Base.Flush((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1BitmapRenderTarget_Flush") #define ID2D1BitmapRenderTarget_SaveDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.SaveDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1BitmapRenderTarget_SaveDrawingState") #define ID2D1BitmapRenderTarget_RestoreDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.RestoreDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1BitmapRenderTarget_RestoreDrawingState") #define ID2D1BitmapRenderTarget_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.PushAxisAlignedClip((ID2D1RenderTarget *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1BitmapRenderTarget_PushAxisAlignedClip") #define ID2D1BitmapRenderTarget_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.PopAxisAlignedClip((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_PopAxisAlignedClip") #define ID2D1BitmapRenderTarget_Clear(This, clearColor) \ ((This)->lpVtbl->Base.Clear((ID2D1RenderTarget *)This, clearColor)) +#pragma deprecated("ID2D1BitmapRenderTarget_Clear") #define ID2D1BitmapRenderTarget_BeginDraw(This) \ ((This)->lpVtbl->Base.BeginDraw((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_BeginDraw") #define ID2D1BitmapRenderTarget_EndDraw(This, tag1, tag2) \ ((This)->lpVtbl->Base.EndDraw((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1BitmapRenderTarget_EndDraw") #define ID2D1BitmapRenderTarget_GetPixelFormat(This) \ ((This)->lpVtbl->Base.GetPixelFormat((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetPixelFormat") #define ID2D1BitmapRenderTarget_SetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.SetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1BitmapRenderTarget_SetDpi") #define ID2D1BitmapRenderTarget_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.GetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetDpi") #define ID2D1BitmapRenderTarget_GetSize(This) \ ((This)->lpVtbl->Base.GetSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetSize") #define ID2D1BitmapRenderTarget_GetPixelSize(This) \ ((This)->lpVtbl->Base.GetPixelSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetPixelSize") #define ID2D1BitmapRenderTarget_GetMaximumBitmapSize(This) \ ((This)->lpVtbl->Base.GetMaximumBitmapSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetMaximumBitmapSize") #define ID2D1BitmapRenderTarget_IsSupported(This, renderTargetProperties) \ ((This)->lpVtbl->Base.IsSupported((ID2D1RenderTarget *)This, renderTargetProperties)) +#pragma deprecated("ID2D1BitmapRenderTarget_IsSupported") #define ID2D1BitmapRenderTarget_GetBitmap(This, bitmap) \ ((This)->lpVtbl->GetBitmap(This, bitmap)) +#pragma deprecated("ID2D1BitmapRenderTarget_GetBitmap") typedef interface ID2D1HwndRenderTarget ID2D1HwndRenderTarget; @@ -6473,183 +6871,243 @@ interface ID2D1HwndRenderTarget #define ID2D1HwndRenderTarget_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1HwndRenderTarget_QueryInterface") #define ID2D1HwndRenderTarget_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_AddRef") #define ID2D1HwndRenderTarget_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_Release") #define ID2D1HwndRenderTarget_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1HwndRenderTarget_GetFactory") #define ID2D1HwndRenderTarget_CreateBitmap(This, size, srcData, pitch, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmap((ID2D1RenderTarget *)This, size, srcData, pitch, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateBitmap") #define ID2D1HwndRenderTarget_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmapFromWicBitmap((ID2D1RenderTarget *)This, wicBitmapSource, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateBitmapFromWicBitmap") #define ID2D1HwndRenderTarget_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateSharedBitmap((ID2D1RenderTarget *)This, riid, data, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateSharedBitmap") #define ID2D1HwndRenderTarget_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \ ((This)->lpVtbl->Base.CreateBitmapBrush((ID2D1RenderTarget *)This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateBitmapBrush") #define ID2D1HwndRenderTarget_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \ ((This)->lpVtbl->Base.CreateSolidColorBrush((ID2D1RenderTarget *)This, color, brushProperties, solidColorBrush)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateSolidColorBrush") #define ID2D1HwndRenderTarget_CreateGradientStopCollection(This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection) \ ((This)->lpVtbl->Base.CreateGradientStopCollection((ID2D1RenderTarget *)This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateGradientStopCollection") #define ID2D1HwndRenderTarget_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \ ((This)->lpVtbl->Base.CreateLinearGradientBrush((ID2D1RenderTarget *)This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateLinearGradientBrush") #define ID2D1HwndRenderTarget_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \ ((This)->lpVtbl->Base.CreateRadialGradientBrush((ID2D1RenderTarget *)This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateRadialGradientBrush") #define ID2D1HwndRenderTarget_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \ ((This)->lpVtbl->Base.CreateCompatibleRenderTarget((ID2D1RenderTarget *)This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateCompatibleRenderTarget") #define ID2D1HwndRenderTarget_CreateLayer(This, size, layer) \ ((This)->lpVtbl->Base.CreateLayer((ID2D1RenderTarget *)This, size, layer)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateLayer") #define ID2D1HwndRenderTarget_CreateMesh(This, mesh) \ ((This)->lpVtbl->Base.CreateMesh((ID2D1RenderTarget *)This, mesh)) +#pragma deprecated("ID2D1HwndRenderTarget_CreateMesh") #define ID2D1HwndRenderTarget_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawLine((ID2D1RenderTarget *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawLine") #define ID2D1HwndRenderTarget_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRectangle((ID2D1RenderTarget *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawRectangle") #define ID2D1HwndRenderTarget_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.FillRectangle((ID2D1RenderTarget *)This, rect, brush)) +#pragma deprecated("ID2D1HwndRenderTarget_FillRectangle") #define ID2D1HwndRenderTarget_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawRoundedRectangle") #define ID2D1HwndRenderTarget_FillRoundedRectangle(This, roundedRect, brush) \ ((This)->lpVtbl->Base.FillRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush)) +#pragma deprecated("ID2D1HwndRenderTarget_FillRoundedRectangle") #define ID2D1HwndRenderTarget_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawEllipse((ID2D1RenderTarget *)This, ellipse, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawEllipse") #define ID2D1HwndRenderTarget_FillEllipse(This, ellipse, brush) \ ((This)->lpVtbl->Base.FillEllipse((ID2D1RenderTarget *)This, ellipse, brush)) +#pragma deprecated("ID2D1HwndRenderTarget_FillEllipse") #define ID2D1HwndRenderTarget_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawGeometry((ID2D1RenderTarget *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawGeometry") #define ID2D1HwndRenderTarget_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.FillGeometry((ID2D1RenderTarget *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1HwndRenderTarget_FillGeometry") #define ID2D1HwndRenderTarget_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.FillMesh((ID2D1RenderTarget *)This, mesh, brush)) +#pragma deprecated("ID2D1HwndRenderTarget_FillMesh") #define ID2D1HwndRenderTarget_FillOpacityMask(This, opacityMask, brush, content, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->Base.FillOpacityMask((ID2D1RenderTarget *)This, opacityMask, brush, content, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1HwndRenderTarget_FillOpacityMask") #define ID2D1HwndRenderTarget_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle) \ ((This)->lpVtbl->Base.DrawBitmap((ID2D1RenderTarget *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawBitmap") #define ID2D1HwndRenderTarget_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \ ((This)->lpVtbl->Base.DrawText((ID2D1RenderTarget *)This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawText") #define ID2D1HwndRenderTarget_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \ ((This)->lpVtbl->Base.DrawTextLayout((ID2D1RenderTarget *)This, origin, textLayout, defaultForegroundBrush, options)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawTextLayout") #define ID2D1HwndRenderTarget_DrawGlyphRun(This, baselineOrigin, glyphRun, foregroundBrush, measuringMode) \ ((This)->lpVtbl->Base.DrawGlyphRun((ID2D1RenderTarget *)This, baselineOrigin, glyphRun, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1HwndRenderTarget_DrawGlyphRun") #define ID2D1HwndRenderTarget_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1HwndRenderTarget_SetTransform") #define ID2D1HwndRenderTarget_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1HwndRenderTarget_GetTransform") #define ID2D1HwndRenderTarget_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.SetAntialiasMode((ID2D1RenderTarget *)This, antialiasMode)) +#pragma deprecated("ID2D1HwndRenderTarget_SetAntialiasMode") #define ID2D1HwndRenderTarget_GetAntialiasMode(This) \ ((This)->lpVtbl->Base.GetAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_GetAntialiasMode") #define ID2D1HwndRenderTarget_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.SetTextAntialiasMode((ID2D1RenderTarget *)This, textAntialiasMode)) +#pragma deprecated("ID2D1HwndRenderTarget_SetTextAntialiasMode") #define ID2D1HwndRenderTarget_GetTextAntialiasMode(This) \ ((This)->lpVtbl->Base.GetTextAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_GetTextAntialiasMode") #define ID2D1HwndRenderTarget_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.SetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1HwndRenderTarget_SetTextRenderingParams") #define ID2D1HwndRenderTarget_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.GetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1HwndRenderTarget_GetTextRenderingParams") #define ID2D1HwndRenderTarget_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.SetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1HwndRenderTarget_SetTags") #define ID2D1HwndRenderTarget_GetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.GetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1HwndRenderTarget_GetTags") #define ID2D1HwndRenderTarget_PushLayer(This, layerParameters, layer) \ ((This)->lpVtbl->Base.PushLayer((ID2D1RenderTarget *)This, layerParameters, layer)) +#pragma deprecated("ID2D1HwndRenderTarget_PushLayer") #define ID2D1HwndRenderTarget_PopLayer(This) \ ((This)->lpVtbl->Base.PopLayer((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_PopLayer") #define ID2D1HwndRenderTarget_Flush(This, tag1, tag2) \ ((This)->lpVtbl->Base.Flush((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1HwndRenderTarget_Flush") #define ID2D1HwndRenderTarget_SaveDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.SaveDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1HwndRenderTarget_SaveDrawingState") #define ID2D1HwndRenderTarget_RestoreDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.RestoreDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1HwndRenderTarget_RestoreDrawingState") #define ID2D1HwndRenderTarget_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.PushAxisAlignedClip((ID2D1RenderTarget *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1HwndRenderTarget_PushAxisAlignedClip") #define ID2D1HwndRenderTarget_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.PopAxisAlignedClip((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_PopAxisAlignedClip") #define ID2D1HwndRenderTarget_Clear(This, clearColor) \ ((This)->lpVtbl->Base.Clear((ID2D1RenderTarget *)This, clearColor)) +#pragma deprecated("ID2D1HwndRenderTarget_Clear") #define ID2D1HwndRenderTarget_BeginDraw(This) \ ((This)->lpVtbl->Base.BeginDraw((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_BeginDraw") #define ID2D1HwndRenderTarget_EndDraw(This, tag1, tag2) \ ((This)->lpVtbl->Base.EndDraw((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1HwndRenderTarget_EndDraw") #define ID2D1HwndRenderTarget_GetPixelFormat(This) \ ((This)->lpVtbl->Base.GetPixelFormat((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_GetPixelFormat") #define ID2D1HwndRenderTarget_SetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.SetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1HwndRenderTarget_SetDpi") #define ID2D1HwndRenderTarget_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.GetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1HwndRenderTarget_GetDpi") #define ID2D1HwndRenderTarget_GetSize(This) \ ((This)->lpVtbl->Base.GetSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_GetSize") #define ID2D1HwndRenderTarget_GetPixelSize(This) \ ((This)->lpVtbl->Base.GetPixelSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_GetPixelSize") #define ID2D1HwndRenderTarget_GetMaximumBitmapSize(This) \ ((This)->lpVtbl->Base.GetMaximumBitmapSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1HwndRenderTarget_GetMaximumBitmapSize") #define ID2D1HwndRenderTarget_IsSupported(This, renderTargetProperties) \ ((This)->lpVtbl->Base.IsSupported((ID2D1RenderTarget *)This, renderTargetProperties)) +#pragma deprecated("ID2D1HwndRenderTarget_IsSupported") #define ID2D1HwndRenderTarget_CheckWindowState(This) \ ((This)->lpVtbl->CheckWindowState(This)) +#pragma deprecated("ID2D1HwndRenderTarget_CheckWindowState") #define ID2D1HwndRenderTarget_Resize(This, pixelSize) \ ((This)->lpVtbl->Resize(This, pixelSize)) +#pragma deprecated("ID2D1HwndRenderTarget_Resize") #define ID2D1HwndRenderTarget_GetHwnd(This) \ ((This)->lpVtbl->GetHwnd(This)) +#pragma deprecated("ID2D1HwndRenderTarget_GetHwnd") #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ @@ -6686,18 +7144,23 @@ interface ID2D1GdiInteropRenderTarget #define ID2D1GdiInteropRenderTarget_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GdiInteropRenderTarget_QueryInterface") #define ID2D1GdiInteropRenderTarget_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GdiInteropRenderTarget_AddRef") #define ID2D1GdiInteropRenderTarget_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GdiInteropRenderTarget_Release") #define ID2D1GdiInteropRenderTarget_GetDC(This, mode, hdc) \ ((This)->lpVtbl->GetDC(This, mode, hdc)) +#pragma deprecated("ID2D1GdiInteropRenderTarget_GetDC") #define ID2D1GdiInteropRenderTarget_ReleaseDC(This, update) \ ((This)->lpVtbl->ReleaseDC(This, update)) +#pragma deprecated("ID2D1GdiInteropRenderTarget_ReleaseDC") #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ @@ -6729,177 +7192,235 @@ interface ID2D1DCRenderTarget #define ID2D1DCRenderTarget_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1DCRenderTarget_QueryInterface") #define ID2D1DCRenderTarget_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1DCRenderTarget_AddRef") #define ID2D1DCRenderTarget_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1DCRenderTarget_Release") #define ID2D1DCRenderTarget_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1DCRenderTarget_GetFactory") #define ID2D1DCRenderTarget_CreateBitmap(This, size, srcData, pitch, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmap((ID2D1RenderTarget *)This, size, srcData, pitch, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DCRenderTarget_CreateBitmap") #define ID2D1DCRenderTarget_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmapFromWicBitmap((ID2D1RenderTarget *)This, wicBitmapSource, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DCRenderTarget_CreateBitmapFromWicBitmap") #define ID2D1DCRenderTarget_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateSharedBitmap((ID2D1RenderTarget *)This, riid, data, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DCRenderTarget_CreateSharedBitmap") #define ID2D1DCRenderTarget_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \ ((This)->lpVtbl->Base.CreateBitmapBrush((ID2D1RenderTarget *)This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush)) +#pragma deprecated("ID2D1DCRenderTarget_CreateBitmapBrush") #define ID2D1DCRenderTarget_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \ ((This)->lpVtbl->Base.CreateSolidColorBrush((ID2D1RenderTarget *)This, color, brushProperties, solidColorBrush)) +#pragma deprecated("ID2D1DCRenderTarget_CreateSolidColorBrush") #define ID2D1DCRenderTarget_CreateGradientStopCollection(This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection) \ ((This)->lpVtbl->Base.CreateGradientStopCollection((ID2D1RenderTarget *)This, gradientStops, gradientStopsCount, colorInterpolationGamma, extendMode, gradientStopCollection)) +#pragma deprecated("ID2D1DCRenderTarget_CreateGradientStopCollection") #define ID2D1DCRenderTarget_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \ ((This)->lpVtbl->Base.CreateLinearGradientBrush((ID2D1RenderTarget *)This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush)) +#pragma deprecated("ID2D1DCRenderTarget_CreateLinearGradientBrush") #define ID2D1DCRenderTarget_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \ ((This)->lpVtbl->Base.CreateRadialGradientBrush((ID2D1RenderTarget *)This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush)) +#pragma deprecated("ID2D1DCRenderTarget_CreateRadialGradientBrush") #define ID2D1DCRenderTarget_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \ ((This)->lpVtbl->Base.CreateCompatibleRenderTarget((ID2D1RenderTarget *)This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget)) +#pragma deprecated("ID2D1DCRenderTarget_CreateCompatibleRenderTarget") #define ID2D1DCRenderTarget_CreateLayer(This, size, layer) \ ((This)->lpVtbl->Base.CreateLayer((ID2D1RenderTarget *)This, size, layer)) +#pragma deprecated("ID2D1DCRenderTarget_CreateLayer") #define ID2D1DCRenderTarget_CreateMesh(This, mesh) \ ((This)->lpVtbl->Base.CreateMesh((ID2D1RenderTarget *)This, mesh)) +#pragma deprecated("ID2D1DCRenderTarget_CreateMesh") #define ID2D1DCRenderTarget_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawLine((ID2D1RenderTarget *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DCRenderTarget_DrawLine") #define ID2D1DCRenderTarget_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRectangle((ID2D1RenderTarget *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DCRenderTarget_DrawRectangle") #define ID2D1DCRenderTarget_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.FillRectangle((ID2D1RenderTarget *)This, rect, brush)) +#pragma deprecated("ID2D1DCRenderTarget_FillRectangle") #define ID2D1DCRenderTarget_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DCRenderTarget_DrawRoundedRectangle") #define ID2D1DCRenderTarget_FillRoundedRectangle(This, roundedRect, brush) \ ((This)->lpVtbl->Base.FillRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush)) +#pragma deprecated("ID2D1DCRenderTarget_FillRoundedRectangle") #define ID2D1DCRenderTarget_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawEllipse((ID2D1RenderTarget *)This, ellipse, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DCRenderTarget_DrawEllipse") #define ID2D1DCRenderTarget_FillEllipse(This, ellipse, brush) \ ((This)->lpVtbl->Base.FillEllipse((ID2D1RenderTarget *)This, ellipse, brush)) +#pragma deprecated("ID2D1DCRenderTarget_FillEllipse") #define ID2D1DCRenderTarget_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawGeometry((ID2D1RenderTarget *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DCRenderTarget_DrawGeometry") #define ID2D1DCRenderTarget_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.FillGeometry((ID2D1RenderTarget *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1DCRenderTarget_FillGeometry") #define ID2D1DCRenderTarget_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.FillMesh((ID2D1RenderTarget *)This, mesh, brush)) +#pragma deprecated("ID2D1DCRenderTarget_FillMesh") #define ID2D1DCRenderTarget_FillOpacityMask(This, opacityMask, brush, content, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->Base.FillOpacityMask((ID2D1RenderTarget *)This, opacityMask, brush, content, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1DCRenderTarget_FillOpacityMask") #define ID2D1DCRenderTarget_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle) \ ((This)->lpVtbl->Base.DrawBitmap((ID2D1RenderTarget *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle)) +#pragma deprecated("ID2D1DCRenderTarget_DrawBitmap") #define ID2D1DCRenderTarget_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \ ((This)->lpVtbl->Base.DrawText((ID2D1RenderTarget *)This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode)) +#pragma deprecated("ID2D1DCRenderTarget_DrawText") #define ID2D1DCRenderTarget_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \ ((This)->lpVtbl->Base.DrawTextLayout((ID2D1RenderTarget *)This, origin, textLayout, defaultForegroundBrush, options)) +#pragma deprecated("ID2D1DCRenderTarget_DrawTextLayout") #define ID2D1DCRenderTarget_DrawGlyphRun(This, baselineOrigin, glyphRun, foregroundBrush, measuringMode) \ ((This)->lpVtbl->Base.DrawGlyphRun((ID2D1RenderTarget *)This, baselineOrigin, glyphRun, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1DCRenderTarget_DrawGlyphRun") #define ID2D1DCRenderTarget_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DCRenderTarget_SetTransform") #define ID2D1DCRenderTarget_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DCRenderTarget_GetTransform") #define ID2D1DCRenderTarget_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.SetAntialiasMode((ID2D1RenderTarget *)This, antialiasMode)) +#pragma deprecated("ID2D1DCRenderTarget_SetAntialiasMode") #define ID2D1DCRenderTarget_GetAntialiasMode(This) \ ((This)->lpVtbl->Base.GetAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_GetAntialiasMode") #define ID2D1DCRenderTarget_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.SetTextAntialiasMode((ID2D1RenderTarget *)This, textAntialiasMode)) +#pragma deprecated("ID2D1DCRenderTarget_SetTextAntialiasMode") #define ID2D1DCRenderTarget_GetTextAntialiasMode(This) \ ((This)->lpVtbl->Base.GetTextAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_GetTextAntialiasMode") #define ID2D1DCRenderTarget_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.SetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DCRenderTarget_SetTextRenderingParams") #define ID2D1DCRenderTarget_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.GetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DCRenderTarget_GetTextRenderingParams") #define ID2D1DCRenderTarget_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.SetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DCRenderTarget_SetTags") #define ID2D1DCRenderTarget_GetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.GetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DCRenderTarget_GetTags") #define ID2D1DCRenderTarget_PushLayer(This, layerParameters, layer) \ ((This)->lpVtbl->Base.PushLayer((ID2D1RenderTarget *)This, layerParameters, layer)) +#pragma deprecated("ID2D1DCRenderTarget_PushLayer") #define ID2D1DCRenderTarget_PopLayer(This) \ ((This)->lpVtbl->Base.PopLayer((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_PopLayer") #define ID2D1DCRenderTarget_Flush(This, tag1, tag2) \ ((This)->lpVtbl->Base.Flush((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DCRenderTarget_Flush") #define ID2D1DCRenderTarget_SaveDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.SaveDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DCRenderTarget_SaveDrawingState") #define ID2D1DCRenderTarget_RestoreDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.RestoreDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DCRenderTarget_RestoreDrawingState") #define ID2D1DCRenderTarget_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.PushAxisAlignedClip((ID2D1RenderTarget *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1DCRenderTarget_PushAxisAlignedClip") #define ID2D1DCRenderTarget_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.PopAxisAlignedClip((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_PopAxisAlignedClip") #define ID2D1DCRenderTarget_Clear(This, clearColor) \ ((This)->lpVtbl->Base.Clear((ID2D1RenderTarget *)This, clearColor)) +#pragma deprecated("ID2D1DCRenderTarget_Clear") #define ID2D1DCRenderTarget_BeginDraw(This) \ ((This)->lpVtbl->Base.BeginDraw((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_BeginDraw") #define ID2D1DCRenderTarget_EndDraw(This, tag1, tag2) \ ((This)->lpVtbl->Base.EndDraw((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DCRenderTarget_EndDraw") #define ID2D1DCRenderTarget_GetPixelFormat(This) \ ((This)->lpVtbl->Base.GetPixelFormat((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_GetPixelFormat") #define ID2D1DCRenderTarget_SetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.SetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DCRenderTarget_SetDpi") #define ID2D1DCRenderTarget_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.GetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DCRenderTarget_GetDpi") #define ID2D1DCRenderTarget_GetSize(This) \ ((This)->lpVtbl->Base.GetSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_GetSize") #define ID2D1DCRenderTarget_GetPixelSize(This) \ ((This)->lpVtbl->Base.GetPixelSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_GetPixelSize") #define ID2D1DCRenderTarget_GetMaximumBitmapSize(This) \ ((This)->lpVtbl->Base.GetMaximumBitmapSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DCRenderTarget_GetMaximumBitmapSize") #define ID2D1DCRenderTarget_IsSupported(This, renderTargetProperties) \ ((This)->lpVtbl->Base.IsSupported((ID2D1RenderTarget *)This, renderTargetProperties)) +#pragma deprecated("ID2D1DCRenderTarget_IsSupported") #define ID2D1DCRenderTarget_BindDC(This, hDC, pSubRect) \ ((This)->lpVtbl->BindDC(This, hDC, pSubRect)) +#pragma deprecated("ID2D1DCRenderTarget_BindDC") typedef interface ID2D1Factory ID2D1Factory; @@ -7008,54 +7529,71 @@ interface ID2D1Factory #define ID2D1Factory_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Factory_QueryInterface") #define ID2D1Factory_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Factory_AddRef") #define ID2D1Factory_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Factory_Release") #define ID2D1Factory_ReloadSystemMetrics(This) \ ((This)->lpVtbl->ReloadSystemMetrics(This)) +#pragma deprecated("ID2D1Factory_ReloadSystemMetrics") #define ID2D1Factory_GetDesktopDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->GetDesktopDpi(This, dpiX, dpiY)) +#pragma deprecated("ID2D1Factory_GetDesktopDpi") #define ID2D1Factory_CreateRectangleGeometry(This, rectangle, rectangleGeometry) \ ((This)->lpVtbl->CreateRectangleGeometry(This, rectangle, rectangleGeometry)) +#pragma deprecated("ID2D1Factory_CreateRectangleGeometry") #define ID2D1Factory_CreateRoundedRectangleGeometry(This, roundedRectangle, roundedRectangleGeometry) \ ((This)->lpVtbl->CreateRoundedRectangleGeometry(This, roundedRectangle, roundedRectangleGeometry)) +#pragma deprecated("ID2D1Factory_CreateRoundedRectangleGeometry") #define ID2D1Factory_CreateEllipseGeometry(This, ellipse, ellipseGeometry) \ ((This)->lpVtbl->CreateEllipseGeometry(This, ellipse, ellipseGeometry)) +#pragma deprecated("ID2D1Factory_CreateEllipseGeometry") #define ID2D1Factory_CreateGeometryGroup(This, fillMode, geometries, geometriesCount, geometryGroup) \ ((This)->lpVtbl->CreateGeometryGroup(This, fillMode, geometries, geometriesCount, geometryGroup)) +#pragma deprecated("ID2D1Factory_CreateGeometryGroup") #define ID2D1Factory_CreateTransformedGeometry(This, sourceGeometry, transform, transformedGeometry) \ ((This)->lpVtbl->CreateTransformedGeometry(This, sourceGeometry, transform, transformedGeometry)) +#pragma deprecated("ID2D1Factory_CreateTransformedGeometry") #define ID2D1Factory_CreatePathGeometry(This, pathGeometry) \ ((This)->lpVtbl->CreatePathGeometry(This, pathGeometry)) +#pragma deprecated("ID2D1Factory_CreatePathGeometry") #define ID2D1Factory_CreateStrokeStyle(This, strokeStyleProperties, dashes, dashesCount, strokeStyle) \ ((This)->lpVtbl->CreateStrokeStyle(This, strokeStyleProperties, dashes, dashesCount, strokeStyle)) +#pragma deprecated("ID2D1Factory_CreateStrokeStyle") #define ID2D1Factory_CreateDrawingStateBlock(This, drawingStateDescription, textRenderingParams, drawingStateBlock) \ ((This)->lpVtbl->CreateDrawingStateBlock(This, drawingStateDescription, textRenderingParams, drawingStateBlock)) +#pragma deprecated("ID2D1Factory_CreateDrawingStateBlock") #define ID2D1Factory_CreateWicBitmapRenderTarget(This, target, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->CreateWicBitmapRenderTarget(This, target, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory_CreateWicBitmapRenderTarget") #define ID2D1Factory_CreateHwndRenderTarget(This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget) \ ((This)->lpVtbl->CreateHwndRenderTarget(This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget)) +#pragma deprecated("ID2D1Factory_CreateHwndRenderTarget") #define ID2D1Factory_CreateDxgiSurfaceRenderTarget(This, dxgiSurface, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->CreateDxgiSurfaceRenderTarget(This, dxgiSurface, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory_CreateDxgiSurfaceRenderTarget") #define ID2D1Factory_CreateDCRenderTarget(This, renderTargetProperties, dcRenderTarget) \ ((This)->lpVtbl->CreateDCRenderTarget(This, renderTargetProperties, dcRenderTarget)) +#pragma deprecated("ID2D1Factory_CreateDCRenderTarget") #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ diff --git a/minidx12/Include/d2d1_1.h b/minidx12/Include/d2d1_1.h index 12749f9980..d66ec303be 100644 --- a/minidx12/Include/d2d1_1.h +++ b/minidx12/Include/d2d1_1.h @@ -2802,15 +2802,19 @@ interface ID2D1GdiMetafileSink #define ID2D1GdiMetafileSink_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GdiMetafileSink_QueryInterface") #define ID2D1GdiMetafileSink_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafileSink_AddRef") #define ID2D1GdiMetafileSink_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafileSink_Release") #define ID2D1GdiMetafileSink_ProcessRecord(This, recordType, recordData, recordDataSize) \ ((This)->lpVtbl->ProcessRecord(This, recordType, recordData, recordDataSize)) +#pragma deprecated("ID2D1GdiMetafileSink_ProcessRecord") typedef interface ID2D1GdiMetafile ID2D1GdiMetafile; @@ -2839,21 +2843,27 @@ interface ID2D1GdiMetafile #define ID2D1GdiMetafile_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GdiMetafile_QueryInterface") #define ID2D1GdiMetafile_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafile_AddRef") #define ID2D1GdiMetafile_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafile_Release") #define ID2D1GdiMetafile_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1GdiMetafile_GetFactory") #define ID2D1GdiMetafile_Stream(This, sink) \ ((This)->lpVtbl->Stream(This, sink)) +#pragma deprecated("ID2D1GdiMetafile_Stream") #define ID2D1GdiMetafile_GetBounds(This, bounds) \ ((This)->lpVtbl->GetBounds(This, bounds)) +#pragma deprecated("ID2D1GdiMetafile_GetBounds") typedef interface ID2D1CommandSink ID2D1CommandSink; @@ -3027,87 +3037,115 @@ interface ID2D1CommandSink #define ID2D1CommandSink_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1CommandSink_QueryInterface") #define ID2D1CommandSink_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1CommandSink_AddRef") #define ID2D1CommandSink_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1CommandSink_Release") #define ID2D1CommandSink_BeginDraw(This) \ ((This)->lpVtbl->BeginDraw(This)) +#pragma deprecated("ID2D1CommandSink_BeginDraw") #define ID2D1CommandSink_EndDraw(This) \ ((This)->lpVtbl->EndDraw(This)) +#pragma deprecated("ID2D1CommandSink_EndDraw") #define ID2D1CommandSink_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->SetAntialiasMode(This, antialiasMode)) +#pragma deprecated("ID2D1CommandSink_SetAntialiasMode") #define ID2D1CommandSink_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->SetTags(This, tag1, tag2)) +#pragma deprecated("ID2D1CommandSink_SetTags") #define ID2D1CommandSink_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->SetTextAntialiasMode(This, textAntialiasMode)) +#pragma deprecated("ID2D1CommandSink_SetTextAntialiasMode") #define ID2D1CommandSink_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->SetTextRenderingParams(This, textRenderingParams)) +#pragma deprecated("ID2D1CommandSink_SetTextRenderingParams") #define ID2D1CommandSink_SetTransform(This, transform) \ ((This)->lpVtbl->SetTransform(This, transform)) +#pragma deprecated("ID2D1CommandSink_SetTransform") #define ID2D1CommandSink_SetPrimitiveBlend(This, primitiveBlend) \ ((This)->lpVtbl->SetPrimitiveBlend(This, primitiveBlend)) +#pragma deprecated("ID2D1CommandSink_SetPrimitiveBlend") #define ID2D1CommandSink_SetUnitMode(This, unitMode) \ ((This)->lpVtbl->SetUnitMode(This, unitMode)) +#pragma deprecated("ID2D1CommandSink_SetUnitMode") #define ID2D1CommandSink_Clear(This, color) \ ((This)->lpVtbl->Clear(This, color)) +#pragma deprecated("ID2D1CommandSink_Clear") #define ID2D1CommandSink_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \ ((This)->lpVtbl->DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1CommandSink_DrawGlyphRun") #define ID2D1CommandSink_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink_DrawLine") #define ID2D1CommandSink_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink_DrawGeometry") #define ID2D1CommandSink_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->DrawRectangle(This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink_DrawRectangle") #define ID2D1CommandSink_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \ ((This)->lpVtbl->DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform)) +#pragma deprecated("ID2D1CommandSink_DrawBitmap") #define ID2D1CommandSink_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \ ((This)->lpVtbl->DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode)) +#pragma deprecated("ID2D1CommandSink_DrawImage") #define ID2D1CommandSink_DrawGdiMetafile(This, gdiMetafile, targetOffset) \ ((This)->lpVtbl->DrawGdiMetafile(This, gdiMetafile, targetOffset)) +#pragma deprecated("ID2D1CommandSink_DrawGdiMetafile") #define ID2D1CommandSink_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->FillMesh(This, mesh, brush)) +#pragma deprecated("ID2D1CommandSink_FillMesh") #define ID2D1CommandSink_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1CommandSink_FillOpacityMask") #define ID2D1CommandSink_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->FillGeometry(This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1CommandSink_FillGeometry") #define ID2D1CommandSink_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->FillRectangle(This, rect, brush)) +#pragma deprecated("ID2D1CommandSink_FillRectangle") #define ID2D1CommandSink_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->PushAxisAlignedClip(This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1CommandSink_PushAxisAlignedClip") #define ID2D1CommandSink_PushLayer(This, layerParameters1, layer) \ ((This)->lpVtbl->PushLayer(This, layerParameters1, layer)) +#pragma deprecated("ID2D1CommandSink_PushLayer") #define ID2D1CommandSink_PopAxisAlignedClip(This) \ ((This)->lpVtbl->PopAxisAlignedClip(This)) +#pragma deprecated("ID2D1CommandSink_PopAxisAlignedClip") #define ID2D1CommandSink_PopLayer(This) \ ((This)->lpVtbl->PopLayer(This)) +#pragma deprecated("ID2D1CommandSink_PopLayer") typedef interface ID2D1CommandList ID2D1CommandList; @@ -3135,21 +3173,27 @@ interface ID2D1CommandList #define ID2D1CommandList_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1CommandList_QueryInterface") #define ID2D1CommandList_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1CommandList_AddRef") #define ID2D1CommandList_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1CommandList_Release") #define ID2D1CommandList_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1CommandList_GetFactory") #define ID2D1CommandList_Stream(This, sink) \ ((This)->lpVtbl->Stream(This, sink)) +#pragma deprecated("ID2D1CommandList_Stream") #define ID2D1CommandList_Close(This) \ ((This)->lpVtbl->Close(This)) +#pragma deprecated("ID2D1CommandList_Close") typedef interface ID2D1PrintControl ID2D1PrintControl; @@ -3181,18 +3225,23 @@ interface ID2D1PrintControl #define ID2D1PrintControl_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1PrintControl_QueryInterface") #define ID2D1PrintControl_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1PrintControl_AddRef") #define ID2D1PrintControl_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1PrintControl_Release") #define ID2D1PrintControl_AddPage(This, commandList, pageSize, pagePrintTicketStream, tag1, tag2) \ ((This)->lpVtbl->AddPage(This, commandList, pageSize, pagePrintTicketStream, tag1, tag2)) +#pragma deprecated("ID2D1PrintControl_AddPage") #define ID2D1PrintControl_Close(This) \ ((This)->lpVtbl->Close(This)) +#pragma deprecated("ID2D1PrintControl_Close") typedef interface ID2D1ImageBrush ID2D1ImageBrush; @@ -3258,57 +3307,75 @@ interface ID2D1ImageBrush #define ID2D1ImageBrush_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1ImageBrush_QueryInterface") #define ID2D1ImageBrush_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1ImageBrush_AddRef") #define ID2D1ImageBrush_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1ImageBrush_Release") #define ID2D1ImageBrush_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1ImageBrush_GetFactory") #define ID2D1ImageBrush_SetOpacity(This, opacity) \ ((This)->lpVtbl->Base.SetOpacity((ID2D1Brush *)This, opacity)) +#pragma deprecated("ID2D1ImageBrush_SetOpacity") #define ID2D1ImageBrush_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1ImageBrush_SetTransform") #define ID2D1ImageBrush_GetOpacity(This) \ ((This)->lpVtbl->Base.GetOpacity((ID2D1Brush *)This)) +#pragma deprecated("ID2D1ImageBrush_GetOpacity") #define ID2D1ImageBrush_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1ImageBrush_GetTransform") #define ID2D1ImageBrush_SetImage(This, image) \ ((This)->lpVtbl->SetImage(This, image)) +#pragma deprecated("ID2D1ImageBrush_SetImage") #define ID2D1ImageBrush_SetExtendModeX(This, extendModeX) \ ((This)->lpVtbl->SetExtendModeX(This, extendModeX)) +#pragma deprecated("ID2D1ImageBrush_SetExtendModeX") #define ID2D1ImageBrush_SetExtendModeY(This, extendModeY) \ ((This)->lpVtbl->SetExtendModeY(This, extendModeY)) +#pragma deprecated("ID2D1ImageBrush_SetExtendModeY") #define ID2D1ImageBrush_SetInterpolationMode(This, interpolationMode) \ ((This)->lpVtbl->SetInterpolationMode(This, interpolationMode)) +#pragma deprecated("ID2D1ImageBrush_SetInterpolationMode") #define ID2D1ImageBrush_SetSourceRectangle(This, sourceRectangle) \ ((This)->lpVtbl->SetSourceRectangle(This, sourceRectangle)) +#pragma deprecated("ID2D1ImageBrush_SetSourceRectangle") #define ID2D1ImageBrush_GetImage(This, image) \ ((This)->lpVtbl->GetImage(This, image)) +#pragma deprecated("ID2D1ImageBrush_GetImage") #define ID2D1ImageBrush_GetExtendModeX(This) \ ((This)->lpVtbl->GetExtendModeX(This)) +#pragma deprecated("ID2D1ImageBrush_GetExtendModeX") #define ID2D1ImageBrush_GetExtendModeY(This) \ ((This)->lpVtbl->GetExtendModeY(This)) +#pragma deprecated("ID2D1ImageBrush_GetExtendModeY") #define ID2D1ImageBrush_GetInterpolationMode(This) \ ((This)->lpVtbl->GetInterpolationMode(This)) +#pragma deprecated("ID2D1ImageBrush_GetInterpolationMode") #define ID2D1ImageBrush_GetSourceRectangle(This, sourceRectangle) \ ((This)->lpVtbl->GetSourceRectangle(This, sourceRectangle)) +#pragma deprecated("ID2D1ImageBrush_GetSourceRectangle") typedef interface ID2D1BitmapBrush1 ID2D1BitmapBrush1; @@ -3336,57 +3403,75 @@ interface ID2D1BitmapBrush1 #define ID2D1BitmapBrush1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1BitmapBrush1_QueryInterface") #define ID2D1BitmapBrush1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1BitmapBrush1_AddRef") #define ID2D1BitmapBrush1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1BitmapBrush1_Release") #define ID2D1BitmapBrush1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1BitmapBrush1_GetFactory") #define ID2D1BitmapBrush1_SetOpacity(This, opacity) \ ((This)->lpVtbl->Base.Base.SetOpacity((ID2D1Brush *)This, opacity)) +#pragma deprecated("ID2D1BitmapBrush1_SetOpacity") #define ID2D1BitmapBrush1_SetTransform(This, transform) \ ((This)->lpVtbl->Base.Base.SetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1BitmapBrush1_SetTransform") #define ID2D1BitmapBrush1_GetOpacity(This) \ ((This)->lpVtbl->Base.Base.GetOpacity((ID2D1Brush *)This)) +#pragma deprecated("ID2D1BitmapBrush1_GetOpacity") #define ID2D1BitmapBrush1_GetTransform(This, transform) \ ((This)->lpVtbl->Base.Base.GetTransform((ID2D1Brush *)This, transform)) +#pragma deprecated("ID2D1BitmapBrush1_GetTransform") #define ID2D1BitmapBrush1_SetExtendModeX(This, extendModeX) \ ((This)->lpVtbl->Base.SetExtendModeX((ID2D1BitmapBrush *)This, extendModeX)) +#pragma deprecated("ID2D1BitmapBrush1_SetExtendModeX") #define ID2D1BitmapBrush1_SetExtendModeY(This, extendModeY) \ ((This)->lpVtbl->Base.SetExtendModeY((ID2D1BitmapBrush *)This, extendModeY)) +#pragma deprecated("ID2D1BitmapBrush1_SetExtendModeY") #define ID2D1BitmapBrush1_SetInterpolationMode(This, interpolationMode) \ ((This)->lpVtbl->Base.SetInterpolationMode((ID2D1BitmapBrush *)This, interpolationMode)) +#pragma deprecated("ID2D1BitmapBrush1_SetInterpolationMode") #define ID2D1BitmapBrush1_SetBitmap(This, bitmap) \ ((This)->lpVtbl->Base.SetBitmap((ID2D1BitmapBrush *)This, bitmap)) +#pragma deprecated("ID2D1BitmapBrush1_SetBitmap") #define ID2D1BitmapBrush1_GetExtendModeX(This) \ ((This)->lpVtbl->Base.GetExtendModeX((ID2D1BitmapBrush *)This)) +#pragma deprecated("ID2D1BitmapBrush1_GetExtendModeX") #define ID2D1BitmapBrush1_GetExtendModeY(This) \ ((This)->lpVtbl->Base.GetExtendModeY((ID2D1BitmapBrush *)This)) +#pragma deprecated("ID2D1BitmapBrush1_GetExtendModeY") #define ID2D1BitmapBrush1_GetInterpolationMode(This) \ ((This)->lpVtbl->Base.GetInterpolationMode((ID2D1BitmapBrush *)This)) +#pragma deprecated("ID2D1BitmapBrush1_GetInterpolationMode") #define ID2D1BitmapBrush1_GetBitmap(This, bitmap) \ ((This)->lpVtbl->Base.GetBitmap((ID2D1BitmapBrush *)This, bitmap)) +#pragma deprecated("ID2D1BitmapBrush1_GetBitmap") #define ID2D1BitmapBrush1_SetInterpolationMode1(This, interpolationMode) \ ((This)->lpVtbl->SetInterpolationMode1(This, interpolationMode)) +#pragma deprecated("ID2D1BitmapBrush1_SetInterpolationMode1") #define ID2D1BitmapBrush1_GetInterpolationMode1(This) \ ((This)->lpVtbl->GetInterpolationMode1(This)) +#pragma deprecated("ID2D1BitmapBrush1_GetInterpolationMode1") typedef interface ID2D1StrokeStyle1 ID2D1StrokeStyle1; @@ -3409,45 +3494,59 @@ interface ID2D1StrokeStyle1 #define ID2D1StrokeStyle1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1StrokeStyle1_QueryInterface") #define ID2D1StrokeStyle1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1StrokeStyle1_AddRef") #define ID2D1StrokeStyle1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1StrokeStyle1_Release") #define ID2D1StrokeStyle1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1StrokeStyle1_GetFactory") #define ID2D1StrokeStyle1_GetStartCap(This) \ ((This)->lpVtbl->Base.GetStartCap((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetStartCap") #define ID2D1StrokeStyle1_GetEndCap(This) \ ((This)->lpVtbl->Base.GetEndCap((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetEndCap") #define ID2D1StrokeStyle1_GetDashCap(This) \ ((This)->lpVtbl->Base.GetDashCap((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetDashCap") #define ID2D1StrokeStyle1_GetMiterLimit(This) \ ((This)->lpVtbl->Base.GetMiterLimit((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetMiterLimit") #define ID2D1StrokeStyle1_GetLineJoin(This) \ ((This)->lpVtbl->Base.GetLineJoin((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetLineJoin") #define ID2D1StrokeStyle1_GetDashOffset(This) \ ((This)->lpVtbl->Base.GetDashOffset((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetDashOffset") #define ID2D1StrokeStyle1_GetDashStyle(This) \ ((This)->lpVtbl->Base.GetDashStyle((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetDashStyle") #define ID2D1StrokeStyle1_GetDashesCount(This) \ ((This)->lpVtbl->Base.GetDashesCount((ID2D1StrokeStyle *)This)) +#pragma deprecated("ID2D1StrokeStyle1_GetDashesCount") #define ID2D1StrokeStyle1_GetDashes(This, dashes, dashesCount) \ ((This)->lpVtbl->Base.GetDashes((ID2D1StrokeStyle *)This, dashes, dashesCount)) +#pragma deprecated("ID2D1StrokeStyle1_GetDashes") #define ID2D1StrokeStyle1_GetStrokeTransformType(This) \ ((This)->lpVtbl->GetStrokeTransformType(This)) +#pragma deprecated("ID2D1StrokeStyle1_GetStrokeTransformType") typedef interface ID2D1PathGeometry1 ID2D1PathGeometry1; @@ -3475,69 +3574,91 @@ interface ID2D1PathGeometry1 #define ID2D1PathGeometry1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1PathGeometry1_QueryInterface") #define ID2D1PathGeometry1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1PathGeometry1_AddRef") #define ID2D1PathGeometry1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1PathGeometry1_Release") #define ID2D1PathGeometry1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1PathGeometry1_GetFactory") #define ID2D1PathGeometry1_GetBounds(This, worldTransform, bounds) \ ((This)->lpVtbl->Base.Base.GetBounds((ID2D1Geometry *)This, worldTransform, bounds)) +#pragma deprecated("ID2D1PathGeometry1_GetBounds") #define ID2D1PathGeometry1_GetWidenedBounds(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds) \ ((This)->lpVtbl->Base.Base.GetWidenedBounds((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds)) +#pragma deprecated("ID2D1PathGeometry1_GetWidenedBounds") #define ID2D1PathGeometry1_StrokeContainsPoint(This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.Base.StrokeContainsPoint((ID2D1Geometry *)This, point, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1PathGeometry1_StrokeContainsPoint") #define ID2D1PathGeometry1_FillContainsPoint(This, point, worldTransform, flatteningTolerance, contains) \ ((This)->lpVtbl->Base.Base.FillContainsPoint((ID2D1Geometry *)This, point, worldTransform, flatteningTolerance, contains)) +#pragma deprecated("ID2D1PathGeometry1_FillContainsPoint") #define ID2D1PathGeometry1_CompareWithGeometry(This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation) \ ((This)->lpVtbl->Base.Base.CompareWithGeometry((ID2D1Geometry *)This, inputGeometry, inputGeometryTransform, flatteningTolerance, relation)) +#pragma deprecated("ID2D1PathGeometry1_CompareWithGeometry") #define ID2D1PathGeometry1_Simplify(This, simplificationOption, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Base.Simplify((ID2D1Geometry *)This, simplificationOption, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry1_Simplify") #define ID2D1PathGeometry1_Tessellate(This, worldTransform, flatteningTolerance, tessellationSink) \ ((This)->lpVtbl->Base.Base.Tessellate((ID2D1Geometry *)This, worldTransform, flatteningTolerance, tessellationSink)) +#pragma deprecated("ID2D1PathGeometry1_Tessellate") #define ID2D1PathGeometry1_CombineWithGeometry(This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Base.CombineWithGeometry((ID2D1Geometry *)This, inputGeometry, combineMode, inputGeometryTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry1_CombineWithGeometry") #define ID2D1PathGeometry1_Outline(This, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Base.Outline((ID2D1Geometry *)This, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry1_Outline") #define ID2D1PathGeometry1_ComputeArea(This, worldTransform, flatteningTolerance, area) \ ((This)->lpVtbl->Base.Base.ComputeArea((ID2D1Geometry *)This, worldTransform, flatteningTolerance, area)) +#pragma deprecated("ID2D1PathGeometry1_ComputeArea") #define ID2D1PathGeometry1_ComputeLength(This, worldTransform, flatteningTolerance, length) \ ((This)->lpVtbl->Base.Base.ComputeLength((ID2D1Geometry *)This, worldTransform, flatteningTolerance, length)) +#pragma deprecated("ID2D1PathGeometry1_ComputeLength") #define ID2D1PathGeometry1_ComputePointAtLength(This, length, worldTransform, flatteningTolerance, point, unitTangentVector) \ ((This)->lpVtbl->Base.Base.ComputePointAtLength((ID2D1Geometry *)This, length, worldTransform, flatteningTolerance, point, unitTangentVector)) +#pragma deprecated("ID2D1PathGeometry1_ComputePointAtLength") #define ID2D1PathGeometry1_Widen(This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->Base.Base.Widen((ID2D1Geometry *)This, strokeWidth, strokeStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1PathGeometry1_Widen") #define ID2D1PathGeometry1_Open(This, geometrySink) \ ((This)->lpVtbl->Base.Open((ID2D1PathGeometry *)This, geometrySink)) +#pragma deprecated("ID2D1PathGeometry1_Open") #define ID2D1PathGeometry1_Stream(This, geometrySink) \ ((This)->lpVtbl->Base.Stream((ID2D1PathGeometry *)This, geometrySink)) +#pragma deprecated("ID2D1PathGeometry1_Stream") #define ID2D1PathGeometry1_GetSegmentCount(This, count) \ ((This)->lpVtbl->Base.GetSegmentCount((ID2D1PathGeometry *)This, count)) +#pragma deprecated("ID2D1PathGeometry1_GetSegmentCount") #define ID2D1PathGeometry1_GetFigureCount(This, count) \ ((This)->lpVtbl->Base.GetFigureCount((ID2D1PathGeometry *)This, count)) +#pragma deprecated("ID2D1PathGeometry1_GetFigureCount") #define ID2D1PathGeometry1_ComputePointAndSegmentAtLength(This, length, startSegment, worldTransform, flatteningTolerance, pointDescription) \ ((This)->lpVtbl->ComputePointAndSegmentAtLength(This, length, startSegment, worldTransform, flatteningTolerance, pointDescription)) +#pragma deprecated("ID2D1PathGeometry1_ComputePointAndSegmentAtLength") typedef interface ID2D1Properties ID2D1Properties; @@ -3625,45 +3746,59 @@ interface ID2D1Properties #define ID2D1Properties_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Properties_QueryInterface") #define ID2D1Properties_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Properties_AddRef") #define ID2D1Properties_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Properties_Release") #define ID2D1Properties_GetPropertyCount(This) \ ((This)->lpVtbl->GetPropertyCount(This)) +#pragma deprecated("ID2D1Properties_GetPropertyCount") #define ID2D1Properties_GetPropertyName(This, index, name, nameCount) \ ((This)->lpVtbl->GetPropertyName(This, index, name, nameCount)) +#pragma deprecated("ID2D1Properties_GetPropertyName") #define ID2D1Properties_GetPropertyNameLength(This, index) \ ((This)->lpVtbl->GetPropertyNameLength(This, index)) +#pragma deprecated("ID2D1Properties_GetPropertyNameLength") #define ID2D1Properties_GetType(This, index) \ ((This)->lpVtbl->GetType(This, index)) +#pragma deprecated("ID2D1Properties_GetType") #define ID2D1Properties_GetPropertyIndex(This, name) \ ((This)->lpVtbl->GetPropertyIndex(This, name)) +#pragma deprecated("ID2D1Properties_GetPropertyIndex") #define ID2D1Properties_SetValueByName(This, name, type, data, dataSize) \ ((This)->lpVtbl->SetValueByName(This, name, type, data, dataSize)) +#pragma deprecated("ID2D1Properties_SetValueByName") #define ID2D1Properties_SetValue(This, index, type, data, dataSize) \ ((This)->lpVtbl->SetValue(This, index, type, data, dataSize)) +#pragma deprecated("ID2D1Properties_SetValue") #define ID2D1Properties_GetValueByName(This, name, type, data, dataSize) \ ((This)->lpVtbl->GetValueByName(This, name, type, data, dataSize)) +#pragma deprecated("ID2D1Properties_GetValueByName") #define ID2D1Properties_GetValue(This, index, type, data, dataSize) \ ((This)->lpVtbl->GetValue(This, index, type, data, dataSize)) +#pragma deprecated("ID2D1Properties_GetValue") #define ID2D1Properties_GetValueSize(This, index) \ ((This)->lpVtbl->GetValueSize(This, index)) +#pragma deprecated("ID2D1Properties_GetValueSize") #define ID2D1Properties_GetSubProperties(This, index, subProperties) \ ((This)->lpVtbl->GetSubProperties(This, index, subProperties)) +#pragma deprecated("ID2D1Properties_GetSubProperties") typedef interface ID2D1Effect ID2D1Effect; @@ -3709,60 +3844,79 @@ interface ID2D1Effect #define ID2D1Effect_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Effect_QueryInterface") #define ID2D1Effect_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Effect_AddRef") #define ID2D1Effect_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Effect_Release") #define ID2D1Effect_GetPropertyCount(This) \ ((This)->lpVtbl->Base.GetPropertyCount((ID2D1Properties *)This)) +#pragma deprecated("ID2D1Effect_GetPropertyCount") #define ID2D1Effect_GetPropertyName(This, index, name, nameCount) \ ((This)->lpVtbl->Base.GetPropertyName((ID2D1Properties *)This, index, name, nameCount)) +#pragma deprecated("ID2D1Effect_GetPropertyName") #define ID2D1Effect_GetPropertyNameLength(This, index) \ ((This)->lpVtbl->Base.GetPropertyNameLength((ID2D1Properties *)This, index)) +#pragma deprecated("ID2D1Effect_GetPropertyNameLength") #define ID2D1Effect_GetType(This, index) \ ((This)->lpVtbl->Base.GetType((ID2D1Properties *)This, index)) +#pragma deprecated("ID2D1Effect_GetType") #define ID2D1Effect_GetPropertyIndex(This, name) \ ((This)->lpVtbl->Base.GetPropertyIndex((ID2D1Properties *)This, name)) +#pragma deprecated("ID2D1Effect_GetPropertyIndex") #define ID2D1Effect_SetValueByName(This, name, type, data, dataSize) \ ((This)->lpVtbl->Base.SetValueByName((ID2D1Properties *)This, name, type, data, dataSize)) +#pragma deprecated("ID2D1Effect_SetValueByName") #define ID2D1Effect_SetValue(This, index, type, data, dataSize) \ ((This)->lpVtbl->Base.SetValue((ID2D1Properties *)This, index, type, data, dataSize)) +#pragma deprecated("ID2D1Effect_SetValue") #define ID2D1Effect_GetValueByName(This, name, type, data, dataSize) \ ((This)->lpVtbl->Base.GetValueByName((ID2D1Properties *)This, name, type, data, dataSize)) +#pragma deprecated("ID2D1Effect_GetValueByName") #define ID2D1Effect_GetValue(This, index, type, data, dataSize) \ ((This)->lpVtbl->Base.GetValue((ID2D1Properties *)This, index, type, data, dataSize)) +#pragma deprecated("ID2D1Effect_GetValue") #define ID2D1Effect_GetValueSize(This, index) \ ((This)->lpVtbl->Base.GetValueSize((ID2D1Properties *)This, index)) +#pragma deprecated("ID2D1Effect_GetValueSize") #define ID2D1Effect_GetSubProperties(This, index, subProperties) \ ((This)->lpVtbl->Base.GetSubProperties((ID2D1Properties *)This, index, subProperties)) +#pragma deprecated("ID2D1Effect_GetSubProperties") #define ID2D1Effect_SetInput(This, index, input, invalidate) \ ((This)->lpVtbl->SetInput(This, index, input, invalidate)) +#pragma deprecated("ID2D1Effect_SetInput") #define ID2D1Effect_SetInputCount(This, inputCount) \ ((This)->lpVtbl->SetInputCount(This, inputCount)) +#pragma deprecated("ID2D1Effect_SetInputCount") #define ID2D1Effect_GetInput(This, index, input) \ ((This)->lpVtbl->GetInput(This, index, input)) +#pragma deprecated("ID2D1Effect_GetInput") #define ID2D1Effect_GetInputCount(This) \ ((This)->lpVtbl->GetInputCount(This)) +#pragma deprecated("ID2D1Effect_GetInputCount") #define ID2D1Effect_GetOutput(This, outputImage) \ ((This)->lpVtbl->GetOutput(This, outputImage)) +#pragma deprecated("ID2D1Effect_GetOutput") typedef interface ID2D1Bitmap1 ID2D1Bitmap1; @@ -3805,51 +3959,67 @@ interface ID2D1Bitmap1 #define ID2D1Bitmap1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Bitmap1_QueryInterface") #define ID2D1Bitmap1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Bitmap1_AddRef") #define ID2D1Bitmap1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Bitmap1_Release") #define ID2D1Bitmap1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Bitmap1_GetFactory") #define ID2D1Bitmap1_GetSize(This) \ ((This)->lpVtbl->Base.GetSize((ID2D1Bitmap *)This)) +#pragma deprecated("ID2D1Bitmap1_GetSize") #define ID2D1Bitmap1_GetPixelSize(This) \ ((This)->lpVtbl->Base.GetPixelSize((ID2D1Bitmap *)This)) +#pragma deprecated("ID2D1Bitmap1_GetPixelSize") #define ID2D1Bitmap1_GetPixelFormat(This) \ ((This)->lpVtbl->Base.GetPixelFormat((ID2D1Bitmap *)This)) +#pragma deprecated("ID2D1Bitmap1_GetPixelFormat") #define ID2D1Bitmap1_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.GetDpi((ID2D1Bitmap *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1Bitmap1_GetDpi") #define ID2D1Bitmap1_CopyFromBitmap(This, destPoint, bitmap, srcRect) \ ((This)->lpVtbl->Base.CopyFromBitmap((ID2D1Bitmap *)This, destPoint, bitmap, srcRect)) +#pragma deprecated("ID2D1Bitmap1_CopyFromBitmap") #define ID2D1Bitmap1_CopyFromRenderTarget(This, destPoint, renderTarget, srcRect) \ ((This)->lpVtbl->Base.CopyFromRenderTarget((ID2D1Bitmap *)This, destPoint, renderTarget, srcRect)) +#pragma deprecated("ID2D1Bitmap1_CopyFromRenderTarget") #define ID2D1Bitmap1_CopyFromMemory(This, dstRect, srcData, pitch) \ ((This)->lpVtbl->Base.CopyFromMemory((ID2D1Bitmap *)This, dstRect, srcData, pitch)) +#pragma deprecated("ID2D1Bitmap1_CopyFromMemory") #define ID2D1Bitmap1_GetColorContext(This, colorContext) \ ((This)->lpVtbl->GetColorContext(This, colorContext)) +#pragma deprecated("ID2D1Bitmap1_GetColorContext") #define ID2D1Bitmap1_GetOptions(This) \ ((This)->lpVtbl->GetOptions(This)) +#pragma deprecated("ID2D1Bitmap1_GetOptions") #define ID2D1Bitmap1_GetSurface(This, dxgiSurface) \ ((This)->lpVtbl->GetSurface(This, dxgiSurface)) +#pragma deprecated("ID2D1Bitmap1_GetSurface") #define ID2D1Bitmap1_Map(This, options, mappedRect) \ ((This)->lpVtbl->Map(This, options, mappedRect)) +#pragma deprecated("ID2D1Bitmap1_Map") #define ID2D1Bitmap1_Unmap(This) \ ((This)->lpVtbl->Unmap(This)) +#pragma deprecated("ID2D1Bitmap1_Unmap") typedef interface ID2D1ColorContext ID2D1ColorContext; @@ -3882,24 +4052,31 @@ interface ID2D1ColorContext #define ID2D1ColorContext_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1ColorContext_QueryInterface") #define ID2D1ColorContext_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1ColorContext_AddRef") #define ID2D1ColorContext_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1ColorContext_Release") #define ID2D1ColorContext_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1ColorContext_GetFactory") #define ID2D1ColorContext_GetColorSpace(This) \ ((This)->lpVtbl->GetColorSpace(This)) +#pragma deprecated("ID2D1ColorContext_GetColorSpace") #define ID2D1ColorContext_GetProfileSize(This) \ ((This)->lpVtbl->GetProfileSize(This)) +#pragma deprecated("ID2D1ColorContext_GetProfileSize") #define ID2D1ColorContext_GetProfile(This, profile, profileSize) \ ((This)->lpVtbl->GetProfile(This, profile, profileSize)) +#pragma deprecated("ID2D1ColorContext_GetProfile") typedef interface ID2D1GradientStopCollection1 ID2D1GradientStopCollection1; @@ -3940,42 +4117,55 @@ interface ID2D1GradientStopCollection1 #define ID2D1GradientStopCollection1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GradientStopCollection1_QueryInterface") #define ID2D1GradientStopCollection1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GradientStopCollection1_AddRef") #define ID2D1GradientStopCollection1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GradientStopCollection1_Release") #define ID2D1GradientStopCollection1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1GradientStopCollection1_GetFactory") #define ID2D1GradientStopCollection1_GetGradientStopCount(This) \ ((This)->lpVtbl->Base.GetGradientStopCount((ID2D1GradientStopCollection *)This)) +#pragma deprecated("ID2D1GradientStopCollection1_GetGradientStopCount") #define ID2D1GradientStopCollection1_GetGradientStops(This, gradientStops, gradientStopsCount) \ ((This)->lpVtbl->Base.GetGradientStops((ID2D1GradientStopCollection *)This, gradientStops, gradientStopsCount)) +#pragma deprecated("ID2D1GradientStopCollection1_GetGradientStops") #define ID2D1GradientStopCollection1_GetColorInterpolationGamma(This) \ ((This)->lpVtbl->Base.GetColorInterpolationGamma((ID2D1GradientStopCollection *)This)) +#pragma deprecated("ID2D1GradientStopCollection1_GetColorInterpolationGamma") #define ID2D1GradientStopCollection1_GetExtendMode(This) \ ((This)->lpVtbl->Base.GetExtendMode((ID2D1GradientStopCollection *)This)) +#pragma deprecated("ID2D1GradientStopCollection1_GetExtendMode") #define ID2D1GradientStopCollection1_GetGradientStops1(This, gradientStops, gradientStopsCount) \ ((This)->lpVtbl->GetGradientStops1(This, gradientStops, gradientStopsCount)) +#pragma deprecated("ID2D1GradientStopCollection1_GetGradientStops1") #define ID2D1GradientStopCollection1_GetPreInterpolationSpace(This) \ ((This)->lpVtbl->GetPreInterpolationSpace(This)) +#pragma deprecated("ID2D1GradientStopCollection1_GetPreInterpolationSpace") #define ID2D1GradientStopCollection1_GetPostInterpolationSpace(This) \ ((This)->lpVtbl->GetPostInterpolationSpace(This)) +#pragma deprecated("ID2D1GradientStopCollection1_GetPostInterpolationSpace") #define ID2D1GradientStopCollection1_GetBufferPrecision(This) \ ((This)->lpVtbl->GetBufferPrecision(This)) +#pragma deprecated("ID2D1GradientStopCollection1_GetBufferPrecision") #define ID2D1GradientStopCollection1_GetColorInterpolationMode(This) \ ((This)->lpVtbl->GetColorInterpolationMode(This)) +#pragma deprecated("ID2D1GradientStopCollection1_GetColorInterpolationMode") typedef interface ID2D1DrawingStateBlock1 ID2D1DrawingStateBlock1; @@ -4004,27 +4194,35 @@ interface ID2D1DrawingStateBlock1 #define ID2D1DrawingStateBlock1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1DrawingStateBlock1_QueryInterface") #define ID2D1DrawingStateBlock1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1DrawingStateBlock1_AddRef") #define ID2D1DrawingStateBlock1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1DrawingStateBlock1_Release") #define ID2D1DrawingStateBlock1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1DrawingStateBlock1_GetFactory") #define ID2D1DrawingStateBlock1_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.SetTextRenderingParams((ID2D1DrawingStateBlock *)This, textRenderingParams)) +#pragma deprecated("ID2D1DrawingStateBlock1_SetTextRenderingParams") #define ID2D1DrawingStateBlock1_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.GetTextRenderingParams((ID2D1DrawingStateBlock *)This, textRenderingParams)) +#pragma deprecated("ID2D1DrawingStateBlock1_GetTextRenderingParams") #define ID2D1DrawingStateBlock1_GetDescription(This, stateDescription) \ ((This)->lpVtbl->GetDescription(This, stateDescription)) +#pragma deprecated("ID2D1DrawingStateBlock1_GetDescription") #define ID2D1DrawingStateBlock1_SetDescription(This, stateDescription) \ ((This)->lpVtbl->SetDescription(This, stateDescription)) +#pragma deprecated("ID2D1DrawingStateBlock1_SetDescription") typedef interface ID2D1DeviceContext ID2D1DeviceContext; @@ -4275,255 +4473,339 @@ interface ID2D1DeviceContext #define ID2D1DeviceContext_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1DeviceContext_QueryInterface") #define ID2D1DeviceContext_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1DeviceContext_AddRef") #define ID2D1DeviceContext_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1DeviceContext_Release") #define ID2D1DeviceContext_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1DeviceContext_GetFactory") #define ID2D1DeviceContext_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateSharedBitmap((ID2D1RenderTarget *)This, riid, data, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext_CreateSharedBitmap") #define ID2D1DeviceContext_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \ ((This)->lpVtbl->Base.CreateSolidColorBrush((ID2D1RenderTarget *)This, color, brushProperties, solidColorBrush)) +#pragma deprecated("ID2D1DeviceContext_CreateSolidColorBrush") #define ID2D1DeviceContext_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \ ((This)->lpVtbl->Base.CreateLinearGradientBrush((ID2D1RenderTarget *)This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush)) +#pragma deprecated("ID2D1DeviceContext_CreateLinearGradientBrush") #define ID2D1DeviceContext_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \ ((This)->lpVtbl->Base.CreateRadialGradientBrush((ID2D1RenderTarget *)This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush)) +#pragma deprecated("ID2D1DeviceContext_CreateRadialGradientBrush") #define ID2D1DeviceContext_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \ ((This)->lpVtbl->Base.CreateCompatibleRenderTarget((ID2D1RenderTarget *)This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget)) +#pragma deprecated("ID2D1DeviceContext_CreateCompatibleRenderTarget") #define ID2D1DeviceContext_CreateLayer(This, size, layer) \ ((This)->lpVtbl->Base.CreateLayer((ID2D1RenderTarget *)This, size, layer)) +#pragma deprecated("ID2D1DeviceContext_CreateLayer") #define ID2D1DeviceContext_CreateMesh(This, mesh) \ ((This)->lpVtbl->Base.CreateMesh((ID2D1RenderTarget *)This, mesh)) +#pragma deprecated("ID2D1DeviceContext_CreateMesh") #define ID2D1DeviceContext_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawLine((ID2D1RenderTarget *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext_DrawLine") #define ID2D1DeviceContext_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRectangle((ID2D1RenderTarget *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext_DrawRectangle") #define ID2D1DeviceContext_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.FillRectangle((ID2D1RenderTarget *)This, rect, brush)) +#pragma deprecated("ID2D1DeviceContext_FillRectangle") #define ID2D1DeviceContext_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext_DrawRoundedRectangle") #define ID2D1DeviceContext_FillRoundedRectangle(This, roundedRect, brush) \ ((This)->lpVtbl->Base.FillRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush)) +#pragma deprecated("ID2D1DeviceContext_FillRoundedRectangle") #define ID2D1DeviceContext_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawEllipse((ID2D1RenderTarget *)This, ellipse, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext_DrawEllipse") #define ID2D1DeviceContext_FillEllipse(This, ellipse, brush) \ ((This)->lpVtbl->Base.FillEllipse((ID2D1RenderTarget *)This, ellipse, brush)) +#pragma deprecated("ID2D1DeviceContext_FillEllipse") #define ID2D1DeviceContext_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawGeometry((ID2D1RenderTarget *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext_DrawGeometry") #define ID2D1DeviceContext_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.FillGeometry((ID2D1RenderTarget *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1DeviceContext_FillGeometry") #define ID2D1DeviceContext_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.FillMesh((ID2D1RenderTarget *)This, mesh, brush)) +#pragma deprecated("ID2D1DeviceContext_FillMesh") #define ID2D1DeviceContext_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \ ((This)->lpVtbl->Base.DrawText((ID2D1RenderTarget *)This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode)) +#pragma deprecated("ID2D1DeviceContext_DrawText") #define ID2D1DeviceContext_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \ ((This)->lpVtbl->Base.DrawTextLayout((ID2D1RenderTarget *)This, origin, textLayout, defaultForegroundBrush, options)) +#pragma deprecated("ID2D1DeviceContext_DrawTextLayout") #define ID2D1DeviceContext_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DeviceContext_SetTransform") #define ID2D1DeviceContext_GetTransform(This, transform) \ ((This)->lpVtbl->Base.GetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DeviceContext_GetTransform") #define ID2D1DeviceContext_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.SetAntialiasMode((ID2D1RenderTarget *)This, antialiasMode)) +#pragma deprecated("ID2D1DeviceContext_SetAntialiasMode") #define ID2D1DeviceContext_GetAntialiasMode(This) \ ((This)->lpVtbl->Base.GetAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_GetAntialiasMode") #define ID2D1DeviceContext_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.SetTextAntialiasMode((ID2D1RenderTarget *)This, textAntialiasMode)) +#pragma deprecated("ID2D1DeviceContext_SetTextAntialiasMode") #define ID2D1DeviceContext_GetTextAntialiasMode(This) \ ((This)->lpVtbl->Base.GetTextAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_GetTextAntialiasMode") #define ID2D1DeviceContext_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.SetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DeviceContext_SetTextRenderingParams") #define ID2D1DeviceContext_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.GetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DeviceContext_GetTextRenderingParams") #define ID2D1DeviceContext_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.SetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext_SetTags") #define ID2D1DeviceContext_GetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.GetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext_GetTags") #define ID2D1DeviceContext_PopLayer(This) \ ((This)->lpVtbl->Base.PopLayer((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_PopLayer") #define ID2D1DeviceContext_Flush(This, tag1, tag2) \ ((This)->lpVtbl->Base.Flush((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext_Flush") #define ID2D1DeviceContext_SaveDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.SaveDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DeviceContext_SaveDrawingState") #define ID2D1DeviceContext_RestoreDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.RestoreDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DeviceContext_RestoreDrawingState") #define ID2D1DeviceContext_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.PushAxisAlignedClip((ID2D1RenderTarget *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1DeviceContext_PushAxisAlignedClip") #define ID2D1DeviceContext_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.PopAxisAlignedClip((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_PopAxisAlignedClip") #define ID2D1DeviceContext_Clear(This, clearColor) \ ((This)->lpVtbl->Base.Clear((ID2D1RenderTarget *)This, clearColor)) +#pragma deprecated("ID2D1DeviceContext_Clear") #define ID2D1DeviceContext_BeginDraw(This) \ ((This)->lpVtbl->Base.BeginDraw((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_BeginDraw") #define ID2D1DeviceContext_EndDraw(This, tag1, tag2) \ ((This)->lpVtbl->Base.EndDraw((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext_EndDraw") #define ID2D1DeviceContext_GetPixelFormat(This) \ ((This)->lpVtbl->Base.GetPixelFormat((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_GetPixelFormat") #define ID2D1DeviceContext_SetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.SetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DeviceContext_SetDpi") #define ID2D1DeviceContext_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.GetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DeviceContext_GetDpi") #define ID2D1DeviceContext_GetSize(This) \ ((This)->lpVtbl->Base.GetSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_GetSize") #define ID2D1DeviceContext_GetPixelSize(This) \ ((This)->lpVtbl->Base.GetPixelSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_GetPixelSize") #define ID2D1DeviceContext_GetMaximumBitmapSize(This) \ ((This)->lpVtbl->Base.GetMaximumBitmapSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext_GetMaximumBitmapSize") #define ID2D1DeviceContext_IsSupported(This, renderTargetProperties) \ ((This)->lpVtbl->Base.IsSupported((ID2D1RenderTarget *)This, renderTargetProperties)) +#pragma deprecated("ID2D1DeviceContext_IsSupported") #define ID2D1DeviceContext_CreateBitmap(This, size, sourceData, pitch, bitmapProperties, bitmap) \ ((This)->lpVtbl->CreateBitmap(This, size, sourceData, pitch, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext_CreateBitmap") #define ID2D1DeviceContext_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \ ((This)->lpVtbl->CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext_CreateBitmapFromWicBitmap") #define ID2D1DeviceContext_CreateColorContext(This, space, profile, profileSize, colorContext) \ ((This)->lpVtbl->CreateColorContext(This, space, profile, profileSize, colorContext)) +#pragma deprecated("ID2D1DeviceContext_CreateColorContext") #define ID2D1DeviceContext_CreateColorContextFromFilename(This, filename, colorContext) \ ((This)->lpVtbl->CreateColorContextFromFilename(This, filename, colorContext)) +#pragma deprecated("ID2D1DeviceContext_CreateColorContextFromFilename") #define ID2D1DeviceContext_CreateColorContextFromWicColorContext(This, wicColorContext, colorContext) \ ((This)->lpVtbl->CreateColorContextFromWicColorContext(This, wicColorContext, colorContext)) +#pragma deprecated("ID2D1DeviceContext_CreateColorContextFromWicColorContext") #define ID2D1DeviceContext_CreateBitmapFromDxgiSurface(This, surface, bitmapProperties, bitmap) \ ((This)->lpVtbl->CreateBitmapFromDxgiSurface(This, surface, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext_CreateBitmapFromDxgiSurface") #define ID2D1DeviceContext_CreateEffect(This, effectId, effect) \ ((This)->lpVtbl->CreateEffect(This, effectId, effect)) +#pragma deprecated("ID2D1DeviceContext_CreateEffect") #define ID2D1DeviceContext_CreateGradientStopCollection(This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1) \ ((This)->lpVtbl->CreateGradientStopCollection(This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1)) +#pragma deprecated("ID2D1DeviceContext_CreateGradientStopCollection") #define ID2D1DeviceContext_CreateImageBrush(This, image, imageBrushProperties, brushProperties, imageBrush) \ ((This)->lpVtbl->CreateImageBrush(This, image, imageBrushProperties, brushProperties, imageBrush)) +#pragma deprecated("ID2D1DeviceContext_CreateImageBrush") #define ID2D1DeviceContext_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \ ((This)->lpVtbl->CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush)) +#pragma deprecated("ID2D1DeviceContext_CreateBitmapBrush") #define ID2D1DeviceContext_CreateCommandList(This, commandList) \ ((This)->lpVtbl->CreateCommandList(This, commandList)) +#pragma deprecated("ID2D1DeviceContext_CreateCommandList") #define ID2D1DeviceContext_IsDxgiFormatSupported(This, format) \ ((This)->lpVtbl->IsDxgiFormatSupported(This, format)) +#pragma deprecated("ID2D1DeviceContext_IsDxgiFormatSupported") #define ID2D1DeviceContext_IsBufferPrecisionSupported(This, bufferPrecision) \ ((This)->lpVtbl->IsBufferPrecisionSupported(This, bufferPrecision)) +#pragma deprecated("ID2D1DeviceContext_IsBufferPrecisionSupported") #define ID2D1DeviceContext_GetImageLocalBounds(This, image, localBounds) \ ((This)->lpVtbl->GetImageLocalBounds(This, image, localBounds)) +#pragma deprecated("ID2D1DeviceContext_GetImageLocalBounds") #define ID2D1DeviceContext_GetImageWorldBounds(This, image, worldBounds) \ ((This)->lpVtbl->GetImageWorldBounds(This, image, worldBounds)) +#pragma deprecated("ID2D1DeviceContext_GetImageWorldBounds") #define ID2D1DeviceContext_GetGlyphRunWorldBounds(This, baselineOrigin, glyphRun, measuringMode, bounds) \ ((This)->lpVtbl->GetGlyphRunWorldBounds(This, baselineOrigin, glyphRun, measuringMode, bounds)) +#pragma deprecated("ID2D1DeviceContext_GetGlyphRunWorldBounds") #define ID2D1DeviceContext_GetDevice(This, device) \ ((This)->lpVtbl->GetDevice(This, device)) +#pragma deprecated("ID2D1DeviceContext_GetDevice") #define ID2D1DeviceContext_SetTarget(This, image) \ ((This)->lpVtbl->SetTarget(This, image)) +#pragma deprecated("ID2D1DeviceContext_SetTarget") #define ID2D1DeviceContext_GetTarget(This, image) \ ((This)->lpVtbl->GetTarget(This, image)) +#pragma deprecated("ID2D1DeviceContext_GetTarget") #define ID2D1DeviceContext_SetRenderingControls(This, renderingControls) \ ((This)->lpVtbl->SetRenderingControls(This, renderingControls)) +#pragma deprecated("ID2D1DeviceContext_SetRenderingControls") #define ID2D1DeviceContext_GetRenderingControls(This, renderingControls) \ ((This)->lpVtbl->GetRenderingControls(This, renderingControls)) +#pragma deprecated("ID2D1DeviceContext_GetRenderingControls") #define ID2D1DeviceContext_SetPrimitiveBlend(This, primitiveBlend) \ ((This)->lpVtbl->SetPrimitiveBlend(This, primitiveBlend)) +#pragma deprecated("ID2D1DeviceContext_SetPrimitiveBlend") #define ID2D1DeviceContext_GetPrimitiveBlend(This) \ ((This)->lpVtbl->GetPrimitiveBlend(This)) +#pragma deprecated("ID2D1DeviceContext_GetPrimitiveBlend") #define ID2D1DeviceContext_SetUnitMode(This, unitMode) \ ((This)->lpVtbl->SetUnitMode(This, unitMode)) +#pragma deprecated("ID2D1DeviceContext_SetUnitMode") #define ID2D1DeviceContext_GetUnitMode(This) \ ((This)->lpVtbl->GetUnitMode(This)) +#pragma deprecated("ID2D1DeviceContext_GetUnitMode") #define ID2D1DeviceContext_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \ ((This)->lpVtbl->DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1DeviceContext_DrawGlyphRun") #define ID2D1DeviceContext_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \ ((This)->lpVtbl->DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode)) +#pragma deprecated("ID2D1DeviceContext_DrawImage") #define ID2D1DeviceContext_DrawGdiMetafile(This, gdiMetafile, targetOffset) \ ((This)->lpVtbl->DrawGdiMetafile(This, gdiMetafile, targetOffset)) +#pragma deprecated("ID2D1DeviceContext_DrawGdiMetafile") #define ID2D1DeviceContext_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \ ((This)->lpVtbl->DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform)) +#pragma deprecated("ID2D1DeviceContext_DrawBitmap") #define ID2D1DeviceContext_PushLayer(This, layerParameters, layer) \ ((This)->lpVtbl->PushLayer(This, layerParameters, layer)) +#pragma deprecated("ID2D1DeviceContext_PushLayer") #define ID2D1DeviceContext_InvalidateEffectInputRectangle(This, effect, input, inputRectangle) \ ((This)->lpVtbl->InvalidateEffectInputRectangle(This, effect, input, inputRectangle)) +#pragma deprecated("ID2D1DeviceContext_InvalidateEffectInputRectangle") #define ID2D1DeviceContext_GetEffectInvalidRectangleCount(This, effect, rectangleCount) \ ((This)->lpVtbl->GetEffectInvalidRectangleCount(This, effect, rectangleCount)) +#pragma deprecated("ID2D1DeviceContext_GetEffectInvalidRectangleCount") #define ID2D1DeviceContext_GetEffectInvalidRectangles(This, effect, rectangles, rectanglesCount) \ ((This)->lpVtbl->GetEffectInvalidRectangles(This, effect, rectangles, rectanglesCount)) +#pragma deprecated("ID2D1DeviceContext_GetEffectInvalidRectangles") #define ID2D1DeviceContext_GetEffectRequiredInputRectangles(This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount) \ ((This)->lpVtbl->GetEffectRequiredInputRectangles(This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount)) +#pragma deprecated("ID2D1DeviceContext_GetEffectRequiredInputRectangles") #define ID2D1DeviceContext_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1DeviceContext_FillOpacityMask") typedef interface ID2D1Device ID2D1Device; @@ -4570,30 +4852,39 @@ interface ID2D1Device #define ID2D1Device_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Device_QueryInterface") #define ID2D1Device_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Device_AddRef") #define ID2D1Device_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Device_Release") #define ID2D1Device_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Device_GetFactory") #define ID2D1Device_CreateDeviceContext(This, options, deviceContext) \ ((This)->lpVtbl->CreateDeviceContext(This, options, deviceContext)) +#pragma deprecated("ID2D1Device_CreateDeviceContext") #define ID2D1Device_CreatePrintControl(This, wicFactory, documentTarget, printControlProperties, printControl) \ ((This)->lpVtbl->CreatePrintControl(This, wicFactory, documentTarget, printControlProperties, printControl)) +#pragma deprecated("ID2D1Device_CreatePrintControl") #define ID2D1Device_SetMaximumTextureMemory(This, maximumInBytes) \ ((This)->lpVtbl->SetMaximumTextureMemory(This, maximumInBytes)) +#pragma deprecated("ID2D1Device_SetMaximumTextureMemory") #define ID2D1Device_GetMaximumTextureMemory(This) \ ((This)->lpVtbl->GetMaximumTextureMemory(This)) +#pragma deprecated("ID2D1Device_GetMaximumTextureMemory") #define ID2D1Device_ClearResources(This, millisecondsSinceUse) \ ((This)->lpVtbl->ClearResources(This, millisecondsSinceUse)) +#pragma deprecated("ID2D1Device_ClearResources") typedef interface ID2D1Factory1 ID2D1Factory1; @@ -4681,75 +4972,99 @@ interface ID2D1Factory1 #define ID2D1Factory1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Factory1_QueryInterface") #define ID2D1Factory1_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Factory1_AddRef") #define ID2D1Factory1_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Factory1_Release") #define ID2D1Factory1_ReloadSystemMetrics(This) \ ((This)->lpVtbl->Base.ReloadSystemMetrics((ID2D1Factory *)This)) +#pragma deprecated("ID2D1Factory1_ReloadSystemMetrics") #define ID2D1Factory1_GetDesktopDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.GetDesktopDpi((ID2D1Factory *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1Factory1_GetDesktopDpi") #define ID2D1Factory1_CreateRectangleGeometry(This, rectangle, rectangleGeometry) \ ((This)->lpVtbl->Base.CreateRectangleGeometry((ID2D1Factory *)This, rectangle, rectangleGeometry)) +#pragma deprecated("ID2D1Factory1_CreateRectangleGeometry") #define ID2D1Factory1_CreateRoundedRectangleGeometry(This, roundedRectangle, roundedRectangleGeometry) \ ((This)->lpVtbl->Base.CreateRoundedRectangleGeometry((ID2D1Factory *)This, roundedRectangle, roundedRectangleGeometry)) +#pragma deprecated("ID2D1Factory1_CreateRoundedRectangleGeometry") #define ID2D1Factory1_CreateEllipseGeometry(This, ellipse, ellipseGeometry) \ ((This)->lpVtbl->Base.CreateEllipseGeometry((ID2D1Factory *)This, ellipse, ellipseGeometry)) +#pragma deprecated("ID2D1Factory1_CreateEllipseGeometry") #define ID2D1Factory1_CreateGeometryGroup(This, fillMode, geometries, geometriesCount, geometryGroup) \ ((This)->lpVtbl->Base.CreateGeometryGroup((ID2D1Factory *)This, fillMode, geometries, geometriesCount, geometryGroup)) +#pragma deprecated("ID2D1Factory1_CreateGeometryGroup") #define ID2D1Factory1_CreateTransformedGeometry(This, sourceGeometry, transform, transformedGeometry) \ ((This)->lpVtbl->Base.CreateTransformedGeometry((ID2D1Factory *)This, sourceGeometry, transform, transformedGeometry)) +#pragma deprecated("ID2D1Factory1_CreateTransformedGeometry") #define ID2D1Factory1_CreateWicBitmapRenderTarget(This, target, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->Base.CreateWicBitmapRenderTarget((ID2D1Factory *)This, target, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory1_CreateWicBitmapRenderTarget") #define ID2D1Factory1_CreateHwndRenderTarget(This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget) \ ((This)->lpVtbl->Base.CreateHwndRenderTarget((ID2D1Factory *)This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget)) +#pragma deprecated("ID2D1Factory1_CreateHwndRenderTarget") #define ID2D1Factory1_CreateDxgiSurfaceRenderTarget(This, dxgiSurface, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->Base.CreateDxgiSurfaceRenderTarget((ID2D1Factory *)This, dxgiSurface, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory1_CreateDxgiSurfaceRenderTarget") #define ID2D1Factory1_CreateDCRenderTarget(This, renderTargetProperties, dcRenderTarget) \ ((This)->lpVtbl->Base.CreateDCRenderTarget((ID2D1Factory *)This, renderTargetProperties, dcRenderTarget)) +#pragma deprecated("ID2D1Factory1_CreateDCRenderTarget") #define ID2D1Factory1_CreateDevice(This, dxgiDevice, d2dDevice) \ ((This)->lpVtbl->CreateDevice(This, dxgiDevice, d2dDevice)) +#pragma deprecated("ID2D1Factory1_CreateDevice") #define ID2D1Factory1_CreateStrokeStyle(This, strokeStyleProperties, dashes, dashesCount, strokeStyle) \ ((This)->lpVtbl->CreateStrokeStyle(This, strokeStyleProperties, dashes, dashesCount, strokeStyle)) +#pragma deprecated("ID2D1Factory1_CreateStrokeStyle") #define ID2D1Factory1_CreatePathGeometry(This, pathGeometry) \ ((This)->lpVtbl->CreatePathGeometry(This, pathGeometry)) +#pragma deprecated("ID2D1Factory1_CreatePathGeometry") #define ID2D1Factory1_CreateDrawingStateBlock(This, drawingStateDescription, textRenderingParams, drawingStateBlock) \ ((This)->lpVtbl->CreateDrawingStateBlock(This, drawingStateDescription, textRenderingParams, drawingStateBlock)) +#pragma deprecated("ID2D1Factory1_CreateDrawingStateBlock") #define ID2D1Factory1_CreateGdiMetafile(This, metafileStream, metafile) \ ((This)->lpVtbl->CreateGdiMetafile(This, metafileStream, metafile)) +#pragma deprecated("ID2D1Factory1_CreateGdiMetafile") #define ID2D1Factory1_RegisterEffectFromStream(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \ ((This)->lpVtbl->RegisterEffectFromStream(This, classId, propertyXml, bindings, bindingsCount, effectFactory)) +#pragma deprecated("ID2D1Factory1_RegisterEffectFromStream") #define ID2D1Factory1_RegisterEffectFromString(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \ ((This)->lpVtbl->RegisterEffectFromString(This, classId, propertyXml, bindings, bindingsCount, effectFactory)) +#pragma deprecated("ID2D1Factory1_RegisterEffectFromString") #define ID2D1Factory1_UnregisterEffect(This, classId) \ ((This)->lpVtbl->UnregisterEffect(This, classId)) +#pragma deprecated("ID2D1Factory1_UnregisterEffect") #define ID2D1Factory1_GetRegisteredEffects(This, effects, effectsCount, effectsReturned, effectsRegistered) \ ((This)->lpVtbl->GetRegisteredEffects(This, effects, effectsCount, effectsReturned, effectsRegistered)) +#pragma deprecated("ID2D1Factory1_GetRegisteredEffects") #define ID2D1Factory1_GetEffectProperties(This, effectId, properties) \ ((This)->lpVtbl->GetEffectProperties(This, effectId, properties)) +#pragma deprecated("ID2D1Factory1_GetEffectProperties") typedef interface ID2D1Multithread ID2D1Multithread; @@ -4780,21 +5095,27 @@ interface ID2D1Multithread #define ID2D1Multithread_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Multithread_QueryInterface") #define ID2D1Multithread_AddRef(This) \ ((This)->lpVtbl->Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Multithread_AddRef") #define ID2D1Multithread_Release(This) \ ((This)->lpVtbl->Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Multithread_Release") #define ID2D1Multithread_GetMultithreadProtected(This) \ ((This)->lpVtbl->GetMultithreadProtected(This)) +#pragma deprecated("ID2D1Multithread_GetMultithreadProtected") #define ID2D1Multithread_Enter(This) \ ((This)->lpVtbl->Enter(This)) +#pragma deprecated("ID2D1Multithread_Enter") #define ID2D1Multithread_Leave(This) \ ((This)->lpVtbl->Leave(This)) +#pragma deprecated("ID2D1Multithread_Leave") #endif diff --git a/minidx12/Include/d2d1_2.h b/minidx12/Include/d2d1_2.h index dc21a5d2e3..d2171a9fcf 100644 --- a/minidx12/Include/d2d1_2.h +++ b/minidx12/Include/d2d1_2.h @@ -210,15 +210,19 @@ interface ID2D1GeometryRealization #define ID2D1GeometryRealization_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GeometryRealization_QueryInterface") #define ID2D1GeometryRealization_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GeometryRealization_AddRef") #define ID2D1GeometryRealization_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GeometryRealization_Release") #define ID2D1GeometryRealization_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1GeometryRealization_GetFactory") typedef interface ID2D1DeviceContext1 ID2D1DeviceContext1; @@ -259,264 +263,351 @@ interface ID2D1DeviceContext1 #define ID2D1DeviceContext1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1DeviceContext1_QueryInterface") #define ID2D1DeviceContext1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1DeviceContext1_AddRef") #define ID2D1DeviceContext1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1DeviceContext1_Release") #define ID2D1DeviceContext1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1DeviceContext1_GetFactory") #define ID2D1DeviceContext1_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.Base.CreateSharedBitmap((ID2D1RenderTarget *)This, riid, data, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext1_CreateSharedBitmap") #define ID2D1DeviceContext1_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \ ((This)->lpVtbl->Base.Base.CreateSolidColorBrush((ID2D1RenderTarget *)This, color, brushProperties, solidColorBrush)) +#pragma deprecated("ID2D1DeviceContext1_CreateSolidColorBrush") #define ID2D1DeviceContext1_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \ ((This)->lpVtbl->Base.Base.CreateLinearGradientBrush((ID2D1RenderTarget *)This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush)) +#pragma deprecated("ID2D1DeviceContext1_CreateLinearGradientBrush") #define ID2D1DeviceContext1_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \ ((This)->lpVtbl->Base.Base.CreateRadialGradientBrush((ID2D1RenderTarget *)This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush)) +#pragma deprecated("ID2D1DeviceContext1_CreateRadialGradientBrush") #define ID2D1DeviceContext1_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \ ((This)->lpVtbl->Base.Base.CreateCompatibleRenderTarget((ID2D1RenderTarget *)This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget)) +#pragma deprecated("ID2D1DeviceContext1_CreateCompatibleRenderTarget") #define ID2D1DeviceContext1_CreateLayer(This, size, layer) \ ((This)->lpVtbl->Base.Base.CreateLayer((ID2D1RenderTarget *)This, size, layer)) +#pragma deprecated("ID2D1DeviceContext1_CreateLayer") #define ID2D1DeviceContext1_CreateMesh(This, mesh) \ ((This)->lpVtbl->Base.Base.CreateMesh((ID2D1RenderTarget *)This, mesh)) +#pragma deprecated("ID2D1DeviceContext1_CreateMesh") #define ID2D1DeviceContext1_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawLine((ID2D1RenderTarget *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext1_DrawLine") #define ID2D1DeviceContext1_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawRectangle((ID2D1RenderTarget *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext1_DrawRectangle") #define ID2D1DeviceContext1_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.Base.FillRectangle((ID2D1RenderTarget *)This, rect, brush)) +#pragma deprecated("ID2D1DeviceContext1_FillRectangle") #define ID2D1DeviceContext1_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext1_DrawRoundedRectangle") #define ID2D1DeviceContext1_FillRoundedRectangle(This, roundedRect, brush) \ ((This)->lpVtbl->Base.Base.FillRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush)) +#pragma deprecated("ID2D1DeviceContext1_FillRoundedRectangle") #define ID2D1DeviceContext1_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawEllipse((ID2D1RenderTarget *)This, ellipse, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext1_DrawEllipse") #define ID2D1DeviceContext1_FillEllipse(This, ellipse, brush) \ ((This)->lpVtbl->Base.Base.FillEllipse((ID2D1RenderTarget *)This, ellipse, brush)) +#pragma deprecated("ID2D1DeviceContext1_FillEllipse") #define ID2D1DeviceContext1_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawGeometry((ID2D1RenderTarget *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext1_DrawGeometry") #define ID2D1DeviceContext1_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.Base.FillGeometry((ID2D1RenderTarget *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1DeviceContext1_FillGeometry") #define ID2D1DeviceContext1_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.Base.FillMesh((ID2D1RenderTarget *)This, mesh, brush)) +#pragma deprecated("ID2D1DeviceContext1_FillMesh") #define ID2D1DeviceContext1_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \ ((This)->lpVtbl->Base.Base.DrawText((ID2D1RenderTarget *)This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode)) +#pragma deprecated("ID2D1DeviceContext1_DrawText") #define ID2D1DeviceContext1_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \ ((This)->lpVtbl->Base.Base.DrawTextLayout((ID2D1RenderTarget *)This, origin, textLayout, defaultForegroundBrush, options)) +#pragma deprecated("ID2D1DeviceContext1_DrawTextLayout") #define ID2D1DeviceContext1_SetTransform(This, transform) \ ((This)->lpVtbl->Base.Base.SetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DeviceContext1_SetTransform") #define ID2D1DeviceContext1_GetTransform(This, transform) \ ((This)->lpVtbl->Base.Base.GetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DeviceContext1_GetTransform") #define ID2D1DeviceContext1_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.Base.SetAntialiasMode((ID2D1RenderTarget *)This, antialiasMode)) +#pragma deprecated("ID2D1DeviceContext1_SetAntialiasMode") #define ID2D1DeviceContext1_GetAntialiasMode(This) \ ((This)->lpVtbl->Base.Base.GetAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetAntialiasMode") #define ID2D1DeviceContext1_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.Base.SetTextAntialiasMode((ID2D1RenderTarget *)This, textAntialiasMode)) +#pragma deprecated("ID2D1DeviceContext1_SetTextAntialiasMode") #define ID2D1DeviceContext1_GetTextAntialiasMode(This) \ ((This)->lpVtbl->Base.Base.GetTextAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetTextAntialiasMode") #define ID2D1DeviceContext1_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.Base.SetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DeviceContext1_SetTextRenderingParams") #define ID2D1DeviceContext1_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.Base.GetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DeviceContext1_GetTextRenderingParams") #define ID2D1DeviceContext1_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.SetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext1_SetTags") #define ID2D1DeviceContext1_GetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.GetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext1_GetTags") #define ID2D1DeviceContext1_PopLayer(This) \ ((This)->lpVtbl->Base.Base.PopLayer((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_PopLayer") #define ID2D1DeviceContext1_Flush(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.Flush((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext1_Flush") #define ID2D1DeviceContext1_SaveDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.Base.SaveDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DeviceContext1_SaveDrawingState") #define ID2D1DeviceContext1_RestoreDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.Base.RestoreDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DeviceContext1_RestoreDrawingState") #define ID2D1DeviceContext1_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.Base.PushAxisAlignedClip((ID2D1RenderTarget *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1DeviceContext1_PushAxisAlignedClip") #define ID2D1DeviceContext1_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.Base.PopAxisAlignedClip((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_PopAxisAlignedClip") #define ID2D1DeviceContext1_Clear(This, clearColor) \ ((This)->lpVtbl->Base.Base.Clear((ID2D1RenderTarget *)This, clearColor)) +#pragma deprecated("ID2D1DeviceContext1_Clear") #define ID2D1DeviceContext1_BeginDraw(This) \ ((This)->lpVtbl->Base.Base.BeginDraw((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_BeginDraw") #define ID2D1DeviceContext1_EndDraw(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.EndDraw((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext1_EndDraw") #define ID2D1DeviceContext1_GetPixelFormat(This) \ ((This)->lpVtbl->Base.Base.GetPixelFormat((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetPixelFormat") #define ID2D1DeviceContext1_SetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.Base.SetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DeviceContext1_SetDpi") #define ID2D1DeviceContext1_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.Base.GetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DeviceContext1_GetDpi") #define ID2D1DeviceContext1_GetSize(This) \ ((This)->lpVtbl->Base.Base.GetSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetSize") #define ID2D1DeviceContext1_GetPixelSize(This) \ ((This)->lpVtbl->Base.Base.GetPixelSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetPixelSize") #define ID2D1DeviceContext1_GetMaximumBitmapSize(This) \ ((This)->lpVtbl->Base.Base.GetMaximumBitmapSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetMaximumBitmapSize") #define ID2D1DeviceContext1_IsSupported(This, renderTargetProperties) \ ((This)->lpVtbl->Base.Base.IsSupported((ID2D1RenderTarget *)This, renderTargetProperties)) +#pragma deprecated("ID2D1DeviceContext1_IsSupported") #define ID2D1DeviceContext1_CreateBitmap(This, size, sourceData, pitch, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmap((ID2D1DeviceContext *)This, size, sourceData, pitch, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext1_CreateBitmap") #define ID2D1DeviceContext1_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmapFromWicBitmap((ID2D1DeviceContext *)This, wicBitmapSource, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext1_CreateBitmapFromWicBitmap") #define ID2D1DeviceContext1_CreateColorContext(This, space, profile, profileSize, colorContext) \ ((This)->lpVtbl->Base.CreateColorContext((ID2D1DeviceContext *)This, space, profile, profileSize, colorContext)) +#pragma deprecated("ID2D1DeviceContext1_CreateColorContext") #define ID2D1DeviceContext1_CreateColorContextFromFilename(This, filename, colorContext) \ ((This)->lpVtbl->Base.CreateColorContextFromFilename((ID2D1DeviceContext *)This, filename, colorContext)) +#pragma deprecated("ID2D1DeviceContext1_CreateColorContextFromFilename") #define ID2D1DeviceContext1_CreateColorContextFromWicColorContext(This, wicColorContext, colorContext) \ ((This)->lpVtbl->Base.CreateColorContextFromWicColorContext((ID2D1DeviceContext *)This, wicColorContext, colorContext)) +#pragma deprecated("ID2D1DeviceContext1_CreateColorContextFromWicColorContext") #define ID2D1DeviceContext1_CreateBitmapFromDxgiSurface(This, surface, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.CreateBitmapFromDxgiSurface((ID2D1DeviceContext *)This, surface, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext1_CreateBitmapFromDxgiSurface") #define ID2D1DeviceContext1_CreateEffect(This, effectId, effect) \ ((This)->lpVtbl->Base.CreateEffect((ID2D1DeviceContext *)This, effectId, effect)) +#pragma deprecated("ID2D1DeviceContext1_CreateEffect") #define ID2D1DeviceContext1_CreateGradientStopCollection(This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1) \ ((This)->lpVtbl->Base.CreateGradientStopCollection((ID2D1DeviceContext *)This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1)) +#pragma deprecated("ID2D1DeviceContext1_CreateGradientStopCollection") #define ID2D1DeviceContext1_CreateImageBrush(This, image, imageBrushProperties, brushProperties, imageBrush) \ ((This)->lpVtbl->Base.CreateImageBrush((ID2D1DeviceContext *)This, image, imageBrushProperties, brushProperties, imageBrush)) +#pragma deprecated("ID2D1DeviceContext1_CreateImageBrush") #define ID2D1DeviceContext1_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \ ((This)->lpVtbl->Base.CreateBitmapBrush((ID2D1DeviceContext *)This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush)) +#pragma deprecated("ID2D1DeviceContext1_CreateBitmapBrush") #define ID2D1DeviceContext1_CreateCommandList(This, commandList) \ ((This)->lpVtbl->Base.CreateCommandList((ID2D1DeviceContext *)This, commandList)) +#pragma deprecated("ID2D1DeviceContext1_CreateCommandList") #define ID2D1DeviceContext1_IsDxgiFormatSupported(This, format) \ ((This)->lpVtbl->Base.IsDxgiFormatSupported((ID2D1DeviceContext *)This, format)) +#pragma deprecated("ID2D1DeviceContext1_IsDxgiFormatSupported") #define ID2D1DeviceContext1_IsBufferPrecisionSupported(This, bufferPrecision) \ ((This)->lpVtbl->Base.IsBufferPrecisionSupported((ID2D1DeviceContext *)This, bufferPrecision)) +#pragma deprecated("ID2D1DeviceContext1_IsBufferPrecisionSupported") #define ID2D1DeviceContext1_GetImageLocalBounds(This, image, localBounds) \ ((This)->lpVtbl->Base.GetImageLocalBounds((ID2D1DeviceContext *)This, image, localBounds)) +#pragma deprecated("ID2D1DeviceContext1_GetImageLocalBounds") #define ID2D1DeviceContext1_GetImageWorldBounds(This, image, worldBounds) \ ((This)->lpVtbl->Base.GetImageWorldBounds((ID2D1DeviceContext *)This, image, worldBounds)) +#pragma deprecated("ID2D1DeviceContext1_GetImageWorldBounds") #define ID2D1DeviceContext1_GetGlyphRunWorldBounds(This, baselineOrigin, glyphRun, measuringMode, bounds) \ ((This)->lpVtbl->Base.GetGlyphRunWorldBounds((ID2D1DeviceContext *)This, baselineOrigin, glyphRun, measuringMode, bounds)) +#pragma deprecated("ID2D1DeviceContext1_GetGlyphRunWorldBounds") #define ID2D1DeviceContext1_GetDevice(This, device) \ ((This)->lpVtbl->Base.GetDevice((ID2D1DeviceContext *)This, device)) +#pragma deprecated("ID2D1DeviceContext1_GetDevice") #define ID2D1DeviceContext1_SetTarget(This, image) \ ((This)->lpVtbl->Base.SetTarget((ID2D1DeviceContext *)This, image)) +#pragma deprecated("ID2D1DeviceContext1_SetTarget") #define ID2D1DeviceContext1_GetTarget(This, image) \ ((This)->lpVtbl->Base.GetTarget((ID2D1DeviceContext *)This, image)) +#pragma deprecated("ID2D1DeviceContext1_GetTarget") #define ID2D1DeviceContext1_SetRenderingControls(This, renderingControls) \ ((This)->lpVtbl->Base.SetRenderingControls((ID2D1DeviceContext *)This, renderingControls)) +#pragma deprecated("ID2D1DeviceContext1_SetRenderingControls") #define ID2D1DeviceContext1_GetRenderingControls(This, renderingControls) \ ((This)->lpVtbl->Base.GetRenderingControls((ID2D1DeviceContext *)This, renderingControls)) +#pragma deprecated("ID2D1DeviceContext1_GetRenderingControls") #define ID2D1DeviceContext1_SetPrimitiveBlend(This, primitiveBlend) \ ((This)->lpVtbl->Base.SetPrimitiveBlend((ID2D1DeviceContext *)This, primitiveBlend)) +#pragma deprecated("ID2D1DeviceContext1_SetPrimitiveBlend") #define ID2D1DeviceContext1_GetPrimitiveBlend(This) \ ((This)->lpVtbl->Base.GetPrimitiveBlend((ID2D1DeviceContext *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetPrimitiveBlend") #define ID2D1DeviceContext1_SetUnitMode(This, unitMode) \ ((This)->lpVtbl->Base.SetUnitMode((ID2D1DeviceContext *)This, unitMode)) +#pragma deprecated("ID2D1DeviceContext1_SetUnitMode") #define ID2D1DeviceContext1_GetUnitMode(This) \ ((This)->lpVtbl->Base.GetUnitMode((ID2D1DeviceContext *)This)) +#pragma deprecated("ID2D1DeviceContext1_GetUnitMode") #define ID2D1DeviceContext1_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \ ((This)->lpVtbl->Base.DrawGlyphRun((ID2D1DeviceContext *)This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1DeviceContext1_DrawGlyphRun") #define ID2D1DeviceContext1_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \ ((This)->lpVtbl->Base.DrawImage((ID2D1DeviceContext *)This, image, targetOffset, imageRectangle, interpolationMode, compositeMode)) +#pragma deprecated("ID2D1DeviceContext1_DrawImage") #define ID2D1DeviceContext1_DrawGdiMetafile(This, gdiMetafile, targetOffset) \ ((This)->lpVtbl->Base.DrawGdiMetafile((ID2D1DeviceContext *)This, gdiMetafile, targetOffset)) +#pragma deprecated("ID2D1DeviceContext1_DrawGdiMetafile") #define ID2D1DeviceContext1_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \ ((This)->lpVtbl->Base.DrawBitmap((ID2D1DeviceContext *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform)) +#pragma deprecated("ID2D1DeviceContext1_DrawBitmap") #define ID2D1DeviceContext1_PushLayer(This, layerParameters, layer) \ ((This)->lpVtbl->Base.PushLayer((ID2D1DeviceContext *)This, layerParameters, layer)) +#pragma deprecated("ID2D1DeviceContext1_PushLayer") #define ID2D1DeviceContext1_InvalidateEffectInputRectangle(This, effect, input, inputRectangle) \ ((This)->lpVtbl->Base.InvalidateEffectInputRectangle((ID2D1DeviceContext *)This, effect, input, inputRectangle)) +#pragma deprecated("ID2D1DeviceContext1_InvalidateEffectInputRectangle") #define ID2D1DeviceContext1_GetEffectInvalidRectangleCount(This, effect, rectangleCount) \ ((This)->lpVtbl->Base.GetEffectInvalidRectangleCount((ID2D1DeviceContext *)This, effect, rectangleCount)) +#pragma deprecated("ID2D1DeviceContext1_GetEffectInvalidRectangleCount") #define ID2D1DeviceContext1_GetEffectInvalidRectangles(This, effect, rectangles, rectanglesCount) \ ((This)->lpVtbl->Base.GetEffectInvalidRectangles((ID2D1DeviceContext *)This, effect, rectangles, rectanglesCount)) +#pragma deprecated("ID2D1DeviceContext1_GetEffectInvalidRectangles") #define ID2D1DeviceContext1_GetEffectRequiredInputRectangles(This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount) \ ((This)->lpVtbl->Base.GetEffectRequiredInputRectangles((ID2D1DeviceContext *)This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount)) +#pragma deprecated("ID2D1DeviceContext1_GetEffectRequiredInputRectangles") #define ID2D1DeviceContext1_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->Base.FillOpacityMask((ID2D1DeviceContext *)This, opacityMask, brush, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1DeviceContext1_FillOpacityMask") #define ID2D1DeviceContext1_CreateFilledGeometryRealization(This, geometry, flatteningTolerance, geometryRealization) \ ((This)->lpVtbl->CreateFilledGeometryRealization(This, geometry, flatteningTolerance, geometryRealization)) +#pragma deprecated("ID2D1DeviceContext1_CreateFilledGeometryRealization") #define ID2D1DeviceContext1_CreateStrokedGeometryRealization(This, geometry, flatteningTolerance, strokeWidth, strokeStyle, geometryRealization) \ ((This)->lpVtbl->CreateStrokedGeometryRealization(This, geometry, flatteningTolerance, strokeWidth, strokeStyle, geometryRealization)) +#pragma deprecated("ID2D1DeviceContext1_CreateStrokedGeometryRealization") #define ID2D1DeviceContext1_DrawGeometryRealization(This, geometryRealization, brush) \ ((This)->lpVtbl->DrawGeometryRealization(This, geometryRealization, brush)) +#pragma deprecated("ID2D1DeviceContext1_DrawGeometryRealization") typedef interface ID2D1Device1 ID2D1Device1; @@ -550,36 +641,47 @@ interface ID2D1Device1 #define ID2D1Device1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Device1_QueryInterface") #define ID2D1Device1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Device1_AddRef") #define ID2D1Device1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Device1_Release") #define ID2D1Device1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Device1_GetFactory") #define ID2D1Device1_CreatePrintControl(This, wicFactory, documentTarget, printControlProperties, printControl) \ ((This)->lpVtbl->Base.CreatePrintControl((ID2D1Device *)This, wicFactory, documentTarget, printControlProperties, printControl)) +#pragma deprecated("ID2D1Device1_CreatePrintControl") #define ID2D1Device1_SetMaximumTextureMemory(This, maximumInBytes) \ ((This)->lpVtbl->Base.SetMaximumTextureMemory((ID2D1Device *)This, maximumInBytes)) +#pragma deprecated("ID2D1Device1_SetMaximumTextureMemory") #define ID2D1Device1_GetMaximumTextureMemory(This) \ ((This)->lpVtbl->Base.GetMaximumTextureMemory((ID2D1Device *)This)) +#pragma deprecated("ID2D1Device1_GetMaximumTextureMemory") #define ID2D1Device1_ClearResources(This, millisecondsSinceUse) \ ((This)->lpVtbl->Base.ClearResources((ID2D1Device *)This, millisecondsSinceUse)) +#pragma deprecated("ID2D1Device1_ClearResources") #define ID2D1Device1_GetRenderingPriority(This) \ ((This)->lpVtbl->GetRenderingPriority(This)) +#pragma deprecated("ID2D1Device1_GetRenderingPriority") #define ID2D1Device1_SetRenderingPriority(This, renderingPriority) \ ((This)->lpVtbl->SetRenderingPriority(This, renderingPriority)) +#pragma deprecated("ID2D1Device1_SetRenderingPriority") #define ID2D1Device1_CreateDeviceContext(This, options, deviceContext1) \ ((This)->lpVtbl->CreateDeviceContext(This, options, deviceContext1)) +#pragma deprecated("ID2D1Device1_CreateDeviceContext") typedef interface ID2D1Factory2 ID2D1Factory2; @@ -604,75 +706,99 @@ interface ID2D1Factory2 #define ID2D1Factory2_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Factory2_QueryInterface") #define ID2D1Factory2_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Factory2_AddRef") #define ID2D1Factory2_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Factory2_Release") #define ID2D1Factory2_ReloadSystemMetrics(This) \ ((This)->lpVtbl->Base.Base.ReloadSystemMetrics((ID2D1Factory *)This)) +#pragma deprecated("ID2D1Factory2_ReloadSystemMetrics") #define ID2D1Factory2_GetDesktopDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.Base.GetDesktopDpi((ID2D1Factory *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1Factory2_GetDesktopDpi") #define ID2D1Factory2_CreateRectangleGeometry(This, rectangle, rectangleGeometry) \ ((This)->lpVtbl->Base.Base.CreateRectangleGeometry((ID2D1Factory *)This, rectangle, rectangleGeometry)) +#pragma deprecated("ID2D1Factory2_CreateRectangleGeometry") #define ID2D1Factory2_CreateRoundedRectangleGeometry(This, roundedRectangle, roundedRectangleGeometry) \ ((This)->lpVtbl->Base.Base.CreateRoundedRectangleGeometry((ID2D1Factory *)This, roundedRectangle, roundedRectangleGeometry)) +#pragma deprecated("ID2D1Factory2_CreateRoundedRectangleGeometry") #define ID2D1Factory2_CreateEllipseGeometry(This, ellipse, ellipseGeometry) \ ((This)->lpVtbl->Base.Base.CreateEllipseGeometry((ID2D1Factory *)This, ellipse, ellipseGeometry)) +#pragma deprecated("ID2D1Factory2_CreateEllipseGeometry") #define ID2D1Factory2_CreateGeometryGroup(This, fillMode, geometries, geometriesCount, geometryGroup) \ ((This)->lpVtbl->Base.Base.CreateGeometryGroup((ID2D1Factory *)This, fillMode, geometries, geometriesCount, geometryGroup)) +#pragma deprecated("ID2D1Factory2_CreateGeometryGroup") #define ID2D1Factory2_CreateTransformedGeometry(This, sourceGeometry, transform, transformedGeometry) \ ((This)->lpVtbl->Base.Base.CreateTransformedGeometry((ID2D1Factory *)This, sourceGeometry, transform, transformedGeometry)) +#pragma deprecated("ID2D1Factory2_CreateTransformedGeometry") #define ID2D1Factory2_CreateWicBitmapRenderTarget(This, target, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->Base.Base.CreateWicBitmapRenderTarget((ID2D1Factory *)This, target, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory2_CreateWicBitmapRenderTarget") #define ID2D1Factory2_CreateHwndRenderTarget(This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget) \ ((This)->lpVtbl->Base.Base.CreateHwndRenderTarget((ID2D1Factory *)This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget)) +#pragma deprecated("ID2D1Factory2_CreateHwndRenderTarget") #define ID2D1Factory2_CreateDxgiSurfaceRenderTarget(This, dxgiSurface, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->Base.Base.CreateDxgiSurfaceRenderTarget((ID2D1Factory *)This, dxgiSurface, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory2_CreateDxgiSurfaceRenderTarget") #define ID2D1Factory2_CreateDCRenderTarget(This, renderTargetProperties, dcRenderTarget) \ ((This)->lpVtbl->Base.Base.CreateDCRenderTarget((ID2D1Factory *)This, renderTargetProperties, dcRenderTarget)) +#pragma deprecated("ID2D1Factory2_CreateDCRenderTarget") #define ID2D1Factory2_CreateStrokeStyle(This, strokeStyleProperties, dashes, dashesCount, strokeStyle) \ ((This)->lpVtbl->Base.CreateStrokeStyle((ID2D1Factory1 *)This, strokeStyleProperties, dashes, dashesCount, strokeStyle)) +#pragma deprecated("ID2D1Factory2_CreateStrokeStyle") #define ID2D1Factory2_CreatePathGeometry(This, pathGeometry) \ ((This)->lpVtbl->Base.CreatePathGeometry((ID2D1Factory1 *)This, pathGeometry)) +#pragma deprecated("ID2D1Factory2_CreatePathGeometry") #define ID2D1Factory2_CreateDrawingStateBlock(This, drawingStateDescription, textRenderingParams, drawingStateBlock) \ ((This)->lpVtbl->Base.CreateDrawingStateBlock((ID2D1Factory1 *)This, drawingStateDescription, textRenderingParams, drawingStateBlock)) +#pragma deprecated("ID2D1Factory2_CreateDrawingStateBlock") #define ID2D1Factory2_CreateGdiMetafile(This, metafileStream, metafile) \ ((This)->lpVtbl->Base.CreateGdiMetafile((ID2D1Factory1 *)This, metafileStream, metafile)) +#pragma deprecated("ID2D1Factory2_CreateGdiMetafile") #define ID2D1Factory2_RegisterEffectFromStream(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \ ((This)->lpVtbl->Base.RegisterEffectFromStream((ID2D1Factory1 *)This, classId, propertyXml, bindings, bindingsCount, effectFactory)) +#pragma deprecated("ID2D1Factory2_RegisterEffectFromStream") #define ID2D1Factory2_RegisterEffectFromString(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \ ((This)->lpVtbl->Base.RegisterEffectFromString((ID2D1Factory1 *)This, classId, propertyXml, bindings, bindingsCount, effectFactory)) +#pragma deprecated("ID2D1Factory2_RegisterEffectFromString") #define ID2D1Factory2_UnregisterEffect(This, classId) \ ((This)->lpVtbl->Base.UnregisterEffect((ID2D1Factory1 *)This, classId)) +#pragma deprecated("ID2D1Factory2_UnregisterEffect") #define ID2D1Factory2_GetRegisteredEffects(This, effects, effectsCount, effectsReturned, effectsRegistered) \ ((This)->lpVtbl->Base.GetRegisteredEffects((ID2D1Factory1 *)This, effects, effectsCount, effectsReturned, effectsRegistered)) +#pragma deprecated("ID2D1Factory2_GetRegisteredEffects") #define ID2D1Factory2_GetEffectProperties(This, effectId, properties) \ ((This)->lpVtbl->Base.GetEffectProperties((ID2D1Factory1 *)This, effectId, properties)) +#pragma deprecated("ID2D1Factory2_GetEffectProperties") #define ID2D1Factory2_CreateDevice(This, dxgiDevice, d2dDevice1) \ ((This)->lpVtbl->CreateDevice(This, dxgiDevice, d2dDevice1)) +#pragma deprecated("ID2D1Factory2_CreateDevice") typedef interface ID2D1CommandSink1 ID2D1CommandSink1; @@ -696,90 +822,119 @@ interface ID2D1CommandSink1 #define ID2D1CommandSink1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1CommandSink1_QueryInterface") #define ID2D1CommandSink1_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1CommandSink1_AddRef") #define ID2D1CommandSink1_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1CommandSink1_Release") #define ID2D1CommandSink1_BeginDraw(This) \ ((This)->lpVtbl->Base.BeginDraw((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink1_BeginDraw") #define ID2D1CommandSink1_EndDraw(This) \ ((This)->lpVtbl->Base.EndDraw((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink1_EndDraw") #define ID2D1CommandSink1_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.SetAntialiasMode((ID2D1CommandSink *)This, antialiasMode)) +#pragma deprecated("ID2D1CommandSink1_SetAntialiasMode") #define ID2D1CommandSink1_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.SetTags((ID2D1CommandSink *)This, tag1, tag2)) +#pragma deprecated("ID2D1CommandSink1_SetTags") #define ID2D1CommandSink1_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.SetTextAntialiasMode((ID2D1CommandSink *)This, textAntialiasMode)) +#pragma deprecated("ID2D1CommandSink1_SetTextAntialiasMode") #define ID2D1CommandSink1_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.SetTextRenderingParams((ID2D1CommandSink *)This, textRenderingParams)) +#pragma deprecated("ID2D1CommandSink1_SetTextRenderingParams") #define ID2D1CommandSink1_SetTransform(This, transform) \ ((This)->lpVtbl->Base.SetTransform((ID2D1CommandSink *)This, transform)) +#pragma deprecated("ID2D1CommandSink1_SetTransform") #define ID2D1CommandSink1_SetPrimitiveBlend(This, primitiveBlend) \ ((This)->lpVtbl->Base.SetPrimitiveBlend((ID2D1CommandSink *)This, primitiveBlend)) +#pragma deprecated("ID2D1CommandSink1_SetPrimitiveBlend") #define ID2D1CommandSink1_SetUnitMode(This, unitMode) \ ((This)->lpVtbl->Base.SetUnitMode((ID2D1CommandSink *)This, unitMode)) +#pragma deprecated("ID2D1CommandSink1_SetUnitMode") #define ID2D1CommandSink1_Clear(This, color) \ ((This)->lpVtbl->Base.Clear((ID2D1CommandSink *)This, color)) +#pragma deprecated("ID2D1CommandSink1_Clear") #define ID2D1CommandSink1_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \ ((This)->lpVtbl->Base.DrawGlyphRun((ID2D1CommandSink *)This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1CommandSink1_DrawGlyphRun") #define ID2D1CommandSink1_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawLine((ID2D1CommandSink *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink1_DrawLine") #define ID2D1CommandSink1_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawGeometry((ID2D1CommandSink *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink1_DrawGeometry") #define ID2D1CommandSink1_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.DrawRectangle((ID2D1CommandSink *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink1_DrawRectangle") #define ID2D1CommandSink1_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \ ((This)->lpVtbl->Base.DrawBitmap((ID2D1CommandSink *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform)) +#pragma deprecated("ID2D1CommandSink1_DrawBitmap") #define ID2D1CommandSink1_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \ ((This)->lpVtbl->Base.DrawImage((ID2D1CommandSink *)This, image, targetOffset, imageRectangle, interpolationMode, compositeMode)) +#pragma deprecated("ID2D1CommandSink1_DrawImage") #define ID2D1CommandSink1_DrawGdiMetafile(This, gdiMetafile, targetOffset) \ ((This)->lpVtbl->Base.DrawGdiMetafile((ID2D1CommandSink *)This, gdiMetafile, targetOffset)) +#pragma deprecated("ID2D1CommandSink1_DrawGdiMetafile") #define ID2D1CommandSink1_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.FillMesh((ID2D1CommandSink *)This, mesh, brush)) +#pragma deprecated("ID2D1CommandSink1_FillMesh") #define ID2D1CommandSink1_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->Base.FillOpacityMask((ID2D1CommandSink *)This, opacityMask, brush, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1CommandSink1_FillOpacityMask") #define ID2D1CommandSink1_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.FillGeometry((ID2D1CommandSink *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1CommandSink1_FillGeometry") #define ID2D1CommandSink1_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.FillRectangle((ID2D1CommandSink *)This, rect, brush)) +#pragma deprecated("ID2D1CommandSink1_FillRectangle") #define ID2D1CommandSink1_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.PushAxisAlignedClip((ID2D1CommandSink *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1CommandSink1_PushAxisAlignedClip") #define ID2D1CommandSink1_PushLayer(This, layerParameters1, layer) \ ((This)->lpVtbl->Base.PushLayer((ID2D1CommandSink *)This, layerParameters1, layer)) +#pragma deprecated("ID2D1CommandSink1_PushLayer") #define ID2D1CommandSink1_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.PopAxisAlignedClip((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink1_PopAxisAlignedClip") #define ID2D1CommandSink1_PopLayer(This) \ ((This)->lpVtbl->Base.PopLayer((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink1_PopLayer") #define ID2D1CommandSink1_SetPrimitiveBlend1(This, primitiveBlend) \ ((This)->lpVtbl->SetPrimitiveBlend1(This, primitiveBlend)) +#pragma deprecated("ID2D1CommandSink1_SetPrimitiveBlend1") #endif diff --git a/minidx12/Include/d2d1_3.h b/minidx12/Include/d2d1_3.h index 516988125d..a583b005ad 100644 --- a/minidx12/Include/d2d1_3.h +++ b/minidx12/Include/d2d1_3.h @@ -386,6 +386,31 @@ typedef struct D2D1_GRADIENT_MESH_PATCH } D2D1_GRADIENT_MESH_PATCH; +//+----------------------------------------------------------------------------- +// +// Flag: +// D2D1_SPRITE_OPTIONS +// +//------------------------------------------------------------------------------ +typedef enum D2D1_SPRITE_OPTIONS +{ + + // + // Use default sprite rendering behavior. + // + D2D1_SPRITE_OPTIONS_NONE = 0, + + // + // Bitmap interpolation will be clamped to the sprite's source rectangle. + // + D2D1_SPRITE_OPTIONS_CLAMP_TO_SOURCE_RECTANGLE = 1, + D2D1_SPRITE_OPTIONS_FORCE_DWORD = 0xffffffff + +} D2D1_SPRITE_OPTIONS; + +DEFINE_ENUM_FLAG_OPERATORS(D2D1_SPRITE_OPTIONS); + + #ifndef D2D_USE_C_DEFINITIONS @@ -1054,6 +1079,208 @@ interface DX_DECLARE_INTERFACE("fd0ecb6b-91e6-411e-8655-395e760f91b4") ID2D1GdiM }; // interface ID2D1GdiMetafileSink1 +#if NTDDI_VERSION >= NTDDI_WIN10_TH2 + + + +//+----------------------------------------------------------------------------- +// +// Interface: +// ID2D1SpriteBatch +// +//------------------------------------------------------------------------------ +interface DX_DECLARE_INTERFACE("4dc583bf-3a10-438a-8722-e9765224f1f1") ID2D1SpriteBatch : public ID2D1Resource +{ + + + // + // Adds sprites to the end of the sprite batch. + // + STDMETHOD(AddSprites)( + UINT32 spriteCount, + _In_reads_bytes_(sizeof(D2D1_RECT_F) + (spriteCount - 1) * destinationRectanglesStride) CONST D2D1_RECT_F *destinationRectangles, + _In_reads_bytes_opt_(sizeof(D2D1_RECT_U) + (spriteCount - 1) * sourceRectanglesStride) CONST D2D1_RECT_U *sourceRectangles = NULL, + _In_reads_bytes_opt_(sizeof(D2D1_COLOR_F) + (spriteCount - 1) * colorsStride) CONST D2D1_COLOR_F *colors = NULL, + _In_reads_bytes_opt_(sizeof(D2D1_MATRIX_3X2_F) + (spriteCount - 1) * transformsStride) CONST D2D1_MATRIX_3X2_F *transforms = NULL, + UINT32 destinationRectanglesStride = sizeof(D2D1_RECT_F), + UINT32 sourceRectanglesStride = sizeof(D2D1_RECT_U), + UINT32 colorsStride = sizeof(D2D1_COLOR_F), + UINT32 transformsStride = sizeof(D2D1_MATRIX_3X2_F) + ) PURE; + + + // + // Set properties for existing sprites. All properties not specified are + // unmodified. + // + STDMETHOD(SetSprites)( + UINT32 startIndex, + UINT32 spriteCount, + _In_reads_bytes_opt_(sizeof(D2D1_RECT_F) + (spriteCount - 1) * destinationRectanglesStride) CONST D2D1_RECT_F *destinationRectangles = NULL, + _In_reads_bytes_opt_(sizeof(D2D1_RECT_U) + (spriteCount - 1) * sourceRectanglesStride) CONST D2D1_RECT_U *sourceRectangles = NULL, + _In_reads_bytes_opt_(sizeof(D2D1_COLOR_F) + (spriteCount - 1) * colorsStride) CONST D2D1_COLOR_F *colors = NULL, + _In_reads_bytes_opt_(sizeof(D2D1_MATRIX_3X2_F) + (spriteCount - 1) * transformsStride) CONST D2D1_MATRIX_3X2_F *transforms = NULL, + UINT32 destinationRectanglesStride = sizeof(D2D1_RECT_F), + UINT32 sourceRectanglesStride = sizeof(D2D1_RECT_U), + UINT32 colorsStride = sizeof(D2D1_COLOR_F), + UINT32 transformsStride = sizeof(D2D1_MATRIX_3X2_F) + ) PURE; + + + // + // Retrieves sprite properties. + // + STDMETHOD(GetSprites)( + UINT32 startIndex, + UINT32 spriteCount, + _Out_writes_opt_(spriteCount) D2D1_RECT_F *destinationRectangles = NULL, + _Out_writes_opt_(spriteCount) D2D1_RECT_U *sourceRectangles = NULL, + _Out_writes_opt_(spriteCount) D2D1_COLOR_F *colors = NULL, + _Out_writes_opt_(spriteCount) D2D1_MATRIX_3X2_F *transforms = NULL + ) CONST PURE; + + + // + // Retrieves the number of sprites in the sprite batch. + // + STDMETHOD_(UINT32, GetSpriteCount)( + ) CONST PURE; + + + // + // Removes all sprites from the sprite batch. + // + STDMETHOD_(void, Clear)( + ) PURE; +}; // interface ID2D1SpriteBatch + + + +//+----------------------------------------------------------------------------- +// +// Interface: +// ID2D1DeviceContext3 +// +//------------------------------------------------------------------------------ +interface DX_DECLARE_INTERFACE("235a7496-8351-414c-bcd4-6672ab2d8e00") ID2D1DeviceContext3 : public ID2D1DeviceContext2 +{ + + + // + // Creates a new sprite batch. + // + STDMETHOD(CreateSpriteBatch)( + _Outptr_ ID2D1SpriteBatch **spriteBatch + ) PURE; + + + // + // Draws sprites in a sprite batch. + // + STDMETHOD_(void, DrawSpriteBatch)( + _In_ ID2D1SpriteBatch *spriteBatch, + UINT32 startIndex, + UINT32 spriteCount, + _In_ ID2D1Bitmap *bitmap, + D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, + D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE + ) PURE; + + + // + // Draws all sprites in a sprite batch. + // + COM_DECLSPEC_NOTHROW + void + DrawSpriteBatch( + _In_ ID2D1SpriteBatch *spriteBatch, + _In_ ID2D1Bitmap *bitmap, + D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, + D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE + ) + { + return DrawSpriteBatch(spriteBatch, 0, spriteBatch->GetSpriteCount(), bitmap, interpolationMode, spriteOptions); + } +}; // interface ID2D1DeviceContext3 + + + +//+----------------------------------------------------------------------------- +// +// Interface: +// ID2D1Device3 +// +//------------------------------------------------------------------------------ +interface DX_DECLARE_INTERFACE("852f2087-802c-4037-ab60-ff2e7ee6fc01") ID2D1Device3 : public ID2D1Device2 +{ + + + // + // Creates a new device context with no initially assigned target. + // + STDMETHOD(CreateDeviceContext)( + D2D1_DEVICE_CONTEXT_OPTIONS options, + _Outptr_ ID2D1DeviceContext3 **deviceContext3 + ) PURE; + + using ID2D1Device2::CreateDeviceContext; + + using ID2D1Device1::CreateDeviceContext; + + using ID2D1Device::CreateDeviceContext; +}; // interface ID2D1Device3 + + + +//+----------------------------------------------------------------------------- +// +// Interface: +// ID2D1Factory4 +// +//------------------------------------------------------------------------------ +interface DX_DECLARE_INTERFACE("bd4ec2d2-0662-4bee-ba8e-6f29f032e096") ID2D1Factory4 : public ID2D1Factory3 +{ + + + // + // This creates a new Direct2D device from the given IDXGIDevice. + // + STDMETHOD(CreateDevice)( + _In_ IDXGIDevice *dxgiDevice, + _Outptr_ ID2D1Device3 **d2dDevice3 + ) PURE; + + using ID2D1Factory3::CreateDevice; + + using ID2D1Factory2::CreateDevice; + + using ID2D1Factory1::CreateDevice; +}; // interface ID2D1Factory4 + + + +//+----------------------------------------------------------------------------- +// +// Interface: +// ID2D1CommandSink3 +// +//------------------------------------------------------------------------------ +interface DX_DECLARE_INTERFACE("18079135-4cf3-4868-bc8e-06067e6d242d") ID2D1CommandSink3 : public ID2D1CommandSink2 +{ + + STDMETHOD(DrawSpriteBatch)( + _In_ ID2D1SpriteBatch *spriteBatch, + UINT32 startIndex, + UINT32 spriteCount, + _In_ ID2D1Bitmap *bitmap, + D2D1_BITMAP_INTERPOLATION_MODE interpolationMode, + D2D1_SPRITE_OPTIONS spriteOptions + ) PURE; +}; // interface ID2D1CommandSink3 + + +#endif // #if NTDDI_VERSION >= NTDDI_WIN10_TH2 + #endif @@ -1071,6 +1298,11 @@ EXTERN_C CONST IID IID_ID2D1Factory3; EXTERN_C CONST IID IID_ID2D1CommandSink2; EXTERN_C CONST IID IID_ID2D1GdiMetafile1; EXTERN_C CONST IID IID_ID2D1GdiMetafileSink1; +EXTERN_C CONST IID IID_ID2D1SpriteBatch; +EXTERN_C CONST IID IID_ID2D1DeviceContext3; +EXTERN_C CONST IID IID_ID2D1Device3; +EXTERN_C CONST IID IID_ID2D1Factory4; +EXTERN_C CONST IID IID_ID2D1CommandSink3; #ifdef D2D_USE_C_DEFINITIONS @@ -1112,27 +1344,35 @@ interface ID2D1InkStyle #define ID2D1InkStyle_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1InkStyle_QueryInterface") #define ID2D1InkStyle_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1InkStyle_AddRef") #define ID2D1InkStyle_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1InkStyle_Release") #define ID2D1InkStyle_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1InkStyle_GetFactory") #define ID2D1InkStyle_SetNibTransform(This, transform) \ ((This)->lpVtbl->SetNibTransform(This, transform)) +#pragma deprecated("ID2D1InkStyle_SetNibTransform") #define ID2D1InkStyle_GetNibTransform(This, transform) \ ((This)->lpVtbl->GetNibTransform(This, transform)) +#pragma deprecated("ID2D1InkStyle_GetNibTransform") #define ID2D1InkStyle_SetNibShape(This, nibShape) \ ((This)->lpVtbl->SetNibShape(This, nibShape)) +#pragma deprecated("ID2D1InkStyle_SetNibShape") #define ID2D1InkStyle_GetNibShape(This) \ ((This)->lpVtbl->GetNibShape(This)) +#pragma deprecated("ID2D1InkStyle_GetNibShape") typedef interface ID2D1Ink ID2D1Ink; @@ -1209,45 +1449,59 @@ interface ID2D1Ink #define ID2D1Ink_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Ink_QueryInterface") #define ID2D1Ink_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Ink_AddRef") #define ID2D1Ink_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Ink_Release") #define ID2D1Ink_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Ink_GetFactory") #define ID2D1Ink_SetStartPoint(This, startPoint) \ ((This)->lpVtbl->SetStartPoint(This, startPoint)) +#pragma deprecated("ID2D1Ink_SetStartPoint") #define ID2D1Ink_GetStartPoint(This) \ ((This)->lpVtbl->GetStartPoint(This)) +#pragma deprecated("ID2D1Ink_GetStartPoint") #define ID2D1Ink_AddSegments(This, segments, segmentsCount) \ ((This)->lpVtbl->AddSegments(This, segments, segmentsCount)) +#pragma deprecated("ID2D1Ink_AddSegments") #define ID2D1Ink_RemoveSegmentsAtEnd(This, segmentsCount) \ ((This)->lpVtbl->RemoveSegmentsAtEnd(This, segmentsCount)) +#pragma deprecated("ID2D1Ink_RemoveSegmentsAtEnd") #define ID2D1Ink_SetSegments(This, startSegment, segments, segmentsCount) \ ((This)->lpVtbl->SetSegments(This, startSegment, segments, segmentsCount)) +#pragma deprecated("ID2D1Ink_SetSegments") #define ID2D1Ink_SetSegmentAtEnd(This, segment) \ ((This)->lpVtbl->SetSegmentAtEnd(This, segment)) +#pragma deprecated("ID2D1Ink_SetSegmentAtEnd") #define ID2D1Ink_GetSegmentCount(This) \ ((This)->lpVtbl->GetSegmentCount(This)) +#pragma deprecated("ID2D1Ink_GetSegmentCount") #define ID2D1Ink_GetSegments(This, startSegment, segments, segmentsCount) \ ((This)->lpVtbl->GetSegments(This, startSegment, segments, segmentsCount)) +#pragma deprecated("ID2D1Ink_GetSegments") #define ID2D1Ink_StreamAsGeometry(This, inkStyle, worldTransform, flatteningTolerance, geometrySink) \ ((This)->lpVtbl->StreamAsGeometry(This, inkStyle, worldTransform, flatteningTolerance, geometrySink)) +#pragma deprecated("ID2D1Ink_StreamAsGeometry") #define ID2D1Ink_GetBounds(This, inkStyle, worldTransform, bounds) \ ((This)->lpVtbl->GetBounds(This, inkStyle, worldTransform, bounds)) +#pragma deprecated("ID2D1Ink_GetBounds") typedef interface ID2D1GradientMesh ID2D1GradientMesh; @@ -1277,21 +1531,27 @@ interface ID2D1GradientMesh #define ID2D1GradientMesh_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GradientMesh_QueryInterface") #define ID2D1GradientMesh_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GradientMesh_AddRef") #define ID2D1GradientMesh_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GradientMesh_Release") #define ID2D1GradientMesh_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1GradientMesh_GetFactory") #define ID2D1GradientMesh_GetPatchCount(This) \ ((This)->lpVtbl->GetPatchCount(This)) +#pragma deprecated("ID2D1GradientMesh_GetPatchCount") #define ID2D1GradientMesh_GetPatches(This, startIndex, patches, patchesCount) \ ((This)->lpVtbl->GetPatches(This, startIndex, patches, patchesCount)) +#pragma deprecated("ID2D1GradientMesh_GetPatches") typedef interface ID2D1ImageSource ID2D1ImageSource; @@ -1319,21 +1579,27 @@ interface ID2D1ImageSource #define ID2D1ImageSource_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1ImageSource_QueryInterface") #define ID2D1ImageSource_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1ImageSource_AddRef") #define ID2D1ImageSource_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1ImageSource_Release") #define ID2D1ImageSource_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1ImageSource_GetFactory") #define ID2D1ImageSource_OfferResources(This) \ ((This)->lpVtbl->OfferResources(This)) +#pragma deprecated("ID2D1ImageSource_OfferResources") #define ID2D1ImageSource_TryReclaimResources(This, resourcesDiscarded) \ ((This)->lpVtbl->TryReclaimResources(This, resourcesDiscarded)) +#pragma deprecated("ID2D1ImageSource_TryReclaimResources") typedef interface ID2D1ImageSourceFromWic ID2D1ImageSourceFromWic; @@ -1367,30 +1633,39 @@ interface ID2D1ImageSourceFromWic #define ID2D1ImageSourceFromWic_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1ImageSourceFromWic_QueryInterface") #define ID2D1ImageSourceFromWic_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1ImageSourceFromWic_AddRef") #define ID2D1ImageSourceFromWic_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1ImageSourceFromWic_Release") #define ID2D1ImageSourceFromWic_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1ImageSourceFromWic_GetFactory") #define ID2D1ImageSourceFromWic_OfferResources(This) \ ((This)->lpVtbl->Base.OfferResources((ID2D1ImageSource *)This)) +#pragma deprecated("ID2D1ImageSourceFromWic_OfferResources") #define ID2D1ImageSourceFromWic_TryReclaimResources(This, resourcesDiscarded) \ ((This)->lpVtbl->Base.TryReclaimResources((ID2D1ImageSource *)This, resourcesDiscarded)) +#pragma deprecated("ID2D1ImageSourceFromWic_TryReclaimResources") #define ID2D1ImageSourceFromWic_EnsureCached(This, rectangleToFill) \ ((This)->lpVtbl->EnsureCached(This, rectangleToFill)) +#pragma deprecated("ID2D1ImageSourceFromWic_EnsureCached") #define ID2D1ImageSourceFromWic_TrimCache(This, rectangleToPreserve) \ ((This)->lpVtbl->TrimCache(This, rectangleToPreserve)) +#pragma deprecated("ID2D1ImageSourceFromWic_TrimCache") #define ID2D1ImageSourceFromWic_GetSource(This, wicBitmapSource) \ ((This)->lpVtbl->GetSource(This, wicBitmapSource)) +#pragma deprecated("ID2D1ImageSourceFromWic_GetSource") typedef interface ID2D1TransformedImageSource ID2D1TransformedImageSource; @@ -1419,21 +1694,27 @@ interface ID2D1TransformedImageSource #define ID2D1TransformedImageSource_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1TransformedImageSource_QueryInterface") #define ID2D1TransformedImageSource_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1TransformedImageSource_AddRef") #define ID2D1TransformedImageSource_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1TransformedImageSource_Release") #define ID2D1TransformedImageSource_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1TransformedImageSource_GetFactory") #define ID2D1TransformedImageSource_GetSource(This, imageSource) \ ((This)->lpVtbl->GetSource(This, imageSource)) +#pragma deprecated("ID2D1TransformedImageSource_GetSource") #define ID2D1TransformedImageSource_GetProperties(This, properties) \ ((This)->lpVtbl->GetProperties(This, properties)) +#pragma deprecated("ID2D1TransformedImageSource_GetProperties") typedef interface ID2D1LookupTable3D ID2D1LookupTable3D; @@ -1452,15 +1733,19 @@ interface ID2D1LookupTable3D #define ID2D1LookupTable3D_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1LookupTable3D_QueryInterface") #define ID2D1LookupTable3D_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1LookupTable3D_AddRef") #define ID2D1LookupTable3D_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1LookupTable3D_Release") #define ID2D1LookupTable3D_GetFactory(This, factory) \ ((This)->lpVtbl->Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1LookupTable3D_GetFactory") typedef interface ID2D1DeviceContext2 ID2D1DeviceContext2; @@ -1557,294 +1842,391 @@ interface ID2D1DeviceContext2 #define ID2D1DeviceContext2_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1DeviceContext2_QueryInterface") #define ID2D1DeviceContext2_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1DeviceContext2_AddRef") #define ID2D1DeviceContext2_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1DeviceContext2_Release") #define ID2D1DeviceContext2_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1DeviceContext2_GetFactory") #define ID2D1DeviceContext2_CreateSharedBitmap(This, riid, data, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.Base.Base.CreateSharedBitmap((ID2D1RenderTarget *)This, riid, data, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext2_CreateSharedBitmap") #define ID2D1DeviceContext2_CreateSolidColorBrush(This, color, brushProperties, solidColorBrush) \ ((This)->lpVtbl->Base.Base.Base.CreateSolidColorBrush((ID2D1RenderTarget *)This, color, brushProperties, solidColorBrush)) +#pragma deprecated("ID2D1DeviceContext2_CreateSolidColorBrush") #define ID2D1DeviceContext2_CreateLinearGradientBrush(This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush) \ ((This)->lpVtbl->Base.Base.Base.CreateLinearGradientBrush((ID2D1RenderTarget *)This, linearGradientBrushProperties, brushProperties, gradientStopCollection, linearGradientBrush)) +#pragma deprecated("ID2D1DeviceContext2_CreateLinearGradientBrush") #define ID2D1DeviceContext2_CreateRadialGradientBrush(This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush) \ ((This)->lpVtbl->Base.Base.Base.CreateRadialGradientBrush((ID2D1RenderTarget *)This, radialGradientBrushProperties, brushProperties, gradientStopCollection, radialGradientBrush)) +#pragma deprecated("ID2D1DeviceContext2_CreateRadialGradientBrush") #define ID2D1DeviceContext2_CreateCompatibleRenderTarget(This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget) \ ((This)->lpVtbl->Base.Base.Base.CreateCompatibleRenderTarget((ID2D1RenderTarget *)This, desiredSize, desiredPixelSize, desiredFormat, options, bitmapRenderTarget)) +#pragma deprecated("ID2D1DeviceContext2_CreateCompatibleRenderTarget") #define ID2D1DeviceContext2_CreateLayer(This, size, layer) \ ((This)->lpVtbl->Base.Base.Base.CreateLayer((ID2D1RenderTarget *)This, size, layer)) +#pragma deprecated("ID2D1DeviceContext2_CreateLayer") #define ID2D1DeviceContext2_CreateMesh(This, mesh) \ ((This)->lpVtbl->Base.Base.Base.CreateMesh((ID2D1RenderTarget *)This, mesh)) +#pragma deprecated("ID2D1DeviceContext2_CreateMesh") #define ID2D1DeviceContext2_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.Base.DrawLine((ID2D1RenderTarget *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext2_DrawLine") #define ID2D1DeviceContext2_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.Base.DrawRectangle((ID2D1RenderTarget *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext2_DrawRectangle") #define ID2D1DeviceContext2_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.Base.Base.FillRectangle((ID2D1RenderTarget *)This, rect, brush)) +#pragma deprecated("ID2D1DeviceContext2_FillRectangle") #define ID2D1DeviceContext2_DrawRoundedRectangle(This, roundedRect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.Base.DrawRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext2_DrawRoundedRectangle") #define ID2D1DeviceContext2_FillRoundedRectangle(This, roundedRect, brush) \ ((This)->lpVtbl->Base.Base.Base.FillRoundedRectangle((ID2D1RenderTarget *)This, roundedRect, brush)) +#pragma deprecated("ID2D1DeviceContext2_FillRoundedRectangle") #define ID2D1DeviceContext2_DrawEllipse(This, ellipse, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.Base.DrawEllipse((ID2D1RenderTarget *)This, ellipse, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext2_DrawEllipse") #define ID2D1DeviceContext2_FillEllipse(This, ellipse, brush) \ ((This)->lpVtbl->Base.Base.Base.FillEllipse((ID2D1RenderTarget *)This, ellipse, brush)) +#pragma deprecated("ID2D1DeviceContext2_FillEllipse") #define ID2D1DeviceContext2_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.Base.DrawGeometry((ID2D1RenderTarget *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1DeviceContext2_DrawGeometry") #define ID2D1DeviceContext2_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.Base.Base.FillGeometry((ID2D1RenderTarget *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1DeviceContext2_FillGeometry") #define ID2D1DeviceContext2_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.Base.Base.FillMesh((ID2D1RenderTarget *)This, mesh, brush)) +#pragma deprecated("ID2D1DeviceContext2_FillMesh") #define ID2D1DeviceContext2_DrawText(This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode) \ ((This)->lpVtbl->Base.Base.Base.DrawText((ID2D1RenderTarget *)This, string, stringLength, textFormat, layoutRect, defaultForegroundBrush, options, measuringMode)) +#pragma deprecated("ID2D1DeviceContext2_DrawText") #define ID2D1DeviceContext2_DrawTextLayout(This, origin, textLayout, defaultForegroundBrush, options) \ ((This)->lpVtbl->Base.Base.Base.DrawTextLayout((ID2D1RenderTarget *)This, origin, textLayout, defaultForegroundBrush, options)) +#pragma deprecated("ID2D1DeviceContext2_DrawTextLayout") #define ID2D1DeviceContext2_SetTransform(This, transform) \ ((This)->lpVtbl->Base.Base.Base.SetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DeviceContext2_SetTransform") #define ID2D1DeviceContext2_GetTransform(This, transform) \ ((This)->lpVtbl->Base.Base.Base.GetTransform((ID2D1RenderTarget *)This, transform)) +#pragma deprecated("ID2D1DeviceContext2_GetTransform") #define ID2D1DeviceContext2_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.Base.Base.SetAntialiasMode((ID2D1RenderTarget *)This, antialiasMode)) +#pragma deprecated("ID2D1DeviceContext2_SetAntialiasMode") #define ID2D1DeviceContext2_GetAntialiasMode(This) \ ((This)->lpVtbl->Base.Base.Base.GetAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetAntialiasMode") #define ID2D1DeviceContext2_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.Base.Base.SetTextAntialiasMode((ID2D1RenderTarget *)This, textAntialiasMode)) +#pragma deprecated("ID2D1DeviceContext2_SetTextAntialiasMode") #define ID2D1DeviceContext2_GetTextAntialiasMode(This) \ ((This)->lpVtbl->Base.Base.Base.GetTextAntialiasMode((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetTextAntialiasMode") #define ID2D1DeviceContext2_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.Base.Base.SetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DeviceContext2_SetTextRenderingParams") #define ID2D1DeviceContext2_GetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.Base.Base.GetTextRenderingParams((ID2D1RenderTarget *)This, textRenderingParams)) +#pragma deprecated("ID2D1DeviceContext2_GetTextRenderingParams") #define ID2D1DeviceContext2_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.Base.SetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext2_SetTags") #define ID2D1DeviceContext2_GetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.Base.GetTags((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext2_GetTags") #define ID2D1DeviceContext2_PopLayer(This) \ ((This)->lpVtbl->Base.Base.Base.PopLayer((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_PopLayer") #define ID2D1DeviceContext2_Flush(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.Base.Flush((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext2_Flush") #define ID2D1DeviceContext2_SaveDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.Base.Base.SaveDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DeviceContext2_SaveDrawingState") #define ID2D1DeviceContext2_RestoreDrawingState(This, drawingStateBlock) \ ((This)->lpVtbl->Base.Base.Base.RestoreDrawingState((ID2D1RenderTarget *)This, drawingStateBlock)) +#pragma deprecated("ID2D1DeviceContext2_RestoreDrawingState") #define ID2D1DeviceContext2_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.Base.Base.PushAxisAlignedClip((ID2D1RenderTarget *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1DeviceContext2_PushAxisAlignedClip") #define ID2D1DeviceContext2_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.Base.Base.PopAxisAlignedClip((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_PopAxisAlignedClip") #define ID2D1DeviceContext2_Clear(This, clearColor) \ ((This)->lpVtbl->Base.Base.Base.Clear((ID2D1RenderTarget *)This, clearColor)) +#pragma deprecated("ID2D1DeviceContext2_Clear") #define ID2D1DeviceContext2_BeginDraw(This) \ ((This)->lpVtbl->Base.Base.Base.BeginDraw((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_BeginDraw") #define ID2D1DeviceContext2_EndDraw(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.Base.EndDraw((ID2D1RenderTarget *)This, tag1, tag2)) +#pragma deprecated("ID2D1DeviceContext2_EndDraw") #define ID2D1DeviceContext2_GetPixelFormat(This) \ ((This)->lpVtbl->Base.Base.Base.GetPixelFormat((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetPixelFormat") #define ID2D1DeviceContext2_SetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.Base.Base.SetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DeviceContext2_SetDpi") #define ID2D1DeviceContext2_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.Base.Base.GetDpi((ID2D1RenderTarget *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1DeviceContext2_GetDpi") #define ID2D1DeviceContext2_GetSize(This) \ ((This)->lpVtbl->Base.Base.Base.GetSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetSize") #define ID2D1DeviceContext2_GetPixelSize(This) \ ((This)->lpVtbl->Base.Base.Base.GetPixelSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetPixelSize") #define ID2D1DeviceContext2_GetMaximumBitmapSize(This) \ ((This)->lpVtbl->Base.Base.Base.GetMaximumBitmapSize((ID2D1RenderTarget *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetMaximumBitmapSize") #define ID2D1DeviceContext2_IsSupported(This, renderTargetProperties) \ ((This)->lpVtbl->Base.Base.Base.IsSupported((ID2D1RenderTarget *)This, renderTargetProperties)) +#pragma deprecated("ID2D1DeviceContext2_IsSupported") #define ID2D1DeviceContext2_CreateBitmap(This, size, sourceData, pitch, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.Base.CreateBitmap((ID2D1DeviceContext *)This, size, sourceData, pitch, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext2_CreateBitmap") #define ID2D1DeviceContext2_CreateBitmapFromWicBitmap(This, wicBitmapSource, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.Base.CreateBitmapFromWicBitmap((ID2D1DeviceContext *)This, wicBitmapSource, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext2_CreateBitmapFromWicBitmap") #define ID2D1DeviceContext2_CreateColorContext(This, space, profile, profileSize, colorContext) \ ((This)->lpVtbl->Base.Base.CreateColorContext((ID2D1DeviceContext *)This, space, profile, profileSize, colorContext)) +#pragma deprecated("ID2D1DeviceContext2_CreateColorContext") #define ID2D1DeviceContext2_CreateColorContextFromFilename(This, filename, colorContext) \ ((This)->lpVtbl->Base.Base.CreateColorContextFromFilename((ID2D1DeviceContext *)This, filename, colorContext)) +#pragma deprecated("ID2D1DeviceContext2_CreateColorContextFromFilename") #define ID2D1DeviceContext2_CreateColorContextFromWicColorContext(This, wicColorContext, colorContext) \ ((This)->lpVtbl->Base.Base.CreateColorContextFromWicColorContext((ID2D1DeviceContext *)This, wicColorContext, colorContext)) +#pragma deprecated("ID2D1DeviceContext2_CreateColorContextFromWicColorContext") #define ID2D1DeviceContext2_CreateBitmapFromDxgiSurface(This, surface, bitmapProperties, bitmap) \ ((This)->lpVtbl->Base.Base.CreateBitmapFromDxgiSurface((ID2D1DeviceContext *)This, surface, bitmapProperties, bitmap)) +#pragma deprecated("ID2D1DeviceContext2_CreateBitmapFromDxgiSurface") #define ID2D1DeviceContext2_CreateEffect(This, effectId, effect) \ ((This)->lpVtbl->Base.Base.CreateEffect((ID2D1DeviceContext *)This, effectId, effect)) +#pragma deprecated("ID2D1DeviceContext2_CreateEffect") #define ID2D1DeviceContext2_CreateGradientStopCollection(This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1) \ ((This)->lpVtbl->Base.Base.CreateGradientStopCollection((ID2D1DeviceContext *)This, straightAlphaGradientStops, straightAlphaGradientStopsCount, preInterpolationSpace, postInterpolationSpace, bufferPrecision, extendMode, colorInterpolationMode, gradientStopCollection1)) +#pragma deprecated("ID2D1DeviceContext2_CreateGradientStopCollection") #define ID2D1DeviceContext2_CreateImageBrush(This, image, imageBrushProperties, brushProperties, imageBrush) \ ((This)->lpVtbl->Base.Base.CreateImageBrush((ID2D1DeviceContext *)This, image, imageBrushProperties, brushProperties, imageBrush)) +#pragma deprecated("ID2D1DeviceContext2_CreateImageBrush") #define ID2D1DeviceContext2_CreateBitmapBrush(This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush) \ ((This)->lpVtbl->Base.Base.CreateBitmapBrush((ID2D1DeviceContext *)This, bitmap, bitmapBrushProperties, brushProperties, bitmapBrush)) +#pragma deprecated("ID2D1DeviceContext2_CreateBitmapBrush") #define ID2D1DeviceContext2_CreateCommandList(This, commandList) \ ((This)->lpVtbl->Base.Base.CreateCommandList((ID2D1DeviceContext *)This, commandList)) +#pragma deprecated("ID2D1DeviceContext2_CreateCommandList") #define ID2D1DeviceContext2_IsDxgiFormatSupported(This, format) \ ((This)->lpVtbl->Base.Base.IsDxgiFormatSupported((ID2D1DeviceContext *)This, format)) +#pragma deprecated("ID2D1DeviceContext2_IsDxgiFormatSupported") #define ID2D1DeviceContext2_IsBufferPrecisionSupported(This, bufferPrecision) \ ((This)->lpVtbl->Base.Base.IsBufferPrecisionSupported((ID2D1DeviceContext *)This, bufferPrecision)) +#pragma deprecated("ID2D1DeviceContext2_IsBufferPrecisionSupported") #define ID2D1DeviceContext2_GetImageLocalBounds(This, image, localBounds) \ ((This)->lpVtbl->Base.Base.GetImageLocalBounds((ID2D1DeviceContext *)This, image, localBounds)) +#pragma deprecated("ID2D1DeviceContext2_GetImageLocalBounds") #define ID2D1DeviceContext2_GetImageWorldBounds(This, image, worldBounds) \ ((This)->lpVtbl->Base.Base.GetImageWorldBounds((ID2D1DeviceContext *)This, image, worldBounds)) +#pragma deprecated("ID2D1DeviceContext2_GetImageWorldBounds") #define ID2D1DeviceContext2_GetGlyphRunWorldBounds(This, baselineOrigin, glyphRun, measuringMode, bounds) \ ((This)->lpVtbl->Base.Base.GetGlyphRunWorldBounds((ID2D1DeviceContext *)This, baselineOrigin, glyphRun, measuringMode, bounds)) +#pragma deprecated("ID2D1DeviceContext2_GetGlyphRunWorldBounds") #define ID2D1DeviceContext2_GetDevice(This, device) \ ((This)->lpVtbl->Base.Base.GetDevice((ID2D1DeviceContext *)This, device)) +#pragma deprecated("ID2D1DeviceContext2_GetDevice") #define ID2D1DeviceContext2_SetTarget(This, image) \ ((This)->lpVtbl->Base.Base.SetTarget((ID2D1DeviceContext *)This, image)) +#pragma deprecated("ID2D1DeviceContext2_SetTarget") #define ID2D1DeviceContext2_GetTarget(This, image) \ ((This)->lpVtbl->Base.Base.GetTarget((ID2D1DeviceContext *)This, image)) +#pragma deprecated("ID2D1DeviceContext2_GetTarget") #define ID2D1DeviceContext2_SetRenderingControls(This, renderingControls) \ ((This)->lpVtbl->Base.Base.SetRenderingControls((ID2D1DeviceContext *)This, renderingControls)) +#pragma deprecated("ID2D1DeviceContext2_SetRenderingControls") #define ID2D1DeviceContext2_GetRenderingControls(This, renderingControls) \ ((This)->lpVtbl->Base.Base.GetRenderingControls((ID2D1DeviceContext *)This, renderingControls)) +#pragma deprecated("ID2D1DeviceContext2_GetRenderingControls") #define ID2D1DeviceContext2_SetPrimitiveBlend(This, primitiveBlend) \ ((This)->lpVtbl->Base.Base.SetPrimitiveBlend((ID2D1DeviceContext *)This, primitiveBlend)) +#pragma deprecated("ID2D1DeviceContext2_SetPrimitiveBlend") #define ID2D1DeviceContext2_GetPrimitiveBlend(This) \ ((This)->lpVtbl->Base.Base.GetPrimitiveBlend((ID2D1DeviceContext *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetPrimitiveBlend") #define ID2D1DeviceContext2_SetUnitMode(This, unitMode) \ ((This)->lpVtbl->Base.Base.SetUnitMode((ID2D1DeviceContext *)This, unitMode)) +#pragma deprecated("ID2D1DeviceContext2_SetUnitMode") #define ID2D1DeviceContext2_GetUnitMode(This) \ ((This)->lpVtbl->Base.Base.GetUnitMode((ID2D1DeviceContext *)This)) +#pragma deprecated("ID2D1DeviceContext2_GetUnitMode") #define ID2D1DeviceContext2_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \ ((This)->lpVtbl->Base.Base.DrawGlyphRun((ID2D1DeviceContext *)This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1DeviceContext2_DrawGlyphRun") #define ID2D1DeviceContext2_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \ ((This)->lpVtbl->Base.Base.DrawImage((ID2D1DeviceContext *)This, image, targetOffset, imageRectangle, interpolationMode, compositeMode)) +#pragma deprecated("ID2D1DeviceContext2_DrawImage") #define ID2D1DeviceContext2_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \ ((This)->lpVtbl->Base.Base.DrawBitmap((ID2D1DeviceContext *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform)) +#pragma deprecated("ID2D1DeviceContext2_DrawBitmap") #define ID2D1DeviceContext2_PushLayer(This, layerParameters, layer) \ ((This)->lpVtbl->Base.Base.PushLayer((ID2D1DeviceContext *)This, layerParameters, layer)) +#pragma deprecated("ID2D1DeviceContext2_PushLayer") #define ID2D1DeviceContext2_InvalidateEffectInputRectangle(This, effect, input, inputRectangle) \ ((This)->lpVtbl->Base.Base.InvalidateEffectInputRectangle((ID2D1DeviceContext *)This, effect, input, inputRectangle)) +#pragma deprecated("ID2D1DeviceContext2_InvalidateEffectInputRectangle") #define ID2D1DeviceContext2_GetEffectInvalidRectangleCount(This, effect, rectangleCount) \ ((This)->lpVtbl->Base.Base.GetEffectInvalidRectangleCount((ID2D1DeviceContext *)This, effect, rectangleCount)) +#pragma deprecated("ID2D1DeviceContext2_GetEffectInvalidRectangleCount") #define ID2D1DeviceContext2_GetEffectInvalidRectangles(This, effect, rectangles, rectanglesCount) \ ((This)->lpVtbl->Base.Base.GetEffectInvalidRectangles((ID2D1DeviceContext *)This, effect, rectangles, rectanglesCount)) +#pragma deprecated("ID2D1DeviceContext2_GetEffectInvalidRectangles") #define ID2D1DeviceContext2_GetEffectRequiredInputRectangles(This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount) \ ((This)->lpVtbl->Base.Base.GetEffectRequiredInputRectangles((ID2D1DeviceContext *)This, renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount)) +#pragma deprecated("ID2D1DeviceContext2_GetEffectRequiredInputRectangles") #define ID2D1DeviceContext2_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->Base.Base.FillOpacityMask((ID2D1DeviceContext *)This, opacityMask, brush, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1DeviceContext2_FillOpacityMask") #define ID2D1DeviceContext2_CreateFilledGeometryRealization(This, geometry, flatteningTolerance, geometryRealization) \ ((This)->lpVtbl->Base.CreateFilledGeometryRealization((ID2D1DeviceContext1 *)This, geometry, flatteningTolerance, geometryRealization)) +#pragma deprecated("ID2D1DeviceContext2_CreateFilledGeometryRealization") #define ID2D1DeviceContext2_CreateStrokedGeometryRealization(This, geometry, flatteningTolerance, strokeWidth, strokeStyle, geometryRealization) \ ((This)->lpVtbl->Base.CreateStrokedGeometryRealization((ID2D1DeviceContext1 *)This, geometry, flatteningTolerance, strokeWidth, strokeStyle, geometryRealization)) +#pragma deprecated("ID2D1DeviceContext2_CreateStrokedGeometryRealization") #define ID2D1DeviceContext2_DrawGeometryRealization(This, geometryRealization, brush) \ ((This)->lpVtbl->Base.DrawGeometryRealization((ID2D1DeviceContext1 *)This, geometryRealization, brush)) +#pragma deprecated("ID2D1DeviceContext2_DrawGeometryRealization") #define ID2D1DeviceContext2_CreateInk(This, startPoint, ink) \ ((This)->lpVtbl->CreateInk(This, startPoint, ink)) +#pragma deprecated("ID2D1DeviceContext2_CreateInk") #define ID2D1DeviceContext2_CreateInkStyle(This, inkStyleProperties, inkStyle) \ ((This)->lpVtbl->CreateInkStyle(This, inkStyleProperties, inkStyle)) +#pragma deprecated("ID2D1DeviceContext2_CreateInkStyle") #define ID2D1DeviceContext2_CreateGradientMesh(This, patches, patchesCount, gradientMesh) \ ((This)->lpVtbl->CreateGradientMesh(This, patches, patchesCount, gradientMesh)) +#pragma deprecated("ID2D1DeviceContext2_CreateGradientMesh") #define ID2D1DeviceContext2_CreateImageSourceFromWic(This, wicBitmapSource, loadingOptions, alphaMode, imageSource) \ ((This)->lpVtbl->CreateImageSourceFromWic(This, wicBitmapSource, loadingOptions, alphaMode, imageSource)) +#pragma deprecated("ID2D1DeviceContext2_CreateImageSourceFromWic") #define ID2D1DeviceContext2_CreateLookupTable3D(This, precision, extents, data, dataCount, strides, lookupTable) \ ((This)->lpVtbl->CreateLookupTable3D(This, precision, extents, data, dataCount, strides, lookupTable)) +#pragma deprecated("ID2D1DeviceContext2_CreateLookupTable3D") #define ID2D1DeviceContext2_CreateImageSourceFromDxgi(This, surfaces, surfaceCount, colorSpace, options, imageSource) \ ((This)->lpVtbl->CreateImageSourceFromDxgi(This, surfaces, surfaceCount, colorSpace, options, imageSource)) +#pragma deprecated("ID2D1DeviceContext2_CreateImageSourceFromDxgi") #define ID2D1DeviceContext2_GetGradientMeshWorldBounds(This, gradientMesh, pBounds) \ ((This)->lpVtbl->GetGradientMeshWorldBounds(This, gradientMesh, pBounds)) +#pragma deprecated("ID2D1DeviceContext2_GetGradientMeshWorldBounds") #define ID2D1DeviceContext2_DrawInk(This, ink, brush, inkStyle) \ ((This)->lpVtbl->DrawInk(This, ink, brush, inkStyle)) +#pragma deprecated("ID2D1DeviceContext2_DrawInk") #define ID2D1DeviceContext2_DrawGradientMesh(This, gradientMesh) \ ((This)->lpVtbl->DrawGradientMesh(This, gradientMesh)) +#pragma deprecated("ID2D1DeviceContext2_DrawGradientMesh") #define ID2D1DeviceContext2_DrawGdiMetafile(This, gdiMetafile, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->DrawGdiMetafile(This, gdiMetafile, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1DeviceContext2_DrawGdiMetafile") #define ID2D1DeviceContext2_CreateTransformedImageSource(This, imageSource, properties, transformedImageSource) \ ((This)->lpVtbl->CreateTransformedImageSource(This, imageSource, properties, transformedImageSource)) +#pragma deprecated("ID2D1DeviceContext2_CreateTransformedImageSource") typedef interface ID2D1Device2 ID2D1Device2; @@ -1879,42 +2261,55 @@ interface ID2D1Device2 #define ID2D1Device2_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Device2_QueryInterface") #define ID2D1Device2_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Device2_AddRef") #define ID2D1Device2_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Device2_Release") #define ID2D1Device2_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1Device2_GetFactory") #define ID2D1Device2_CreatePrintControl(This, wicFactory, documentTarget, printControlProperties, printControl) \ ((This)->lpVtbl->Base.Base.CreatePrintControl((ID2D1Device *)This, wicFactory, documentTarget, printControlProperties, printControl)) +#pragma deprecated("ID2D1Device2_CreatePrintControl") #define ID2D1Device2_SetMaximumTextureMemory(This, maximumInBytes) \ ((This)->lpVtbl->Base.Base.SetMaximumTextureMemory((ID2D1Device *)This, maximumInBytes)) +#pragma deprecated("ID2D1Device2_SetMaximumTextureMemory") #define ID2D1Device2_GetMaximumTextureMemory(This) \ ((This)->lpVtbl->Base.Base.GetMaximumTextureMemory((ID2D1Device *)This)) +#pragma deprecated("ID2D1Device2_GetMaximumTextureMemory") #define ID2D1Device2_ClearResources(This, millisecondsSinceUse) \ ((This)->lpVtbl->Base.Base.ClearResources((ID2D1Device *)This, millisecondsSinceUse)) +#pragma deprecated("ID2D1Device2_ClearResources") #define ID2D1Device2_GetRenderingPriority(This) \ ((This)->lpVtbl->Base.GetRenderingPriority((ID2D1Device1 *)This)) +#pragma deprecated("ID2D1Device2_GetRenderingPriority") #define ID2D1Device2_SetRenderingPriority(This, renderingPriority) \ ((This)->lpVtbl->Base.SetRenderingPriority((ID2D1Device1 *)This, renderingPriority)) +#pragma deprecated("ID2D1Device2_SetRenderingPriority") #define ID2D1Device2_CreateDeviceContext(This, options, deviceContext2) \ ((This)->lpVtbl->CreateDeviceContext(This, options, deviceContext2)) +#pragma deprecated("ID2D1Device2_CreateDeviceContext") #define ID2D1Device2_FlushDeviceContexts(This, bitmap) \ ((This)->lpVtbl->FlushDeviceContexts(This, bitmap)) +#pragma deprecated("ID2D1Device2_FlushDeviceContexts") #define ID2D1Device2_GetDxgiDevice(This, dxgiDevice) \ ((This)->lpVtbl->GetDxgiDevice(This, dxgiDevice)) +#pragma deprecated("ID2D1Device2_GetDxgiDevice") typedef interface ID2D1Factory3 ID2D1Factory3; @@ -1939,75 +2334,99 @@ interface ID2D1Factory3 #define ID2D1Factory3_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1Factory3_QueryInterface") #define ID2D1Factory3_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1Factory3_AddRef") #define ID2D1Factory3_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1Factory3_Release") #define ID2D1Factory3_ReloadSystemMetrics(This) \ ((This)->lpVtbl->Base.Base.Base.ReloadSystemMetrics((ID2D1Factory *)This)) +#pragma deprecated("ID2D1Factory3_ReloadSystemMetrics") #define ID2D1Factory3_GetDesktopDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->Base.Base.Base.GetDesktopDpi((ID2D1Factory *)This, dpiX, dpiY)) +#pragma deprecated("ID2D1Factory3_GetDesktopDpi") #define ID2D1Factory3_CreateRectangleGeometry(This, rectangle, rectangleGeometry) \ ((This)->lpVtbl->Base.Base.Base.CreateRectangleGeometry((ID2D1Factory *)This, rectangle, rectangleGeometry)) +#pragma deprecated("ID2D1Factory3_CreateRectangleGeometry") #define ID2D1Factory3_CreateRoundedRectangleGeometry(This, roundedRectangle, roundedRectangleGeometry) \ ((This)->lpVtbl->Base.Base.Base.CreateRoundedRectangleGeometry((ID2D1Factory *)This, roundedRectangle, roundedRectangleGeometry)) +#pragma deprecated("ID2D1Factory3_CreateRoundedRectangleGeometry") #define ID2D1Factory3_CreateEllipseGeometry(This, ellipse, ellipseGeometry) \ ((This)->lpVtbl->Base.Base.Base.CreateEllipseGeometry((ID2D1Factory *)This, ellipse, ellipseGeometry)) +#pragma deprecated("ID2D1Factory3_CreateEllipseGeometry") #define ID2D1Factory3_CreateGeometryGroup(This, fillMode, geometries, geometriesCount, geometryGroup) \ ((This)->lpVtbl->Base.Base.Base.CreateGeometryGroup((ID2D1Factory *)This, fillMode, geometries, geometriesCount, geometryGroup)) +#pragma deprecated("ID2D1Factory3_CreateGeometryGroup") #define ID2D1Factory3_CreateTransformedGeometry(This, sourceGeometry, transform, transformedGeometry) \ ((This)->lpVtbl->Base.Base.Base.CreateTransformedGeometry((ID2D1Factory *)This, sourceGeometry, transform, transformedGeometry)) +#pragma deprecated("ID2D1Factory3_CreateTransformedGeometry") #define ID2D1Factory3_CreateWicBitmapRenderTarget(This, target, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->Base.Base.Base.CreateWicBitmapRenderTarget((ID2D1Factory *)This, target, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory3_CreateWicBitmapRenderTarget") #define ID2D1Factory3_CreateHwndRenderTarget(This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget) \ ((This)->lpVtbl->Base.Base.Base.CreateHwndRenderTarget((ID2D1Factory *)This, renderTargetProperties, hwndRenderTargetProperties, hwndRenderTarget)) +#pragma deprecated("ID2D1Factory3_CreateHwndRenderTarget") #define ID2D1Factory3_CreateDxgiSurfaceRenderTarget(This, dxgiSurface, renderTargetProperties, renderTarget) \ ((This)->lpVtbl->Base.Base.Base.CreateDxgiSurfaceRenderTarget((ID2D1Factory *)This, dxgiSurface, renderTargetProperties, renderTarget)) +#pragma deprecated("ID2D1Factory3_CreateDxgiSurfaceRenderTarget") #define ID2D1Factory3_CreateDCRenderTarget(This, renderTargetProperties, dcRenderTarget) \ ((This)->lpVtbl->Base.Base.Base.CreateDCRenderTarget((ID2D1Factory *)This, renderTargetProperties, dcRenderTarget)) +#pragma deprecated("ID2D1Factory3_CreateDCRenderTarget") #define ID2D1Factory3_CreateStrokeStyle(This, strokeStyleProperties, dashes, dashesCount, strokeStyle) \ ((This)->lpVtbl->Base.Base.CreateStrokeStyle((ID2D1Factory1 *)This, strokeStyleProperties, dashes, dashesCount, strokeStyle)) +#pragma deprecated("ID2D1Factory3_CreateStrokeStyle") #define ID2D1Factory3_CreatePathGeometry(This, pathGeometry) \ ((This)->lpVtbl->Base.Base.CreatePathGeometry((ID2D1Factory1 *)This, pathGeometry)) +#pragma deprecated("ID2D1Factory3_CreatePathGeometry") #define ID2D1Factory3_CreateDrawingStateBlock(This, drawingStateDescription, textRenderingParams, drawingStateBlock) \ ((This)->lpVtbl->Base.Base.CreateDrawingStateBlock((ID2D1Factory1 *)This, drawingStateDescription, textRenderingParams, drawingStateBlock)) +#pragma deprecated("ID2D1Factory3_CreateDrawingStateBlock") #define ID2D1Factory3_CreateGdiMetafile(This, metafileStream, metafile) \ ((This)->lpVtbl->Base.Base.CreateGdiMetafile((ID2D1Factory1 *)This, metafileStream, metafile)) +#pragma deprecated("ID2D1Factory3_CreateGdiMetafile") #define ID2D1Factory3_RegisterEffectFromStream(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \ ((This)->lpVtbl->Base.Base.RegisterEffectFromStream((ID2D1Factory1 *)This, classId, propertyXml, bindings, bindingsCount, effectFactory)) +#pragma deprecated("ID2D1Factory3_RegisterEffectFromStream") #define ID2D1Factory3_RegisterEffectFromString(This, classId, propertyXml, bindings, bindingsCount, effectFactory) \ ((This)->lpVtbl->Base.Base.RegisterEffectFromString((ID2D1Factory1 *)This, classId, propertyXml, bindings, bindingsCount, effectFactory)) +#pragma deprecated("ID2D1Factory3_RegisterEffectFromString") #define ID2D1Factory3_UnregisterEffect(This, classId) \ ((This)->lpVtbl->Base.Base.UnregisterEffect((ID2D1Factory1 *)This, classId)) +#pragma deprecated("ID2D1Factory3_UnregisterEffect") #define ID2D1Factory3_GetRegisteredEffects(This, effects, effectsCount, effectsReturned, effectsRegistered) \ ((This)->lpVtbl->Base.Base.GetRegisteredEffects((ID2D1Factory1 *)This, effects, effectsCount, effectsReturned, effectsRegistered)) +#pragma deprecated("ID2D1Factory3_GetRegisteredEffects") #define ID2D1Factory3_GetEffectProperties(This, effectId, properties) \ ((This)->lpVtbl->Base.Base.GetEffectProperties((ID2D1Factory1 *)This, effectId, properties)) +#pragma deprecated("ID2D1Factory3_GetEffectProperties") #define ID2D1Factory3_CreateDevice(This, dxgiDevice, d2dDevice2) \ ((This)->lpVtbl->CreateDevice(This, dxgiDevice, d2dDevice2)) +#pragma deprecated("ID2D1Factory3_CreateDevice") typedef interface ID2D1CommandSink2 ID2D1CommandSink2; @@ -2045,96 +2464,127 @@ interface ID2D1CommandSink2 #define ID2D1CommandSink2_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1CommandSink2_QueryInterface") #define ID2D1CommandSink2_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1CommandSink2_AddRef") #define ID2D1CommandSink2_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1CommandSink2_Release") #define ID2D1CommandSink2_BeginDraw(This) \ ((This)->lpVtbl->Base.Base.BeginDraw((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink2_BeginDraw") #define ID2D1CommandSink2_EndDraw(This) \ ((This)->lpVtbl->Base.Base.EndDraw((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink2_EndDraw") #define ID2D1CommandSink2_SetAntialiasMode(This, antialiasMode) \ ((This)->lpVtbl->Base.Base.SetAntialiasMode((ID2D1CommandSink *)This, antialiasMode)) +#pragma deprecated("ID2D1CommandSink2_SetAntialiasMode") #define ID2D1CommandSink2_SetTags(This, tag1, tag2) \ ((This)->lpVtbl->Base.Base.SetTags((ID2D1CommandSink *)This, tag1, tag2)) +#pragma deprecated("ID2D1CommandSink2_SetTags") #define ID2D1CommandSink2_SetTextAntialiasMode(This, textAntialiasMode) \ ((This)->lpVtbl->Base.Base.SetTextAntialiasMode((ID2D1CommandSink *)This, textAntialiasMode)) +#pragma deprecated("ID2D1CommandSink2_SetTextAntialiasMode") #define ID2D1CommandSink2_SetTextRenderingParams(This, textRenderingParams) \ ((This)->lpVtbl->Base.Base.SetTextRenderingParams((ID2D1CommandSink *)This, textRenderingParams)) +#pragma deprecated("ID2D1CommandSink2_SetTextRenderingParams") #define ID2D1CommandSink2_SetTransform(This, transform) \ ((This)->lpVtbl->Base.Base.SetTransform((ID2D1CommandSink *)This, transform)) +#pragma deprecated("ID2D1CommandSink2_SetTransform") #define ID2D1CommandSink2_SetPrimitiveBlend(This, primitiveBlend) \ ((This)->lpVtbl->Base.Base.SetPrimitiveBlend((ID2D1CommandSink *)This, primitiveBlend)) +#pragma deprecated("ID2D1CommandSink2_SetPrimitiveBlend") #define ID2D1CommandSink2_SetUnitMode(This, unitMode) \ ((This)->lpVtbl->Base.Base.SetUnitMode((ID2D1CommandSink *)This, unitMode)) +#pragma deprecated("ID2D1CommandSink2_SetUnitMode") #define ID2D1CommandSink2_Clear(This, color) \ ((This)->lpVtbl->Base.Base.Clear((ID2D1CommandSink *)This, color)) +#pragma deprecated("ID2D1CommandSink2_Clear") #define ID2D1CommandSink2_DrawGlyphRun(This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode) \ ((This)->lpVtbl->Base.Base.DrawGlyphRun((ID2D1CommandSink *)This, baselineOrigin, glyphRun, glyphRunDescription, foregroundBrush, measuringMode)) +#pragma deprecated("ID2D1CommandSink2_DrawGlyphRun") #define ID2D1CommandSink2_DrawLine(This, point0, point1, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawLine((ID2D1CommandSink *)This, point0, point1, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink2_DrawLine") #define ID2D1CommandSink2_DrawGeometry(This, geometry, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawGeometry((ID2D1CommandSink *)This, geometry, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink2_DrawGeometry") #define ID2D1CommandSink2_DrawRectangle(This, rect, brush, strokeWidth, strokeStyle) \ ((This)->lpVtbl->Base.Base.DrawRectangle((ID2D1CommandSink *)This, rect, brush, strokeWidth, strokeStyle)) +#pragma deprecated("ID2D1CommandSink2_DrawRectangle") #define ID2D1CommandSink2_DrawBitmap(This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform) \ ((This)->lpVtbl->Base.Base.DrawBitmap((ID2D1CommandSink *)This, bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform)) +#pragma deprecated("ID2D1CommandSink2_DrawBitmap") #define ID2D1CommandSink2_DrawImage(This, image, targetOffset, imageRectangle, interpolationMode, compositeMode) \ ((This)->lpVtbl->Base.Base.DrawImage((ID2D1CommandSink *)This, image, targetOffset, imageRectangle, interpolationMode, compositeMode)) +#pragma deprecated("ID2D1CommandSink2_DrawImage") #define ID2D1CommandSink2_FillMesh(This, mesh, brush) \ ((This)->lpVtbl->Base.Base.FillMesh((ID2D1CommandSink *)This, mesh, brush)) +#pragma deprecated("ID2D1CommandSink2_FillMesh") #define ID2D1CommandSink2_FillOpacityMask(This, opacityMask, brush, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->Base.Base.FillOpacityMask((ID2D1CommandSink *)This, opacityMask, brush, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1CommandSink2_FillOpacityMask") #define ID2D1CommandSink2_FillGeometry(This, geometry, brush, opacityBrush) \ ((This)->lpVtbl->Base.Base.FillGeometry((ID2D1CommandSink *)This, geometry, brush, opacityBrush)) +#pragma deprecated("ID2D1CommandSink2_FillGeometry") #define ID2D1CommandSink2_FillRectangle(This, rect, brush) \ ((This)->lpVtbl->Base.Base.FillRectangle((ID2D1CommandSink *)This, rect, brush)) +#pragma deprecated("ID2D1CommandSink2_FillRectangle") #define ID2D1CommandSink2_PushAxisAlignedClip(This, clipRect, antialiasMode) \ ((This)->lpVtbl->Base.Base.PushAxisAlignedClip((ID2D1CommandSink *)This, clipRect, antialiasMode)) +#pragma deprecated("ID2D1CommandSink2_PushAxisAlignedClip") #define ID2D1CommandSink2_PushLayer(This, layerParameters1, layer) \ ((This)->lpVtbl->Base.Base.PushLayer((ID2D1CommandSink *)This, layerParameters1, layer)) +#pragma deprecated("ID2D1CommandSink2_PushLayer") #define ID2D1CommandSink2_PopAxisAlignedClip(This) \ ((This)->lpVtbl->Base.Base.PopAxisAlignedClip((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink2_PopAxisAlignedClip") #define ID2D1CommandSink2_PopLayer(This) \ ((This)->lpVtbl->Base.Base.PopLayer((ID2D1CommandSink *)This)) +#pragma deprecated("ID2D1CommandSink2_PopLayer") #define ID2D1CommandSink2_SetPrimitiveBlend1(This, primitiveBlend) \ ((This)->lpVtbl->Base.SetPrimitiveBlend1((ID2D1CommandSink1 *)This, primitiveBlend)) +#pragma deprecated("ID2D1CommandSink2_SetPrimitiveBlend1") #define ID2D1CommandSink2_DrawInk(This, ink, brush, inkStyle) \ ((This)->lpVtbl->DrawInk(This, ink, brush, inkStyle)) +#pragma deprecated("ID2D1CommandSink2_DrawInk") #define ID2D1CommandSink2_DrawGradientMesh(This, gradientMesh) \ ((This)->lpVtbl->DrawGradientMesh(This, gradientMesh)) +#pragma deprecated("ID2D1CommandSink2_DrawGradientMesh") #define ID2D1CommandSink2_DrawGdiMetafile(This, gdiMetafile, destinationRectangle, sourceRectangle) \ ((This)->lpVtbl->DrawGdiMetafile(This, gdiMetafile, destinationRectangle, sourceRectangle)) +#pragma deprecated("ID2D1CommandSink2_DrawGdiMetafile") typedef interface ID2D1GdiMetafile1 ID2D1GdiMetafile1; @@ -2164,27 +2614,35 @@ interface ID2D1GdiMetafile1 #define ID2D1GdiMetafile1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GdiMetafile1_QueryInterface") #define ID2D1GdiMetafile1_AddRef(This) \ ((This)->lpVtbl->Base.Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafile1_AddRef") #define ID2D1GdiMetafile1_Release(This) \ ((This)->lpVtbl->Base.Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafile1_Release") #define ID2D1GdiMetafile1_GetFactory(This, factory) \ ((This)->lpVtbl->Base.Base.GetFactory((ID2D1Resource *)This, factory)) +#pragma deprecated("ID2D1GdiMetafile1_GetFactory") #define ID2D1GdiMetafile1_Stream(This, sink) \ ((This)->lpVtbl->Base.Stream((ID2D1GdiMetafile *)This, sink)) +#pragma deprecated("ID2D1GdiMetafile1_Stream") #define ID2D1GdiMetafile1_GetBounds(This, bounds) \ ((This)->lpVtbl->Base.GetBounds((ID2D1GdiMetafile *)This, bounds)) +#pragma deprecated("ID2D1GdiMetafile1_GetBounds") #define ID2D1GdiMetafile1_GetDpi(This, dpiX, dpiY) \ ((This)->lpVtbl->GetDpi(This, dpiX, dpiY)) +#pragma deprecated("ID2D1GdiMetafile1_GetDpi") #define ID2D1GdiMetafile1_GetSourceBounds(This, bounds) \ ((This)->lpVtbl->GetSourceBounds(This, bounds)) +#pragma deprecated("ID2D1GdiMetafile1_GetSourceBounds") typedef interface ID2D1GdiMetafileSink1 ID2D1GdiMetafileSink1; @@ -2211,15 +2669,19 @@ interface ID2D1GdiMetafileSink1 #define ID2D1GdiMetafileSink1_QueryInterface(This, riid, ppv) \ ((This)->lpVtbl->Base.Base.QueryInterface((IUnknown *)This, riid, ppv)) +#pragma deprecated("ID2D1GdiMetafileSink1_QueryInterface") #define ID2D1GdiMetafileSink1_AddRef(This) \ ((This)->lpVtbl->Base.Base.AddRef((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafileSink1_AddRef") #define ID2D1GdiMetafileSink1_Release(This) \ ((This)->lpVtbl->Base.Base.Release((IUnknown *)This)) +#pragma deprecated("ID2D1GdiMetafileSink1_Release") #define ID2D1GdiMetafileSink1_ProcessRecord(This, recordType, recordData, recordDataSize, flags) \ ((This)->lpVtbl->ProcessRecord(This, recordType, recordData, recordDataSize, flags)) +#pragma deprecated("ID2D1GdiMetafileSink1_ProcessRecord") #endif diff --git a/minidx12/Include/d2d1_3helper.h b/minidx12/Include/d2d1_3helper.h index cb7fdd8699..939d65df61 100644 --- a/minidx12/Include/d2d1_3helper.h +++ b/minidx12/Include/d2d1_3helper.h @@ -215,6 +215,16 @@ namespace D2D1 return inkStyleProperties; } + + COM_DECLSPEC_NOTHROW + D2D1FORCEINLINE + D2D1_RECT_U + InfiniteRectU() + { + D2D1_RECT_U rect = { 0u, 0u, UINT_MAX, UINT_MAX }; + + return rect; + } } // namespace D2D1 #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ diff --git a/minidx12/Include/d3d11.h b/minidx12/Include/d3d11.h index 8d7838d4e5..a2ac2d73fd 100644 --- a/minidx12/Include/d3d11.h +++ b/minidx12/Include/d3d11.h @@ -9661,6 +9661,8 @@ DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_NOGMC, 0xed418a9f, 0x0 DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_GMC, 0xab998b5b, 0x4258,0x44a9,0x9f,0xeb,0x94,0xe5,0x97,0xa6,0xba,0xae); DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN, 0x5b11d51b, 0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0); DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10, 0x107af0e0, 0xef1a,0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13); +DEFINE_GUID(D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0, 0x463707f8, 0xa1d0, 0x4585, 0x87, 0x6d, 0x83, 0xaa, 0x6d, 0x60, 0xb8, 0x9e); +DEFINE_GUID(D3D11_DECODER_PROFILE_VP8_VLD, 0x90b899ea, 0x3a62, 0x4705, 0x88, 0xb3, 0x8d, 0xf0, 0x4b, 0x27, 0x44, 0xe7); typedef struct D3D11_VIDEO_DECODER_DESC { GUID Guid; diff --git a/minidx12/Include/d3d12.h b/minidx12/Include/d3d12.h index 0755bc96fa..27d65fad80 100644 --- a/minidx12/Include/d3d12.h +++ b/minidx12/Include/d3d12.h @@ -4523,7 +4523,7 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; virtual void STDMETHODCALLTYPE SetDescriptorHeaps( _In_ UINT NumDescriptorHeaps, - _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap **ppDescriptorHeaps) = 0; + _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const *ppDescriptorHeaps) = 0; virtual void STDMETHODCALLTYPE SetComputeRootSignature( _In_ ID3D12RootSignature *pRootSignature) = 0; @@ -4600,7 +4600,7 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; virtual void STDMETHODCALLTYPE OMSetRenderTargets( _In_ UINT NumRenderTargetDescriptors, - _In_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, + _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, _In_ BOOL RTsSingleHandleToDescriptorRange, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pDepthStencilDescriptor) = 0; @@ -4840,7 +4840,7 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; void ( STDMETHODCALLTYPE *SetDescriptorHeaps )( ID3D12GraphicsCommandList * This, _In_ UINT NumDescriptorHeaps, - _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap **ppDescriptorHeaps); + _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const *ppDescriptorHeaps); void ( STDMETHODCALLTYPE *SetComputeRootSignature )( ID3D12GraphicsCommandList * This, @@ -4935,7 +4935,7 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D12GraphicsCommandList * This, _In_ UINT NumRenderTargetDescriptors, - _In_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, + _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, _In_ BOOL RTsSingleHandleToDescriptorRange, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pDepthStencilDescriptor); diff --git a/minidx12/Include/d3d12sdklayers.h b/minidx12/Include/d3d12sdklayers.h index e23088ea88..b76b96aeb2 100644 --- a/minidx12/Include/d3d12sdklayers.h +++ b/minidx12/Include/d3d12sdklayers.h @@ -1459,7 +1459,27 @@ enum D3D12_MESSAGE_ID D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE = ( D3D12_MESSAGE_ID_MAP_INVALID_NULLRANGE + 1 ) , D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT = ( D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE + 1 ) , D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT = ( D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT + 1 ) , - D3D12_MESSAGE_ID_D3D12_MESSAGES_END = ( D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT + 1 ) + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_FLAGS_NOT_SUPPORTED = ( D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_ROOT_ARGUMENT_UNINITIALIZED = ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_FLAGS_NOT_SUPPORTED + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_HEAP_INDEX_OUT_OF_BOUNDS = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_ROOT_ARGUMENT_UNINITIALIZED + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_TABLE_REGISTER_INDEX_OUT_OF_BOUNDS = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_HEAP_INDEX_OUT_OF_BOUNDS + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_UNINITIALIZED = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_TABLE_REGISTER_INDEX_OUT_OF_BOUNDS + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_TYPE_MISMATCH = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_UNINITIALIZED + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_SRV_RESOURCE_DIMENSION_MISMATCH = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_DESCRIPTOR_TYPE_MISMATCH + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_UAV_RESOURCE_DIMENSION_MISMATCH = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_SRV_RESOURCE_DIMENSION_MISMATCH + 1 ) , + D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_INCOMPATIBLE_RESOURCE_STATE = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_UAV_RESOURCE_DIMENSION_MISMATCH + 1 ) , + D3D12_MESSAGE_ID_COPYRESOURCE_NULLDST = ( D3D12_MESSAGE_ID_SHADER_BASED_VALIDATION_INCOMPATIBLE_RESOURCE_STATE + 1 ) , + D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDSTRESOURCE = ( D3D12_MESSAGE_ID_COPYRESOURCE_NULLDST + 1 ) , + D3D12_MESSAGE_ID_COPYRESOURCE_NULLSRC = ( D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDSTRESOURCE + 1 ) , + D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSRCRESOURCE = ( D3D12_MESSAGE_ID_COPYRESOURCE_NULLSRC + 1 ) , + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLDST = ( D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSRCRESOURCE + 1 ) , + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDDSTRESOURCE = ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLDST + 1 ) , + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLSRC = ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDDSTRESOURCE + 1 ) , + D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDSRCRESOURCE = ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_NULLSRC + 1 ) , + D3D12_MESSAGE_ID_PIPELINE_STATE_TYPE_MISMATCH = ( D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALIDSRCRESOURCE + 1 ) , + D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_NOT_SET = ( D3D12_MESSAGE_ID_PIPELINE_STATE_TYPE_MISMATCH + 1 ) , + D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_MISMATCH = ( D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_NOT_SET + 1 ) , + D3D12_MESSAGE_ID_D3D12_MESSAGES_END = ( D3D12_MESSAGE_ID_COMMAND_LIST_DISPATCH_ROOT_SIGNATURE_MISMATCH + 1 ) } D3D12_MESSAGE_ID; typedef struct D3D12_MESSAGE diff --git a/minidx12/Include/dwrite.h b/minidx12/Include/dwrite.h index e37bc2f1aa..9036a6b4fe 100644 --- a/minidx12/Include/dwrite.h +++ b/minidx12/Include/dwrite.h @@ -2446,7 +2446,7 @@ enum DWRITE_NUMBER_SUBSTITUTION_METHOD /// /// Holds the appropriate digits and numeric punctuation for a given locale. /// -interface DECLSPEC_UUID("14885CC9-BAB0-4f90-B6ED-5C366A2CD03D") DECLSPEC_NOVTABLE IDWriteNumberSubstitution : public IUnknown +interface DWRITE_DECLARE_INTERFACE("14885CC9-BAB0-4f90-B6ED-5C366A2CD03D") IDWriteNumberSubstitution : public IUnknown { }; @@ -2511,7 +2511,7 @@ struct DWRITE_SHAPING_GLYPH_PROPERTIES /// stop prematurely and return a callback error. Rather than return E_NOTIMPL, /// an application should stub the method and return a constant/null and S_OK. /// -interface DECLSPEC_UUID("688e1a58-5094-47c8-adc8-fbcea60ae92b") DECLSPEC_NOVTABLE IDWriteTextAnalysisSource : public IUnknown +interface DWRITE_DECLARE_INTERFACE("688e1a58-5094-47c8-adc8-fbcea60ae92b") IDWriteTextAnalysisSource : public IUnknown { /// /// Get a block of text starting at the specified text position. @@ -2620,7 +2620,7 @@ interface DECLSPEC_UUID("688e1a58-5094-47c8-adc8-fbcea60ae92b") DECLSPEC_NOVTABL /// state of the analysis sink, therefore a Set method call on a range /// overwrites the previously set analysis result of the same range. /// -interface DECLSPEC_UUID("5810cd44-0ca0-4701-b3fa-bec5182ae4f6") DECLSPEC_NOVTABLE IDWriteTextAnalysisSink : public IUnknown +interface DWRITE_DECLARE_INTERFACE("5810cd44-0ca0-4701-b3fa-bec5182ae4f6") IDWriteTextAnalysisSink : public IUnknown { /// /// Report script analysis for the text range. diff --git a/minidx12/Include/dwrite_1.h b/minidx12/Include/dwrite_1.h index 0939921337..b12acc1d12 100644 --- a/minidx12/Include/dwrite_1.h +++ b/minidx12/Include/dwrite_1.h @@ -1714,7 +1714,7 @@ interface DWRITE_DECLARE_INTERFACE("80DAD800-E21F-4E83-96CE-BFCCE500DB7C") IDWri /// If any of these callbacks returns an error, the analysis functions will /// stop prematurely and return a callback error. /// -interface DECLSPEC_UUID("{639CFAD8-0FB4-4B21-A58A-067920120009}") DECLSPEC_NOVTABLE IDWriteTextAnalysisSource1 : public IDWriteTextAnalysisSource +interface DWRITE_DECLARE_INTERFACE("639CFAD8-0FB4-4B21-A58A-067920120009") IDWriteTextAnalysisSource1 : public IDWriteTextAnalysisSource { /// /// The text analyzer calls back to this to get the desired glyph @@ -1753,7 +1753,7 @@ interface DECLSPEC_UUID("{639CFAD8-0FB4-4B21-A58A-067920120009}") DECLSPEC_NOVTA /// The interface implemented by the client to receive the /// output of the text analyzers. /// -interface DECLSPEC_UUID("B0D941A0-85E7-4D8B-9FD3-5CED9934482A") DECLSPEC_NOVTABLE IDWriteTextAnalysisSink1 : public IDWriteTextAnalysisSink +interface DWRITE_DECLARE_INTERFACE("B0D941A0-85E7-4D8B-9FD3-5CED9934482A") IDWriteTextAnalysisSink1 : public IDWriteTextAnalysisSink { /// /// The text analyzer calls back to this to report the actual orientation diff --git a/minidx12/Lib/d2d1.lib b/minidx12/Lib/d2d1.lib index e584cf6665..4fd248e8af 100644 Binary files a/minidx12/Lib/d2d1.lib and b/minidx12/Lib/d2d1.lib differ diff --git a/minidx12/Lib/dwrite.lib b/minidx12/Lib/dwrite.lib index 75d18cecbe..d7e9469e95 100644 Binary files a/minidx12/Lib/dwrite.lib and b/minidx12/Lib/dwrite.lib differ diff --git a/minidx12/Lib/dxgi.lib b/minidx12/Lib/dxgi.lib index 8dfdb2dd72..20016c2a9a 100644 Binary files a/minidx12/Lib/dxgi.lib and b/minidx12/Lib/dxgi.lib differ