Commit: eb8b95171697a477a93a5863691ea84449c967ee - NotifyMessage (git)

Notifying a message in Action center.

Commit MetaInfo

• Revision: eb8b95171697a477a93a5863691ea84449c967ee (tree)
• Zeit: 2015-09-13 13:03:49
• Autor: JeffyTS <JeffyTS@outl...>
• Commiter: JeffyTS

Log Message

Improved code and added to remember a former window pos until exitting program.

Ändern Zusammenfassung

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

Diff

--- a/VMwPlayerTaskTray/MainForm.cs
+++ b/VMwPlayerTaskTray/MainForm.cs
@@ -28,7 +28,7 @@ namespace VMwPlayerTaskTray
                                          "\r\n" +
                                          " Option:\r\n" +
                                          "   /gui | /nogui | (none)\r\n" +
-                                         "   /pos num_left num_top";
+                                         "   /pos num_left num_top | (none)";
         private const string MSG_RUN_DUP = PROGRAM_NAME + " has been already running with \r\n" + 
                                           "same guest OS.\r\n" +
                                           "\r\n" +

--- a/VMwPlayerTaskTray/MainFormSub.cs
+++ b/VMwPlayerTaskTray/MainFormSub.cs
@@ -10,6 +10,8 @@ using System.Reflection;    // Add
 using System.Management;    // Add
 using System.Diagnostics;   // Add
 using System.IO;            // Add
+using System.Runtime.InteropServices; // Add DLL Import
+
 
 namespace VMwPlayerTaskTray
 {
@@ -138,6 +140,9 @@ namespace VMwPlayerTaskTray
                 case VMCTRL.GO_NOGUI:
                     if ((vmState == VMSTATE.POWERED_ON) && (Vix.CheckRunningMode(vmxFilePath) == Constants.RUNNING_MODE.GUI))
                     {
+                        // get & save current window pos
+                        getPlayerWindowPos(out Program.moveWindow_left, out Program.moveWindow_top);
+
                         // Go to Suspend mode
                         if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.SUSPEND)) return false;
                         //@@@for (int i = 0; i < 10; i++)
@@ -160,6 +165,11 @@ namespace VMwPlayerTaskTray
                     if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.POWER_ON_NOGUI)) return false;
                     break;
                 case VMCTRL.GO_SUSPEND:
+                    if ((vmState == VMSTATE.POWERED_ON) && (Vix.CheckRunningMode(vmxFilePath) == Constants.RUNNING_MODE.GUI))
+                    {
+                        // get & save current window pos
+                        getPlayerWindowPos(out Program.moveWindow_left, out Program.moveWindow_top);
+                    }
                     // Go to Suspend mode
                     if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.SUSPEND)) return false;
                     break;
@@ -168,10 +178,20 @@ namespace VMwPlayerTaskTray
                     if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.ACPI_RESET)) return false;
                     break;
                 case VMCTRL.GO_ACPI_POWER_OFF:
+                    if ((vmState == VMSTATE.POWERED_ON) && (Vix.CheckRunningMode(vmxFilePath) == Constants.RUNNING_MODE.GUI))
+                    {
+                        // get & save current window pos
+                        getPlayerWindowPos(out Program.moveWindow_left, out Program.moveWindow_top);
+                    }
                     // ACPI shutdown
                     if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.ACPI_POWER_OFF)) return false;
                     break;
                 case VMCTRL.GO_RESET:
+                    if ((vmState == VMSTATE.POWERED_ON) && (Vix.CheckRunningMode(vmxFilePath) == Constants.RUNNING_MODE.GUI))
+                    {
+                        // get & save current window pos
+                        getPlayerWindowPos(out Program.moveWindow_left, out Program.moveWindow_top);
+                    }
                     // Harware reset
                     if (!Vix.VMOperation(vmxFilePath, CtrlVix.Constants.POWEROP.HW_RESET)) return false;
                     break;
