Line 0
Link Here
|
|
|
1 |
--- plugins/rdp/vinagre-rdp-tab.c.orig 2016-09-13 08:34:13 UTC |
2 |
+++ plugins/rdp/vinagre-rdp-tab.c |
3 |
@@ -476,16 +476,18 @@ frdp_drawing_area_draw (GtkWidget *area, |
4 |
return TRUE; |
5 |
} |
6 |
|
7 |
-static void |
8 |
+static BOOL |
9 |
frdp_begin_paint (rdpContext *context) |
10 |
{ |
11 |
rdpGdi *gdi = context->gdi; |
12 |
|
13 |
gdi->primary->hdc->hwnd->invalid->null = 1; |
14 |
gdi->primary->hdc->hwnd->ninvalid = 0; |
15 |
+ |
16 |
+ return TRUE; |
17 |
} |
18 |
|
19 |
-static void |
20 |
+static BOOL |
21 |
frdp_end_paint (rdpContext *context) |
22 |
{ |
23 |
VinagreRdpTab *rdp_tab = ((frdpContext *) context)->rdp_tab; |
24 |
@@ -495,7 +497,7 @@ frdp_end_paint (rdpContext *context) |
25 |
gint x, y, w, h; |
26 |
|
27 |
if (gdi->primary->hdc->hwnd->invalid->null) |
28 |
- return; |
29 |
+ return FALSE; |
30 |
|
31 |
x = gdi->primary->hdc->hwnd->invalid->x; |
32 |
y = gdi->primary->hdc->hwnd->invalid->y; |
33 |
@@ -517,6 +519,8 @@ frdp_end_paint (rdpContext *context) |
34 |
{ |
35 |
gtk_widget_queue_draw_area (priv->display, x, y, w, h); |
36 |
} |
37 |
+ |
38 |
+ return TRUE; |
39 |
} |
40 |
|
41 |
static BOOL |
42 |
@@ -591,11 +595,15 @@ frdp_post_connect (freerdp *instance) |
43 |
#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ |
44 |
!(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \ |
45 |
FREERDP_VERSION_MINOR >= 2)) |
46 |
- CLRBUF_24BPP, |
47 |
+ CLRBUF_24BPP, NULL |
48 |
#else |
49 |
- CLRBUF_32BPP, |
50 |
+#ifndef PIXEL_FORMAT_ARGB32 |
51 |
+ CLRBUF_32BPP, NULL |
52 |
+#else |
53 |
+ PIXEL_FORMAT_BGRA32 |
54 |
#endif |
55 |
- NULL); |
56 |
+#endif |
57 |
+ ); |
58 |
gdi = instance->context->gdi; |
59 |
|
60 |
instance->update->BeginPaint = frdp_begin_paint; |
61 |
@@ -862,7 +870,7 @@ frdp_mouse_moved (GtkWidget *widget |
62 |
return TRUE; |
63 |
} |
64 |
|
65 |
-static gboolean |
66 |
+static BOOL |
67 |
frdp_authenticate (freerdp *instance, |
68 |
char **username, |
69 |
char **password, |
70 |
@@ -934,11 +942,13 @@ frdp_authenticate (freerdp *instance, |
71 |
return TRUE; |
72 |
} |
73 |
|
74 |
-static BOOL |
75 |
-frdp_certificate_verify (freerdp *instance, |
76 |
- char *subject, |
77 |
- char *issuer, |
78 |
- char *fingerprint) |
79 |
+static DWORD |
80 |
+frdp_certificate_verify (freerdp *instance, |
81 |
+ const char *common_name, |
82 |
+ const char *subject, |
83 |
+ const char *issuer, |
84 |
+ const char *fingerprint, |
85 |
+ BOOL host_mismatch) |
86 |
{ |
87 |
VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); |
88 |
GtkBuilder *builder; |
89 |
@@ -973,12 +983,15 @@ frdp_certificate_verify (freerdp *instan |
90 |
|
91 |
|
92 |
#if HAVE_FREERDP_1_1 |
93 |
-static BOOL |
94 |
-frdp_changed_certificate_verify (freerdp *instance, |
95 |
- char *subject, |
96 |
- char *issuer, |
97 |
- char *new_fingerprint, |
98 |
- char *old_fingerprint) |
99 |
+static DWORD |
100 |
+frdp_changed_certificate_verify (freerdp *instance, |
101 |
+ const char *common_name, |
102 |
+ const char *subject, |
103 |
+ const char *issuer, |
104 |
+ const char *new_fingerprint, |
105 |
+ const char *old_subject, |
106 |
+ const char *old_issuer, |
107 |
+ const char *old_fingerprint) |
108 |
{ |
109 |
VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); |
110 |
GtkBuilder *builder; |