github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

freerdp: fix offsets in padding

Browse Source
This commit is contained in:
Marc-André Moreau 2011-11-19 11:18:45 -05:00
parent 666fbb0405
commit 300fe32eba
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/freerdp/freerdp.h
View File

@ -58,11 +58,11 @@ struct rdp_context
{ {
freerdp* instance; freerdp* instance;
freerdp_peer* peer; freerdp_peer* peer;
uint32 paddingA[16 - 2]; /* offset 16 */ uint32 paddingA[16 - 2]; /* offset 64 */
int argc; int argc;
char** argv; char** argv;
uint32 paddingB[16 - 2]; /* offset 32 */ uint32 paddingB[16 - 2]; /* offset 128 */
rdpRdp* rdp; rdpRdp* rdp;
rdpGdi* gdi; rdpGdi* gdi;
@ -70,33 +70,33 @@ struct rdp_context
rdpCache* cache; rdpCache* cache;
rdpChannels* channels; rdpChannels* channels;
rdpGraphics* graphics; rdpGraphics* graphics;
uint32 paddingC[32 - 6]; /* offset 64 */ uint32 paddingC[32 - 6]; /* offset 256 */
}; };
struct rdp_freerdp struct rdp_freerdp
{ {
rdpContext* context; rdpContext* context;
uint32 paddingA[16 - 1]; /* offset 16 */ uint32 paddingA[16 - 1]; /* offset 64 */
rdpInput* input; rdpInput* input;
rdpUpdate* update; rdpUpdate* update;
rdpSettings* settings; rdpSettings* settings;
uint32 paddingB[16 - 3]; /* offset 32 */ uint32 paddingB[16 - 3]; /* offset 128 */
size_t context_size; size_t context_size;
pContextNew ContextNew; pContextNew ContextNew;
pContextFree ContextFree; pContextFree ContextFree;
uint32 paddingC[16 - 3]; /* offset 48 */ uint32 paddingC[16 - 3]; /* offset 192 */
pPreConnect PreConnect; pPreConnect PreConnect;
pPostConnect PostConnect; pPostConnect PostConnect;
pAuthenticate Authenticate; pAuthenticate Authenticate;
pVerifyCertificate VerifyCertificate; pVerifyCertificate VerifyCertificate;
uint32 paddingD[16 - 4]; /* offset 64 */ uint32 paddingD[16 - 4]; /* offset 256 */
pSendChannelData SendChannelData; pSendChannelData SendChannelData;
pReceiveChannelData ReceiveChannelData; pReceiveChannelData ReceiveChannelData;
uint32 paddingE[16 - 2]; /* offset 80 */ uint32 paddingE[16 - 2]; /* offset 320 */
}; };
FREERDP_API void freerdp_context_new(freerdp* instance); FREERDP_API void freerdp_context_new(freerdp* instance);

16
include/freerdp/graphics.h
View File

@ -46,7 +46,7 @@ struct rdp_bitmap
pBitmap_Paint Paint; pBitmap_Paint Paint;
pBitmap_Decompress Decompress; pBitmap_Decompress Decompress;
pBitmap_SetSurface SetSurface; pBitmap_SetSurface SetSurface;
uint32 paddingA[16 - 6]; /* offset 16 */ uint32 paddingA[16 - 6]; /* offset 64 */
uint32 left; uint32 left;
uint32 top; uint32 top;
@ -58,11 +58,11 @@ struct rdp_bitmap
uint32 flags; uint32 flags;
uint32 length; uint32 length;
uint8* data; uint8* data;
uint32 paddingB[16 - 10]; /* offset 32 */ uint32 paddingB[16 - 10]; /* offset 128 */
boolean compressed; boolean compressed;
boolean ephemeral; boolean ephemeral;
uint32 paddingC[16 - 2]; /* offset 48 */ uint32 paddingC[16 - 2]; /* offset 192 */
}; };
FREERDP_API rdpBitmap* Bitmap_Alloc(rdpContext* context); FREERDP_API rdpBitmap* Bitmap_Alloc(rdpContext* context);
@ -88,7 +88,7 @@ struct rdp_pointer
pPointer_New New; pPointer_New New;
pPointer_Free Free; pPointer_Free Free;
pPointer_Set Set; pPointer_Set Set;
uint32 paddingA[16 - 4]; /* offset 16 */ uint32 paddingA[16 - 4]; /* offset 64 */
uint32 xPos; uint32 xPos;
uint32 yPos; uint32 yPos;
@ -99,7 +99,7 @@ struct rdp_pointer
uint32 lengthXorMask; uint32 lengthXorMask;
uint8* xorMaskData; uint8* xorMaskData;
uint8* andMaskData; uint8* andMaskData;
uint32 paddingB[16 - 9]; /* offset 32 */ uint32 paddingB[16 - 9]; /* offset 128 */
}; };
FREERDP_API rdpPointer* Pointer_Alloc(rdpContext* context); FREERDP_API rdpPointer* Pointer_Alloc(rdpContext* context);
@ -123,7 +123,7 @@ struct rdp_glyph
pGlyph_Draw Draw; pGlyph_Draw Draw;
pGlyph_BeginDraw BeginDraw; pGlyph_BeginDraw BeginDraw;
pGlyph_EndDraw EndDraw; pGlyph_EndDraw EndDraw;
uint32 paddingA[16 - 6]; /* offset 16 */ uint32 paddingA[16 - 6]; /* offset 64 */
sint32 x; sint32 x;
sint32 y; sint32 y;
@ -131,7 +131,7 @@ struct rdp_glyph
uint32 cy; uint32 cy;
uint32 cb; uint32 cb;
uint8* aj; uint8* aj;
uint32 paddingB[16 - 6]; /* offset 32 */ uint32 paddingB[16 - 6]; /* offset 128 */
}; };
FREERDP_API rdpGlyph* Glyph_Alloc(rdpContext* context); FREERDP_API rdpGlyph* Glyph_Alloc(rdpContext* context);
@ -149,7 +149,7 @@ struct rdp_graphics
rdpBitmap* Bitmap_Prototype; rdpBitmap* Bitmap_Prototype;
rdpPointer* Pointer_Prototype; rdpPointer* Pointer_Prototype;
rdpGlyph* Glyph_Prototype; rdpGlyph* Glyph_Prototype;
uint32 paddingA[16 - 4]; /* offset 16 */ uint32 paddingA[16 - 4]; /* offset 64 */
}; };
FREERDP_API void graphics_register_bitmap(rdpGraphics* graphics, rdpBitmap* bitmap); FREERDP_API void graphics_register_bitmap(rdpGraphics* graphics, rdpBitmap* bitmap);

