[staging/edk2-test PATCH V2 3/6] TestFrameworkPkg: Fix VS2015 compatibility issues

[Michael Kinney <michael.d.kinney@intel.com>]

Cc: Andrew Fish <afish@apple.com>
Cc: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
---
 TestFrameworkPkg/Sct/Execute/ExecuteSupport.c | 17 -----------------
 TestFrameworkPkg/Sct/UI/KeyFunction.c         | 14 +++++++-------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
index 43b117d..8036050 100644
--- a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
+++ b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
@@ -647,23 +647,6 @@ DeviceConfigGetString (
 }
 
 
-EFI_STATUS
-DeviceConfigSetString (
-  IN EFI_INI_FILE_HANDLE    IniFile,
-  IN UINT32                 Order,
-  IN CHAR16                 *Key,
-  IN CHAR16                 *Buffer
-  )
-{
-  return IniFile->SetStringByOrder (
-                    IniFile,
-                    Order,
-                    EFI_SCT_SECTION_DEVICE_CONFIG,
-                    Key,
-                    Buffer
-                    );
-}
-
 STATIC
 VOID
 InsertChildHandles (
diff --git a/TestFrameworkPkg/Sct/UI/KeyFunction.c b/TestFrameworkPkg/Sct/UI/KeyFunction.c
index 30e1e8a..34e683f 100644
--- a/TestFrameworkPkg/Sct/UI/KeyFunction.c
+++ b/TestFrameworkPkg/Sct/UI/KeyFunction.c
@@ -637,11 +637,11 @@ Returns:
   BOOLEAN                 WAITING;
   CHAR16                  Buffer[EFI_MAX_EDIT_LENGTH + 1];
   CHAR16                  TempStr[EFI_MAX_ITEM_VALUE_LENGTH + 1];
-  INTN                    XOffSetInScreen;
-  INTN                    XOffSetInBuffer;
-  INTN                    FirstInDisplay;
-  INTN                    LastInDisplay;
-  INTN                    CurrentLength;
+  UINTN                   XOffSetInScreen;
+  UINTN                   XOffSetInBuffer;
+  UINTN                   FirstInDisplay;
+  UINTN                   LastInDisplay;
+  UINTN                   CurrentLength;
   UINTN                   TempValue;
   EFI_DIALOG_CONTEXT      MsgDialogContext;
   CHAR16                  *MsgDialogTitle;
@@ -2187,8 +2187,8 @@ Returns:
   BOOLEAN         BufferChanged;
   CHAR16          Buffer[EFI_MAX_ITER_EDIT_LENGTH + 1];
   CHAR16          TempStr[EFI_MAX_ITER_EDIT_LENGTH + 1];
-  INTN            XOffSetInBuffer;
-  INTN            CurrentLength;
+  UINTN           XOffSetInBuffer;
+  UINTN           CurrentLength;
   UINT32          TempValue;
 
   //
-- 
2.6.3.windows.1