improved cbuild.bat

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-02-20 11:57:10 +03:00
parent e13c81704b
commit eb938ce184
3 changed files with 11 additions and 7 deletions

View File

@ -26,6 +26,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Disable warning when last field of data structure is a zero sized array.
//
#pragma warning ( disable : 4200 )
#pragma warning ( disable : 4804 )
#endif
/**
@ -39,7 +40,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
@param Size The expected size for the TYPE.
**/
#define VERIFY_SIZE_OF(TYPE, Size) extern UINT8 _VerifySizeof##TYPE[(sizeof(TYPE) == (Size)) / (sizeof(TYPE) == (Size))]
#define VERIFY_SIZE_OF(TYPE, Size) extern UINT8 _VerifySizeof##TYPE[(sizeof(TYPE) == (Size))?1:0 / (sizeof(TYPE) == (Size))?1:0]
//
// Verify that ProcessorBind.h produced UEFI Data Types that are compliant with

View File

@ -30,11 +30,11 @@ set DEVSTAGE=
set IASL_PREFIX=c:\ASL\
set DEFAULT_CYGWIN_HOME=c:\cygwin
rem set DEFAULT_PYTHONHOME=
rem d:\Program File\Python37"
rem set DEFAULT_PYTHON_FREEZER_PATH=%PYTHON_HOME%\Scripts
set "PYTHONHOME=d:\Program File\Python37"
set "PYTHON_FREEZER_PATH=%PYTHONHOME%\Scripts"
set DEFAULT_PYTHONHOME=d:\Program File\Python38
set DEFAULT_PYTHONPATH=d:\Program File\Python38\Lib
set DEFAULT_PYTHON_FREEZER_PATH=%PYTHON_HOME%\Scripts
rem set "PYTHONHOME=d:\Program File\Python37"
rem set "PYTHON_FREEZER_PATH=%PYTHONHOME%\Scripts"
set PYTHON3_ENABLE=TRUE
set DEFAULT_NASM_PREFIX=
rem C:\Program Files (x86)\NASM"

View File

@ -310,8 +310,11 @@ EFI_STATUS ScanDeviceHandles(EFI_HANDLE ControllerHandle,
//
Status = gBS->LocateHandleBuffer (AllHandles, NULL, NULL, HandleCount, HandleBuffer);
if (EFI_ERROR (Status)) goto Error;
#ifdef _MSC_VER
*HandleType = static_cast<UINT32*>(AllocatePool(*HandleCount * sizeof(UINT32)));
#else
*HandleType = (__typeof__(*HandleType))AllocatePool (*HandleCount * sizeof (UINT32));
#endif
if (*HandleType == NULL) goto Error;
for (HandleIndex = 0; HandleIndex < *HandleCount; HandleIndex++) {