Gesture stuffs working on Vista part 2

This also undoes eaf8c1e, which theoretically would reintroduce Bug 1696786. This is suboptimal, but I don't know how to make it work otherwise. Please pr a proper fix.

Author: K4sum1

widget/windows/nsWindow.cpp

@@ -7183,6 +7183,25 @@ void nsWindow::UserActivity() {
   }
 }
 
+LayoutDeviceIntPoint nsWindow::GetTouchCoordinates(WPARAM wParam,
+                                                   LPARAM lParam) {
+  LayoutDeviceIntPoint ret;
+  uint32_t cInputs = LOWORD(wParam);
+  if (cInputs != 1) {
+    // Just return 0,0 if there isn't exactly one touch point active
+    return ret;
+  }
+  PTOUCHINPUT pInputs = new TOUCHINPUT[cInputs];
+  if (mGesture.GetTouchInputInfo((HTOUCHINPUT)lParam, cInputs, pInputs)) {
+    ret.x = TOUCH_COORD_TO_PIXEL(pInputs[0].x);
+    ret.y = TOUCH_COORD_TO_PIXEL(pInputs[0].y);
+  }
+  delete[] pInputs;
+  // Note that we don't call CloseTouchInputHandle here because we need
+  // to read the touch input info again in OnTouch later.
+  return ret;
+}
+
 // Helper function for TouchDeviceNeedsPanGestureConversion(PTOUCHINPUT,
 // uint32_t).
 static bool TouchDeviceNeedsPanGestureConversion(HANDLE aSource) {
@@ -8239,24 +8258,6 @@ static bool IsTouchSupportEnabled(HWND aWnd) {
   return topWindow ? topWindow->IsTouchWindow() : false;
 }
 
-static Maybe<POINT> GetSingleTouch(WPARAM wParam, LPARAM lParam) {
-  Maybe<POINT> ret;
-  uint32_t cInputs = LOWORD(wParam);
-  if (cInputs != 1) {
-    return ret;
-  }
-  TOUCHINPUT input;
-  if (GetTouchInputInfo((HTOUCHINPUT)lParam, cInputs, &input,
-                        sizeof(TOUCHINPUT))) {
-    ret.emplace();
-    ret->x = TOUCH_COORD_TO_PIXEL(input.x);
-    ret->y = TOUCH_COORD_TO_PIXEL(input.y);
-  }
-  // Note that we don't call CloseTouchInputHandle here because we need
-  // to read the touch input info again in OnTouch later.
-  return ret;
-}
-
 // static
 bool nsWindow::DealWithPopups(HWND aWnd, UINT aMessage, WPARAM aWParam,
                               LPARAM aLParam, LRESULT* aResult) {
@@ -8289,7 +8290,6 @@ bool nsWindow::DealWithPopups(HWND aWnd, UINT aMessage, WPARAM aWParam,
   uint32_t popupsToRollup = UINT32_MAX;
 
   bool consumeRollupEvent = false;
-  Maybe<POINT> touchPoint;  // In screen coords.
 
   // If we rollup with animations but get occluded right away, we might not
   // advance the refresh driver enough for the animation to finish.
@@ -8303,10 +8303,6 @@ bool nsWindow::DealWithPopups(HWND aWnd, UINT aMessage, WPARAM aWParam,
         // compatibility mouse events will do it instead.
         return false;
       }
-      touchPoint = GetSingleTouch(aWParam, aLParam);
-      if (!touchPoint) {
-        return false;
-      }
       [[fallthrough]];
     case WM_LBUTTONDOWN:
     case WM_RBUTTONDOWN:
@@ -8326,8 +8322,8 @@ bool nsWindow::DealWithPopups(HWND aWnd, UINT aMessage, WPARAM aWParam,
         // handling the long-tap-up.
         return false;
       }
-      if (!EventIsInsideWindow(popupWindow, touchPoint) &&
-          GetPopupsToRollup(rollupListener, &popupsToRollup, touchPoint)) {
+      if (!EventIsInsideWindow(popupWindow) &&
+          GetPopupsToRollup(rollupListener, &popupsToRollup)) {
         break;
       }
       return false;
@@ -8461,16 +8457,15 @@ bool nsWindow::DealWithPopups(HWND aWnd, UINT aMessage, WPARAM aWParam,
       nativeMessage == WM_POINTERDOWN) {
     LayoutDeviceIntPoint pos;
     if (nativeMessage == WM_TOUCH) {
-      pos.x = touchPoint->x;
-      pos.y = touchPoint->y;
+      if (nsWindow* win = WinUtils::GetNSWindowPtr(aWnd)) {
+        pos = win->GetTouchCoordinates(aWParam, aLParam);
+      }
     } else {
       POINT pt;
       pt.x = GET_X_LPARAM(aLParam);
       pt.y = GET_Y_LPARAM(aLParam);
       // POINTERDOWN is already in screen coords.
-      if (nativeMessage == WM_LBUTTONDOWN) {
-        ::ClientToScreen(aWnd, &pt);
-      }
+      ::ClientToScreen(aWnd, &pt);
       pos = LayoutDeviceIntPoint(pt.x, pt.y);
     }
 

widget/windows/nsWindow.h

@@ -568,6 +568,7 @@ class nsWindow final : public nsBaseWidget {
   TimeStamp GetMessageTimeStamp(LONG aEventTime) const;
   static void UpdateFirstEventTime(DWORD aEventTime);
   void FinishLiveResizing(ResizeState aNewState);
+  LayoutDeviceIntPoint GetTouchCoordinates(WPARAM wParam, LPARAM lParam);
   mozilla::Maybe<mozilla::PanGestureInput> ConvertTouchToPanGesture(
       const mozilla::MultiTouchInput& aTouchInput, PTOUCHINPUT aOriginalEvent);
   void DispatchTouchOrPanGestureInput(mozilla::MultiTouchInput& aTouchInput,