Modify WinUserNativeMethods, as the interface within changed for supp…

…orting multiple user on same machine do enc/dec
hpsa · Jun 1, 2016 · fc869cc · fc869cc
1 parent 02d5950
commit fc869cc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/HpToolsLauncher/WinUserNativeMethods.cs b/HpToolsLauncher/WinUserNativeMethods.cs
@@ -8,19 +8,19 @@ public static class WinUserNativeMethods
         private static class EncodeUtilsWrap
         {
             [DllImport("EncodeUtilsWrap", CallingConvention = CallingConvention.Cdecl)]
-            public static extern void UnprotectBSTRFromBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result);
+            public static extern void UnprotectBSTRFromBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result, [MarshalAs(UnmanagedType.Bool)] bool bCrypt);
 
             [DllImport("EncodeUtilsWrap", CallingConvention = CallingConvention.Cdecl)]
-            public static extern void ProtectBSTRToBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result);
+            public static extern void ProtectBSTRToBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result, [MarshalAs(UnmanagedType.Bool)] bool bCrypt);
         }
 
         private static class EncodeUtilsWrapD
         {
             [DllImport("EncodeUtilsWrapD", CallingConvention = CallingConvention.Cdecl)]
-            public static extern void UnprotectBSTRFromBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result);
+            public static extern void UnprotectBSTRFromBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result, [MarshalAs(UnmanagedType.Bool)] bool bCrypt);
 
             [DllImport("EncodeUtilsWrapD", CallingConvention = CallingConvention.Cdecl)]
-            public static extern void ProtectBSTRToBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result);
+            public static extern void ProtectBSTRToBase64([MarshalAs(UnmanagedType.BStr)] string input, [MarshalAs(UnmanagedType.BStr)] out string result, [MarshalAs(UnmanagedType.Bool)] bool bCrypt);
         }
 
         public static string ProtectBSTRToBase64(string clearData)
@@ -29,13 +29,13 @@ public static string ProtectBSTRToBase64(string clearData)
 
             try
             {
-                EncodeUtilsWrap.ProtectBSTRToBase64(clearData, out result);
+                EncodeUtilsWrap.ProtectBSTRToBase64(clearData, out result, true);
             }
             catch (DllNotFoundException)
             {
                 try
                 {
-                    EncodeUtilsWrapD.ProtectBSTRToBase64(clearData, out result);
+                    EncodeUtilsWrapD.ProtectBSTRToBase64(clearData, out result, true);
                 }
                 catch (DllNotFoundException)
                 {
@@ -55,11 +55,11 @@ public static string UnprotectBSTRFromBase64(string protectedData)
 
             try
             {
-                EncodeUtilsWrap.UnprotectBSTRFromBase64(protectedData, out result);
+                EncodeUtilsWrap.UnprotectBSTRFromBase64(protectedData, out result, true);
             }
             catch (DllNotFoundException)
             {
-                EncodeUtilsWrapD.UnprotectBSTRFromBase64(protectedData, out result);
+                EncodeUtilsWrapD.UnprotectBSTRFromBase64(protectedData, out result,true);
             }
 
             return result;

diff --git a/src/main/resources/HpToolsAborter.exe b/src/main/resources/HpToolsAborter.exe
diff --git a/src/main/resources/HpToolsLauncher.exe b/src/main/resources/HpToolsLauncher.exe
diff --git a/src/main/resources/LRAnalysisLauncher.exe b/src/main/resources/LRAnalysisLauncher.exe