Skip to content

Commit 2c1d33d

Browse files
helderjgoncalveshelderjgoncalves
committed
ss
1 parent acf4f0f commit 2c1d33d

11 files changed

Lines changed: 691 additions & 63 deletions

‎CefGlue.Interop.Gen/cef_parser.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ def get_capi_name(cppname, isclassname, prefix=None):
4949
for chr in cppname:
5050
# add an underscore if the current character is an upper case letter
5151
# and the last character was a lower case letter
52-
if len(result) > 0 and (lastchr.isdigit() or (not chr.isdigit() \
53-
and chr.upper() == chr \
54-
and not lastchr.upper() == lastchr)):
52+
if len(result) > 0 and not chr.isdigit() \
53+
and ((chr.upper() == chr \
54+
and not lastchr.upper() == lastchr) or lastchr.isdigit()):
5555
result += '_'
5656
result += chr.lower()
5757
lastchr = chr

‎CefGlue/Classes.g/CefX509CertPrincipal.g.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ namespace Xilium.CefGlue
1313
// Role: PROXY
1414
public sealed unsafe partial class CefX509CertPrincipal : IDisposable
1515
{
16-
internal static CefX509CertPrincipal FromNative(cef_x5_0_9_cert_principal_t* ptr)
16+
internal static CefX509CertPrincipal FromNative(cef_x509_cert_principal_t* ptr)
1717
{
1818
return new CefX509CertPrincipal(ptr);
1919
}
2020

21-
internal static CefX509CertPrincipal FromNativeOrNull(cef_x5_0_9_cert_principal_t* ptr)
21+
internal static CefX509CertPrincipal FromNativeOrNull(cef_x509_cert_principal_t* ptr)
2222
{
2323
if (ptr == null) return null;
2424
return new CefX509CertPrincipal(ptr);
2525
}
2626

27-
private cef_x5_0_9_cert_principal_t* _self;
27+
private cef_x509_cert_principal_t* _self;
2828
private int _disposed = 0;
2929

30-
private CefX509CertPrincipal(cef_x5_0_9_cert_principal_t* ptr)
30+
private CefX509CertPrincipal(cef_x509_cert_principal_t* ptr)
3131
{
3232
if (ptr == null) throw new ArgumentNullException("ptr");
3333
_self = ptr;
@@ -56,25 +56,25 @@ public void Dispose()
5656

5757
internal void AddRef()
5858
{
59-
cef_x5_0_9_cert_principal_t.add_ref(_self);
59+
cef_x509_cert_principal_t.add_ref(_self);
6060
}
6161

6262
internal bool Release()
6363
{
64-
return cef_x5_0_9_cert_principal_t.release(_self) != 0;
64+
return cef_x509_cert_principal_t.release(_self) != 0;
6565
}
6666

6767
internal bool HasOneRef
6868
{
69-
get { return cef_x5_0_9_cert_principal_t.has_one_ref(_self) != 0; }
69+
get { return cef_x509_cert_principal_t.has_one_ref(_self) != 0; }
7070
}
7171

7272
internal bool HasAtLeastOneRef
7373
{
74-
get { return cef_x5_0_9_cert_principal_t.has_at_least_one_ref(_self) != 0; }
74+
get { return cef_x509_cert_principal_t.has_at_least_one_ref(_self) != 0; }
7575
}
7676

77-
internal cef_x5_0_9_cert_principal_t* ToNative()
77+
internal cef_x509_cert_principal_t* ToNative()
7878
{
7979
AddRef();
8080
return _self;

‎CefGlue/Classes.g/CefX509Certificate.g.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ namespace Xilium.CefGlue
1313
// Role: PROXY
1414
public sealed unsafe partial class CefX509Certificate : IDisposable
1515
{
16-
internal static CefX509Certificate FromNative(cef_x5_0_9_certificate_t* ptr)
16+
internal static CefX509Certificate FromNative(cef_x509_certificate_t* ptr)
1717
{
1818
return new CefX509Certificate(ptr);
1919
}
2020

21-
internal static CefX509Certificate FromNativeOrNull(cef_x5_0_9_certificate_t* ptr)
21+
internal static CefX509Certificate FromNativeOrNull(cef_x509_certificate_t* ptr)
2222
{
2323
if (ptr == null) return null;
2424
return new CefX509Certificate(ptr);
2525
}
2626

27-
private cef_x5_0_9_certificate_t* _self;
27+
private cef_x509_certificate_t* _self;
2828
private int _disposed = 0;
2929

30-
private CefX509Certificate(cef_x5_0_9_certificate_t* ptr)
30+
private CefX509Certificate(cef_x509_certificate_t* ptr)
3131
{
3232
if (ptr == null) throw new ArgumentNullException("ptr");
3333
_self = ptr;
@@ -56,25 +56,25 @@ public void Dispose()
5656

5757
internal void AddRef()
5858
{
59-
cef_x5_0_9_certificate_t.add_ref(_self);
59+
cef_x509_certificate_t.add_ref(_self);
6060
}
6161

6262
internal bool Release()
6363
{
64-
return cef_x5_0_9_certificate_t.release(_self) != 0;
64+
return cef_x509_certificate_t.release(_self) != 0;
6565
}
6666

6767
internal bool HasOneRef
6868
{
69-
get { return cef_x5_0_9_certificate_t.has_one_ref(_self) != 0; }
69+
get { return cef_x509_certificate_t.has_one_ref(_self) != 0; }
7070
}
7171

7272
internal bool HasAtLeastOneRef
7373
{
74-
get { return cef_x5_0_9_certificate_t.has_at_least_one_ref(_self) != 0; }
74+
get { return cef_x509_certificate_t.has_at_least_one_ref(_self) != 0; }
7575
}
7676

77-
internal cef_x5_0_9_certificate_t* ToNative()
77+
internal cef_x509_certificate_t* ToNative()
7878
{
7979
AddRef();
8080
return _self;

‎CefGlue/Interop/Classes.g/cef_request_handler_t.g.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ internal unsafe struct cef_request_handler_t
8383
#if !DEBUG
8484
[SuppressUnmanagedCodeSecurity]
8585
#endif
86-
internal delegate int on_select_client_certificate_delegate(cef_request_handler_t* self, cef_browser_t* browser, int isProxy, cef_string_t* host, int port, UIntPtr certificatesCount, cef_x5_0_9_certificate_t** certificates, cef_select_client_certificate_callback_t* callback);
86+
internal delegate int on_select_client_certificate_delegate(cef_request_handler_t* self, cef_browser_t* browser, int isProxy, cef_string_t* host, int port, UIntPtr certificatesCount, cef_x509_certificate_t** certificates, cef_select_client_certificate_callback_t* callback);
8787

8888
[UnmanagedFunctionPointer(libcef.CEF_CALLBACK)]
8989
#if !DEBUG

‎CefGlue/Interop/Classes.g/cef_select_client_certificate_callback_t.g.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ internal unsafe struct cef_select_client_certificate_callback_t
4343
#if !DEBUG
4444
[SuppressUnmanagedCodeSecurity]
4545
#endif
46-
private delegate void select_delegate(cef_select_client_certificate_callback_t* self, cef_x5_0_9_certificate_t* cert);
46+
private delegate void select_delegate(cef_select_client_certificate_callback_t* self, cef_x509_certificate_t* cert);
4747

4848
// AddRef
4949
private static IntPtr _p0;
@@ -117,7 +117,7 @@ public static int has_at_least_one_ref(cef_select_client_certificate_callback_t*
117117
private static IntPtr _p4;
118118
private static select_delegate _d4;
119119

120-
public static void select(cef_select_client_certificate_callback_t* self, cef_x5_0_9_certificate_t* cert)
120+
public static void select(cef_select_client_certificate_callback_t* self, cef_x509_certificate_t* cert)
121121
{
122122
select_delegate d;
123123
var p = self->_select;

‎CefGlue/Interop/Classes.g/cef_server_t.g.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ internal unsafe struct cef_server_t
1919
internal IntPtr _get_address;
2020
internal IntPtr _has_connection;
2121
internal IntPtr _is_valid_connection;
22-
internal IntPtr _send_http2_0_0_response;
23-
internal IntPtr _send_http4_0_4_response;
24-
internal IntPtr _send_http5_0_0_response;
22+
internal IntPtr _send_http200_response;
23+
internal IntPtr _send_http404_response;
24+
internal IntPtr _send_http500_response;
2525
internal IntPtr _send_http_response;
2626
internal IntPtr _send_raw_data;
2727
internal IntPtr _close_connection;
@@ -95,19 +95,19 @@ internal unsafe struct cef_server_t
9595
#if !DEBUG
9696
[SuppressUnmanagedCodeSecurity]
9797
#endif
98-
private delegate void send_http2_0_0_response_delegate(cef_server_t* self, int connection_id, cef_string_t* content_type, void* data, UIntPtr data_size);
98+
private delegate void send_http200_response_delegate(cef_server_t* self, int connection_id, cef_string_t* content_type, void* data, UIntPtr data_size);
9999

100100
[UnmanagedFunctionPointer(libcef.CEF_CALLBACK)]
101101
#if !DEBUG
102102
[SuppressUnmanagedCodeSecurity]
103103
#endif
104-
private delegate void send_http4_0_4_response_delegate(cef_server_t* self, int connection_id);
104+
private delegate void send_http404_response_delegate(cef_server_t* self, int connection_id);
105105

106106
[UnmanagedFunctionPointer(libcef.CEF_CALLBACK)]
107107
#if !DEBUG
108108
[SuppressUnmanagedCodeSecurity]
109109
#endif
110-
private delegate void send_http5_0_0_response_delegate(cef_server_t* self, int connection_id, cef_string_t* error_message);
110+
private delegate void send_http500_response_delegate(cef_server_t* self, int connection_id, cef_string_t* error_message);
111111

112112
[UnmanagedFunctionPointer(libcef.CEF_CALLBACK)]
113113
#if !DEBUG
@@ -305,50 +305,50 @@ public static int is_valid_connection(cef_server_t* self, int connection_id)
305305

306306
// SendHttp200Response
307307
private static IntPtr _pa;
308-
private static send_http2_0_0_response_delegate _da;
308+
private static send_http200_response_delegate _da;
309309

310-
public static void send_http2_0_0_response(cef_server_t* self, int connection_id, cef_string_t* content_type, void* data, UIntPtr data_size)
310+
public static void send_http200_response(cef_server_t* self, int connection_id, cef_string_t* content_type, void* data, UIntPtr data_size)
311311
{
312-
send_http2_0_0_response_delegate d;
313-
var p = self->_send_http2_0_0_response;
312+
send_http200_response_delegate d;
313+
var p = self->_send_http200_response;
314314
if (p == _pa) { d = _da; }
315315
else
316316
{
317-
d = (send_http2_0_0_response_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(send_http2_0_0_response_delegate));
317+
d = (send_http200_response_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(send_http200_response_delegate));
318318
if (_pa == IntPtr.Zero) { _da = d; _pa = p; }
319319
}
320320
d(self, connection_id, content_type, data, data_size);
321321
}
322322

323323
// SendHttp404Response
324324
private static IntPtr _pb;
325-
private static send_http4_0_4_response_delegate _db;
325+
private static send_http404_response_delegate _db;
326326

327-
public static void send_http4_0_4_response(cef_server_t* self, int connection_id)
327+
public static void send_http404_response(cef_server_t* self, int connection_id)
328328
{
329-
send_http4_0_4_response_delegate d;
330-
var p = self->_send_http4_0_4_response;
329+
send_http404_response_delegate d;
330+
var p = self->_send_http404_response;
331331
if (p == _pb) { d = _db; }
332332
else
333333
{
334-
d = (send_http4_0_4_response_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(send_http4_0_4_response_delegate));
334+
d = (send_http404_response_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(send_http404_response_delegate));
335335
if (_pb == IntPtr.Zero) { _db = d; _pb = p; }
336336
}
337337
d(self, connection_id);
338338
}
339339

340340
// SendHttp500Response
341341
private static IntPtr _pc;
342-
private static send_http5_0_0_response_delegate _dc;
342+
private static send_http500_response_delegate _dc;
343343

344-
public static void send_http5_0_0_response(cef_server_t* self, int connection_id, cef_string_t* error_message)
344+
public static void send_http500_response(cef_server_t* self, int connection_id, cef_string_t* error_message)
345345
{
346-
send_http5_0_0_response_delegate d;
347-
var p = self->_send_http5_0_0_response;
346+
send_http500_response_delegate d;
347+
var p = self->_send_http500_response;
348348
if (p == _pc) { d = _dc; }
349349
else
350350
{
351-
d = (send_http5_0_0_response_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(send_http5_0_0_response_delegate));
351+
d = (send_http500_response_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(send_http500_response_delegate));
352352
if (_pc == IntPtr.Zero) { _dc = d; _pc = p; }
353353
}
354354
d(self, connection_id, error_message);

‎CefGlue/Interop/Classes.g/cef_sslinfo_t.g.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal unsafe struct cef_sslinfo_t
1414
{
1515
internal cef_base_ref_counted_t _base;
1616
internal IntPtr _get_cert_status;
17-
internal IntPtr _get_x5_0_9_certificate;
17+
internal IntPtr _get_x509_certificate;
1818

1919
[UnmanagedFunctionPointer(libcef.CEF_CALLBACK)]
2020
#if !DEBUG
@@ -50,7 +50,7 @@ internal unsafe struct cef_sslinfo_t
5050
#if !DEBUG
5151
[SuppressUnmanagedCodeSecurity]
5252
#endif
53-
private delegate cef_x5_0_9_certificate_t* get_x5_0_9_certificate_delegate(cef_sslinfo_t* self);
53+
private delegate cef_x509_certificate_t* get_x509_certificate_delegate(cef_sslinfo_t* self);
5454

5555
// AddRef
5656
private static IntPtr _p0;
@@ -139,16 +139,16 @@ public static CefCertStatus get_cert_status(cef_sslinfo_t* self)
139139

140140
// GetX509Certificate
141141
private static IntPtr _p5;
142-
private static get_x5_0_9_certificate_delegate _d5;
142+
private static get_x509_certificate_delegate _d5;
143143

144-
public static cef_x5_0_9_certificate_t* get_x5_0_9_certificate(cef_sslinfo_t* self)
144+
public static cef_x509_certificate_t* get_x509_certificate(cef_sslinfo_t* self)
145145
{
146-
get_x5_0_9_certificate_delegate d;
147-
var p = self->_get_x5_0_9_certificate;
146+
get_x509_certificate_delegate d;
147+
var p = self->_get_x509_certificate;
148148
if (p == _p5) { d = _d5; }
149149
else
150150
{
151-
d = (get_x5_0_9_certificate_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(get_x5_0_9_certificate_delegate));
151+
d = (get_x509_certificate_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(get_x509_certificate_delegate));
152152
if (_p5 == IntPtr.Zero) { _d5 = d; _p5 = p; }
153153
}
154154
return d(self);

‎CefGlue/Interop/Classes.g/cef_sslstatus_t.g.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal unsafe struct cef_sslstatus_t
1717
internal IntPtr _get_cert_status;
1818
internal IntPtr _get_sslversion;
1919
internal IntPtr _get_content_status;
20-
internal IntPtr _get_x5_0_9_certificate;
20+
internal IntPtr _get_x509_certificate;
2121

2222
[UnmanagedFunctionPointer(libcef.CEF_CALLBACK)]
2323
#if !DEBUG
@@ -71,7 +71,7 @@ internal unsafe struct cef_sslstatus_t
7171
#if !DEBUG
7272
[SuppressUnmanagedCodeSecurity]
7373
#endif
74-
private delegate cef_x5_0_9_certificate_t* get_x5_0_9_certificate_delegate(cef_sslstatus_t* self);
74+
private delegate cef_x509_certificate_t* get_x509_certificate_delegate(cef_sslstatus_t* self);
7575

7676
// AddRef
7777
private static IntPtr _p0;
@@ -211,16 +211,16 @@ public static CefSslContentStatus get_content_status(cef_sslstatus_t* self)
211211

212212
// GetX509Certificate
213213
private static IntPtr _p8;
214-
private static get_x5_0_9_certificate_delegate _d8;
214+
private static get_x509_certificate_delegate _d8;
215215

216-
public static cef_x5_0_9_certificate_t* get_x5_0_9_certificate(cef_sslstatus_t* self)
216+
public static cef_x509_certificate_t* get_x509_certificate(cef_sslstatus_t* self)
217217
{
218-
get_x5_0_9_certificate_delegate d;
219-
var p = self->_get_x5_0_9_certificate;
218+
get_x509_certificate_delegate d;
219+
var p = self->_get_x509_certificate;
220220
if (p == _p8) { d = _d8; }
221221
else
222222
{
223-
d = (get_x5_0_9_certificate_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(get_x5_0_9_certificate_delegate));
223+
d = (get_x509_certificate_delegate)Marshal.GetDelegateForFunctionPointer(p, typeof(get_x509_certificate_delegate));
224224
if (_p8 == IntPtr.Zero) { _d8 = d; _p8 = p; }
225225
}
226226
return d(self);

0 commit comments

Comments
 (0)