mirrors/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MSVC sample compilation

Browse Source
This commit is contained in:
Pete Batard 2023-11-08 18:28:05 +00:00
parent ac8d6944c2
commit 130ebd8f04
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/bltgrid.c
View File

@ -66,7 +66,7 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
NumPixels = (UINTN)info->VerticalResolution NumPixels = (UINTN)info->VerticalResolution
* (UINTN)info->HorizontalResolution; * (UINTN)info->HorizontalResolution;
BufferSize = NumPixels * sizeof(UINT32); BufferSize = (UINT32)(NumPixels * sizeof(UINT32));
PixelBuffer = AllocatePool(BufferSize); PixelBuffer = AllocatePool(BufferSize);
if (!PixelBuffer) { if (!PixelBuffer) {

21
apps/lfbgrid.c
View File

@ -3,7 +3,24 @@
extern EFI_GUID GraphicsOutputProtocol; extern EFI_GUID GraphicsOutputProtocol;
#ifdef _MSC_VER
#if defined(_M_X64) || defined (_M_ARM64)
#define __SIZEOF_POINTER__ 8
#elif defined(_M_IX86) || defined(_M_ARM)
#define __SIZEOF_POINTER__ 4
#else
#error "Unknown arch"
#endif
#endif
#ifdef __GNUC__
#define be32_to_cpu(x) __builtin_bswap32(x) #define be32_to_cpu(x) __builtin_bswap32(x)
#else
static inline UINT32 be32_to_cpu(const UINT32 x) {
return ((x >> 24) & 0x000000FFUL) | ((x << 24) & 0xFF000000UL) |
((x >> 8) & 0x0000FF00UL) | ((x << 8) & 0x00FF0000UL);
}
#endif
static void static void
fill_boxes(UINT32 *PixelBuffer, UINT32 Width, UINT32 Height, UINT32 Pitch, fill_boxes(UINT32 *PixelBuffer, UINT32 Width, UINT32 Height, UINT32 Pitch,
@ -90,12 +107,12 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
NumPixels = (UINTN)info->VerticalResolution NumPixels = (UINTN)info->VerticalResolution
* (UINTN)info->PixelsPerScanLine; * (UINTN)info->PixelsPerScanLine;
BufferSize = NumPixels * sizeof(UINT32); BufferSize = (UINT32)(NumPixels * sizeof(UINT32));
if (BufferSize == gop->Mode->FrameBufferSize) { if (BufferSize == gop->Mode->FrameBufferSize) {
CopySize = BufferSize; CopySize = BufferSize;
} else { } else {
CopySize = BufferSize < gop->Mode->FrameBufferSize ? CopySize = BufferSize < gop->Mode->FrameBufferSize ?
BufferSize : gop->Mode->FrameBufferSize; BufferSize : (UINT32)gop->Mode->FrameBufferSize;
Print(L"height * pitch * pixelsize = %lu buf fb size is %lu; using %lu\n", Print(L"height * pitch * pixelsize = %lu buf fb size is %lu; using %lu\n",
BufferSize, gop->Mode->FrameBufferSize, CopySize); BufferSize, gop->Mode->FrameBufferSize, CopySize);
} }

2
apps/tpause.c
View File

@ -5,5 +5,5 @@ EFI_STATUS
efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab) efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
{ {
Print(L"Press `q' to quit, any other key to continue:\n"); Print(L"Press `q' to quit, any other key to continue:\n");
return EFI_SUCCESS;
} }