From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id D925A81FBD for ; Wed, 1 Feb 2017 09:46:43 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B7E041595; Wed, 1 Feb 2017 09:46:43 -0800 (PST) Received: from [192.168.150.241] (u201365.usa.arm.com [10.118.28.87]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5201B3F24D; Wed, 1 Feb 2017 09:46:43 -0800 (PST) Message-ID: <1485971202.3126.0.camel@arm.com> From: Supreeth Venkatesh To: Michael Kinney , edk2-devel@lists.01.org Cc: Andrew Fish Date: Wed, 01 Feb 2017 11:46:42 -0600 In-Reply-To: <1485942552-47388-3-git-send-email-michael.d.kinney@intel.com> References: <1485942552-47388-1-git-send-email-michael.d.kinney@intel.com> <1485942552-47388-3-git-send-email-michael.d.kinney@intel.com> X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Subject: Re: [staging/edk2-test PATCH V2 2/6] TestFrameworkPkg: Fix XCODE compatibility issues X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 17:46:44 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Wed, 2017-02-01 at 01:49 -0800, Michael Kinney wrote: > Cc: Michael Kinney > Cc: Supreeth Venkatesh > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Andrew Fish This looks fine to me. Tested-by: Supreeth Venkatesh Reviewed-by: Supreeth Venkatesh > --- >  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 +-- >  TestFrameworkPkg/Sct/UI/BuildMenu.c                |  6 +-- >  TestFrameworkPkg/Sct/UI/ConfigMenu.c               | 28 +++++------ >  TestFrameworkPkg/Sct/UI/FileDialog.c               |  2 +- >  TestFrameworkPkg/Sct/UI/KeyFunction.c              | 16 +++--- >  TestFrameworkPkg/Sct/UI/LogFileDialog.c            |  2 +- >  TestFrameworkPkg/Sct/UI/TestNodeMenu.c             |  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_OPTION > S_COUNT]; > -extern > UINT8                        *mUnsupportedOptions[EFTP_UNSUPPORTED_OP > TIONS_COUNT]; > +extern > CHAR8                        *mSupportedOptions[EFTP_SUPPORTED_OPTION > S_COUNT]; > +extern > CHAR8                        *mUnsupportedOptions[EFTP_UNSUPPORTED_OP > TIONS_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/TestFramework > Pkg/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_P > ATH_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/IP4NetworkMonito > r.c > b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonito > r.c > index 6988c9d..a4775a2 100644 > --- > a/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonito > r.c > +++ > b/TestFrameworkPkg/MonitorServices/IP4NetworkMonitor/IP4NetworkMonito > r.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/ManagedNetwo > rkMonitor.c > b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetwo > rkMonitor.c > index 48a840d..8d2a8c2 100644 > --- > a/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetwo > rkMonitor.c > +++ > b/TestFrameworkPkg/MonitorServices/ManagedNetworkMonitor/ManagedNetwo > rkMonitor.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 > diff --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 ; > diff --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; > diff --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