Rename BltBits and CopyBits. These functions now are not doing the job but just preparing the QXLDrawable structure to be sent to the server. --- qxldod/QxlDod.cpp | 8 ++++---- qxldod/QxlDod.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qxldod/QxlDod.cpp b/qxldod/QxlDod.cpp index 3302a23..6bf7525 100755 --- a/qxldod/QxlDod.cpp +++ b/qxldod/QxlDod.cpp @@ -3901,7 +3901,7 @@ QxlDevice::ExecutePresentDisplayOnly( DbgPrint(TRACE_LEVEL_INFORMATION, ("--- %d SourcePoint.x = %ld, SourcePoint.y = %ld, DestRect.bottom = %ld, DestRect.left = %ld, DestRect.right = %ld, DestRect.top = %ld\n", i , pSourcePoint->x, pSourcePoint->y, pDestRect->bottom, pDestRect->left, pDestRect->right, pDestRect->top)); - pDrawables[nIndex] = CopyBits(*pDestRect, *pSourcePoint); + pDrawables[nIndex] = PrepareCopyBits(*pDestRect, *pSourcePoint); if (pDrawables[nIndex]) nIndex++; } @@ -3917,7 +3917,7 @@ QxlDevice::ExecutePresentDisplayOnly( DbgPrint(TRACE_LEVEL_INFORMATION, ("--- %d pDirtyRect->bottom = %ld, pDirtyRect->left = %ld, pDirtyRect->right = %ld, pDirtyRect->top = %ld\n", i, pDirtyRect->bottom, pDirtyRect->left, pDirtyRect->right, pDirtyRect->top)); - pDrawables[nIndex] = BltBits(&DstBltInfo, + pDrawables[nIndex] = PrepareBltBits(&DstBltInfo, &SrcBltInfo, 1, pDirtyRect, @@ -4350,7 +4350,7 @@ VOID QxlDevice::SetImageId(InternalImage *internal, } } -QXLDrawable *QxlDevice::CopyBits(const RECT& rect, const POINT& sourcePoint) +QXLDrawable *QxlDevice::PrepareCopyBits(const RECT& rect, const POINT& sourcePoint) { PAGED_CODE(); QXLDrawable *drawable; @@ -4370,7 +4370,7 @@ QXLDrawable *QxlDevice::CopyBits(const RECT& rect, const POINT& sourcePoint) return drawable; } -QXLDrawable *QxlDevice::BltBits ( +QXLDrawable *QxlDevice::PrepareBltBits ( BLT_INFO* pDst, CONST BLT_INFO* pSrc, UINT NumRects, diff --git a/qxldod/QxlDod.h b/qxldod/QxlDod.h index f441f4b..45d5691 100755 --- a/qxldod/QxlDod.h +++ b/qxldod/QxlDod.h @@ -495,12 +495,12 @@ public: BOOLEAN IsBIOSCompatible() { return FALSE; } protected: NTSTATUS GetModeList(DXGK_DISPLAY_INFORMATION* pDispInfo); - QXLDrawable *BltBits (BLT_INFO* pDst, + QXLDrawable *PrepareBltBits (BLT_INFO* pDst, CONST BLT_INFO* pSrc, UINT NumRects, _In_reads_(NumRects) CONST RECT *pRects, POINT* pSourcePoint); - QXLDrawable *CopyBits(const RECT& rect, const POINT& sourcePoint); + QXLDrawable *PrepareCopyBits(const RECT& rect, const POINT& sourcePoint); QXLDrawable *Drawable(UINT8 type, CONST RECT *area, CONST RECT *clip, -- 2.9.3 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel