From a9893f69e748b55475a479605d9c7e60ab4da37b Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 18 May 2023 11:03:36 +0100
Subject: [PATCH] backport of PR 11096 - MacOS timestamp overflow.

---
 native/Avalonia.Native/src/OSX/AvnView.mm   |  4 ++--
 native/Avalonia.Native/src/OSX/AvnWindow.mm |  2 +-
 src/Avalonia.Native/WindowImplBase.cs       | 12 ++++++------
 src/Avalonia.Native/avn.idl                 |  7 ++++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
index 14d834f901..34ee176694 100644
--- a/native/Avalonia.Native/src/OSX/AvnView.mm
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -255,7 +255,7 @@
         }
     }
 
-    uint32 timestamp = static_cast<uint32>([event timestamp] * 1000);
+    auto timestamp = static_cast<uint64>([event timestamp] * 1000);
     auto modifiers = [self getModifiers:[event modifierFlags]];
 
     if(type != Move ||
@@ -406,7 +406,7 @@
 
     auto key = s_KeyMap[[event keyCode]];
 
-    uint32_t timestamp = static_cast<uint32_t>([event timestamp] * 1000);
+    auto timestamp = static_cast<uint64_t>([event timestamp] * 1000);
     auto modifiers = [self getModifiers:[event modifierFlags]];
 
     if(_parent != nullptr)
diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index a545791aa8..aa67fce457 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -459,7 +459,7 @@
                     auto point = [self translateLocalPoint:avnPoint];
                     AvnVector delta = { 0, 0 };
 
-                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint32>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
+                    _parent->BaseEvents->RawMouseEvent(NonClientLeftButtonDown, static_cast<uint64>([event timestamp] * 1000), AvnInputModifiersNone, point, delta);
                 }
                 
                 if(!_isTransitioningToFullScreen)
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index ea632add0a..7ebe92e5ef 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -211,17 +211,17 @@ namespace Avalonia.Native
                 _parent.PositionChanged?.Invoke(position.ToAvaloniaPixelPoint());
             }
 
-            void IAvnWindowBaseEvents.RawMouseEvent(AvnRawMouseEventType type, uint timeStamp, AvnInputModifiers modifiers, AvnPoint point, AvnVector delta)
+            void IAvnWindowBaseEvents.RawMouseEvent(AvnRawMouseEventType type, ulong timeStamp, AvnInputModifiers modifiers, AvnPoint point, AvnVector delta)
             {
                 _parent.RawMouseEvent(type, timeStamp, modifiers, point, delta);
             }
 
-            int IAvnWindowBaseEvents.RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key)
+            int IAvnWindowBaseEvents.RawKeyEvent(AvnRawKeyEventType type, ulong timeStamp, AvnInputModifiers modifiers, uint key)
             {
                 return _parent.RawKeyEvent(type, timeStamp, modifiers, key).AsComBool();
             }
 
-            int IAvnWindowBaseEvents.RawTextInputEvent(uint timeStamp, string text)
+            int IAvnWindowBaseEvents.RawTextInputEvent(ulong timeStamp, string text)
             {
                 return _parent.RawTextInputEvent(timeStamp, text).AsComBool();
             }
@@ -279,7 +279,7 @@ namespace Avalonia.Native
         }
 
 
-        public bool RawTextInputEvent(uint timeStamp, string text)
+        public bool RawTextInputEvent(ulong timeStamp, string text)
         {
             if (_inputRoot is null) 
                 return false;
@@ -293,7 +293,7 @@ namespace Avalonia.Native
             return args.Handled;
         }
 
-        public bool RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key)
+        public bool RawKeyEvent(AvnRawKeyEventType type, ulong timeStamp, AvnInputModifiers modifiers, uint key)
         {
             if (_inputRoot is null) 
                 return false;
@@ -312,7 +312,7 @@ namespace Avalonia.Native
             return false;
         }
 
-        public void RawMouseEvent(AvnRawMouseEventType type, uint timeStamp, AvnInputModifiers modifiers, AvnPoint point, AvnVector delta)
+        public void RawMouseEvent(AvnRawMouseEventType type, ulong timeStamp, AvnInputModifiers modifiers, AvnPoint point, AvnVector delta)
         {
             if (_inputRoot is null) 
                 return;
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 426cb3eddc..ba9491d04a 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -1,6 +1,7 @@
 @clr-namespace Avalonia.Native.Interop
 @clr-access internal
 @clr-map bool int
+@clr-map u_int64_t ulong
 @cpp-preamble @@
 #pragma once
 #include "com.h"
@@ -515,12 +516,12 @@ interface IAvnWindowBaseEvents : IUnknown
      void Resized([const] AvnSize& size, AvnPlatformResizeReason reason);
      void PositionChanged(AvnPoint position);
      void RawMouseEvent(AvnRawMouseEventType type,
-                                uint timeStamp,
+                                u_int64_t timeStamp,
                                 AvnInputModifiers modifiers,
                                 AvnPoint point,
                                 AvnVector delta);
-     bool RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key);
-     bool RawTextInputEvent(uint timeStamp, [const] char* text);
+     bool RawKeyEvent(AvnRawKeyEventType type, u_int64_t timeStamp, AvnInputModifiers modifiers, uint key);
+     bool RawTextInputEvent(u_int64_t timeStamp, [const] char* text);
      void ScalingChanged(double scaling);
      void RunRenderPriorityJobs();
      void LostFocus();