From 028f523ea0ef69f90723d8e5df3e04a110de80be Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 14 Nov 2019 15:10:03 +0100 Subject: [PATCH] rdpBrushCache now opaque --- include/freerdp/cache/brush.h | 26 -------------------------- libfreerdp/cache/brush.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/freerdp/cache/brush.h b/include/freerdp/cache/brush.h index 2c116ec..463e6a9 100644 --- a/include/freerdp/cache/brush.h +++ b/include/freerdp/cache/brush.h @@ -27,36 +27,10 @@ #include -typedef struct _BRUSH_ENTRY BRUSH_ENTRY; typedef struct rdp_brush_cache rdpBrushCache; #include -struct _BRUSH_ENTRY -{ - UINT32 bpp; - void* entry; -}; - -struct rdp_brush_cache -{ - pPatBlt PatBlt; /* 0 */ - pCacheBrush CacheBrush; /* 1 */ - pPolygonSC PolygonSC; /* 2 */ - pPolygonCB PolygonCB; /* 3 */ - UINT32 paddingA[16 - 4]; /* 4 */ - - UINT32 maxEntries; /* 16 */ - UINT32 maxMonoEntries; /* 17 */ - BRUSH_ENTRY* entries; /* 18 */ - BRUSH_ENTRY* monoEntries; /* 19 */ - UINT32 paddingB[32 - 20]; /* 20 */ - - /* internal */ - - rdpSettings* settings; -}; - #ifdef __cplusplus extern "C" { diff --git a/libfreerdp/cache/brush.c b/libfreerdp/cache/brush.c index 6a57e575..0475b26 100644 --- a/libfreerdp/cache/brush.c +++ b/libfreerdp/cache/brush.c @@ -35,6 +35,32 @@ #define TAG FREERDP_TAG("cache.brush") +struct _BRUSH_ENTRY +{ + UINT32 bpp; + void* entry; +}; +typedef struct _BRUSH_ENTRY BRUSH_ENTRY; + +struct rdp_brush_cache +{ + pPatBlt PatBlt; /* 0 */ + pCacheBrush CacheBrush; /* 1 */ + pPolygonSC PolygonSC; /* 2 */ + pPolygonCB PolygonCB; /* 3 */ + UINT32 paddingA[16 - 4]; /* 4 */ + + UINT32 maxEntries; /* 16 */ + UINT32 maxMonoEntries; /* 17 */ + BRUSH_ENTRY* entries; /* 18 */ + BRUSH_ENTRY* monoEntries; /* 19 */ + UINT32 paddingB[32 - 20]; /* 20 */ + + /* internal */ + + rdpSettings* settings; +}; + static BOOL update_gdi_patblt(rdpContext* context, PATBLT_ORDER* patblt) { BYTE style; -- 2.7.4