Fix ICC build issues

[mirror_edk2.git] / Nt32Pkg / WinNtGopDxe / WinNtGopInput.c

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
index 3b91da8f9f49d87e39eb2fd8833955f694c187ad..5defc1601c33e61f3acab80f7d9ffe8e854d4f9e 100644 (file)
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
@@ -246,12 +246,14 @@ Returns:
 \r
 VOID\r
 WinNtGopSimpleTextInTimerHandler (\r
-  IN EFI_EVENT          Event,\r
-  IN GOP_PRIVATE_DATA   *Private\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_KEY_DATA          KeyData;\r
+  GOP_PRIVATE_DATA  *Private;\r
+  EFI_KEY_DATA      KeyData;\r
 \r
+  Private = (GOP_PRIVATE_DATA *)Context;\r
   while (GopPrivateDeleteQ (Private, &Private->QueueForNotify, &KeyData) == EFI_SUCCESS) {\r
     GopPrivateInvokeRegisteredFunction (Private, &KeyData);\r
   }\r
@@ -330,9 +332,9 @@ GopPrivateAddKey (
       (KeyData.Key.UnicodeChar >= 1) && (KeyData.Key.UnicodeChar <= 26)\r
      ) {\r
     if ((Private->LeftShift || Private->RightShift) == Private->CapsLock) {\r
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar + L'a' - 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar + L'a' - 1);\r
     } else {\r
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar + L'A' - 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar + L'A' - 1);\r
     }\r
   }\r
 \r
@@ -352,9 +354,9 @@ GopPrivateAddKey (
   //\r
   if (Private->LeftCtrl || Private->RightCtrl) {\r
     if ((KeyData.Key.UnicodeChar >= L'a') && (KeyData.Key.UnicodeChar <= L'z')) {\r
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar - L'a' + 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'a' + 1);\r
     } else if ((KeyData.Key.UnicodeChar >= L'A') && (KeyData.Key.UnicodeChar <= L'Z')) {\r
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar - L'A' + 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'A' + 1);\r
     }\r
   }\r
   GopPrivateAddQ (Private, &Private->QueueForRead, &KeyData);\r