xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Use common handle and properly close GOP protocol on failures
All checks were successful
Builds / ExectOS (i686) (push) Successful in 37s
Details
Builds / ExectOS (amd64) (push) Successful in 38s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2024-03-21 06:59:05 +01:00
parent b6f915c0c5
commit eb75a27ac2
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/xtdk/bltypes.h
View File

@ -287,6 +287,7 @@ typedef struct _XTBL_FRAMEBUFFER_INFORMATION
EFI_PHYSICAL_ADDRESS FrameBufferBase; EFI_PHYSICAL_ADDRESS FrameBufferBase;
ULONG_PTR FrameBufferSize; ULONG_PTR FrameBufferSize;
UINT DefaultMode; UINT DefaultMode;
EFI_HANDLE Handle;
union union
{ {
PEFI_GRAPHICS_OUTPUT_PROTOCOL Gop; PEFI_GRAPHICS_OUTPUT_PROTOCOL Gop;

22
xtldr/modules/framebuf/framebuf.c
View File

@ -102,7 +102,6 @@ FbInitializeDisplay()
PEFI_GRAPHICS_OUTPUT_MODE_INFORMATION GopModeInfo; PEFI_GRAPHICS_OUTPUT_MODE_INFORMATION GopModeInfo;
UINT Depth, QueryMode, Refresh; UINT Depth, QueryMode, Refresh;
ULONG_PTR InfoSize; ULONG_PTR InfoSize;
EFI_HANDLE Handle;
EFI_STATUS Status; EFI_STATUS Status;
/* Check if framebuffer already initialized */ /* Check if framebuffer already initialized */
@ -112,7 +111,7 @@ FbInitializeDisplay()
XtLdrProtocol->Debug.Print(L"Initializing framebuffer device\n"); XtLdrProtocol->Debug.Print(L"Initializing framebuffer device\n");
/* Attempt to open EFI GOP protocol */ /* Attempt to open EFI GOP protocol */
Status = XtLdrProtocol->Protocol.Open(&Handle, (PVOID*)&FbpDisplayInfo.Driver.Gop, &GopGuid); Status = XtLdrProtocol->Protocol.Open(&FbpDisplayInfo.Handle, (PVOID*)&FbpDisplayInfo.Driver.Gop, &GopGuid);
/* Check if Graphics Output Protocol (GOP) is available */ /* Check if Graphics Output Protocol (GOP) is available */
if(Status == STATUS_EFI_SUCCESS) if(Status == STATUS_EFI_SUCCESS)
@ -122,6 +121,9 @@ FbInitializeDisplay()
{ {
/* No video modes available */ /* No video modes available */
XtLdrProtocol->Debug.Print(L"ERROR: No GOP video mode available\n"); XtLdrProtocol->Debug.Print(L"ERROR: No GOP video mode available\n");
/* Close GOP protocol and return error */
XtLdrProtocol->Protocol.Close(FbpDisplayInfo.Handle, &GopGuid);
return STATUS_EFI_UNSUPPORTED; return STATUS_EFI_UNSUPPORTED;
} }
@ -137,6 +139,9 @@ FbInitializeDisplay()
{ {
/* Unable to query GOP modes */ /* Unable to query GOP modes */
XtLdrProtocol->Debug.Print(L"ERROR: Failed to get GOP native mode (Status Code: 0x%zX)\n"); XtLdrProtocol->Debug.Print(L"ERROR: Failed to get GOP native mode (Status Code: 0x%zX)\n");
/* Close GOP protocol and return error */
XtLdrProtocol->Protocol.Close(FbpDisplayInfo.Handle, &GopGuid);
return STATUS_EFI_UNSUPPORTED; return STATUS_EFI_UNSUPPORTED;
} }
@ -151,6 +156,9 @@ FbInitializeDisplay()
{ {
/* Unable to get mode information */ /* Unable to get mode information */
XtLdrProtocol->Debug.Print(L"ERROR: Failed to get GOP mode information (Status Code: 0x%zX)\n"); XtLdrProtocol->Debug.Print(L"ERROR: Failed to get GOP mode information (Status Code: 0x%zX)\n");
/* Close GOP protocol and return error */
XtLdrProtocol->Protocol.Close(FbpDisplayInfo.Handle, &GopGuid);
return STATUS_EFI_UNSUPPORTED; return STATUS_EFI_UNSUPPORTED;
} }
@ -159,12 +167,12 @@ FbInitializeDisplay()
FbpDisplayInfo.FrameBufferBase, FbpDisplayInfo.FrameBufferSize); FbpDisplayInfo.FrameBufferBase, FbpDisplayInfo.FrameBufferSize);
/* Close GOP protocol */ /* Close GOP protocol */
Status = XtLdrProtocol->Protocol.Close(Handle, &GopGuid); Status = XtLdrProtocol->Protocol.Close(FbpDisplayInfo.Handle, &GopGuid);
} }
else else
{ {
/* GOP is unavailable, attempt to open UGA protocol */ /* GOP is unavailable, attempt to open UGA protocol */
Status = XtLdrProtocol->Protocol.Open(&Handle, (PVOID*)&FbpDisplayInfo.Driver.Uga, &UgaGuid); Status = XtLdrProtocol->Protocol.Open(&FbpDisplayInfo.Handle, (PVOID*)&FbpDisplayInfo.Driver.Uga, &UgaGuid);
/* Check if Universal Graphics Adapter (UGA) is available */ /* Check if Universal Graphics Adapter (UGA) is available */
if(Status == STATUS_EFI_SUCCESS) if(Status == STATUS_EFI_SUCCESS)
@ -178,7 +186,7 @@ FbInitializeDisplay()
XtLdrProtocol->Debug.Print(L"ERROR: Failed to get current UGA mode (Status Code: 0x%zX)\n", Status); XtLdrProtocol->Debug.Print(L"ERROR: Failed to get current UGA mode (Status Code: 0x%zX)\n", Status);
/* Close UGA protocol and return error */ /* Close UGA protocol and return error */
XtLdrProtocol->Protocol.Close(Handle, &UgaGuid); XtLdrProtocol->Protocol.Close(FbpDisplayInfo.Handle, &UgaGuid);
return STATUS_EFI_DEVICE_ERROR; return STATUS_EFI_DEVICE_ERROR;
} }
@ -190,7 +198,7 @@ FbInitializeDisplay()
XtLdrProtocol->Debug.Print(L"ERROR: Failed to get EFI FB address (Status Code: 0x%zX)\n", Status); XtLdrProtocol->Debug.Print(L"ERROR: Failed to get EFI FB address (Status Code: 0x%zX)\n", Status);
/* Close UGA protocol and return error */ /* Close UGA protocol and return error */
XtLdrProtocol->Protocol.Close(Handle, &UgaGuid); XtLdrProtocol->Protocol.Close(FbpDisplayInfo.Handle, &UgaGuid);
return STATUS_EFI_DEVICE_ERROR; return STATUS_EFI_DEVICE_ERROR;
} }
@ -212,7 +220,7 @@ FbInitializeDisplay()
FbpDisplayInfo.FrameBufferBase, FbpDisplayInfo.FrameBufferSize); FbpDisplayInfo.FrameBufferBase, FbpDisplayInfo.FrameBufferSize);
/* Close UGA protocol */ /* Close UGA protocol */
XtLdrProtocol->Protocol.Close(Handle, &UgaGuid); XtLdrProtocol->Protocol.Close(FbpDisplayInfo.Handle, &UgaGuid);
} }
} }