Commit: bac4db89f68c658ed2954910b4f295f8cccc7d90 - NotifyMessage (git)

Notifying a message in Action center.

Commit MetaInfo

• Revision: bac4db89f68c658ed2954910b4f295f8cccc7d90 (tree)
• Time: 2015-01-31 13:46:21
• Author: JeffyTS <JeffyTS@outl...>
• Commiter: JeffyTS

Log Message

Improved checking whether VM tools running.

Change Summary

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

Incremental Difference

--- a/CtrlVIX/CtrlVix.cs
+++ b/CtrlVIX/CtrlVix.cs
@@ -125,19 +125,27 @@ namespace CtrlVix
                     CloseVixObject(IVM);
                     IHost.Disconnect();
                     // 数回再実行する
-                    for (int i = 1; i <= 10; i++)
+                    for (int i = 1; i <= 5; i++)
                     {
 #if DEBUG
                         Debug.WriteLine("VIX: ReRunVMControl x" + i.ToString("D"));
 #endif
                         System.Threading.Thread.Sleep(5000);    // 5sec wait
                         if (reRunVMOperation(vmxFilePath, powerOP)) return true;
+                        // if (GetVMState(vmxFilePath) != Constants.VMSTATE.ERROR) return true;
                     }
-                    ErrMessage(VixCOM.Constants.VIX_E_POWEROP_SCRIPTS_NOT_AVAILABLE);
+                    if (CheckToolsRunnnging(vmxFilePath) != Constants.TOOLS_RUNNING.RUNNING)
+                    {
+                        // toolが動いていないときはエラーとはしない
+                        // ErrMessage(VixCOM.Constants.VIX_E_TIMEOUT_WAITING_FOR_TOOLS);
+                        return true;
+                    }
+                    ErrMessage(VixCOM.Constants.VIX_E_TIMEOUT_WAITING_FOR_TOOLS);
                     return false;
                 }
                 // SUSPED させたとき VM_NOT_RUNNNINGはエラーとはしない
-                else if ((powerOP == Constants.POWEROP.SUSPEND) && (IVixLib.ErrorCode(err) == VixCOM.Constants.VIX_E_VM_NOT_RUNNING))
+                else if ((powerOP == Constants.POWEROP.SUSPEND) &&
+                                                (IVixLib.ErrorCode(err) == VixCOM.Constants.VIX_E_VM_NOT_RUNNING))
                 {
                     // NOP
                 }
@@ -497,6 +505,9 @@ namespace CtrlVix
             if ((toolsState & VixCOM.Constants.VIX_TOOLSSTATE_RUNNING) == VixCOM.Constants.VIX_TOOLSSTATE_RUNNING)
             {
                 vmState = vmState | VixCOM.Constants.VIX_POWERSTATE_TOOLS_RUNNING;  // プロパティを見てもちゃんと判定できないので手動でフラグを立てる
+//#if DEBUG
+//                Debug.WriteLine("VIX: Can't determine tools running.");
+//#endif
             }
             CloseVixObject(IVM);
             IHost.Disconnect();
@@ -661,13 +672,22 @@ namespace CtrlVix
         private void ErrMessage(ulong err)
         {
             VixCOM.IVixLib IVixLib = new VixCOM.VixLib();
-            if (err == 0x4000)
+            if (err == VixCOM.Constants.VIX_E_VM_NOT_FOUND) // 0x4000
             {
 #if DEBUG
                 Debug.WriteLine("VIX: VIX file not found");
 #endif
                 return;      // vix file not found no時は無視する
             }
+            /***
+            if (err == VixCOM.Constants.VIX_E_POWEROP_SCRIPTS_NOT_AVAILABLE) // 0x3009
+            {
+#if DEBUG
+                Debug.WriteLine("VIX: VIX_E_POWEROP_SCRIPTS_NOT_AVAILABLE");
+#endif
+                return;      // VIX_E_POWEROP_SCRIPTS_NOT_AVAILABLE時は無視する
+            }
+            ***/
 #if DEBUG
             // 文字化けのため
             string a = IVixLib.GetErrorText(err, null);

--- a/CtrlVIX/Properties/AssemblyInfo.cs
+++ b/CtrlVIX/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]

--- a/VMwPlayerTaskTray/MainFormSub.cs
+++ b/VMwPlayerTaskTray/MainFormSub.cs
@@ -35,6 +35,7 @@ namespace VMwPlayerTaskTray
         private const string MSG_BALN_WARN = "GUI/NoGUI couldn't be determined when guest OS started by \"VMware Player\".  " +
                                              "It might be cause of loosing control.";
         private const string MSG_BALN_NO_VMX_FILE = ".vmx\" file not found. Check your VM path.";
+        private const string MSG_BALN_NOT_RUNNING_VMTOOLS = "VM tools might be not running. Check your VM.";
 
         // クラス内のグローバル変数
         private enum VMSTATE : int  // ChangeMenuItem()
