mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update: aligning data structures to 4 byte

Browse Source
This commit is contained in:
Marc-André Moreau 2011-11-21 22:11:31 -05:00
parent 4ba59d8fcd
commit 0e234de3ae
19 changed files with 374 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
include/freerdp/altsec.h
View File

@ -38,43 +38,43 @@
struct _OFFSCREEN_DELETE_LIST
{
uint16 cIndices;
uint32 cIndices;
uint16* indices;
};
typedef struct _OFFSCREEN_DELETE_LIST OFFSCREEN_DELETE_LIST;
struct _CREATE_OFFSCREEN_BITMAP_ORDER
{
uint16 id;
uint16 cx;
uint16 cy;
uint32 id;
uint32 cx;
uint32 cy;
OFFSCREEN_DELETE_LIST deleteList;
};
typedef struct _CREATE_OFFSCREEN_BITMAP_ORDER CREATE_OFFSCREEN_BITMAP_ORDER;
struct _SWITCH_SURFACE_ORDER
{
uint16 bitmapId;
uint32 bitmapId;
};
typedef struct _SWITCH_SURFACE_ORDER SWITCH_SURFACE_ORDER;
struct _NINE_GRID_BITMAP_INFO
{
uint32 flFlags;
uint16 ulLeftWidth;
uint16 ulRightWidth;
uint16 ulTopHeight;
uint16 ulBottomHeight;
uint32 ulLeftWidth;
uint32 ulRightWidth;
uint32 ulTopHeight;
uint32 ulBottomHeight;
uint32 crTransparent;
};
typedef struct _NINE_GRID_BITMAP_INFO NINE_GRID_BITMAP_INFO;
struct _CREATE_NINE_GRID_BITMAP_ORDER
{
uint8 bitmapBpp;
uint16 bitmapId;
uint16 cx;
uint16 cy;
uint32 bitmapBpp;
uint32 bitmapId;
uint32 cx;
uint32 cy;
NINE_GRID_BITMAP_INFO nineGridInfo;
};
typedef struct _CREATE_NINE_GRID_BITMAP_ORDER CREATE_NINE_GRID_BITMAP_ORDER;
@ -87,29 +87,29 @@ typedef struct _FRAME_MARKER_ORDER FRAME_MARKER_ORDER;
struct _STREAM_BITMAP_FIRST_ORDER
{
uint8 bitmapFlags;
uint8 bitmapBpp;
uint16 bitmapType;
uint16 bitmapWidth;
uint16 bitmapHeight;
uint32 bitmapFlags;
uint32 bitmapBpp;
uint32 bitmapType;
uint32 bitmapWidth;
uint32 bitmapHeight;
uint32 bitmapSize;
uint16 bitmapBlockSize;
uint32 bitmapBlockSize;
uint8* bitmapBlock;
};
typedef struct _STREAM_BITMAP_FIRST_ORDER STREAM_BITMAP_FIRST_ORDER;
struct _STREAM_BITMAP_NEXT_ORDER
{
uint8 bitmapFlags;
uint16 bitmapType;
uint16 bitmapBlockSize;
uint32 bitmapFlags;
uint32 bitmapType;
uint32 bitmapBlockSize;
uint8* bitmapBlock;
};
typedef struct _STREAM_BITMAP_NEXT_ORDER STREAM_BITMAP_NEXT_ORDER;
struct _DRAW_GDIPLUS_FIRST_ORDER
{
uint16 cbSize;
uint32 cbSize;
uint32 cbTotalSize;
uint32 cbTotalEmfSize;
uint8* emfRecords;
@ -118,14 +118,14 @@ typedef struct _DRAW_GDIPLUS_FIRST_ORDER DRAW_GDIPLUS_FIRST_ORDER;
struct _DRAW_GDIPLUS_NEXT_ORDER
{
uint16 cbSize;
uint32 cbSize;
uint8* emfRecords;
};
typedef struct _DRAW_GDIPLUS_NEXT_ORDER DRAW_GDIPLUS_NEXT_ORDER;
struct _DRAW_GDIPLUS_END_ORDER
{
uint16 cbSize;
uint32 cbSize;
uint32 cbTotalSize;
uint32 cbTotalEmfSize;
uint8* emfRecords;
@ -134,10 +134,10 @@ typedef struct _DRAW_GDIPLUS_END_ORDER DRAW_GDIPLUS_END_ORDER;
struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER
{
uint8 flags;
uint16 cacheType;
uint16 cacheIndex;
uint16 cbSize;
uint32 flags;
uint32 cacheType;
uint32 cacheIndex;
uint32 cbSize;
uint32 cbTotalSize;
uint8* emfRecords;
};
@ -145,20 +145,20 @@ typedef struct _DRAW_GDIPLUS_CACHE_FIRST_ORDER DRAW_GDIPLUS_CACHE_FIRST_ORDER;
struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER
{
uint8 flags;
uint16 cacheType;
uint16 cacheIndex;
uint16 cbSize;
uint32 flags;
uint32 cacheType;
uint32 cacheIndex;
uint32 cbSize;
uint8* emfRecords;
};
typedef struct _DRAW_GDIPLUS_CACHE_NEXT_ORDER DRAW_GDIPLUS_CACHE_NEXT_ORDER;
struct _DRAW_GDIPLUS_CACHE_END_ORDER
{
uint8 flags;
uint16 cacheType;
uint16 cacheIndex;
uint16 cbSize;
uint32 flags;
uint32 cacheType;
uint32 cacheIndex;
uint32 cbSize;
uint32 cbTotalSize;
uint8* emfRecords;
};

6
include/freerdp/cache/bitmap.h vendored
View File

@ -48,7 +48,7 @@ struct rdp_bitmap_cache
pBitmapUpdate BitmapUpdate;
uint8 maxCells;
uint32 maxCells;
rdpBitmap* bitmap;
rdpUpdate* update;
rdpContext* context;
@ -58,8 +58,8 @@ struct rdp_bitmap_cache
FREERDP_API void bitmap_free(rdpBitmap* bitmap);
FREERDP_API rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint8 id, uint16 index);
FREERDP_API void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint8 id, uint16 index, rdpBitmap* bitmap);
FREERDP_API rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index);
FREERDP_API void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdpBitmap* bitmap);
FREERDP_API void bitmap_cache_register_callbacks(rdpUpdate* update);

