* [staging/edk2-test PATCH V2 2/6] TestFrameworkPkg: Fix XCODE compatibility issues
2017-02-01 9:49 [staging/edk2-test PATCH V2 0/6] Fix XCODE and GCC build issues Michael Kinney
2017-02-01 9:49 ` [staging/edk2-test PATCH V2 1/6] edk2-test: Update Readme.md Michael Kinney
@ 2017-02-01 9:49 ` Michael Kinney
2017-02-01 17:46 ` Supreeth Venkatesh
2017-02-01 9:49 ` [staging/edk2-test PATCH V2 3/6] TestFrameworkPkg: Fix VS2015 " Michael Kinney
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Michael Kinney @ 2017-02-01 9:49 UTC (permalink / raw)
To: edk2-devel; +Cc: Supreeth Venkatesh, Andrew Fish
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <afish@apple.com>
---
TestFrameworkPkg/Eftp/EftpCommon.h | 2 +-
TestFrameworkPkg/Eftp/EftpMain.c | 4 +-
TestFrameworkPkg/Eftp/EftpMain.h | 8 +--
TestFrameworkPkg/Eftp/EftpOption.c | 36 +++++++-------
TestFrameworkPkg/Eftp/EftpOption.h | 4 +-
TestFrameworkPkg/Eftp/EftpPacket.c | 8 +--
TestFrameworkPkg/Eftp/EftpPacket.h | 4 +-
TestFrameworkPkg/Eftp/EftpRRQ.c | 28 +++++++++--
TestFrameworkPkg/Eftp/EftpWRQ.c | 17 ++++++-
TestFrameworkPkg/Include/Protocol/BbTest.h | 8 +--
TestFrameworkPkg/Include/Protocol/Eftp.h | 24 ++++-----
.../Include/Protocol/EntsMonitorProtocol.h | 4 +-
TestFrameworkPkg/Include/Protocol/LibPrivate.h | 12 ++---
.../Include/Protocol/StandardTestLibrary.h | 4 +-
.../Include/Protocol/TestLoggingLibrary.h | 4 +-
.../Include/Protocol/TestOutputLibrary.h | 4 +-
.../Include/Protocol/TestProfileLibrary.h | 9 ++--
.../Include/Protocol/TestRecoveryLibrary.h | 4 +-
TestFrameworkPkg/Include/Protocol/TslInit.h | 4 +-
TestFrameworkPkg/Include/Protocol/WBTest.h | 8 +--
TestFrameworkPkg/InstallSct/InstallSct.c | 10 ++--
TestFrameworkPkg/Library/EasLib/EntsContext.c | 2 +-
TestFrameworkPkg/Library/EasLib/EntsDpath.c | 2 +-
TestFrameworkPkg/Library/EasLib/EntsLib.inf | 20 ++++----
TestFrameworkPkg/Library/EasLib/EntsMisc.c | 4 +-
TestFrameworkPkg/Library/EasLib/EntsPrint.c | 6 +--
TestFrameworkPkg/Library/EasLib/EntsSupport.c | 41 ++++++++--------
TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c | 18 +++----
.../IP4NetworkMonitor/IP4NetworkMonitor.c | 8 +--
.../ManagedNetworkMonitor/ManagedNetworkMonitor.c | 8 +--
.../MonitorServices/SerialMonitor/SerialMonitor.c | 8 +--
.../PeiSctManageModule/PeiSctManageModule.c | 4 +-
TestFrameworkPkg/Sct/Core/SctInit.c | 2 +-
TestFrameworkPkg/Sct/Data/ApTest.c | 4 +-
TestFrameworkPkg/Sct/Data/Category.c | 2 +-
TestFrameworkPkg/Sct/Data/TestCase.c | 2 +-
TestFrameworkPkg/Sct/Data/TestNode.c | 2 +-
TestFrameworkPkg/Sct/DeviceConfig/DeviceConfig.c | 12 ++---
.../Sct/ENTS/EasDispatcher/Arg/EasArg.c | 2 +-
.../Sct/ENTS/EasDispatcher/Core/EasInit.c | 6 +--
.../Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c | 6 +--
.../Sct/ENTS/EasDispatcher/Exec/EftpImplement.c | 17 +++----
.../Sct/ENTS/EasDispatcher/Load/EasSupportFile.c | 12 ++---
.../Sct/ENTS/EasDispatcher/Load/EasTestFile.c | 10 ++--
.../Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c | 16 +++---
TestFrameworkPkg/Sct/Execute/ExecuteSupport.c | 6 +--
TestFrameworkPkg/Sct/Execute/Reset.c | 6 +--
TestFrameworkPkg/Sct/Include/ApTest.h | 4 +-
TestFrameworkPkg/Sct/Include/SctOutput.h | 4 +-
TestFrameworkPkg/Sct/Load/SupportFile.c | 32 ++++++------
TestFrameworkPkg/Sct/Load/TestFile.c | 14 +++---
TestFrameworkPkg/Sct/Misc/SctMisc.c | 4 +-
TestFrameworkPkg/Sct/Operation/Operation.c | 2 +-
TestFrameworkPkg/Sct/Report/Report.c | 14 +++---
TestFrameworkPkg/Sct/Report/ReportConfig.c | 2 +-
TestFrameworkPkg/Sct/Report/ReportDatabase.c | 14 +++---
TestFrameworkPkg/Sct/Report/ReportSupport.c | 10 ++--
TestFrameworkPkg/Sct/Report/ReportSupport.h | 8 +--
| 6 +--
| 28 +++++------
TestFrameworkPkg/Sct/UI/FileDialog.c | 2 +-
TestFrameworkPkg/Sct/UI/KeyFunction.c | 16 +++---
TestFrameworkPkg/Sct/UI/LogFileDialog.c | 2 +-
| 6 +--
TestFrameworkPkg/Sct/UI/UI.h | 16 +++---
TestFrameworkPkg/Sct/print.c | 8 +--
.../Support/StandardTest/StandardTest.c | 57 ++--------------------
TestFrameworkPkg/Support/TestLogging/TestLogging.c | 8 +--
TestFrameworkPkg/Support/TestProfile/TestProfile.c | 14 +++---
.../Support/TestRecovery/TestRecovery.c | 6 +--
TestFrameworkPkg/TestFrameworkPkg.dsc | 2 +-
71 files changed, 351 insertions(+), 360 deletions(-)
diff --git a/TestFrameworkPkg/Eftp/EftpCommon.h b/TestFrameworkPkg/Eftp/EftpCommon.h
index 3c73d57..e4ae385 100644
--- a/TestFrameworkPkg/Eftp/EftpCommon.h
+++ b/TestFrameworkPkg/Eftp/EftpCommon.h
@@ -109,7 +109,7 @@ typedef struct _EFTP_COMPLETION_TOKEN {
typedef struct _EFTP_ERRINFO {
UINT16 Code;
- UINT8 *Desc;
+ CHAR8 *Desc;
} EFTP_ERRINFO;
#endif
diff --git a/TestFrameworkPkg/Eftp/EftpMain.c b/TestFrameworkPkg/Eftp/EftpMain.c
index 94a0bf4..f9e84c5 100644
--- a/TestFrameworkPkg/Eftp/EftpMain.c
+++ b/TestFrameworkPkg/Eftp/EftpMain.c
@@ -14,13 +14,13 @@
#include "EftpMain.h"
-UINT8 *mSupportedOptions[EFTP_SUPPORTED_OPTIONS_COUNT] = {
+CHAR8 *mSupportedOptions[EFTP_SUPPORTED_OPTIONS_COUNT] = {
"timeout",
"blksize",
"tsize",
};
-UINT8 *mUnsupportedOptions[EFTP_UNSUPPORTED_OPTIONS_COUNT] = {
+CHAR8 *mUnsupportedOptions[EFTP_UNSUPPORTED_OPTIONS_COUNT] = {
"restart",
"session",
"pktdelay",
diff --git a/TestFrameworkPkg/Eftp/EftpMain.h b/TestFrameworkPkg/Eftp/EftpMain.h
index c183790..c595a38 100644
--- a/TestFrameworkPkg/Eftp/EftpMain.h
+++ b/TestFrameworkPkg/Eftp/EftpMain.h
@@ -44,10 +44,10 @@ typedef struct _EFTP_IO_PRIVATE EFTP_IO_PRIVATE;
extern UINT32 mEftpDebugLevel;
extern EFI_DRIVER_BINDING_PROTOCOL gEftpDriverBinding;
-extern UINT8 *mSupportedOptions[EFTP_SUPPORTED_OPTIONS_COUNT];
-extern UINT8 *mUnsupportedOptions[EFTP_UNSUPPORTED_OPTIONS_COUNT];
+extern CHAR8 *mSupportedOptions[EFTP_SUPPORTED_OPTIONS_COUNT];
+extern CHAR8 *mUnsupportedOptions[EFTP_UNSUPPORTED_OPTIONS_COUNT];
-typedef struct _EFTP_IO_PRIVATE {
+struct _EFTP_IO_PRIVATE {
UINTN Signature;
LIST_ENTRY List;
EFI_EFTP_PROTOCOL Eftp;
@@ -115,7 +115,7 @@ typedef struct _EFTP_IO_PRIVATE {
#endif
-} EFTP_IO_PRIVATE;
+};
//
// API Prototype declare
diff --git a/TestFrameworkPkg/Eftp/EftpOption.c b/TestFrameworkPkg/Eftp/EftpOption.c
index 3baaa66..8df0558 100644
--- a/TestFrameworkPkg/Eftp/EftpOption.c
+++ b/TestFrameworkPkg/Eftp/EftpOption.c
@@ -18,21 +18,21 @@ STATIC
EFI_STATUS
ExtractTsize (
OUT EFTP_OPTION *Opt,
- IN UINT8 *Str
+ IN CHAR8 *Str
);
STATIC
EFI_STATUS
ExtractTimeout (
OUT EFTP_OPTION *Opt,
- IN UINT8 *Str
+ IN CHAR8 *Str
);
STATIC
EFI_STATUS
ExtractBlksize (
IN EFTP_OPTION *Opt,
- UINT8 *Str
+ CHAR8 *Str
);
STATIC EFTP_OPTIONOBJ mOptionObjs[] = {
@@ -58,7 +58,7 @@ STATIC EFTP_OPTIONOBJ mOptionObjs[] = {
}
};
-STATIC UINT8 mSepeator[] = { '.', '.', '.', ',', ',', '\0' };
+UINT8 mSepeator[] = { '.', '.', '.', ',', ',', '\0' };
VOID
EftpInitOption (
@@ -122,12 +122,12 @@ Returns:
--*/
{
- UINT8 *P;
- UINT8 *Start;
+ CHAR8 *P;
+ CHAR8 *Start;
UINT8 NOption;
- UINT8 *Last;
- UINT8 *Name;
- UINT8 *Value;
+ CHAR8 *Last;
+ CHAR8 *Name;
+ CHAR8 *Value;
UINT16 OpCode;
EFI_STATUS Status;
@@ -137,8 +137,8 @@ Returns:
*OptionList = NULL;
}
- P = (UINT8 *) Packet + EFTP_HEADER_LEN;
- Last = (UINT8 *) Packet + PacketLen;
+ P = (CHAR8 *) Packet + EFTP_HEADER_LEN;
+ Last = (CHAR8 *) Packet + PacketLen;
OpCode = NTOHS (Packet->Hdr.OpCode);
switch (OpCode) {
@@ -277,8 +277,8 @@ Returns:
INTN
NetAsciiStrCaseCmp (
- IN UINT8 *Left,
- IN UINT8 *Right
+ IN CHAR8 *Left,
+ IN CHAR8 *Right
)
/*++
@@ -343,7 +343,7 @@ NetAsciiStrCaseCmp (
STATIC
EFI_STATUS
StrToUint64 (
- IN UINT8 *Str,
+ IN CHAR8 *Str,
OUT UINT64*Value
)
/*++
@@ -365,7 +365,7 @@ Returns:
--*/
{
EFI_STATUS Status;
- UINT8 *P;
+ CHAR8 *P;
ASSERT (Str && Value);
@@ -389,7 +389,7 @@ STATIC
EFI_STATUS
ExtractTsize (
OUT EFTP_OPTION *Opt,
- IN UINT8 *Str
+ IN CHAR8 *Str
)
/*++
@@ -418,7 +418,7 @@ STATIC
EFI_STATUS
ExtractTimeout (
OUT EFTP_OPTION *Opt,
- IN UINT8 *Str
+ IN CHAR8 *Str
)
/*++
@@ -459,7 +459,7 @@ STATIC
EFI_STATUS
ExtractBlksize (
IN EFTP_OPTION *Opt,
- UINT8 *Str
+ CHAR8 *Str
)
/*++
diff --git a/TestFrameworkPkg/Eftp/EftpOption.h b/TestFrameworkPkg/Eftp/EftpOption.h
index 9601d41..ae4bcf0 100644
--- a/TestFrameworkPkg/Eftp/EftpOption.h
+++ b/TestFrameworkPkg/Eftp/EftpOption.h
@@ -55,7 +55,7 @@ typedef
EFI_STATUS
(*ExtractOption) (
OUT EFTP_OPTION * Opt,
- IN UINT8 *Str
+ IN CHAR8 *Str
);
typedef
@@ -66,7 +66,7 @@ EFI_STATUS
typedef struct _EFTP_OPTIONOBJ {
UINTN Index;
- UINT8 *Name;
+ CHAR8 *Name;
ExtractOption Extract;
VerifyOption Verify;
} EFTP_OPTIONOBJ;
diff --git a/TestFrameworkPkg/Eftp/EftpPacket.c b/TestFrameworkPkg/Eftp/EftpPacket.c
index 7961a52..1c813f0 100644
--- a/TestFrameworkPkg/Eftp/EftpPacket.c
+++ b/TestFrameworkPkg/Eftp/EftpPacket.c
@@ -565,7 +565,7 @@ Returns:
EFI_EFTP_PACKET *Packet;
EFI_STATUS Status;
UINT32 Len;
- UINT8 *P;
+ CHAR8 *P;
ASSERT (Private && Err);
@@ -638,8 +638,8 @@ EFTP_PACKET_BUFFER *
EftpBuildRequest (
IN EFTP_IO_PRIVATE *Private,
IN UINT16 OpCode,
- IN UINT8 *Filename,
- IN UINT8 *Mode,
+ IN CHAR8 *Filename,
+ IN CHAR8 *Mode,
IN UINT32 NOption,
IN EFI_EFTP_OPTION *OptionList,
IN EFI_EVENT_NOTIFY Func
@@ -672,7 +672,7 @@ Returns:
EFI_STATUS Status;
UINT32 Len;
UINTN Index;
- UINT8 *P;
+ CHAR8 *P;
ASSERT (Filename);
diff --git a/TestFrameworkPkg/Eftp/EftpPacket.h b/TestFrameworkPkg/Eftp/EftpPacket.h
index 325ff73..9a537f8 100644
--- a/TestFrameworkPkg/Eftp/EftpPacket.h
+++ b/TestFrameworkPkg/Eftp/EftpPacket.h
@@ -227,8 +227,8 @@ EFTP_PACKET_BUFFER *
EftpBuildRequest (
IN EFTP_IO_PRIVATE *Private,
IN UINT16 OpCode,
- IN UINT8 *Filename,
- IN UINT8 *Mode,
+ IN CHAR8 *Filename,
+ IN CHAR8 *Mode,
IN UINT32 NOption,
IN EFI_EFTP_OPTION *OptionList,
IN EFI_EVENT_NOTIFY Func
diff --git a/TestFrameworkPkg/Eftp/EftpRRQ.c b/TestFrameworkPkg/Eftp/EftpRRQ.c
index fd41c17..9c6d952 100644
--- a/TestFrameworkPkg/Eftp/EftpRRQ.c
+++ b/TestFrameworkPkg/Eftp/EftpRRQ.c
@@ -28,7 +28,6 @@ EftpRrqSaveBlk (
IN UINTN PacketLen
);
-STATIC
EFI_STATUS
EftpRrqRecordLostBlock (
IN EFTP_IO_PRIVATE *Private,
@@ -42,7 +41,6 @@ EftpRrqFlushLostBlock (
IN EFTP_IO_PRIVATE *Private
);
-STATIC
EFI_STATUS
EftpRrqSaveLostBlock (
IN EFTP_IO_PRIVATE *Private,
@@ -62,7 +60,6 @@ EftpRrqTxCallback (
IN VOID *Context
);
-STATIC
VOID
NumToAsciiStr (
IN UINTN Number,
@@ -731,6 +728,9 @@ Returns:
}
break;
+
+ default:
+ break;
}
}
@@ -848,6 +848,9 @@ Returns:
//
return EFI_ABORTED;
break;
+
+ default:
+ break;
}
return EFI_SUCCESS;
@@ -909,6 +912,9 @@ Returns:
//
return EFI_ABORTED;
break;
+
+ default:
+ break;
}
return EFI_SUCCESS;
@@ -1157,6 +1163,8 @@ Returns:
EftpRrqCleanUp (Private);
break;
+ default:
+ break;
}
return ;
@@ -1297,6 +1305,9 @@ Returns:
//
return EFI_ABORTED;
break;
+
+ default:
+ break;
}
return EFI_SUCCESS;
@@ -1375,6 +1386,9 @@ Returns:
case EFTP_TIME_WAIT:
return EFI_ABORTED;
break;
+
+ default:
+ break;
}
return EFI_SUCCESS;
@@ -1478,6 +1492,9 @@ Returns:
case EFTP_TIME_WAIT:
return EFI_SUCCESS;
break;
+
+ default:
+ break;
}
return EFI_SUCCESS;
@@ -1563,6 +1580,8 @@ Returns:
EftpRrqCleanUp (Private);
return ;
+ default:
+ break;
}
return ;
@@ -1880,7 +1899,7 @@ Returns:
return EFI_SUCCESS;
}
-STATIC
+
EFI_STATUS
EftpRrqRecordLostBlock (
IN EFTP_IO_PRIVATE *Private,
@@ -1940,7 +1959,6 @@ Returns:
(PrevEntry)->ForwardLink = (NewEntry);\
}
-STATIC
EFI_STATUS
EftpRrqSaveLostBlock (
IN EFTP_IO_PRIVATE *Private,
diff --git a/TestFrameworkPkg/Eftp/EftpWRQ.c b/TestFrameworkPkg/Eftp/EftpWRQ.c
index d35795f..495b2a2 100644
--- a/TestFrameworkPkg/Eftp/EftpWRQ.c
+++ b/TestFrameworkPkg/Eftp/EftpWRQ.c
@@ -464,6 +464,9 @@ Returns:
}
break;
+
+ default:
+ break;
}
}
@@ -596,6 +599,9 @@ Returns:
EftpWrqCleanUp (Private);
break;
+
+ default:
+ break;
}
return ;
@@ -791,6 +797,9 @@ Returns:
//
return EFI_ABORTED;
break;
+
+ default:
+ break;
}
return EFI_ABORTED;
@@ -852,6 +861,9 @@ Returns:
//
return EFI_ABORTED;
break;
+
+ default:
+ break;
}
return EFI_ABORTED;
@@ -951,6 +963,9 @@ Returns:
//
return EFI_ABORTED;
break;
+
+ default:
+ break;
}
return EFI_ABORTED;
@@ -1025,7 +1040,7 @@ Returns:
EFTP_DEBUG_VERBOSE ((L"EftpWrqReadBlk: call PacketNeeded to fill in data\n"));
- Status = Private->Token->PacketNeeded (&Private->Eftp, Private->Token, &DataLen, &DataBuf);
+ Status = Private->Token->PacketNeeded (&Private->Eftp, Private->Token, &DataLen, (VOID **)&DataBuf);
if (EFI_ERROR (Status)) {
EFTP_DEBUG_ERROR ((L"EftpWrqReadBlk: PacketNeeded returns %r .\n", Status));
diff --git a/TestFrameworkPkg/Include/Protocol/BbTest.h b/TestFrameworkPkg/Include/Protocol/BbTest.h
index 50e076d..f86dc91 100644
--- a/TestFrameworkPkg/Include/Protocol/BbTest.h
+++ b/TestFrameworkPkg/Include/Protocol/BbTest.h
@@ -52,7 +52,7 @@ EFI_STATUS
// EFI Black-Box Test Entry
//
-typedef struct _EFI_BB_TEST_ENTRY {
+struct _EFI_BB_TEST_ENTRY {
EFI_BB_TEST_ENTRY *Next;
EFI_GUID EntryId;
CHAR16 *Name;
@@ -61,19 +61,19 @@ typedef struct _EFI_BB_TEST_ENTRY {
EFI_GUID *SupportProtocols;
EFI_TEST_ATTRIBUTE CaseAttribute;
EFI_BB_ENTRY_POINT EntryPoint;
-} EFI_BB_TEST_ENTRY;
+};
//
// EFI Black-Box Test Protocol
//
-typedef struct _EFI_BB_TEST_PROTOCOL {
+struct _EFI_BB_TEST_PROTOCOL {
UINT64 TestRevision;
EFI_GUID CategoryGuid;
CHAR16 *Name;
CHAR16 *Description;
EFI_BB_TEST_ENTRY *EntryList;
-} EFI_BB_TEST_PROTOCOL;
+};
//
// Global ID for EFI Black-Box Test Protocol
diff --git a/TestFrameworkPkg/Include/Protocol/Eftp.h b/TestFrameworkPkg/Include/Protocol/Eftp.h
index c7ffe5e..6e38b91 100644
--- a/TestFrameworkPkg/Include/Protocol/Eftp.h
+++ b/TestFrameworkPkg/Include/Protocol/Eftp.h
@@ -71,7 +71,7 @@ typedef struct {
UINT16 CheckSum;
UINT16 OpCode;
UINT16 Rsvd;
- UINT8 Filename[1];
+ CHAR8 Filename[1];
} EFI_EFTP_REQ_HEADER;
typedef struct {
@@ -102,7 +102,7 @@ typedef struct {
UINT16 CheckSum;
UINT16 OpCode;
UINT16 ErrorCode;
- UINT8 ErrorMessage[1];
+ CHAR8 ErrorMessage[1];
} EFI_EFTP_ERROR_HEADER;
typedef union {
@@ -120,8 +120,8 @@ typedef union {
// EFTP option definition
//
typedef struct {
- UINT8 *OptionStr;
- UINT8 *ValueStr;
+ CHAR8 *OptionStr;
+ CHAR8 *ValueStr;
} EFI_EFTP_OPTION;
//
@@ -140,9 +140,9 @@ typedef struct {
typedef struct {
EFI_EFTP_CONFIG_DATA ConfigData;
UINT8 SupportedOptionCount;
- UINT8 **SupportedOptoins;
+ CHAR8 **SupportedOptoins;
UINT8 UnsupportedOptionCount;
- UINT8 **UnsupportedOptoins;
+ CHAR8 **UnsupportedOptoins;
} EFI_EFTP_MODE_DATA;
//
@@ -251,7 +251,7 @@ EFI_STATUS
IN EFI_EFTP_PROTOCOL * This
);
-typedef struct _EFI_EFTP_PROTOCOL {
+struct _EFI_EFTP_PROTOCOL {
EFI_EFTP_GET_MODE_DATA GetModeData;
EFI_EFTP_CONFIGURE Configure;
EFI_EFTP_GET_INFO GetInfo;
@@ -260,17 +260,17 @@ typedef struct _EFI_EFTP_PROTOCOL {
EFI_EFTP_WRITE_FILE WriteFile;
EFI_EFTP_READ_DIRECTORY ReadDirectory;
EFI_EFTP_POLL Poll;
-} EFI_EFTP_PROTOCOL;
+};
//
// EFTP token data
//
-typedef struct _EFI_EFTP_TOKEN {
+struct _EFI_EFTP_TOKEN {
IN OUT EFI_STATUS Status;
IN EFI_EVENT Event OPTIONAL;
IN EFI_EFTP_OVERRIDE_DATA * OverrideData OPTIONAL;
- IN UINT8 *Filename;
- IN UINT8 *ModeStr OPTIONAL;
+ IN CHAR8 *Filename;
+ IN CHAR8 *ModeStr OPTIONAL;
IN UINT32 OptionCount;
IN EFI_EFTP_OPTION * OptionList OPTIONAL;
IN OUT UINT64 BufferSize;
@@ -279,7 +279,7 @@ typedef struct _EFI_EFTP_TOKEN {
IN EFI_EFTP_CHECK_PACKET CheckPacket OPTIONAL;
IN EFI_EFTP_TIMEOUT_CALLBACK TimeoutCallback OPTIONAL;
IN EFI_EFTP_PACKET_NEEDED PacketNeeded OPTIONAL;
-} EFI_EFTP_TOKEN;
+};
extern EFI_GUID gEfiEftpServiceBindingProtocolGuid;
extern EFI_GUID gEfiEftpProtocolGuid;
diff --git a/TestFrameworkPkg/Include/Protocol/EntsMonitorProtocol.h b/TestFrameworkPkg/Include/Protocol/EntsMonitorProtocol.h
index fcfdf8b..1b6a960 100644
--- a/TestFrameworkPkg/Include/Protocol/EntsMonitorProtocol.h
+++ b/TestFrameworkPkg/Include/Protocol/EntsMonitorProtocol.h
@@ -67,7 +67,7 @@ EFI_STATUS
IN EFI_ENTS_MONITOR_PROTOCOL *This
);
-typedef struct _EFI_ENTS_MONITOR_PROTOCOL {
+struct _EFI_ENTS_MONITOR_PROTOCOL {
VOID *MonitorName;
VOID *MonitorIo;
EFI_INIT_MONITOR InitMonitor;
@@ -77,6 +77,6 @@ typedef struct _EFI_ENTS_MONITOR_PROTOCOL {
EFI_MONITOR_SENDER MonitorSender;
EFI_MONITOR_SAVECONTEXT MonitorSaveContext;
EFI_MONITOR_RESTORECONTEXT MonitorRestoreContext;
-} EFI_ENTS_MONITOR_PROTOCOL;
+};
#endif // _ENTS_MONITOR_PROTOCOL_H_
diff --git a/TestFrameworkPkg/Include/Protocol/LibPrivate.h b/TestFrameworkPkg/Include/Protocol/LibPrivate.h
index e4b57d1..db9c710 100644
--- a/TestFrameworkPkg/Include/Protocol/LibPrivate.h
+++ b/TestFrameworkPkg/Include/Protocol/LibPrivate.h
@@ -59,11 +59,11 @@ EFI_STATUS
IN EFI_STATUS TestStatus
);
-typedef struct _EFI_STANDARD_TSL_PRIVATE_INTERFACE {
+struct _EFI_STANDARD_TSL_PRIVATE_INTERFACE {
EFI_STSL_SET_CONFIG SetConfig;
EFI_STSL_BEGIN_LOGGING BeginLogging;
EFI_STSL_END_LOGGING EndLogging;
-} EFI_STANDARD_TSL_PRIVATE_INTERFACE;
+};
//
// Test logging library's private interface
@@ -90,11 +90,11 @@ EFI_STATUS
IN EFI_STATUS TestStatus
);
-typedef struct _EFI_TLL_PRIVATE_INTERFACE {
+struct _EFI_TLL_PRIVATE_INTERFACE {
EFI_TLL_SET_CONFIG SetConfig;
EFI_TLL_BEGIN_LOGGING BeginLogging;
EFI_TLL_END_LOGGING EndLogging;
-} EFI_TLL_PRIVATE_INTERFACE;
+};
//
// Test recovery library's private interface
@@ -109,8 +109,8 @@ EFI_STATUS
IN CHAR16 *FileName
);
-typedef struct _EFI_TRL_PRIVATE_INTERFACE {
+struct _EFI_TRL_PRIVATE_INTERFACE {
EFI_TRL_SET_CONFIG SetConfig;
-} EFI_TRL_PRIVATE_INTERFACE;
+};
#endif
diff --git a/TestFrameworkPkg/Include/Protocol/StandardTestLibrary.h b/TestFrameworkPkg/Include/Protocol/StandardTestLibrary.h
index 2209dc3..3edb75b 100644
--- a/TestFrameworkPkg/Include/Protocol/StandardTestLibrary.h
+++ b/TestFrameworkPkg/Include/Protocol/StandardTestLibrary.h
@@ -176,14 +176,14 @@ Returns:
// EFI Standard Test Library Protocol
//
-typedef struct _EFI_STANDARD_TEST_LIBRARY_PROTOCOL {
+struct _EFI_STANDARD_TEST_LIBRARY_PROTOCOL {
UINT64 LibraryRevision;
CHAR16 *Name;
CHAR16 *Description;
EFI_RECORD_ASSERTION RecordAssertion;
EFI_RECORD_MESSAGE RecordMessage;
EFI_GET_RESULT_COUNT GetResultCount;
-} EFI_STANDARD_TEST_LIBRARY_PROTOCOL;
+};
//
// Global ID for EFI Standard Test Library Protocol
diff --git a/TestFrameworkPkg/Include/Protocol/TestLoggingLibrary.h b/TestFrameworkPkg/Include/Protocol/TestLoggingLibrary.h
index cb0e524..e1022bf 100644
--- a/TestFrameworkPkg/Include/Protocol/TestLoggingLibrary.h
+++ b/TestFrameworkPkg/Include/Protocol/TestLoggingLibrary.h
@@ -217,7 +217,7 @@ Returns:
// EFI Test Logging Library Protocol
//
-typedef struct _EFI_TEST_LOGGING_LIBRARY_PROTOCOL {
+struct _EFI_TEST_LOGGING_LIBRARY_PROTOCOL {
UINT64 LibraryRevision;
CHAR16 *Name;
CHAR16 *Description;
@@ -226,7 +226,7 @@ typedef struct _EFI_TEST_LOGGING_LIBRARY_PROTOCOL {
EFI_TLL_EXIT_FUNCTION ExitFunction;
EFI_TLL_DUMP_MASK DumpMask;
EFI_TLL_DUMP_BUF DumpBuf;
-} EFI_TEST_LOGGING_LIBRARY_PROTOCOL;
+};
//
// Global ID for EFI Test Logging Library Protocol
diff --git a/TestFrameworkPkg/Include/Protocol/TestOutputLibrary.h b/TestFrameworkPkg/Include/Protocol/TestOutputLibrary.h
index bcbc63d..1283273 100644
--- a/TestFrameworkPkg/Include/Protocol/TestOutputLibrary.h
+++ b/TestFrameworkPkg/Include/Protocol/TestOutputLibrary.h
@@ -142,14 +142,14 @@ Returns:
// EFI Test Output Library Protocol
//
-typedef struct _EFI_TEST_OUTPUT_LIBRARY_PROTOCOL {
+struct _EFI_TEST_OUTPUT_LIBRARY_PROTOCOL {
UINT64 LibraryRevision;
CHAR16 *Name;
CHAR16 *Description;
EFI_TOL_OPEN Open;
EFI_TOL_CLOSE Close;
EFI_TOL_WRITE Write;
-} EFI_TEST_OUTPUT_LIBRARY_PROTOCOL;
+};
//
// Global ID for EFI Test Output Library Protocol
diff --git a/TestFrameworkPkg/Include/Protocol/TestProfileLibrary.h b/TestFrameworkPkg/Include/Protocol/TestProfileLibrary.h
index af21ea6..a775166 100644
--- a/TestFrameworkPkg/Include/Protocol/TestProfileLibrary.h
+++ b/TestFrameworkPkg/Include/Protocol/TestProfileLibrary.h
@@ -33,6 +33,7 @@
// Forward reference for pure ANSI compatibility
//
typedef struct _EFI_INI_FILE EFI_INI_FILE;
+typedef EFI_INI_FILE * EFI_INI_FILE_HANDLE;
typedef struct _EFI_TEST_PROFILE_LIBRARY_PROTOCOL EFI_TEST_PROFILE_LIBRARY_PROTOCOL;
//
@@ -312,7 +313,7 @@ Returns:
// EFI INI File
//
-typedef struct _EFI_INI_FILE {
+struct _EFI_INI_FILE {
UINT64 Revision;
EFI_INI_GETSTRING GetString;
EFI_INI_SETSTRING SetString;
@@ -322,7 +323,7 @@ typedef struct _EFI_INI_FILE {
EFI_INI_RMSECTION_BYORDER RmSectionByOrder;
EFI_INI_GETORDERNUM GetOrderNum;
EFI_INI_FLUSH Flush;
-} EFI_INI_FILE, *EFI_INI_FILE_HANDLE;
+};
//
// EFI Test Profile Library Protocol API - IniOpen
@@ -491,7 +492,7 @@ Returns:
// EFI Test Profile Library Protocol
//
-typedef struct _EFI_TEST_PROFILE_LIBRARY_PROTOCOL {
+struct _EFI_TEST_PROFILE_LIBRARY_PROTOCOL {
UINT64 LibraryRevision;
CHAR16 *Name;
CHAR16 *Description;
@@ -500,7 +501,7 @@ typedef struct _EFI_TEST_PROFILE_LIBRARY_PROTOCOL {
EFI_TPL_INI_CLOSE EfiIniClose;
EFI_TPL_GET_SYSTEM_DEVICE_PATH EfiGetSystemDevicePath;
EFI_TPL_SET_SYSTEM_DEVICE_PATH EfiSetSystemDevicePath;
-} EFI_TEST_PROFILE_LIBRARY_PROTOCOL;
+};
//
// Global ID for EFI Test Profile Library Protocol
diff --git a/TestFrameworkPkg/Include/Protocol/TestRecoveryLibrary.h b/TestFrameworkPkg/Include/Protocol/TestRecoveryLibrary.h
index f3a445b..63d7f58 100644
--- a/TestFrameworkPkg/Include/Protocol/TestRecoveryLibrary.h
+++ b/TestFrameworkPkg/Include/Protocol/TestRecoveryLibrary.h
@@ -103,13 +103,13 @@ Returns:
//
// EFI Test Recovery Library Protocol
//
-typedef struct _EFI_TEST_RECOVERY_LIBRARY_PROTOCOL {
+struct _EFI_TEST_RECOVERY_LIBRARY_PROTOCOL {
UINT64 LibraryRevision;
CHAR16 *Name;
CHAR16 *Description;
EFI_TRL_READ_RESET_RECORD ReadResetRecord;
EFI_TRL_WRITE_RESET_RECORD WriteResetRecord;
-} EFI_TEST_RECOVERY_LIBRARY_PROTOCOL;
+};
//
// Global ID for EFI Test Recovery Library Protocol
diff --git a/TestFrameworkPkg/Include/Protocol/TslInit.h b/TestFrameworkPkg/Include/Protocol/TslInit.h
index f0e93e1..6349da5 100644
--- a/TestFrameworkPkg/Include/Protocol/TslInit.h
+++ b/TestFrameworkPkg/Include/Protocol/TslInit.h
@@ -98,12 +98,12 @@ Returns:
// EFI TSL Initiation Interface
//
-typedef struct _EFI_TSL_INIT_INTERFACE {
+struct _EFI_TSL_INIT_INTERFACE {
UINT64 Revision;
EFI_GUID LibraryGuid;
EFI_TSL_OPEN Open;
EFI_TSL_CLOSE Close;
-} EFI_TSL_INIT_INTERFACE;
+};
//
// Global ID for EFI TSL Initiation Interface
diff --git a/TestFrameworkPkg/Include/Protocol/WBTest.h b/TestFrameworkPkg/Include/Protocol/WBTest.h
index 480a382..b85b6ae 100644
--- a/TestFrameworkPkg/Include/Protocol/WBTest.h
+++ b/TestFrameworkPkg/Include/Protocol/WBTest.h
@@ -51,7 +51,7 @@ EFI_STATUS
// EFI White-Box Test Entry
//
-typedef struct _EFI_WB_TEST_ENTRY {
+struct _EFI_WB_TEST_ENTRY {
EFI_WB_TEST_ENTRY *Next;
EFI_GUID EntryId;
CHAR16 *Name;
@@ -60,20 +60,20 @@ typedef struct _EFI_WB_TEST_ENTRY {
EFI_GUID *SupportProtocols;
EFI_TEST_ATTRIBUTE CaseAttribute;
EFI_WB_ENTRY_POINT EntryPoint;
-} EFI_WB_TEST_ENTRY;
+} ;
//
// EFI White-Box Test Protocol
//
-typedef struct _EFI_WB_TEST_PROTOCOL {
+struct _EFI_WB_TEST_PROTOCOL {
UINT64 TestRevision;
EFI_GUID CategoryGuid;
EFI_HANDLE ClientHandle;
CHAR16 *Name;
CHAR16 *Description;
EFI_WB_TEST_ENTRY *EntryList;
-} EFI_WB_TEST_PROTOCOL;
+};
//
// Global ID for EFI White-Box Test Protocol
diff --git a/TestFrameworkPkg/InstallSct/InstallSct.c b/TestFrameworkPkg/InstallSct/InstallSct.c
index 1c71535..b6a2298 100644
--- a/TestFrameworkPkg/InstallSct/InstallSct.c
+++ b/TestFrameworkPkg/InstallSct/InstallSct.c
@@ -467,7 +467,7 @@ GetDestination (
ShellPromptForResponse (
ShellPromptResponseTypeFreeform,
L"Input index of destination FS. 'q' to exit:",
- &Response
+ (VOID **)&Response
);
Print (L"\n");
@@ -561,7 +561,7 @@ BackupTests (
ShellPromptForResponse (
ShellPromptResponseTypeFreeform,
Prompt,
- &Response
+ (VOID **)&Response
);
Print (L"\n");
@@ -642,7 +642,7 @@ BackupStartups (
ShellPromptForResponse (
ShellPromptResponseTypeFreeform,
Prompt,
- &Response
+ (VOID **)&Response
);
Print (L"\n");
@@ -701,6 +701,8 @@ InstallTest (
if (SrcFsName == NULL) {
return EFI_OUT_OF_RESOURCES;
}
+
+ SrcPath = NULL;
for (Index = 0; SrcFsName[Index] != 0; Index++) {
if (SrcFsName[Index] == L':') {
SrcPath = CatSPrint (NULL, L"%s", &SrcFsName[Index + 1]);
@@ -771,6 +773,8 @@ InstallStartup (
if (SrcFsName == NULL) {
return EFI_OUT_OF_RESOURCES;
}
+
+ SrcPath = NULL;
for (Index = 0; SrcFsName[Index] != 0; Index++) {
if (SrcFsName[Index] == L':') {
SrcPath = CatSPrint (NULL, L"%s\\..\\%s", &SrcFsName[Index + 1], INSTALL_SCT_STARTUP_FILE);
diff --git a/TestFrameworkPkg/Library/EasLib/EntsContext.c b/TestFrameworkPkg/Library/EasLib/EntsContext.c
index b49ea99..0433877 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsContext.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsContext.c
@@ -67,7 +67,7 @@ _RecordPrint(
_BuffPrint((CHAR8 *)Record->Value, Record->Size);
}
-STATIC
+
VOID
_RecordListPrint(
IN EFI_PASSIVE_TEST_CONTEXT_RECORD *RecordList
diff --git a/TestFrameworkPkg/Library/EasLib/EntsDpath.c b/TestFrameworkPkg/Library/EasLib/EntsDpath.c
index 8c7668e..1b44d5b 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsDpath.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsDpath.c
@@ -684,7 +684,7 @@ _DevPathMediaProtocol (
EntsCatPrint (Str, L"%g", &MediaProt->Protocol);
}
-STATIC
+
VOID
_DevPathFvFilePath (
IN OUT ENTS_POOL_PRINT *Str,
diff --git a/TestFrameworkPkg/Library/EasLib/EntsLib.inf b/TestFrameworkPkg/Library/EasLib/EntsLib.inf
index 4052017..acdc0ad 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsLib.inf
+++ b/TestFrameworkPkg/Library/EasLib/EntsLib.inf
@@ -41,22 +41,22 @@
EntsContext.c
[Sources.Ia32]
- Ia32\EfiLibPlat.h
- Ia32\InitPlat.c
+ Ia32/EfiLibPlat.h
+ Ia32/InitPlat.c
[Sources.Ipf]
- Ipf\EfiLibPlat.h
- Ipf\InitPlat.c
- Ipf\SalPal.c
- Ipf\LibSalPal.h
+ Ipf/EfiLibPlat.h
+ Ipf/InitPlat.c
+ Ipf/SalPal.c
+ Ipf/LibSalPal.h
[Sources.Ebc]
- Ebc\EfiLibPlat.h
- Ebc\EfiLibPlat.c
+ Ebc/EfiLibPlat.h
+ Ebc/EfiLibPlat.c
[Sources.X64]
- X64\EfiLibPlat.h
- X64\EfiLibPlat.c
+ X64/EfiLibPlat.h
+ X64/EfiLibPlat.c
[Packages]
MdePkg/MdePkg.dec
diff --git a/TestFrameworkPkg/Library/EasLib/EntsMisc.c b/TestFrameworkPkg/Library/EasLib/EntsMisc.c
index bd2443d..feeadd6 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsMisc.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsMisc.c
@@ -58,7 +58,7 @@ Returns:
Status = gntBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &Image
+ (VOID **)&Image
);
if (EFI_ERROR (Status)) {
return Status;
@@ -69,7 +69,7 @@ Returns:
Status = gntBS->HandleProtocol (
Image->DeviceHandle,
&gEfiDevicePathProtocolGuid,
- &TempDevicePath
+ (VOID **)&TempDevicePath
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/TestFrameworkPkg/Library/EasLib/EntsPrint.c b/TestFrameworkPkg/Library/EasLib/EntsPrint.c
index c2bd29d..9903f16 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsPrint.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsPrint.c
@@ -115,7 +115,7 @@ _IPrint (
IN VA_LIST args
);
-STATIC
+
INTN
_DbgOut (
IN VOID *Context,
@@ -251,7 +251,7 @@ _PoolCatPrint (
ps.Output = Output;
ps.Context = spc;
ps.fmt.u.pw = fmt;
- ps.args = args;
+ VA_COPY(ps.args, args);
_Print (&ps);
}
@@ -429,7 +429,7 @@ _IPrint (
ps.fmt.u.pc = fmta;
}
- ps.args = args;
+ VA_COPY(ps.args, args);
if (Column != (UINTN) -1) {
Out->SetCursorPosition (Out, Column, Row);
diff --git a/TestFrameworkPkg/Library/EasLib/EntsSupport.c b/TestFrameworkPkg/Library/EasLib/EntsSupport.c
index 9fef2a2..6cacd3b 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsSupport.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsSupport.c
@@ -45,11 +45,11 @@ STATIC BOOLEAN Finished;
STATIC EFI_NET_ASSERTION_CONFIG NetAssertionConfigData = {0, };
#define MAX_DEVICE_PATH_STR_LEN 128
-STATIC UINTN NICDevicePathLen = 0;
-STATIC CHAR16 NICDevicePathStr[MAX_DEVICE_PATH_STR_LEN] = {0, };
+UINTN NICDevicePathLen = 0;
+CHAR16 NICDevicePathStr[MAX_DEVICE_PATH_STR_LEN] = {0, };
#define SCT_AGENT_NIC_DEVICE_PATH L"Sct Agent NIC Device Path"
-STATIC EFI_GUID gSctVendorGuid = {0x72092b90, 0x17da, 0x47d1, 0x95, 0xce, 0x88, 0xf0, 0x12, 0xe8, 0x50, 0x8d};
+EFI_GUID gSctVendorGuid = {0x72092b90, 0x17da, 0x47d1, 0x95, 0xce, 0x88, 0xf0, 0x12, 0xe8, 0x50, 0x8d};
#define MAX_PACKET_LENGTH 1492
@@ -323,9 +323,9 @@ UdpCkSum (
STATIC
UINT32
AssertionPayloadGen (
- IN UINT8 *MessageHead,
- IN UINT8 *MessageBody,
- OUT UINT8 *PacketBuffer
+ IN CHAR8 *MessageHead,
+ IN CHAR8 *MessageBody,
+ OUT CHAR8 *PacketBuffer
)
/*++
@@ -411,7 +411,7 @@ Returns:
CopyMem (&ippkt->data[0], data, datalen);
ippkt->cksum = 0;
- ippkt->cksum = HTONS (IpCkSum ((short *) (buffer), headlen / 2));
+ ippkt->cksum = HTONS (IpCkSum ((UINT16 *) (buffer), headlen / 2));
CopyMem (&ippkt->data[0], data, datalen);
@@ -481,13 +481,13 @@ Returns:
UINTN
AssertionPacketGen (
- IN UINT8 *MessageHead,
- IN UINT8 *MessageBody,
+ IN CHAR8 *MessageHead,
+ IN CHAR8 *MessageBody,
IN EFI_NET_ASSERTION_CONFIG *ConfigData,
- OUT UINT8 *PacketBuffer
+ OUT CHAR8 *PacketBuffer
)
{
- UINT8 *AssertionPkt;
+ CHAR8 *AssertionPkt;
UDP_PACKET *UdpPkt;
IPV4_PACKET *IpPkt;
UINT32 SrcIpv4Add, DstIpv4Add;
@@ -498,14 +498,14 @@ AssertionPacketGen (
SrcIpv4Add = HTONL (*((UINT32 *) ConfigData->StationIp.Addr));
DstIpv4Add = HTONL (*((UINT32 *) ConfigData->ServerIp.Addr));
- AssertionPkt = (UINT8 *) (PacketBuffer + IPV4_HEAD_LEN + UDP_HEAD_LEN);
+ AssertionPkt = PacketBuffer + IPV4_HEAD_LEN + UDP_HEAD_LEN;
UdpPkt = (UDP_PACKET *) (PacketBuffer + IPV4_HEAD_LEN);
IpPkt = (IPV4_PACKET *) (PacketBuffer);
AssertionPktLen = AssertionPayloadGen (
MessageHead,
MessageBody,
- (UINT8 *) AssertionPkt
+ AssertionPkt
);
UpdLen = UdpPacketGen (
@@ -724,12 +724,13 @@ Returns:
STATIC
VOID
+EFIAPI
NotifyFunc (
EFI_EVENT Event,
- BOOLEAN *FinishedParameter
+ VOID *FinishedParameter
)
{
- *FinishedParameter = TRUE;
+ *(BOOLEAN *)FinishedParameter = TRUE;
return ;
}
@@ -837,7 +838,7 @@ NetAssertionUtilityInstall (
Status = gntBS->HandleProtocol (
ControllerHandle,
&gEfiManagedNetworkServiceBindingProtocolGuid,
- &MnpSb
+ (VOID **)&MnpSb
);
if (EFI_ERROR (Status)) {
return Status;
@@ -862,7 +863,7 @@ NetAssertionUtilityInstall (
Status = gntBS->OpenProtocol (
MnpChildHandle,
&gEfiManagedNetworkProtocolGuid,
- &Mnp,
+ (VOID **)&Mnp,
mImageHandle,
MnpChildHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER
@@ -994,7 +995,7 @@ EntsNetworkServiceBindingGetControllerHandle (
Status = gntBS->HandleProtocol (
NICHandleBuffer[Index],
&gEfiDevicePathProtocolGuid,
- &DevicePath
+ (VOID **)&DevicePath
);
if (EFI_ERROR(Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"Can not get device path - %r\n", Status));
@@ -1073,7 +1074,7 @@ EntsChooseNICAndSave (
Status = gntBS->HandleProtocol (
NicHandleBuffer[Index],
&gEfiDevicePathProtocolGuid,
- &NicDevicePath
+ (VOID **)&NicDevicePath
);
if (EFI_ERROR(Status)) {
EFI_ENTS_DEBUG((EFI_ENTS_D_ERROR, L"EntsChooseNICAndSave: HandleProtocol fail - %r", NicHandleBuffer[Index], Status));
@@ -1144,7 +1145,7 @@ GetMacAddress (
Status = gntBS->HandleProtocol (
ControllerHandle,
&gEfiManagedNetworkServiceBindingProtocolGuid,
- &MnpSb
+ (VOID **)&MnpSb
);
if (EFI_ERROR(Status)) {
EFI_ENTS_DEBUG((EFI_ENTS_D_ERROR, L"GetMacAddress: Handle MNP Service Binding Protocol fail - %r", Status));
diff --git a/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c b/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c
index c6897be..ac9912b 100644
--- a/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c
+++ b/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c
@@ -158,7 +158,7 @@ EfiInitAndInstallBBTestInterface (
Status = gtBS->HandleProtocol (
*Handle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
return EFI_INVALID_PARAMETER;
@@ -253,7 +253,7 @@ EfiInitAndInstallIHVBBTestInterface (
Status = gtBS->HandleProtocol (
*Handle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
return EFI_INVALID_PARAMETER;
@@ -452,7 +452,7 @@ EfiInitAndInstallWBTestInterface (
Status = gtBS->HandleProtocol (
*Handle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
return EFI_INVALID_PARAMETER;
@@ -590,7 +590,7 @@ BuildBBTestInterface (
Status = gtBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_BB_TEST_PROTOCOL),
- &BBTest
+ (VOID **)&BBTest
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -638,7 +638,7 @@ AddBBTestEntry (
Status = gtBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_BB_TEST_ENTRY),
- &BBTestEntry
+ (VOID **)&BBTestEntry
);
if (EFI_ERROR (Status)) {
return Status;
@@ -661,7 +661,7 @@ AddBBTestEntry (
Status = gtBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_GUID) * (GuidCount + 1),
- &BBTestEntry->SupportProtocols
+ (VOID **)&BBTestEntry->SupportProtocols
);
if (EFI_ERROR (Status)) {
gtBS->FreePool (BBTestEntry);
@@ -725,7 +725,7 @@ BuildWBTestInterface (
Status = gtBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_WB_TEST_PROTOCOL),
- &WBTest
+ (VOID **)&WBTest
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -774,7 +774,7 @@ AddWBTestEntry (
Status = gtBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_WB_TEST_ENTRY),
- &WBTestEntry
+ (VOID **)&WBTestEntry
);
if (EFI_ERROR (Status)) {
return Status;
@@ -797,7 +797,7 @@ AddWBTestEntry (
Status = gtBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_GUID) * (GuidCount + 1),
- &WBTestEntry->SupportProtocols
+ (VOID **)&WBTestEntry->SupportProtocols
);
if (EFI_ERROR (Status)) {
gtBS->FreePool (WBTestEntry);
diff --git a/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
index 6988c9d..a4775a2 100644
--- a/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
+++ b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
@@ -227,7 +227,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_ENTS_MONITOR_PROTOCOL),
- &gIP4NetworkMonitorInterface
+ (VOID **)&gIP4NetworkMonitorInterface
);
if (EFI_ERROR (Status)) {
goto Error;
@@ -334,7 +334,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiIp4ServiceBindingProtocolGuid,
NULL,
- &Ip4Sb
+ (VOID **)&Ip4Sb
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"Locate Ip4Sb Error"));
@@ -360,7 +360,7 @@ Returns:
Status = gBS->OpenProtocol (
mIp4InstanceHandle,
&gEfiIp4ProtocolGuid,
- &Ip4,
+ (VOID **)&Ip4,
mImageHandle,
mIp4InstanceHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER
@@ -455,7 +455,7 @@ Returns:
Status = gBS->LocateProtocol (
&gEfiIp4ServiceBindingProtocolGuid,
NULL,
- &Ip4Sb
+ (VOID **)&Ip4Sb
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"Locate Ip4Sb Error"));
diff --git a/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
index 48a840d..8d2a8c2 100644
--- a/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
+++ b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
@@ -47,7 +47,7 @@ STATIC EFI_MANAGED_NETWORK_COMPLETION_TOKEN TxLLToken;
STATIC EFI_MANAGED_NETWORK_COMPLETION_TOKEN RxToken;
STATIC EFI_MANAGED_NETWORK_TRANSMIT_DATA TxData;
STATIC EFI_MANAGED_NETWORK_TRANSMIT_DATA TxLLData;
-STATIC EFI_MANAGED_NETWORK_TRANSMIT_DATA TxProbeResp;
+ EFI_MANAGED_NETWORK_TRANSMIT_DATA TxProbeResp;
STATIC EFI_MANAGED_NETWORK_RECEIVE_DATA *RxData;
STATIC BOOLEAN HasReceivePacket = FALSE;
@@ -233,7 +233,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_ENTS_MONITOR_PROTOCOL),
- &gManagedNetworkMonitorInterface
+ (VOID **)&gManagedNetworkMonitorInterface
);
if (EFI_ERROR (Status)) {
goto Error;
@@ -351,7 +351,7 @@ Returns:
Status = gBS->HandleProtocol (
ControllerHandle,
&gEfiManagedNetworkServiceBindingProtocolGuid,
- &MnpSb
+ (VOID **)&MnpSb
);
if (EFI_ERROR (Status)) {
return Status;
@@ -376,7 +376,7 @@ Returns:
Status = gBS->OpenProtocol (
mMnpInstanceHandle,
&gEfiManagedNetworkProtocolGuid,
- &mMnp,
+ (VOID **)&mMnp,
mImageHandle,
mMnpInstanceHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER
diff --git a/TestFrameworkPkg/MonitorServices/SerialMonitor/SerialMonitor.c b/TestFrameworkPkg/MonitorServices/SerialMonitor/SerialMonitor.c
index 9e452b1..cc44e0b 100644
--- a/TestFrameworkPkg/MonitorServices/SerialMonitor/SerialMonitor.c
+++ b/TestFrameworkPkg/MonitorServices/SerialMonitor/SerialMonitor.c
@@ -217,13 +217,13 @@ Returns:
gBS->HandleProtocol (
HandleBuffer[HANDLE_IN_USE - 1],
&gEfiSerialIoProtocolGuid,
- &SerialIo
+ (VOID **)&SerialIo
);
} else {
Status = gBS->LocateProtocol (
&gEfiSerialIoProtocolGuid,
NULL,
- &SerialIo
+ (VOID **)&SerialIo
);
if (EFI_ERROR (Status)) {
return Status;
@@ -506,7 +506,7 @@ Returns:
Status = gBS->UninstallMultipleProtocolInterfaces (
ImageHandle,
&gEfiEntsMonitorProtocolGuid,
- gSerialMonitorInterface,
+ (VOID **)gSerialMonitorInterface,
NULL
);
@@ -558,7 +558,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_ENTS_MONITOR_PROTOCOL),
- &gSerialMonitorInterface
+ (VOID **)&gSerialMonitorInterface
);
if (EFI_ERROR (Status)) {
goto Error;
diff --git a/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c b/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c
index dc6e1c5..e86a790 100644
--- a/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c
+++ b/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c
@@ -506,7 +506,7 @@ ParseHob (
return EFI_NOT_FOUND;
}
- Status = gST->BootServices->AllocatePool (EfiBootServicesData, REPORT_BUFFER_SIZE, &(VOID*)ReportBuffer);
+ Status = gST->BootServices->AllocatePool (EfiBootServicesData, REPORT_BUFFER_SIZE, (VOID **)&ReportBuffer);
if (EFI_ERROR (Status)) {
gST->BootServices->FreePool ((VOID*)ReportBuffer);
return Status;
@@ -693,7 +693,7 @@ InitManageModule (
Fclose(InitConfig);
goto end;
}
- Status = gST->BootServices->AllocatePool (EfiBootServicesData, FileSize, &(VOID*)FileBuffer);
+ Status = gST->BootServices->AllocatePool (EfiBootServicesData, FileSize, (VOID **)&FileBuffer);
if (EFI_ERROR (Status)) {
goto end;
}
diff --git a/TestFrameworkPkg/Sct/Core/SctInit.c b/TestFrameworkPkg/Sct/Core/SctInit.c
index c3581ad..6e27eae 100644
--- a/TestFrameworkPkg/Sct/Core/SctInit.c
+++ b/TestFrameworkPkg/Sct/Core/SctInit.c
@@ -77,7 +77,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_FRAMEWORK_TABLE),
- &gFT
+ (VOID **)&gFT
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/TestFrameworkPkg/Sct/Data/ApTest.c b/TestFrameworkPkg/Sct/Data/ApTest.c
index a730bf2..a53e8a4 100644
--- a/TestFrameworkPkg/Sct/Data/ApTest.c
+++ b/TestFrameworkPkg/Sct/Data/ApTest.c
@@ -405,7 +405,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_AP_TEST_INTERFACE),
- &TempApTest
+ (VOID **)&TempApTest
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -781,7 +781,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_AP_TEST_ENTRY),
- &TempApEntry
+ (VOID **)&TempApEntry
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Data/Category.c b/TestFrameworkPkg/Sct/Data/Category.c
index e59a796..1df7666 100644
--- a/TestFrameworkPkg/Sct/Data/Category.c
+++ b/TestFrameworkPkg/Sct/Data/Category.c
@@ -509,7 +509,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_CATEGORY_DATA),
- &TempCategory
+ (VOID **)&TempCategory
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Data/TestCase.c b/TestFrameworkPkg/Sct/Data/TestCase.c
index 97fab1d..63b4255 100644
--- a/TestFrameworkPkg/Sct/Data/TestCase.c
+++ b/TestFrameworkPkg/Sct/Data/TestCase.c
@@ -1477,7 +1477,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_TEST_CASE),
- &TempTestCase
+ (VOID **)&TempTestCase
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Data/TestNode.c b/TestFrameworkPkg/Sct/Data/TestNode.c
index 9ced0ab..30df071 100644
--- a/TestFrameworkPkg/Sct/Data/TestNode.c
+++ b/TestFrameworkPkg/Sct/Data/TestNode.c
@@ -479,7 +479,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_TEST_NODE),
- &TempTestNode
+ (VOID **)&TempTestNode
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/DeviceConfig/DeviceConfig.c b/TestFrameworkPkg/Sct/DeviceConfig/DeviceConfig.c
index dc69720..732ec2f 100644
--- a/TestFrameworkPkg/Sct/DeviceConfig/DeviceConfig.c
+++ b/TestFrameworkPkg/Sct/DeviceConfig/DeviceConfig.c
@@ -132,7 +132,7 @@ Input (
CHAR16 *Response;
Response = NULL;
- ShellPromptForResponse (ShellPromptResponseTypeFreeform, Prompt, &Response);
+ ShellPromptForResponse (ShellPromptResponseTypeFreeform, Prompt, (VOID **)&Response);
if (Response == NULL) {
StrnCpy (String, L"", Length);
} else {
@@ -443,7 +443,7 @@ DeviceConfigInsert (
Status = gBS->HandleProtocol (
Handle,
&gEfiDevicePathProtocolGuid,
- &DevicePath
+ (VOID **)&DevicePath
);
if (EFI_ERROR (Status)) {
Print (L" Invalid handle number!\n");
@@ -936,7 +936,7 @@ DeviceConfigScan (
Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiDevicePathProtocolGuid,
- &DevicePath
+ (VOID **)&DevicePath
);
if (EFI_ERROR (Status)) {
continue;
@@ -949,7 +949,7 @@ DeviceConfigScan (
Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiPciIoProtocolGuid,
- &PciIo
+ (VOID **)&PciIo
);
if (EFI_ERROR (Status)) {
continue;
@@ -1244,7 +1244,7 @@ DeviceConfigScanDrivers (
Status = gBS->HandleProtocol (
EntryBuffer[Index2].AgentHandle,
&gEfiComponentNameProtocolGuid,
- &ComponentName
+ (VOID **)&ComponentName
);
if (!EFI_ERROR (Status)) {
Status = ComponentName->GetDriverName (
@@ -1275,7 +1275,7 @@ DeviceConfigScanDrivers (
Status = gBS->HandleProtocol (
EntryBuffer[Index2].AgentHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (!EFI_ERROR (Status)) {
FilePathStr = ConvertDevicePathToText (LoadedImage->FilePath, FALSE, FALSE);
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Arg/EasArg.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Arg/EasArg.c
index 296271d..4e7ede2 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Arg/EasArg.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Arg/EasArg.c
@@ -130,7 +130,7 @@ Returns:
}
if ((Feature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- VarBaseAddress = &(UINT8 *) RivlVariable->Address;
+ VarBaseAddress = (UINT8 **) &RivlVariable->Address;
} else {
VarBaseAddress = RivlVariable->Address;
}
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/EasInit.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/EasInit.c
index 389f848..2881010 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/EasInit.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/EasInit.c
@@ -267,7 +267,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_NETWORK_TEST_FRAMEWORK_TABLE),
- &gEasFT
+ (VOID **)&gEasFT
);
if (EFI_ERROR (Status)) {
return Status;
@@ -281,7 +281,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_MONITOR_COMMAND),
- &gEasFT->Cmd
+ (VOID **)&gEasFT->Cmd
);
if (EFI_ERROR (Status)) {
FreePool (gEasFT->Cmd);
@@ -579,7 +579,7 @@ Returns:
Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiEntsMonitorProtocolGuid,
- &EntsMonitorInterface
+ (VOID **)&EntsMonitorInterface
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG((EFI_ENTS_D_ERROR, L"Can not get ENTS Monitor interface - %r", Status));
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c
index 4c55e20..cbb49dc 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c
@@ -1001,7 +1001,7 @@ Returns:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"in ExecElet: HandleProtocol - %r", Status));
@@ -1183,7 +1183,7 @@ Returns:
Status = gBS->HandleProtocol (
HandleBuffer[HandleIndex],
&gEfiEntsProtocolGuid,
- &Interface
+ (VOID **)&Interface
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"Handle protocol - %r, Index - %d", Status, HandleIndex));
@@ -1367,7 +1367,7 @@ Returns:
//
// Locate CpuArch protocol
//
- Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, &Cpu);
+ Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&Cpu);
if (EFI_ERROR (Status)) {
Print (L"Locate CpuArch protocol error\n");
}
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EftpImplement.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EftpImplement.c
index 2529248..90225d8 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EftpImplement.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EftpImplement.c
@@ -68,7 +68,6 @@ Returns:
return Index;
}
-STATIC
EFI_STATUS
EftpTimeoutCallback (
IN EFI_EFTP_PROTOCOL *This,
@@ -95,7 +94,7 @@ Returns:
return EFI_SUCCESS;
}
-STATIC
+
EFI_STATUS
OpenMnpProtocol (
VOID
@@ -131,7 +130,7 @@ Returns:
Status = gBS->HandleProtocol (
ControllerHandle,
&gEfiManagedNetworkServiceBindingProtocolGuid,
- &TmpMnpSb
+ (VOID **)&TmpMnpSb
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"OpenMnpProtocol: LocateProtocol error ! - %r", Status));
@@ -173,7 +172,7 @@ Returns:
return EFI_SUCCESS;
}
-STATIC
+
EFI_STATUS
CloseMnpProtocol (
VOID
@@ -241,7 +240,7 @@ OpenEftpProtocol (
Status = gBS->HandleProtocol (
ControllerHandle,
&gEfiEftpServiceBindingProtocolGuid,
- &TmpEftpSb
+ (VOID **)&TmpEftpSb
);
if (EFI_ERROR(Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"No Eftp driver has found!\n"));
@@ -355,7 +354,7 @@ Returns:
Status = gBS->HandleProtocol (
mImageHandle,
&gEfiLoadedImageProtocolGuid,
- &Image
+ (VOID **)&Image
);
if (EFI_ERROR (Status)) {
Print (L"Error: HandleProtocol LoadedImage ! - %r\n", Status);
@@ -365,7 +364,7 @@ Returns:
Status = gBS->HandleProtocol (
Image->DeviceHandle,
&gEfiDevicePathProtocolGuid,
- &DevicePath
+ (VOID **)&DevicePath
);
if (EFI_ERROR (Status)) {
Print (L"Error: HandleProtocol DevicePath ! - %r\n", Status);
@@ -609,8 +608,8 @@ Returns:
EFI_STATUS Status;
EFI_EFTP_TOKEN Token;
EFI_EFTP_CONFIG_DATA EftpCfgData;
- UINT8 FileName[MAX_FILENAME_LEN];
- UINT8 ModeStr[MAX_MODE_STR_LEN];
+ CHAR8 FileName[MAX_FILENAME_LEN];
+ CHAR8 ModeStr[MAX_MODE_STR_LEN];
UINTN MacAddrLen;
//
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasSupportFile.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasSupportFile.c
index 039fe73..418fbe2 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasSupportFile.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasSupportFile.c
@@ -133,7 +133,7 @@ Returns:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"in LoadTestFile: Locate file volume - %r", Status));
@@ -172,7 +172,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR (Status)) {
TestDir->Close (TestDir);
@@ -424,7 +424,7 @@ Returns:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
return Status;
@@ -446,7 +446,7 @@ Returns:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiEntsMonitorProtocolGuid,
- &EntsMonitorProtocol
+ (VOID **)&EntsMonitorProtocol
);
if (!EFI_ERROR (Status)) {
Status = EntsCreateSingleSupportFile (
@@ -551,7 +551,7 @@ Returns:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
return Status;
@@ -685,7 +685,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_NETWORK_TEST_FILE),
- TestFile
+ (VOID **)TestFile
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasTestFile.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasTestFile.c
index 7701a69..d37dd11 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasTestFile.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Load/EasTestFile.c
@@ -119,7 +119,7 @@ Returns:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"in LoadTestFile: Locate file volume - %r", Status));
@@ -158,7 +158,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR (Status)) {
TestDir->Close (TestDir);
@@ -440,7 +440,7 @@ Returns:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
return Status;
@@ -462,7 +462,7 @@ Returns:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiEntsProtocolGuid,
- &EntsProtocol
+ (VOID **)&EntsProtocol
);
if (!EFI_ERROR (Status)) {
Status = EntsCreateSingleTestFile (
@@ -598,7 +598,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_NETWORK_TEST_FILE),
- TestFile
+ (VOID **)TestFile
);
if (EFI_ERROR (Status)) {
EFI_ENTS_DEBUG ((EFI_ENTS_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c
index 99e3d37..efb7289 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c
@@ -563,7 +563,7 @@ Returns:
}
if ((Feature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- VarBaseAddress = &(UINT8 *) RivlVariable->Address;
+ VarBaseAddress = (UINT8 **)&RivlVariable->Address;
} else {
VarBaseAddress = RivlVariable->Address;
}
@@ -608,7 +608,7 @@ Returns:
}
if ((BufferFeature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- BufferVarBaseAddress = &(UINT8 *) RivlBufferVariable->Address;
+ BufferVarBaseAddress = (UINT8 **)&RivlBufferVariable->Address;
} else {
BufferVarBaseAddress = RivlBufferVariable->Address;
}
@@ -686,7 +686,7 @@ Returns:
}
if ((BufferFeature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- BufferVarBaseAddress = &(UINT8 *) RivlBufferVariable->Address;
+ BufferVarBaseAddress = (UINT8 **)&RivlBufferVariable->Address;
} else {
BufferVarBaseAddress = RivlBufferVariable->Address;
}
@@ -749,7 +749,7 @@ Returns:
}
if ((BufferFeature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- BufferVarBaseAddress = &(UINT8 *) RivlBufferVariable->Address;
+ BufferVarBaseAddress = (UINT8 **)&RivlBufferVariable->Address;
} else {
BufferVarBaseAddress = RivlBufferVariable->Address;
}
@@ -815,7 +815,7 @@ Returns:
}
if ((BufferFeature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- BufferVarBaseAddress = &(UINT8 *) RivlBufferVariable->Address;
+ BufferVarBaseAddress = (UINT8 **)&RivlBufferVariable->Address;
} else {
BufferVarBaseAddress = RivlBufferVariable->Address;
}
@@ -887,7 +887,7 @@ Returns:
}
if ((BufferFeature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- BufferVarBaseAddress = &(UINT8 *) RivlBufferVariable->Address;
+ BufferVarBaseAddress = (UINT8 **)&RivlBufferVariable->Address;
} else {
BufferVarBaseAddress = RivlBufferVariable->Address;
}
@@ -946,7 +946,7 @@ Returns:
}
if ((BufferFeature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- BufferVarBaseAddress = &(UINT8 *) RivlBufferVariable->Address;
+ BufferVarBaseAddress = (UINT8 **)&RivlBufferVariable->Address;
} else {
BufferVarBaseAddress = RivlBufferVariable->Address;
}
@@ -1045,7 +1045,7 @@ Returns:
}
if ((Feature & RIVL_VAR_FEATURE_POINTER) != RIVL_VAR_FEATURE_POINTER) {
- VarBaseAddress = &(UINT8 *) RivlVariable->Address;
+ VarBaseAddress = (UINT8 **)&RivlVariable->Address;
} else {
VarBaseAddress = RivlVariable->Address;
}
diff --git a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
index 7c88716..43b117d 100644
--- a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
+++ b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
@@ -646,7 +646,7 @@ DeviceConfigGetString (
);
}
-STATIC
+
EFI_STATUS
DeviceConfigSetString (
IN EFI_INI_FILE_HANDLE IniFile,
@@ -788,7 +788,7 @@ GatherConfigHandles (
Status = gBS->HandleProtocol (
SupportHandle,
&gEfiTestProfileLibraryGuid,
- &ProfileLib
+ (VOID **)&ProfileLib
);
if (EFI_ERROR (Status)) {
return Status;
@@ -900,7 +900,7 @@ GatherConfigHandles (
Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiDevicePathProtocolGuid,
- &DevicePath
+ (VOID **)&DevicePath
);
if (EFI_ERROR (Status)) {
continue;
diff --git a/TestFrameworkPkg/Sct/Execute/Reset.c b/TestFrameworkPkg/Sct/Execute/Reset.c
index 6e71789..5723ddf 100644
--- a/TestFrameworkPkg/Sct/Execute/Reset.c
+++ b/TestFrameworkPkg/Sct/Execute/Reset.c
@@ -348,7 +348,7 @@ Routine Description:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR(Status)) {
return Status;
@@ -390,7 +390,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR(Status)) {
Handle->Close (Handle);
@@ -527,7 +527,7 @@ Routine Description:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/TestFrameworkPkg/Sct/Include/ApTest.h b/TestFrameworkPkg/Sct/Include/ApTest.h
index 85b58ae..bda6b87 100644
--- a/TestFrameworkPkg/Sct/Include/ApTest.h
+++ b/TestFrameworkPkg/Sct/Include/ApTest.h
@@ -42,7 +42,7 @@ typedef struct _EFI_AP_TEST_ENTRY EFI_AP_TEST_ENTRY;
// EFI Application Test Entry Point
//
-typedef struct _EFI_AP_TEST_ENTRY {
+struct _EFI_AP_TEST_ENTRY {
EFI_AP_TEST_ENTRY *Next;
EFI_GUID EntryId;
CHAR16 *Name;
@@ -51,7 +51,7 @@ typedef struct _EFI_AP_TEST_ENTRY {
EFI_GUID *SupportProtocols;
UINT32 CaseAttribute;
CHAR16 *Parameters;
-} EFI_AP_TEST_ENTRY;
+};
//
// EFI Application Test Interface
diff --git a/TestFrameworkPkg/Sct/Include/SctOutput.h b/TestFrameworkPkg/Sct/Include/SctOutput.h
index ece573d..ffd17e8 100644
--- a/TestFrameworkPkg/Sct/Include/SctOutput.h
+++ b/TestFrameworkPkg/Sct/Include/SctOutput.h
@@ -36,13 +36,13 @@
//
typedef struct _TEST_OUTPUT_FILE TEST_OUTPUT_FILE;
-typedef struct _TEST_OUTPUT_FILE {
+struct _TEST_OUTPUT_FILE {
TEST_OUTPUT_FILE *Next;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
CHAR16 *FileName;
EFI_FILE_HANDLE FileHandle;
UINTN OpenCount;
-} TEST_OUTPUT_FILE;
+};
typedef struct {
UINT32 Signature;
diff --git a/TestFrameworkPkg/Sct/Load/SupportFile.c b/TestFrameworkPkg/Sct/Load/SupportFile.c
index 4d51370..ebeefcb 100644
--- a/TestFrameworkPkg/Sct/Load/SupportFile.c
+++ b/TestFrameworkPkg/Sct/Load/SupportFile.c
@@ -149,7 +149,7 @@ Returns:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Locate file system - %r", Status));
@@ -191,7 +191,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -383,8 +383,8 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiStandardTestLibraryGuid,
- &gFT->StslProtocol,
- &gFT->StslInterface
+ (VOID **)&gFT->StslProtocol,
+ (VOID **)&gFT->StslInterface
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Open standard test - %r", Status));
@@ -397,7 +397,7 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiTestProfileLibraryGuid,
- &gFT->TplProtocol,
+ (VOID **)&gFT->TplProtocol,
NULL
);
if (EFI_ERROR (Status)) {
@@ -411,8 +411,8 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiTestRecoveryLibraryGuid,
- &gFT->TrlProtocol,
- &gFT->TrlInterface
+ (VOID **)&gFT->TrlProtocol,
+ (VOID **)&gFT->TrlInterface
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Open test recovery - %r", Status));
@@ -425,8 +425,8 @@ Returns:
//
Status = OpenSingleSupportFile (
&gEfiTestLoggingLibraryGuid,
- &gFT->TllProtocol,
- &gFT->TllInterface
+ (VOID **)&gFT->TllProtocol,
+ (VOID **)&gFT->TllInterface
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Open test logging - %r", Status));
@@ -730,7 +730,7 @@ Routine Description:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Locate loaded image - %r", Status));
@@ -758,7 +758,7 @@ Routine Description:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiTslInitInterfaceGuid,
- &TslInit
+ (VOID **)&TslInit
);
if (!EFI_ERROR (Status)) {
Status = CreateSingleSupportFile (
@@ -819,7 +819,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_TEST_FILE),
- SupportFile
+ (VOID **)SupportFile
);
if (EFI_ERROR(Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -1107,7 +1107,7 @@ Returns:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Locate file system - %r", Status));
@@ -1149,7 +1149,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -1387,7 +1387,7 @@ Routine Description:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Locate loaded image - %r", Status));
@@ -1469,7 +1469,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_TEST_FILE),
- ProxyFile
+ (VOID **)ProxyFile
);
if (EFI_ERROR(Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Load/TestFile.c b/TestFrameworkPkg/Sct/Load/TestFile.c
index 7f22141..38900e7 100644
--- a/TestFrameworkPkg/Sct/Load/TestFile.c
+++ b/TestFrameworkPkg/Sct/Load/TestFile.c
@@ -124,7 +124,7 @@ Returns:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Locate file system - %r", Status));
@@ -166,7 +166,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -579,7 +579,7 @@ Routine Description:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiLoadedImageProtocolGuid,
- &LoadedImage
+ (VOID **)&LoadedImage
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Locate loaded image - %r", Status));
@@ -607,7 +607,7 @@ Routine Description:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiBbTestGuid,
- &BbTest
+ (VOID **)&BbTest
);
if (!EFI_ERROR (Status)) {
Status = CreateSingleTestFile (
@@ -633,7 +633,7 @@ Routine Description:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiWbTestGuid,
- &WbTest
+ (VOID **)&WbTest
);
if (!EFI_ERROR (Status)) {
Status = CreateSingleTestFile (
@@ -659,7 +659,7 @@ Routine Description:
Status = gBS->HandleProtocol (
ImageHandle,
&gEfiIHVBbTestGuid,
- &BbTest
+ (VOID **)&BbTest
);
if (!EFI_ERROR (Status)) {
Status = CreateSingleTestFile (
@@ -838,7 +838,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_TEST_FILE),
- TestFile
+ (VOID **)TestFile
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Misc/SctMisc.c b/TestFrameworkPkg/Sct/Misc/SctMisc.c
index 23308ea..1108f63 100644
--- a/TestFrameworkPkg/Sct/Misc/SctMisc.c
+++ b/TestFrameworkPkg/Sct/Misc/SctMisc.c
@@ -298,7 +298,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(CHAR16) * (Length + 1),
- &ShortFileName
+ (VOID **)&ShortFileName
);
if (EFI_ERROR(Status)) {
return NULL;
@@ -1236,7 +1236,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
(NumberOfTokens + 1) * sizeof(EFI_GUID),
- GuidArray
+ (VOID **)GuidArray
);
if (EFI_ERROR (Status)) {
FreePool (TempBuffer);
diff --git a/TestFrameworkPkg/Sct/Operation/Operation.c b/TestFrameworkPkg/Sct/Operation/Operation.c
index b7215ea..8fbff61 100644
--- a/TestFrameworkPkg/Sct/Operation/Operation.c
+++ b/TestFrameworkPkg/Sct/Operation/Operation.c
@@ -721,7 +721,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_CONFIG_DATA),
- &gFT->ConfigData
+ (VOID **)&gFT->ConfigData
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Report/Report.c b/TestFrameworkPkg/Sct/Report/Report.c
index 5ba4653..e2dfc21 100644
--- a/TestFrameworkPkg/Sct/Report/Report.c
+++ b/TestFrameworkPkg/Sct/Report/Report.c
@@ -141,7 +141,7 @@ Returns:
DevicePath,
FileName,
&BufferSize,
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Read file to buffer - %r", Status));
@@ -257,7 +257,7 @@ Returns:
DevicePath,
FileName,
&BufferSize,
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Read file to buffer - %r", Status));
@@ -374,7 +374,7 @@ Returns:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Handle protocol - %r", Status));
@@ -416,7 +416,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -467,7 +467,7 @@ Returns:
DevicePath,
FileName,
&BufferSize,
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_DEBUG, L"Read file to buffer - %r", Status));
@@ -640,7 +640,7 @@ Arguments:
//
Status = SctReportConfig (
&ConfigBufferSize,
- &ConfigBuffer
+ (VOID **)&ConfigBuffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"SctReportConfig: %r", Status));
@@ -708,7 +708,7 @@ Arguments:
Status = gBS->AllocatePool (
EfiBootServicesData,
AsciiBufferSize,
- &AsciiBuffer
+ (VOID **)&AsciiBuffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Report/ReportConfig.c b/TestFrameworkPkg/Sct/Report/ReportConfig.c
index 94decea..11e63f4 100644
--- a/TestFrameworkPkg/Sct/Report/ReportConfig.c
+++ b/TestFrameworkPkg/Sct/Report/ReportConfig.c
@@ -22,7 +22,7 @@
EFI_STATUS
SctReportConfig (
OUT UINTN *BufferSize,
- OUT UINT8 **Buffer
+ OUT VOID **Buffer
)
/*++
diff --git a/TestFrameworkPkg/Sct/Report/ReportDatabase.c b/TestFrameworkPkg/Sct/Report/ReportDatabase.c
index b44e6e2..d3df65e 100644
--- a/TestFrameworkPkg/Sct/Report/ReportDatabase.c
+++ b/TestFrameworkPkg/Sct/Report/ReportDatabase.c
@@ -106,7 +106,7 @@ Routine Description:
DevicePath,
FileName,
&BufferSize,
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Read file to buffer - %r", Status));
@@ -983,7 +983,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
mGuidDatabaseMaxSize * sizeof(EFI_SCT_GUID_DATABASE),
- &mGuidDatabase
+ (VOID **)&mGuidDatabase
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -1003,7 +1003,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
mGuidDatabaseMaxSize * sizeof(EFI_SCT_GUID_DATABASE),
- &TempGuidDatabase
+ (VOID **)&TempGuidDatabase
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -1117,7 +1117,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
mGuidAssertionMaxSize * sizeof(EFI_SCT_GUID_ASSERTION),
- &mGuidAssertion
+ (VOID **)&mGuidAssertion
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -1137,7 +1137,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
mGuidAssertionMaxSize * sizeof(EFI_SCT_GUID_ASSERTION),
- &TempGuidAssertion
+ (VOID **)&TempGuidAssertion
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -1291,7 +1291,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_REPORT_ITEM),
- &NewReportItem
+ (VOID **)&NewReportItem
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -1334,7 +1334,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof(EFI_SCT_ASSERTION_INFOR),
- &NewAssertionInfor
+ (VOID **)&NewAssertionInfor
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Report/ReportSupport.c b/TestFrameworkPkg/Sct/Report/ReportSupport.c
index e1428ca..f334730 100644
--- a/TestFrameworkPkg/Sct/Report/ReportSupport.c
+++ b/TestFrameworkPkg/Sct/Report/ReportSupport.c
@@ -94,7 +94,7 @@ Routine Description:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
return FALSE;
@@ -182,7 +182,7 @@ Routine Description:
Status = gBS->HandleProtocol (
DeviceHandle,
&gEfiSimpleFileSystemProtocolGuid,
- &Vol
+ (VOID **)&Vol
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Handle protocol - %r", Status));
@@ -224,7 +224,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
FileInfoSize,
- &FileInfo
+ (VOID **)&FileInfo
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -451,7 +451,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
mReportBufferMaxSize * sizeof(CHAR16),
- &mReportBuffer
+ (VOID **)&mReportBuffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
@@ -474,7 +474,7 @@ Routine Description:
Status = gBS->AllocatePool (
EfiBootServicesData,
mReportBufferMaxSize * sizeof(CHAR16),
- &TempBuffer
+ (VOID **)&TempBuffer
);
if (EFI_ERROR (Status)) {
EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Allocate pool - %r", Status));
diff --git a/TestFrameworkPkg/Sct/Report/ReportSupport.h b/TestFrameworkPkg/Sct/Report/ReportSupport.h
index 85a6a33..4909605 100644
--- a/TestFrameworkPkg/Sct/Report/ReportSupport.h
+++ b/TestFrameworkPkg/Sct/Report/ReportSupport.h
@@ -77,7 +77,7 @@ typedef struct {
//
typedef struct _EFI_SCT_ASSERTION_INFOR EFI_SCT_ASSERTION_INFOR;
-typedef struct _EFI_SCT_ASSERTION_INFOR {
+struct _EFI_SCT_ASSERTION_INFOR {
EFI_SCT_ASSERTION_INFOR *Next;
EFI_SCT_ASSERTION_INFOR *Prev;
CHAR16 Index[EFI_SCT_INDEX_LEN];
@@ -90,14 +90,14 @@ typedef struct _EFI_SCT_ASSERTION_INFOR {
CHAR16 RuntimeInfor[EFI_SCT_RUNTIME_INFOR_LEN];
CHAR16 DevicePath[EFI_SCT_DEVICE_PATH_LEN];
CHAR16 FileName[EFI_SCT_NAME_LEN];
-} EFI_SCT_ASSERTION_INFOR;
+} ;
//
// EFI_SCT_REPORT_ITEM
//
typedef struct _EFI_SCT_REPORT_ITEM EFI_SCT_REPORT_ITEM;
-typedef struct _EFI_SCT_REPORT_ITEM {
+struct _EFI_SCT_REPORT_ITEM {
EFI_SCT_REPORT_ITEM *Next;
EFI_SCT_REPORT_ITEM *Prev;
UINT32 PassNumber;
@@ -107,7 +107,7 @@ typedef struct _EFI_SCT_REPORT_ITEM {
CHAR16 TestCategory[EFI_SCT_NAME_LEN];
EFI_SCT_ASSERTION_INFOR *FailAssertion;
EFI_SCT_ASSERTION_INFOR *PassAssertion;
-} EFI_SCT_REPORT_ITEM;
+};
//
// EFI_SCT_REPORT_INFOR
--git a/TestFrameworkPkg/Sct/UI/BuildMenu.c b/TestFrameworkPkg/Sct/UI/BuildMenu.c
index af2127e..5d77dd5 100644
--- a/TestFrameworkPkg/Sct/UI/BuildMenu.c
+++ b/TestFrameworkPkg/Sct/UI/BuildMenu.c
@@ -190,7 +190,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_MENU_PAGE),
- &MyPage
+ (VOID **)&MyPage
);
if (EFI_ERROR (Status)) {
return Status;
@@ -1079,7 +1079,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_ITEM_VALUE_QUEUE),
- &TempValueQueue
+ (VOID **)&TempValueQueue
);
if (EFI_ERROR (Status)) {
return EFI_OUT_OF_RESOURCES;
@@ -1210,7 +1210,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
sizeof (EFI_SCROLL_BAR),
- &ScrollBar
+ (VOID **)&ScrollBar
);
if(!EFI_ERROR (Status)) {
ScrollBar->ScrollBarRect.TopLeft.Row = Page->Body.SplitPoint.Row + 1 ;
--git a/TestFrameworkPkg/Sct/UI/ConfigMenu.c b/TestFrameworkPkg/Sct/UI/ConfigMenu.c
index 2ce71c0..8aebf4e 100644
--- a/TestFrameworkPkg/Sct/UI/ConfigMenu.c
+++ b/TestFrameworkPkg/Sct/UI/ConfigMenu.c
@@ -118,7 +118,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (Page);
@@ -224,7 +224,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH + 1) * sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (Page);
@@ -257,7 +257,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH + 1) * sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (Page);
@@ -297,7 +297,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH + 1) * sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (Page);
@@ -342,7 +342,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH + 1) * sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (Page);
@@ -375,7 +375,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH + 1) * sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (Page);
@@ -550,7 +550,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (MenuPage);
@@ -579,7 +579,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (MenuPage);
@@ -624,7 +624,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (MenuPage);
@@ -653,7 +653,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (MenuPage);
@@ -678,7 +678,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (MenuPage);
@@ -703,7 +703,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (MenuPage);
@@ -728,7 +728,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH+1)*sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (MenuPage);
@@ -986,7 +986,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
MAX_STRING_LEN * sizeof (CHAR16),
- (void *)&Buffer
+ (VOID *)&Buffer
);
if (EFI_ERROR (Status)) {
return EFI_OUT_OF_RESOURCES;
diff --git a/TestFrameworkPkg/Sct/UI/FileDialog.c b/TestFrameworkPkg/Sct/UI/FileDialog.c
index 089c048..c3e7732 100644
--- a/TestFrameworkPkg/Sct/UI/FileDialog.c
+++ b/TestFrameworkPkg/Sct/UI/FileDialog.c
@@ -1331,7 +1331,7 @@ Returns:
EFI_STATUS Status;
INTN Ypos;
INTN XLeft;
- INTN Num;
+ UINTN Num;
EFI_INPUT_KEY Key;
volatile INTN Index;
BOOLEAN WAITING;
diff --git a/TestFrameworkPkg/Sct/UI/KeyFunction.c b/TestFrameworkPkg/Sct/UI/KeyFunction.c
index 13398c9..30e1e8a 100644
--- a/TestFrameworkPkg/Sct/UI/KeyFunction.c
+++ b/TestFrameworkPkg/Sct/UI/KeyFunction.c
@@ -632,8 +632,8 @@ Returns:
INTN Ypos;
INTN XLeft;
EFI_INPUT_KEY Key;
- volatile INTN Index;
- INTN WaitIndex;
+ volatile UINTN Index;
+ UINTN WaitIndex;
BOOLEAN WAITING;
CHAR16 Buffer[EFI_MAX_EDIT_LENGTH + 1];
CHAR16 TempStr[EFI_MAX_ITEM_VALUE_LENGTH + 1];
@@ -855,8 +855,8 @@ Returns:
WAITING = FALSE;
MenuItem = MenuPage->Body.CurrentSelected;
- if (Key.ScanCode == SCAN_UP && MenuItem->Prev == NULL ||
- Key.ScanCode == SCAN_DOWN && MenuItem->Next == NULL) {
+ if ((Key.ScanCode == SCAN_UP && MenuItem->Prev == NULL) ||
+ (Key.ScanCode == SCAN_DOWN && MenuItem->Next == NULL)) {
//
//no need to call the UpFunc or DownFunc so don't return the scancode
//
@@ -1748,7 +1748,7 @@ Returns:
{
EFI_STATUS Status;
EFI_INPUT_KEY Key;
- INTN Index;
+ UINTN Index;
EFI_HOT_KEY *HotKey;
//
@@ -2182,7 +2182,7 @@ Returns:
INTN XLeft;
UINTN X0;
EFI_INPUT_KEY Key;
- INTN Index;
+ UINTN Index;
BOOLEAN WAITING;
BOOLEAN BufferChanged;
CHAR16 Buffer[EFI_MAX_ITER_EDIT_LENGTH + 1];
@@ -2307,8 +2307,8 @@ Returns:
WAITING = FALSE;
MenuItem = MenuPage->Body.CurrentSelected;
- if (Key.ScanCode == SCAN_UP && MenuItem->Prev == NULL ||
- Key.ScanCode == SCAN_DOWN && MenuItem->Next == NULL) {
+ if ((Key.ScanCode == SCAN_UP && MenuItem->Prev == NULL) ||
+ (Key.ScanCode == SCAN_DOWN && MenuItem->Next == NULL)) {
//
//no need to call the UpFunc or DownFunc so don't return the scancode
//
diff --git a/TestFrameworkPkg/Sct/UI/LogFileDialog.c b/TestFrameworkPkg/Sct/UI/LogFileDialog.c
index 2eb1bd1..9b16ad8 100644
--- a/TestFrameworkPkg/Sct/UI/LogFileDialog.c
+++ b/TestFrameworkPkg/Sct/UI/LogFileDialog.c
@@ -1385,7 +1385,7 @@ Returns:
EFI_STATUS Status;
INTN Ypos;
INTN XLeft;
- INTN Num;
+ UINTN Num;
EFI_INPUT_KEY Key;
volatile INTN Index;
BOOLEAN WAITING;
--git a/TestFrameworkPkg/Sct/UI/TestNodeMenu.c b/TestFrameworkPkg/Sct/UI/TestNodeMenu.c
index 9693aa5..0cdf597 100644
--- a/TestFrameworkPkg/Sct/UI/TestNodeMenu.c
+++ b/TestFrameworkPkg/Sct/UI/TestNodeMenu.c
@@ -172,7 +172,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_EDIT_LENGTH + 1) * sizeof(CHAR16),
- &EditBuffer
+ (VOID **)&EditBuffer
);
if (EFI_ERROR (Status)) {
DestroyMenuPage (Page);
@@ -513,7 +513,7 @@ Returns:
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_ITER_EDIT_LENGTH + 2) * 2,
- &TempString
+ (VOID **)&TempString
);
if (EFI_ERROR (Status)) {
return EFI_OUT_OF_RESOURCES;
@@ -1422,7 +1422,7 @@ GetIterString(
Status = gBS->AllocatePool(
EfiBootServicesData,
(EFI_MAX_ITER_EDIT_LENGTH + 2) * 2,
- &TempString
+ (VOID **)&TempString
);
if (EFI_ERROR (Status)) {
return EFI_OUT_OF_RESOURCES;
diff --git a/TestFrameworkPkg/Sct/UI/UI.h b/TestFrameworkPkg/Sct/UI/UI.h
index 225acf6..dbd2d41 100644
--- a/TestFrameworkPkg/Sct/UI/UI.h
+++ b/TestFrameworkPkg/Sct/UI/UI.h
@@ -129,18 +129,18 @@ EFI_STATUS
IN UINTN Column
);
-typedef struct _EFI_ITEM_VALUE_QUEUE {
+struct _EFI_ITEM_VALUE_QUEUE {
EFI_ITEM_VALUE_QUEUE *Next;
EFI_ITEM_VALUE_QUEUE *Prev;
UINT16 *StringValue;
UINTN IntValue;
-} EFI_ITEM_VALUE_QUEUE;
+};
typedef struct _EFI_MENU_ITEM_CONTEXT {
EFI_GUID *ItemGuid;
} EFI_MENU_ITEM_CONTEXT;
-typedef struct _EFI_MENU_ITEM {
+struct _EFI_MENU_ITEM {
EFI_MENU_ITEM *Next;
EFI_MENU_ITEM *Prev;
EFI_ITEM_TYPE ItemType;
@@ -158,7 +158,7 @@ typedef struct _EFI_MENU_ITEM {
EFI_MENU_STRING ItemDesc;
DESC_PRINT DescPrint;
VOID *Context; // can point to function or data struct
-} EFI_MENU_ITEM;
+};
typedef struct {
EFI_RECT ScrollBarRect;
@@ -189,21 +189,21 @@ EFI_STATUS
IN EFI_MENU_PAGE *MenuPage
);
-typedef struct _EFI_HOT_KEY {
+struct _EFI_HOT_KEY {
EFI_MENU_STRING HotKeyName;
EFI_MENU_STRING HotKeyDesc;
EFI_INPUT_KEY KeyCode;
BOOLEAN Visible;
KEY_FUNCTION Context;
EFI_HOT_KEY *Next;
-} EFI_HOT_KEY;
+};
typedef struct {
EFI_HOT_KEY *HotKeyList;
EFI_RECT FooterRect;
} EFI_MENU_FOOTER;
-typedef struct _EFI_MENU_PAGE {
+struct _EFI_MENU_PAGE {
UINTN BackColor;
BOOLEAN HasHeader;
EFI_MENU_HEADER Header;
@@ -212,7 +212,7 @@ typedef struct _EFI_MENU_PAGE {
BOOLEAN HasFooter;
EFI_MENU_FOOTER Footer;
EFI_MENU_PAGE *Parent;
-} EFI_MENU_PAGE;
+};
EFI_STATUS
TestPrintAt (
diff --git a/TestFrameworkPkg/Sct/print.c b/TestFrameworkPkg/Sct/print.c
index ee8c6e3..935b3bc 100644
--- a/TestFrameworkPkg/Sct/print.c
+++ b/TestFrameworkPkg/Sct/print.c
@@ -431,7 +431,7 @@ _PoolCatPrint (
ps.Output = Output;
ps.Context = spc;
ps.fmt.u.pw = fmt;
- ps.args = args;
+ VA_COPY(ps.args, args);
_Print (&ps);
}
@@ -765,7 +765,7 @@ _IPrint (
ps.fmt.u.pc = fmta;
}
- ps.args = args;
+ VA_COPY(ps.args, args);
if (Column != (UINTN) -1) {
Out->SetCursorPosition(Out, Column, Row);
@@ -1352,8 +1352,8 @@ EnablePageBreak (
gST->ConOut->QueryMode (
gST->ConOut,
gST->ConOut->Mode->Mode,
- &mPrintMode.MaxColumn,
- &mPrintMode.MaxRow
+ (UINTN *)&mPrintMode.MaxColumn,
+ (UINTN *)&mPrintMode.MaxRow
);
mPrintMode.Row = StartRow;
diff --git a/TestFrameworkPkg/Support/StandardTest/StandardTest.c b/TestFrameworkPkg/Support/StandardTest/StandardTest.c
index dee4d42..8ea22dd 100644
--- a/TestFrameworkPkg/Support/StandardTest/StandardTest.c
+++ b/TestFrameworkPkg/Support/StandardTest/StandardTest.c
@@ -101,10 +101,6 @@ CHAR16 *DashLine = L"-----------------------------------------------------------
#define IS_LEAP(y) (((y) % 4) == 0 && ((y) % 100) != 0 || ((y) % 400) == 0)
-static const UINTN MonthLengths[2][12] = {
- { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
- { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
#define MINS_PER_HOUR 60
#define HOURS_PER_DAY 24
@@ -162,7 +158,7 @@ StslGuidsDuplicate (
Status = gBS->AllocatePool (
EfiBootServicesData,
(NoGuids + 1) * sizeof(EFI_GUID),
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -188,7 +184,7 @@ StslStrDuplicate (
Status = gBS->AllocatePool (
EfiBootServicesData,
(StrLen (String) + 1) * sizeof(CHAR16),
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -199,49 +195,6 @@ StslStrDuplicate (
return Buffer;
}
-UINT32
-SecondsElapsedFromBaseYear (
- IN UINT16 BaseYear,
- IN UINT16 Year,
- IN UINT8 Month,
- IN UINT8 Day,
- IN UINT8 Hour,
- IN UINT8 Minute,
- IN UINT8 Second
- )
-{
- UINTN Seconds;
- UINT32 LeapYear;
- INTN Index;
-
- Seconds = 0;
- for (Index = BaseYear; Index < Year; Index ++) {
- if (IS_LEAP(Index)) {
- Seconds += DAYS_PER_LYEAR * SECS_PER_DAY;
- } else {
- Seconds += DAYS_PER_NYEAR * SECS_PER_DAY;
- }
- }
-
- LeapYear = IS_LEAP(Year);
- for (Index = 0; Index < Month - 1; Index ++) {
- Seconds += MonthLengths[LeapYear][Index] * SECS_PER_DAY;
- }
-
- for (Index = 0; Index < Day - 1; Index ++) {
- Seconds += SECS_PER_DAY;
- }
-
- for (Index = 0; Index < Hour; Index ++) {
- Seconds += SECS_PER_HOUR;
- }
-
- for (Index = 0; Index < Minute; Index ++) {
- Seconds += SECS_PER_MIN;
- }
-
- return (UINT32) (Seconds + Second);
-}
EFI_STATUS
StslFreePointer (
@@ -696,7 +649,7 @@ Returns:
// Send assertion to remotion computer if the network
// record assertion utility installed.
//
- NetRecordAssertion(Type, EventId, Buffer);
+ NetRecordAssertion((NET_EFI_TEST_ASSERTION)Type, EventId, Buffer);
//
// write key file detail line
@@ -1575,7 +1528,7 @@ Returns:
Status = gBS->OpenProtocol (
LibHandle,
&gEfiStandardTestLibraryGuid,
- &StandardTest,
+ (VOID **)&StandardTest,
TslPrivate->ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
@@ -1632,7 +1585,7 @@ Returns:
Status = gBS->OpenProtocol (
ImageHandle,
&gEfiTslInitInterfaceGuid,
- &TslInit,
+ (VOID **)&TslInit,
ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
diff --git a/TestFrameworkPkg/Support/TestLogging/TestLogging.c b/TestFrameworkPkg/Support/TestLogging/TestLogging.c
index 0384a75..703aae9 100644
--- a/TestFrameworkPkg/Support/TestLogging/TestLogging.c
+++ b/TestFrameworkPkg/Support/TestLogging/TestLogging.c
@@ -275,7 +275,7 @@ TllStrDuplicate (
Status = gBS->AllocatePool (
EfiBootServicesData,
(StrLen (String) + 1) * sizeof(CHAR16),
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -311,7 +311,7 @@ TllGuidsDuplicate (
Status = gBS->AllocatePool (
EfiBootServicesData,
(NoGuids + 1) * sizeof(EFI_GUID),
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -1058,7 +1058,7 @@ Returns:
Status = gBS->OpenProtocol (
LibHandle,
&gEfiTestLoggingLibraryGuid,
- &TestLogging,
+ (VOID **)&TestLogging,
TslPrivate->ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
@@ -1113,7 +1113,7 @@ Returns:
Status = gBS->OpenProtocol (
ImageHandle,
&gEfiTslInitInterfaceGuid,
- &TslInit,
+ (VOID **)&TslInit,
ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
diff --git a/TestFrameworkPkg/Support/TestProfile/TestProfile.c b/TestFrameworkPkg/Support/TestProfile/TestProfile.c
index e522e2a..ca405d3 100644
--- a/TestFrameworkPkg/Support/TestProfile/TestProfile.c
+++ b/TestFrameworkPkg/Support/TestProfile/TestProfile.c
@@ -54,20 +54,20 @@ typedef struct {
typedef struct _INI INI;
typedef struct _COMMENTLINE COMMENTLINE;
-typedef struct _INI {
+struct _INI {
UINT32 commentNo;
CHAR8 *ptrSection;
CHAR8 *ptrEntry;
CHAR8 *ptrValue;
INI *ptrNext;
-} INI;
+};
-typedef struct _COMMENTLINE {
+struct _COMMENTLINE {
UINT32 commentNo;
CHAR8 *ptrComment;
COMMENTLINE *ptrNext;
-} COMMENTLINE;
+};
typedef struct {
UINT32 Signature;
@@ -855,7 +855,7 @@ TplStrDuplicate (
Status = gBS->AllocatePool (
EfiBootServicesData,
(StrLen (String) + 1) * sizeof(CHAR16),
- &Buffer
+ (VOID **)&Buffer
);
if (EFI_ERROR (Status)) {
return NULL;
@@ -2711,7 +2711,7 @@ Returns:
Status = gBS->OpenProtocol (
LibHandle,
&gEfiTestProfileLibraryGuid,
- &TestProfile,
+ (VOID **)&TestProfile,
TslPrivate->ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
@@ -2764,7 +2764,7 @@ Returns:
Status = gBS->OpenProtocol (
ImageHandle,
&gEfiTslInitInterfaceGuid,
- &TslInit,
+ (VOID **)&TslInit,
ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
diff --git a/TestFrameworkPkg/Support/TestRecovery/TestRecovery.c b/TestFrameworkPkg/Support/TestRecovery/TestRecovery.c
index d6ace76..fadedf4 100644
--- a/TestFrameworkPkg/Support/TestRecovery/TestRecovery.c
+++ b/TestFrameworkPkg/Support/TestRecovery/TestRecovery.c
@@ -362,7 +362,7 @@ Returns:
Status = gBS->AllocatePool (
EfiBootServicesData,
(StrLen (FileName) + 1) * 2,
- &(Private->FileName)
+ (VOID **)&(Private->FileName)
);
if (EFI_ERROR (Status)) {
TrlFreePointer (Private);
@@ -505,7 +505,7 @@ Returns:
Status = gBS->OpenProtocol (
LibHandle,
&gEfiTestRecoveryLibraryGuid,
- &TestRecovery,
+ (VOID **)&TestRecovery,
TslPrivate->ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
@@ -560,7 +560,7 @@ Returns:
Status = gBS->OpenProtocol (
ImageHandle,
&gEfiTslInitInterfaceGuid,
- &TslInit,
+ (VOID **)&TslInit,
ImageHandle,
NULL,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
diff --git a/TestFrameworkPkg/TestFrameworkPkg.dsc b/TestFrameworkPkg/TestFrameworkPkg.dsc
index 6bbc126..93c8886 100644
--- a/TestFrameworkPkg/TestFrameworkPkg.dsc
+++ b/TestFrameworkPkg/TestFrameworkPkg.dsc
@@ -79,4 +79,4 @@
TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.inf
[BuildOptions]
- *_*_*_CC_FLAGS = /FAsc
+ MSFT:*_*_*_CC_FLAGS = /FAsc
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [staging/edk2-test PATCH V2 4/6] TestFrameworkPkg: Fix GCC compatibility issues
2017-02-01 9:49 [staging/edk2-test PATCH V2 0/6] Fix XCODE and GCC build issues Michael Kinney
` (2 preceding siblings ...)
2017-02-01 9:49 ` [staging/edk2-test PATCH V2 3/6] TestFrameworkPkg: Fix VS2015 " Michael Kinney
@ 2017-02-01 9:49 ` Michael Kinney
2017-02-01 9:49 ` [staging/edk2-test PATCH V2 5/6] TestCasePkg: Fix XCODE " Michael Kinney
2017-02-01 9:49 ` [staging/edk2-test PATCH V2 6/6] TestCasePkg: Fix GCC " Michael Kinney
5 siblings, 0 replies; 12+ messages in thread
From: Michael Kinney @ 2017-02-01 9:49 UTC (permalink / raw)
To: edk2-devel; +Cc: Andrew Fish, Supreeth Venkatesh
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/Eftp/ComponentName.c | 4 +
TestFrameworkPkg/Eftp/EftpDriver.h | 5 +
TestFrameworkPkg/Eftp/EftpMain.c | 2 +
TestFrameworkPkg/Eftp/EftpPacket.c | 2 -
TestFrameworkPkg/Eftp/EftpRRQ.c | 13 +-
TestFrameworkPkg/Eftp/EftpRRQ.h | 8 +-
TestFrameworkPkg/Eftp/EftpWRQ.c | 7 +-
TestFrameworkPkg/Eftp/EftpWRQ.h | 2 +
TestFrameworkPkg/Include/Library/EntsLib.h | 225 -------
TestFrameworkPkg/Include/Protocol/WBTest.h | 84 ---
TestFrameworkPkg/Include/Protocol/WbTest.h | 84 +++
TestFrameworkPkg/InstallSct/InstallSct.c | 15 +-
TestFrameworkPkg/Library/EasLib/EntsContext.c | 83 +--
TestFrameworkPkg/Library/EasLib/EntsDpath.c | 60 +-
TestFrameworkPkg/Library/EasLib/EntsGuid.c | 113 ++--
TestFrameworkPkg/Library/EasLib/EntsLib.c | 21 +-
TestFrameworkPkg/Library/EasLib/EntsLib.inf | 1 +
TestFrameworkPkg/Library/EasLib/EntsStr.c | 690 ---------------------
TestFrameworkPkg/Library/EasLib/EntsSupport.c | 11 +-
TestFrameworkPkg/Library/EasLib/EntsTime.c | 2 +-
TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c | 4 +
.../IP4NetworkMonitor/IP4NetworkMonitor.c | 30 +-
.../IP4NetworkMonitor/IP4NetworkMonitor.h | 8 +-
.../ManagedNetworkMonitor/ManagedNetworkMonitor.c | 25 +-
.../ManagedNetworkMonitor/ManagedNetworkMonitor.h | 6 +
.../PeiSctManageModule/PeiSctManageModule.c | 15 +-
TestFrameworkPkg/Sct/Core/SctInit.c | 2 -
TestFrameworkPkg/Sct/Data/TestCaseEx.c | 2 -
TestFrameworkPkg/Sct/Data/TestNode.c | 2 -
TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/Eas.c | 3 -
.../Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c | 3 +-
.../Sct/ENTS/EasDispatcher/Rivl/RivlType.c | 8 +-
.../Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c | 9 +-
TestFrameworkPkg/Sct/Execute/Execute.c | 5 -
TestFrameworkPkg/Sct/Execute/ExecuteSupport.c | 1 +
TestFrameworkPkg/Sct/Execute/ExecuteSupport.h | 1 +
TestFrameworkPkg/Sct/Include/SctCore.h | 1 +
TestFrameworkPkg/Sct/Include/SctDef.h | 2 +-
TestFrameworkPkg/Sct/Misc/SctMisc.c | 2 +-
| 2 +
| 11 +-
| 23 +-
TestFrameworkPkg/Sct/UI/Dialog.h | 2 +-
TestFrameworkPkg/Sct/UI/DisplayUi.c | 14 +-
TestFrameworkPkg/Sct/UI/FileDialog.c | 2 -
TestFrameworkPkg/Sct/UI/FileDialog.h | 2 +-
TestFrameworkPkg/Sct/UI/KeyFunction.c | 18 +
TestFrameworkPkg/Sct/UI/LogFileDialog.c | 4 +-
TestFrameworkPkg/Sct/UI/LogFileDialog.h | 2 +-
TestFrameworkPkg/Sct/UI/MainMenu.c | 18 +
| 12 +
| 2 +-
TestFrameworkPkg/Sct/UI/UI.h | 16 +
.../Support/StandardTest/StandardTest.c | 34 +-
TestFrameworkPkg/Support/TestLogging/TestLogging.c | 17 +-
TestFrameworkPkg/Support/TestProfile/TestProfile.c | 658 ++++++--------------
.../Support/TestProfile/TestProfile.inf | 1 +
57 files changed, 614 insertions(+), 1785 deletions(-)
delete mode 100644 TestFrameworkPkg/Include/Protocol/WBTest.h
create mode 100644 TestFrameworkPkg/Include/Protocol/WbTest.h
diff --git a/TestFrameworkPkg/Eftp/ComponentName.c b/TestFrameworkPkg/Eftp/ComponentName.c
index 7956658..3ab1bfc 100644
--- a/TestFrameworkPkg/Eftp/ComponentName.c
+++ b/TestFrameworkPkg/Eftp/ComponentName.c
@@ -17,6 +17,7 @@
// EFI Component Name Functions
//
EFI_STATUS
+EFIAPI
EftpComponentNameGetDriverName (
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
IN CHAR8 *Language,
@@ -24,6 +25,7 @@ EftpComponentNameGetDriverName (
);
EFI_STATUS
+EFIAPI
EftpComponentNameGetControllerName (
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
@@ -53,6 +55,7 @@ static EFI_UNICODE_STRING_TABLE mEftpDriverNameTable[] = {
};
EFI_STATUS
+EFIAPI
EftpComponentNameGetDriverName (
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
IN CHAR8 *Language,
@@ -94,6 +97,7 @@ EftpComponentNameGetDriverName (
}
EFI_STATUS
+EFIAPI
EftpComponentNameGetControllerName (
IN EFI_COMPONENT_NAME2_PROTOCOL *This,
IN EFI_HANDLE ControllerHandle,
diff --git a/TestFrameworkPkg/Eftp/EftpDriver.h b/TestFrameworkPkg/Eftp/EftpDriver.h
index a6fac3f..4bcefbe 100644
--- a/TestFrameworkPkg/Eftp/EftpDriver.h
+++ b/TestFrameworkPkg/Eftp/EftpDriver.h
@@ -80,6 +80,7 @@ typedef struct _EFTP_SERVICE_BINDING_PRIVATE {
} EFTP_SERVICE_BINDING_PRIVATE;
EFI_STATUS
+EFIAPI
EftpDriverBindingSupported (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -106,6 +107,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpDriverBindingStart (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -133,6 +135,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpDriverBindingStop (
IN EFI_DRIVER_BINDING_PROTOCOL *This,
IN EFI_HANDLE Controller,
@@ -160,6 +163,7 @@ EftpDriverBindingStop (
;
EFI_STATUS
+EFIAPI
EftpServiceBindingCreateChild (
IN EFI_SERVICE_BINDING_PROTOCOL *This,
IN OUT EFI_HANDLE *ChildHandle
@@ -185,6 +189,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
EftpServiceBindingDestroyChild (
IN EFI_SERVICE_BINDING_PROTOCOL *This,
IN EFI_HANDLE ChildHandle
diff --git a/TestFrameworkPkg/Eftp/EftpMain.c b/TestFrameworkPkg/Eftp/EftpMain.c
index f9e84c5..e88dfe8 100644
--- a/TestFrameworkPkg/Eftp/EftpMain.c
+++ b/TestFrameworkPkg/Eftp/EftpMain.c
@@ -458,6 +458,7 @@ CleanUp:
}
EFI_STATUS
+EFIAPI
EftpReadFile (
IN EFI_EFTP_PROTOCOL *This,
IN EFI_EFTP_TOKEN *Token
@@ -581,6 +582,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
EftpConfigure (
IN EFI_EFTP_PROTOCOL *This,
IN EFI_EFTP_CONFIG_DATA *EftpConfigData // OPTIONAL
diff --git a/TestFrameworkPkg/Eftp/EftpPacket.c b/TestFrameworkPkg/Eftp/EftpPacket.c
index 1c813f0..f403e4a 100644
--- a/TestFrameworkPkg/Eftp/EftpPacket.c
+++ b/TestFrameworkPkg/Eftp/EftpPacket.c
@@ -565,7 +565,6 @@ Returns:
EFI_EFTP_PACKET *Packet;
EFI_STATUS Status;
UINT32 Len;
- CHAR8 *P;
ASSERT (Private && Err);
@@ -581,7 +580,6 @@ Returns:
}
Packet = Buf->Packet;
- P = AsciiStrCpy (Packet->Error.ErrorMessage, Err->Desc);
Status = gBS->CreateEvent (
EVT_NOTIFY_SIGNAL,
diff --git a/TestFrameworkPkg/Eftp/EftpRRQ.c b/TestFrameworkPkg/Eftp/EftpRRQ.c
index 9c6d952..4bf15f7 100644
--- a/TestFrameworkPkg/Eftp/EftpRRQ.c
+++ b/TestFrameworkPkg/Eftp/EftpRRQ.c
@@ -55,6 +55,7 @@ EftpListIntegrityCheck (
STATIC
VOID
+EFIAPI
EftpRrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -156,6 +157,7 @@ Returns:
}
VOID
+EFIAPI
EftpRrqRxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -527,6 +529,7 @@ Returns:
}
VOID
+EFIAPI
EftpRrqTimer (
IN EFI_EVENT Event,
IN VOID *Context
@@ -664,6 +667,7 @@ Returns:
STATIC
VOID
+EFIAPI
EftpRrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -763,7 +767,6 @@ Returns:
--*/
{
- EFTP_OPTION *Opt;
EFTP_RRQ_STATE *Rrq;
EFTP_PACKET_BUFFER *Buf;
BOOLEAN Copy;
@@ -773,7 +776,6 @@ Returns:
ASSERT (Private && Private->RrqState && Packet);
Rrq = Private->RrqState;
- Opt = &Private->Option;
//
// Ignore the data packet with wrong opcode
@@ -1081,6 +1083,7 @@ Returns:
STATIC
VOID
+EFIAPI
EftpRrqInitTimer (
IN EFI_EVENT Event,
IN VOID *Context
@@ -1203,8 +1206,6 @@ Returns:
--*/
{
- EFTP_OPTION *Opt;
- EFTP_RRQ_STATE *Rrq;
EFTP_PACKET_BUFFER *Buf;
EFTP_ERRINFO Err;
EFI_STATUS Status;
@@ -1213,9 +1214,6 @@ Returns:
ASSERT (Private && Private->RrqState && Packet);
- Rrq = Private->RrqState;
- Opt = &Private->Option;
-
//
// Ignore the data packet with wrong opcode
//
@@ -1503,6 +1501,7 @@ Returns:
STATIC
VOID
+EFIAPI
EftpRrqActiveTimer (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/TestFrameworkPkg/Eftp/EftpRRQ.h b/TestFrameworkPkg/Eftp/EftpRRQ.h
index 16008f9..6bb6c85 100644
--- a/TestFrameworkPkg/Eftp/EftpRRQ.h
+++ b/TestFrameworkPkg/Eftp/EftpRRQ.h
@@ -146,6 +146,7 @@ Returns:
;
VOID
+EFIAPI
EftpRrqRxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -169,7 +170,12 @@ Returns:
--*/
;
-VOID EftpRrqTimer (IN EFI_EVENT Event, IN VOID *Context)
+VOID
+EFIAPI
+EftpRrqTimer (
+ IN EFI_EVENT Event,
+ IN VOID *Context
+ )
/*++
Routine Description:
diff --git a/TestFrameworkPkg/Eftp/EftpWRQ.c b/TestFrameworkPkg/Eftp/EftpWRQ.c
index 495b2a2..10d38a1 100644
--- a/TestFrameworkPkg/Eftp/EftpWRQ.c
+++ b/TestFrameworkPkg/Eftp/EftpWRQ.c
@@ -16,6 +16,7 @@
STATIC
VOID
+EFIAPI
EftpWrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -143,6 +144,7 @@ Returns:
}
VOID
+EFIAPI
EftpWrqRxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -400,6 +402,7 @@ CleanUp:
STATIC
VOID
+EFIAPI
EftpWrqTxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -472,6 +475,7 @@ Returns:
}
VOID
+EFIAPI
EftpWrqTimer (
IN EFI_EVENT Event,
IN VOID *Context
@@ -654,7 +658,6 @@ Returns:
--*/
{
EFI_STATUS Status;
- EFTP_OPTION *Opt;
UINT64 AckNo;
EFTP_ERRINFO Err;
EFTP_PACKET_BUFFER *Buf;
@@ -662,8 +665,6 @@ Returns:
ASSERT (Private && Private->WrqState && Packet);
- Opt = &Private->Option;
-
//
// Ignore the ACK packet with wrong opcode
//
diff --git a/TestFrameworkPkg/Eftp/EftpWRQ.h b/TestFrameworkPkg/Eftp/EftpWRQ.h
index 55585e2..4201bf9 100644
--- a/TestFrameworkPkg/Eftp/EftpWRQ.h
+++ b/TestFrameworkPkg/Eftp/EftpWRQ.h
@@ -67,6 +67,7 @@ Returns:
;
VOID
+EFIAPI
EftpWrqRxCallback (
IN EFI_EVENT Event,
IN VOID *Context
@@ -113,6 +114,7 @@ Returns:
;
VOID
+EFIAPI
EftpWrqTimer (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/TestFrameworkPkg/Include/Library/EntsLib.h b/TestFrameworkPkg/Include/Library/EntsLib.h
index 03cfcab..c324765 100644
--- a/TestFrameworkPkg/Include/Library/EntsLib.h
+++ b/TestFrameworkPkg/Include/Library/EntsLib.h
@@ -247,29 +247,6 @@ EntsStrDuplicate (
)
;
-INTN
-EntsLibStubStriCmp (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *s1,
- IN CHAR16 *s2
- )
-;
-
-VOID
-EntsLibStubStrLwrUpr (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *Str
- )
-;
-
-BOOLEAN
-EntsLibStubMetaiMatch (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *String,
- IN CHAR16 *Pattern
- )
-;
-
EFI_STATUS
Char16ToChar8 (
IN CHAR16 *Src,
@@ -361,23 +338,6 @@ strtok_line (
;
CHAR16 *
-strtok_arg (
- CHAR16 *s,
- const CHAR16 *ct
- )
-/*++
-
-Routine Description:
-
- Find the next token in a string
- Tokens are separated by separators defined in "ct"
- If enclosed in double quotations, other separators are invalid. Then token is
- the content in the quotations.
-
---*/
-;
-
-CHAR16 *
strtok_field (
CHAR16 *s,
const CHAR16 *ct
@@ -406,30 +366,6 @@ EntsHexStrToUINTN (
;
EFI_STATUS
-EntsStrToValue (
- IN CHAR16 *Buffer,
- OUT UINTN *Value
- )
-/*++
-
-Routine Description:
-
- Convert a string to a value.
-
-Arguments:
-
- Buffer - String buffer.
- Value - Pointer to receive the converted value.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-;
-
-EFI_STATUS
EntsValueToStr (
IN UINTN Value,
OUT CHAR16 *Buffer
@@ -453,103 +389,6 @@ Returns:
--*/
;
-EFI_STATUS
-EntsHexValueToStr (
- IN UINTN Value,
- OUT CHAR16 *Buffer
- )
-/*++
-
-Routine Description:
-
- Convert a hexadecimal value to a string.
-
-Arguments:
-
- Value - Value to be converted.
- Buffer - Pointer to string receive buffer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-;
-
-EFI_STATUS
-EntsStrToHexValue (
- IN CHAR16 *Buffer,
- OUT UINTN *Value
- )
-/*++
-
-Routine Description:
-
- Convert a string to a hexadecimal value.
-
-Arguments:
-
- Buffer - String buffer to be converted.
- Value - Receive value pointer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-;
-
-EFI_STATUS
-EntsBooleanToStr (
- IN BOOLEAN Value,
- OUT CHAR16 *Buffer
- )
-/*++
-
-Routine Description:
-
- Convert a boolean to a string.
-
-Arguments:
-
- Value - Boolean value.
- Buffer - Receive string buffer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-;
-
-EFI_STATUS
-EntsStrToBoolean (
- IN CHAR16 *Buffer,
- OUT BOOLEAN *Value
- )
-/*++
-
-Routine Description:
-
- Convert a string to a boolean.
-
-Arguments:
-
- Buffer - String buffer to be converted.
- Value - Receive value pointer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_UNSUPPORTED - String not supported.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-;
-
BOOLEAN
EntsStrBeginWith (
IN CHAR16 *Str,
@@ -581,12 +420,6 @@ Returns:
--*/
;
-CHAR16 *
-EntsStrChr (
- IN CHAR16 *Str,
- IN CHAR16 c
- );
-
UINTN
EntsStrStr (
IN CHAR16 *Str,
@@ -611,70 +444,12 @@ Returns:
--*/
;
-UINTN
-HexStringToValue (
- IN CHAR16 *String,
- IN UINTN Length
- )
-/*++
-
-Routine Description:
-
- Convert a hex string to a value.
-
-Arguments:
-
- String - Hex string buffer.
- Length - Hex string length.
-
-Returns:
-
- Converted value.
-
---*/
-;
-
INTN
a2i (
IN CHAR16 Ch
)
;
-CHAR16
-i2A (
- UINTN x
- )
-;
-
-CHAR16
-i2a (
- UINTN x
- )
-;
-
-EFI_STATUS
-EntsIpToStr (
- IN EFI_IP_ADDRESS *IpAddr,
- IN UINTN StrSize,
- IN OUT CHAR16 *Str
- )
-;
-
-EFI_STATUS
-EntsStrToMac (
- IN CHAR16 *Str,
- IN OUT EFI_MAC_ADDRESS *MacAddr
- )
-;
-
-EFI_STATUS
-EntsMacToStr (
- IN EFI_MAC_ADDRESS *MacAddr,
- IN UINTN StrSize,
- IN OUT CHAR16 *Str
- )
-;
-
EFI_STATUS
EntsTimeToStr (
IN EFI_TIME *Time,
diff --git a/TestFrameworkPkg/Include/Protocol/WBTest.h b/TestFrameworkPkg/Include/Protocol/WBTest.h
deleted file mode 100644
index b85b6ae..0000000
--- a/TestFrameworkPkg/Include/Protocol/WBTest.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/** @file
- This file defines the EFI White-Box Test Protocol.
-
- Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _EFI_WB_TEST_H_
-#define _EFI_WB_TEST_H_
-
-//
-// Includes
-//
-#include <Protocol/StandardTestLibrary.h>
-
-//
-// EFI White-Box Test Protocol Definitions
-//
-
-#define EFI_WB_TEST_GUID \
- { 0x0B486CED, 0x25EB, 0x448a, {0xB2, 0xB2, 0x22, 0x4E, 0x7A, 0x20, 0xCF, 0x57 } }
-
-#define EFI_WB_TEST_REVISION 0x00010000
-
-//
-// Forward reference for pure ANSI compatibility
-//
-typedef struct _EFI_WB_TEST_ENTRY EFI_WB_TEST_ENTRY;
-typedef struct _EFI_WB_TEST_PROTOCOL EFI_WB_TEST_PROTOCOL;
-
-//
-// EFI White-Box Test Entry Point
-//
-
-typedef
-EFI_STATUS
-(EFIAPI *EFI_WB_ENTRY_POINT) (
- IN EFI_WB_TEST_PROTOCOL *This,
- IN EFI_TEST_LEVEL TestLevel,
- IN EFI_HANDLE SupportHandle
- );
-
-//
-// EFI White-Box Test Entry
-//
-
-struct _EFI_WB_TEST_ENTRY {
- EFI_WB_TEST_ENTRY *Next;
- EFI_GUID EntryId;
- CHAR16 *Name;
- CHAR16 *Description;
- EFI_TEST_LEVEL TestLevelSupportMap;
- EFI_GUID *SupportProtocols;
- EFI_TEST_ATTRIBUTE CaseAttribute;
- EFI_WB_ENTRY_POINT EntryPoint;
-} ;
-
-//
-// EFI White-Box Test Protocol
-//
-
-struct _EFI_WB_TEST_PROTOCOL {
- UINT64 TestRevision;
- EFI_GUID CategoryGuid;
- EFI_HANDLE ClientHandle;
- CHAR16 *Name;
- CHAR16 *Description;
- EFI_WB_TEST_ENTRY *EntryList;
-};
-
-//
-// Global ID for EFI White-Box Test Protocol
-//
-
-extern EFI_GUID gEfiWbTestGuid;
-
-#endif
diff --git a/TestFrameworkPkg/Include/Protocol/WbTest.h b/TestFrameworkPkg/Include/Protocol/WbTest.h
new file mode 100644
index 0000000..b85b6ae
--- /dev/null
+++ b/TestFrameworkPkg/Include/Protocol/WbTest.h
@@ -0,0 +1,84 @@
+/** @file
+ This file defines the EFI White-Box Test Protocol.
+
+ Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution. The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef _EFI_WB_TEST_H_
+#define _EFI_WB_TEST_H_
+
+//
+// Includes
+//
+#include <Protocol/StandardTestLibrary.h>
+
+//
+// EFI White-Box Test Protocol Definitions
+//
+
+#define EFI_WB_TEST_GUID \
+ { 0x0B486CED, 0x25EB, 0x448a, {0xB2, 0xB2, 0x22, 0x4E, 0x7A, 0x20, 0xCF, 0x57 } }
+
+#define EFI_WB_TEST_REVISION 0x00010000
+
+//
+// Forward reference for pure ANSI compatibility
+//
+typedef struct _EFI_WB_TEST_ENTRY EFI_WB_TEST_ENTRY;
+typedef struct _EFI_WB_TEST_PROTOCOL EFI_WB_TEST_PROTOCOL;
+
+//
+// EFI White-Box Test Entry Point
+//
+
+typedef
+EFI_STATUS
+(EFIAPI *EFI_WB_ENTRY_POINT) (
+ IN EFI_WB_TEST_PROTOCOL *This,
+ IN EFI_TEST_LEVEL TestLevel,
+ IN EFI_HANDLE SupportHandle
+ );
+
+//
+// EFI White-Box Test Entry
+//
+
+struct _EFI_WB_TEST_ENTRY {
+ EFI_WB_TEST_ENTRY *Next;
+ EFI_GUID EntryId;
+ CHAR16 *Name;
+ CHAR16 *Description;
+ EFI_TEST_LEVEL TestLevelSupportMap;
+ EFI_GUID *SupportProtocols;
+ EFI_TEST_ATTRIBUTE CaseAttribute;
+ EFI_WB_ENTRY_POINT EntryPoint;
+} ;
+
+//
+// EFI White-Box Test Protocol
+//
+
+struct _EFI_WB_TEST_PROTOCOL {
+ UINT64 TestRevision;
+ EFI_GUID CategoryGuid;
+ EFI_HANDLE ClientHandle;
+ CHAR16 *Name;
+ CHAR16 *Description;
+ EFI_WB_TEST_ENTRY *EntryList;
+};
+
+//
+// Global ID for EFI White-Box Test Protocol
+//
+
+extern EFI_GUID gEfiWbTestGuid;
+
+#endif
diff --git a/TestFrameworkPkg/InstallSct/InstallSct.c b/TestFrameworkPkg/InstallSct/InstallSct.c
index b6a2298..e4d9654 100644
--- a/TestFrameworkPkg/InstallSct/InstallSct.c
+++ b/TestFrameworkPkg/InstallSct/InstallSct.c
@@ -152,7 +152,6 @@ RemoveDirFile (
IN CHAR16 *Path
)
{
- EFI_STATUS Status;
EFI_STATUS ExecuteStatus;
CHAR16 *CmdLine;
@@ -175,13 +174,13 @@ RemoveDirFile (
// Execute this shell command
//
Print (L"ShellExecute %s\n", CmdLine);
- Status = ShellExecute (
- &gImageHandle,
- CmdLine,
- FALSE,
- NULL,
- &ExecuteStatus
- );
+ ShellExecute (
+ &gImageHandle,
+ CmdLine,
+ FALSE,
+ NULL,
+ &ExecuteStatus
+ );
if (EFI_ERROR (ExecuteStatus)) {
Print (L"Error: Could not execute \"%s\"\n", CmdLine);
}
diff --git a/TestFrameworkPkg/Library/EasLib/EntsContext.c b/TestFrameworkPkg/Library/EasLib/EntsContext.c
index 0433877..f3072a3 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsContext.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsContext.c
@@ -94,65 +94,6 @@ _RecordListPrint(
#define RecordListPrint(RecordList)
#endif
-/*--------------------------Internal string library function---------------------------*/
-STATIC
-UINTN
-strlen(
- CHAR8 *str
- )
-{
- CHAR8 *s;
-
- for (s = str; *s; ++s)
- ;
- return (UINTN)(s - str);
-}
-
-STATIC
-CHAR8 *
-strcpy(
- CHAR8 *to,
- CHAR8 *from
- )
-{
- CHAR8 *save;
-
- save = to;
- for (; (*to = *from) != 0 ; ++from, ++to)
- ;
- return(save);
-}
-
-STATIC
-INTN
-strcmp(
- CHAR8 *s1,
- CHAR8 *s2
- )
-{
- while (*s1 == *s2++) {
- if (*s1++ == 0)
- return 0;
- }
- return (*s1 - *s2 - 1);
-}
-
-STATIC
-CHAR8 *
-strchr (
- CHAR8 *p,
- INTN ch
- )
-{
- for (; ; ++p) {
- if (*p == ch)
- return((CHAR8 *)p);
- if (!*p)
- return((CHAR8 *)NULL);
- }
- /* NOTREACHED */
-}
-
/*-------------------------------------------------------------------------------------*/
STATIC
EFI_STATUS
@@ -188,7 +129,7 @@ ParseRecordLine (
VOID *ValueBuf;
UINTN ValueSize;
- TmpStr = strchr(LineBuf, '|');
+ TmpStr = AsciiStrStr(LineBuf, "|");
if (TmpStr == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -197,7 +138,7 @@ ParseRecordLine (
if (KeyBuf == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- strcpy (KeyBuf, LineBuf);
+ AsciiStrCpy (KeyBuf, LineBuf);
TmpStr++;
CopyMem(&ValueSize, TmpStr, sizeof(UINTN));
ValueBuf = (VOID *)AllocateZeroPool (ValueSize);
@@ -347,8 +288,8 @@ WriteRecordsToFile(
FileHandle = Context->FileHandle;
for (Record = RecordListHead; Record != NULL; Record = Record->Next) {
- strcpy(Buffer, Record->Key);
- Index = strlen(Record->Key);
+ AsciiStrCpy(Buffer, Record->Key);
+ Index = AsciiStrLen(Record->Key);
Buffer[Index++] = '|';
CopyMem(Buffer + Index, &Record->Size, sizeof(UINTN));
Index += sizeof(UINTN);
@@ -385,7 +326,7 @@ SetRecord (
}
for (Record = RecordListHead; Record != NULL; Record = Record->Next) {
- if (strcmp(Key, Record->Key) == 0) {
+ if (AsciiStrCmp(Key, Record->Key) == 0) {
break;
}
}
@@ -400,7 +341,7 @@ SetRecord (
Status = EFI_OUT_OF_RESOURCES;
goto FreeAndReturn;
}
- KeyBuf = (CHAR8 *)AllocateZeroPool (strlen(Key) + 1);
+ KeyBuf = (CHAR8 *)AllocateZeroPool (AsciiStrLen(Key) + 1);
if (KeyBuf == NULL) {
FreePool(Record);
Status = EFI_OUT_OF_RESOURCES;
@@ -413,7 +354,7 @@ SetRecord (
Status = EFI_OUT_OF_RESOURCES;
goto FreeAndReturn;
}
- strcpy(KeyBuf, Key);
+ AsciiStrCpy(KeyBuf, Key);
CopyMem(ValueBuf, RecordValue, RecordSize);
Record->Key = KeyBuf;
Record->Size = RecordSize;
@@ -476,7 +417,7 @@ GetRecord (
// the records in the list are same as the ones in file
//
for (Record = RecordListHead; Record != NULL; Record = Record->Next) {
- if (strcmp(Record->Key, Key) == 0) {
+ if (AsciiStrCmp(Record->Key, Key) == 0) {
break;
}
}
@@ -526,12 +467,12 @@ DelRecord (
if (RecordListHead == NULL) {
return EFI_NOT_FOUND;
} else {
- if (strcmp(Key, RecordListHead->Key) == 0) {
+ if (AsciiStrCmp(Key, RecordListHead->Key) == 0) {
Record = RecordListHead;
RecordListHead = RecordListHead->Next;
} else {
for (Record = RecordListHead; Record->Next != NULL; Record = Record->Next) {
- if (strcmp(Key, Record->Next->Key) == 0) {
+ if (AsciiStrCmp(Key, Record->Next->Key) == 0) {
break;
}
}
@@ -872,11 +813,11 @@ SetContextRecord (
}
Unicode2Ascii(AsciiKey, Key);
- if (strlen(AsciiKey) + Size + 1 > MAX_RECORD_LEN) {
+ if (AsciiStrLen(AsciiKey) + Size + 1 > MAX_RECORD_LEN) {
return EFI_INVALID_PARAMETER;
}
- if (strchr(AsciiKey, '=') != NULL) {
+ if (AsciiStrStr(AsciiKey, "=") != NULL) {
EFI_ENTS_DEBUG((EFI_ENTS_D_ERROR, L"The KEY of record can not contain ="));
return EFI_INVALID_PARAMETER;
}
diff --git a/TestFrameworkPkg/Library/EasLib/EntsDpath.c b/TestFrameworkPkg/Library/EasLib/EntsDpath.c
index 1b44d5b..6a8abae 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsDpath.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsDpath.c
@@ -777,38 +777,38 @@ struct {
UINT8 SubType;
VOID (*Function) (ENTS_POOL_PRINT *, VOID *);
} DevPathTable[] = {
- HARDWARE_DEVICE_PATH, HW_PCI_DP, _DevPathPci,
- HARDWARE_DEVICE_PATH, HW_PCCARD_DP, _DevPathPccard,
- HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, _DevPathMemMap,
- HARDWARE_DEVICE_PATH, HW_VENDOR_DP, _DevPathVendor,
- HARDWARE_DEVICE_PATH, HW_CONTROLLER_DP, _DevPathController,
- ACPI_DEVICE_PATH, ACPI_DP, _DevPathAcpi,
- ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, _DevPathExtendedAcpi,
- ACPI_DEVICE_PATH, ACPI_ADR_DP, _DevPathAdrAcpi,
- MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, _DevPathAtapi,
- MESSAGING_DEVICE_PATH, MSG_SCSI_DP, _DevPathScsi,
- MESSAGING_DEVICE_PATH, MSG_FIBRECHANNEL_DP, _DevPathFibre,
- MESSAGING_DEVICE_PATH, MSG_1394_DP, _DevPath1394,
- MESSAGING_DEVICE_PATH, MSG_USB_DP, _DevPathUsb,
- MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP, _DevPathUsbClass,
- MESSAGING_DEVICE_PATH, MSG_I2O_DP, _DevPathI2O,
- MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, _DevPathMacAddr,
- MESSAGING_DEVICE_PATH, MSG_IPv4_DP, _DevPathIPv4,
- MESSAGING_DEVICE_PATH, MSG_IPv6_DP, _DevPathIPv6,
- MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, _DevPathInfiniBand,
- MESSAGING_DEVICE_PATH, MSG_UART_DP, _DevPathUart,
- MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, _DevPathVendor,
- MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, _DevPathHardDrive,
- MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, _DevPathCDROM,
- MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, _DevPathVendor,
- MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, _DevPathFilePath,
- MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, _DevPathMediaProtocol,
+ { HARDWARE_DEVICE_PATH, HW_PCI_DP, _DevPathPci},
+ { HARDWARE_DEVICE_PATH, HW_PCCARD_DP, _DevPathPccard},
+ { HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, _DevPathMemMap},
+ { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, _DevPathVendor},
+ { HARDWARE_DEVICE_PATH, HW_CONTROLLER_DP, _DevPathController},
+ { ACPI_DEVICE_PATH, ACPI_DP, _DevPathAcpi},
+ { ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, _DevPathExtendedAcpi},
+ { ACPI_DEVICE_PATH, ACPI_ADR_DP, _DevPathAdrAcpi},
+ { MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, _DevPathAtapi},
+ { MESSAGING_DEVICE_PATH, MSG_SCSI_DP, _DevPathScsi},
+ { MESSAGING_DEVICE_PATH, MSG_FIBRECHANNEL_DP, _DevPathFibre},
+ { MESSAGING_DEVICE_PATH, MSG_1394_DP, _DevPath1394},
+ { MESSAGING_DEVICE_PATH, MSG_USB_DP, _DevPathUsb},
+ { MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP, _DevPathUsbClass},
+ { MESSAGING_DEVICE_PATH, MSG_I2O_DP, _DevPathI2O},
+ { MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, _DevPathMacAddr},
+ { MESSAGING_DEVICE_PATH, MSG_IPv4_DP, _DevPathIPv4},
+ { MESSAGING_DEVICE_PATH, MSG_IPv6_DP, _DevPathIPv6},
+ { MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, _DevPathInfiniBand},
+ { MESSAGING_DEVICE_PATH, MSG_UART_DP, _DevPathUart},
+ { MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, _DevPathVendor},
+ { MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, _DevPathHardDrive},
+ { MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, _DevPathCDROM},
+ { MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, _DevPathVendor},
+ { MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, _DevPathFilePath},
+ { MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, _DevPathMediaProtocol},
#if (EFI_SPECIFICATION_VERSION < 0x00020000)
- MEDIA_DEVICE_PATH, MEDIA_FV_FILEPATH_DP, _DevPathFvFilePath,
+ { MEDIA_DEVICE_PATH, MEDIA_FV_FILEPATH_DP, _DevPathFvFilePath},
#endif
- BBS_DEVICE_PATH, BBS_BBS_DP, _DevPathBssBss,
- END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, _DevPathEndInstance,
- 0, 0, NULL
+ { BBS_DEVICE_PATH, BBS_BBS_DP, _DevPathBssBss},
+ { END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, _DevPathEndInstance},
+ { 0, 0, NULL}
};
UINTN
diff --git a/TestFrameworkPkg/Library/EasLib/EntsGuid.c b/TestFrameworkPkg/Library/EasLib/EntsGuid.c
index 3e02e69..0bd8bc3 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsGuid.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsGuid.c
@@ -17,27 +17,27 @@
#define SHELL_INTERFACE_PROTOCOL \
{ \
- 0x47c7b223, 0xc42a, 0x11d2, 0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+ 0x47c7b223, 0xc42a, 0x11d2, {0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \
}
#define ENVIRONMENT_VARIABLE_ID \
{ \
- 0x47c7b224, 0xc42a, 0x11d2, 0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+ 0x47c7b224, 0xc42a, 0x11d2, {0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \
}
#define DEVICE_PATH_MAPPING_ID \
{ \
- 0x47c7b225, 0xc42a, 0x11d2, 0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+ 0x47c7b225, 0xc42a, 0x11d2, {0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \
}
#define PROTOCOL_ID_ID \
{ \
- 0x47c7b226, 0xc42a, 0x11d2, 0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+ 0x47c7b226, 0xc42a, 0x11d2, {0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \
}
#define ALIAS_ID \
{ \
- 0x47c7b227, 0xc42a, 0x11d2, 0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
+ 0x47c7b227, 0xc42a, 0x11d2, {0x8e, 0x57, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \
}
static EFI_GUID ShellInterfaceProtocol = SHELL_INTERFACE_PROTOCOL;
@@ -51,72 +51,43 @@ struct {
CHAR16 *GuidName;
}
EntsKnownGuids[] = {
- &tNullGuid,
- L"G0",
- &tEfiGlobalVariable,
- L"Efi",
-
- >EfiDevicePathProtocolGuid,
- L"dpath",
- >EfiLoadedImageProtocolGuid,
- L"image",
- >EfiSimpleTextInProtocolGuid,
- L"txtin",
- >EfiSimpleTextOutProtocolGuid,
- L"txtout",
- >EfiBlockIoProtocolGuid,
- L"blkio",
- >EfiDiskIoProtocolGuid,
- L"diskio",
- >EfiSimpleFileSystemProtocolGuid,
- L"fs",
- >EfiLoadFileProtocolGuid,
- L"load",
- >EfiDeviceIoProtocolGuid,
- L"DevIo",
-
- &tGenericFileInfo,
- L"GenFileInfo",
- >EfiFileSystemInfoGuid,
- L"FileSysInfo",
-
- >EfiUnicodeCollationProtocolGuid,
- L"UnicodeCollation",
- >EfiSerialIoProtocolGuid,
- L"serialio",
- >EfiSimpleNetworkProtocolGuid,
- L"net",
- >EfiNetworkInterfaceIdentifierProtocolGuid,
- L"nii",
- >EfiPxeBaseCodeProtocolGuid,
- L"pxebc",
- >EfiPxeCallbackProtocolGuid,
- L"pxecb",
-
- &tPcAnsiProtocol,
- L"PcAnsi",
- &tVt100Protocol,
- L"Vt100",
- >EfiUnknownDeviceGuid,
- L"Unknown Device",
-
- >EfiPartTypeSystemPartitionGuid,
- L"ESP",
- >EfiPartTypeLegacyMbrGuid,
- L"GPT MBR",
-
- &ShellInterfaceProtocol,
- L"ShellInt",
- &SEnvId,
- L"SEnv",
- &SProtId,
- L"ShellProtId",
- &SMapId,
- L"ShellDevPathMap",
- &SAliasId,
- L"ShellAlias",
-
- NULL
+ { &tNullGuid, L"G0"},
+ { &tEfiGlobalVariable, L"Efi"},
+
+ { >EfiDevicePathProtocolGuid, L"dpath"},
+ { >EfiLoadedImageProtocolGuid, L"image"},
+ { >EfiSimpleTextInProtocolGuid, L"txtin"},
+ { >EfiSimpleTextOutProtocolGuid, L"txtout"},
+ { >EfiBlockIoProtocolGuid, L"blkio"},
+ { >EfiDiskIoProtocolGuid, L"diskio"},
+ { >EfiSimpleFileSystemProtocolGuid, L"fs"},
+ { >EfiLoadFileProtocolGuid, L"load"},
+ { >EfiDeviceIoProtocolGuid, L"DevIo"},
+
+ { &tGenericFileInfo, L"GenFileInfo"},
+ { >EfiFileSystemInfoGuid, L"FileSysInfo"},
+
+ { >EfiUnicodeCollationProtocolGuid, L"UnicodeCollation"},
+ { >EfiSerialIoProtocolGuid, L"serialio"},
+ { >EfiSimpleNetworkProtocolGuid, L"net"},
+ { >EfiNetworkInterfaceIdentifierProtocolGuid, L"nii"},
+ { >EfiPxeBaseCodeProtocolGuid, L"pxebc"},
+ { >EfiPxeCallbackProtocolGuid, L"pxecb"},
+
+ { &tPcAnsiProtocol, L"PcAnsi"},
+ { &tVt100Protocol, L"Vt100"},
+ { >EfiUnknownDeviceGuid, L"Unknown Device"},
+
+ { >EfiPartTypeSystemPartitionGuid, L"ESP"},
+ { >EfiPartTypeLegacyMbrGuid, L"GPT MBR"},
+
+ { &ShellInterfaceProtocol, L"ShellInt"},
+ { &SEnvId, L"SEnv"},
+ { &SProtId, L"ShellProtId"},
+ { &SMapId, L"ShellDevPathMap"},
+ { &SAliasId, L"ShellAlias"},
+
+ { NULL, NULL}
};
VOID
diff --git a/TestFrameworkPkg/Library/EasLib/EntsLib.c b/TestFrameworkPkg/Library/EasLib/EntsLib.c
index 38300c2..97603c9 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsLib.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsLib.c
@@ -29,26 +29,13 @@ EFI_RUNTIME_SERVICES *gntRT = NULL;
//
EFI_MEMORY_TYPE EntsPoolAllocationType = EfiBootServicesData;
-//
-// Unicode collation functions that are in use
-//
-EFI_UNICODE_COLLATION_PROTOCOL EntsLibStubUnicodeInterface = {
- EntsLibStubStriCmp,
- EntsLibStubMetaiMatch,
- EntsLibStubStrLwrUpr,
- EntsLibStubStrLwrUpr,
- NULL, // FatToStr
- NULL, // StrToFat
- NULL // SupportedLanguages
-};
-
-EFI_UNICODE_COLLATION_PROTOCOL *EntsUnicodeInterface = &EntsLibStubUnicodeInterface;
+EFI_UNICODE_COLLATION_PROTOCOL *EntsUnicodeInterface = NULL;
//
// EFI IDs
//
EFI_GUID tEfiGlobalVariable = EFI_GLOBAL_VARIABLE;
-EFI_GUID tNullGuid = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+EFI_GUID tNullGuid = { 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0 }};
//
// Protocol IDs
@@ -153,6 +140,10 @@ Returns:
if (EFI_ERROR(Status)) {
return Status;
}
+ Status = gntBS->LocateProtocol(&gEfiUnicodeCollation2ProtocolGuid, NULL, (VOID**)&EntsUnicodeInterface);
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
}
return EFI_SUCCESS;
diff --git a/TestFrameworkPkg/Library/EasLib/EntsLib.inf b/TestFrameworkPkg/Library/EasLib/EntsLib.inf
index acdc0ad..d9f00ff 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsLib.inf
+++ b/TestFrameworkPkg/Library/EasLib/EntsLib.inf
@@ -83,3 +83,4 @@
gEfiManagedNetworkProtocolGuid
gEfiManagedNetworkServiceBindingProtocolGuid
gEfiSimpleNetworkProtocolGuid
+ gEfiUnicodeCollation2ProtocolGuid
diff --git a/TestFrameworkPkg/Library/EasLib/EntsStr.c b/TestFrameworkPkg/Library/EasLib/EntsStr.c
index 1ba83a7..ed2e268 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsStr.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsStr.c
@@ -240,25 +240,6 @@ EntsStrDuplicate (
}
INTN
-EntsLibStubStriCmp (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *s1,
- IN CHAR16 *s2
- )
-{
- return StrCmp (s1, s2);
-}
-
-VOID
-EntsLibStubStrLwrUpr (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *Str
- )
-{
- return;
-}
-
-INTN
EFIAPI
StriCmp (
IN CHAR16 *s1,
@@ -268,146 +249,6 @@ StriCmp (
return EntsUnicodeInterface->StriColl (EntsUnicodeInterface, s1, s2);
}
-STATIC
-BOOLEAN
-MetaMatch (
- IN CHAR16 *String,
- IN CHAR16 *Pattern
- )
-{
- CHAR16 c;
-
- CHAR16 p;
-
- CHAR16 l;
-
- for (;;) {
- p = *Pattern;
- Pattern += 1;
-
- switch (p) {
- case 0:
- //
- // End of pattern. If end of string, TRUE match
- //
- return (BOOLEAN) (*String ? FALSE : TRUE);
-
- case '*':
- //
- // Match zero or more chars
- //
- while (*String) {
- if (MetaMatch (String, Pattern)) {
- return TRUE;
- }
-
- String += 1;
- }
-
- return MetaMatch (String, Pattern);
-
- case '?':
- //
- // Match any one char
- //
- if (!*String) {
- return FALSE;
- }
-
- String += 1;
- break;
-
- case '[':
- //
- // Match char set
- //
- c = *String;
- if (!c) {
- return FALSE;
- //
- // syntax problem
- //
- }
-
- l = 0;
- p = *Pattern++;
- while (p) {
- if (p == ']') {
- return FALSE;
- }
-
- if (p == '-') {
- //
- // if range of chars,
- //
- p = *Pattern;
- //
- // get high range
- //
- if (p == 0 || p == ']') {
- return FALSE;
- //
- // syntax problem
- //
- }
-
- if (c >= l && c <= p) {
- //
- // if in range,
- //
- break;
- //
- // it's a match
- //
- }
- }
-
- l = p;
- if (c == p) {
- //
- // if char matches
- //
- break;
- //
- // move on
- //
- }
-
- p = *Pattern++;
- }
- //
- // skip to end of match char set
- //
- while (p && p != ']') {
- p = *Pattern;
- Pattern += 1;
- }
-
- String += 1;
- break;
-
- default:
- c = *String;
- if (c != p) {
- return FALSE;
- }
-
- String += 1;
- break;
- }
- }
-}
-
-BOOLEAN
-EntsLibStubMetaiMatch (
- IN EFI_UNICODE_COLLATION_PROTOCOL *This,
- IN CHAR16 *String,
- IN CHAR16 *Pattern
- )
-{
- return MetaMatch (String, Pattern);
-}
-
UINTN
Atoi (
CHAR16 *str
@@ -532,23 +373,6 @@ Returns:
return EFI_SUCCESS;
}
-CHAR16 *
-EntsStrChr (
- IN CHAR16 *Str,
- IN CHAR16 c
- )
-{
- ASSERT (Str != NULL);
-
- for (; *Str != c; ++Str) {
- if (*Str == '\0') {
- return NULL;
- }
- }
-
- return (CHAR16 *) Str;
-}
-
UINTN
EntsStrStr (
IN CHAR16 *Str,
@@ -654,69 +478,6 @@ strtok_line (
}
CHAR16 *
-strtok_arg (
- CHAR16 *s,
- const CHAR16 *ct
- )
-/*++
-
-Routine Description:
-
- Find the next token in a string
- Tokens are separated by separators defined in "ct"
- If enclosed in double quotations, other separators are invalid. Then token is
- the content in the quotations.
-
---*/
-{
- CHAR16 *sbegin;
-
- CHAR16 *send;
- INT32 l;
-
- sbegin = s ? s : ___strtok_arg;
- if (!sbegin) {
- return NULL;
- }
-
- sbegin += strspn (sbegin, ct);
-
- //
- // extract string enclosed in double quotation marks
- //
- if ((*sbegin == '"') || (*sbegin == 'L' && *(sbegin + 1) == '"')) {
- l = (*sbegin == 'L') ? 2 : 1;
- sbegin += l;
- if (!sbegin) {
- return NULL;
- }
-
- send = strpbrk (sbegin, L"\"");
- if (send && (*send != '\0')) {
- *send++ = '\0';
- }
-
- ___strtok_arg = send;
- return sbegin - l;
- }
- //
- // extract string separated per ct
- //
- if (*sbegin == '\0') {
- ___strtok_arg = NULL;
- return NULL;
- }
-
- send = strpbrk (sbegin, ct);
- if (send && (*send != '\0')) {
- *send++ = '\0';
- }
-
- ___strtok_arg = send;
- return sbegin;
-}
-
-CHAR16 *
strtok_field (
CHAR16 *s,
const CHAR16 *ct
@@ -819,44 +580,6 @@ Routine Description:
return NULL;
}
-EFI_STATUS
-EntsStrToValue (
- IN CHAR16 *Buffer,
- OUT UINTN *Value
- )
-/*++
-
-Routine Description:
-
- Convert a string to a value.
-
-Arguments:
-
- Buffer - String buffer.
- Value - Pointer to receive the converted value.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-{
- if ((Buffer == NULL) || (Value == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
- //
- // Convert a string to a value
- //
- if (Buffer[0] == L'-') {
- *Value = (UINTN) (0 - Atoi (Buffer + 1));
- } else {
- *Value = Atoi (Buffer);
- }
-
- return EFI_SUCCESS;
-}
-
INTN
EntsStrToUINTN (
IN CHAR16 *Str,
@@ -922,229 +645,6 @@ EntsHexStrToUINTN (
return Index;
}
-EFI_STATUS
-EntsHexValueToStr (
- IN UINTN Value,
- OUT CHAR16 *Buffer
- )
-/*++
-
-Routine Description:
-
- Convert a hexadecimal value to a string.
-
-Arguments:
-
- Value - Value to be converted.
- Buffer - Pointer to string receive buffer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-{
- if (Buffer == NULL) {
- return EFI_INVALID_PARAMETER;
- }
- //
- // Convert a value to a string
- //
- EntsSPrint (Buffer, 0, L"0x%x", Value);
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-EntsStrToHexValue (
- IN CHAR16 *Buffer,
- OUT UINTN *Value
- )
-/*++
-
-Routine Description:
-
- Convert a string to a hexadecimal value.
-
-Arguments:
-
- Buffer - String buffer to be converted.
- Value - Receive value pointer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-{
- CHAR16 c;
-
- if ((Buffer == NULL) || (Value == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
- //
- // skip preceeding white space
- //
- while (*Buffer && *Buffer == ' ') {
- Buffer += 1;
- }
- //
- // skip preceeding zeros
- //
- while (*Buffer && *Buffer == '0') {
- Buffer += 1;
- }
- //
- // skip preceeding white space
- //
- if (*Buffer && (*Buffer == 'x' || *Buffer == 'X')) {
- Buffer += 1;
- }
-
- *Value = 0;
- c = *(Buffer++);
- while (c) {
- if (c >= 'a' && c <= 'f') {
- c -= 'a' - 'A';
- }
-
- if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')) {
- *Value = *Value << 4 | c - (c >= 'A' ? 'A' - 10 : '0');
- } else {
- break;
- }
-
- c = *(Buffer++);
- }
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-EntsBooleanToStr (
- IN BOOLEAN Value,
- OUT CHAR16 *Buffer
- )
-/*++
-
-Routine Description:
-
- Convert a boolean to a string.
-
-Arguments:
-
- Value - Boolean value.
- Buffer - Receive string buffer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-{
- if (Buffer == NULL) {
- return EFI_INVALID_PARAMETER;
- }
- //
- // Convert a boolean to a string
- //
- if (Value) {
- StrCpy (Buffer, L"True");
- } else {
- StrCpy (Buffer, L"False");
- }
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-EntsStrToBoolean (
- IN CHAR16 *Buffer,
- OUT BOOLEAN *Value
- )
-/*++
-
-Routine Description:
-
- Convert a string to a boolean.
-
-Arguments:
-
- Buffer - String buffer to be converted.
- Value - Receive value pointer.
-
-Returns:
-
- EFI_INVALID_PARAMETER - Parameter invalid.
- EFI_UNSUPPORTED - String not supported.
- EFI_SUCCESS - Operation succeeded.
-
---*/
-{
- if ((Buffer == NULL) || (Value == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (StriCmp (Buffer, L"True") == 0) {
- *Value = TRUE;
- } else if (StriCmp (Buffer, L"False") == 0) {
- *Value = FALSE;
- } else {
- return EFI_UNSUPPORTED;
- }
-
- return EFI_SUCCESS;
-}
-
-BOOLEAN
-EntStrBeginWith (
- IN CHAR16 *Str,
- IN CHAR16 *SubStr
- )
-/*++
-
-Routine Description:
-
- Test if the string is begin with the sub string.
-
-Arguments:
-
- Str - The pointer to the string being tested
- SubStr - The pointer to the sub string
-
-Returns:
-
- TRUE - The Str is begin with SubStr.
- FALSE - The Str not begin with SubStr.
-
---*/
-{
- CHAR16 *Temp;
-
- if ((Str == NULL) || (SubStr == NULL) || (StrLen (Str) < StrLen (SubStr))) {
- return FALSE;
- }
- //
- // Remove the pre-space characters
- //
- Temp = SubStr;
-
- while (*Temp == L' ') {
- Temp = Temp + 1;
- }
- //
- // Compare
- //
- if (StrnCmp (Str, Temp, StrLen (Temp)) == 0) {
- return TRUE;
- } else {
- return FALSE;
- }
-}
-
BOOLEAN
EntsStrEndWith (
IN CHAR16 *Str,
@@ -1222,48 +722,6 @@ Returns:
return EFI_SUCCESS;
}
-UINTN
-HexStringToValue (
- IN CHAR16 *String,
- IN UINTN Length
- )
-/*++
-
-Routine Description:
-
- Convert a hex string to a value.
-
-Arguments:
-
- String - Hex string buffer.
- Length - Hex string length.
-
-Returns:
-
- Converted value.
-
---*/
-{
- UINTN Index;
- UINTN Value;
-
- Value = 0;
-
- for (Index = 0; Index < Length; Index++) {
- if ((String[Index] >= L'0') && (String[Index] <= L'9')) {
- Value = (Value << 4) + (String[Index] - L'0');
- } else if ((String[Index] >= L'A') && (String[Index] <= L'F')) {
- Value = (Value << 4) + (String[Index] - L'A' + 10);
- } else if ((String[Index] >= L'a') && (String[Index] <= L'f')) {
- Value = (Value << 4) + (String[Index] - L'a' + 10);
- } else {
- return 0;
- }
- }
-
- return Value;
-}
-
INTN
a2i (
IN CHAR16 Ch
@@ -1284,154 +742,6 @@ a2i (
return -1;
}
-CHAR16
-i2A (
- UINTN x
- )
-{
- if (x >= 0 && x <= 9) {
- return (CHAR16) (x + '0');
- }
-
- if (x >= 10 && x <= 15) {
- return (CHAR16) (x - 10 + 'A');
- }
-
- return 0;
-}
-
-CHAR16
-i2a (
- UINTN x
- )
-{
- if (x >= 0 && x <= 9) {
- return (CHAR16) (x + '0');
- }
-
- if (x >= 10 && x <= 15) {
- return (CHAR16) (x - 10 + 'a');
- }
-
- return 0;
-}
-
-EFI_STATUS
-EntsStrToIp (
- IN CHAR16 *Str,
- IN OUT EFI_IP_ADDRESS *IpAddr
- )
-{
- UINT8 i;
- INTN templen;
- CHAR16 *s;
- UINTN temp;
-
- templen = 0;
- s = Str;
- temp = 0;
-
- SetMem (IpAddr, sizeof (EFI_IP_ADDRESS), 0);
- for (i = 0; i < 4; i++) {
- templen = EntsStrToUINTN (s, &temp);
- if ((templen < 0) || (temp > 255)) {
- return EFI_INVALID_PARAMETER;
- }
-
- IpAddr->v4.Addr[i] = (UINT8) temp;
- if (i == 3) {
- break;
- }
-
- if (s[templen] != L'.') {
- return EFI_INVALID_PARAMETER;
- }
-
- s = &s[templen + 1];
- }
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-EntsIpToStr (
- IN EFI_IP_ADDRESS *IpAddr,
- IN UINTN StrSize,
- OUT CHAR16 *Str
- )
-{
- EntsSPrint (
- Str,
- StrSize,
- L"%d.%d.%d.%d",
- IpAddr->v4.Addr[0],
- IpAddr->v4.Addr[1],
- IpAddr->v4.Addr[2],
- IpAddr->v4.Addr[3]
- );
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-EntsStrToMac (
- IN CHAR16 *Str,
- IN OUT EFI_MAC_ADDRESS *MacAddr
- )
-{
- UINT8 i;
- INTN templen;
- CHAR16 *s;
- UINTN temp;
-
- templen = 0;
- s = Str;
- temp = 0;
-
- SetMem (MacAddr, sizeof (EFI_MAC_ADDRESS), 0);
- for (i = 0; i < 6; i++) {
- templen = EntsHexStrToUINTN (s, &temp);
- if ((templen < 0) || (temp > 255)) {
- return EFI_INVALID_PARAMETER;
- }
-
- MacAddr->Addr[i] = (UINT8) temp;
- if (i == 5) {
- break;
- }
-
- if (s[templen] != L':') {
- return EFI_INVALID_PARAMETER;
- }
-
- s = &s[templen + 1];
- }
-
- return EFI_SUCCESS;
-}
-
-EFI_STATUS
-EntsMacToStr (
- IN OUT EFI_MAC_ADDRESS *MacAddr,
- IN UINTN StrSize,
- OUT CHAR16 *Str
- )
-{
- EntsSPrint (
- Str,
- StrSize,
- L"%02x:%02x:%02x:%02x:%02x:%02x",
- MacAddr->Addr[0],
- MacAddr->Addr[1],
- MacAddr->Addr[2],
- MacAddr->Addr[3],
- MacAddr->Addr[4],
- MacAddr->Addr[5]
- );
-
- return EFI_SUCCESS;
-}
-
EFI_STATUS
EntsTimeToStr (
IN EFI_TIME *Time,
diff --git a/TestFrameworkPkg/Library/EasLib/EntsSupport.c b/TestFrameworkPkg/Library/EasLib/EntsSupport.c
index 6cacd3b..efd2c87 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsSupport.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsSupport.c
@@ -49,21 +49,20 @@ UINTN NICDevicePathLen = 0;
CHAR16 NICDevicePathStr[MAX_DEVICE_PATH_STR_LEN] = {0, };
#define SCT_AGENT_NIC_DEVICE_PATH L"Sct Agent NIC Device Path"
-EFI_GUID gSctVendorGuid = {0x72092b90, 0x17da, 0x47d1, 0x95, 0xce, 0x88, 0xf0, 0x12, 0xe8, 0x50, 0x8d};
+EFI_GUID gSctVendorGuid = {0x72092b90, 0x17da, 0x47d1, {0x95, 0xce, 0x88, 0xf0, 0x12, 0xe8, 0x50, 0x8d}};
#define MAX_PACKET_LENGTH 1492
STATIC EFI_MANAGED_NETWORK_TRANSMIT_DATA EntsMnpTxDataTemplate = {
&NetAssertionConfigData.ServerMac, // DestinationAddress
&NetAssertionConfigData.MacAddr, // SourceAddress
- 0x0800, // ProtocolType
+ 0x0800, // ProtocolType
0, // DataLength
0, // HeaderLength
1, // FragmentCount
- {
- 0,
- NULL
- } // FragmentTable
+ { // FragmentTable
+ {0, NULL}
+ }
};
#define ENTS_SERVER_MAC_ADDRESS_NAME L"ServerMac"
diff --git a/TestFrameworkPkg/Library/EasLib/EntsTime.c b/TestFrameworkPkg/Library/EasLib/EntsTime.c
index 2565443..c93e51c 100644
--- a/TestFrameworkPkg/Library/EasLib/EntsTime.c
+++ b/TestFrameworkPkg/Library/EasLib/EntsTime.c
@@ -18,7 +18,7 @@
//
// Global variables and definitions
//
-#define IS_LEAP(y) (((y) % 4) == 0 && ((y) % 100) != 0 || ((y) % 400) == 0)
+#define IS_LEAP(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
static const UINTN MonthLengths[2][12] = {
{
diff --git a/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c b/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c
index ac9912b..20d2dec 100644
--- a/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c
+++ b/TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c
@@ -87,6 +87,7 @@ CompareGuid (
);
BOOLEAN
+EFIAPI
CheckBBTestCanRunAndRecordAssertion (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN CHAR16 *AssertionString,
@@ -870,6 +871,7 @@ CompareGuid (
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
BOOLEAN
+EFIAPI
CheckBBTestCanRunAndRecordAssertion (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN CHAR16 *AssertionString,
@@ -895,6 +897,7 @@ CheckBBTestCanRunAndRecordAssertion (
#else
BOOLEAN
+EFIAPI
CheckBBTestCanRunAndRecordAssertion (
IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib,
IN CHAR16 *AssertionString,
@@ -908,6 +911,7 @@ CheckBBTestCanRunAndRecordAssertion (
#endif
EFI_STATUS
+EFIAPI
EfiTestLibGetSystemConfigurationTable (
IN EFI_GUID *TableGuid,
IN OUT VOID **Table
diff --git a/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
index a4775a2..40c6740 100644
--- a/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
+++ b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.c
@@ -65,15 +65,15 @@ STATIC LINK_LAYER_STATUS LinkStatus = WaitForPacket;
#define DESTINATION_ADDRESS \
{ \
- 255, 255, 255, 255 \
+ {255, 255, 255, 255} \
}
#define STATION_ADDRESS \
{ \
- 0, 0, 0, 0 \
+ {0, 0, 0, 0} \
}
#define SUBNET_MASK \
{ \
- 0, 0, 0, 0 \
+ {0, 0, 0, 0} \
}
EFI_IP4_CONFIG_DATA mIp4ConfigDataTemplate = {
@@ -104,8 +104,7 @@ EFI_IP4_TRANSMIT_DATA mIp4TxDataTemplate = {
0, // TotalDataLength
1, // FragmentCount
{
- 0,
- NULL
+ {0, NULL}
} // FragmentTable
};
@@ -121,8 +120,7 @@ EFI_IP4_RECEIVE_DATA mIp4RxDataTemplate = {
0, // DataLength
1, // FragmentCount
{
- 0,
- NULL
+ {0, NULL}
} // FragmentTable
};
@@ -141,12 +139,14 @@ StartInitIp4 (
);
VOID
+EFIAPI
NotifyFunctionSend (
EFI_EVENT Event,
VOID *Context
);
VOID
+EFIAPI
NotifyFunctionListen (
EFI_EVENT Event,
VOID *Context
@@ -173,6 +173,7 @@ SetResendTimer (
);
VOID
+EFIAPI
ReSendTimer (
IN EFI_EVENT Event,
IN VOID *Context
@@ -263,6 +264,7 @@ Error:
}
EFI_STATUS
+EFIAPI
IP4NetworkMonitorUnload (
IN EFI_HANDLE ImageHandle
)
@@ -303,6 +305,7 @@ Returns:
// External functions implementations
//
EFI_STATUS
+EFIAPI
InitIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -411,6 +414,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ResetIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -565,6 +569,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
IP4NetworkSaveContext(
EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -588,6 +593,7 @@ IP4NetworkSaveContext(
}
EFI_STATUS
+EFIAPI
IP4NetworkRestoreContext(
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -614,6 +620,7 @@ IP4NetworkRestoreContext(
}
EFI_STATUS
+EFIAPI
IP4NetworkListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -673,6 +680,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
IP4NetworkSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
@@ -890,6 +898,7 @@ Returns:
}
VOID
+EFIAPI
NotifyFunctionSend (
EFI_EVENT Event,
VOID *Context
@@ -915,6 +924,7 @@ Returns:
}
VOID
+EFIAPI
NotifyFunctionListen (
EFI_EVENT Event,
VOID *Context
@@ -936,7 +946,6 @@ Returns:
--*/
{
EAS_IP4_FRAG_FLAG FragFlag;
- EFI_STATUS Status;
UINT32 SequenceID;
UINTN Index;
@@ -944,7 +953,7 @@ Returns:
// Timeout occur, continue
//
if (RxToken.Status == EFI_TIMEOUT) {
- Status = Ip4->Receive (Ip4, &RxToken);
+ Ip4->Receive (Ip4, &RxToken);
return ;
}
@@ -1093,12 +1102,13 @@ Returns:
break;
}
- Status = Ip4->Receive (Ip4, &RxToken);
+ Ip4->Receive (Ip4, &RxToken);
return ;
}
VOID
+EFIAPI
ReSendTimer (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h
index 5885a8d..256d2b2 100644
--- a/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h
+++ b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonitor.h
@@ -20,7 +20,7 @@
#define ENTS_VENDOR_GUID \
{ \
- 0x868b4f16, 0xc83a, 0x4205, 0xa9, 0x3c, 0x3f, 0x51, 0xcf, 0x7f, 0x61, 0xc0 \
+ 0x868b4f16, 0xc83a, 0x4205, {0xa9, 0x3c, 0x3f, 0x51, 0xcf, 0x7f, 0x61, 0xc0} \
}
#define ENTS_SERVER_IPV4_ADDRESS_NAME L"ServerIp"
@@ -56,6 +56,7 @@ typedef enum {
} LINK_LAYER_STATUS;
EFI_STATUS
+EFIAPI
IP4NetworkSaveContext(
EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -79,6 +80,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
IP4NetworkRestoreContext(
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -105,6 +107,7 @@ Returns:
// External functions declarations
//
EFI_STATUS
+EFIAPI
IP4NetworkListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -131,6 +134,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
IP4NetworkSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
@@ -157,6 +161,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
InitIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -179,6 +184,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ResetIP4Network (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
diff --git a/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
index 8d2a8c2..d1e1a69 100644
--- a/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
+++ b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.c
@@ -68,8 +68,8 @@ STATIC UINT32 mCurrentOpCode;
STATIC UINT32 mCurrentSeqId;
STATIC UINT32 mCurrentPacketLength;
-EFI_MAC_ADDRESS mDestinationAddress = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-EFI_MAC_ADDRESS mSourceAddress = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+EFI_MAC_ADDRESS mDestinationAddress = { {0xff, 0xff, 0xff, 0xff, 0xff, 0xff} };
+EFI_MAC_ADDRESS mSourceAddress = { {0xff, 0xff, 0xff, 0xff, 0xff, 0xff} };
EFI_MANAGED_NETWORK_CONFIG_DATA mMnpConfigDataTemplate = {
//
@@ -95,8 +95,7 @@ EFI_MANAGED_NETWORK_TRANSMIT_DATA mMnpTxDataTemplate = {
0, // HeaderLength
1, // FragmentCount
{
- 0,
- NULL
+ {0,NULL}
} // FragmentTable
};
@@ -142,12 +141,14 @@ MnpSendPacketOut (
);
VOID
+EFIAPI
NotifyFunctionSend (
EFI_EVENT Event,
VOID *Context
);
VOID
+EFIAPI
NotifyFunctionListen (
EFI_EVENT Event,
VOID *Context
@@ -180,12 +181,14 @@ SetResendTimer (
);
VOID
+EFIAPI
ReSendTimer (
IN EFI_EVENT Event,
IN VOID *Context
);
EFI_STATUS
+EFIAPI
ManagedNetworkMonitorUnload (
IN EFI_HANDLE ImageHandle
);
@@ -755,9 +758,6 @@ Returns:
--*/
{
EFI_STATUS Status;
- EFI_MANAGED_NETWORK_PROTOCOL *Mnp;
-
- Mnp = This->MonitorIo;
EntsPrint (L"MNP Send ...\n");
if (LinkStatus == SendoutPacket) {
@@ -858,7 +858,8 @@ Returns:
//
if (BufferSize <= MAX_PACKET_LENGTH) {
IsOver = TRUE;
- CLR_FLAG_MF (FragFlag.LLFlag);
+// CLR_FLAG_MF (FragFlag.LLFlag);
+ FragFlag.Flag.MF = 0;
PacketLength = (UINT32) BufferSize;
FragFlag.Flag.Offset = HTONS ((UINT16)PacketStartPoint);
} else {
@@ -866,7 +867,8 @@ Returns:
// Need more fragement
//
IsOver = FALSE;
- SET_FLAG_MF (FragFlag.LLFlag);
+// SET_FLAG_MF (FragFlag.LLFlag);
+ FragFlag.Flag.MF = 1;
PacketLength = MAX_PACKET_LENGTH;
FragFlag.Flag.Offset = HTONS ((UINT16)PacketStartPoint);
BufferSize -= MAX_PACKET_LENGTH;
@@ -1121,6 +1123,7 @@ ManagedNetworkRefresh(
}
VOID
+EFIAPI
NotifyFunctionListen (
EFI_EVENT Event,
VOID *Context
@@ -1184,7 +1187,8 @@ Returns:
SequenceId = NTOHL (FragFlag.Flag.SeqId);
PacketStartPoint = NTOHS ((UINT16)(FragFlag.Flag.Offset));
PacketLength = RxData->DataLength - sizeof (EAS_MNP_FRAG_FLAG);
- IsOver = HAS_FLAG_MF (FragFlag.LLFlag) ? FALSE : TRUE;
+// IsOver = HAS_FLAG_MF (FragFlag.LLFlag) ? FALSE : TRUE;
+ IsOver = FragFlag.Flag.MF ? FALSE : TRUE;
OpCode = FragFlag.Flag.OpCode;
//
@@ -1399,6 +1403,7 @@ RESTART_RECEIVE:
}
VOID
+EFIAPI
ReSendTimer (
IN EFI_EVENT Event,
IN VOID *Context
diff --git a/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h
index f7db299..f9ac4ad 100644
--- a/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h
+++ b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetworkMonitor.h
@@ -75,6 +75,7 @@ typedef enum {
#define MAX_PACKET_LENGTH 1492
EFI_STATUS
+EFIAPI
ManagedNetworkSaveContext (
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -98,6 +99,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ManagedNetworkRestoreContext(
IN EFI_ENTS_MONITOR_PROTOCOL *This
)
@@ -124,6 +126,7 @@ Returns:
// External functions declarations
//
EFI_STATUS
+EFIAPI
ManagedNetworkListener (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN OUT UINTN *Size,
@@ -150,6 +153,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ManagedNetworkSender (
IN EFI_ENTS_MONITOR_PROTOCOL *This,
IN CHAR16 *Buffer
@@ -175,6 +179,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
InitManagedNetwork (
IN EFI_ENTS_MONITOR_PROTOCOL *This
) /*++
@@ -196,6 +201,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
ResetManagedNetwork (
IN EFI_ENTS_MONITOR_PROTOCOL *This
) /*++
diff --git a/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c b/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c
index e86a790..6389f7a 100644
--- a/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c
+++ b/TestFrameworkPkg/PeiSctManageModule/PeiSctManageModule.c
@@ -621,7 +621,6 @@ BurnFd (
CHAR16* FdPath
)
{
- EFI_STATUS Status;
EFI_STATUS ExecuteStatus;
VOID* CmdLine = NULL;
SHELL_FILE_HANDLE BurnHandle = NULL;
@@ -649,13 +648,13 @@ BurnFd (
Print (L"\n\n");
Print (L"Burning %s\n\n", FdPath);
- Status = ShellExecute (
- &ImageHandle,
- CmdLine,
- FALSE,
- NULL,
- &ExecuteStatus
- );
+ ShellExecute (
+ &ImageHandle,
+ CmdLine,
+ FALSE,
+ NULL,
+ &ExecuteStatus
+ );
FreePool (CmdLine);
diff --git a/TestFrameworkPkg/Sct/Core/SctInit.c b/TestFrameworkPkg/Sct/Core/SctInit.c
index 6e27eae..f29cd38 100644
--- a/TestFrameworkPkg/Sct/Core/SctInit.c
+++ b/TestFrameworkPkg/Sct/Core/SctInit.c
@@ -43,7 +43,6 @@ Returns:
{
EFI_STATUS Status;
EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters;
- UINTN Argc;
CHAR16 **Argv;
//
@@ -61,7 +60,6 @@ Returns:
return Status;
}
- Argc = ShellParameters->Argc;
Argv = ShellParameters->Argv;
gBS->CloseProtocol(
diff --git a/TestFrameworkPkg/Sct/Data/TestCaseEx.c b/TestFrameworkPkg/Sct/Data/TestCaseEx.c
index 4e49a52..d85c88f 100644
--- a/TestFrameworkPkg/Sct/Data/TestCaseEx.c
+++ b/TestFrameworkPkg/Sct/Data/TestCaseEx.c
@@ -149,7 +149,6 @@ Returns:
--*/
{
- UINT32 Order;
LIST_ENTRY *Link;
EFI_SCT_TEST_CASE *TestCase;
EFI_SCT_TEST_CASE *Target;
@@ -164,7 +163,6 @@ Returns:
//
// Initialize
//
- Order = EFI_SCT_TEST_CASE_INVALID;
Target = NULL;
//
diff --git a/TestFrameworkPkg/Sct/Data/TestNode.c b/TestFrameworkPkg/Sct/Data/TestNode.c
index 30df071..bf98966 100644
--- a/TestFrameworkPkg/Sct/Data/TestNode.c
+++ b/TestFrameworkPkg/Sct/Data/TestNode.c
@@ -119,7 +119,6 @@ Returns:
--*/
{
EFI_STATUS Status;
- LIST_ENTRY *CategoryList;
LIST_ENTRY *TestFileList;
LIST_ENTRY *Link;
EFI_SCT_CATEGORY_DATA *Category;
@@ -145,7 +144,6 @@ Returns:
//
// Walk through all test files
//
- CategoryList = &gFT->CategoryList;
TestFileList = &gFT->TestFileList;
for (Link = TestFileList->ForwardLink; Link != TestFileList; Link = Link->ForwardLink) {
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/Eas.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/Eas.c
index 96fb40a..3d64180 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/Eas.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/Eas.c
@@ -137,7 +137,6 @@ Returns:
{
EFI_STATUS Status;
CHAR16 *Buffer;
- CHAR16 *Arg;
UINTN BufferSize;
EFI_ENTS_MONITOR_PROTOCOL *EntsMonitor;
@@ -146,7 +145,6 @@ Returns:
BufferSize = 0;
Buffer = NULL;
Status = EFI_SUCCESS;
- Arg = NULL;
EntsMonitor = gEasFT->Monitor;
Status = PostSctAgentDelayedCmd();
@@ -413,4 +411,3 @@ EmptyDelayedPostCmd (
Cmd->ComdInterface = NULL;
}
}
-
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c
index cbb49dc..a278407 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c
@@ -1070,7 +1070,6 @@ Returns:
EFI_ENTS_PROTOCOL *EntsProtocol;
ENTS_INTERFACE *EntsInterface;
EFI_STATUS Status;
- EFI_STATUS TestStatus;
RIVL_VARIABLE *DelayTimeVariable;
UINT64 StartTick;
UINT64 StopTick;
@@ -1111,7 +1110,7 @@ Returns:
// Call the entry point
//
StartTick = AsmReadTsc ();
- TestStatus = EntsInterface->EntsInterfaceEntry (EntsProtocol->ClientInterface);
+ EntsInterface->EntsInterfaceEntry (EntsProtocol->ClientInterface);
StopTick = AsmReadTsc ();
RecordExecTime (StartTick, StopTick);
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlType.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlType.c
index 2d0bb28..d3ba7d4 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlType.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlType.c
@@ -80,7 +80,10 @@ RIVL_INTERNAL_TYPE gRivlInternalTypeArray[] = {
L"POINTER",
sizeof (VOID *)
},
- 0
+ {
+ L"",
+ 0
+ }
};
//
@@ -257,14 +260,13 @@ Returns:
--*/
{
- EFI_STATUS Status;
CHAR16 *Name;
//
// If buf is NULL, delete all type
//
if (TypeBuf == NULL) {
- Status = DelRivlAllType ();
+ DelRivlAllType ();
return EFI_SUCCESS;
}
//
diff --git a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c
index efb7289..8d74dad 100644
--- a/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c
+++ b/TestFrameworkPkg/Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c
@@ -162,14 +162,13 @@ Returns:
--*/
{
- EFI_STATUS Status;
CHAR16 *Name;
//
// If buf is NULL, delete all variable
//
if (VarBuf == NULL) {
- Status = DelRivlAllVariable ();
+ DelRivlAllVariable ();
return EFI_SUCCESS;
}
//
@@ -1132,7 +1131,6 @@ Returns:
RIVL_INTERNAL_TYPE *RivlInternalType;
RIVL_MEMBER *RivlMember;
CHAR16 *UnitName;
- CHAR16 *ValueName;
CHAR16 *IndexName;
BOOLEAN HasIndex;
UINTN IndexValue;
@@ -1153,7 +1151,6 @@ Returns:
}
UnitName = NULL;
- ValueName = NULL;
IndexName = NULL;
HasIndex = FALSE;
IndexValue = 0;
@@ -1233,7 +1230,7 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- ValueName = my_strtok_field (UnitName, L"(");
+ my_strtok_field (UnitName, L"(");
IndexName = my_strtok_field (NULL, L")");
if (IndexName == NULL) {
@@ -1344,7 +1341,7 @@ Returns:
// Recursive search the member name
//
while (UnitName != NULL) {
- ValueName = my_strtok_field (UnitName, L"(");
+ my_strtok_field (UnitName, L"(");
IndexName = my_strtok_field (NULL, L")");
if (IndexName == NULL) {
diff --git a/TestFrameworkPkg/Sct/Execute/Execute.c b/TestFrameworkPkg/Sct/Execute/Execute.c
index a55586d..c76ba0b 100644
--- a/TestFrameworkPkg/Sct/Execute/Execute.c
+++ b/TestFrameworkPkg/Sct/Execute/Execute.c
@@ -1161,7 +1161,6 @@ Routine Description:
--*/
{
EFI_STATUS Status;
- EFI_AP_TEST_INTERFACE *ApTest;
//
// Check parameters
@@ -1173,8 +1172,6 @@ Routine Description:
//
// Application test interface
//
- ApTest = (EFI_AP_TEST_INTERFACE *) ExecuteInfo->TestProtocol;
-
while (ExecuteInfo->Iteration < ExecuteInfo->TestCase->Iterations) {
//
// Application test
@@ -1453,7 +1450,6 @@ Routine Description:
EFI_STATUS TestStatus;
BOOLEAN IsSkip;
CHAR16 *CmdLine;
- EFI_AP_TEST_INTERFACE *ApTest;
EFI_AP_TEST_ENTRY *ApEntry;
//
@@ -1466,7 +1462,6 @@ Routine Description:
//
// Application test instance
//
- ApTest = (EFI_AP_TEST_INTERFACE *) ExecuteInfo->TestProtocol;
ApEntry = (EFI_AP_TEST_ENTRY *) ExecuteInfo->TestEntry;
TestStatus = EFI_UNSUPPORTED;
diff --git a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
index 8036050..ecd4112 100644
--- a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
+++ b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.c
@@ -928,6 +928,7 @@ GatherConfigHandles (
}
BOOLEAN
+EFIAPI
IhvInterfaceFilter (
IN VOID *ClientInterface,
IN EFI_HANDLE SupportHandle,
diff --git a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.h b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.h
index 680eb2b..a98bac2 100644
--- a/TestFrameworkPkg/Sct/Execute/ExecuteSupport.h
+++ b/TestFrameworkPkg/Sct/Execute/ExecuteSupport.h
@@ -80,6 +80,7 @@ BOOLEAN
);
BOOLEAN
+EFIAPI
IhvInterfaceFilter (
IN VOID *ClientInterface,
IN EFI_HANDLE SupportHandle,
diff --git a/TestFrameworkPkg/Sct/Include/SctCore.h b/TestFrameworkPkg/Sct/Include/SctCore.h
index 36c2361..861cc0b 100644
--- a/TestFrameworkPkg/Sct/Include/SctCore.h
+++ b/TestFrameworkPkg/Sct/Include/SctCore.h
@@ -20,6 +20,7 @@
//
EFI_STATUS
+EFIAPI
InitializeSct (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
diff --git a/TestFrameworkPkg/Sct/Include/SctDef.h b/TestFrameworkPkg/Sct/Include/SctDef.h
index d0c4226..2d04ca9 100644
--- a/TestFrameworkPkg/Sct/Include/SctDef.h
+++ b/TestFrameworkPkg/Sct/Include/SctDef.h
@@ -65,7 +65,7 @@
// System hang assertion
//
#define EFI_SYSTEM_HANG_ASSERTION_GUID \
- { 0xde687a18, 0x0bbd, 0x4396, 0x85, 0x09, 0x49, 0x8f, 0xf2, 0x32, 0x34, 0xf1 }
+ { 0xde687a18, 0x0bbd, 0x4396, {0x85, 0x09, 0x49, 0x8f, 0xf2, 0x32, 0x34, 0xf1 }}
//
// Global variables
diff --git a/TestFrameworkPkg/Sct/Misc/SctMisc.c b/TestFrameworkPkg/Sct/Misc/SctMisc.c
index 1108f63..73f63f5 100644
--- a/TestFrameworkPkg/Sct/Misc/SctMisc.c
+++ b/TestFrameworkPkg/Sct/Misc/SctMisc.c
@@ -1400,7 +1400,7 @@ Routine Description:
StrCpy (Buffer, L"Exhaustive");
break;
default:
- EFI_UNSUPPORTED;
+ return EFI_UNSUPPORTED;
}
return EFI_SUCCESS;
--git a/TestFrameworkPkg/Sct/UI/BuildMenu.c b/TestFrameworkPkg/Sct/UI/BuildMenu.c
index 5d77dd5..dfa3d6c 100644
--- a/TestFrameworkPkg/Sct/UI/BuildMenu.c
+++ b/TestFrameworkPkg/Sct/UI/BuildMenu.c
@@ -40,6 +40,7 @@ CreateStandardMenuPage (
);
EFI_STATUS
+EFIAPI
DestroyMenuPage (
IN EFI_MENU_PAGE *Page
);
@@ -266,6 +267,7 @@ Returns:
EFI_STATUS
+EFIAPI
DestroyMenuPage (
IN EFI_MENU_PAGE *Page
)
--git a/TestFrameworkPkg/Sct/UI/BuildMenu.h b/TestFrameworkPkg/Sct/UI/BuildMenu.h
index 01ccdad..a2f4b80 100644
--- a/TestFrameworkPkg/Sct/UI/BuildMenu.h
+++ b/TestFrameworkPkg/Sct/UI/BuildMenu.h
@@ -20,7 +20,7 @@
//
#include "Sct.h"
-#include "Ui.h"
+#include "UI.h"
//
// Definitions
@@ -50,6 +50,7 @@ CreateStandardMenuPage (
);
EFI_STATUS
+EFIAPI
DestroyMenuPage (
IN EFI_MENU_PAGE *Page
);
@@ -169,6 +170,7 @@ DisplayMainMenu (
//
EFI_STATUS
+EFIAPI
DisplayConfigMenu (
IN EFI_MENU_PAGE *ParentPage
);
@@ -178,6 +180,7 @@ DisplayConfigMenu (
//
EFI_STATUS
+EFIAPI
DisplayCaseMgmtMenu (
IN EFI_MENU_PAGE *ParentPage
);
@@ -187,6 +190,7 @@ DisplayCaseMgmtMenu (
//
EFI_STATUS
+EFIAPI
DisplayProtocolMenu (
IN EFI_MENU_PAGE *ParentPage
);
@@ -196,6 +200,7 @@ DisplayProtocolMenu (
//
EFI_STATUS
+EFIAPI
DisplayDriverMenu (
IN EFI_MENU_PAGE *ParentPage
);
@@ -205,11 +210,13 @@ DisplayDriverMenu (
//
EFI_STATUS
+EFIAPI
DisplayFileNameMenu (
IN EFI_MENU_PAGE *ParentPage
);
EFI_STATUS
+EFIAPI
DisplaySequenceMenu (
IN EFI_MENU_PAGE *ParentPage
);
@@ -228,6 +235,7 @@ DisplayCaseMenu (
//prototypes (from ResultMgmtMenu.c)
//
EFI_STATUS
+EFIAPI
DisplayResultMgmtMenu (
IN EFI_MENU_PAGE *ParentPage
);
@@ -235,6 +243,7 @@ DisplayResultMgmtMenu (
//protypes (from UtilityMenu.c)
//
EFI_STATUS
+EFIAPI
DisplayUtilityMenu (
IN EFI_MENU_PAGE *ParentPage
);
--git a/TestFrameworkPkg/Sct/UI/ConfigMenu.c b/TestFrameworkPkg/Sct/UI/ConfigMenu.c
index 8aebf4e..a679e21 100644
--- a/TestFrameworkPkg/Sct/UI/ConfigMenu.c
+++ b/TestFrameworkPkg/Sct/UI/ConfigMenu.c
@@ -12,7 +12,7 @@
**/
-#include "SCT.h"
+#include "Sct.h"
#include "BuildMenu.h"
//
@@ -37,21 +37,25 @@ BOOLEAN ItemValueChanged = FALSE;
//
EFI_STATUS
+EFIAPI
DisplayConfigMenu (
IN EFI_MENU_PAGE *ParentPage
);
EFI_STATUS
+EFIAPI
ConfigMenuEscFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
ConfigMenuSetDefaultFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
ConfigMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
@@ -64,6 +68,7 @@ ConfigMenuDescPrintFunc (
//
EFI_STATUS
+EFIAPI
DisplayConfigMenu (
IN EFI_MENU_PAGE *ParentPage
)
@@ -511,6 +516,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ConfigMenuSetDefaultFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -758,6 +764,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ConfigMenuEscFunc (
IN EFI_MENU_PAGE *Page
)
@@ -778,8 +785,7 @@ Returns:
--*/
{
- EFI_STATUS Status;
- EFI_MENU_ITEM *MenuItem;
+ EFI_MENU_ITEM *MenuItem;
CHAR16 *FileName;
UINTN TempValue;
BOOLEAN TrueOrFalse;
@@ -877,11 +883,11 @@ Returns:
//
//save config data into profile
//
- Status = SaveConfigData (
- gFT->DevicePath,
- FileName,
- gFT->ConfigData
- );
+ SaveConfigData (
+ gFT->DevicePath,
+ FileName,
+ gFT->ConfigData
+ );
FreePool (FileName);
}
//
@@ -898,6 +904,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
ConfigMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
diff --git a/TestFrameworkPkg/Sct/UI/Dialog.h b/TestFrameworkPkg/Sct/UI/Dialog.h
index d662602..90755b9 100644
--- a/TestFrameworkPkg/Sct/UI/Dialog.h
+++ b/TestFrameworkPkg/Sct/UI/Dialog.h
@@ -24,7 +24,7 @@
#include <Library/UefiLib.h>
#include <Library/MemoryAllocationLib.h>
-#include "Ui.h"
+#include "UI.h"
#include <Protocol/DevicePath.h>
diff --git a/TestFrameworkPkg/Sct/UI/DisplayUi.c b/TestFrameworkPkg/Sct/UI/DisplayUi.c
index b04426c..2a000cf 100644
--- a/TestFrameworkPkg/Sct/UI/DisplayUi.c
+++ b/TestFrameworkPkg/Sct/UI/DisplayUi.c
@@ -45,21 +45,25 @@ SetScrollBarPos (
);
EFI_STATUS
+EFIAPI
MenuBodyRefresh (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
MenuFooterRefresh (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
MenuBodyItemsRefresh (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
MenuItemRefresh (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_MENU_ITEM *Item,
@@ -67,6 +71,7 @@ MenuItemRefresh (
);
EFI_STATUS
+EFIAPI
MenuPageRefresh (
IN EFI_MENU_PAGE *MenuPage
);
@@ -278,6 +283,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MenuHeaderRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -379,6 +385,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MenuBodyRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -728,6 +735,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MenuFooterRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -753,7 +761,6 @@ Returns:
UINTN X1;
UINTN Y1;
UINTN Lines;
- UINTN Columns;
UINTN Xpos;
UINTN Ypos;
EFI_HOT_KEY *HotKey;
@@ -775,7 +782,6 @@ Returns:
X1 = MenuPage->Footer.FooterRect.BottomRight.Col;
Y1 = MenuPage->Footer.FooterRect.BottomRight.Row;
Lines = Y1-Y0+1;
- Columns = X1-X0+1;
Xpos = X0;
Ypos = Y0;
@@ -868,6 +874,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MenuBodyItemsRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -1061,6 +1068,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MenuItemRefresh (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_MENU_ITEM *Item,
@@ -1562,6 +1570,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MenuItemStatusRefresh (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_MENU_ITEM *Item,
@@ -1752,6 +1761,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MenuPageRefresh (
IN EFI_MENU_PAGE *MenuPage
)
diff --git a/TestFrameworkPkg/Sct/UI/FileDialog.c b/TestFrameworkPkg/Sct/UI/FileDialog.c
index c3e7732..4424dbc 100644
--- a/TestFrameworkPkg/Sct/UI/FileDialog.c
+++ b/TestFrameworkPkg/Sct/UI/FileDialog.c
@@ -2601,7 +2601,6 @@ Returns:
EFI_INPUT_KEY Key;
EFI_STATUS Status;
EFI_FILE_HANDLE FHandle;
- EFI_FILE_HANDLE TempHandle;
BOOLEAN RET;
CHAR16 *TempName;
INTN Length;
@@ -2631,7 +2630,6 @@ Returns:
} else {
ResultContextWasNull = FALSE;
}
- TempHandle = ResultContext->FHandle;
//
//set the new file
diff --git a/TestFrameworkPkg/Sct/UI/FileDialog.h b/TestFrameworkPkg/Sct/UI/FileDialog.h
index bfc2bf2..4801fc0 100644
--- a/TestFrameworkPkg/Sct/UI/FileDialog.h
+++ b/TestFrameworkPkg/Sct/UI/FileDialog.h
@@ -24,7 +24,7 @@
#include <Library/UefiLib.h>
#include <Library/MemoryAllocationLib.h>
-#include "Ui.h"
+#include "UI.h"
#include <Protocol/DevicePath.h>
//
diff --git a/TestFrameworkPkg/Sct/UI/KeyFunction.c b/TestFrameworkPkg/Sct/UI/KeyFunction.c
index 34e683f..e585489 100644
--- a/TestFrameworkPkg/Sct/UI/KeyFunction.c
+++ b/TestFrameworkPkg/Sct/UI/KeyFunction.c
@@ -30,44 +30,52 @@ extern BOOLEAN gMenuExit;
//protypes (external)
//
EFI_STATUS
+EFIAPI
DoDefault (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_INPUT_KEY *InKey
);
EFI_STATUS
+EFIAPI
UpFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
DownFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
DoEdit (
IN EFI_MENU_PAGE *MenuPage,
IN OUT EFI_INPUT_KEY *InKey
);
EFI_STATUS
+EFIAPI
DoIterEdit (
IN EFI_MENU_PAGE *MenuPage,
IN OUT EFI_INPUT_KEY *InKey
);
EFI_STATUS
+EFIAPI
SpaceFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
LeftArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
RightArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
@@ -110,6 +118,7 @@ CompareNumberString (
//
EFI_STATUS
+EFIAPI
DoDefault (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_INPUT_KEY *InKey
@@ -141,6 +150,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
UpFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -237,6 +247,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
DownFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -359,6 +370,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
PageUpFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -469,6 +481,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
PageDownFunc (
IN EFI_MENU_PAGE *MenuPage
)
@@ -603,6 +616,7 @@ Returns:
EFI_STATUS
+EFIAPI
DoEdit (
IN EFI_MENU_PAGE *MenuPage,
IN OUT EFI_INPUT_KEY *InKey
@@ -1425,6 +1439,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
SpaceFunc(
IN EFI_MENU_PAGE *MenuPage
)
@@ -1542,6 +1557,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
LeftArrowFunc(
IN EFI_MENU_PAGE *MenuPage
)
@@ -1635,6 +1651,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
RightArrowFunc(
IN EFI_MENU_PAGE *MenuPage
)
@@ -2152,6 +2169,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
DoIterEdit (
IN EFI_MENU_PAGE *MenuPage,
IN OUT EFI_INPUT_KEY *InKey
diff --git a/TestFrameworkPkg/Sct/UI/LogFileDialog.c b/TestFrameworkPkg/Sct/UI/LogFileDialog.c
index 9b16ad8..e10fa73 100644
--- a/TestFrameworkPkg/Sct/UI/LogFileDialog.c
+++ b/TestFrameworkPkg/Sct/UI/LogFileDialog.c
@@ -2370,7 +2370,7 @@ Returns:
if (*Ptr == '\\' && *(Ptr+1) == '.' && *(Ptr+2) == '.' && *(Ptr+3) != 0) {
//
- // Convert \Name\..\ to \
+ // Convert "\Name\..\" to "\"
// DO NOT convert the .. if it is at the end of the string. This will
// break the .. behavior in changing directories.
//
@@ -2380,7 +2380,7 @@ Returns:
} else if (*Ptr == '\\' && *(Ptr+1) == '.' && *(Ptr + 2) == '\\') {
//
- // Convert a \.\ to a \
+ // Convert a "\.\" to a "\"
//
StrCpy (TempStr, Ptr + 2);
StrCpy (Ptr, TempStr);
diff --git a/TestFrameworkPkg/Sct/UI/LogFileDialog.h b/TestFrameworkPkg/Sct/UI/LogFileDialog.h
index 1db7f09..10b21ac 100644
--- a/TestFrameworkPkg/Sct/UI/LogFileDialog.h
+++ b/TestFrameworkPkg/Sct/UI/LogFileDialog.h
@@ -24,7 +24,7 @@
#include <Library/UefiLib.h>
#include <Library/MemoryAllocationLib.h>
-#include "Ui.h"
+#include "UI.h"
#include <Protocol/DevicePath.h>
//
diff --git a/TestFrameworkPkg/Sct/UI/MainMenu.c b/TestFrameworkPkg/Sct/UI/MainMenu.c
index c44b406..cc79f8b 100644
--- a/TestFrameworkPkg/Sct/UI/MainMenu.c
+++ b/TestFrameworkPkg/Sct/UI/MainMenu.c
@@ -54,46 +54,55 @@ DisplayMainMenu (
//
VOID
+EFIAPI
DisplayDeviceConfig (
IN EFI_MENU_PAGE *Page
);
VOID
+EFIAPI
DisplayReportGenerator(
IN EFI_MENU_PAGE *Page
);
VOID
+EFIAPI
DisplayLog(
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuEnterFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuEscFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuLoadSeqFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuSaveSeqFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuF9Func(
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
MainMenuClearFunc (
IN EFI_MENU_PAGE *Page
);
@@ -416,6 +425,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MainMenuEnterFunc (
IN EFI_MENU_PAGE *Page
)
@@ -472,6 +482,7 @@ Reutrns
EFI_STATUS
+EFIAPI
MainMenuEscFunc (
IN EFI_MENU_PAGE *Page
)
@@ -506,6 +517,7 @@ Returns:
}
VOID
+EFIAPI
DisplayDeviceConfig (
IN EFI_MENU_PAGE *Page
)
@@ -548,6 +560,7 @@ DisplayDeviceConfig (
}
VOID
+EFIAPI
DisplayReportGenerator(
IN EFI_MENU_PAGE *Page
)
@@ -661,6 +674,7 @@ DisplayReportGenerator(
VOID
+EFIAPI
DisplayLog (
IN EFI_MENU_PAGE *Page
)
@@ -767,6 +781,7 @@ DisplayLog (
}
EFI_STATUS
+EFIAPI
MainMenuLoadSeqFunc (
IN EFI_MENU_PAGE *Page
)
@@ -853,6 +868,7 @@ MainMenuLoadSeqFunc (
EFI_STATUS
+EFIAPI
MainMenuSaveSeqFunc (
IN EFI_MENU_PAGE *Page
)
@@ -944,6 +960,7 @@ MainMenuSaveSeqFunc (
}
EFI_STATUS
+EFIAPI
MainMenuF9Func(
IN EFI_MENU_PAGE *Page
)
@@ -1004,6 +1021,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
MainMenuClearFunc (
IN EFI_MENU_PAGE *Page
)
--git a/TestFrameworkPkg/Sct/UI/TestNodeMenu.c b/TestFrameworkPkg/Sct/UI/TestNodeMenu.c
index 0cdf597..72ac50e 100644
--- a/TestFrameworkPkg/Sct/UI/TestNodeMenu.c
+++ b/TestFrameworkPkg/Sct/UI/TestNodeMenu.c
@@ -40,26 +40,31 @@ DisplayTestNodeMenu (
// Prototypes (internal)
//
EFI_STATUS
+EFIAPI
TestNodeMenuEnterFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuEscFunc (
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuSpaceFunc(
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuF9Func(
IN EFI_MENU_PAGE *Page
);
EFI_STATUS
+EFIAPI
TestNodeMenuF8Func(
IN EFI_MENU_PAGE *Page
);
@@ -87,6 +92,7 @@ UnSelectTestNode (
);
EFI_STATUS
+EFIAPI
TestNodeMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
@@ -388,6 +394,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuEnterFunc (
IN EFI_MENU_PAGE *Page
)
@@ -449,6 +456,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuEscFunc (
IN EFI_MENU_PAGE *Page
)
@@ -586,6 +594,7 @@ Returns:
EFI_STATUS
+EFIAPI
TestNodeMenuSpaceFunc(
IN EFI_MENU_PAGE *Page
)
@@ -661,6 +670,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuF9Func(
IN EFI_MENU_PAGE *Page
)
@@ -721,6 +731,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TestNodeMenuF8Func(
IN EFI_MENU_PAGE *Page
)
@@ -929,6 +940,7 @@ Arguments:
}
EFI_STATUS
+EFIAPI
TestNodeMenuDescPrintFunc (
IN EFI_MENU_ITEM *MenuItem,
IN VOID *Context,
--git a/TestFrameworkPkg/Sct/UI/TestNodeMenu.h b/TestFrameworkPkg/Sct/UI/TestNodeMenu.h
index 8f86bfb..84348c1 100644
--- a/TestFrameworkPkg/Sct/UI/TestNodeMenu.h
+++ b/TestFrameworkPkg/Sct/UI/TestNodeMenu.h
@@ -20,7 +20,7 @@
//
#include "Sct.h"
-#include "Ui.h"
+#include "UI.h"
#include "BuildMenu.h"
#include "Dialog.h"
diff --git a/TestFrameworkPkg/Sct/UI/UI.h b/TestFrameworkPkg/Sct/UI/UI.h
index dbd2d41..6304c78 100644
--- a/TestFrameworkPkg/Sct/UI/UI.h
+++ b/TestFrameworkPkg/Sct/UI/UI.h
@@ -242,6 +242,7 @@ Returns:
EFI_STATUS
+EFIAPI
MenuHeaderRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -264,6 +265,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MenuBodyRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -290,6 +292,7 @@ Returns:
//
EFI_STATUS
+EFIAPI
MenuBodyItemsRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -312,6 +315,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MenuItemRefresh (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_MENU_ITEM *Item,
@@ -338,6 +342,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MenuItemStatusRefresh(
IN EFI_MENU_PAGE *MenuPage,
IN EFI_MENU_ITEM *Item,
@@ -363,6 +368,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MenuFooterRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -385,6 +391,7 @@ Returns:
;
EFI_STATUS
+EFIAPI
MenuPageRefresh (
IN EFI_MENU_PAGE *MenuPage
)
@@ -463,12 +470,14 @@ DisplayMessage (
);
EFI_STATUS
+EFIAPI
DoEdit (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_INPUT_KEY *InKey
);
EFI_STATUS
+EFIAPI
DoIterEdit (
IN EFI_MENU_PAGE *MenuPage,
IN EFI_INPUT_KEY *InKey
@@ -479,36 +488,43 @@ DoIterEdit (
//
EFI_STATUS
+EFIAPI
UpFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
DownFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
PageUpFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
PageDownFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
SpaceFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
LeftArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
EFI_STATUS
+EFIAPI
RightArrowFunc (
IN EFI_MENU_PAGE *MenuPage
);
diff --git a/TestFrameworkPkg/Support/StandardTest/StandardTest.c b/TestFrameworkPkg/Support/StandardTest/StandardTest.c
index 8ea22dd..270dc76 100644
--- a/TestFrameworkPkg/Support/StandardTest/StandardTest.c
+++ b/TestFrameworkPkg/Support/StandardTest/StandardTest.c
@@ -335,7 +335,6 @@ StslCloseAllFiles (
IN STANDARD_TEST_PRIVATE_DATA *Private
)
{
- EFI_STATUS Status;
EFI_TEST_OUTPUT_LIBRARY_PROTOCOL *Output;
EFI_LIB_CONFIG_FILE_HANDLE *FileConf;
@@ -346,10 +345,10 @@ StslCloseAllFiles (
//
FileConf = &Private->SystemLogFile;
if (FileConf->FileHandle != NULL) {
- Status = Output->Close (
- Output,
- FileConf->FileHandle
- );
+ Output->Close (
+ Output,
+ FileConf->FileHandle
+ );
FileConf->FileHandle = NULL;
}
@@ -358,10 +357,10 @@ StslCloseAllFiles (
//
FileConf = &Private->SystemKeyFile;
if (FileConf->FileHandle != NULL) {
- Status = Output->Close (
- Output,
- FileConf->FileHandle
- );
+ Output->Close (
+ Output,
+ FileConf->FileHandle
+ );
FileConf->FileHandle = NULL;
}
@@ -370,10 +369,10 @@ StslCloseAllFiles (
//
FileConf = &Private->CaseLogFile;
if (FileConf->FileHandle != NULL) {
- Status = Output->Close (
- Output,
- FileConf->FileHandle
- );
+ Output->Close (
+ Output,
+ FileConf->FileHandle
+ );
FileConf->FileHandle = NULL;
}
@@ -382,10 +381,10 @@ StslCloseAllFiles (
//
FileConf = &Private->CaseKeyFile;
if (FileConf->FileHandle != NULL) {
- Status = Output->Close (
- Output,
- FileConf->FileHandle
- );
+ Output->Close (
+ Output,
+ FileConf->FileHandle
+ );
FileConf->FileHandle = NULL;
}
@@ -1712,4 +1711,3 @@ Returns:
return Status;
}
-
diff --git a/TestFrameworkPkg/Support/TestLogging/TestLogging.c b/TestFrameworkPkg/Support/TestLogging/TestLogging.c
index 703aae9..16f12c7 100644
--- a/TestFrameworkPkg/Support/TestLogging/TestLogging.c
+++ b/TestFrameworkPkg/Support/TestLogging/TestLogging.c
@@ -89,7 +89,6 @@ TllCloseAllFiles (
TEST_LOGGING_PRIVATE_DATA *Private
)
{
- EFI_STATUS Status;
EFI_TEST_OUTPUT_LIBRARY_PROTOCOL *Output;
EFI_LIB_CONFIG_FILE_HANDLE *FileConf;
@@ -100,10 +99,10 @@ TllCloseAllFiles (
//
FileConf = &Private->SystemLogFile;
if (FileConf->FileHandle != NULL) {
- Status = Output->Close (
- Output,
- FileConf->FileHandle
- );
+ Output->Close (
+ Output,
+ FileConf->FileHandle
+ );
FileConf->FileHandle = NULL;
}
@@ -112,10 +111,10 @@ TllCloseAllFiles (
//
FileConf = &Private->CaseLogFile;
if (FileConf->FileHandle != NULL) {
- Status = Output->Close (
- Output,
- FileConf->FileHandle
- );
+ Output->Close (
+ Output,
+ FileConf->FileHandle
+ );
FileConf->FileHandle = NULL;
}
diff --git a/TestFrameworkPkg/Support/TestProfile/TestProfile.c b/TestFrameworkPkg/Support/TestProfile/TestProfile.c
index ca405d3..f02e9df 100644
--- a/TestFrameworkPkg/Support/TestProfile/TestProfile.c
+++ b/TestFrameworkPkg/Support/TestProfile/TestProfile.c
@@ -16,6 +16,7 @@
#include <Library/UefiBootServicesTableLib.h>
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
#include <Library/DevicePathLib.h>
#include <Library/DebugLib.h>
#include <Protocol/LoadedImage.h>
@@ -93,326 +94,52 @@ CHAR16 *gAtslDescription = L"EFI Test Profile Library";
//
// Internal functions
//
-#define toupper(c) (((c <= 'z') && (c >= 'a')) ? (c + 'A' - 'a') : c)
-#define tolower(c) (((c <= 'Z') && (c >= 'A')) ? (c - 'A' + 'a') : c)
-
-VOID *
-TestProfile_memset(
- VOID *b,
- INTN c,
- UINTN len
- )
-{
- volatile CHAR8 *p;
- UINTN i;
-
- p = b;
- for (i = 0; i < len; i++) {
- p[i] = (CHAR8)c;
- }
- return ((VOID *)p);
-}
-
-VOID*
-malloc (
- UINTN size
- )
-{
- VOID *pMem;
-
- if (gBS->AllocatePool (EfiBootServicesData, size, &pMem) != EFI_SUCCESS) {
- return NULL;
- }
- return pMem;
-}
-
-VOID *
-calloc(
- UINTN NMemb,
- UINTN MembSize
- )
-{
- UINTN NewSize;
- VOID *NewMem;
-
- NewSize = NMemb * MembSize;
- NewMem = malloc (NewSize);
- if (NewMem) {
- TestProfile_memset (NewMem, 0, NewSize);
- }
-
- return NewMem;
-}
-
-VOID
-free (
- VOID *addr
- )
-{
- gBS->FreePool (addr);
-}
-
-INTN
-memcmp(
- VOID *s1,
- VOID *s2,
- UINTN n
- )
-{
- CHAR8 *p1, *p2;
-
- p1 = s1;
- p2 = s2;
- if (n != 0) {
- do {
- if (*p1++ != *p2++)
- return (*--p1 - *--p2);
- } while (--n != 0);
- }
- return (0);
-}
-
-VOID *
-memcpy(
- VOID *dst,
- VOID *src,
- UINTN len
- )
-{
- CHAR8 *d, *s;
-
- d = dst;
- s = src;
- while (len--) {
- *(d++) = *(s++);
- }
- return dst;
-}
-
-CHAR8 *
-strchr(
- CHAR8 *p,
- INTN ch
- )
-{
- for (; ; ++p) {
- if (*p == ch)
- return((CHAR8 *)p);
- if (!*p)
- return((CHAR8 *)NULL);
- }
- /* NOTREACHED */
-}
-
-INTN
-strcmp(
- CHAR8 *s1,
- CHAR8 *s2
- )
-{
- while (*s1 == *s2++) {
- if (*s1++ == 0)
- return 0;
- }
- return (*s1 - *s2 - 1);
-}
-
-INTN
-stricmp(
- CHAR8 *s1,
- CHAR8 *s2
- )
-{
- while (toupper(*s1) == toupper(*s2)) {
- s2++;
- if (*s1++ == 0)
- return (0);
- }
- return (*s1 - *s2);
-}
-
-CHAR8 *
-strcpy(
- CHAR8 *to,
- CHAR8 *from
- )
-{
- CHAR8 *save;
-
- save = to;
- for (; (*to = *from) != 0 ; ++from, ++to)
- ;
- return(save);
-}
-
-CHAR8 *
-strncpy(
- CHAR8 *dst,
- CHAR8 *src,
- UINTN n
- )
-{
- volatile CHAR8 *d;
- CHAR8 *s;
-
- d = dst;
- s = src;
- if (n != 0) {
- do {
- if ((*d++ = *s++) == 0) {
- /* NUL pad the remaining n-1 bytes */
- while (--n != 0)
- *d++ = 0;
- break;
- }
- } while (--n != 0);
- }
- return (dst);
-}
-
-UINTN
-strlen(
- CHAR8 *str
- )
-{
- CHAR8 *s;
-
- for (s = str; *s; ++s)
- ;
- return (UINTN)(s - str);
-}
-
CHAR8 *
-strdup(
- CHAR8 *str
+AsciiDuplicateString (
+ CHAR8 *str
)
{
- CHAR8 *copy;
-
- if (str != NULL) {
- copy = malloc(strlen(str) + 1);
- if (copy != NULL)
- return strcpy(copy, str);
- }
- return NULL;
-}
-
-CHAR8 *
-strcat(
- CHAR8 *s,
- CHAR8 *append
-)
-{
- CHAR8 *save;
-
- save = s;
- for (; *s; ++s)
- ;
- while ( (*s++ = *append++) != 0)
- ;
- return(save);
-}
-
-UINTN
-wcslen(
- CHAR16 *str
- )
-{
- CHAR16 *s;
-
- for (s = str; *s; ++s)
- ;
- return (UINTN)(s - str);
-}
-
-CHAR16 *
-wcscpy(
- CHAR16 *to,
- CHAR16 *from
- )
-{
- CHAR16 *save;
-
- save = to;
- for (; (*to = *from) != 0; ++from, ++to)
- ;
- return(save);
+ return (str == NULL) ? NULL : AllocateCopyPool (AsciiStrSize (str), str);
}
CHAR16 *
-wcsdup (
+UnicodeDuplicateString (
CHAR16 *str
)
{
- CHAR16 *copy;
-
- if (str != NULL) {
- copy = calloc(wcslen(str) + 1, sizeof(CHAR16));
- if (copy != NULL)
- return wcscpy(copy, str);
- }
- return NULL;
-}
-
-CHAR16 *
-wcschr(
- CHAR16 *p,
- INTN ch
- )
-{
- for (;; ++p) {
- if (*p == ch)
- return((CHAR16 *)p);
- if (!*p)
- return((CHAR16 *)NULL);
- }
- /* NOTREACHED */
+ return (str == NULL) ? NULL : AllocateCopyPool (StrSize (str), str);
}
-UINTN
-wcstombs(
+INTN
+TestProfile_wcstombs(
CHAR8 *s,
CHAR16 *pwcs,
UINTN n
)
{
- UINTN cnt;
-
- cnt = 0;
- if (!pwcs || !s)
- return (UINTN)-1;
+ EFI_STATUS Status;
- while (n-- > 0) {
- *s = (CHAR8) (*pwcs++ & 0x00ff);
- if (*s++ == 0) {
- break;
- }
- ++cnt;
+ Status = UnicodeStrToAsciiStrS(pwcs, s, n);
+ if (EFI_ERROR (Status)) {
+ return -1;
}
- return (cnt);
+ return AsciiStrnLenS (s, n);
}
-UINTN
-mbstowcs(
+INTN
+TestProfile_mbstowcs(
CHAR16 *pwcs,
CHAR8 *s,
UINTN n
)
{
- UINTN cnt;
-
- cnt = 0;
- if (!pwcs || !s)
- return (UINTN)-1;
+ EFI_STATUS Status;
- while (n-- > 0) {
- *pwcs = (CHAR16)(*s++ & 0x00ff);
- if (*pwcs++ == 0) {
- break;
- }
- ++cnt;
+ Status = AsciiStrToUnicodeStrS(s, pwcs, n);
+ if (EFI_ERROR (Status)) {
+ return -1;
}
- return (cnt);
+ return StrnLenS (pwcs, n);
}
VOID
@@ -435,15 +162,15 @@ Routine Description:
ptrCur = IniFile->Head;
while (ptrCur != NULL) {
- free (ptrCur->ptrSection);
- free (ptrCur->ptrEntry);
- free (ptrCur->ptrValue);
+ FreePool (ptrCur->ptrSection);
+ FreePool (ptrCur->ptrEntry);
+ FreePool (ptrCur->ptrValue);
ptrCur = ptrCur->ptrNext;
}
while (IniFile->Head != NULL) {
ptrTmp = IniFile->Head->ptrNext;
- free (IniFile->Head);
+ FreePool (IniFile->Head);
IniFile->Head = ptrTmp;
}
IniFile->Tail = NULL;
@@ -451,13 +178,13 @@ Routine Description:
ptrCommentCur = IniFile->CommentLineHead;
while (ptrCommentCur != NULL) {
- free (ptrCommentCur->ptrComment);
+ FreePool (ptrCommentCur->ptrComment);
ptrCommentCur = ptrCommentCur->ptrNext;
}
while (IniFile->CommentLineHead != NULL) {
ptrCommentTmp = IniFile->CommentLineHead->ptrNext;
- free (IniFile->CommentLineHead);
+ FreePool (IniFile->CommentLineHead);
IniFile->CommentLineHead = ptrCommentTmp;
}
}
@@ -484,7 +211,7 @@ Routine Description:
//
// skip '\n' & '\r' at end of comment line
//
- Length = (UINT32) strlen (ptrStr);
+ Length = (UINT32) AsciiStrLen (ptrStr);
for (Index = Length; Index > 0; Index --) {
if (ptrStr[Index - 1] != '\n' && ptrStr[Index - 1] != '\r') {
break;
@@ -492,11 +219,11 @@ Routine Description:
}
ptrStr[Index] = '\0';
- ptrCommentLineNew = (COMMENTLINE *) malloc (sizeof(COMMENTLINE));
- ptrCommentLineNew->ptrComment = (CHAR8 *) calloc (strlen(ptrStr) + 1, sizeof(CHAR8));
+ ptrCommentLineNew = (COMMENTLINE *) AllocatePool (sizeof(COMMENTLINE));
+ ptrCommentLineNew->ptrComment = (CHAR8 *) AllocateZeroPool (AsciiStrLen(ptrStr) + 1);
ptrCommentLineNew->commentNo = *commentNo;
- strcpy (ptrCommentLineNew->ptrComment, ptrStr);
+ AsciiStrCpy (ptrCommentLineNew->ptrComment, ptrStr);
if (IniFile->CommentLineHead == NULL) {
IniFile->CommentLineHead = ptrCommentLineNew;
@@ -534,7 +261,7 @@ Routine Description:
//
// skip '\n' & ' ' & '\r' at end of string
//
- Length = (UINT32) strlen (tmp);
+ Length = (UINT32) AsciiStrLen (tmp);
for (Index = Length; Index > 0; Index --) {
if (tmp[Index - 1] != '\n' && tmp[Index - 1] != ' ' && tmp[Index - 1] != '\r') {
break;
@@ -542,7 +269,7 @@ Routine Description:
}
tmp[Index] = '\0';
- strcpy (ptrStr, tmp);
+ AsciiStrCpy (ptrStr, tmp);
return ptrStr;
}
@@ -590,34 +317,34 @@ Routine Description:
CHAR8 *p, *q;
INI *ptrItem;
- p = strchr (ptrStr, '[');
- q = strchr (ptrStr, ']');
+ p = AsciiStrStr (ptrStr, "[");
+ q = AsciiStrStr (ptrStr, "]");
*q = '\0' ;
_alltrim (++p);
- if (strlen (p) <= MAX_STRING_LEN) {
+ if (AsciiStrLen (p) <= MAX_STRING_LEN) {
if (*p == '\0') {
- strcpy (ptrSection, "UNKNOWN");
+ AsciiStrCpy (ptrSection, "UNKNOWN");
} else {
- strcpy (ptrSection, p);
+ AsciiStrCpy (ptrSection, p);
}
} else {
- strncpy (ptrSection, p, MAX_STRING_LEN);
+ AsciiStrnCpy (ptrSection, p, MAX_STRING_LEN);
ptrSection[MAX_STRING_LEN] = '\0';
}
- ptrItem = (INI *)malloc (sizeof(INI));
+ ptrItem = (INI *)AllocatePool (sizeof(INI));
- ptrItem->ptrSection = (CHAR8 *) calloc (strlen(ptrSection) + 1, sizeof(CHAR8));
- ptrItem->ptrEntry = (CHAR8 *) calloc (1, sizeof(CHAR8));
- ptrItem->ptrValue = (CHAR8 *) calloc (1, sizeof(CHAR8));
+ ptrItem->ptrSection = (CHAR8 *) AllocateZeroPool (AsciiStrLen(ptrSection) + 1);
+ ptrItem->ptrEntry = (CHAR8 *) AllocateZeroPool (1);
+ ptrItem->ptrValue = (CHAR8 *) AllocateZeroPool (1);
ptrItem->commentNo = *commentNo;
- strcpy (ptrItem->ptrSection, ptrSection);
- strcpy (ptrItem->ptrEntry, "");
- strcpy (ptrItem->ptrValue, "");
+ AsciiStrCpy (ptrItem->ptrSection, ptrSection);
+ AsciiStrCpy (ptrItem->ptrEntry, "");
+ AsciiStrCpy (ptrItem->ptrValue, "");
(*commentNo) ++;
@@ -639,38 +366,35 @@ Routine Description:
--*/
{
CHAR8 *p, *p2;
- UINTN Len;
- p = strchr (ptrStr, '=');
+ p = AsciiStrStr (ptrStr, "=");
*p = '\0';
_alltrim (ptrStr);
- if (strlen (ptrStr) <= MAX_STRING_LEN) {
+ if (AsciiStrLen (ptrStr) <= MAX_STRING_LEN) {
if (*ptrStr == '\0') {
- strcpy (ptrEntry, "UNKNOWN");
+ AsciiStrCpy (ptrEntry, "UNKNOWN");
} else {
- strcpy (ptrEntry, ptrStr);
+ AsciiStrCpy (ptrEntry, ptrStr);
}
} else {
- strncpy (ptrEntry, ptrStr, MAX_STRING_LEN);
+ AsciiStrnCpy (ptrEntry, ptrStr, MAX_STRING_LEN);
ptrEntry[MAX_STRING_LEN] = '\0';
}
_alltrim (++ p);
- p2 = strchr (p, '#');
+ p2 = AsciiStrStr (p, "#");
if (p2 != NULL) {
*p2 = '\0';
_alltrim (p);
}
- Len = strlen (p);
-
- if (strlen (p) <= MAX_STRING_LEN) {
- strcpy (ptrValue, p);
+ if (AsciiStrLen (p) <= MAX_STRING_LEN) {
+ AsciiStrCpy (ptrValue, p);
} else {
- strncpy (ptrValue, p, MAX_STRING_LEN);
+ AsciiStrnCpy (ptrValue, p, MAX_STRING_LEN);
ptrValue[MAX_STRING_LEN] = '\0';
}
}
@@ -695,28 +419,28 @@ Routine Description:
CHAR8 ptrValue[MAX_STRING_LEN + 1];
INI *ptrItem;
- strcpy (ptrLine, _alltrim (ptrLine));
+ AsciiStrCpy (ptrLine, _alltrim (ptrLine));
if (*ptrLine == '#') {
// it's a comment line
_getcomment (IniFile, ptrLine, commentNo);
- } else if ((*ptrLine == '[') && (strchr (ptrLine, ']') != NULL)) {
+ } else if ((*ptrLine == '[') && (AsciiStrStr (ptrLine, "]") != NULL)) {
// it's a section head
_getsection (IniFile, ptrLine, ptrSection, commentNo);
*isSectionGot = TRUE;
- } else if (strchr (ptrLine, '=') != NULL) {
+ } else if (AsciiStrStr (ptrLine, "=") != NULL) {
_getentry (ptrLine, ptrEntry, ptrValue);
if (*isSectionGot == TRUE) {
- ptrItem = (INI *)malloc (sizeof(INI));
- ptrItem->ptrSection = (CHAR8 *) calloc (strlen(ptrSection) + 1, sizeof(CHAR8));
- ptrItem->ptrEntry = (CHAR8 *) calloc (strlen(ptrEntry) + 1, sizeof(CHAR8));
- ptrItem->ptrValue = (CHAR8 *) calloc (strlen(ptrValue) + 1, sizeof(CHAR8));
+ ptrItem = (INI *)AllocatePool (sizeof(INI));
+ ptrItem->ptrSection = (CHAR8 *) AllocateZeroPool (AsciiStrLen(ptrSection) + 1);
+ ptrItem->ptrEntry = (CHAR8 *) AllocateZeroPool (AsciiStrLen(ptrEntry) + 1);
+ ptrItem->ptrValue = (CHAR8 *) AllocateZeroPool (AsciiStrLen(ptrValue) + 1);
ptrItem->commentNo = *commentNo;
- strcpy (ptrItem->ptrSection, ptrSection);
- strcpy (ptrItem->ptrEntry, ptrEntry);
- strcpy (ptrItem->ptrValue, ptrValue);
+ AsciiStrCpy (ptrItem->ptrSection, ptrSection);
+ AsciiStrCpy (ptrItem->ptrEntry, ptrEntry);
+ AsciiStrCpy (ptrItem->ptrValue, ptrValue);
(*commentNo) ++;
@@ -770,7 +494,7 @@ Routine Description:
CurOrder = 0;
ptrCur = Head;
while (ptrCur != NULL) {
- if (stricmp (Section, ptrCur->ptrSection) == 0) {
+ if (AsciiStriCmp (Section, ptrCur->ptrSection) == 0) {
if (CurOrder == Order) {
break;
}
@@ -796,18 +520,18 @@ Routine Description:
--*/
{
if (ptrItem->ptrSection != NULL) {
- free (ptrItem->ptrSection);
+ FreePool (ptrItem->ptrSection);
ptrItem->ptrSection = NULL;
}
if (ptrItem->ptrEntry != NULL) {
- free (ptrItem->ptrEntry);
+ FreePool (ptrItem->ptrEntry);
ptrItem->ptrEntry = NULL;
}
if (ptrItem->ptrValue != NULL) {
- free (ptrItem->ptrValue);
+ FreePool (ptrItem->ptrValue);
ptrItem->ptrValue = NULL;
}
- free (ptrItem);
+ FreePool (ptrItem);
}
VOID
@@ -825,8 +549,8 @@ _rmComment (
while (ptrCmtCur != NULL) {
if (ptrCmtCur->commentNo == ptrItem->commentNo) {
ptrCmtNext = ptrCmtCur->ptrNext;
- free (ptrCmtCur->ptrComment);
- free (ptrCmtCur);
+ FreePool (ptrCmtCur->ptrComment);
+ FreePool (ptrCmtCur);
if (ptrCmtPrev == NULL) {
*CmtHead = ptrCmtNext;
} else {
@@ -919,27 +643,27 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- wcscpy (String, L"");
+ StrCpy (String, L"");
- if (wcslen (Section) > MAX_STRING_LEN || wcslen(Entry) > MAX_STRING_LEN) {
+ if (StrLen (Section) > MAX_STRING_LEN || StrLen(Entry) > MAX_STRING_LEN) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpSection, ptrSection);
+ AsciiStrCpy (tmpSection, ptrSection);
_alltrim (tmpSection);
- strcpy (tmpEntry, ptrEntry);
+ AsciiStrCpy (tmpEntry, ptrEntry);
_alltrim (tmpEntry);
- if (strlen (tmpSection) == 0 || strlen (tmpEntry) == 0) {
+ if (AsciiStrLen (tmpSection) == 0 || AsciiStrLen (tmpEntry) == 0) {
return EFI_INVALID_PARAMETER;
}
@@ -956,17 +680,17 @@ Returns:
//
// the same, so find the field
//
- if ((stricmp (tmpSection, ptrCur->ptrSection) == 0) &&
- (stricmp (tmpEntry, ptrCur->ptrEntry) == 0)) {
- if (strlen (ptrCur->ptrValue) < *maxLength) {
- strcpy (ptrString, ptrCur->ptrValue);
- mbstowcs (String, ptrString, strlen(ptrString) + 1);
+ if ((AsciiStriCmp (tmpSection, ptrCur->ptrSection) == 0) &&
+ (AsciiStriCmp (tmpEntry, ptrCur->ptrEntry) == 0)) {
+ if (AsciiStrLen (ptrCur->ptrValue) < *maxLength) {
+ AsciiStrCpy (ptrString, ptrCur->ptrValue);
+ TestProfile_mbstowcs (String, ptrString, AsciiStrLen(ptrString) + 1);
return EFI_SUCCESS;
} else {
- strncpy (ptrString, ptrCur->ptrValue, *maxLength - 1);
+ AsciiStrnCpy (ptrString, ptrCur->ptrValue, *maxLength - 1);
ptrString[*maxLength-1] = '\0';
- mbstowcs (String, ptrString, strlen(ptrString) + 1);
- *maxLength = (UINT32) (strlen (ptrCur->ptrValue) + 1);
+ TestProfile_mbstowcs (String, ptrString, AsciiStrLen(ptrString) + 1);
+ *maxLength = (UINT32) (AsciiStrLen (ptrCur->ptrValue) + 1);
return EFI_BUFFER_TOO_SMALL;
}
}
@@ -1030,35 +754,35 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- if (wcslen (Section) > MAX_STRING_LEN ||
- wcslen (Entry) > MAX_STRING_LEN ||
- wcslen (String) > MAX_STRING_LEN) {
+ if (StrLen (Section) > MAX_STRING_LEN ||
+ StrLen (Entry) > MAX_STRING_LEN ||
+ StrLen (String) > MAX_STRING_LEN) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpSection, ptrSection);
+ AsciiStrCpy (tmpSection, ptrSection);
_alltrim (tmpSection);
- strcpy (tmpEntry, ptrEntry);
+ AsciiStrCpy (tmpEntry, ptrEntry);
_alltrim (tmpEntry);
- if (strlen (tmpSection) == 0 || strlen (tmpEntry) == 0) {
+ if (AsciiStrLen (tmpSection) == 0 || AsciiStrLen (tmpEntry) == 0) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrString, String, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrString, String, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpString, ptrString);
+ AsciiStrCpy (tmpString, ptrString);
_alltrim (tmpString);
//
@@ -1067,14 +791,14 @@ Returns:
ptrCur = Private->Head;
ptrPrev = NULL;
while (ptrCur != NULL) {
- if (stricmp (tmpSection, ptrCur->ptrSection) == 0) {
- if (stricmp (tmpEntry, ptrCur->ptrEntry) == 0) {
- if (stricmp (tmpString, ptrCur->ptrValue) != 0) {
- tmpPtr = strdup (tmpString);
+ if (AsciiStriCmp (tmpSection, ptrCur->ptrSection) == 0) {
+ if (AsciiStriCmp (tmpEntry, ptrCur->ptrEntry) == 0) {
+ if (AsciiStriCmp (tmpString, ptrCur->ptrValue) != 0) {
+ tmpPtr = AsciiDuplicateString (tmpString);
if (tmpPtr == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- free (ptrCur->ptrValue);
+ FreePool (ptrCur->ptrValue);
ptrCur->ptrValue = tmpPtr;
Private->Modified = TRUE;
}
@@ -1088,22 +812,21 @@ Returns:
//
// if not, should add a new item
//
- ptrNew = (INI *) malloc (sizeof(INI));
- TestProfile_memset (ptrNew, 0, sizeof(INI));
+ ptrNew = (INI *) AllocateZeroPool (sizeof(INI));
if (ptrNew == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrSection = strdup (tmpSection);
+ ptrNew->ptrSection = AsciiDuplicateString (tmpSection);
if (ptrNew->ptrSection == NULL) {
_freeItem (ptrNew);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrEntry = strdup (tmpEntry);
+ ptrNew->ptrEntry = AsciiDuplicateString (tmpEntry);
if (ptrNew->ptrEntry == NULL) {
_freeItem (ptrNew);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrValue = strdup (tmpString);
+ ptrNew->ptrValue = AsciiDuplicateString (tmpString);
if (ptrNew->ptrValue == NULL) {
_freeItem (ptrNew) ;
return EFI_OUT_OF_RESOURCES;
@@ -1128,24 +851,23 @@ Returns:
//
ptrCur = ptrNew;
- ptrNew = (INI *) malloc (sizeof(INI));
- TestProfile_memset (ptrNew, 0, sizeof(INI));
+ ptrNew = (INI *) AllocateZeroPool (sizeof(INI));
if (ptrNew == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrSection = strdup (tmpSection);
+ ptrNew->ptrSection = AsciiDuplicateString (tmpSection);
if (ptrNew->ptrSection == NULL) {
_freeItem (ptrNew);
_freeItem (ptrCur);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrEntry = strdup ("");
+ ptrNew->ptrEntry = AsciiDuplicateString ("");
if (ptrNew->ptrEntry == NULL) {
_freeItem (ptrNew);
_freeItem (ptrCur);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrValue = strdup ("");
+ ptrNew->ptrValue = AsciiDuplicateString ("");
if (ptrNew->ptrValue == NULL) {
_freeItem (ptrNew);
_freeItem (ptrCur);
@@ -1205,16 +927,16 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpSection, ptrSection);
+ AsciiStrCpy (tmpSection, ptrSection);
_alltrim (tmpSection);
ptrCur = Private->Head;
ptrPrev = NULL;
while (ptrCur != NULL) {
- if (stricmp (tmpSection, ptrCur->ptrSection) == 0) {
+ if (AsciiStriCmp (tmpSection, ptrCur->ptrSection) == 0) {
Private->Modified = TRUE;
_rmComment (&(Private->CommentLineHead), ptrCur);
ptrNext = ptrCur->ptrNext;
@@ -1296,27 +1018,27 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- wcscpy (String, L"");
+ StrCpy (String, L"");
- if (wcslen (Section) > MAX_STRING_LEN || wcslen (Entry) > MAX_STRING_LEN) {
+ if (StrLen (Section) > MAX_STRING_LEN || StrLen (Entry) > MAX_STRING_LEN) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpSection, ptrSection);
+ AsciiStrCpy (tmpSection, ptrSection);
_alltrim (tmpSection);
- strcpy (tmpEntry, ptrEntry);
+ AsciiStrCpy (tmpEntry, ptrEntry);
_alltrim (tmpEntry);
- if (strlen (tmpSection) == 0 || strlen (tmpEntry) == 0) {
+ if (AsciiStrLen (tmpSection) == 0 || AsciiStrLen (tmpEntry) == 0) {
return EFI_INVALID_PARAMETER;
}
@@ -1341,17 +1063,17 @@ Returns:
//
break;
}
- if ((stricmp (tmpSection, ptrCur->ptrSection) == 0) &&
- (stricmp (tmpEntry, ptrCur->ptrEntry) == 0)) {
- if (strlen (ptrCur->ptrValue) < *maxLength) {
- strcpy (ptrString, ptrCur->ptrValue);
- mbstowcs (String, ptrString, strlen(ptrString) + 1);
+ if ((AsciiStriCmp (tmpSection, ptrCur->ptrSection) == 0) &&
+ (AsciiStriCmp (tmpEntry, ptrCur->ptrEntry) == 0)) {
+ if (AsciiStrLen (ptrCur->ptrValue) < *maxLength) {
+ AsciiStrCpy (ptrString, ptrCur->ptrValue);
+ TestProfile_mbstowcs (String, ptrString, AsciiStrLen(ptrString) + 1);
return EFI_SUCCESS;
} else {
- strncpy (ptrString, ptrCur->ptrValue, *maxLength - 1);
+ AsciiStrnCpy (ptrString, ptrCur->ptrValue, *maxLength - 1);
ptrString[*maxLength-1] = '\0';
- mbstowcs (String, ptrString, strlen(ptrString) + 1 );
- *maxLength = (UINT32) (strlen (ptrCur->ptrValue) + 1);
+ TestProfile_mbstowcs (String, ptrString, AsciiStrLen(ptrString) + 1 );
+ *maxLength = (UINT32) (AsciiStrLen (ptrCur->ptrValue) + 1);
return EFI_BUFFER_TOO_SMALL;
}
}
@@ -1417,35 +1139,35 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- if (wcslen (Section) > MAX_STRING_LEN ||
- wcslen (Entry) > MAX_STRING_LEN ||
- wcslen (String) > MAX_STRING_LEN) {
+ if (StrLen (Section) > MAX_STRING_LEN ||
+ StrLen (Entry) > MAX_STRING_LEN ||
+ StrLen (String) > MAX_STRING_LEN) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrEntry, Entry, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpSection, ptrSection);
+ AsciiStrCpy (tmpSection, ptrSection);
_alltrim (tmpSection);
- strcpy (tmpEntry, ptrEntry);
+ AsciiStrCpy (tmpEntry, ptrEntry);
_alltrim (tmpEntry);
- if (strlen (tmpSection) == 0 || strlen (tmpEntry) == 0) {
+ if (AsciiStrLen (tmpSection) == 0 || AsciiStrLen (tmpEntry) == 0) {
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrString, String, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrString, String, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpString, ptrString);
+ AsciiStrCpy (tmpString, ptrString);
_alltrim (tmpString);
//
@@ -1463,14 +1185,14 @@ Returns:
//
break;
}
- if ((stricmp (tmpSection, ptrCur->ptrSection ) == 0) &&
- (stricmp (tmpEntry, ptrCur->ptrEntry ) == 0)) {
- if (stricmp( tmpString, ptrCur->ptrValue) != 0) {
- tmpPtr = strdup (tmpString);
+ if ((AsciiStriCmp (tmpSection, ptrCur->ptrSection ) == 0) &&
+ (AsciiStriCmp (tmpEntry, ptrCur->ptrEntry ) == 0)) {
+ if (AsciiStriCmp( tmpString, ptrCur->ptrValue) != 0) {
+ tmpPtr = AsciiDuplicateString (tmpString);
if (tmpPtr == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- free (ptrCur->ptrValue);
+ FreePool (ptrCur->ptrValue);
ptrCur->ptrValue = tmpPtr;
Private->Modified = TRUE;
}
@@ -1483,22 +1205,21 @@ Returns:
//
// if not, should add a new item
//
- ptrNew = (INI *) malloc(sizeof(INI));
- TestProfile_memset (ptrNew, 0, sizeof(INI));
+ ptrNew = (INI *) AllocateZeroPool (sizeof(INI));
if (ptrNew == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrSection = strdup (tmpSection);
+ ptrNew->ptrSection = AsciiDuplicateString (tmpSection);
if (ptrNew->ptrSection == NULL) {
_freeItem (ptrNew);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrEntry = strdup (tmpEntry);
+ ptrNew->ptrEntry = AsciiDuplicateString (tmpEntry);
if (ptrNew->ptrEntry == NULL) {
_freeItem (ptrNew);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrValue = strdup (tmpString);
+ ptrNew->ptrValue = AsciiDuplicateString (tmpString);
if (ptrNew->ptrValue == NULL) {
_freeItem (ptrNew);
return EFI_OUT_OF_RESOURCES;
@@ -1523,24 +1244,23 @@ Returns:
//
ptrCur = ptrNew;
- ptrNew = (INI *)malloc (sizeof(INI));
- TestProfile_memset (ptrNew, 0, sizeof(INI));
+ ptrNew = (INI *) AllocateZeroPool (sizeof(INI));
if (ptrNew == NULL) {
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrSection = strdup (tmpSection);
+ ptrNew->ptrSection = AsciiDuplicateString (tmpSection);
if ( ptrNew->ptrSection == NULL ) {
_freeItem (ptrNew);
_freeItem (ptrCur);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrEntry = strdup ("");
+ ptrNew->ptrEntry = AsciiDuplicateString ("");
if ( ptrNew->ptrEntry == NULL ) {
_freeItem (ptrNew);
_freeItem (ptrCur);
return EFI_OUT_OF_RESOURCES;
}
- ptrNew->ptrValue = strdup ("");
+ ptrNew->ptrValue = AsciiDuplicateString ("");
if ( ptrNew->ptrValue == NULL ) {
_freeItem (ptrNew);
_freeItem (ptrCur);
@@ -1603,10 +1323,10 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpSection, ptrSection);
+ AsciiStrCpy (tmpSection, ptrSection);
_alltrim (tmpSection);
ptrSect = _searchSection (Private->Head, Order, tmpSection);
@@ -1692,17 +1412,17 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- if (wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
+ if (TestProfile_wcstombs (ptrSection, Section, MAX_STRING_LEN + 1) == -1) {
return EFI_INVALID_PARAMETER;
}
- strcpy (tmpSection, ptrSection);
+ AsciiStrCpy (tmpSection, ptrSection);
_alltrim (tmpSection);
*OrderNum = 0;
ptrCur = Private->Head;
while (ptrCur != NULL) {
- if (stricmp (tmpSection, ptrCur->ptrSection) == 0) {
+ if (AsciiStriCmp (tmpSection, ptrCur->ptrSection) == 0) {
++ (*OrderNum);
}
@@ -1835,7 +1555,7 @@ Returns:
}
ptrCur = Private->Head ;
- strcpy (ptrCurSection, "");
+ AsciiStrCpy (ptrCurSection, "");
first = TRUE;
//
@@ -1865,10 +1585,10 @@ Returns:
if (first) {
first = FALSE;
} else {
- strcpy (Buffer, "\r\n");
- BufSize = strlen (Buffer);
+ AsciiStrCpy (Buffer, "\r\n");
+ BufSize = AsciiStrLen (Buffer);
if (Private->isUnicode) {
- mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
+ TestProfile_mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
BufSize *= 2;
Status = Handle->Write (Handle, &BufSize, Line);
} else {
@@ -1889,11 +1609,11 @@ Returns:
while (ptrCmtCur != NULL) {
if (ptrCmtCur->commentNo == ptrCur->commentNo) {
commentNo = ptrCmtCur->commentNo;
- strcpy (Buffer, ptrCmtCur->ptrComment);
- strcat (Buffer, "\r\n");
- BufSize = strlen (Buffer);
+ AsciiStrCpy (Buffer, ptrCmtCur->ptrComment);
+ AsciiStrCat (Buffer, "\r\n");
+ BufSize = AsciiStrLen (Buffer);
if (Private->isUnicode) {
- mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
+ TestProfile_mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
BufSize *= 2;
Status = Handle->Write (Handle, &BufSize, Line);
} else {
@@ -1912,13 +1632,13 @@ Returns:
//
// new section, write the section head
//
- strcpy (ptrCurSection, ptrCur->ptrSection);
- strcpy (Buffer, "[");
- strcat (Buffer, ptrCurSection);
- strcat (Buffer, "]\r\n");
- BufSize = strlen (Buffer);
+ AsciiStrCpy (ptrCurSection, ptrCur->ptrSection);
+ AsciiStrCpy (Buffer, "[");
+ AsciiStrCat (Buffer, ptrCurSection);
+ AsciiStrCat (Buffer, "]\r\n");
+ BufSize = AsciiStrLen (Buffer);
if (Private->isUnicode) {
- mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
+ TestProfile_mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
BufSize *= 2;
Status = Handle->Write (Handle, &BufSize, Line);
} else {
@@ -1933,13 +1653,13 @@ Returns:
//
// write the entry and value line
//
- strcpy (Buffer, ptrCur->ptrEntry);
- strcat (Buffer, "=");
- strcat (Buffer, ptrCur->ptrValue);
- strcat (Buffer, "\r\n");
- BufSize = strlen (Buffer);
+ AsciiStrCpy (Buffer, ptrCur->ptrEntry);
+ AsciiStrCat (Buffer, "=");
+ AsciiStrCat (Buffer, ptrCur->ptrValue);
+ AsciiStrCat (Buffer, "\r\n");
+ BufSize = AsciiStrLen (Buffer);
if (Private->isUnicode) {
- mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
+ TestProfile_mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
BufSize *= 2;
Status = Handle->Write (Handle, &BufSize, Line);
} else {
@@ -1962,11 +1682,11 @@ Returns:
commentNo ++;
while (ptrCmtCur != NULL) {
if (ptrCmtCur->commentNo >= commentNo) {
- strcpy (Buffer, ptrCmtCur->ptrComment);
- strcat (Buffer, "\r\n");
- BufSize = strlen (Buffer);
+ AsciiStrCpy (Buffer, ptrCmtCur->ptrComment);
+ AsciiStrCat (Buffer, "\r\n");
+ BufSize = AsciiStrLen (Buffer);
if (Private->isUnicode) {
- mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
+ TestProfile_mbstowcs ((CHAR16 *)Line, Buffer, BufSize + 1);
BufSize *= 2;
Status = Handle->Write (Handle, &BufSize, Line);
} else {
@@ -2041,15 +1761,15 @@ Routine Description:
IniFile->Handle.GetOrderNum = NULL;
IniFile->Handle.Flush = NULL;
if (IniFile->FileName != NULL) {
- free (IniFile->FileName);
+ FreePool (IniFile->FileName);
IniFile->FileName = NULL;
}
if (IniFile->DevPath != NULL) {
- free (IniFile->DevPath);
+ FreePool (IniFile->DevPath);
IniFile->DevPath = NULL;
}
_freePointer(IniFile);
- free (IniFile);
+ FreePool (IniFile);
}
EFI_STATUS
@@ -2104,20 +1824,20 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- if (wcslen (FileName) > MAX_STRING_LEN) {
+ if (StrLen (FileName) > MAX_STRING_LEN) {
return EFI_INVALID_PARAMETER;
}
//
// New and initialize a ini file
//
- NewIniFile = malloc (sizeof(EFI_INI_FILE_PRIVATE_DATA));
+ NewIniFile = AllocatePool (sizeof(EFI_INI_FILE_PRIVATE_DATA));
if (NewIniFile == NULL) {
return EFI_OUT_OF_RESOURCES;
}
_initFile (NewIniFile);
- NewIniFile->FileName = wcsdup (FileName);
+ NewIniFile->FileName = UnicodeDuplicateString (FileName);
if ( NewIniFile->FileName == NULL ) {
_freeIniFile (NewIniFile);
return EFI_OUT_OF_RESOURCES;
@@ -2324,20 +2044,20 @@ Returns:
return EFI_INVALID_PARAMETER;
}
- if (wcslen (FileName) > MAX_STRING_LEN) {
+ if (StrLen (FileName) > MAX_STRING_LEN) {
return EFI_INVALID_PARAMETER;
}
//
// New and initialize a ini file
//
- NewIniFile = malloc (sizeof(EFI_INI_FILE_PRIVATE_DATA));
+ NewIniFile = AllocatePool (sizeof(EFI_INI_FILE_PRIVATE_DATA));
if (NewIniFile == NULL) {
return EFI_OUT_OF_RESOURCES;
}
_initFile (NewIniFile);
- NewIniFile->FileName = wcsdup (FileName);
+ NewIniFile->FileName = UnicodeDuplicateString (FileName);
if ( NewIniFile->FileName == NULL ) {
_freeIniFile (NewIniFile);
return EFI_OUT_OF_RESOURCES;
@@ -2735,6 +2455,7 @@ Returns:
}
EFI_STATUS
+EFIAPI
TslInitUnload (
IN EFI_HANDLE ImageHandle
)
@@ -2881,4 +2602,3 @@ Returns:
return Status;
}
-
diff --git a/TestFrameworkPkg/Support/TestProfile/TestProfile.inf b/TestFrameworkPkg/Support/TestProfile/TestProfile.inf
index c8fc148..bb6c3f8 100644
--- a/TestFrameworkPkg/Support/TestProfile/TestProfile.inf
+++ b/TestFrameworkPkg/Support/TestProfile/TestProfile.inf
@@ -34,6 +34,7 @@
UefiBootServicesTableLib
BaseLib
BaseMemoryLib
+ MemoryAllocationLib
DevicePathLib
DebugLib
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [staging/edk2-test PATCH V2 6/6] TestCasePkg: Fix GCC compatibility issues
2017-02-01 9:49 [staging/edk2-test PATCH V2 0/6] Fix XCODE and GCC build issues Michael Kinney
` (4 preceding siblings ...)
2017-02-01 9:49 ` [staging/edk2-test PATCH V2 5/6] TestCasePkg: Fix XCODE " Michael Kinney
@ 2017-02-01 9:49 ` Michael Kinney
2017-02-01 19:17 ` Supreeth Venkatesh
5 siblings, 1 reply; 12+ messages in thread
From: Michael Kinney @ 2017-02-01 9:49 UTC (permalink / raw)
To: edk2-devel; +Cc: Andrew Fish, Supreeth Venkatesh
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>
---
TestCasePkg/Timer/ArchTimerBBTestConformance.c | 2 ++
TestCasePkg/Timer/ArchTimerBBTestFunction.c | 4 +++
TestCasePkg/Timer/ArchTimerBBTestMain.c | 4 ++-
TestCasePkg/Timer/Guid.h | 41 +++++++++++++-------------
4 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/TestCasePkg/Timer/ArchTimerBBTestConformance.c b/TestCasePkg/Timer/ArchTimerBBTestConformance.c
index 58c4ade..5ceda59 100644
--- a/TestCasePkg/Timer/ArchTimerBBTestConformance.c
+++ b/TestCasePkg/Timer/ArchTimerBBTestConformance.c
@@ -28,6 +28,7 @@
// TDS 3.1
//
EFI_STATUS
+EFIAPI
BBTestRegisterHandlerConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -199,6 +200,7 @@ BBTestRegisterHandlerConsistencyTest (
// TDS 3.2
//
EFI_STATUS
+EFIAPI
BBTestGetTimerPeriodConsistencyTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/TestCasePkg/Timer/ArchTimerBBTestFunction.c b/TestCasePkg/Timer/ArchTimerBBTestFunction.c
index dc76bec..9a78eec 100644
--- a/TestCasePkg/Timer/ArchTimerBBTestFunction.c
+++ b/TestCasePkg/Timer/ArchTimerBBTestFunction.c
@@ -27,6 +27,7 @@
// TDS 4.1
//
EFI_STATUS
+EFIAPI
BBTestRegisterHandlerInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -259,6 +260,7 @@ BBTestRegisterHandlerInterfaceTest (
// TDS 4.2
//
EFI_STATUS
+EFIAPI
BBTestSetTimerPeriodInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -584,6 +586,7 @@ BBTestSetTimerPeriodInterfaceTest (
// TDS 4.3
//
EFI_STATUS
+EFIAPI
BBTestGetTimerPeriodInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
@@ -728,6 +731,7 @@ BBTestGetTimerPeriodInterfaceTest (
// TDS 4.4
//
EFI_STATUS
+EFIAPI
BBTestGenerateSoftInterruptInterfaceTest (
IN EFI_BB_TEST_PROTOCOL *This,
IN VOID *ClientInterface,
diff --git a/TestCasePkg/Timer/ArchTimerBBTestMain.c b/TestCasePkg/Timer/ArchTimerBBTestMain.c
index fc36c27..f41c8a6 100644
--- a/TestCasePkg/Timer/ArchTimerBBTestMain.c
+++ b/TestCasePkg/Timer/ArchTimerBBTestMain.c
@@ -88,7 +88,9 @@ EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
EFI_TEST_CASE_AUTO | EFI_TEST_CASE_RESET_REQUIRED,
BBTestGenerateSoftInterruptInterfaceTest
},
- 0
+ {
+ ZERO_GUID
+ }
};
diff --git a/TestCasePkg/Timer/Guid.h b/TestCasePkg/Timer/Guid.h
index 47bcbc8..7b154fe 100644
--- a/TestCasePkg/Timer/Guid.h
+++ b/TestCasePkg/Timer/Guid.h
@@ -14,102 +14,101 @@
#define EFI_TEST_ARCHTIMERCONSISTENCYTEST_ASSERTION_001_GUID \
-{ 0x6c68726e, 0xa1c1, 0x450d, 0x91, 0x54, 0x0d, 0x73, 0x34, 0xa2, 0xa3, 0x62 }
+{ 0x6c68726e, 0xa1c1, 0x450d, {0x91, 0x54, 0x0d, 0x73, 0x34, 0xa2, 0xa3, 0x62 }}
extern EFI_GUID gArchTimerConsistencyTestAssertionGuid001;
#define EFI_TEST_ARCHTIMERCONSISTENCYTEST_ASSERTION_002_GUID \
-{ 0x762d3586, 0x3bad, 0x40a5, 0xa1, 0x16, 0x6f, 0x30, 0xa2, 0xb5, 0x6b, 0x2a }
+{ 0x762d3586, 0x3bad, 0x40a5, {0xa1, 0x16, 0x6f, 0x30, 0xa2, 0xb5, 0x6b, 0x2a }}
extern EFI_GUID gArchTimerConsistencyTestAssertionGuid002;
#define EFI_TEST_ARCHTIMERCONSISTENCYTEST_ASSERTION_003_GUID \
-{ 0xfb0fa1fe, 0xb026, 0x4f7f, 0xb2, 0x94, 0xeb, 0x01, 0x8a, 0x90, 0xf5, 0xfc }
+{ 0xfb0fa1fe, 0xb026, 0x4f7f, {0xb2, 0x94, 0xeb, 0x01, 0x8a, 0x90, 0xf5, 0xfc }}
extern EFI_GUID gArchTimerConsistencyTestAssertionGuid003;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_001_GUID \
-{ 0x23dedf70, 0x457c, 0x4a97, 0x8f, 0x1b, 0xb2, 0xa6, 0xdc, 0xa3, 0x03, 0x4a }
+{ 0x23dedf70, 0x457c, 0x4a97, {0x8f, 0x1b, 0xb2, 0xa6, 0xdc, 0xa3, 0x03, 0x4a }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid001;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_002_GUID \
-{ 0xa371de14, 0x690e, 0x4e7a, 0xae, 0x75, 0x5c, 0x5d, 0x6f, 0x2e, 0x1a, 0xbf }
+{ 0xa371de14, 0x690e, 0x4e7a, {0xae, 0x75, 0x5c, 0x5d, 0x6f, 0x2e, 0x1a, 0xbf }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid002;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_003_GUID \
-{ 0x0c553adc, 0xc3e7, 0x4bdb, 0xb7, 0x19, 0xe2, 0x25, 0x6f, 0x8b, 0xb7, 0x6d }
+{ 0x0c553adc, 0xc3e7, 0x4bdb, {0xb7, 0x19, 0xe2, 0x25, 0x6f, 0x8b, 0xb7, 0x6d }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid003;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_004_GUID \
-{ 0xa37674f4, 0xcac7, 0x426f, 0xbd, 0x42, 0xe6, 0xd4, 0x95, 0xec, 0xdb, 0x7d }
+{ 0xa37674f4, 0xcac7, 0x426f, {0xbd, 0x42, 0xe6, 0xd4, 0x95, 0xec, 0xdb, 0x7d }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid004;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_005_GUID \
-{ 0x204d0d9e, 0x9537, 0x4a16, 0x96, 0xea, 0x5a, 0x3d, 0xeb, 0x4b, 0xf6, 0x3e }
+{ 0x204d0d9e, 0x9537, 0x4a16, {0x96, 0xea, 0x5a, 0x3d, 0xeb, 0x4b, 0xf6, 0x3e }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid005;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_006_GUID \
-{ 0x67afcccd, 0xce79, 0x43e8, 0xab, 0x7f, 0x91, 0xcd, 0x84, 0x80, 0xae, 0xfc }
+{ 0x67afcccd, 0xce79, 0x43e8, {0xab, 0x7f, 0x91, 0xcd, 0x84, 0x80, 0xae, 0xfc }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid006;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_007_GUID \
-{ 0x793a3655, 0x1dec, 0x4bf0, 0x88, 0xea, 0xa7, 0xb6, 0xf5, 0x18, 0x0a, 0x2a }
+{ 0x793a3655, 0x1dec, 0x4bf0, {0x88, 0xea, 0xa7, 0xb6, 0xf5, 0x18, 0x0a, 0x2a }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid007;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_008_GUID \
-{ 0xab6bdf70, 0xb727, 0x4731, 0xba, 0x36, 0x78, 0x69, 0x8d, 0x18, 0xce, 0x49 }
+{ 0xab6bdf70, 0xb727, 0x4731, {0xba, 0x36, 0x78, 0x69, 0x8d, 0x18, 0xce, 0x49 }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid008;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_009_GUID \
-{ 0x3632e6d6, 0x27e2, 0x46d6, 0xaa, 0xc2, 0x97, 0xc5, 0x1e, 0x83, 0xaa, 0x5c }
+{ 0x3632e6d6, 0x27e2, 0x46d6, {0xaa, 0xc2, 0x97, 0xc5, 0x1e, 0x83, 0xaa, 0x5c }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid009;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_010_GUID \
-{ 0x49cf6051, 0x74d0, 0x4ab7, 0x9c, 0xd2, 0x30, 0xb3, 0x69, 0xfe, 0xaf, 0x76 }
+{ 0x49cf6051, 0x74d0, 0x4ab7, {0x9c, 0xd2, 0x30, 0xb3, 0x69, 0xfe, 0xaf, 0x76 }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid010;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_011_GUID \
-{ 0x8d9692d1, 0x7772, 0x44b3, 0xad, 0x42, 0xa8, 0xda, 0x7f, 0x9b, 0x66, 0xc8 }
+{ 0x8d9692d1, 0x7772, 0x44b3, {0xad, 0x42, 0xa8, 0xda, 0x7f, 0x9b, 0x66, 0xc8 }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid011;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_012_GUID \
-{ 0xb19dd34f, 0x3bae, 0x41eb, 0x92, 0xdf, 0x56, 0x9e, 0x80, 0x95, 0x21, 0x2f }
+{ 0xb19dd34f, 0x3bae, 0x41eb, {0x92, 0xdf, 0x56, 0x9e, 0x80, 0x95, 0x21, 0x2f }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid012;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_013_GUID \
-{ 0xe3bb8873, 0xcdf7, 0x4c4c, 0x96, 0x3f, 0xf6, 0xeb, 0x23, 0x2c, 0xa9, 0x05 }
+{ 0xe3bb8873, 0xcdf7, 0x4c4c, {0x96, 0x3f, 0xf6, 0xeb, 0x23, 0x2c, 0xa9, 0x05 }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid013;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_014_GUID \
-{ 0x3e2686aa, 0xaa79, 0x4f2a, 0xb8, 0xb2, 0xd4, 0x05, 0x37, 0xf2, 0x3e, 0xc0 }
+{ 0x3e2686aa, 0xaa79, 0x4f2a, {0xb8, 0xb2, 0xd4, 0x05, 0x37, 0xf2, 0x3e, 0xc0 }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid014;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_015_GUID \
-{ 0x7d0e2fa0, 0xc40b, 0x47e3, 0x96, 0x70, 0xc8, 0x69, 0xe5, 0x2c, 0x29, 0x41 }
+{ 0x7d0e2fa0, 0xc40b, 0x47e3, {0x96, 0x70, 0xc8, 0x69, 0xe5, 0x2c, 0x29, 0x41 }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid015;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_016_GUID \
-{ 0xae2aae66, 0x2510, 0x47a5, 0x83, 0x6f, 0xdc, 0xd8, 0x55, 0xff, 0x9a, 0x32 }
+{ 0xae2aae66, 0x2510, 0x47a5, {0x83, 0x6f, 0xdc, 0xd8, 0x55, 0xff, 0x9a, 0x32 }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid016;
#define EFI_TEST_ARCHTIMERINTERFACETEST_ASSERTION_017_GUID \
-{ 0xdc368011, 0x1a7f, 0x4e3a, 0x8f, 0xaf, 0x70, 0x9e, 0x71, 0x85, 0x94, 0x5d }
+{ 0xdc368011, 0x1a7f, 0x4e3a, {0x8f, 0xaf, 0x70, 0x9e, 0x71, 0x85, 0x94, 0x5d }}
extern EFI_GUID gArchTimerInterfaceTestAssertionGuid017;
-
--
2.6.3.windows.1
^ permalink raw reply related [flat|nested] 12+ messages in thread