@@ -528,37 +548,71 @@ namespace VMwPlayerTaskTray
 
             if (pid != 0)
             {
-                if (move_window(pid, left, top, "VMPlayerFrame"))              // Windowを移動する
+                if (moveWindow(pid, left, top, "VMPlayerFrame"))              // Windowを移動する
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private bool getPlayerWindowPos(out int left, out int top)
+        {
+            CtrlVIX Vix = new CtrlVIX();
+            int pid = Vix.GetVMProcessID(vmxFilePath);
+
+            if (pid != 0)
+            {
+                if (getWindowPos(pid, out left, out top, "VMPlayerFrame"))              // Windowの top, leftを取得する
                 {
                     return true;
                 }
             }
+            left = 0; top = 0;
             return false;
         }
 
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static IntPtr GetParent(IntPtr hwnd);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static IntPtr GetWindow(IntPtr hWnd, int wCmd);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static IntPtr FindWindow(String lpClassName, String lpWindowName);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static IntPtr GetWindowThreadProcessId(IntPtr hWnd, out int lpdwprocessid);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static int IsWindowVisible(IntPtr hWnd);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static IntPtr GetAncestor(IntPtr hWnd, uint gaFlags);
-        private struct RECT
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        public struct RECT
         {
             public int Left { get; set; }
             public int Top { get; set; }
             public int Right { get; set; }
             public int Bottom { get; set; }
         }
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static bool MoveWindow(IntPtr hWnd, int x, int y, int nWidth, int nHeight, int bRepaint);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, int wParam, StringBuilder lParam);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private static extern int GetWindowTextLength(IntPtr hWnd);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
-        [System.Runtime.InteropServices.DllImport("user32.dll")] private extern static IntPtr FindWindowEx(IntPtr hWndParent, IntPtr hWndChildAfter, String lpszClass, String lpszWindow);
+
+        internal class NativeMethods
+        {
+            [DllImport("user32.dll", EntryPoint = "GetParent", SetLastError = true)]
+            public static extern IntPtr GetParent(IntPtr hwnd);
+            [DllImport("user32.dll", EntryPoint = "GetWindow", SetLastError = true)]
+            public static extern IntPtr GetWindow(IntPtr hWnd, int wCmd);
+            [DllImport("user32.dll", EntryPoint = "FindWindow", SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+            public static extern IntPtr FindWindow(String lpClassName, String lpWindowName);
+            [DllImport("user32.dll", EntryPoint = "GetWindowThreadProcessId", SetLastError = true)]
+            public static extern Int32 GetWindowThreadProcessId(IntPtr hWnd, out int lpdwprocessid);
+            [DllImport("user32.dll", EntryPoint = "IsWindowVisible", SetLastError = true)]
+            public static extern int IsWindowVisible(IntPtr hWnd);
+            [DllImport("user32.dll", EntryPoint = "GetAncestor", SetLastError = true)]
+            public static extern IntPtr GetAncestor(IntPtr hWnd, uint gaFlags);
+            [DllImport("user32.dll", EntryPoint = "GetWindowRect", SetLastError = true)]
+            public static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+            [DllImport("user32.dll", EntryPoint = "MoveWindow", SetLastError = true)]
+            public static extern bool MoveWindow(IntPtr hWnd, int x, int y, int nWidth, int nHeight, int bRepaint);
+            [DllImport("user32.dll", EntryPoint = "SendMessage", SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+            public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, StringBuilder lParam);
+            [DllImport("user32.dll", EntryPoint = "GetWindowText", SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+            public static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
+            [DllImport("user32.dll", EntryPoint = "GetWindowTextLength", SetLastError = true)]
+            public static extern int GetWindowTextLength(IntPtr hWnd);
+            [DllImport("user32.dll", EntryPoint = "GetClassName", SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+            public static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+            [DllImport("user32.dll", EntryPoint = "FindWindowEx", SetLastError = true, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+            public static extern IntPtr FindWindowEx(IntPtr hWndParent, IntPtr hWndChildAfter, String lpszClass, String lpszWindow);
+        }
 
         // 指定したPIDのWindowを移動させる
-        private bool move_window(int pid, int left, int top, string classname)
+        private bool moveWindow(int pid, int left, int top, string classname)
         {
             RECT rect = new RECT();
             rect.Left = 0; rect.Top = 0; rect.Right = 0; rect.Bottom = 0;
@@ -570,16 +624,16 @@ namespace VMwPlayerTaskTray
             {
                 return false;
             }
-            if (!GetWindowRect(hWnd, out rect))
+            if (!NativeMethods.GetWindowRect(hWnd, out rect))
             {
                 return false;
             }
-            if (!MoveWindow(hWnd, left, top, rect.Right - rect.Left, rect.Bottom - rect.Top, bRepaint_TRUE))
+            if (!NativeMethods.MoveWindow(hWnd, left, top, rect.Right - rect.Left, rect.Bottom - rect.Top, bRepaint_TRUE))
             {
                 return false;
             }
             System.Threading.Thread.Sleep(1000);
-            if (!GetWindowRect(hWnd, out rect))
+            if (!NativeMethods.GetWindowRect(hWnd, out rect))
             {
                 return false;
             }
@@ -590,6 +644,28 @@ namespace VMwPlayerTaskTray
             return true;
         }
 
+        // 指定したPIDのWindowのleft topを取得する
+        private bool getWindowPos(int pid, out int left, out int top, string classname)
+        {
+            RECT rect = new RECT();
+            rect.Left = 0; rect.Top = 0; rect.Right = 0; rect.Bottom = 0;
+            IntPtr hWnd = IntPtr.Zero;
+            IntPtr hWndChildAfter = IntPtr.Zero;
+
+            left = 0; top = 0;
+
+            if ((hWnd = getHwndFromPid(pid, classname)) == IntPtr.Zero)
+            {
+                return false;
+            }
+            if (!NativeMethods.GetWindowRect(hWnd, out rect))
+            {
+                return false;
+            }
+            left = rect.Left; top = rect.Top;
+            return true;
+        }
+
         // プロセスID(pid)をウィンドウハンドル(hWnd)に変換する
         private IntPtr getHwndFromPid(int pid, string classname)
         {
@@ -602,14 +678,14 @@ namespace VMwPlayerTaskTray
             // IntPtr parent = IntPtr.Zero, root = IntPtr.Zero, rootowner=IntPtr.Zero;
             StringBuilder csb = new StringBuilder(256);
 
-            hWnd = FindWindow(null, null);
+            hWnd = NativeMethods.FindWindow(null, null);
             while (hWnd != IntPtr.Zero)
             {
-                if (GetParent(hWnd) == IntPtr.Zero && IsWindowVisible(hWnd) != 0)
+                if (NativeMethods.GetParent(hWnd) == IntPtr.Zero && NativeMethods.IsWindowVisible(hWnd) != 0)
                 {
                     if (pid == getPidFromHwnd(hWnd))
                     {
-                        GetClassName(hWnd, csb, csb.Capacity);
+                        NativeMethods.GetClassName(hWnd, csb, csb.Capacity);
                         if (0 <= csb.ToString().IndexOf(classname))
                         {
 #if DEBUG
@@ -624,7 +700,7 @@ namespace VMwPlayerTaskTray
                 // parent = GetAncestor(hWnd, GA_PARENT);
                 // root = GetAncestor(hWnd, GA_ROOT);
                 // rootowner = GetAncestor(hWnd, GA_ROOTOWNER);
-                hWnd = GetWindow(hWnd, GW_HWNDNEXT);
+                hWnd = NativeMethods.GetWindow(hWnd, GW_HWNDNEXT);
             }
             return IntPtr.Zero;
         }
@@ -634,10 +710,8 @@ namespace VMwPlayerTaskTray
         {
             int pid;
 
-            GetWindowThreadProcessId(hWnd, out pid);
+            NativeMethods.GetWindowThreadProcessId(hWnd, out pid);
             return pid;
         }
-
-
     }
 }

--- 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.5.*")]
-[assembly: AssemblyFileVersion("1.1.5.0")]
+[assembly: AssemblyVersion("1.1.6.*")]
+[assembly: AssemblyFileVersion("1.1.6.0")]

--- a/readme.txt
+++ b/readme.txt
@@ -21,8 +21,8 @@
 			[NOTE]
 				You might be better to use shortcut files. See sample.lnk property.
 	Option:
-		/gui | (none)
-		/pos left top | (none)
+		/gui | /nogui | (none)
+		/pos num_left num_top | (none)
 
 Thanks to VMware,Inc and Microsoft Corporation.
 	This program has been developed on
@@ -50,6 +50,7 @@ Rlease & modify
 									Windows10 Professional 64bit.
 	2015/09/10	1.1.4	Add /pos option, changed Icons.
 	2015/09/11	1.1.5	Enabled GO NoGUI but diplaying an error message and going on running. 
+	2015/09/13	1.1.6	Improved code and added to remember a former window pos until exitting program.