From 0c9345050b153977fb5120292acdd24dd26d6b2e Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Sun, 5 Jun 2022 14:51:29 -0500
Subject: [PATCH] Fixed more bitness assumptions

---
 UIX.RenderApi/Microsoft/Iris/Render/Protocol/BlobInfo.cs    | 2 +-
 UIX.RenderApi/Microsoft/Iris/Render/Protocol/MessageHeap.cs | 2 +-
 UIX.RenderApi/Microsoft/Iris/Render/Protocol/RenderPort.cs  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/BlobInfo.cs b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/BlobInfo.cs
index 0760824..aee08d3 100644
--- a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/BlobInfo.cs
+++ b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/BlobInfo.cs
@@ -78,7 +78,7 @@ namespace Microsoft.Iris.Render.Protocol
 
         public unsafe void Attach(Message* pMessage)
         {
-            byte* numPtr1 = (byte*)((uint)pMessage + this.m_blobsOffset);
+            byte* numPtr1 = (byte*)pMessage + this.m_blobsOffset;
             foreach (object obj in this.m_data)
             {
                 if (obj is string)
diff --git a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/MessageHeap.cs b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/MessageHeap.cs
index 58749d9..742ad94 100644
--- a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/MessageHeap.cs
+++ b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/MessageHeap.cs
@@ -181,7 +181,7 @@ namespace Microsoft.Iris.Render.Protocol
         private unsafe void ZeroMemoryBlock(MessageHeap.BlockInfo block, uint offset, uint size)
         {
             Debug2.Validate(offset + size <= block.size, typeof(ArgumentOutOfRangeException), "Invalid memory range for block");
-            byte* start = (byte*)((nint)block.data + offset);
+            byte* start = (byte*)block.data + offset;
             for (byte* current = start + size; start < current; ++start)
                 *start = 0;
         }
diff --git a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/RenderPort.cs b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/RenderPort.cs
index 2dfd17f..9682870 100644
--- a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/RenderPort.cs
+++ b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/RenderPort.cs
@@ -466,11 +466,11 @@ namespace Microsoft.Iris.Render.Protocol
             MessageHeap.Block block = this._currentMessageHeap.LookupBlock(pMethodMsg);
             Debug2.Throw((IntPtr)block.data != IntPtr.Zero, "message should be in current message heap");
             uint num = (uint)((ulong)((sbyte*)pMethodMsg - (sbyte*)block.data) - (ulong)sizeof(MessageBatchEntry));
-            if ((IntPtr)this._lastBatchEntry != IntPtr.Zero && (int)this._lastBatchBlockId == (int)block.id)
+            if ((IntPtr)_lastBatchEntry != IntPtr.Zero && _lastBatchBlockId == block.id)
                 this._lastBatchEntry->uOffsetNextEntry = num;
             else
                 ((MessageBatchHeader*)block.data)->uOffsetFirstEntry = num;
-            this._lastBatchEntry = (MessageBatchEntry*)((int)block.data + (int)num);
+            this._lastBatchEntry = (MessageBatchEntry*)block.data + num;
             this._lastBatchBlockId = block.id;
             ++this._uBatchedMessages;
             BatchCallback populateCallback = this._batchPopulateCallback;