Chameleon Commit Details - 8 - Chameleon open source boot loader project.

Date:

2010-01-16 04:40:53 (14 years 3 months ago)

Author:

Rekursor

Commit:

Parents:

Message:

Fixed the font bug in asere patch, latest fix from asere was not enough, see gui.c for more details

Changes:

M	/branches/rekursor/i386/boot2/gui.c
M	/branches/rekursor/i386/libsaio/fake_efi.c

File differences

-407
408 408
409 409
410
410 411
411 412
412 413
... ...
438 439
439 440
440 441
441 
442 442
443 443
444 444
+␉return uuid;␊
}␊
␊
/* Parse an UUID string into an (EFI_CHAR8*) buffer */␊
static EFI_CHAR8*  getUUIDFromString(const char *source)␊
{␊
        if (!source) return 0;␊

␉return uuid;␊
}␊
␊
/* Parse an UUID string into an (EFI_CHAR8*) buffer */␊
␊
// FIXME: can't use my original code here,␊
// Ironically, trying to reuse convertHexStr2Binary() would RESET the system!␊
 ...
 ␉return uuid;␊
 }␊
 ␊
+/* Parse an UUID string into an (EFI_CHAR8*) buffer */␊
 static EFI_CHAR8*  getUUIDFromString(const char *source)␊
 {␊
         if (!source) return 0;␊
 ␉return uuid;␊
 }␊
 ␊
-/* Parse an UUID string into an (EFI_CHAR8*) buffer */␊
 ␊
 // FIXME: can't use my original code here,␊
 // Ironically, trying to reuse convertHexStr2Binary() would RESET the system!␊

-12
13 13
14 14
15
16
15 17
16 18
17 19
... ...
106 108
107 109
108 110
111
109 112
110 
111 113
112 114
113 115
+#include "appleboot.h"␊
#include "vers.h"␊
␊
//#define EMBED_THEME␊
␊
#ifdef EMBED_THEME␊
#include "art.h"␊
#define LOADPNG(img)␉if (loadEmbeddedThemeImage(#img, __## img ##_png, __## img ##_png_len) != 0) { return 1; }␊

␉{.name = "text_scroll_prev",␉␉␉.image = NULL},␊
␉{.name = "text_scroll_next",␉␉␉.image = NULL},␊
␊
␉{.name = "font_console",␉␉␉.image = NULL},␊
␉{.name = "font_small",␉␉␉␉.image = NULL},␊
␉{.name = "font_console",␉␉␉.image = NULL},␊
};␊
␊
int imageCnt = 0;␊
 ...
 #include "appleboot.h"␊
 #include "vers.h"␊
 ␊
+//#define EMBED_THEME␊
+␊
 #ifdef EMBED_THEME␊
 #include "art.h"␊
 #define LOADPNG(img)␉if (loadEmbeddedThemeImage(#img, __## img ##_png, __## img ##_png_len) != 0) { return 1; }␊
 ␉{.name = "text_scroll_prev",␉␉␉.image = NULL},␊
 ␉{.name = "text_scroll_next",␉␉␉.image = NULL},␊
 ␊
+␉{.name = "font_console",␉␉␉.image = NULL},␊
 ␉{.name = "font_small",␉␉␉␉.image = NULL},␊
-␉{.name = "font_console",␉␉␉.image = NULL},␊
 };␊
 ␊
 int imageCnt = 0;␊