Skip to content

Commit 720afaf

Browse files
awakecodingawakecoding
committed
rdp: fix plugin compilation with latest FreeRDP API changes
1 parent 8dcf59c commit 720afaf

File tree

1 file changed

+50
-45
lines changed

1 file changed

+50
-45
lines changed

‎remmina-plugins/rdp/remminapluginrdpui.c

+50-45
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ remmina_plugin_rdpui_queue_ui (RemminaProtocolWidget *gp, RemminaPluginRdpUiObje
4848
}
4949

5050
static void
51-
remmina_plugin_rdpui_desktop_resize(rdpUpdate* update)
51+
remmina_plugin_rdpui_desktop_resize(rdpContext* context)
5252
{
5353
RemminaPluginRdpData *gpdata;
5454
RemminaProtocolWidget *gp;
5555

56-
gpdata = (RemminaPluginRdpData*) update->context;
56+
gpdata = (RemminaPluginRdpData*) context;
5757
gp = gpdata->protocol_widget;
5858

5959
LOCK_BUFFER (TRUE)
@@ -71,89 +71,89 @@ remmina_plugin_rdpui_desktop_resize(rdpUpdate* update)
7171
}
7272

7373
static void
74-
remmina_plugin_rdpui_palette (rdpUpdate* update, PALETTE_UPDATE* palette)
74+
remmina_plugin_rdpui_palette (rdpContext* context, PALETTE_UPDATE* palette)
7575
{
7676
g_print ("palette\n");
7777
}
7878

7979
static void
80-
remmina_plugin_rdpui_set_bounds (rdpUpdate* update, BOUNDS* bounds)
80+
remmina_plugin_rdpui_set_bounds (rdpContext* context, rdpBounds* bounds)
8181
{
8282
g_print ("set_bounds\n");
8383
}
8484

8585
static void
86-
remmina_plugin_rdpui_dstblt (rdpUpdate* update, DSTBLT_ORDER* dstblt)
86+
remmina_plugin_rdpui_dstblt (rdpContext* context, DSTBLT_ORDER* dstblt)
8787
{
8888
g_print ("dstblt\n");
8989
}
9090

9191
static void
92-
remmina_plugin_rdpui_patblt (rdpUpdate* update, PATBLT_ORDER* patblt)
92+
remmina_plugin_rdpui_patblt (rdpContext* context, PATBLT_ORDER* patblt)
9393
{
9494
g_print ("patblt\n");
9595
}
9696

9797
static void
98-
remmina_plugin_rdpui_scrblt (rdpUpdate* update, SCRBLT_ORDER* scrblt)
98+
remmina_plugin_rdpui_scrblt (rdpContext* context, SCRBLT_ORDER* scrblt)
9999
{
100100
g_print ("srcblt\n");
101101
}
102102

103103
static void
104-
remmina_plugin_rdpui_opaque_rect (rdpUpdate* update, OPAQUE_RECT_ORDER* opaque_rect)
104+
remmina_plugin_rdpui_opaque_rect (rdpContext* context, OPAQUE_RECT_ORDER* opaque_rect)
105105
{
106106
g_print ("opaque_rect\n");
107107
}
108108

109109
static void
110-
remmina_plugin_rdpui_multi_opaque_rect (rdpUpdate* update, MULTI_OPAQUE_RECT_ORDER* multi_opaque_rect)
110+
remmina_plugin_rdpui_multi_opaque_rect (rdpContext* context, MULTI_OPAQUE_RECT_ORDER* multi_opaque_rect)
111111
{
112112
g_print ("multi_opaque_rect\n");
113113
}
114114

115115
static void
116-
remmina_plugin_rdpui_line_to (rdpUpdate* update, LINE_TO_ORDER* line_to)
116+
remmina_plugin_rdpui_line_to (rdpContext* context, LINE_TO_ORDER* line_to)
117117
{
118118
g_print ("line_to\n");
119119
}
120120

121-
static void remmina_plugin_rdpui_polyline (rdpUpdate* update, POLYLINE_ORDER* polyline)
121+
static void remmina_plugin_rdpui_polyline (rdpContext* context, POLYLINE_ORDER* polyline)
122122
{
123123
g_print ("polyline\n");
124124
}
125125

126-
static void remmina_plugin_rdpui_memblt (rdpUpdate* update, MEMBLT_ORDER* memblt)
126+
static void remmina_plugin_rdpui_memblt (rdpContext* context, MEMBLT_ORDER* memblt)
127127
{
128128
g_print ("memblt\n");
129129
}
130130

131-
static void remmina_plugin_rdpui_fast_index (rdpUpdate* update, FAST_INDEX_ORDER* fast_index)
131+
static void remmina_plugin_rdpui_fast_index (rdpContext* context, FAST_INDEX_ORDER* fast_index)
132132
{
133133
g_print ("fast_index\n");
134134
}
135135

136-
static void remmina_plugin_rdpui_cache_color_table (rdpUpdate* update, CACHE_COLOR_TABLE_ORDER* cache_color_table_order)
136+
static void remmina_plugin_rdpui_cache_color_table (rdpContext* context, CACHE_COLOR_TABLE_ORDER* cache_color_table_order)
137137
{
138138
g_print ("cache_color_table\n");
139139
}
140140

141-
static void remmina_plugin_rdpui_cache_glyph (rdpUpdate* update, CACHE_GLYPH_ORDER* cache_glyph_order)
141+
static void remmina_plugin_rdpui_cache_glyph (rdpContext* context, CACHE_GLYPH_ORDER* cache_glyph_order)
142142
{
143143
g_print ("cache_glyph\n");
144144
}
145145

