OSDN Git Service

na-get-lib,チケット #36130 に関連して、更新パッケージから非対応パッケージを除外するようにした
[applistation/AppliStation.git] / na-get-lib / NaGet.InteropServices / PEFileInfoUtils.cs
index 489bcc9..9416f5c 100644 (file)
@@ -4,6 +4,29 @@ using System.Runtime.InteropServices;
 \r
 namespace NaGet.InteropServices\r
 {      \r
+       /// <summary>\r
+       /// PE\83t\83@\83C\83\8b\82Ì\8eí\97Þ\r
+       /// </summary>\r
+       public enum PEFileType : uint\r
+       {\r
+               /// <summary>\r
+               /// \95s\96¾\82È\8c`\8e®\81A\82 \82é\82¢\82ÍPE\83t\83@\83C\83\8b\83w\83b\83_\82ð\8e\9d\82½\82È\82¢\r
+               /// </summary>\r
+               Unknown = 0,\r
+               /// <summary>\r
+               /// Windows\83R\83\93\83\\81[\83\8b\83A\83v\83\8a\83P\81[\83V\83\87\83\93\r
+               /// </summary>\r
+               WinConsole = 1,\r
+               /// <summary>\r
+               /// Windows GUI\83A\83v\83\8a\83P\81[\83V\83\87\83\93\r
+               /// </summary>\r
+               WinGUI = 2,\r
+               /// <summary>\r
+               /// MS-DOS(\8by\82Ñ\83R\83}\83\93\83h\83v\83\8d\83\93\83v\83g)\82Å\82ÌCOM\83t\83@\83C\83\8b\r
+               /// </summary>\r
+               MSDosCom = 3,\r
+       }\r
+       \r
        public sealed class PEFileInfoUtils\r
        {\r
                // \8cÄ\82Ñ\8fo\82µ\8bÖ\8e~\r
@@ -12,29 +35,6 @@ namespace NaGet.InteropServices
                }\r
                \r
                /// <summary>\r
-               /// PE\83t\83@\83C\83\8b\82Ì\8eí\97Þ\r
-               /// </summary>\r
-               public enum PEFileType : uint\r
-               {\r
-                       /// <summary>\r
-                       /// \95s\96¾\82È\8c`\8e®\81A\82 \82é\82¢\82ÍPE\83t\83@\83C\83\8b\83w\83b\83_\82ð\8e\9d\82½\82È\82¢\r
-                       /// </summary>\r
-                       Unknown = 0,\r
-                       /// <summary>\r
-                       /// Windows\83R\83\93\83\\81[\83\8b\83A\83v\83\8a\83P\81[\83V\83\87\83\93\r
-                       /// </summary>\r
-                       WinConsole = 1,\r
-                       /// <summary>\r
-                       /// Windows GUI\83A\83v\83\8a\83P\81[\83V\83\87\83\93\r
-                       /// </summary>\r
-                       WinGUI = 2,\r
-                       /// <summary>\r
-                       /// MS-DOS(\8by\82Ñ\83R\83}\83\93\83h\83v\83\8d\83\93\83v\83g)\82Å\82ÌCOM\83t\83@\83C\83\8b\r
-                       /// </summary>\r
-                       MSDosCom = 3,\r
-               }\r
-               \r
-               /// <summary>\r
                /// \93n\82³\82ê\82½\8eÀ\8ds\83t\83@\83C\83\8b\82Ì\8eí\97Þ\82ð\95Ô\82·\81B\93à\95\94\82ÅSHGetFileInfo\82ð\8eg\97p\81B\r
                /// </summary>\r
                /// <param name="path">\8eÀ\8ds\83t\83@\83C\83\8b(*.exe,*.dll)\82Ö\82Ì\83p\83X</param>\r
@@ -130,7 +130,7 @@ namespace NaGet.InteropServices
                                throw new FileNotFoundException(null, pszPath);\r
                        }\r
                        \r
-                       IntPtr hSuccess = SHGetFileInfo(pszPath, 0, ref psfi, (uint)Marshal.SizeOf(psfi), (uint) uFlags);\r
+                       IntPtr hSuccess = SHGetFileInfo(pszPath, dwFileAttributes, ref psfi, (uint)Marshal.SizeOf(psfi), (uint) uFlags);\r
                        if (hSuccess == IntPtr.Zero) {\r
                                throw new IOException(string.Format("Maybe {0} is not a executable file.", pszPath));\r
                        }\r