@@ -66,6 +67,7 @@ namespace VMwPlayerTaskTray
             POWERED_OFF,
             CANNOT_DEFINE_RUNNING_MODE,
             NO_VMXFILE,
+            NOT_RUNNING_VMTOOLS,
             ERROR = 0xffff
         };
 
@@ -267,29 +269,38 @@ namespace VMwPlayerTaskTray
             }
             else if (vmState == VMSTATE.POWERED_ON)
             {
-                switch (Vix.CheckRunningMode(vmxFilePath))
+                if (Vix.CheckToolsRunnnging(vmxFilePath) != CtrlVix.Constants.TOOLS_RUNNING.RUNNING)
                 {
-                    case CtrlVix.Constants.RUNNING_MODE.GUI:
-                        // GUI mode
-                        SetMenuItem(MENU_MODE.RUNNING_GUI);
+                        SetMenuItem(MENU_MODE.NOT_RUNNING_VMTOOLS);
 #if DEBUG
-                        Debug.WriteLine("RUNNING_GUI");
+                        Debug.WriteLine("NOT_RUNNING_VMTOOLS");
 #endif
-                        break;
-                    case CtrlVix.Constants.RUNNING_MODE.NOGUI:
-                        // No GUI mode
-                        SetMenuItem(MENU_MODE.RUNNING_NOGUI);
+                }
+                else{
+                    switch (Vix.CheckRunningMode(vmxFilePath))
+                    {
+                        case CtrlVix.Constants.RUNNING_MODE.GUI:
+                            // GUI mode
+                            SetMenuItem(MENU_MODE.RUNNING_GUI);
 #if DEBUG
-                        Debug.WriteLine("RUNNING_NOGUI");
+                            Debug.WriteLine("RUNNING_GUI");
 #endif
-                        break;
-                    case CtrlVix.Constants.RUNNING_MODE.CANNOT_DETERMINE:
-                        // Guest OS started by VMware Player - can't determine GUI/NGUI
-                        SetMenuItem(MENU_MODE.CANNOT_DEFINE_RUNNING_MODE);
+                            break;
+                        case CtrlVix.Constants.RUNNING_MODE.NOGUI:
+                            // No GUI mode
+                            SetMenuItem(MENU_MODE.RUNNING_NOGUI);
 #if DEBUG
-                        Debug.WriteLine("CANNOT_DEFINE_RUNNING_MODE");
+                            Debug.WriteLine("RUNNING_NOGUI");
 #endif
-                        break;
+                            break;
+                        case CtrlVix.Constants.RUNNING_MODE.CANNOT_DETERMINE:
+                            // Guest OS started by VMware Player - can't determine GUI/NGUI
+                            SetMenuItem(MENU_MODE.CANNOT_DEFINE_RUNNING_MODE);
+#if DEBUG
+                            Debug.WriteLine("CANNOT_DEFINE_RUNNING_MODE");
+#endif
+                            break;
+                    }
                 }
             }
             else if (vmState == VMSTATE.NO_VMXFILE)
@@ -397,6 +408,16 @@ namespace VMwPlayerTaskTray
                     this.notifyIcon_MainForm.Icon = Properties.Resources.VMwPlayerTaskTray_err;
                     this.notifyIcon_MainForm.ShowBalloonTip(500);   // バルーンTip表示
                     break;
+                case MENU_MODE.NOT_RUNNING_VMTOOLS:
+                    ToolStripMenuItem_GoGUI.Enabled = false;
+                    ToolStripMenuItem_GoNoGUI.Enabled = false;
+                    ToolStripMenuItem_GoSuspend.Enabled = false;
+                    ToolStripMenuItem_OtherCommand.Enabled = false;
+                    this.notifyIcon_MainForm.Text = "VM tools not runnning - " + vmxName;
+                    this.notifyIcon_MainForm.BalloonTipText = "\"" + vmxName + MSG_BALN_NOT_RUNNING_VMTOOLS;
+                    this.notifyIcon_MainForm.Icon = Properties.Resources.VMwPlayerTaskTray_err;
+                    this.notifyIcon_MainForm.ShowBalloonTip(500);   // バルーンTip表示
+                    break;
                 case MENU_MODE.ERROR:
                 default:
                     ToolStripMenuItem_GoGUI.Enabled = false;

--- a/VMwPlayerTaskTray/Properties/AssemblyInfo.cs
+++ b/VMwPlayerTaskTray/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.*")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.*")]
+[assembly: AssemblyFileVersion("1.1.1.0")]

--- a/readme.txt
+++ b/readme.txt
@@ -40,6 +40,7 @@ Rlease & modify
 	2015/01/10	1.0.4	Separated source files.
 	2015/01/20	1.0.5	Improved error messages.
 	2015/01/22	1.1.0	Change to x64 appication.
+	2015/01/31	1.1.1	Improved checking whether VM tools running.