Skip to content

Refactor Managed-Native conversion - ICustomMarshaler #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmuriart merged 8 commits into from
Feb 28, 2017
Merged

Refactor Managed-Native conversion - ICustomMarshaler #407

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6667669
Add ICustomMarshaler StrMarshaler
vmuriart Feb 25, 2017
d01f25f
Add ICustomMarshaler StrArrayMarshaler
vmuriart Feb 25, 2017
74440a6
Refactor Marshals
vmuriart Feb 25, 2017
e487076
Add ICustomMarshaler Utf8Marshaler
vmuriart Feb 25, 2017
ccd4521
Match PyUnicode_AsUnicode signature in UCS2/UCS4
vmuriart Feb 26, 2017
07f87de
Refactor GetManagedString
vmuriart Feb 26, 2017
edafdf2
Remove internal PyUnicode_AS_UNICODE
vmuriart Feb 26, 2017
78939c5
Refactor Encoding check
vmuriart Feb 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor GetManagedString
  • Loading branch information
@vmuriart
vmuriart committed Feb 28, 2017
commit 07f87de2ae0456d7e5c09333a09ab6bbbc11cf1f
34 changes: 22 additions & 12 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1725,7 +1725,20 @@ internal static IntPtr PyUnicode_FromString(string s)
return PyUnicode_FromUnicode(s, (s.Length));
}

internal unsafe static string GetManagedString(IntPtr op)
/// <summary>
/// Function to access the internal PyUnicode/PyString object and
/// convert it to a managed string with the correct encoding.
/// </summary>
/// <remarks>
/// We can't easily do this through through the CustomMarshaler's on
/// the returns because will have access to the IntPtr but not size.
/// <para />
/// For PyUnicodeType, we can't convert with Marshal.PtrToStringUni
/// since it only works for UCS2.
/// </remarks>
/// <param name="op">PyStringType or PyUnicodeType object to convert</param>
/// <returns>Managed String</returns>
internal static string GetManagedString(IntPtr op)
{
IntPtr type = PyObject_TYPE(op);

Expand All @@ -1741,18 +1754,15 @@ internal unsafe static string GetManagedString(IntPtr op)

if (type == Runtime.PyUnicodeType)
{
#if UCS4
IntPtr p = Runtime.PyUnicode_AsUnicode(op);
int length = Runtime.PyUnicode_GetSize(op);
int size = length * 4;
byte[] buffer = new byte[size];
Encoding encoding = UCS == 2 ? Encoding.Unicode : Encoding.UTF32;

IntPtr p = PyUnicode_AsUnicode(op);
int length = PyUnicode_GetSize(op);

int size = length * UCS;
var buffer = new byte[size];
Marshal.Copy(p, buffer, 0, size);
return Encoding.UTF32.GetString(buffer, 0, size);
#elif UCS2
IntPtr p = Runtime.PyUnicode_AsUnicode(op);
int length = Runtime.PyUnicode_GetSize(op);
return Marshal.PtrToStringUni(p, length);
#endif
return encoding.GetString(buffer, 0, size);
}

return null;
Expand Down