} else if (*String == L'&') {\r
Lower = FALSE;\r
} else if (Lower && *String > L'A' && *String <= L'F') {\r
- *String = *String - L'A' + L'a';\r
+ *String = (CHAR16) (*String - L'A' + L'a');\r
}\r
}\r
\r
VA_LIST Args;\r
UINTN AltCfgId;\r
UINT16 Width;\r
+ UINT16 OffsetValue;\r
+ UINT16 WidthValue;\r
\r
ASSERT (Guid != NULL);\r
ASSERT (Name != NULL);\r
//\r
// Append &OFFSET=XXXX&WIDTH=YYYY\r
//\r
+ OffsetValue = ReadUnaligned16 ((UINT16 *)Buffer);\r
+ WidthValue = ReadUnaligned16 ((UINT16 *)(Buffer + sizeof (UINT16)));\r
UnicodeSPrint (\r
String, \r
(8 + 4 + 7 + 4) * sizeof (CHAR16), \r
L"&OFFSET=%04X&WIDTH=%04X", \r
- ReadUnaligned16 ((UINT16 *)Buffer), \r
- ReadUnaligned16 ((UINT16 *)(Buffer + sizeof (UINT16)))\r
- );\r
+ OffsetValue, \r
+ WidthValue\r
+ );\r
+\r
String += StrLen (String);\r
Buffer += (sizeof (UINT16) + sizeof (UINT16));\r
}\r
}\r
\r
//\r
- // Construct <ConfigResp>\r
+ // Construct <ConfigResp> mConfigHdrTemplate L'&' ResultsData L'\0'\r
//\r
- Size = (StrLen (mConfigHdrTemplate) + 1 + StrLen (ResultsData) + 1) * sizeof (CHAR16);\r
+ Size = (StrLen (mConfigHdrTemplate) + 1) * sizeof (CHAR16);\r
+ Size = Size + (StrLen (ResultsData) + 1) * sizeof (CHAR16);\r
ConfigResp = AllocateZeroPool (Size);\r
UnicodeSPrint (ConfigResp, Size, L"%s&%s", mConfigHdrTemplate, ResultsData);\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template \r
// followed by <RequestElement> followed by a Null-terminator\r
//\r
- Size = (StrLen (mConfigHdrTemplate) + StrLen (RequestElement) + 1) * sizeof (CHAR16);\r
+ Size = StrLen (mConfigHdrTemplate) * sizeof (CHAR16);\r
+ Size = Size + (StrLen (RequestElement) + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
UnicodeSPrint (ConfigRequest, Size, L"%s%s", mConfigHdrTemplate, RequestElement);\r
}\r
ASSERT (OpCodeSize >= sizeof (OpCode));\r
\r
ZeroMem (&OpCode, sizeof (OpCode));\r
- CopyGuid (&OpCode.Guid, Guid);\r
+ CopyGuid ((EFI_GUID *)(VOID *)&OpCode.Guid, Guid);\r
\r
OpCodePointer = (EFI_IFR_GUID *)InternalHiiCreateOpCodeExtended (\r
OpCodeHandle, \r