6
include/freerdp/cache/brush.h vendored
View File

@ -33,7 +33,7 @@ typedef struct rdp_brush_cache rdpBrushCache;
struct _BRUSH_ENTRY
{
uint8 bpp;
uint32 bpp;
void* entry;
};
@ -50,8 +50,8 @@ struct rdp_brush_cache
BRUSH_ENTRY* monoEntries;
};
FREERDP_API void* brush_cache_get(rdpBrushCache* brush, uint8 index, uint8* bpp);
FREERDP_API void brush_cache_put(rdpBrushCache* brush, uint8 index, void* entry, uint8 bpp);
FREERDP_API void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp);
FREERDP_API void brush_cache_put(rdpBrushCache* brush, uint32 index, void* entry, uint32 bpp);
FREERDP_API void brush_cache_register_callbacks(rdpUpdate* update);

14
include/freerdp/cache/glyph.h vendored
View File

@ -34,15 +34,15 @@ typedef struct rdp_glyph_cache rdpGlyphCache;
struct _GLYPH_CACHE
{
uint16 number;
uint16 maxCellSize;
uint32 number;
uint32 maxCellSize;
rdpGlyph** entries;
};
struct _FRAGMENT_CACHE_ENTRY
{
void* fragment;
uint16 size;
uint32 size;
};
struct _FRAGMENT_CACHE
@ -58,11 +58,11 @@ struct rdp_glyph_cache
FRAGMENT_CACHE fragCache;
};
FREERDP_API rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint8 id, uint16 index);
FREERDP_API void glyph_cache_put(rdpGlyphCache* glyph_cache, uint8 id, uint16 index, rdpGlyph* entry);
FREERDP_API rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint32 id, uint32 index);
FREERDP_API void glyph_cache_put(rdpGlyphCache* glyph_cache, uint32 id, uint32 index, rdpGlyph* entry);
FREERDP_API void* glyph_cache_fragment_get(rdpGlyphCache* glyph, uint8 index, uint8* count);
FREERDP_API void glyph_cache_fragment_put(rdpGlyphCache* glyph, uint8 index, uint8 count, void* entry);
FREERDP_API void* glyph_cache_fragment_get(rdpGlyphCache* glyph, uint32 index, uint32* count);
FREERDP_API void glyph_cache_fragment_put(rdpGlyphCache* glyph, uint32 index, uint32 count, void* entry);
FREERDP_API void glyph_cache_register_callbacks(rdpUpdate* update);

12
include/freerdp/cache/offscreen.h vendored
View File

@ -32,17 +32,17 @@ typedef struct rdp_offscreen_cache rdpOffscreenCache;
struct rdp_offscreen_cache
{
uint16 currentSurface;
uint16 maxSize;
uint16 maxEntries;
uint32 currentSurface;
uint32 maxSize;
uint32 maxEntries;
rdpUpdate* update;
rdpSettings* settings;
rdpBitmap** entries;
};
FREERDP_API rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint16 index);
FREERDP_API void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, uint16 index, rdpBitmap* bitmap);
FREERDP_API void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint16 index);
FREERDP_API rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index);
FREERDP_API void offscreen_cache_put(rdpOffscreenCache* offscreen_cache, uint32 index, rdpBitmap* bitmap);
FREERDP_API void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint32 index);
FREERDP_API void offscreen_cache_register_callbacks(rdpUpdate* update);

6
include/freerdp/cache/palette.h vendored
View File

@ -38,13 +38,13 @@ struct _PALETTE_TABLE_ENTRY
struct rdp_palette_cache
{
uint8 maxEntries;
uint32 maxEntries;
rdpSettings* settings;
PALETTE_TABLE_ENTRY* entries;
};
FREERDP_API void* palette_cache_get(rdpPaletteCache* palette, uint8 index);
FREERDP_API void palette_cache_put(rdpPaletteCache* palette, uint8 index, void* entry);
FREERDP_API void* palette_cache_get(rdpPaletteCache* palette, uint32 index);
FREERDP_API void palette_cache_put(rdpPaletteCache* palette, uint32 index, void* entry);
FREERDP_API void palette_cache_register_callbacks(rdpUpdate* update);

6
include/freerdp/cache/pointer.h vendored
View File

