Commit: a59b49f158ac8cba6c95ddc08b19df6cf84b2b30 - NotifyMessage (git)

Notifying a message in Action center.

Commit MetaInfo

• Revision: a59b49f158ac8cba6c95ddc08b19df6cf84b2b30 (tree)
• Zeit: 2015-01-05 15:44:14
• Autor: JeffyTS <JeffyTS@outl...>
• Commiter: JeffyTS

Log Message

Coresponded to workingDir.

Ändern Zusammenfassung

• modified: CtrlVIX/CtrlVix.cs
• modified: CtrlVIX/Properties/AssemblyInfo.cs
• modified: VMwPlayerTaskTray/Form1.cs
• modified: VMwPlayerTaskTray/Properties/AssemblyInfo.cs
• modified: readme.txt

Diff

--- a/CtrlVIX/CtrlVix.cs
+++ b/CtrlVIX/CtrlVix.cs
@@ -370,7 +370,7 @@ namespace CtrlVix
             return Constants.TOOLS_RUNNING.NOT_RUNNING;
         }
 
-        public Constants.POWER_OFF_MODE CheckPowerOffMode(string vmxFilePath)
+        public Constants.POWER_OFF_MODE CheckPowerOffMode(string vmxFilePath, string workingDir)
         {
             int vmState;
             string Dir;
@@ -395,7 +395,8 @@ namespace CtrlVix
             // エラーでファイルが残った場合などはうまく判定できない可能性あり
             try
             {
-                Dir = System.IO.Path.GetDirectoryName(vmxFilePath);
+                // Dir = System.IO.Path.GetDirectoryName(vmxFilePath);
+                Dir = workingDir;
                 VMname = System.IO.Path.GetFileNameWithoutExtension(vmxFilePath);
                 VMSSname = VMname + "-*.vmss";
 

--- a/CtrlVIX/Properties/AssemblyInfo.cs
+++ b/CtrlVIX/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("CtrlVIX")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright ©  2014-2015 T.S. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]

--- a/VMwPlayerTaskTray/Form1.cs
+++ b/VMwPlayerTaskTray/Form1.cs
@@ -12,6 +12,10 @@ using CtrlVix;              // Add
 using System.Reflection;    // Add
 using System.Management;    // Add
 using System.Diagnostics;   // Add
+using System.IO;                        // Add
+using System.Text.RegularExpressions;   // Add
+
+
 
 
 namespace VMwPlayerTaskTray
@@ -48,6 +52,7 @@ namespace VMwPlayerTaskTray
                                                   
         // クラス内のグローバル変数
         private string vmxFilePath = "";
+        private string workingDir = "";
         private VMSTATE vmState = VMSTATE.UNDEFINED;
         private enum VMSTATE : int  // ChangeMenuItem()
         {
@@ -93,6 +98,7 @@ namespace VMwPlayerTaskTray
             {
                 vmxFilePath = Program.vmxFilePath;  // Mainで設定されたvmxFilePathをコピー
                 vmxName = System.IO.Path.GetFileNameWithoutExtension(vmxFilePath);  // vmx 名を作成
+                workingDir = GetWorkingDir(vmxFilePath);    //workingDirの取得
 
                 if (CountProcess(PROGRAM_NAME, vmxName) > 1)     //　二重起動のチェック
                 {
@@ -286,7 +292,8 @@ namespace VMwPlayerTaskTray
                         // Go to Suspend mode
                         if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.SUSPEND)) return false;
                         while (((state = Vix.GetVMState(vmxFilePath)) != CtrlVix.Constants.VMSTATE.POWERED_OFF)
-                                    && ((pwOff = Vix.CheckPowerOffMode(vmxFilePath)) != CtrlVix.Constants.POWER_OFF_MODE.SUSPENDED))
+                                    && ((pwOff = Vix.CheckPowerOffMode(vmxFilePath, workingDir)) 
+                                                        != CtrlVix.Constants.POWER_OFF_MODE.SUSPENDED))
                         {
                             if (state == CtrlVix.Constants.VMSTATE.ERROR) return false;
                             if (pwOff == CtrlVix.Constants.POWER_OFF_MODE.ERROR) return false;
@@ -302,7 +309,8 @@ namespace VMwPlayerTaskTray
                         // Go to Suspend mode
                         if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.SUSPEND)) return false;
                         while (((state = Vix.GetVMState(vmxFilePath)) != CtrlVix.Constants.VMSTATE.POWERED_OFF)
-                                    && ((pwOff = Vix.CheckPowerOffMode(vmxFilePath)) != CtrlVix.Constants.POWER_OFF_MODE.SUSPENDED))
+                                    && ((pwOff = Vix.CheckPowerOffMode(vmxFilePath, workingDir)) 
+                                                        != CtrlVix.Constants.POWER_OFF_MODE.SUSPENDED))
                         {
                             if (state == CtrlVix.Constants.VMSTATE.ERROR) return false;
                             if (pwOff == CtrlVix.Constants.POWER_OFF_MODE.ERROR) return false;
@@ -349,7 +357,8 @@ namespace VMwPlayerTaskTray
                     break;
                 case VMCTRL.GO_SUSPEND:
                     while (((state = Vix.GetVMState(vmxFilePath)) != CtrlVix.Constants.VMSTATE.POWERED_OFF)
-                                && ((pwOff = Vix.CheckPowerOffMode(vmxFilePath)) != CtrlVix.Constants.POWER_OFF_MODE.SUSPENDED))
+                                && ((pwOff = Vix.CheckPowerOffMode(vmxFilePath, workingDir))
+                                                != CtrlVix.Constants.POWER_OFF_MODE.SUSPENDED))
                     {
                         if (state == CtrlVix.Constants.VMSTATE.ERROR) return false;
                         if (pwOff == CtrlVix.Constants.POWER_OFF_MODE.ERROR) return false;
@@ -441,7 +450,7 @@ namespace VMwPlayerTaskTray
             }
             else
             {
-                switch (Vix.CheckPowerOffMode(vmxFilePath))
+                switch (Vix.CheckPowerOffMode(vmxFilePath, workingDir))
                 {
                     case Constants.POWER_OFF_MODE.SUSPENDED:
                         // Suspended
@@ -580,6 +589,70 @@ namespace VMwPlayerTaskTray
             return count;
         }
 
+        private string GetWorkingDir(string vmxFilePath)
+        {
+            foreach (var section in ReadVMX(vmxFilePath)) {
+                // section.Key は無視
+                foreach (var pair in section.Value) {
+                    if (pair.Key == "workingDir") return (pair.Value.Substring(1, pair.Value.Length - 2));
+                }
+            }
+            return System.IO.Path.GetDirectoryName(vmxFilePath);
+        }
+
+        private static Dictionary<string, Dictionary<string, string>> ReadVMX(string file)
+        {
+            using (var reader = new StreamReader(file))
+            {
+                var sections = new Dictionary<string, Dictionary<string, string>>(StringComparer.Ordinal);
+                var regexSection = new Regex(@"^\s*\[(?<section>[^\]]+)\].*$", RegexOptions.Singleline
+                                                                            | RegexOptions.CultureInvariant);
+                var regexNameValue = new Regex(@"^\s*(?<name>[^=]+)=(?<value>.*?)(\s+;(?<comment>.*))?$",
+                                                    RegexOptions.Singleline | RegexOptions.CultureInvariant);
+                var currentSection = string.Empty;
+
+                // セクション名が明示されていない先頭部分のセクション名を""として扱う
+                sections[string.Empty] = new Dictionary<string, string>();
+
+                for (; ; )
+                {
+                    var line = reader.ReadLine();
+
+                    if (line == null) break;
+
+                    // 空行は読み飛ばす
+                    if (line.Length == 0) continue;
+
+                    // コメント行は読み飛ばす
+                    if (line.StartsWith(";", StringComparison.Ordinal)) continue;
+                    else if (line.StartsWith("#", StringComparison.Ordinal)) continue;
+
+                    var matchNameValue = regexNameValue.Match(line);
+
+                    if (matchNameValue.Success)
+                    {
+                        // name=valueの行
+                        sections[currentSection][matchNameValue.Groups["name"].Value.Trim()]
+                                                        = matchNameValue.Groups["value"].Value.Trim();
+                        continue;
+                    }
+
+                    var matchSection = regexSection.Match(line);
+
+                    if (matchSection.Success)
+                    {
+                        // [section]の行
+                        currentSection = matchSection.Groups["section"].Value;
+
+                        if (!sections.ContainsKey(currentSection)) sections[currentSection] = new Dictionary<string, string>();
+
+                        continue;
+                    }
+                }
+                return sections;
+            }
+        }
+ 
         private void AboutDialog()
         {
             string message;

--- a/VMwPlayerTaskTray/Properties/AssemblyInfo.cs
+++ b/VMwPlayerTaskTray/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("VMwPlayerTaskTray")]
-[assembly: AssemblyCopyright("Copyright ©  2014 T.S. All rights reserved.")]
+[assembly: AssemblyCopyright("Copyright ©  2014-2015 T.S. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.*")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyFileVersion("1.0.2.0")]

--- a/readme.txt
+++ b/readme.txt
@@ -32,8 +32,9 @@ Thanks to VMware,Inc and Microsoft Corporation.
 Rlease & modify
 	--- Date --- Ver. -- Modify --
 	2014/04/01  1.0.0	First release for VMware Player 6.0.2 and VMware VIX 1.13.2.
-	2014/12/26  1.0.1	Changed developping environment to VMware Player 7.0.0 and VMware VIX 1.14.0
+	2014/12/26  1.0.1	Changed developping environment to VMware Player 7.0.0 and VMware VIX 1.14.0.
 	2015/01/05	1.0.1	Improved await proc and added readme.txt.
+	2015/01/05	1.0.2	Coresponded to workingDir.