8000 Remove CharSet.Unicode where not needed · sdpython/pythonnet@ef7f69f · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jul 22, 2023. It is now read-only.

Commit ef7f69f

Browse files
vmuriartvmuriart
committed
Remove CharSet.Unicode where not needed
CharSet.Unicode is only needed when args are string type. https://msdn.microsoft.com/en-us/library/system.runtime.interopservices.dllimportattribute.charset(v=vs.110).aspx
1 parent 1fef331 commit ef7f69f

File tree

1 file changed

+15
-30
lines changed

1 file changed

+15
-30
lines changed

‎src/runtime/runtime.cs

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,8 +1370,7 @@ internal static extern IntPtr
13701370
int size
13711371
);
13721372

1373-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1374-
CharSet = CharSet.Unicode)]
1373+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
13751374
internal unsafe static extern IntPtr
13761375
PyUnicode_FromStringAndSize(IntPtr value, int size);
13771376
#elif PYTHON2
@@ -1395,13 +1394,11 @@ internal static bool PyUnicode_Check(IntPtr ob)
13951394
}
13961395

13971396
#if UCS2 && PYTHON3
1398-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1399-
CharSet = CharSet.Unicode)]
1397+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
14001398
internal unsafe static extern IntPtr
14011399
PyUnicode_FromObject(IntPtr ob);
14021400

1403-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1404-
CharSet = CharSet.Unicode)]
1401+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
14051402
internal unsafe static extern IntPtr
14061403
PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);
14071404

@@ -1416,30 +1413,25 @@ internal static IntPtr PyUnicode_FromUnicode(string s, int size)
14161413
return PyUnicode_FromKindAndString(2, s, size);
14171414
}
14181415

1419-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1420-
CharSet = CharSet.Unicode)]
1416+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
14211417
internal unsafe static extern int
14221418
PyUnicode_GetSize(IntPtr ob);
14231419

1424-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1425-
CharSet = CharSet.Unicode)]
1420+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
14261421
internal unsafe static extern IntPtr
14271422
PyUnicode_AsUnicode(IntPtr ob);
14281423

1429-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1430-
CharSet = CharSet.Unicode)]
1424+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
14311425
internal unsafe static extern IntPtr
14321426
PyUnicode_FromOrdinal(int c);
14331427
#elif UCS2 && PYTHON2
14341428
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1435-
EntryPoint = "PyUnicodeUCS2_FromObject",
1436-
CharSet = CharSet.Unicode)]
1429+
EntryPoint = "PyUnicodeUCS2_FromObject")]
14371430
internal unsafe static extern IntPtr
14381431
PyUnicode_FromObject(IntPtr ob);
14391432

14401433
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1441-
EntryPoint = "PyUnicodeUCS2_FromEncodedObject",
1442-
CharSet = CharSet.Unicode)]
1434+
EntryPoint = "PyUnicodeUCS2_FromEncodedObject")]
14431435
internal unsafe static extern IntPtr
14441436
PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);
14451437

@@ -1460,18 +1452,15 @@ internal unsafe static extern IntPtr
14601452
PyUnicode_AsUnicode(IntPtr ob);
14611453

14621454
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1463-
EntryPoint = "PyUnicodeUCS2_FromOrdinal",
1464-
CharSet = CharSet.Unicode)]
1455+
EntryPoint = "PyUnicodeUCS2_FromOrdinal")]
14651456
internal unsafe static extern IntPtr
14661457
PyUnicode_FromOrdinal(int c);
14671458
#elif UCS4 && PYTHON3
1468-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1469-
CharSet = CharSet.Unicode)]
1459+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
14701460
internal unsafe static extern IntPtr
14711461
PyUnicode_FromObject(IntPtr ob);
14721462

1473-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1474-
CharSet = CharSet.Unicode)]
1463+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
14751464
internal unsafe static extern IntPtr
14761465
PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);
14771466

@@ -1497,20 +1486,17 @@ internal unsafe static extern int
14971486
internal unsafe static extern IntPtr
14981487
PyUnicode_AsUnicode(IntPtr ob);
14991488

1500-
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1501-
CharSet = CharSet.Unicode)]
1489+
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl)]
15021490
internal unsafe static extern IntPtr
15031491
PyUnicode_FromOrdinal(int c);
15041492
#elif UCS4 && PYTHON2
15051493
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1506-
EntryPoint = "PyUnicodeUCS4_FromObject",
1507-
CharSet = CharSet.Unicode)]
1494+
EntryPoint = "PyUnicodeUCS4_FromObject")]
15081495
internal unsafe static extern IntPtr
15091496
PyUnicode_FromObject(IntPtr ob);
15101497

15111498
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1512-
EntryPoint = "PyUnicodeUCS4_FromEncodedObject",
1513-
CharSet = CharSet.Unicode)]
1499+
EntryPoint = "PyUnicodeUCS4_FromEncodedObject")]
15141500
internal unsafe static extern IntPtr
15151501
PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);
15161502

@@ -1533,8 +1519,7 @@ internal unsafe static extern IntPtr
15331519
PyUnicode_AsUnicode(IntPtr ob);
15341520

15351521
[DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
1536-
EntryPoint = "PyUnicodeUCS4_FromOrdinal",
1537-
CharSet = CharSet.Unicode)]
1522+
EntryPoint = "PyUnicodeUCS4_FromOrdinal")]
15381523
internal unsafe static extern IntPtr
15391524
PyUnicode_FromOrdinal(int c);
15401525
#endif

0 commit comments

Comments
 (0)
0