@ -33,14 +33,14 @@ typedef struct rdp_pointer_cache rdpPointerCache;
struct rdp_pointer_cache
{
uint16 cacheSize;
uint32 cacheSize;
rdpUpdate* update;
rdpSettings* settings;
rdpPointer** entries;
};
FREERDP_API rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint16 index);
FREERDP_API void pointer_cache_put(rdpPointerCache* pointer_cache, uint16 index, rdpPointer* pointer);
FREERDP_API rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint32 index);
FREERDP_API void pointer_cache_put(rdpPointerCache* pointer_cache, uint32 index, rdpPointer* pointer);
FREERDP_API void pointer_cache_register_callbacks(rdpUpdate* update);

22
include/freerdp/pointer.h
View File

@ -33,8 +33,8 @@
struct _POINTER_POSITION_UPDATE
{
uint16 xPos;
uint16 yPos;
uint32 xPos;
uint32 yPos;
};
typedef struct _POINTER_POSITION_UPDATE POINTER_POSITION_UPDATE;
@ -46,13 +46,13 @@ typedef struct _POINTER_SYSTEM_UPDATE POINTER_SYSTEM_UPDATE;
struct _POINTER_COLOR_UPDATE
{
uint16 cacheIndex;
uint16 xPos;
uint16 yPos;
uint16 width;
uint16 height;
uint16 lengthAndMask;
uint16 lengthXorMask;
uint32 cacheIndex;
uint32 xPos;
uint32 yPos;
uint32 width;
uint32 height;
uint32 lengthAndMask;
uint32 lengthXorMask;
uint8* xorMaskData;
uint8* andMaskData;
};
@ -60,14 +60,14 @@ typedef struct _POINTER_COLOR_UPDATE POINTER_COLOR_UPDATE;
struct _POINTER_NEW_UPDATE
{
uint16 xorBpp;
uint32 xorBpp;
POINTER_COLOR_UPDATE colorPtrAttr;
};
typedef struct _POINTER_NEW_UPDATE POINTER_NEW_UPDATE;
struct _POINTER_CACHED_UPDATE
{
uint16 cacheIndex;
uint32 cacheIndex;
};
typedef struct _POINTER_CACHED_UPDATE POINTER_CACHED_UPDATE;

388
include/freerdp/primary.h
View File

