When unmapping mask check for remaining. Also do write access last as that's something we don't want to get incorrect as it looks confusing.

Author: tyranid

NtApiDotNet/GenericMapping.cs

@@ -109,16 +109,20 @@ public AccessMask UnmapMask(AccessMask mask)
                 result |= GenericAccessRights.GenericRead;
                 remaining &= ~GenericRead;
             }
-            if ((mask & GenericWrite) == GenericWrite)
-            {
-                result |= GenericAccessRights.GenericWrite;
-                remaining &= ~GenericWrite;
-            }
+            if (remaining.IsEmpty)
+                return result;
             if ((mask & GenericExecute) == GenericExecute)
             {
                 result |= GenericAccessRights.GenericExecute;
                 remaining &= ~GenericExecute;
             }
+            if (remaining.IsEmpty)
+                return result;
+            if ((mask & GenericWrite) == GenericWrite)
+            {
+                result |= GenericAccessRights.GenericWrite;
+                remaining &= ~GenericWrite;
+            }
 
             return result | remaining;
         }