コメントアウトしてた周りの確認。ソース更新。

※ただし、動かなかったので再度コメントアウトした。
juner · Apr 15, 2018 · 0a8274f · 0a8274f
1 parent 2b3575a
commit 0a8274f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/WinCred/Interop/Credential.cs b/WinCred/Interop/Credential.cs
@@ -195,7 +195,7 @@ public WinCred.Credential ToManaged()
                 LastWritten = LastWritten.ToDateTime(),
                 CredentialBlob = CredentialBlob,
                 Persist = Persist,
-                //Attributes = (Attributes ?? Enumerable.Empty<UnmanagedCredentialAttribute>())
+                //Attributes = (Attributes ?? Enumerable.Empty<CredentialAttribute>())
                 //    .Select(uca => uca.ToManaged())
                 //    .ToArray(),
                 TargetAlias = TargetAlias,

diff --git a/WinCred/Interop/CredentialAttribute.cs b/WinCred/Interop/CredentialAttribute.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Advapi32.WinCred.Unmanaged
 {
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto, Pack = 4)]
     public struct CredentialAttribute : IUnmanaged<WinCred.CredentialAttribute>
     {
+        [MarshalAs(UnmanagedType.LPWStr)]
         public string Keyword;
         public uint Flags;
         uint ValueSize;
@@ -54,13 +56,13 @@ public byte[] Value
         public static CredentialAttribute From(IntPtr Ptr)
         {
             return (CredentialAttribute)Marshal.PtrToStructure(Ptr, typeof(CredentialAttribute));
-            //var Size = Marshal.SizeOf(typeof(UnmanagedCredentialAttribute));
+            //var Size = Marshal.SizeOf(typeof(CredentialAttribute));
             //var bytes = new byte[Size];
-            //Marshal.Copy(Ptr, bytes, 0, Size);
-            //var Keyword = Marshal.PtrToStringBSTR(new IntPtr(BitConverter.ToInt32(bytes, 0)));
-            //var Flags = BitConverter.ToUInt32(bytes, 4);
+            //var KeywordPtr = Marshal.ReadIntPtr(Ptr, 0);
+            //var Keyword = Marshal.PtrToStringUni(KeywordPtr);
+            //var Flags = (uint)Marshal.ReadInt32(Ptr, 4);
             //var _Value = new IntPtr(BitConverter.ToInt32(bytes, 8));
-            //return new UnmanagedCredentialAttribute
+            //return new CredentialAttribute
             //{
             //    Keyword = Keyword,
             //    Flags = Flags,