@ -24,21 +24,21 @@
struct rdp_bounds
{
sint16 left;
sint16 top;
sint16 right;
sint16 bottom;
sint32 left;
sint32 top;
sint32 right;
sint32 bottom;
};
typedef struct rdp_bounds rdpBounds;
struct rdp_brush
{
uint8 x;
uint8 y;
uint8 bpp;
uint8 style;
uint8 hatch;
uint8 index;
uint32 x;
uint32 y;
uint32 bpp;
uint32 style;
uint32 hatch;
uint32 index;
uint8* data;
uint8 p8x8[8];
};
@ -46,34 +46,34 @@ typedef struct rdp_brush rdpBrush;
struct _ORDER_INFO
{
uint8 orderType;
uint32 orderType;
uint32 fieldFlags;
rdpBounds bounds;
sint8 deltaBoundLeft;
sint8 deltaBoundTop;
sint8 deltaBoundRight;
sint8 deltaBoundBottom;
sint32 deltaBoundLeft;
sint32 deltaBoundTop;
sint32 deltaBoundRight;
sint32 deltaBoundBottom;
boolean deltaCoordinates;
};
typedef struct _ORDER_INFO ORDER_INFO;
struct _DSTBLT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
};
typedef struct _DSTBLT_ORDER DSTBLT_ORDER;
struct _PATBLT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
uint32 backColor;
uint32 foreColor;
rdpBrush brush;
@ -82,180 +82,180 @@ typedef struct _PATBLT_ORDER PATBLT_ORDER;
struct _SCRBLT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
sint16 nXSrc;
sint16 nYSrc;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
sint32 nXSrc;
sint32 nYSrc;
};
typedef struct _SCRBLT_ORDER SCRBLT_ORDER;
struct _OPAQUE_RECT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 color;
};
typedef struct _OPAQUE_RECT_ORDER OPAQUE_RECT_ORDER;
struct _DRAW_NINE_GRID_ORDER
{
sint16 srcLeft;
sint16 srcTop;
sint16 srcRight;
sint16 srcBottom;
uint16 bitmapId;
sint32 srcLeft;
sint32 srcTop;
sint32 srcRight;
sint32 srcBottom;
uint32 bitmapId;
};
typedef struct _DRAW_NINE_GRID_ORDER DRAW_NINE_GRID_ORDER;
struct _DELTA_RECT
{
sint16 left;
sint16 top;
sint16 width;
sint16 height;
sint32 left;
sint32 top;
sint32 width;
sint32 height;
};
typedef struct _DELTA_RECT DELTA_RECT;
struct _MULTI_DSTBLT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
uint8 numRectangles;
uint16 cbData;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
uint32 numRectangles;
uint32 cbData;
DELTA_RECT rectangles[45];
};
typedef struct _MULTI_DSTBLT_ORDER MULTI_DSTBLT_ORDER;
struct _MULTI_PATBLT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
uint32 backColor;
uint32 foreColor;
rdpBrush brush;
uint8 numRectangles;
uint16 cbData;
uint32 numRectangles;
uint32 cbData;
DELTA_RECT rectangles[45];
};
typedef struct _MULTI_PATBLT_ORDER MULTI_PATBLT_ORDER;
struct _MULTI_SCRBLT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
sint16 nXSrc;
sint16 nYSrc;
uint8 numRectangles;
uint16 cbData;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
sint32 nXSrc;
sint32 nYSrc;
uint32 numRectangles;
uint32 cbData;
DELTA_RECT rectangles[45];
};
typedef struct _MULTI_SCRBLT_ORDER MULTI_SCRBLT_ORDER;
struct _MULTI_OPAQUE_RECT_ORDER
{
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 color;
uint8 numRectangles;
uint16 cbData;
uint32 numRectangles;
uint32 cbData;
DELTA_RECT rectangles[45];
};
typedef struct _MULTI_OPAQUE_RECT_ORDER MULTI_OPAQUE_RECT_ORDER;
struct _MULTI_DRAW_NINE_GRID_ORDER
{
sint16 srcLeft;
sint16 srcTop;
sint16 srcRight;
sint16 srcBottom;
uint16 bitmapId;
uint8 nDeltaEntries;
uint16 cbData;
sint32 srcLeft;
sint32 srcTop;
sint32 srcRight;
sint32 srcBottom;
uint32 bitmapId;
uint32 nDeltaEntries;
uint32 cbData;
uint8* codeDeltaList;
};
typedef struct _MULTI_DRAW_NINE_GRID_ORDER MULTI_DRAW_NINE_GRID_ORDER;
struct _LINE_TO_ORDER
{
uint16 backMode;
sint16 nXStart;
sint16 nYStart;
sint16 nXEnd;
sint16 nYEnd;
uint32 backMode;
sint32 nXStart;
sint32 nYStart;
sint32 nXEnd;
sint32 nYEnd;
uint32 backColor;
uint8 bRop2;
uint8 penStyle;
uint8 penWidth;
uint32 bRop2;
uint32 penStyle;
uint32 penWidth;
uint32 penColor;
};
typedef struct _LINE_TO_ORDER LINE_TO_ORDER;
struct _DELTA_POINT
{
sint16 x;
sint16 y;
sint32 x;
sint32 y;
};
typedef struct _DELTA_POINT DELTA_POINT;
struct _POLYLINE_ORDER
{
sint16 xStart;
sint16 yStart;
uint8 bRop2;
sint32 xStart;
sint32 yStart;
uint32 bRop2;
uint32 penColor;
uint8 numPoints;
uint8 cbData;
uint32 numPoints;
uint32 cbData;
DELTA_POINT* points;
};
typedef struct _POLYLINE_ORDER POLYLINE_ORDER;
struct _MEMBLT_ORDER
{
uint16 cacheId;
uint8 colorIndex;
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
sint16 nXSrc;
sint16 nYSrc;
uint16 cacheIndex;
uint32 cacheId;
uint32 colorIndex;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
sint32 nXSrc;
sint32 nYSrc;
uint32 cacheIndex;
rdpBitmap* bitmap;
};
typedef struct _MEMBLT_ORDER MEMBLT_ORDER;
struct _MEM3BLT_ORDER
{
uint16 cacheId;
uint8 colorIndex;
sint16 nLeftRect;
sint16 nTopRect;
sint16 nWidth;
sint16 nHeight;
uint8 bRop;
sint16 nXSrc;
sint16 nYSrc;
uint32 cacheId;
uint32 colorIndex;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nWidth;
sint32 nHeight;
uint32 bRop;
sint32 nXSrc;
sint32 nYSrc;
uint32 backColor;
uint32 foreColor;
rdpBrush brush;
uint16 cacheIndex;
uint32 cacheIndex;
rdpBitmap* bitmap;
};
typedef struct _MEM3BLT_ORDER MEM3BLT_ORDER;
@ -263,148 +263,148 @@ typedef struct _MEM3BLT_ORDER MEM3BLT_ORDER;
struct _SAVE_BITMAP_ORDER
{
uint32 savedBitmapPosition;
sint16 nLeftRect;
sint16 nTopRect;
sint16 nRightRect;
sint16 nBottomRect;
uint8 operation;
sint32 nLeftRect;
sint32 nTopRect;
sint32 nRightRect;
sint32 nBottomRect;
uint32 operation;
};
typedef struct _SAVE_BITMAP_ORDER SAVE_BITMAP_ORDER;
struct _GLYPH_FRAGMENT_INDEX
{
uint8 index;
uint16 delta;
uint32 index;
uint32 delta;
};
typedef struct _GLYPH_FRAGMENT_INDEX GLYPH_FRAGMENT_INDEX;
struct _GLYPH_FRAGMENT
{
uint8 operation;
uint8 index;
uint8 size;
uint8 nindices;
uint32 operation;
uint32 index;
uint32 size;
uint32 nindices;
GLYPH_FRAGMENT_INDEX* indices;
};
typedef struct _GLYPH_FRAGMENT GLYPH_FRAGMENT;
struct _GLYPH_INDEX_ORDER
{
uint8 cacheId;
uint8 flAccel;
uint8 ulCharInc;
uint8 fOpRedundant;
uint32 cacheId;
uint32 flAccel;
uint32 ulCharInc;
uint32 fOpRedundant;
uint32 backColor;
uint32 foreColor;
sint16 bkLeft;
sint16 bkTop;
sint16 bkRight;
sint16 bkBottom;
sint16 opLeft;
sint16 opTop;
sint16 opRight;
sint16 opBottom;
sint32 bkLeft;
sint32 bkTop;
sint32 bkRight;
sint32 bkBottom;
sint32 opLeft;
sint32 opTop;
sint32 opRight;
sint32 opBottom;
rdpBrush brush;
sint16 x;
sint16 y;
uint8 cbData;
sint32 x;
sint32 y;
uint32 cbData;
uint8* data;
};
typedef struct _GLYPH_INDEX_ORDER GLYPH_INDEX_ORDER;
struct _FAST_INDEX_ORDER
{
uint8 cacheId;
uint8 flAccel;
uint8 ulCharInc;
uint32 cacheId;
uint32 flAccel;
uint32 ulCharInc;
uint32 backColor;
uint32 foreColor;
sint16 bkLeft;
sint16 bkTop;
sint16 bkRight;
sint16 bkBottom;
sint16 opLeft;
sint16 opTop;
sint16 opRight;
sint16 opBottom;
sint32 bkLeft;
sint32 bkTop;
sint32 bkRight;
sint32 bkBottom;
sint32 opLeft;
sint32 opTop;
sint32 opRight;
sint32 opBottom;
boolean opaqueRect;
sint16 x;
sint16 y;
uint8 cbData;
sint32 x;
sint32 y;
uint32 cbData;
uint8* data;
};
typedef struct _FAST_INDEX_ORDER FAST_INDEX_ORDER;
struct _FAST_GLYPH_ORDER
{
uint8 cacheId;
uint8 flAccel;
uint8 ulCharInc;
uint32 cacheId;
uint32 flAccel;
uint32 ulCharInc;
uint32 backColor;
uint32 foreColor;
sint16 bkLeft;
sint16 bkTop;
sint16 bkRight;
sint16 bkBottom;
sint16 opLeft;
sint16 opTop;
sint16 opRight;
sint16 opBottom;
sint16 x;
sint16 y;
uint8 cbData;
sint32 bkLeft;
sint32 bkTop;
sint32 bkRight;
sint32 bkBottom;
sint32 opLeft;
sint32 opTop;
sint32 opRight;
sint32 opBottom;
sint32 x;
sint32 y;
uint32 cbData;
uint8* data;
};
typedef struct _FAST_GLYPH_ORDER FAST_GLYPH_ORDER;
struct _POLYGON_SC_ORDER
{
sint16 xStart;
sint16 yStart;
uint8 bRop2;
uint8 fillMode;
sint32 xStart;
sint32 yStart;
uint32 bRop2;
uint32 fillMode;
uint32 brushColor;
uint8 nDeltaEntries;
uint8 cbData;
uint32 nDeltaEntries;
uint32 cbData;
uint8* codeDeltaList;
};
typedef struct _POLYGON_SC_ORDER POLYGON_SC_ORDER;
struct _POLYGON_CB_ORDER
{
sint16 xStart;
sint16 yStart;
uint8 bRop2;
uint8 fillMode;
sint32 xStart;
sint32 yStart;
uint32 bRop2;
uint32 fillMode;
uint32 backColor;
uint32 foreColor;
rdpBrush brush;
uint8 nDeltaEntries;
uint8 cbData;
uint32 nDeltaEntries;
uint32 cbData;
uint8* codeDeltaList;
};
typedef struct _POLYGON_CB_ORDER POLYGON_CB_ORDER;
struct _ELLIPSE_SC_ORDER
{
sint16 leftRect;
sint16 topRect;
sint16 rightRect;
sint16 bottomRect;
uint8 bRop2;
uint8 fillMode;
sint32 leftRect;
sint32 topRect;
sint32 rightRect;
sint32 bottomRect;
uint32 bRop2;
uint32 fillMode;
uint32 color;
};
typedef struct _ELLIPSE_SC_ORDER ELLIPSE_SC_ORDER;
struct _ELLIPSE_CB_ORDER
{
sint16 leftRect;
sint16 topRect;
sint16 rightRect;
sint16 bottomRect;
uint8 bRop2;
uint8 fillMode;
sint32 leftRect;
sint32 topRect;
sint32 rightRect;
sint32 bottomRect;
uint32 bRop2;
uint32 fillMode;
uint32 backColor;
uint32 foreColor;
rdpBrush brush;

90
include/freerdp/secondary.h
View File

@ -66,12 +66,12 @@
struct _CACHE_BITMAP_ORDER
{
uint8 cacheId;
uint8 bitmapBpp;
uint8 bitmapWidth;
uint8 bitmapHeight;
uint16 bitmapLength;
uint16 cacheIndex;
uint32 cacheId;
uint32 bitmapBpp;
uint32 bitmapWidth;
uint32 bitmapHeight;
uint32 bitmapLength;
uint32 cacheIndex;
uint8 bitmapComprHdr[8];
uint8* bitmapDataStream;
};
@ -79,15 +79,15 @@ typedef struct _CACHE_BITMAP_ORDER CACHE_BITMAP_ORDER;
struct _CACHE_BITMAP_V2_ORDER
{
uint8 cacheId;
uint16 flags;
uint32 cacheId;
uint32 flags;
uint32 key1;
uint32 key2;
uint8 bitmapBpp;
uint16 bitmapWidth;
uint16 bitmapHeight;
uint32 bitmapBpp;
uint32 bitmapWidth;
uint32 bitmapHeight;
uint32 bitmapLength;
uint16 cacheIndex;
uint32 cacheIndex;
boolean compressed;
uint8 bitmapComprHdr[8];
uint8* bitmapDataStream;
@ -96,10 +96,10 @@ typedef struct _CACHE_BITMAP_V2_ORDER CACHE_BITMAP_V2_ORDER;
struct _BITMAP_DATA_EX
{
uint8 bpp;
uint8 codecID;
uint16 width;
uint16 height;
uint32 bpp;
uint32 codecID;
uint32 width;
uint32 height;
uint32 length;
uint8* data;
};
@ -107,10 +107,10 @@ typedef struct _BITMAP_DATA_EX BITMAP_DATA_EX;
struct _CACHE_BITMAP_V3_ORDER
{
uint8 cacheId;
uint8 bpp;
uint16 flags;
uint16 cacheIndex;
uint32 cacheId;
uint32 bpp;
uint32 flags;
uint32 cacheIndex;
uint32 key1;
uint32 key2;
BITMAP_DATA_EX bitmapData;
@ -119,28 +119,28 @@ typedef struct _CACHE_BITMAP_V3_ORDER CACHE_BITMAP_V3_ORDER;
struct _CACHE_COLOR_TABLE_ORDER
{
uint8 cacheIndex;
uint16 numberColors;
uint32 cacheIndex;
uint32 numberColors;
uint32* colorTable;
};
typedef struct _CACHE_COLOR_TABLE_ORDER CACHE_COLOR_TABLE_ORDER;
struct _GLYPH_DATA
{
uint16 cacheIndex;
sint16 x;
sint16 y;
uint16 cx;
uint16 cy;
uint16 cb;
uint32 cacheIndex;
sint32 x;
sint32 y;
uint32 cx;
uint32 cy;
uint32 cb;
uint8* aj;
};
typedef struct _GLYPH_DATA GLYPH_DATA;
struct _CACHE_GLYPH_ORDER
{
uint8 cacheId;
uint8 cGlyphs;
uint32 cacheId;
uint32 cGlyphs;
GLYPH_DATA* glyphData[255];
uint8* unicodeCharacters;
};
@ -148,21 +148,21 @@ typedef struct _CACHE_GLYPH_ORDER CACHE_GLYPH_ORDER;
struct _GLYPH_DATA_V2
{
uint8 cacheIndex;
sint16 x;
sint16 y;
uint16 cx;
uint16 cy;
uint16 cb;
uint32 cacheIndex;
sint32 x;
sint32 y;
uint32 cx;
uint32 cy;
uint32 cb;
uint8* aj;
};
typedef struct _GLYPH_DATA_V2 GLYPH_DATA_V2;
struct _CACHE_GLYPH_V2_ORDER
{
uint8 cacheId;
uint8 flags;
uint8 cGlyphs;
uint32 cacheId;
uint32 flags;
uint32 cGlyphs;
GLYPH_DATA_V2* glyphData[255];
uint8* unicodeCharacters;
};
@ -170,12 +170,12 @@ typedef struct _CACHE_GLYPH_V2_ORDER CACHE_GLYPH_V2_ORDER;
struct _CACHE_BRUSH_ORDER
{
uint8 index;
uint8 bpp;
uint8 cx;
uint8 cy;
uint8 style;
uint8 length;
uint32 index;
uint32 bpp;
uint32 cx;
uint32 cy;
uint32 style;
uint32 length;
uint8* data;
};
typedef struct _CACHE_BRUSH_ORDER CACHE_BRUSH_ORDER;

44
include/freerdp/update.h
View File

@ -39,15 +39,15 @@ typedef struct rdp_update rdpUpdate;
struct _BITMAP_DATA
{
uint16 destLeft;
uint16 destTop;
uint16 destRight;
uint16 destBottom;
uint16 width;
uint16 height;
uint16 bitsPerPixel;
uint16 flags;
uint16 bitmapLength;
uint32 destLeft;
uint32 destTop;
uint32 destRight;
uint32 destBottom;
uint32 width;
uint32 height;
uint32 bitsPerPixel;
uint32 flags;
uint32 bitmapLength;
uint8 bitmapComprHdr[8];
uint8* bitmapDataStream;
boolean compressed;
@ -56,8 +56,8 @@ typedef struct _BITMAP_DATA BITMAP_DATA;
struct _BITMAP_UPDATE
{
uint16 count;
uint16 number;
uint32 count;
uint32 number;
BITMAP_DATA* rectangles;
};
typedef struct _BITMAP_UPDATE BITMAP_UPDATE;
@ -81,7 +81,7 @@ typedef struct _PALETTE_UPDATE PALETTE_UPDATE;
struct rdp_palette
{
uint16 count;
uint32 count;
PALETTE_ENTRY* entries;
};
typedef struct rdp_palette rdpPalette;
@ -99,15 +99,15 @@ typedef struct _PLAY_SOUND_UPDATE PLAY_SOUND_UPDATE;
struct _SURFACE_BITS_COMMAND
{
uint16 cmdType;
uint16 destLeft;
uint16 destTop;
uint16 destRight;
uint16 destBottom;
uint8 bpp;
uint8 codecID;
uint16 width;
uint16 height;
uint32 cmdType;
uint32 destLeft;
uint32 destTop;
uint32 destRight;
uint32 destBottom;
uint32 bpp;
uint32 codecID;
uint32 width;
uint32 height;
uint32 bitmapDataLength;
uint8* bitmapData;
};
@ -159,7 +159,7 @@ struct rdp_update
pSurfaceCommand SurfaceCommand; /* 64 */
pSurfaceBits SurfaceBits; /* 65 */
uint32 paddingF[80 - 66]; /* 66 */
uint32 paddingE[80 - 66]; /* 66 */
/* internal */

30
include/freerdp/window.h
View File

@ -130,14 +130,14 @@ typedef struct _WINDOW_ORDER_INFO WINDOW_ORDER_INFO;
struct _ICON_INFO
{
uint16 cacheEntry;
uint8 cacheId;
uint8 bpp;
uint16 width;
uint16 height;
uint16 cbColorTable;
uint16 cbBitsMask;
uint16 cbBitsColor;
uint32 cacheEntry;
uint32 cacheId;
uint32 bpp;
uint32 width;
uint32 height;
uint32 cbColorTable;
uint32 cbBitsMask;
uint32 cbBitsColor;
uint8* bitsMask;
uint8* colorTable;
uint8* bitsColor;
@ -146,8 +146,8 @@ typedef struct _ICON_INFO ICON_INFO;
struct _CACHED_ICON_INFO
{
uint16 cacheEntry;
uint8 cacheId;
uint32 cacheEntry;
uint32 cacheId;
};
typedef struct _CACHED_ICON_INFO CACHED_ICON_INFO;
@ -165,13 +165,13 @@ struct _WINDOW_STATE_ORDER
uint32 ownerWindowId;
uint32 style;
uint32 extendedStyle;
uint8 showState;
uint32 showState;
UNICODE_STRING titleInfo;
uint32 clientOffsetX;
uint32 clientOffsetY;
uint32 clientAreaWidth;
uint32 clientAreaHeight;
uint8 RPContent;
uint32 RPContent;
uint32 rootParentHandle;
uint32 windowOffsetX;
uint32 windowOffsetY;
@ -179,11 +179,11 @@ struct _WINDOW_STATE_ORDER
uint32 windowClientDeltaY;
uint32 windowWidth;
uint32 windowHeight;
uint16 numWindowRects;
uint32 numWindowRects;
RECTANGLE_16* windowRects;
uint32 visibleOffsetX;
uint32 visibleOffsetY;
uint16 numVisibilityRects;
uint32 numVisibilityRects;
RECTANGLE_16* visibilityRects;
};
typedef struct _WINDOW_STATE_ORDER WINDOW_STATE_ORDER;
@ -214,7 +214,7 @@ typedef struct _NOTIFY_ICON_STATE_ORDER NOTIFY_ICON_STATE_ORDER;
struct _MONITORED_DESKTOP_ORDER
{
uint32 activeWindowId;
uint8 numWindowIds;
uint32 numWindowIds;
uint32* windowIds;
};
typedef struct _MONITORED_DESKTOP_ORDER MONITORED_DESKTOP_ORDER;

4
libfreerdp-cache/bitmap.c
View File

@ -126,7 +126,7 @@ void update_gdi_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmap_update)
}
}
rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint8 id, uint16 index)
rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index)
{
rdpBitmap* bitmap;
@ -150,7 +150,7 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint8 id, uint16 index
return bitmap;
}
void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint8 id, uint16 index, rdpBitmap* bitmap)
void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdpBitmap* bitmap)
{
if (id > bitmap_cache->maxCells)
{

4
libfreerdp-cache/brush.c
View File

@ -44,7 +44,7 @@ void update_gdi_cache_brush(rdpContext* context, CACHE_BRUSH_ORDER* cache_brush)
brush_cache_put(cache->brush, cache_brush->index, cache_brush->data, cache_brush->bpp);
}
void* brush_cache_get(rdpBrushCache* brush, uint8 index, uint8* bpp)
void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp)
{
void* entry;
@ -80,7 +80,7 @@ void* brush_cache_get(rdpBrushCache* brush, uint8 index, uint8* bpp)
return entry;
}
void brush_cache_put(rdpBrushCache* brush, uint8 index, void* entry, uint8 bpp)
void brush_cache_put(rdpBrushCache* brush, uint32 index, void* entry, uint32 bpp)
{
if (bpp == 1)
{

20
libfreerdp-cache/glyph.c
View File

@ -24,11 +24,11 @@
#include <freerdp/cache/glyph.h>
void update_process_glyph(rdpContext* context, uint8* data, int* index,
int* x, int* y, uint8 cacheId, uint8 ulCharInc, uint8 flAccel)
int* x, int* y, uint32 cacheId, uint32 ulCharInc, uint32 flAccel)
{
int offset;
rdpGlyph* glyph;
uint8 cacheIndex;
uint32 cacheIndex;
rdpGraphics* graphics;
rdpGlyphCache* glyph_cache;
@ -65,13 +65,13 @@ void update_process_glyph(rdpContext* context, uint8* data, int* index,
}
}
void update_process_glyph_fragments(rdpContext* context, uint8* data, uint8 length,
uint8 cacheId, uint8 ulCharInc, uint8 flAccel, uint32 bgcolor, uint32 fgcolor, int x, int y,
void update_process_glyph_fragments(rdpContext* context, uint8* data, uint32 length,
uint32 cacheId, uint32 ulCharInc, uint32 flAccel, uint32 bgcolor, uint32 fgcolor, int x, int y,
int bkX, int bkY, int bkWidth, int bkHeight, int opX, int opY, int opWidth, int opHeight)
{
int n;
uint8 id;
uint8 size;
uint32 id;
uint32 size;
int index = 0;
uint8* fragments;
rdpGraphics* graphics;
@ -218,7 +218,7 @@ void update_gdi_cache_glyph_v2(rdpContext* context, CACHE_GLYPH_V2_ORDER* cache_
}
rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint8 id, uint16 index)
rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint32 id, uint32 index)
{
rdpGlyph* glyph;
@ -244,7 +244,7 @@ rdpGlyph* glyph_cache_get(rdpGlyphCache* glyph_cache, uint8 id, uint16 index)
return glyph;
}
void glyph_cache_put(rdpGlyphCache* glyph_cache, uint8 id, uint16 index, rdpGlyph* glyph)
void glyph_cache_put(rdpGlyphCache* glyph_cache, uint32 id, uint32 index, rdpGlyph* glyph)
{
rdpGlyph* prevGlyph;
@ -272,7 +272,7 @@ void glyph_cache_put(rdpGlyphCache* glyph_cache, uint8 id, uint16 index, rdpGlyp
glyph_cache->glyphCache[id].entries[index] = glyph;
}
void* glyph_cache_fragment_get(rdpGlyphCache* glyph_cache, uint8 index, uint8* size)
void* glyph_cache_fragment_get(rdpGlyphCache* glyph_cache, uint32 index, uint32* size)
{
void* fragment;
@ -287,7 +287,7 @@ void* glyph_cache_fragment_get(rdpGlyphCache* glyph_cache, uint8 index, uint8* s
return fragment;
}
void glyph_cache_fragment_put(rdpGlyphCache* glyph_cache, uint8 index, uint8 size, void* fragment)
void glyph_cache_fragment_put(rdpGlyphCache* glyph_cache, uint32 index, uint32 size, void* fragment)
{
void* prevFragment;

6
libfreerdp-cache/offscreen.c
View File

@ -67,7 +67,7 @@ void update_gdi_switch_surface(rdpContext* context, SWITCH_SURFACE_ORDER* switch
cache->offscreen->currentSurface = switch_surface->bitmapId;
}
rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint16 index)
rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index)
{
rdpBitmap* bitmap;
@ -88,7 +88,7 @@ rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint16 index)
return bitmap;
}
void offscreen_cache_put(rdpOffscreenCache* offscreen, uint16 index, rdpBitmap* bitmap)
void offscreen_cache_put(rdpOffscreenCache* offscreen, uint32 index, rdpBitmap* bitmap)
{
if (index > offscreen->maxEntries)
{
@ -100,7 +100,7 @@ void offscreen_cache_put(rdpOffscreenCache* offscreen, uint16 index, rdpBitmap*
offscreen->entries[index] = bitmap;
}
void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint16 index)
void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint32 index)
{
rdpBitmap* prevBitmap;

4
libfreerdp-cache/palette.c
View File

@ -28,7 +28,7 @@ void update_gdi_cache_color_table(rdpContext* context, CACHE_COLOR_TABLE_ORDER*
palette_cache_put(cache->palette, cache_color_table->cacheIndex, (void*) cache_color_table->colorTable);
}
void* palette_cache_get(rdpPaletteCache* palette_cache, uint8 index)
void* palette_cache_get(rdpPaletteCache* palette_cache, uint32 index)
{
void* entry;
@ -49,7 +49,7 @@ void* palette_cache_get(rdpPaletteCache* palette_cache, uint8 index)
return entry;
}
void palette_cache_put(rdpPaletteCache* palette_cache, uint8 index, void* entry)
void palette_cache_put(rdpPaletteCache* palette_cache, uint32 index, void* entry)
{
if (index > palette_cache->maxEntries)
{

4
libfreerdp-cache/pointer.c
View File

@ -71,7 +71,7 @@ void update_pointer_cached(rdpContext* context, POINTER_CACHED_UPDATE* pointer_c
Pointer_Set(context, pointer);
}
rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint16 index)
rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint32 index)
{
rdpPointer* pointer;
@ -86,7 +86,7 @@ rdpPointer* pointer_cache_get(rdpPointerCache* pointer_cache, uint16 index)
return pointer;
}
void pointer_cache_put(rdpPointerCache* pointer_cache, uint16 index, rdpPointer* pointer)
void pointer_cache_put(rdpPointerCache* pointer_cache, uint32 index, rdpPointer* pointer)
{
if (index >= pointer_cache->cacheSize)
{

8
libfreerdp-core/orders.c
View File

@ -134,7 +134,7 @@ uint8 BMF_BPP[] =
0, 1, 0, 8, 16, 24, 32
};
INLINE void update_read_coord(STREAM* s, sint16* coord, boolean delta)
INLINE void update_read_coord(STREAM* s, sint32* coord, boolean delta)
{
sint8 byte;
@ -187,7 +187,7 @@ INLINE void update_read_color_quad(STREAM* s, uint32* color)
stream_seek_uint8(s);
}
INLINE void update_read_2byte_unsigned(STREAM* s, uint16* value)
INLINE void update_read_2byte_unsigned(STREAM* s, uint32* value)
{
uint8 byte;
@ -205,7 +205,7 @@ INLINE void update_read_2byte_unsigned(STREAM* s, uint16* value)
}
}
INLINE void update_read_2byte_signed(STREAM* s, sint16* value)
INLINE void update_read_2byte_signed(STREAM* s, sint32* value)
{
uint8 byte;
boolean negative;
@ -270,7 +270,7 @@ INLINE void update_read_4byte_unsigned(STREAM* s, uint32* value)
}
}
INLINE void update_read_delta(STREAM* s, sint16* value)
INLINE void update_read_delta(STREAM* s, sint32* value)
{
uint8 byte;