146-
static void remmina_plugin_rdpui_cache_glyph_v2 (rdpUpdate* update, CACHE_GLYPH_V2_ORDER* cache_glyph_v2_order)
146+
static void remmina_plugin_rdpui_cache_glyph_v2 (rdpContext* context, CACHE_GLYPH_V2_ORDER* cache_glyph_v2_order)
147147
{
148148
g_print ("cache_glyph_v2\n");
149149
}
150150

151-
static void remmina_plugin_rdpui_surface_bits (rdpUpdate* update, SURFACE_BITS_COMMAND* surface_bits_command)
151+
static void remmina_plugin_rdpui_surface_bits (rdpContext* context, SURFACE_BITS_COMMAND* surface_bits_command)
152152
{
153153
uint8* bitmap;
154154
RFX_MESSAGE* message;
155155
RemminaPluginRdpUiObject *ui;
156-
RemminaPluginRdpData *gpdata = (RemminaPluginRdpData*) update->context;
156+
RemminaPluginRdpData *gpdata = (RemminaPluginRdpData*) context;
157157

158158
if (surface_bits_command->codecID == CODEC_ID_REMOTEFX && gpdata->rfx_context)
159159
{
@@ -290,42 +290,47 @@ remmina_plugin_rdpui_pre_connect (RemminaProtocolWidget *gp)
290290
void
291291
remmina_plugin_rdpui_post_connect (RemminaProtocolWidget *gp)
292292
{
293+
rdpUpdate* update;
294+
rdpPrimaryUpdate* primary;
295+
rdpSecondaryUpdate* secondary;
293296
RemminaPluginRdpData *gpdata;
294297
RemminaPluginRdpUiObject *ui;
295-
rdpUpdate *update;
296298

297299
gpdata = GET_DATA (gp);
298300
update = gpdata->instance->update;
301+
primary = update->primary;
302+
secondary = update->secondary;
299303

300304
update->DesktopResize = remmina_plugin_rdpui_desktop_resize;
301305
update->Palette = remmina_plugin_rdpui_palette;
302306
update->SetBounds = remmina_plugin_rdpui_set_bounds;
303-
update->DstBlt = remmina_plugin_rdpui_dstblt;
304-
update->PatBlt = remmina_plugin_rdpui_patblt;
305-
update->ScrBlt = remmina_plugin_rdpui_scrblt;
306-
update->OpaqueRect = remmina_plugin_rdpui_opaque_rect;
307-
update->DrawNineGrid = NULL;
308-
update->MultiDstBlt = NULL;
309-
update->MultiPatBlt = NULL;
310-
update->MultiScrBlt = NULL;
311-
update->MultiOpaqueRect = remmina_plugin_rdpui_multi_opaque_rect;
312-
update->MultiDrawNineGrid = NULL;
313-
update->LineTo = remmina_plugin_rdpui_line_to;
314-
update->Polyline = remmina_plugin_rdpui_polyline;
315-
update->MemBlt = remmina_plugin_rdpui_memblt;
316-
update->Mem3Blt = NULL;
317-
update->SaveBitmap = NULL;
318-
update->GlyphIndex = NULL;
319-
update->FastIndex = remmina_plugin_rdpui_fast_index;
320-
update->FastGlyph = NULL;
321-
update->PolygonSC = NULL;
322-
update->PolygonCB = NULL;
323-
update->EllipseSC = NULL;
324-
update->EllipseCB = NULL;
325-
326-
update->CacheColorTable = remmina_plugin_rdpui_cache_color_table;
327-
update->CacheGlyph = remmina_plugin_rdpui_cache_glyph;
328-
update->CacheGlyphV2 = remmina_plugin_rdpui_cache_glyph_v2;
307+
308+
primary->DstBlt = remmina_plugin_rdpui_dstblt;
309+
primary->PatBlt = remmina_plugin_rdpui_patblt;
310+
primary->ScrBlt = remmina_plugin_rdpui_scrblt;
311+
primary->OpaqueRect = remmina_plugin_rdpui_opaque_rect;
312+
primary->DrawNineGrid = NULL;
313+
primary->MultiDstBlt = NULL;
314+
primary->MultiPatBlt = NULL;
315+
primary->MultiScrBlt = NULL;
316+
primary->MultiOpaqueRect = remmina_plugin_rdpui_multi_opaque_rect;
317+
primary->MultiDrawNineGrid = NULL;
318+
primary->LineTo = remmina_plugin_rdpui_line_to;
319+
primary->Polyline = remmina_plugin_rdpui_polyline;
320+
primary->MemBlt = remmina_plugin_rdpui_memblt;
321+
primary->Mem3Blt = NULL;
322+
primary->SaveBitmap = NULL;
323+
primary->GlyphIndex = NULL;
324+
primary->FastIndex = remmina_plugin_rdpui_fast_index;
325+
primary->FastGlyph = NULL;
326+
primary->PolygonSC = NULL;
327+
primary->PolygonCB = NULL;
328+
primary->EllipseSC = NULL;
329+
primary->EllipseCB = NULL;
330+
331+
secondary->CacheColorTable = remmina_plugin_rdpui_cache_color_table;
332+
secondary->CacheGlyph = remmina_plugin_rdpui_cache_glyph;
333+
secondary->CacheGlyphV2 = remmina_plugin_rdpui_cache_glyph_v2;
329334

330335
update->SurfaceBits = remmina_plugin_rdpui_surface_bits;
331336

0 commit comments

Comments
 (0)