4
include/freerdp/input.h
View File

@ -62,14 +62,14 @@ struct rdp_input
{ {
rdpContext* context; rdpContext* context;
void* param1; void* param1;
uint32 paddingA[16 - 2]; /* offset 16 */ uint32 paddingA[16 - 2]; /* offset 64 */
pSynchronizeEvent SynchronizeEvent; pSynchronizeEvent SynchronizeEvent;
pKeyboardEvent KeyboardEvent; pKeyboardEvent KeyboardEvent;
pUnicodeKeyboardEvent UnicodeKeyboardEvent; pUnicodeKeyboardEvent UnicodeKeyboardEvent;
pMouseEvent MouseEvent; pMouseEvent MouseEvent;
pExtendedMouseEvent ExtendedMouseEvent; pExtendedMouseEvent ExtendedMouseEvent;
uint32 paddingB[16 - 5]; /* offset 32 */ uint32 paddingB[16 - 5]; /* offset 128 */
}; };
#endif /* __INPUT_API_H */ #endif /* __INPUT_API_H */

10
include/freerdp/settings.h
View File

@ -183,7 +183,7 @@ struct rdp_monitor
struct rdp_settings struct rdp_settings
{ {
void* instance; void* instance;
uint32 paddingA[16 - 1]; /* offset 16 */ uint32 paddingA[16 - 1]; /* offset 64 */
/* Core Protocol Parameters */ /* Core Protocol Parameters */
uint32 width; uint32 width;
@ -200,7 +200,7 @@ struct rdp_settings
uint32 encryption_method; uint32 encryption_method;
uint32 encryption_level; uint32 encryption_level;
boolean authentication; boolean authentication;
uint32 paddingB[32 - 14]; /* offset 48 */ uint32 paddingB[32 - 14]; /* offset 192 */
/* Connection Settings */ /* Connection Settings */
uint32 port; uint32 port;
@ -216,7 +216,7 @@ struct rdp_settings
boolean autologon; boolean autologon;
boolean compression; boolean compression;
uint32 performance_flags; uint32 performance_flags;
uint32 paddingC[32 - 13]; /* offset 80 */ uint32 paddingC[32 - 13]; /* offset 320 */
/* User Interface Parameters */ /* User Interface Parameters */
boolean sw_gdi; boolean sw_gdi;
@ -226,7 +226,7 @@ struct rdp_settings
boolean decorations; boolean decorations;
uint32 percent_screen; uint32 percent_screen;
boolean mouse_motion; boolean mouse_motion;
uint32 paddingD[32 - 7]; /* offset 112 */ uint32 paddingD[32 - 7]; /* offset 448 */
/* Internal Parameters */ /* Internal Parameters */
char* home_path; char* home_path;
@ -234,7 +234,7 @@ struct rdp_settings
uint32 pdu_source; uint32 pdu_source;
UNICONV* uniconv; UNICONV* uniconv;
boolean server_mode; boolean server_mode;
uint32 paddingE[32 - 5]; /* offset 144 */ uint32 paddingE[32 - 5]; /* offset 576 */
/* Session */ /* Session */
boolean console_audio; boolean console_audio;

18
include/freerdp/update.h
View File

@ -1141,7 +1141,7 @@ typedef void (*pSurfaceCommand)(rdpUpdate* update, STREAM* s);
struct rdp_update struct rdp_update
{ {
rdpContext* context; rdpContext* context;
uint32 paddingA[16 - 1]; uint32 paddingA[16 - 1]; /* offset 64 */
pBeginPaint BeginPaint; pBeginPaint BeginPaint;
pEndPaint EndPaint; pEndPaint EndPaint;
@ -1151,14 +1151,14 @@ struct rdp_update
pBitmapUpdate BitmapUpdate; pBitmapUpdate BitmapUpdate;
pPalette Palette; pPalette Palette;
pPlaySound PlaySound; pPlaySound PlaySound;
uint32 paddingB[16 - 8]; uint32 paddingB[16 - 8]; /* offset 128 */
pPointerPosition PointerPosition; pPointerPosition PointerPosition;
pPointerSystem PointerSystem; pPointerSystem PointerSystem;
pPointerColor PointerColor; pPointerColor PointerColor;
pPointerNew PointerNew; pPointerNew PointerNew;
pPointerCached PointerCached; pPointerCached PointerCached;
uint32 paddingC[16 - 5]; uint32 paddingC[16 - 5]; /* offset 192 */
pDstBlt DstBlt; pDstBlt DstBlt;
pPatBlt PatBlt; pPatBlt PatBlt;
@ -1182,7 +1182,7 @@ struct rdp_update
pPolygonCB PolygonCB; pPolygonCB PolygonCB;
pEllipseSC EllipseSC; pEllipseSC EllipseSC;
pEllipseCB EllipseCB; pEllipseCB EllipseCB;
uint32 paddingD[32 - 22]; uint32 paddingD[32 - 22]; /* offset 320 */
pCacheBitmap CacheBitmap; pCacheBitmap CacheBitmap;
pCacheBitmapV2 CacheBitmapV2; pCacheBitmapV2 CacheBitmapV2;
@ -1191,7 +1191,7 @@ struct rdp_update
pCacheGlyph CacheGlyph; pCacheGlyph CacheGlyph;
pCacheGlyphV2 CacheGlyphV2; pCacheGlyphV2 CacheGlyphV2;
pCacheBrush CacheBrush; pCacheBrush CacheBrush;
uint32 paddingE[32 - 7]; uint32 paddingE[32 - 7]; /* offset 448 */
pCreateOffscreenBitmap CreateOffscreenBitmap; pCreateOffscreenBitmap CreateOffscreenBitmap;
pSwitchSurface SwitchSurface; pSwitchSurface SwitchSurface;
@ -1205,7 +1205,7 @@ struct rdp_update
pDrawGdiPlusCacheFirst DrawGdiPlusCacheFirst; pDrawGdiPlusCacheFirst DrawGdiPlusCacheFirst;
pDrawGdiPlusCacheNext DrawGdiPlusCacheNext; pDrawGdiPlusCacheNext DrawGdiPlusCacheNext;
pDrawGdiPlusCacheEnd DrawGdiPlusCacheEnd; pDrawGdiPlusCacheEnd DrawGdiPlusCacheEnd;
uint32 paddingF[32 - 12]; uint32 paddingF[32 - 12]; /* offset 576 */
pWindowCreate WindowCreate; pWindowCreate WindowCreate;
pWindowUpdate WindowUpdate; pWindowUpdate WindowUpdate;
@ -1217,15 +1217,15 @@ struct rdp_update
pNotifyIconDelete NotifyIconDelete; pNotifyIconDelete NotifyIconDelete;
pMonitoredDesktop MonitoredDesktop; pMonitoredDesktop MonitoredDesktop;
pNonMonitoredDesktop NonMonitoredDesktop; pNonMonitoredDesktop NonMonitoredDesktop;
uint32 paddingG[32 - 10]; uint32 paddingG[32 - 10]; /* offset 704 */
pRefreshRect RefreshRect; pRefreshRect RefreshRect;
pSuppressOutput SuppressOutput; pSuppressOutput SuppressOutput;
uint32 paddingH[16 - 2]; uint32 paddingH[16 - 2]; /* offset 768 */
pSurfaceBits SurfaceBits; pSurfaceBits SurfaceBits;
pSurfaceCommand SurfaceCommand; pSurfaceCommand SurfaceCommand;
uint32 paddingI[16 - 2]; uint32 paddingI[16 - 2]; /* offset 832 */
/* everything below is internal, and should not be directly accessed */ /* everything below is internal, and should not be directly accessed */