Use REPLACE and empty path instead of BLACK action

This commit is contained in:
Lauri Kenttä
2016-05-14 20:11:17 +03:00
parent b5006f7771
commit a633eeb781
3 changed files with 3 additions and 7 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ static void ReadConfigImage(struct HackBGRT_config* config, const CHAR16* line)
} else if (StrStr(line, L"remove")) { } else if (StrStr(line, L"remove")) {
action = HackBGRT_REMOVE; action = HackBGRT_REMOVE;
} else if (StrStr(line, L"black")) { } else if (StrStr(line, L"black")) {
action = HackBGRT_BLACK; action = HackBGRT_REPLACE;
} else if (StrStr(line, L"keep")) { } else if (StrStr(line, L"keep")) {
action = HackBGRT_KEEP; action = HackBGRT_KEEP;
} else { } else {
+1 -1
View File
@@ -6,7 +6,7 @@
* Possible actions to perform on the BGRT. * Possible actions to perform on the BGRT.
*/ */
enum HackBGRT_action { enum HackBGRT_action {
HackBGRT_KEEP = 0, HackBGRT_REPLACE, HackBGRT_REMOVE, HackBGRT_BLACK HackBGRT_KEEP = 0, HackBGRT_REPLACE, HackBGRT_REMOVE
}; };
/** /**
+1 -5
View File
@@ -209,7 +209,7 @@ static BMP* LoadBMP(enum HackBGRT_action action, EFI_FILE_HANDLE root_dir, const
if (action == HackBGRT_KEEP || action == HackBGRT_REMOVE) { if (action == HackBGRT_KEEP || action == HackBGRT_REMOVE) {
return 0; return 0;
} }
if (action == HackBGRT_BLACK) { if (!path) {
BS->AllocatePool(EfiBootServicesData, 58, (void**) &bmp); BS->AllocatePool(EfiBootServicesData, 58, (void**) &bmp);
if (!bmp) { if (!bmp) {
Print(L"HackBGRT: Failed to allocate a blank BMP!\n"); Print(L"HackBGRT: Failed to allocate a blank BMP!\n");
@@ -226,10 +226,6 @@ static BMP* LoadBMP(enum HackBGRT_action action, EFI_FILE_HANDLE root_dir, const
); );
return bmp; return bmp;
} }
if (!path) {
Print(L"HackBGRT: Missing BMP path. REPORT THIS BUG!");
return 0;
}
Debug(L"HackBGRT: Loading %s.\n", path); Debug(L"HackBGRT: Loading %s.\n", path);
bmp = LoadFile(root_dir, path, 0); bmp = LoadFile(root_dir, path, 0);
if (!bmp) { if (!bmp) {