Fix 'image properties' for Unicode characters

Fix issue #31
d2phap · Jan 1, 2016 · d0be6cf · d0be6cf
1 parent f71dd2b
commit d0be6cf
Show file tree

Hide file tree

Showing 5 changed files with 139 additions and 130 deletions.
diff --git a/Source/Components/ImageGlass.Library/Image/ImageInfo.cs b/Source/Components/ImageGlass.Library/Image/ImageInfo.cs
@@ -39,9 +39,13 @@ private struct SHELLEXECUTEINFO
             public int cbSize;
             public int fMask;
             public IntPtr hwnd;
+            [MarshalAs(UnmanagedType.LPWStr)]
             public string lpVerb;
+            [MarshalAs(UnmanagedType.LPWStr)]
             public string lpFile;
+            [MarshalAs(UnmanagedType.LPWStr)]
             public string lpParameters;
+            [MarshalAs(UnmanagedType.LPWStr)]
             public string lpDirectory;
             public int nShow;
             public IntPtr hInstApp;
@@ -53,8 +57,8 @@ private struct SHELLEXECUTEINFO
             public IntPtr hProcess;
         }
 
-        [DllImport("shell32.dll", EntryPoint = "ShellExecuteEx")]
-        private static extern int ShellExecute(ref SHELLEXECUTEINFO s);
+        [DllImport("shell32.dll", CharSet = CharSet.Auto)]
+        private static extern int ShellExecuteEx(ref SHELLEXECUTEINFO s);
 
         /// <summary>
         /// Show file property dialog
@@ -74,7 +78,7 @@ public static void DisplayFileProperties(string fileName, IntPtr hwnd)
             shInfo.lpVerb = "properties";
             shInfo.hwnd = hwnd;
 
-            ShellExecute(ref shInfo);
+            ShellExecuteEx(ref shInfo);
         }
 
         /// <summary>

diff --git a/Source/ImageGlass/Properties/AssemblyInfo.cs b/Source/ImageGlass/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Duong Dieu Phap")]
 [assembly: AssemblyProduct("ImageGlass 3")]
-[assembly: AssemblyCopyright("Copyright © 2010-2015 by Duong Dieu Phap")]
+[assembly: AssemblyCopyright("Copyright © 2010-2016 by Duong Dieu Phap")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Source/ImageGlass/frmMain.Designer.cs b/Source/ImageGlass/frmMain.Designer.cs