Change charsets to explicitly unicode in System.Drawing.Common (dotne…

…t#36718) * Change charsets to explicitly unicode. * Remove ActiveIssue.
stark-lang · Apr 9, 2019 · 02d4a83 · 02d4a83
1 parent 5023c24
commit 02d4a83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/System.Drawing.Common/src/System/Drawing/NativeStructs.Unix.cs b/src/System.Drawing.Common/src/System/Drawing/NativeStructs.Unix.cs
@@ -34,7 +34,7 @@
 
 namespace System.Drawing
 {
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
     internal struct LOGFONT
     {
         internal int lfHeight;

diff --git a/src/System.Drawing.Common/tests/FontTests.cs b/src/System.Drawing.Common/tests/FontTests.cs
@@ -820,7 +820,6 @@ public void ToLogFont_NullGraphics_ThrowsArgumentNullException()
             }
         }
 
-        [ActiveIssue(36683)]
         [ConditionalFact(Helpers.IsDrawingSupported)]
         public void ToLogFont_DisposedGraphics_ThrowsArgumentException()
         {
@@ -835,7 +834,7 @@ public void ToLogFont_DisposedGraphics_ThrowsArgumentException()
             }
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         public class LOGFONT
         {
             public int lfHeight;