Implement ConvertScalingMode properly (#596)

* Implement ConvertScalingMode properly

* Fix up the naming

* Only values 2 and 4 are allowed

* Return a nullable enum from ConvetScalingMode

* Fix typo on method name

* Use convertedScalingMode

1 files changed, 15 insertions, 6 deletions

diff --git a/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs
index b272e078..48cf3288 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs
@@ -180,22 +180,31 @@ namespace Ryujinx.HLE.HOS.Services.Vi
 
         public long ConvertScalingMode(ServiceCtx context)
         {
-            SrcScalingMode  scalingMode     = (SrcScalingMode)context.RequestData.ReadInt32();
-            DstScalingMode? destScalingMode = ConvetScalingModeImpl(scalingMode);
+            SrcScalingMode scalingMode = (SrcScalingMode)context.RequestData.ReadInt32();
 
-            if (!destScalingMode.HasValue)
+            DstScalingMode? convertedScalingMode = ConvertScalingMode(scalingMode);
+
+            if (!convertedScalingMode.HasValue)
             {
+                //Scaling mode out of the range of valid values.
                 return MakeError(ErrorModule.Vi, 1);
             }
 
-            context.ResponseData.Write((ulong)destScalingMode);
+            if (scalingMode != SrcScalingMode.ScaleToWindow &&
+                scalingMode != SrcScalingMode.PreserveAspectRatio)
+            {
+                //Invalid scaling mode specified.
+                return MakeError(ErrorModule.Vi, 6);
+            }
+
+            context.ResponseData.Write((ulong)convertedScalingMode);
 
             return 0;
         }
 
-        private DstScalingMode? ConvetScalingModeImpl(SrcScalingMode srcScalingMode)
+        private DstScalingMode? ConvertScalingMode(SrcScalingMode source)
         {
-            switch (srcScalingMode)
+            switch (source)
             {
                 case SrcScalingMode.None:                return DstScalingMode.None;
                 case SrcScalingMode.Freeze:              return DstScalingMode.Freeze;