Added WM_CLOSE handling back.

valyard · valyard · commit 0cc4f070fde2 · 2015-09-20T15:40:43.000-04:00
diff --git a/TouchScript.Inputs/TouchScript.Windows/InputSources/Win7TouchInput.cs b/TouchScript.Inputs/TouchScript.Windows/InputSources/Win7TouchInput.cs
@@ -154,6 +154,12 @@ private IntPtr wndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
                 case WM_TOUCH:
                     decodeTouches(wParam, lParam);
                     return IntPtr.Zero;
+                case WM_CLOSE:
+                    // Not having this crashes app on quit
+                    UnregisterTouchWindow(hWnd);
+                    SetWindowLongPtr(hWnd, -4, oldWndProcPtr);
+                    SendMessage(hWnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+                    return IntPtr.Zero;
                 default:
                     return CallWindowProc(oldWndProcPtr, hWnd, msg, wParam, lParam);
             }
@@ -214,6 +220,7 @@ private void decodeTouches(IntPtr wParam, IntPtr lParam)
         #region p/invoke
 
         // Touch event window message constants [winuser.h]
+        private const int WM_CLOSE = 0x0010;
         private const int WM_TOUCH = 0x0240;
 
         // Touch API defined structures [winuser.h]
@@ -245,6 +252,9 @@ private IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong)
             return new IntPtr(SetWindowLong32(hWnd, nIndex, dwNewLong.ToInt32()));
         }
 
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, IntPtr lParam);
+
         [DllImport("user32.dll")]
         private static extern IntPtr GetForegroundWindow();
 
diff --git a/TouchScript.Inputs/TouchScript.Windows/InputSources/Win8TouchInput.cs b/TouchScript.Inputs/TouchScript.Windows/InputSources/Win8TouchInput.cs
@@ -145,6 +145,11 @@ private IntPtr wndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
                 case WM_POINTERUPDATE:
                     decodeTouches(msg, wParam, lParam);
                     return IntPtr.Zero;
+                case WM_CLOSE:
+                    // Not having this crashes app on quit
+                    SetWindowLongPtr(hWnd, -4, oldWndProcPtr);
+                    SendMessage(hWnd, WM_CLOSE, IntPtr.Zero, IntPtr.Zero);
+                    return IntPtr.Zero;
                 default:
                     return CallWindowProc(oldWndProcPtr, hWnd, msg, wParam, lParam);
             }
@@ -206,6 +211,7 @@ private void decodeTouches(uint msg, IntPtr wParam, IntPtr lParam)
         #region p/invoke
 
         // Touch event window message constants [winuser.h]
+        private const int WM_CLOSE = 0x0010;
         private const int WM_TOUCH = 0x0240;
         private const int WM_POINTERDOWN = 0x0246;
         private const int WM_POINTERUP = 0x0247;
@@ -270,6 +276,9 @@ private IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong)
             return new IntPtr(SetWindowLong32(hWnd, nIndex, dwNewLong.ToInt32()));
         }
 
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, IntPtr wParam, IntPtr lParam);
+
         [DllImport("user32.dll")]
         private static extern IntPtr GetForegroundWindow();
 
