Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[hbelusca] 70509: [BOOTVID]: CORE-10777 #comment Sync the Plan-9 font to ARM bootvid. Addendum to r70508.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 6 17:39:08 2016 New Revision: 70509 URL: http://svn.reactos.org/svn/reactos?rev=70509&view=rev Log: [BOOTVID]: CORE-10777 #comment Sync the Plan-9 font to ARM bootvid. Addendum to r70508. Modified: trunk/reactos/drivers/base/bootvid/arm/bootdata.c Modified: trunk/reactos/drivers/base/bootvid/arm/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… ============================================================================== --- trunk/reactos/drivers/base/bootvid/arm/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/arm/bootdata.c [iso-8859-1] Wed Jan 6 17:39:08 2016 @@ -50,266 +50,266 @@ // // The character generator is in natural order, top of char is first element. -// The used font is Anonymous Pro, licensed under SIL Open Font License. -// Available from http://www.marksimonson.com/fonts/view/anonymous-pro +// The used font is 8x13 from plan 9, copyright Markus Kuhn. +// Available from http://mirtchovski.com/p9/fonts/ // FontData Array generated by bootvid_font_generator. // UCHAR FontData[256 * BOOTCHAR_HEIGHT] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 13 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x08, 0x08, 0x08, 0x08, 0x08, // 26 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, // 39 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, // 52 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, // 65 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 78 - 0x00, 0x00, 0x00, 0x00, 0x18, 0x3C, 0x3C, 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, // 91 - 0x00, 0x7E, 0x7E, 0x7E, 0x66, 0x42, 0x42, 0x42, 0x66, 0x7E, 0x7E, 0x7E, 0x7E, // 104 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 0 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 13 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 26 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 39 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 52 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 65 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 78 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 91 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 104 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 117 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 130 - 0x00, 0x00, 0x0E, 0x06, 0x06, 0x0A, 0x08, 0x18, 0x24, 0x24, 0x18, 0x00, 0x00, // 143 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 156 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 143 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 156 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 169 - 0x00, 0x00, 0x06, 0x1A, 0x16, 0x1A, 0x12, 0x12, 0x16, 0x36, 0x30, 0x00, 0x00, // 182 - 0x00, 0x00, 0x2A, 0x2A, 0x14, 0x14, 0x36, 0x14, 0x14, 0x2A, 0x2A, 0x00, 0x00, // 195 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x7E, 0x08, 0x08, 0x08, 0x08, 0x08, // 208 - 0x00, 0x00, 0x02, 0x06, 0x0E, 0x1E, 0x3E, 0x1E, 0x0E, 0x06, 0x02, 0x00, 0x00, // 221 - 0x00, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x08, 0x00, 0x00, // 234 - 0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x14, 0x14, 0x00, 0x00, // 247 - 0x00, 0x1E, 0x2A, 0x2A, 0x2A, 0x1A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x00, 0x00, // 260 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 273 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x08, 0x08, 0x08, 0x08, 0x08, // 286 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x78, 0x08, 0x08, 0x08, 0x08, 0x08, // 299 - 0x00, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, // 312 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x08, // 325 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3E, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, // 338 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x3E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // 351 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 182 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 195 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 208 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 221 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 234 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 247 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 260 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 273 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 286 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 299 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 312 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 325 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 338 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 351 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 364 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 377 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 390 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 403 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 416 - 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x00, 0x00, // 429 - 0x00, 0x00, 0x14, 0x14, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 442 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x7E, 0x24, 0x24, 0x7E, 0x24, 0x00, 0x00, // 455 - 0x00, 0x08, 0x3C, 0x4A, 0x4A, 0x38, 0x0C, 0x0A, 0x4A, 0x4A, 0x3C, 0x08, 0x00, // 468 - 0x00, 0x00, 0x22, 0x54, 0x54, 0x28, 0x18, 0x14, 0x2A, 0x2A, 0x44, 0x00, 0x00, // 481 - 0x00, 0x00, 0x30, 0x48, 0x48, 0x50, 0x20, 0x52, 0x4C, 0x4C, 0x32, 0x00, 0x00, // 494 - 0x00, 0x00, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 507 - 0x00, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x08, 0x04, // 520 - 0x00, 0x20, 0x10, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, // 533 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x54, 0x38, 0x38, 0x54, 0x10, 0x00, 0x00, // 546 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x00, 0x00, // 559 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10, // 572 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 585 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, // 598 - 0x00, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, // 611 - 0x00, 0x00, 0x18, 0x24, 0x46, 0x4A, 0x52, 0x52, 0x62, 0x24, 0x18, 0x00, 0x00, // 624 - 0x00, 0x00, 0x08, 0x08, 0x18, 0x68, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00, 0x00, // 637 - 0x00, 0x00, 0x3C, 0x42, 0x42, 0x02, 0x04, 0x08, 0x10, 0x22, 0x7E, 0x00, 0x00, // 650 - 0x00, 0x00, 0x3C, 0x42, 0x02, 0x02, 0x1C, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 663 - 0x00, 0x00, 0x04, 0x0C, 0x14, 0x14, 0x24, 0x44, 0x7E, 0x04, 0x0E, 0x00, 0x00, // 676 - 0x00, 0x00, 0x7C, 0x40, 0x40, 0x7C, 0x02, 0x02, 0x42, 0x42, 0x3C, 0x00, 0x00, // 689 - 0x00, 0x00, 0x1C, 0x20, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 702 - 0x00, 0x00, 0x7E, 0x42, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, // 715 - 0x00, 0x00, 0x3C, 0x42, 0x42, 0x24, 0x18, 0x24, 0x42, 0x42, 0x3C, 0x00, 0x00, // 728 - 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x04, 0x38, 0x00, 0x00, // 741 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, // 754 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10, // 767 - 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x10, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00, // 780 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, // 793 - 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, // 806 - 0x00, 0x00, 0x1C, 0x22, 0x02, 0x04, 0x08, 0x10, 0x10, 0x00, 0x10, 0x00, 0x00, // 819 - 0x00, 0x00, 0x3C, 0x42, 0x4E, 0x52, 0x52, 0x52, 0x4E, 0x40, 0x3C, 0x00, 0x00, // 832 - 0x00, 0x00, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 845 - 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x00, 0x00, // 858 - 0x00, 0x00, 0x1A, 0x26, 0x42, 0x40, 0x40, 0x40, 0x40, 0x22, 0x1C, 0x00, 0x00, // 871 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 0x00, // 429 + 0x00, 0x00, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 442 + 0x00, 0x00, 0x00, 0x24, 0x24, 0x7E, 0x24, 0x7E, 0x24, 0x24, 0x00, 0x00, 0x00, // 455 + 0x00, 0x00, 0x10, 0x3C, 0x50, 0x50, 0x38, 0x14, 0x14, 0x78, 0x10, 0x00, 0x00, // 468 + 0x00, 0x00, 0x22, 0x52, 0x24, 0x08, 0x08, 0x10, 0x24, 0x2A, 0x44, 0x00, 0x00, // 481 + 0x00, 0x00, 0x00, 0x00, 0x30, 0x48, 0x48, 0x30, 0x4A, 0x44, 0x3A, 0x00, 0x00, // 494 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 507 + 0x00, 0x00, 0x04, 0x08, 0x08, 0x10, 0x10, 0x10, 0x08, 0x08, 0x04, 0x00, 0x00, // 520 + 0x00, 0x00, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x10, 0x10, 0x20, 0x00, 0x00, // 533 + 0x00, 0x00, 0x24, 0x18, 0x7E, 0x18, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 546 + 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 559 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x30, 0x40, 0x00, // 572 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 585 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, // 598 + 0x00, 0x00, 0x02, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, // 611 + 0x00, 0x00, 0x18, 0x24, 0x46, 0x4A, 0x52, 0x62, 0x42, 0x24, 0x18, 0x00, 0x00, // 624 + 0x00, 0x00, 0x10, 0x30, 0x50, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 637 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x02, 0x04, 0x18, 0x20, 0x40, 0x7E, 0x00, 0x00, // 650 + 0x00, 0x00, 0x7E, 0x02, 0x04, 0x08, 0x1C, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 663 + 0x00, 0x00, 0x04, 0x0C, 0x14, 0x24, 0x44, 0x44, 0x7E, 0x04, 0x04, 0x00, 0x00, // 676 + 0x00, 0x00, 0x7E, 0x40, 0x40, 0x5C, 0x62, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 689 + 0x00, 0x00, 0x1C, 0x20, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x3C, 0x00, 0x00, // 702 + 0x00, 0x00, 0x7E, 0x02, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x00, 0x00, // 715 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x3C, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 728 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x02, 0x04, 0x38, 0x00, 0x00, // 741 + 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, // 754 + 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, 0x00, 0x38, 0x30, 0x40, 0x00, // 767 + 0x00, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x00, // 780 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, // 793 + 0x00, 0x00, 0x40, 0x20, 0x10, 0x08, 0x04, 0x08, 0x10, 0x20, 0x40, 0x00, 0x00, // 806 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x02, 0x04, 0x08, 0x08, 0x00, 0x08, 0x00, 0x00, // 819 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x4E, 0x52, 0x56, 0x4A, 0x40, 0x3C, 0x00, 0x00, // 832 + 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x42, 0x00, 0x00, // 845 + 0x00, 0x00, 0x78, 0x44, 0x42, 0x44, 0x78, 0x44, 0x42, 0x44, 0x78, 0x00, 0x00, // 858 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x40, 0x40, 0x40, 0x42, 0x3C, 0x00, 0x00, // 871 0x00, 0x00, 0x78, 0x44, 0x42, 0x42, 0x42, 0x42, 0x42, 0x44, 0x78, 0x00, 0x00, // 884 - 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 897 - 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, // 910 - 0x00, 0x00, 0x1A, 0x26, 0x42, 0x40, 0x4E, 0x42, 0x42, 0x22, 0x1C, 0x00, 0x00, // 923 + 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 897 + 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, // 910 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x40, 0x4E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 923 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 936 - 0x00, 0x00, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 949 - 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x44, 0x38, 0x00, 0x00, // 962 - 0x00, 0x00, 0x42, 0x44, 0x48, 0x50, 0x70, 0x48, 0x48, 0x44, 0x42, 0x00, 0x00, // 975 + 0x00, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 949 + 0x00, 0x00, 0x1F, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x44, 0x38, 0x00, 0x00, // 962 + 0x00, 0x00, 0x42, 0x44, 0x48, 0x50, 0x60, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, // 975 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 988 - 0x00, 0x00, 0x42, 0x66, 0x66, 0x5A, 0x5A, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 1001 - 0x00, 0x00, 0x62, 0x62, 0x52, 0x52, 0x4A, 0x4A, 0x46, 0x46, 0x42, 0x00, 0x00, // 1014 - 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 1027 + 0x00, 0x00, 0x82, 0x82, 0xC6, 0xAA, 0x92, 0x92, 0x82, 0x82, 0x82, 0x00, 0x00, // 1001 + 0x00, 0x00, 0x42, 0x42, 0x62, 0x52, 0x4A, 0x46, 0x42, 0x42, 0x42, 0x00, 0x00, // 1014 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 1027 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, // 1040 - 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x08, 0x06, // 1053 - 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x48, 0x44, 0x44, 0x42, 0x00, 0x00, // 1066 - 0x00, 0x00, 0x3A, 0x46, 0x42, 0x30, 0x0C, 0x02, 0x42, 0x62, 0x5C, 0x00, 0x00, // 1079 - 0x00, 0x00, 0x7F, 0x49, 0x49, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1092 - 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x3C, 0x00, 0x00, // 1105 - 0x00, 0x00, 0x41, 0x41, 0x22, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x00, 0x00, // 1118 - 0x00, 0x00, 0x41, 0x41, 0x41, 0x2A, 0x2A, 0x2A, 0x14, 0x14, 0x14, 0x00, 0x00, // 1131 - 0x00, 0x00, 0x66, 0x24, 0x24, 0x18, 0x18, 0x18, 0x24, 0x24, 0x66, 0x00, 0x00, // 1144 - 0x00, 0x00, 0x63, 0x22, 0x14, 0x14, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1157 - 0x00, 0x00, 0x7E, 0x44, 0x44, 0x08, 0x10, 0x10, 0x22, 0x42, 0x7E, 0x00, 0x00, // 1170 - 0x00, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x18, // 1183 - 0x00, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, // 1196 - 0x00, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, // 1209 - 0x00, 0x00, 0x00, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1222 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, // 1235 - 0x00, 0x20, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1248 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x42, 0x52, 0x4A, 0x3C, 0x02, 0x00, // 1053 + 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, // 1066 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x3C, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 1079 + 0x00, 0x00, 0xFE, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 1092 + 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 1105 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x44, 0x44, 0x28, 0x28, 0x28, 0x10, 0x00, 0x00, // 1118 + 0x00, 0x00, 0x82, 0x82, 0x82, 0x82, 0x92, 0x92, 0x92, 0xAA, 0x44, 0x00, 0x00, // 1131 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x28, 0x10, 0x28, 0x44, 0x82, 0x82, 0x00, 0x00, // 1144 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 1157 + 0x00, 0x00, 0x7E, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x40, 0x7E, 0x00, 0x00, // 1170 + 0x00, 0x00, 0x3C, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3C, 0x00, 0x00, // 1183 + 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02, 0x00, 0x00, // 1196 + 0x00, 0x00, 0x78, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x78, 0x00, 0x00, // 1209 + 0x00, 0x00, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1222 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, // 1235 + 0x00, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1248 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1261 0x00, 0x00, 0x40, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x00, 0x00, // 1274 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x00, 0x00, // 1287 - 0x00, 0x00, 0x06, 0x02, 0x02, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1300 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x00, 0x00, // 1287 + 0x00, 0x00, 0x02, 0x02, 0x02, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1300 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 1313 - 0x00, 0x00, 0x06, 0x08, 0x08, 0x1E, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1326 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x42, 0x3C, // 1339 + 0x00, 0x00, 0x1C, 0x22, 0x20, 0x20, 0x7C, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, // 1326 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x44, 0x44, 0x38, 0x40, 0x3C, 0x42, 0x3C, // 1339 0x00, 0x00, 0x40, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 1352 - 0x00, 0x00, 0x00, 0x08, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1365 - 0x00, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x04, 0x04, 0x04, 0x04, 0x04, 0x44, 0x38, // 1378 - 0x00, 0x00, 0x40, 0x40, 0x40, 0x44, 0x48, 0x50, 0x68, 0x44, 0x42, 0x00, 0x00, // 1391 - 0x00, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1404 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x6A, 0x4A, 0x4A, 0x4A, 0x4A, 0x00, 0x00, // 1417 + 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 1365 + 0x00, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x04, 0x04, 0x04, 0x04, 0x44, 0x44, 0x38, // 1378 + 0x00, 0x00, 0x40, 0x40, 0x40, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42, 0x00, 0x00, // 1391 + 0x00, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1C, 0x00, 0x00, // 1404 + 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, 0x92, 0x92, 0x92, 0x92, 0x82, 0x00, 0x00, // 1417 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 1430 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 1443 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x40, 0x40, // 1456 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x02, // 1469 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0x30, 0x20, 0x20, 0x20, 0x70, 0x00, 0x00, // 1482 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x62, 0x42, 0x62, 0x5C, 0x40, 0x40, 0x40, // 1456 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x46, 0x42, 0x46, 0x3A, 0x02, 0x02, 0x02, // 1469 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x22, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, // 1482 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x30, 0x0C, 0x42, 0x3C, 0x00, 0x00, // 1495 - 0x00, 0x00, 0x20, 0x20, 0x20, 0x7C, 0x20, 0x20, 0x20, 0x22, 0x1C, 0x00, 0x00, // 1508 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1521 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x22, 0x22, 0x14, 0x08, 0x08, 0x00, 0x00, // 1534 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0x5A, 0x5A, 0x3C, 0x24, 0x24, 0x00, 0x00, // 1547 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x24, 0x18, 0x18, 0x24, 0x66, 0x00, 0x00, // 1560 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x30, // 1573 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x44, 0x08, 0x10, 0x22, 0x7E, 0x00, 0x00, // 1586 - 0x00, 0x0C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x20, 0x10, 0x10, 0x10, 0x10, 0x0C, // 1599 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 1612 - 0x00, 0x30, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x08, 0x08, 0x08, 0x08, 0x30, // 1625 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x5A, 0x4C, 0x00, 0x00, 0x00, 0x00, // 1638 - 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, // 1651 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1664 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1677 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1690 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1703 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1716 + 0x00, 0x00, 0x00, 0x20, 0x20, 0x7C, 0x20, 0x20, 0x20, 0x22, 0x1C, 0x00, 0x00, // 1508 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 1521 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x28, 0x28, 0x10, 0x00, 0x00, // 1534 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92, 0x92, 0xAA, 0x44, 0x00, 0x00, // 1547 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, // 1560 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x42, 0x3C, // 1573 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x04, 0x08, 0x10, 0x20, 0x7E, 0x00, 0x00, // 1586 + 0x00, 0x00, 0x0E, 0x10, 0x10, 0x08, 0x30, 0x08, 0x10, 0x10, 0x0E, 0x00, 0x00, // 1599 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 1612 + 0x00, 0x00, 0x70, 0x08, 0x08, 0x10, 0x0C, 0x10, 0x08, 0x08, 0x70, 0x00, 0x00, // 1625 + 0x00, 0x00, 0x24, 0x54, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1638 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1651 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1664 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1677 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1690 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1703 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1716 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1729 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1742 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1755 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1768 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1781 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1794 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1807 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1820 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1833 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1846 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1859 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1872 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1885 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1898 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1911 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1924 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1937 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1950 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1963 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1976 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1989 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2002 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2015 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2028 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2041 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2054 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2067 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1742 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1755 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1768 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1781 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1794 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1807 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1820 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1833 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1846 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1859 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1872 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1885 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1898 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1911 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1924 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1937 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1950 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1963 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1976 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1989 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2002 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2015 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2028 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2041 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2054 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2067 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2080 - 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, // 2093 - 0x00, 0x00, 0x08, 0x08, 0x3C, 0x4A, 0x48, 0x48, 0x4A, 0x3C, 0x08, 0x00, 0x00, // 2106 - 0x00, 0x00, 0x18, 0x24, 0x20, 0x20, 0x78, 0x20, 0x20, 0x22, 0x7C, 0x00, 0x00, // 2119 - 0x00, 0x00, 0x00, 0x00, 0x5A, 0x24, 0x42, 0x42, 0x24, 0x5A, 0x00, 0x00, 0x00, // 2132 - 0x00, 0x00, 0x63, 0x22, 0x14, 0x3E, 0x08, 0x3E, 0x08, 0x08, 0x08, 0x00, 0x00, // 2145 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 2158 - 0x3C, 0x42, 0x40, 0x30, 0x4C, 0x42, 0x32, 0x0C, 0x02, 0x42, 0x42, 0x3C, 0x00, // 2171 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2184 - 0x00, 0x00, 0x1C, 0x22, 0x4D, 0x51, 0x51, 0x4D, 0x22, 0x1C, 0x00, 0x00, 0x00, // 2197 - 0x00, 0x00, 0x1C, 0x02, 0x1E, 0x22, 0x1E, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, // 2210 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x24, 0x12, 0x00, 0x00, 0x00, // 2223 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x02, 0x02, 0x02, 0x00, 0x00, // 2236 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 2249 - 0x00, 0x1C, 0x22, 0x5D, 0x55, 0x59, 0x55, 0x22, 0x1C, 0x00, 0x00, 0x00, 0x00, // 2262 - 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2275 - 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2288 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x7C, 0x00, // 2301 - 0x00, 0x00, 0x60, 0x10, 0x20, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2314 - 0x00, 0x00, 0x60, 0x10, 0x60, 0x10, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2327 - 0x00, 0x04, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2340 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x7A, 0x40, 0x40, // 2353 - 0x00, 0x00, 0x3E, 0x4A, 0x4A, 0x4A, 0x3E, 0x0A, 0x0A, 0x0A, 0x0A, 0x00, 0x00, // 2366 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, // 2379 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x30, // 2392 - 0x00, 0x00, 0x20, 0x60, 0x20, 0x20, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2405 - 0x00, 0x00, 0x1C, 0x22, 0x22, 0x22, 0x1C, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, // 2418 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x12, 0x12, 0x24, 0x00, 0x00, 0x00, // 2431 - 0x00, 0x00, 0x42, 0x44, 0x44, 0x48, 0x18, 0x12, 0x26, 0x2E, 0x42, 0x00, 0x00, // 2444 - 0x00, 0x00, 0x42, 0x44, 0x44, 0x48, 0x18, 0x16, 0x22, 0x24, 0x46, 0x00, 0x00, // 2457 - 0x00, 0x00, 0x42, 0x24, 0x44, 0x28, 0x58, 0x12, 0x26, 0x2E, 0x42, 0x00, 0x00, // 2470 - 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x08, 0x10, 0x20, 0x22, 0x1C, 0x00, 0x00, // 2483 - 0x20, 0x10, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2496 - 0x04, 0x08, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2509 - 0x08, 0x14, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2522 - 0x1A, 0x2C, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2535 - 0x22, 0x00, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2548 - 0x08, 0x14, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2561 - 0x00, 0x00, 0x1E, 0x18, 0x18, 0x28, 0x2E, 0x28, 0x38, 0x48, 0x4E, 0x00, 0x00, // 2574 - 0x00, 0x00, 0x1A, 0x26, 0x42, 0x40, 0x40, 0x40, 0x40, 0x22, 0x1C, 0x08, 0x30, // 2587 - 0x10, 0x08, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2600 - 0x08, 0x10, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2613 - 0x08, 0x14, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2626 - 0x24, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2639 - 0x10, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2652 - 0x04, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2665 - 0x08, 0x14, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2678 - 0x14, 0x00, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2691 - 0x00, 0x00, 0x78, 0x44, 0x42, 0x42, 0xF2, 0x42, 0x42, 0x44, 0x78, 0x00, 0x00, // 2704 - 0x1A, 0x2C, 0x62, 0x62, 0x52, 0x52, 0x4A, 0x4A, 0x46, 0x46, 0x42, 0x00, 0x00, // 2717 - 0x10, 0x08, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2730 - 0x08, 0x10, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2743 - 0x10, 0x28, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2756 - 0x1A, 0x2C, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2769 - 0x24, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2782 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, // 2795 - 0x00, 0x00, 0x1A, 0x26, 0x46, 0x4A, 0x5A, 0x52, 0x62, 0x64, 0x58, 0x00, 0x00, // 2808 - 0x10, 0x08, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2821 - 0x08, 0x10, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2834 - 0x10, 0x28, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2847 - 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2860 - 0x04, 0x08, 0x63, 0x22, 0x14, 0x14, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2873 - 0x00, 0x00, 0x40, 0x40, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x00, 0x00, // 2886 - 0x00, 0x00, 0x38, 0x44, 0x44, 0x48, 0x48, 0x44, 0x42, 0x52, 0x4C, 0x00, 0x00, // 2899 + 0x00, 0x00, 0x10, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 2093 + 0x00, 0x00, 0x10, 0x38, 0x54, 0x50, 0x50, 0x54, 0x38, 0x10, 0x00, 0x00, 0x00, // 2106 + 0x00, 0x00, 0x1C, 0x22, 0x20, 0x70, 0x20, 0x20, 0x20, 0x62, 0xDC, 0x00, 0x00, // 2119 + 0x00, 0x00, 0x00, 0x00, 0x42, 0x3C, 0x24, 0x24, 0x3C, 0x42, 0x00, 0x00, 0x00, // 2132 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x28, 0x7C, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x00, // 2145 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 2158 + 0x00, 0x18, 0x24, 0x20, 0x18, 0x24, 0x24, 0x18, 0x04, 0x24, 0x18, 0x00, 0x00, // 2171 + 0x00, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2184 + 0x00, 0x38, 0x44, 0x92, 0xAA, 0xA2, 0xAA, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, // 2197 + 0x00, 0x00, 0x38, 0x04, 0x3C, 0x44, 0x3C, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, // 2210 + 0x00, 0x00, 0x00, 0x12, 0x24, 0x48, 0x90, 0x48, 0x24, 0x12, 0x00, 0x00, 0x00, // 2223 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, // 2236 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2249 + 0x00, 0x38, 0x44, 0x92, 0xAA, 0xAA, 0xB2, 0xAA, 0x44, 0x38, 0x00, 0x00, 0x00, // 2262 + 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2275 + 0x00, 0x00, 0x18, 0x24, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2288 + 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x7C, 0x00, 0x00, 0x00, // 2301 + 0x00, 0x30, 0x48, 0x08, 0x30, 0x40, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2314 + 0x00, 0x30, 0x48, 0x10, 0x08, 0x48, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2327 + 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2340 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x66, 0x5A, 0x40, 0x00, // 2353 + 0x00, 0x00, 0x3E, 0x74, 0x74, 0x74, 0x34, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00, // 2366 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2379 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, // 2392 + 0x00, 0x20, 0x60, 0x20, 0x20, 0x20, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2405 + 0x00, 0x00, 0x30, 0x48, 0x48, 0x30, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, // 2418 + 0x00, 0x00, 0x00, 0x90, 0x48, 0x24, 0x12, 0x24, 0x48, 0x90, 0x00, 0x00, 0x00, // 2431 + 0x00, 0x40, 0xC0, 0x40, 0x40, 0x42, 0xE6, 0x0A, 0x12, 0x1A, 0x06, 0x00, 0x00, // 2444 + 0x00, 0x40, 0xC0, 0x40, 0x40, 0x4C, 0xF2, 0x02, 0x0C, 0x10, 0x1E, 0x00, 0x00, // 2457 + 0x00, 0x60, 0x90, 0x20, 0x10, 0x92, 0x66, 0x0A, 0x12, 0x1A, 0x06, 0x00, 0x00, // 2470 + 0x00, 0x00, 0x10, 0x00, 0x10, 0x10, 0x20, 0x40, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2483 + 0x00, 0x10, 0x08, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2496 + 0x00, 0x08, 0x10, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2509 + 0x00, 0x18, 0x24, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2522 + 0x00, 0x32, 0x4C, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2535 + 0x00, 0x24, 0x24, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2548 + 0x00, 0x18, 0x24, 0x18, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2561 + 0x00, 0x00, 0x6E, 0x90, 0x90, 0x90, 0x9C, 0xF0, 0x90, 0x90, 0x9E, 0x00, 0x00, // 2574 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x40, 0x40, 0x40, 0x42, 0x3C, 0x08, 0x10, // 2587 + 0x00, 0x10, 0x08, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2600 + 0x00, 0x08, 0x10, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2613 + 0x00, 0x18, 0x24, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2626 + 0x00, 0x24, 0x24, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2639 + 0x00, 0x20, 0x10, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2652 + 0x00, 0x08, 0x10, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2665 + 0x00, 0x18, 0x24, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2678 + 0x00, 0x44, 0x44, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2691 + 0x00, 0x00, 0x78, 0x44, 0x42, 0x42, 0xE2, 0x42, 0x42, 0x44, 0x78, 0x00, 0x00, // 2704 + 0x00, 0x64, 0x98, 0x00, 0x82, 0xC2, 0xA2, 0x92, 0x8A, 0x86, 0x82, 0x00, 0x00, // 2717 + 0x00, 0x20, 0x10, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2730 + 0x00, 0x08, 0x10, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2743 + 0x00, 0x18, 0x24, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2756 + 0x00, 0x64, 0x98, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2769 + 0x00, 0x44, 0x44, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2782 + 0x00, 0x00, 0x00, 0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, 0x00, // 2795 + 0x00, 0x02, 0x3C, 0x46, 0x4A, 0x4A, 0x52, 0x52, 0x52, 0x62, 0x3C, 0x40, 0x00, // 2808 + 0x00, 0x20, 0x10, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2821 + 0x00, 0x08, 0x10, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2834 + 0x00, 0x18, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2847 + 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2860 + 0x00, 0x08, 0x10, 0x00, 0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 2873 + 0x00, 0x00, 0x40, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x40, 0x00, 0x00, // 2886 + 0x00, 0x00, 0x38, 0x44, 0x44, 0x48, 0x50, 0x4C, 0x42, 0x42, 0x5C, 0x00, 0x00, // 2899 0x00, 0x00, 0x10, 0x08, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2912 - 0x00, 0x00, 0x08, 0x10, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2925 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2938 - 0x00, 0x00, 0x1A, 0x2C, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2951 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2964 - 0x00, 0x08, 0x14, 0x08, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2977 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x4A, 0x3E, 0x48, 0x5A, 0x2C, 0x00, 0x00, // 2990 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x08, 0x30, // 3003 + 0x00, 0x00, 0x04, 0x08, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2925 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2938 + 0x00, 0x00, 0x32, 0x4C, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2951 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2964 + 0x00, 0x18, 0x24, 0x18, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2977 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x12, 0x7C, 0x90, 0x92, 0x6C, 0x00, 0x00, // 2990 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x08, 0x10, // 3003 0x00, 0x00, 0x10, 0x08, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3016 0x00, 0x00, 0x08, 0x10, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3029 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3042 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3055 - 0x00, 0x00, 0x10, 0x08, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3068 - 0x00, 0x00, 0x04, 0x08, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3081 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3094 - 0x00, 0x00, 0x00, 0x14, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3107 - 0x00, 0x00, 0x32, 0x0C, 0x12, 0x02, 0x1E, 0x22, 0x42, 0x44, 0x38, 0x00, 0x00, // 3120 - 0x00, 0x00, 0x1A, 0x2C, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 3133 - 0x00, 0x00, 0x10, 0x08, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3146 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3042 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3055 + 0x00, 0x00, 0x20, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3068 + 0x00, 0x00, 0x10, 0x20, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3081 + 0x00, 0x00, 0x30, 0x48, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3094 + 0x00, 0x00, 0x48, 0x48, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3107 + 0x00, 0x24, 0x18, 0x28, 0x04, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3120 + 0x00, 0x00, 0x32, 0x4C, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 3133 + 0x00, 0x00, 0x20, 0x10, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3146 0x00, 0x00, 0x08, 0x10, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3159 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3172 - 0x00, 0x00, 0x1A, 0x2C, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3185 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3198 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x7C, 0x00, 0x10, 0x00, 0x00, 0x00, // 3211 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x46, 0x4A, 0x52, 0x66, 0x7C, 0x00, 0x00, // 3224 - 0x00, 0x00, 0x10, 0x08, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3237 - 0x00, 0x00, 0x08, 0x10, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3250 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3263 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3276 - 0x00, 0x04, 0x08, 0x10, 0x00, 0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x30, // 3289 - 0x00, 0x00, 0x40, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x40, 0x40, // 3302 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x30 // 3315 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3172 + 0x00, 0x00, 0x32, 0x4C, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3185 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3198 + 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x7C, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, // 3211 + 0x00, 0x00, 0x00, 0x00, 0x02, 0x3C, 0x46, 0x4A, 0x52, 0x62, 0x3C, 0x40, 0x00, // 3224 + 0x00, 0x00, 0x20, 0x10, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3237 + 0x00, 0x00, 0x08, 0x10, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3250 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3263 + 0x00, 0x00, 0x28, 0x28, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3276 + 0x00, 0x00, 0x08, 0x10, 0x00, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x42, 0x3C, // 3289 + 0x00, 0x00, 0x00, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x40, 0x40, // 3302 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x42, 0x3C, // 3315 };

8 years, 8 months

[akhaldi] 70508: [BOOTVID] Use plan 9 8x13 font from Markus Kuhn. Patch by Roy Tam. CORE-10777

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 6 15:43:24 2016 New Revision: 70508 URL: http://svn.reactos.org/svn/reactos?rev=70508&view=rev Log: [BOOTVID] Use plan 9 8x13 font from Markus Kuhn. Patch by Roy Tam. CORE-10777 Modified: trunk/reactos/drivers/base/bootvid/i386/bootdata.c Modified: trunk/reactos/drivers/base/bootvid/i386/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootdata.c [iso-8859-1] Wed Jan 6 15:43:24 2016 @@ -50,266 +50,266 @@ // // The character generator is in natural order, top of char is first element. -// The used font is Anonymous Pro, licensed under SIL Open Font License. -// Available from http://www.marksimonson.com/fonts/view/anonymous-pro +// The used font is 8x13 from plan 9, copyright Markus Kuhn. +// Available from http://mirtchovski.com/p9/fonts/ // FontData Array generated by bootvid_font_generator. // UCHAR FontData[256 * BOOTCHAR_HEIGHT] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 13 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x08, 0x08, 0x08, 0x08, 0x08, // 26 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, // 39 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, // 52 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, // 65 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 78 - 0x00, 0x00, 0x00, 0x00, 0x18, 0x3C, 0x3C, 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, // 91 - 0x00, 0x7E, 0x7E, 0x7E, 0x66, 0x42, 0x42, 0x42, 0x66, 0x7E, 0x7E, 0x7E, 0x7E, // 104 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 0 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 13 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 26 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 39 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 52 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 65 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 78 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 91 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 104 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 117 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 130 - 0x00, 0x00, 0x0E, 0x06, 0x06, 0x0A, 0x08, 0x18, 0x24, 0x24, 0x18, 0x00, 0x00, // 143 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 156 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 143 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 156 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 169 - 0x00, 0x00, 0x06, 0x1A, 0x16, 0x1A, 0x12, 0x12, 0x16, 0x36, 0x30, 0x00, 0x00, // 182 - 0x00, 0x00, 0x2A, 0x2A, 0x14, 0x14, 0x36, 0x14, 0x14, 0x2A, 0x2A, 0x00, 0x00, // 195 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x7E, 0x08, 0x08, 0x08, 0x08, 0x08, // 208 - 0x00, 0x00, 0x02, 0x06, 0x0E, 0x1E, 0x3E, 0x1E, 0x0E, 0x06, 0x02, 0x00, 0x00, // 221 - 0x00, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x08, 0x00, 0x00, // 234 - 0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x14, 0x14, 0x00, 0x00, // 247 - 0x00, 0x1E, 0x2A, 0x2A, 0x2A, 0x1A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x00, 0x00, // 260 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 273 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x08, 0x08, 0x08, 0x08, 0x08, // 286 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x78, 0x08, 0x08, 0x08, 0x08, 0x08, // 299 - 0x00, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, // 312 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x08, 0x08, 0x08, 0x08, 0x08, // 325 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3E, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, // 338 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x3E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, // 351 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 182 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 195 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 208 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 221 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 234 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 247 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 260 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 273 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 286 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 299 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 312 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 325 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 338 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 351 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 364 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 377 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 390 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 403 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 416 - 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x00, 0x00, // 429 - 0x00, 0x00, 0x14, 0x14, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 442 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x7E, 0x24, 0x24, 0x7E, 0x24, 0x00, 0x00, // 455 - 0x00, 0x08, 0x3C, 0x4A, 0x4A, 0x38, 0x0C, 0x0A, 0x4A, 0x4A, 0x3C, 0x08, 0x00, // 468 - 0x00, 0x00, 0x22, 0x54, 0x54, 0x28, 0x18, 0x14, 0x2A, 0x2A, 0x44, 0x00, 0x00, // 481 - 0x00, 0x00, 0x30, 0x48, 0x48, 0x50, 0x20, 0x52, 0x4C, 0x4C, 0x32, 0x00, 0x00, // 494 - 0x00, 0x00, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 507 - 0x00, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x08, 0x04, // 520 - 0x00, 0x20, 0x10, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, // 533 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x54, 0x38, 0x38, 0x54, 0x10, 0x00, 0x00, // 546 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x00, 0x00, // 559 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10, // 572 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 585 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, // 598 - 0x00, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, // 611 - 0x00, 0x00, 0x18, 0x24, 0x46, 0x4A, 0x52, 0x52, 0x62, 0x24, 0x18, 0x00, 0x00, // 624 - 0x00, 0x00, 0x08, 0x08, 0x18, 0x68, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00, 0x00, // 637 - 0x00, 0x00, 0x3C, 0x42, 0x42, 0x02, 0x04, 0x08, 0x10, 0x22, 0x7E, 0x00, 0x00, // 650 - 0x00, 0x00, 0x3C, 0x42, 0x02, 0x02, 0x1C, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 663 - 0x00, 0x00, 0x04, 0x0C, 0x14, 0x14, 0x24, 0x44, 0x7E, 0x04, 0x0E, 0x00, 0x00, // 676 - 0x00, 0x00, 0x7C, 0x40, 0x40, 0x7C, 0x02, 0x02, 0x42, 0x42, 0x3C, 0x00, 0x00, // 689 - 0x00, 0x00, 0x1C, 0x20, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 702 - 0x00, 0x00, 0x7E, 0x42, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, // 715 - 0x00, 0x00, 0x3C, 0x42, 0x42, 0x24, 0x18, 0x24, 0x42, 0x42, 0x3C, 0x00, 0x00, // 728 - 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x04, 0x38, 0x00, 0x00, // 741 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, // 754 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10, // 767 - 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x10, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00, // 780 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, // 793 - 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, // 806 - 0x00, 0x00, 0x1C, 0x22, 0x02, 0x04, 0x08, 0x10, 0x10, 0x00, 0x10, 0x00, 0x00, // 819 - 0x00, 0x00, 0x3C, 0x42, 0x4E, 0x52, 0x52, 0x52, 0x4E, 0x40, 0x3C, 0x00, 0x00, // 832 - 0x00, 0x00, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 845 - 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x00, 0x00, // 858 - 0x00, 0x00, 0x1A, 0x26, 0x42, 0x40, 0x40, 0x40, 0x40, 0x22, 0x1C, 0x00, 0x00, // 871 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x00, 0x00, // 429 + 0x00, 0x00, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 442 + 0x00, 0x00, 0x00, 0x24, 0x24, 0x7E, 0x24, 0x7E, 0x24, 0x24, 0x00, 0x00, 0x00, // 455 + 0x00, 0x00, 0x10, 0x3C, 0x50, 0x50, 0x38, 0x14, 0x14, 0x78, 0x10, 0x00, 0x00, // 468 + 0x00, 0x00, 0x22, 0x52, 0x24, 0x08, 0x08, 0x10, 0x24, 0x2A, 0x44, 0x00, 0x00, // 481 + 0x00, 0x00, 0x00, 0x00, 0x30, 0x48, 0x48, 0x30, 0x4A, 0x44, 0x3A, 0x00, 0x00, // 494 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 507 + 0x00, 0x00, 0x04, 0x08, 0x08, 0x10, 0x10, 0x10, 0x08, 0x08, 0x04, 0x00, 0x00, // 520 + 0x00, 0x00, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x10, 0x10, 0x20, 0x00, 0x00, // 533 + 0x00, 0x00, 0x24, 0x18, 0x7E, 0x18, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 546 + 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 559 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x30, 0x40, 0x00, // 572 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 585 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, // 598 + 0x00, 0x00, 0x02, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, // 611 + 0x00, 0x00, 0x18, 0x24, 0x46, 0x4A, 0x52, 0x62, 0x42, 0x24, 0x18, 0x00, 0x00, // 624 + 0x00, 0x00, 0x10, 0x30, 0x50, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 637 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x02, 0x04, 0x18, 0x20, 0x40, 0x7E, 0x00, 0x00, // 650 + 0x00, 0x00, 0x7E, 0x02, 0x04, 0x08, 0x1C, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 663 + 0x00, 0x00, 0x04, 0x0C, 0x14, 0x24, 0x44, 0x44, 0x7E, 0x04, 0x04, 0x00, 0x00, // 676 + 0x00, 0x00, 0x7E, 0x40, 0x40, 0x5C, 0x62, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 689 + 0x00, 0x00, 0x1C, 0x20, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x3C, 0x00, 0x00, // 702 + 0x00, 0x00, 0x7E, 0x02, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x00, 0x00, // 715 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x3C, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 728 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x02, 0x04, 0x38, 0x00, 0x00, // 741 + 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, // 754 + 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, 0x00, 0x38, 0x30, 0x40, 0x00, // 767 + 0x00, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x00, // 780 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, // 793 + 0x00, 0x00, 0x40, 0x20, 0x10, 0x08, 0x04, 0x08, 0x10, 0x20, 0x40, 0x00, 0x00, // 806 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x02, 0x04, 0x08, 0x08, 0x00, 0x08, 0x00, 0x00, // 819 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x4E, 0x52, 0x56, 0x4A, 0x40, 0x3C, 0x00, 0x00, // 832 + 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x42, 0x00, 0x00, // 845 + 0x00, 0x00, 0x78, 0x44, 0x42, 0x44, 0x78, 0x44, 0x42, 0x44, 0x78, 0x00, 0x00, // 858 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x40, 0x40, 0x40, 0x42, 0x3C, 0x00, 0x00, // 871 0x00, 0x00, 0x78, 0x44, 0x42, 0x42, 0x42, 0x42, 0x42, 0x44, 0x78, 0x00, 0x00, // 884 - 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 897 - 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, // 910 - 0x00, 0x00, 0x1A, 0x26, 0x42, 0x40, 0x4E, 0x42, 0x42, 0x22, 0x1C, 0x00, 0x00, // 923 + 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 897 + 0x00, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, // 910 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x40, 0x4E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 923 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 936 - 0x00, 0x00, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 949 - 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x42, 0x44, 0x38, 0x00, 0x00, // 962 - 0x00, 0x00, 0x42, 0x44, 0x48, 0x50, 0x70, 0x48, 0x48, 0x44, 0x42, 0x00, 0x00, // 975 + 0x00, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 949 + 0x00, 0x00, 0x1F, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x44, 0x38, 0x00, 0x00, // 962 + 0x00, 0x00, 0x42, 0x44, 0x48, 0x50, 0x60, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, // 975 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 988 - 0x00, 0x00, 0x42, 0x66, 0x66, 0x5A, 0x5A, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 1001 - 0x00, 0x00, 0x62, 0x62, 0x52, 0x52, 0x4A, 0x4A, 0x46, 0x46, 0x42, 0x00, 0x00, // 1014 - 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 1027 + 0x00, 0x00, 0x82, 0x82, 0xC6, 0xAA, 0x92, 0x92, 0x82, 0x82, 0x82, 0x00, 0x00, // 1001 + 0x00, 0x00, 0x42, 0x42, 0x62, 0x52, 0x4A, 0x46, 0x42, 0x42, 0x42, 0x00, 0x00, // 1014 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 1027 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, // 1040 - 0x00, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x08, 0x06, // 1053 - 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x48, 0x44, 0x44, 0x42, 0x00, 0x00, // 1066 - 0x00, 0x00, 0x3A, 0x46, 0x42, 0x30, 0x0C, 0x02, 0x42, 0x62, 0x5C, 0x00, 0x00, // 1079 - 0x00, 0x00, 0x7F, 0x49, 0x49, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1092 - 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x3C, 0x00, 0x00, // 1105 - 0x00, 0x00, 0x41, 0x41, 0x22, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x00, 0x00, // 1118 - 0x00, 0x00, 0x41, 0x41, 0x41, 0x2A, 0x2A, 0x2A, 0x14, 0x14, 0x14, 0x00, 0x00, // 1131 - 0x00, 0x00, 0x66, 0x24, 0x24, 0x18, 0x18, 0x18, 0x24, 0x24, 0x66, 0x00, 0x00, // 1144 - 0x00, 0x00, 0x63, 0x22, 0x14, 0x14, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1157 - 0x00, 0x00, 0x7E, 0x44, 0x44, 0x08, 0x10, 0x10, 0x22, 0x42, 0x7E, 0x00, 0x00, // 1170 - 0x00, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x18, // 1183 - 0x00, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, // 1196 - 0x00, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, // 1209 - 0x00, 0x00, 0x00, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1222 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, // 1235 - 0x00, 0x20, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1248 + 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x42, 0x52, 0x4A, 0x3C, 0x02, 0x00, // 1053 + 0x00, 0x00, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, // 1066 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x3C, 0x02, 0x02, 0x42, 0x3C, 0x00, 0x00, // 1079 + 0x00, 0x00, 0xFE, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 1092 + 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 1105 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x44, 0x44, 0x28, 0x28, 0x28, 0x10, 0x00, 0x00, // 1118 + 0x00, 0x00, 0x82, 0x82, 0x82, 0x82, 0x92, 0x92, 0x92, 0xAA, 0x44, 0x00, 0x00, // 1131 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x28, 0x10, 0x28, 0x44, 0x82, 0x82, 0x00, 0x00, // 1144 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 1157 + 0x00, 0x00, 0x7E, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x40, 0x7E, 0x00, 0x00, // 1170 + 0x00, 0x00, 0x3C, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3C, 0x00, 0x00, // 1183 + 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x02, 0x00, 0x00, // 1196 + 0x00, 0x00, 0x78, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x78, 0x00, 0x00, // 1209 + 0x00, 0x00, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1222 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, // 1235 + 0x00, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1248 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1261 0x00, 0x00, 0x40, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x00, 0x00, // 1274 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x00, 0x00, // 1287 - 0x00, 0x00, 0x06, 0x02, 0x02, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1300 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x00, 0x00, // 1287 + 0x00, 0x00, 0x02, 0x02, 0x02, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1300 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 1313 - 0x00, 0x00, 0x06, 0x08, 0x08, 0x1E, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1326 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x42, 0x3C, // 1339 + 0x00, 0x00, 0x1C, 0x22, 0x20, 0x20, 0x7C, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, // 1326 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x44, 0x44, 0x38, 0x40, 0x3C, 0x42, 0x3C, // 1339 0x00, 0x00, 0x40, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 1352 - 0x00, 0x00, 0x00, 0x08, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1365 - 0x00, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x04, 0x04, 0x04, 0x04, 0x04, 0x44, 0x38, // 1378 - 0x00, 0x00, 0x40, 0x40, 0x40, 0x44, 0x48, 0x50, 0x68, 0x44, 0x42, 0x00, 0x00, // 1391 - 0x00, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 1404 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x6A, 0x4A, 0x4A, 0x4A, 0x4A, 0x00, 0x00, // 1417 + 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 1365 + 0x00, 0x00, 0x00, 0x04, 0x00, 0x0C, 0x04, 0x04, 0x04, 0x04, 0x44, 0x44, 0x38, // 1378 + 0x00, 0x00, 0x40, 0x40, 0x40, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42, 0x00, 0x00, // 1391 + 0x00, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1C, 0x00, 0x00, // 1404 + 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, 0x92, 0x92, 0x92, 0x92, 0x82, 0x00, 0x00, // 1417 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 1430 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 1443 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x40, 0x40, // 1456 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x46, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x02, // 1469 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0x30, 0x20, 0x20, 0x20, 0x70, 0x00, 0x00, // 1482 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x62, 0x42, 0x62, 0x5C, 0x40, 0x40, 0x40, // 1456 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x46, 0x42, 0x46, 0x3A, 0x02, 0x02, 0x02, // 1469 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x22, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, // 1482 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x30, 0x0C, 0x42, 0x3C, 0x00, 0x00, // 1495 - 0x00, 0x00, 0x20, 0x20, 0x20, 0x7C, 0x20, 0x20, 0x20, 0x22, 0x1C, 0x00, 0x00, // 1508 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 1521 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x22, 0x22, 0x14, 0x08, 0x08, 0x00, 0x00, // 1534 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0x5A, 0x5A, 0x3C, 0x24, 0x24, 0x00, 0x00, // 1547 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x24, 0x18, 0x18, 0x24, 0x66, 0x00, 0x00, // 1560 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x30, // 1573 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x44, 0x08, 0x10, 0x22, 0x7E, 0x00, 0x00, // 1586 - 0x00, 0x0C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x20, 0x10, 0x10, 0x10, 0x10, 0x0C, // 1599 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 1612 - 0x00, 0x30, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x08, 0x08, 0x08, 0x08, 0x30, // 1625 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x5A, 0x4C, 0x00, 0x00, 0x00, 0x00, // 1638 - 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, // 1651 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1664 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1677 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1690 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1703 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1716 + 0x00, 0x00, 0x00, 0x20, 0x20, 0x7C, 0x20, 0x20, 0x20, 0x22, 0x1C, 0x00, 0x00, // 1508 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 1521 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x28, 0x28, 0x10, 0x00, 0x00, // 1534 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92, 0x92, 0xAA, 0x44, 0x00, 0x00, // 1547 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, // 1560 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x42, 0x3C, // 1573 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x04, 0x08, 0x10, 0x20, 0x7E, 0x00, 0x00, // 1586 + 0x00, 0x00, 0x0E, 0x10, 0x10, 0x08, 0x30, 0x08, 0x10, 0x10, 0x0E, 0x00, 0x00, // 1599 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 1612 + 0x00, 0x00, 0x70, 0x08, 0x08, 0x10, 0x0C, 0x10, 0x08, 0x08, 0x70, 0x00, 0x00, // 1625 + 0x00, 0x00, 0x24, 0x54, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1638 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1651 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1664 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1677 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1690 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1703 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1716 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1729 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1742 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1755 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1768 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1781 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1794 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1807 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1820 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1833 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1846 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1859 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1872 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1885 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1898 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1911 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1924 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1937 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1950 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1963 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1976 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 1989 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2002 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2015 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2028 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2041 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2054 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2067 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1742 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1755 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1768 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1781 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1794 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1807 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1820 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1833 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1846 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1859 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1872 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1885 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1898 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1911 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1924 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1937 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1950 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1963 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1976 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 1989 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2002 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2015 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2028 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2041 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2054 + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x00, 0x00, // 2067 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2080 - 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, // 2093 - 0x00, 0x00, 0x08, 0x08, 0x3C, 0x4A, 0x48, 0x48, 0x4A, 0x3C, 0x08, 0x00, 0x00, // 2106 - 0x00, 0x00, 0x18, 0x24, 0x20, 0x20, 0x78, 0x20, 0x20, 0x22, 0x7C, 0x00, 0x00, // 2119 - 0x00, 0x00, 0x00, 0x00, 0x5A, 0x24, 0x42, 0x42, 0x24, 0x5A, 0x00, 0x00, 0x00, // 2132 - 0x00, 0x00, 0x63, 0x22, 0x14, 0x3E, 0x08, 0x3E, 0x08, 0x08, 0x08, 0x00, 0x00, // 2145 - 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 2158 - 0x3C, 0x42, 0x40, 0x30, 0x4C, 0x42, 0x32, 0x0C, 0x02, 0x42, 0x42, 0x3C, 0x00, // 2171 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2184 - 0x00, 0x00, 0x1C, 0x22, 0x4D, 0x51, 0x51, 0x4D, 0x22, 0x1C, 0x00, 0x00, 0x00, // 2197 - 0x00, 0x00, 0x1C, 0x02, 0x1E, 0x22, 0x1E, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, // 2210 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x24, 0x12, 0x00, 0x00, 0x00, // 2223 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x02, 0x02, 0x02, 0x00, 0x00, // 2236 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, // 2249 - 0x00, 0x1C, 0x22, 0x5D, 0x55, 0x59, 0x55, 0x22, 0x1C, 0x00, 0x00, 0x00, 0x00, // 2262 - 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2275 - 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2288 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x7C, 0x00, // 2301 - 0x00, 0x00, 0x60, 0x10, 0x20, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2314 - 0x00, 0x00, 0x60, 0x10, 0x60, 0x10, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2327 - 0x00, 0x04, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2340 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x7A, 0x40, 0x40, // 2353 - 0x00, 0x00, 0x3E, 0x4A, 0x4A, 0x4A, 0x3E, 0x0A, 0x0A, 0x0A, 0x0A, 0x00, 0x00, // 2366 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, // 2379 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x30, // 2392 - 0x00, 0x00, 0x20, 0x60, 0x20, 0x20, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2405 - 0x00, 0x00, 0x1C, 0x22, 0x22, 0x22, 0x1C, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, // 2418 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x12, 0x12, 0x24, 0x00, 0x00, 0x00, // 2431 - 0x00, 0x00, 0x42, 0x44, 0x44, 0x48, 0x18, 0x12, 0x26, 0x2E, 0x42, 0x00, 0x00, // 2444 - 0x00, 0x00, 0x42, 0x44, 0x44, 0x48, 0x18, 0x16, 0x22, 0x24, 0x46, 0x00, 0x00, // 2457 - 0x00, 0x00, 0x42, 0x24, 0x44, 0x28, 0x58, 0x12, 0x26, 0x2E, 0x42, 0x00, 0x00, // 2470 - 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x08, 0x10, 0x20, 0x22, 0x1C, 0x00, 0x00, // 2483 - 0x20, 0x10, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2496 - 0x04, 0x08, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2509 - 0x08, 0x14, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2522 - 0x1A, 0x2C, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2535 - 0x22, 0x00, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2548 - 0x08, 0x14, 0x08, 0x08, 0x14, 0x14, 0x22, 0x22, 0x3E, 0x41, 0x41, 0x00, 0x00, // 2561 - 0x00, 0x00, 0x1E, 0x18, 0x18, 0x28, 0x2E, 0x28, 0x38, 0x48, 0x4E, 0x00, 0x00, // 2574 - 0x00, 0x00, 0x1A, 0x26, 0x42, 0x40, 0x40, 0x40, 0x40, 0x22, 0x1C, 0x08, 0x30, // 2587 - 0x10, 0x08, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2600 - 0x08, 0x10, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2613 - 0x08, 0x14, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2626 - 0x24, 0x00, 0x7E, 0x40, 0x40, 0x40, 0x7C, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2639 - 0x10, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2652 - 0x04, 0x08, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2665 - 0x08, 0x14, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2678 - 0x14, 0x00, 0x1C, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2691 - 0x00, 0x00, 0x78, 0x44, 0x42, 0x42, 0xF2, 0x42, 0x42, 0x44, 0x78, 0x00, 0x00, // 2704 - 0x1A, 0x2C, 0x62, 0x62, 0x52, 0x52, 0x4A, 0x4A, 0x46, 0x46, 0x42, 0x00, 0x00, // 2717 - 0x10, 0x08, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2730 - 0x08, 0x10, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2743 - 0x10, 0x28, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2756 - 0x1A, 0x2C, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2769 - 0x24, 0x00, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x18, 0x00, 0x00, // 2782 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, // 2795 - 0x00, 0x00, 0x1A, 0x26, 0x46, 0x4A, 0x5A, 0x52, 0x62, 0x64, 0x58, 0x00, 0x00, // 2808 - 0x10, 0x08, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2821 - 0x08, 0x10, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2834 - 0x10, 0x28, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2847 - 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2860 - 0x04, 0x08, 0x63, 0x22, 0x14, 0x14, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 2873 - 0x00, 0x00, 0x40, 0x40, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x00, 0x00, // 2886 - 0x00, 0x00, 0x38, 0x44, 0x44, 0x48, 0x48, 0x44, 0x42, 0x52, 0x4C, 0x00, 0x00, // 2899 + 0x00, 0x00, 0x10, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 2093 + 0x00, 0x00, 0x10, 0x38, 0x54, 0x50, 0x50, 0x54, 0x38, 0x10, 0x00, 0x00, 0x00, // 2106 + 0x00, 0x00, 0x1C, 0x22, 0x20, 0x70, 0x20, 0x20, 0x20, 0x62, 0xDC, 0x00, 0x00, // 2119 + 0x00, 0x00, 0x00, 0x00, 0x42, 0x3C, 0x24, 0x24, 0x3C, 0x42, 0x00, 0x00, 0x00, // 2132 + 0x00, 0x00, 0x82, 0x82, 0x44, 0x28, 0x7C, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x00, // 2145 + 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 2158 + 0x00, 0x18, 0x24, 0x20, 0x18, 0x24, 0x24, 0x18, 0x04, 0x24, 0x18, 0x00, 0x00, // 2171 + 0x00, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2184 + 0x00, 0x38, 0x44, 0x92, 0xAA, 0xA2, 0xAA, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, // 2197 + 0x00, 0x00, 0x38, 0x04, 0x3C, 0x44, 0x3C, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, // 2210 + 0x00, 0x00, 0x00, 0x12, 0x24, 0x48, 0x90, 0x48, 0x24, 0x12, 0x00, 0x00, 0x00, // 2223 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, // 2236 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2249 + 0x00, 0x38, 0x44, 0x92, 0xAA, 0xAA, 0xB2, 0xAA, 0x44, 0x38, 0x00, 0x00, 0x00, // 2262 + 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2275 + 0x00, 0x00, 0x18, 0x24, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2288 + 0x00, 0x00, 0x00, 0x10, 0x10, 0x7C, 0x10, 0x10, 0x00, 0x7C, 0x00, 0x00, 0x00, // 2301 + 0x00, 0x30, 0x48, 0x08, 0x30, 0x40, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2314 + 0x00, 0x30, 0x48, 0x10, 0x08, 0x48, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2327 + 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2340 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x66, 0x5A, 0x40, 0x00, // 2353 + 0x00, 0x00, 0x3E, 0x74, 0x74, 0x74, 0x34, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00, // 2366 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2379 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, // 2392 + 0x00, 0x20, 0x60, 0x20, 0x20, 0x20, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 2405 + 0x00, 0x00, 0x30, 0x48, 0x48, 0x30, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, // 2418 + 0x00, 0x00, 0x00, 0x90, 0x48, 0x24, 0x12, 0x24, 0x48, 0x90, 0x00, 0x00, 0x00, // 2431 + 0x00, 0x40, 0xC0, 0x40, 0x40, 0x42, 0xE6, 0x0A, 0x12, 0x1A, 0x06, 0x00, 0x00, // 2444 + 0x00, 0x40, 0xC0, 0x40, 0x40, 0x4C, 0xF2, 0x02, 0x0C, 0x10, 0x1E, 0x00, 0x00, // 2457 + 0x00, 0x60, 0x90, 0x20, 0x10, 0x92, 0x66, 0x0A, 0x12, 0x1A, 0x06, 0x00, 0x00, // 2470 + 0x00, 0x00, 0x10, 0x00, 0x10, 0x10, 0x20, 0x40, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2483 + 0x00, 0x10, 0x08, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2496 + 0x00, 0x08, 0x10, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2509 + 0x00, 0x18, 0x24, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2522 + 0x00, 0x32, 0x4C, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2535 + 0x00, 0x24, 0x24, 0x00, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2548 + 0x00, 0x18, 0x24, 0x18, 0x18, 0x24, 0x42, 0x42, 0x7E, 0x42, 0x42, 0x00, 0x00, // 2561 + 0x00, 0x00, 0x6E, 0x90, 0x90, 0x90, 0x9C, 0xF0, 0x90, 0x90, 0x9E, 0x00, 0x00, // 2574 + 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x40, 0x40, 0x40, 0x42, 0x3C, 0x08, 0x10, // 2587 + 0x00, 0x10, 0x08, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2600 + 0x00, 0x08, 0x10, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2613 + 0x00, 0x18, 0x24, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2626 + 0x00, 0x24, 0x24, 0x00, 0x7E, 0x40, 0x40, 0x78, 0x40, 0x40, 0x7E, 0x00, 0x00, // 2639 + 0x00, 0x20, 0x10, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2652 + 0x00, 0x08, 0x10, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2665 + 0x00, 0x18, 0x24, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2678 + 0x00, 0x44, 0x44, 0x00, 0x7C, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 2691 + 0x00, 0x00, 0x78, 0x44, 0x42, 0x42, 0xE2, 0x42, 0x42, 0x44, 0x78, 0x00, 0x00, // 2704 + 0x00, 0x64, 0x98, 0x00, 0x82, 0xC2, 0xA2, 0x92, 0x8A, 0x86, 0x82, 0x00, 0x00, // 2717 + 0x00, 0x20, 0x10, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2730 + 0x00, 0x08, 0x10, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2743 + 0x00, 0x18, 0x24, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2756 + 0x00, 0x64, 0x98, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2769 + 0x00, 0x44, 0x44, 0x00, 0x7C, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7C, 0x00, 0x00, // 2782 + 0x00, 0x00, 0x00, 0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00, 0x00, 0x00, // 2795 + 0x00, 0x02, 0x3C, 0x46, 0x4A, 0x4A, 0x52, 0x52, 0x52, 0x62, 0x3C, 0x40, 0x00, // 2808 + 0x00, 0x20, 0x10, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2821 + 0x00, 0x08, 0x10, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2834 + 0x00, 0x18, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2847 + 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 2860 + 0x00, 0x08, 0x10, 0x00, 0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 2873 + 0x00, 0x00, 0x40, 0x7C, 0x42, 0x42, 0x42, 0x7C, 0x40, 0x40, 0x40, 0x00, 0x00, // 2886 + 0x00, 0x00, 0x38, 0x44, 0x44, 0x48, 0x50, 0x4C, 0x42, 0x42, 0x5C, 0x00, 0x00, // 2899 0x00, 0x00, 0x10, 0x08, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2912 - 0x00, 0x00, 0x08, 0x10, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2925 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2938 - 0x00, 0x00, 0x1A, 0x2C, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2951 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2964 - 0x00, 0x08, 0x14, 0x08, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2977 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x4A, 0x3E, 0x48, 0x5A, 0x2C, 0x00, 0x00, // 2990 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x08, 0x30, // 3003 + 0x00, 0x00, 0x04, 0x08, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2925 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2938 + 0x00, 0x00, 0x32, 0x4C, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2951 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2964 + 0x00, 0x18, 0x24, 0x18, 0x00, 0x3C, 0x02, 0x3E, 0x42, 0x46, 0x3A, 0x00, 0x00, // 2977 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x12, 0x7C, 0x90, 0x92, 0x6C, 0x00, 0x00, // 2990 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x40, 0x40, 0x42, 0x3C, 0x08, 0x10, // 3003 0x00, 0x00, 0x10, 0x08, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3016 0x00, 0x00, 0x08, 0x10, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3029 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3042 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3055 - 0x00, 0x00, 0x10, 0x08, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3068 - 0x00, 0x00, 0x04, 0x08, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3081 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3094 - 0x00, 0x00, 0x00, 0x14, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x1C, 0x00, 0x00, // 3107 - 0x00, 0x00, 0x32, 0x0C, 0x12, 0x02, 0x1E, 0x22, 0x42, 0x44, 0x38, 0x00, 0x00, // 3120 - 0x00, 0x00, 0x1A, 0x2C, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 3133 - 0x00, 0x00, 0x10, 0x08, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3146 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3042 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x3C, 0x42, 0x7E, 0x40, 0x42, 0x3C, 0x00, 0x00, // 3055 + 0x00, 0x00, 0x20, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3068 + 0x00, 0x00, 0x10, 0x20, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3081 + 0x00, 0x00, 0x30, 0x48, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3094 + 0x00, 0x00, 0x48, 0x48, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, // 3107 + 0x00, 0x24, 0x18, 0x28, 0x04, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3120 + 0x00, 0x00, 0x32, 0x4C, 0x00, 0x5C, 0x62, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, // 3133 + 0x00, 0x00, 0x20, 0x10, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3146 0x00, 0x00, 0x08, 0x10, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3159 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3172 - 0x00, 0x00, 0x1A, 0x2C, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3185 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3198 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x7C, 0x00, 0x10, 0x00, 0x00, 0x00, // 3211 - 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x46, 0x4A, 0x52, 0x66, 0x7C, 0x00, 0x00, // 3224 - 0x00, 0x00, 0x10, 0x08, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3237 - 0x00, 0x00, 0x08, 0x10, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3250 - 0x00, 0x00, 0x08, 0x14, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3263 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x00, 0x00, // 3276 - 0x00, 0x04, 0x08, 0x10, 0x00, 0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x30, // 3289 - 0x00, 0x00, 0x40, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x40, 0x40, // 3302 - 0x00, 0x00, 0x00, 0x24, 0x00, 0x41, 0x22, 0x22, 0x14, 0x14, 0x08, 0x08, 0x30 // 3315 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3172 + 0x00, 0x00, 0x32, 0x4C, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3185 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x3C, 0x42, 0x42, 0x42, 0x42, 0x3C, 0x00, 0x00, // 3198 + 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x7C, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, // 3211 + 0x00, 0x00, 0x00, 0x00, 0x02, 0x3C, 0x46, 0x4A, 0x52, 0x62, 0x3C, 0x40, 0x00, // 3224 + 0x00, 0x00, 0x20, 0x10, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3237 + 0x00, 0x00, 0x08, 0x10, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3250 + 0x00, 0x00, 0x18, 0x24, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3263 + 0x00, 0x00, 0x28, 0x28, 0x00, 0x44, 0x44, 0x44, 0x44, 0x44, 0x3A, 0x00, 0x00, // 3276 + 0x00, 0x00, 0x08, 0x10, 0x00, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x42, 0x3C, // 3289 + 0x00, 0x00, 0x00, 0x40, 0x40, 0x5C, 0x62, 0x42, 0x42, 0x62, 0x5C, 0x40, 0x40, // 3302 + 0x00, 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42, 0x46, 0x3A, 0x02, 0x42, 0x3C, // 3315 };

8 years, 8 months

[cfinck] 70507: [BOOTVID] Change the Blue Screen Font hardcoded into bootvid.dll to the Open Source "Anonymous Pro" font, which makes a nice 8x13 font. Blue Screens now look like this: http://fs5.d...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 6 09:31:53 2016 New Revision: 70507 URL: http://svn.reactos.org/svn/reactos?rev=70507&view=rev Log: [BOOTVID] Change the Blue Screen Font hardcoded into bootvid.dll to the Open Source "Anonymous Pro" font, which makes a nice 8x13 font. Blue Screens now look like this: http://fs5.directupload.net/images/160106/ehv6245t.png [BOOTVID_FONT_GENERATOR] In case you find an even better font, you now have a nice little tool to test that font and generate the corresponding FontData array for bootvid. Added: trunk/rosapps/applications/devutils/bootvid_font_generator/ trunk/rosapps/applications/devutils/bootvid_font_generator/CMakeLists.txt (with props) trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c (with props) Modified: trunk/reactos/drivers/base/bootvid/arm/bootdata.c trunk/reactos/drivers/base/bootvid/i386/bootdata.c trunk/rosapps/applications/devutils/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/base/bootvid/arm/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/b… Modified: trunk/reactos/drivers/base/bootvid/i386/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… Modified: trunk/rosapps/applications/devutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/CMak… Added: trunk/rosapps/applications/devutils/bootvid_font_generator/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/boot… Added: trunk/rosapps/applications/devutils/bootvid_font_generator/bootvid_font_generator.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/boot…

8 years, 8 months

[cfinck] 70506: [WINSPOOL] Forgot to remove the StartDocPrinterA stub.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 6 05:25:01 2016 New Revision: 70506 URL: http://svn.reactos.org/svn/reactos?rev=70506&view=rev Log: [WINSPOOL] Forgot to remove the StartDocPrinterA stub. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Wed Jan 6 05:25:01 2016 @@ -192,7 +192,7 @@ 291 stub SpoolerPrinterEvent 292 stub StartDocDlgA 293 stub StartDocDlgW -294 stub StartDocPrinterA +294 stdcall StartDocPrinterA(long long ptr) 295 stdcall StartDocPrinterW(long long ptr) 296 stdcall StartPagePrinter(long) 297 stub WaitForPrinterChange

8 years, 8 months

[cfinck] 70505: [WINSPOOL] - Implement StartDocPrinterA. - Fix an uninitialized access in StartDocPrinterW. - Make OpenPrinterA and StartDocPrinterA consistent.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 6 05:15:44 2016 New Revision: 70505 URL: http://svn.reactos.org/svn/reactos?rev=70505&view=rev Log: [WINSPOOL] - Implement StartDocPrinterA. - Fix an uninitialized access in StartDocPrinterW. - Make OpenPrinterA and StartDocPrinterA consistent. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Wed Jan 6 05:15:44 2016 @@ -379,24 +379,23 @@ OpenPrinterA(LPSTR pPrinterName, LPHANDLE phPrinter, LPPRINTER_DEFAULTSA pDefault) { BOOL bReturnValue = FALSE; + DWORD cch; PWSTR pwszPrinterName = NULL; - PWSTR pwszDatatype = NULL; PRINTER_DEFAULTSW wDefault = { 0 }; - size_t StringLength; if (pPrinterName) { // Convert pPrinterName to a Unicode string pwszPrinterName - StringLength = strlen(pPrinterName) + 1; - - pwszPrinterName = HeapAlloc(hProcessHeap, 0, StringLength * sizeof(WCHAR)); + cch = strlen(pPrinterName); + + pwszPrinterName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); if (!pwszPrinterName) { ERR("HeapAlloc failed for pwszPrinterName with last error %lu!\n", GetLastError()); goto Cleanup; } - MultiByteToWideChar(CP_ACP, 0, pPrinterName, -1, pwszPrinterName, StringLength); + MultiByteToWideChar(CP_ACP, 0, pPrinterName, -1, pwszPrinterName, cch + 1); } if (pDefault) @@ -405,18 +404,17 @@ if (pDefault->pDatatype) { - // Convert pDefault->pDatatype to a Unicode string pwszDatatype that later becomes wDefault.pDatatype - StringLength = strlen(pDefault->pDatatype) + 1; - - pwszDatatype = HeapAlloc(hProcessHeap, 0, StringLength * sizeof(WCHAR)); - if (!pwszDatatype) + // Convert pDefault->pDatatype to a Unicode string wDefault.pDatatype + cch = strlen(pDefault->pDatatype); + + wDefault.pDatatype = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); + if (!wDefault.pDatatype) { - ERR("HeapAlloc failed for pwszDatatype with last error %lu!\n", GetLastError()); + ERR("HeapAlloc failed for wDefault.pDatatype with last error %lu!\n", GetLastError()); goto Cleanup; } - MultiByteToWideChar(CP_ACP, 0, pDefault->pDatatype, -1, pwszDatatype, StringLength); - wDefault.pDatatype = pwszDatatype; + MultiByteToWideChar(CP_ACP, 0, pDefault->pDatatype, -1, wDefault.pDatatype, cch + 1); } if (pDefault->pDevMode) @@ -426,14 +424,14 @@ bReturnValue = OpenPrinterW(pwszPrinterName, phPrinter, &wDefault); Cleanup: + if (wDefault.pDatatype) + HeapFree(hProcessHeap, 0, wDefault.pDatatype); + if (wDefault.pDevMode) HeapFree(hProcessHeap, 0, wDefault.pDevMode); if (pwszPrinterName) HeapFree(hProcessHeap, 0, pwszPrinterName); - - if (pwszDatatype) - HeapFree(hProcessHeap, 0, pwszDatatype); return bReturnValue; } @@ -537,11 +535,97 @@ } DWORD WINAPI +StartDocPrinterA(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) +{ + DOC_INFO_1W wDocInfo1 = { 0 }; + DWORD cch; + DWORD dwErrorCode; + DWORD dwReturnValue = 0; + PDOC_INFO_1A pDocInfo1 = (PDOC_INFO_1A)pDocInfo; + + // Only check the minimum required for accessing pDocInfo. + // Additional sanity checks are done in StartDocPrinterW. + if (!pDocInfo1) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + if (Level != 1) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + if (pDocInfo1->pDatatype) + { + // Convert pDocInfo1->pDatatype to a Unicode string wDocInfo1.pDatatype + cch = strlen(pDocInfo1->pDatatype); + + wDocInfo1.pDatatype = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); + if (!wDocInfo1.pDatatype) + { + ERR("HeapAlloc failed for wDocInfo1.pDatatype with last error %lu!\n", GetLastError()); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, pDocInfo1->pDatatype, -1, wDocInfo1.pDatatype, cch + 1); + } + + if (pDocInfo1->pDocName) + { + // Convert pDocInfo1->pDocName to a Unicode string wDocInfo1.pDocName + cch = strlen(pDocInfo1->pDocName); + + wDocInfo1.pDocName = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); + if (!wDocInfo1.pDocName) + { + ERR("HeapAlloc failed for wDocInfo1.pDocName with last error %lu!\n", GetLastError()); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, pDocInfo1->pDocName, -1, wDocInfo1.pDocName, cch + 1); + } + + if (pDocInfo1->pOutputFile) + { + // Convert pDocInfo1->pOutputFile to a Unicode string wDocInfo1.pOutputFile + cch = strlen(pDocInfo1->pOutputFile); + + wDocInfo1.pOutputFile = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); + if (!wDocInfo1.pOutputFile) + { + ERR("HeapAlloc failed for wDocInfo1.pOutputFile with last error %lu!\n", GetLastError()); + goto Cleanup; + } + + MultiByteToWideChar(CP_ACP, 0, pDocInfo1->pOutputFile, -1, wDocInfo1.pOutputFile, cch + 1); + } + + dwReturnValue = StartDocPrinterW(hPrinter, Level, (PBYTE)&wDocInfo1); + dwErrorCode = GetLastError(); + +Cleanup: + if (wDocInfo1.pDatatype) + HeapFree(hProcessHeap, 0, wDocInfo1.pDatatype); + + if (wDocInfo1.pDocName) + HeapFree(hProcessHeap, 0, wDocInfo1.pDocName); + + if (wDocInfo1.pOutputFile) + HeapFree(hProcessHeap, 0, wDocInfo1.pOutputFile); + + SetLastError(dwErrorCode); + return dwReturnValue; +} + +DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) { DWORD cbAddJobInfo1; DWORD cbNeeded; DWORD dwErrorCode; + DWORD dwReturnValue = 0; PADDJOB_INFO_1W pAddJobInfo1 = NULL; PDOC_INFO_1W pDocInfo1 = (PDOC_INFO_1W)pDocInfo; PSPOOLER_HANDLE pHandle = (PSPOOLER_HANDLE)hPrinter; @@ -611,14 +695,17 @@ } if (dwErrorCode == ERROR_SUCCESS) + { pHandle->bStartedDoc = TRUE; + dwReturnValue = pHandle->dwJobID; + } Cleanup: if (pAddJobInfo1) HeapFree(hProcessHeap, 0, pAddJobInfo1); SetLastError(dwErrorCode); - return pHandle->dwJobID; + return dwReturnValue; } BOOL WINAPI

8 years, 8 months

[ion] 70504: [BOOTLIB]: Add very early work around font loading. [BOOTLIB]: Add mostly full support for resource and locale management. [BOOTLIB]: Stub out bootstat.dat (Boot Status Data Log) suppo...

by ion＠svn.reactos.org

Author: ion Date: Wed Jan 6 04:43:23 2016 New Revision: 70504 URL: http://svn.reactos.org/svn/reactos?rev=70504&view=rev Log: [BOOTLIB]: Add very early work around font loading. [BOOTLIB]: Add mostly full support for resource and locale management. [BOOTLIB]: Stub out bootstat.dat (Boot Status Data Log) support. [BOOTLIB]: Some refactoring. [BOOTMGFW]: Add a message table with a few initial strings. Also add an empty bootmgr.xsl stylesheet. We'll have to see what we want/need to do here. [BOOTMGFW]: Correctly loading HTML and message table resource data, and add a few other additional initialization calls. Next steps are to re-visit graphics code to support re-initialization. Added: trunk/reactos/boot/environ/app/bootmgr/bootmgr.rc (with props) trunk/reactos/boot/environ/app/bootmgr/bootmgr.xsl (with props) trunk/reactos/boot/environ/lib/firmware/fwutil.c (with props) trunk/reactos/boot/environ/lib/misc/font.c (with props) trunk/reactos/boot/environ/lib/misc/resource.c (with props) trunk/reactos/include/reactos/mc/bootmsg.mc (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/app/bootmgr/bootmgr.h trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/io/display/display.c trunk/reactos/boot/environ/lib/misc/image.c trunk/reactos/boot/environ/lib/misc/util.c trunk/reactos/include/reactos/mc/CMakeLists.txt Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -16,6 +16,9 @@ lib/misc/bootreg.c lib/misc/util.c lib/misc/image.c + lib/misc/resource.c + lib/misc/font.c + lib/firmware/fwutil.c lib/firmware/efi/firmware.c lib/mm/mm.c lib/mm/pagealloc.c @@ -65,7 +68,7 @@ add_asm_files(bootlib_asm ${BOOTLIB_ASM_SOURCE}) add_library(bootlib ${BOOTLIB_SOURCE} ${bootlib_asm}) add_pch(bootlib app/bootmgr/bootmgr.h BOOTLIB_SOURCE) -add_dependencies(bootlib bugcodes xdk) +add_dependencies(bootlib bugcodes bootmsg xdk) list(APPEND BOOTMGR_BASE_SOURCE app/bootmgr/efiemu.c @@ -73,7 +76,7 @@ app/bootmgr/rtlcompat.c ) -add_executable(bootmgfw ${BOOTMGR_BASE_SOURCE}) +add_executable(bootmgfw ${BOOTMGR_BASE_SOURCE} app/bootmgr/bootmgr.rc) set_target_properties(bootmgfw PROPERTIES SUFFIX ".efi") if(MSVC) Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -844,6 +844,191 @@ return Status; } +typedef struct _BL_BSD_LOG_OBJECT +{ + ULONG DeviceId; + ULONG FileId; + ULONG Unknown; + ULONG Size; + ULONG Flags; +} BL_BSD_LOG_OBJECT, *PBL_BSD_LOG_OBJECT; + +BL_BSD_LOG_OBJECT BsdpLogObject; +BOOLEAN BsdpLogObjectInitialized; + +VOID +BlBsdInitializeLog ( + _In_ PBL_DEVICE_DESCRIPTOR LogDevice, + _In_ PWCHAR LogPath, + _In_ ULONG Flags + ) +{ + NTSTATUS Status; + + /* Don't initialize twice */ + if (BsdpLogObjectInitialized) + { + return; + } + + /* Set invalid IDs for now */ + BsdpLogObject.DeviceId = -1; + BsdpLogObject.FileId = -1; + + /* Open the BSD device */ + Status = BlpDeviceOpen(LogDevice, + BL_DEVICE_READ_ACCESS | BL_DEVICE_WRITE_ACCESS, + 0, + &BsdpLogObject.DeviceId); + if (!NT_SUCCESS(Status)) + { + /* Welp that didn't work */ + goto FailurePath; + } + + /* Now open the BSD itself */ + Status = BlFileOpen(BsdpLogObject.DeviceId, + LogPath, + BL_FILE_READ_ACCESS | BL_FILE_WRITE_ACCESS, + &BsdpLogObject.FileId); + if (!NT_SUCCESS(Status)) + { + /* D'oh */ + goto FailurePath; + } + + /* The BSD is open. Start doing stuff to it */ + EfiPrintf(L"Unimplemented BSD path\r\n"); + Status = STATUS_NOT_IMPLEMENTED; + +FailurePath: + /* Close the BSD if we had it open */ + if (BsdpLogObject.FileId != -1) + { + BlFileClose(BsdpLogObject.FileId); + } + + /* Close the device if we had it open */ + if (BsdpLogObject.DeviceId != -1) + { + BlDeviceClose(BsdpLogObject.DeviceId); + } + + /* Set BSD object to its uninitialized state */ + BsdpLogObjectInitialized = FALSE; + BsdpLogObject.FileId = 0; + BsdpLogObject.DeviceId = 0; + BsdpLogObject.Flags = 0; + BsdpLogObject.Unknown = 0; + BsdpLogObject.Size = 0; +} + +VOID +BmpInitializeBootStatusDataLog ( + VOID + ) +{ + NTSTATUS Status; + PBL_DEVICE_DESCRIPTOR BsdDevice; + PWCHAR BsdPath; + ULONG Flags; + BOOLEAN PreserveBsd; + + /* Initialize locals */ + BsdPath = NULL; + BsdDevice = NULL; + Flags = 0; + + /* Check if the BSD is stored in a custom device */ + Status = BlGetBootOptionDevice(BlpApplicationEntry.BcdData, + BcdLibraryDevice_BsdLogDevice, + &BsdDevice, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Nope, use the boot device */ + BsdDevice = BlpBootDevice; + } + + /* Check if the path is custom as well */ + Status = BlGetBootOptionString(BlpApplicationEntry.BcdData, + BcdLibraryString_BsdLogPath, + &BsdPath); + if (!NT_SUCCESS(Status)) + { + /* Nope, use our default path */ + Status = BmpFwGetFullPath(L"\\bootstat.dat", &BsdPath); + if (!NT_SUCCESS(Status)) + { + BsdPath = NULL; + } + + /* Set preserve flag */ + Flags = 1; + } + else + { + /* Set preserve flag */ + Flags = 1; + } + + /* Finally, check if the BSD should be preserved */ + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdLibraryBoolean_PreserveBsdLog, + &PreserveBsd); + if (!(NT_SUCCESS(Status)) || !(PreserveBsd)) + { + /* We failed to read, or we were asked not to preserve it */ + Flags = 0; + } + + /* Initialize the log */ + BlBsdInitializeLog(BsdDevice, BsdPath, Flags); + + /* Free the BSD device descriptor if we had one */ + if (BsdDevice) + { + BlMmFreeHeap(BsdDevice); + } + + /* Free the BSD path if we had one */ + if ((Flags) && (BsdPath)) + { + BlMmFreeHeap(BsdPath); + } +} + +VOID +BmFwMemoryInitialize ( + VOID + ) +{ + NTSTATUS Status; + PHYSICAL_ADDRESS PhysicalAddress; + BL_ADDRESS_RANGE AddressRange; + + /* Select the range below 1MB */ + AddressRange.Maximum = 0xFFFFF; + AddressRange.Minimum = 0; + + /* Allocate one reserved page with the "reserved" attribute */ + Status = MmPapAllocatePhysicalPagesInRange(&PhysicalAddress, + BlApplicationReserved, + 1, + BlMemoryReserved, + 0, + &MmMdlUnmappedAllocated, + &AddressRange, + BL_MM_REQUEST_DEFAULT_TYPE); + if (!NT_SUCCESS(Status)) + { + /* Print a message on error, but keep going */ + BlStatusPrint(L"BmFwMemoryInitialize: Failed to allocate a page below 1MB. Status: 0x%08x\r\n", + Status); + } +} + + /*++ * @name BmMain * @@ -869,6 +1054,7 @@ PGUID AppIdentifier; HANDLE BcdHandle; PBL_BCD_OPTION EarlyOptions; + PWCHAR Stylesheet; EfiPrintf(L"ReactOS UEFI Boot Manager Initializing...\n"); @@ -960,8 +1146,25 @@ Status = LibraryStatus; } + /* Initialize firmware-specific memory regions */ + //BmFwMemoryInitialize(); + + /* Initialize the boot status data log (BSD) */ + BmpInitializeBootStatusDataLog(); + + /* Find our XSL stylesheet */ + Stylesheet = BlResourceFindHtml(); + if (!Stylesheet) + { + /* Awe, no XML. This is actually fatal lol. Can't boot without XML. */ + Status = STATUS_NOT_FOUND; + EfiPrintf(L"BlResourceFindMessage failed 0x%x\r\n", STATUS_NOT_FOUND); + goto Quickie; + } + /* do more stuff!! */ - EfiPrintf(L"We are A-OKer!\r\n"); + EfiPrintf(BlResourceFindMessage(BM_MSG_TEST)); + EfiPrintf(Stylesheet); EfiStall(10000000); //Failure: Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -28,6 +28,9 @@ /* BCD Headers */ #include <bcd.h> + +/* Message Header */ +#include <bootmsg.h> /* STRUCTURES ****************************************************************/ Added: trunk/reactos/boot/environ/app/bootmgr/bootmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.rc (added) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.rc [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -0,0 +1,25 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Manager + * FILE: boot/environ/app/bootmgr.rc + * PURPOSE: Boot Manager Resource File + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +#include <winver.h> +#include <ntverp.h> + +/* Version Data */ +#define VER_FILETYPE VFT_DRV +#define VER_FILESUBTYPE VFT2_DRV_SYSTEM +#define VER_FILEDESCRIPTION_STR "Boot Manager" +#define VER_INTERNALNAME_STR "bootmgr.exe" +#define VER_ORIGINALFILENAME_STR "bootmgr.exe" +#define VER_LANGNEUTRAL +#include "common.ver" + +/* Message Table */ +#include <bootmsg.rc> + +/* XML GUI Stylesheet */ +BOOTMGR.XSL HTML "bootmgr.xsl" Propchange: trunk/reactos/boot/environ/app/bootmgr/bootmgr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/app/bootmgr/bootmgr.xsl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/boot/environ/app/bootmgr/bootmgr.xsl ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/r… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -22,6 +22,8 @@ // boot-code is always ok } #endif + +PVOID MmHighestUserAddress = (PVOID)0xFFFFFFFF; PVOID NTAPI Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -63,6 +63,7 @@ BcdLibraryBoolean_DisplayOptionsEdit = 0x16000041, BcdLibraryDevice_BsdLogDevice = 0x11000043, BcdLibraryString_BsdLogPath = 0x12000044, + BcdLibraryBoolean_PreserveBsdLog = 0x16000045, /* Undocumented */ BcdLibraryBoolean_GraphicsModeDisabled = 0x16000046, BcdLibraryInteger_ConfigAccessPolicy = 0x15000047, BcdLibraryBoolean_DisableIntegrityChecks = 0x16000048, Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -1,10 +1,10 @@ -/*b +/* * COPYRIGHT: See COPYING.ARM in the top level directory * PROJECT: ReactOS UEFI Boot Library * FILE: boot/environ/include/bl.h * PURPOSE: Main Boot Library Header * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + */ #ifndef _BL_H #define _BL_H @@ -24,6 +24,9 @@ /* NT SafeInt Header */ #include <ntintsafe.h> + +/* PE Headers */ +#include <ntimage.h> /* UEFI Headers */ #include <Uefi.h> @@ -241,6 +244,7 @@ // // Application Memory // + BlApplicationReserved = 0xE0000001, BlApplicationData = 0xE0000004, // @@ -285,7 +289,8 @@ // BlMemoryNonFixed = 0x00020000, BlMemoryFixed = 0x00040000, - BlMemoryValidAllocationAttributes = BlMemoryNonFixed | BlMemoryFixed, + BlMemoryReserved = 0x00080000, + BlMemoryValidAllocationAttributes = BlMemoryNonFixed | BlMemoryFixed | BlMemoryReserved, BlMemoryValidAllocationAttributeMask = 0x00FF0000, // @@ -1029,6 +1034,14 @@ PWCHAR FileName; } BL_IMG_FILE, *PBL_IMG_FILE; +typedef struct _BL_DEFERRED_FONT_FILE +{ + LIST_ENTRY ListEntry; + ULONG Flags; + PBL_DEVICE_DESCRIPTOR Device; + PWCHAR FontPath; +} BL_DEFERRED_FONT_FILE, *PBL_DEFERRED_FONT_FILE;; + /* INLINE ROUTINES ***********************************************************/ FORCEINLINE @@ -1275,6 +1288,31 @@ VOID ); +/* RESOURCE LOCALE INTERNATIONALIZATION ROUTINES *****************************/ + +NTSTATUS +BlpDisplayRegisterLocale ( + _In_ PWCHAR Locale + ); + +/* FONT ROUTINES *************************************************************/ + +VOID +BfiFreeDeferredFontFile ( + _In_ PBL_DEFERRED_FONT_FILE DeferredFontFile + ); + +NTSTATUS +BfLoadFontFile ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PWCHAR FontPath + ); + +NTSTATUS +BfLoadDeferredFontFiles ( + VOID + ); + /* FILESYSTEM ROUTINES *******************************************************/ NTSTATUS @@ -1364,9 +1402,25 @@ VOID ); +NTSTATUS +BlGetApplicationBaseAndSize ( + _Out_ PVOID* ImageBase, + _Out_ PULONG ImageSize + ); + PWCHAR BlResourceFindMessage ( _In_ ULONG MsgId + ); + +PWCHAR +BlResourceFindHtml ( + VOID + ); + +NTSTATUS +BlpResourceInitialize ( + VOID ); /* TABLE ROUTINES ************************************************************/ @@ -1627,6 +1681,18 @@ ); NTSTATUS +MmPapAllocatePhysicalPagesInRange ( + _Inout_ PPHYSICAL_ADDRESS BaseAddress, + _In_ BL_MEMORY_TYPE MemoryType, + _In_ ULONGLONG Pages, + _In_ ULONG Attributes, + _In_ ULONG Alignment, + _In_ PBL_MEMORY_DESCRIPTOR_LIST NewList, + _In_opt_ PBL_ADDRESS_RANGE Range, + _In_ ULONG RangeType + ); + +NTSTATUS BlMmFreePhysicalPages ( _In_ PHYSICAL_ADDRESS Address ); @@ -1699,6 +1765,17 @@ BlDisplayGetTextCellResolution ( _Out_ PULONG TextWidth, _Out_ PULONG TextHeight + ); + +NTSTATUS +BlDisplaySetScreenResolution ( + VOID + ); + +NTSTATUS +BlDisplayGetScreenResolution ( + _Out_ PULONG HRes, + _Out_ PULONG Vres ); /* I/O ROUTINES **************************************************************/ @@ -1755,6 +1832,12 @@ _In_ BOOLEAN ShowProgress, _Out_opt_ PUCHAR* HashBuffer, _Out_opt_ PULONG HashSize + ); + +PIMAGE_SECTION_HEADER +BlImgFindSection ( + _In_ PVOID ImageBase, + _In_ ULONG ImageSize ); /* FILE I/O ROUTINES *********************************************************/ @@ -1947,4 +2030,5 @@ extern ULONG ConsoleGraphicalResolutionListSize; extern PVOID DspRemoteInputConsole; extern WCHAR BlScratchBuffer[8192]; +extern BL_MEMORY_DESCRIPTOR_LIST MmMdlUnmappedAllocated; #endif Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -290,18 +290,17 @@ BlpSiInitialize(1); #endif -#if 0 /* Setup the text, UI and font resources */ Status = BlpResourceInitialize(); if (!NT_SUCCESS(Status)) { /* Tear down everything if this failed */ - if (!(LibraryParameters->LibraryFlags & BL_LIBRARY_FLAG_TEXT_MODE)) + if (!(LibraryParameters->LibraryFlags & BL_LIBRARY_FLAG_NO_DISPLAY)) { // BlpDisplayDestroy(); } - //BlpBdDestroy(); #ifdef BL_KD_SUPPORT + BlpBdDestroy(); PltDestroyPciConfiguration(); #endif #ifdef BL_NET_SUPPORT @@ -317,7 +316,6 @@ //BlpMmDestroy(1); return Status; } -#endif #if BL_BITLOCKER_SUPPORT /* Setup the boot cryptography library */ @@ -384,9 +382,9 @@ /* Redraw the graphics console as needed */ BlpDisplayInitialize(LibraryParameters->LibraryFlags); -#if 0 + + /* Reinitialize resources (language may have changed) */ BlpResourceInitialize(); -#endif } /* Nothing to do, we're done */ @@ -420,3 +418,21 @@ return (BlpApplicationEntry.Flags & BL_APPLICATION_ENTRY_FLAG_NO_GUID) ? NULL : &BlpApplicationEntry.Guid; } + +NTSTATUS +BlGetApplicationBaseAndSize ( + _Out_ PVOID* ImageBase, + _Out_ PULONG ImageSize + ) +{ + /* Fail if output parameters are missing */ + if (!ImageBase || !ImageSize) + { + return STATUS_INVALID_PARAMETER; + } + + /* Return the requested data */ + *ImageBase = (PVOID)(ULONG_PTR)BlpApplicationParameters->ImageBase; + *ImageSize = BlpApplicationParameters->ImageSize; + return STATUS_SUCCESS; +} Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -1210,8 +1210,8 @@ /* Check if this region is currently free RAM */ if (Descriptor->Type == BlConventionalMemory) { - /* Set an unknown flag on the descriptor */ - Descriptor->Flags |= 0x80000; + /* Set the reserved flag on the descriptor */ + Descriptor->Flags |= BlReservedMemory; } /* Add this descriptor into the list */ @@ -1254,8 +1254,8 @@ /* Check if this region is currently free RAM below 1MB */ if ((Descriptor->Type == BlConventionalMemory) && (EndPage <= 0x100)) { - /* Set an unknown flag on the descriptor */ - Descriptor->Flags |= 0x80000; + /* Set the reserved flag on the descriptor */ + Descriptor->Flags |= BlReservedMemory; } /* Add the descriptor to the list, requesting coalescing as asked */ @@ -1366,3 +1366,137 @@ return Status; } + +/*++ + * @name EfiGetEfiStatusCode + * + * The EfiGetEfiStatusCode routine converts an NT Status to an EFI status. + * + * @param Status + * NT Status code to be converted. + * + * @remark Only certain, specific NT status codes are converted to EFI codes. + * + * @return The corresponding EFI Status code, EFI_NO_MAPPING otherwise. + * + *--*/ +EFI_STATUS +EfiGetEfiStatusCode( + _In_ NTSTATUS Status + ) +{ + switch (Status) + { + case STATUS_NOT_SUPPORTED: + return EFI_UNSUPPORTED; + case STATUS_DISK_FULL: + return EFI_VOLUME_FULL; + case STATUS_INSUFFICIENT_RESOURCES: + return EFI_OUT_OF_RESOURCES; + case STATUS_MEDIA_WRITE_PROTECTED: + return EFI_WRITE_PROTECTED; + case STATUS_DEVICE_NOT_READY: + return EFI_NOT_STARTED; + case STATUS_DEVICE_ALREADY_ATTACHED: + return EFI_ALREADY_STARTED; + case STATUS_MEDIA_CHANGED: + return EFI_MEDIA_CHANGED; + case STATUS_INVALID_PARAMETER: + return EFI_INVALID_PARAMETER; + case STATUS_ACCESS_DENIED: + return EFI_ACCESS_DENIED; + case STATUS_BUFFER_TOO_SMALL: + return EFI_BUFFER_TOO_SMALL; + case STATUS_DISK_CORRUPT_ERROR: + return EFI_VOLUME_CORRUPTED; + case STATUS_REQUEST_ABORTED: + return EFI_ABORTED; + case STATUS_NO_MEDIA: + return EFI_NO_MEDIA; + case STATUS_IO_DEVICE_ERROR: + return EFI_DEVICE_ERROR; + case STATUS_INVALID_BUFFER_SIZE: + return EFI_BAD_BUFFER_SIZE; + case STATUS_NOT_FOUND: + return EFI_NOT_FOUND; + case STATUS_DRIVER_UNABLE_TO_LOAD: + return EFI_LOAD_ERROR; + case STATUS_NO_MATCH: + return EFI_NO_MAPPING; + case STATUS_SUCCESS: + return EFI_SUCCESS; + case STATUS_TIMEOUT: + return EFI_TIMEOUT; + default: + return EFI_NO_MAPPING; + } +} + +/*++ + * @name EfiGetNtStatusCode + * + * The EfiGetNtStatusCode routine converts an EFI Status to an NT status. + * + * @param EfiStatus + * EFI Status code to be converted. + * + * @remark Only certain, specific EFI status codes are converted to NT codes. + * + * @return The corresponding NT Status code, STATUS_UNSUCCESSFUL otherwise. + * + *--*/ +NTSTATUS +EfiGetNtStatusCode ( + _In_ EFI_STATUS EfiStatus + ) +{ + switch (EfiStatus) + { + case EFI_NOT_READY: + case EFI_NOT_FOUND: + return STATUS_NOT_FOUND; + case EFI_NO_MEDIA: + return STATUS_NO_MEDIA; + case EFI_MEDIA_CHANGED: + return STATUS_MEDIA_CHANGED; + case EFI_ACCESS_DENIED: + case EFI_SECURITY_VIOLATION: + return STATUS_ACCESS_DENIED; + case EFI_TIMEOUT: + case EFI_NO_RESPONSE: + return STATUS_TIMEOUT; + case EFI_NO_MAPPING: + return STATUS_NO_MATCH; + case EFI_NOT_STARTED: + return STATUS_DEVICE_NOT_READY; + case EFI_ALREADY_STARTED: + return STATUS_DEVICE_ALREADY_ATTACHED; + case EFI_ABORTED: + return STATUS_REQUEST_ABORTED; + case EFI_VOLUME_FULL: + return STATUS_DISK_FULL; + case EFI_DEVICE_ERROR: + return STATUS_IO_DEVICE_ERROR; + case EFI_WRITE_PROTECTED: + return STATUS_MEDIA_WRITE_PROTECTED; + /* @FIXME: ReactOS Headers don't yet have this */ + //case EFI_OUT_OF_RESOURCES: + //return STATUS_INSUFFICIENT_NVRAM_RESOURCES; + case EFI_VOLUME_CORRUPTED: + return STATUS_DISK_CORRUPT_ERROR; + case EFI_BUFFER_TOO_SMALL: + return STATUS_BUFFER_TOO_SMALL; + case EFI_SUCCESS: + return STATUS_SUCCESS; + case EFI_LOAD_ERROR: + return STATUS_DRIVER_UNABLE_TO_LOAD; + case EFI_INVALID_PARAMETER: + return STATUS_INVALID_PARAMETER; + case EFI_UNSUPPORTED: + return STATUS_NOT_SUPPORTED; + case EFI_BAD_BUFFER_SIZE: + return STATUS_INVALID_BUFFER_SIZE; + default: + return STATUS_UNSUCCESSFUL; + } +} Added: trunk/reactos/boot/environ/lib/firmware/fwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/fwutil.c (added) +++ trunk/reactos/boot/environ/lib/firmware/fwutil.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -0,0 +1,26 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/firmware/fwutil.c + * PURPOSE: Boot Library Firmware Utility Functions + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +VOID +BlFwReboot ( + VOID + ) +{ +#ifdef BL_KD_SUPPORTED + /* Stop the boot debugger*/ + BlBdStop(); +#endif + + /* Reset the machine */ + EfiResetSystem(EfiResetCold); +} + Propchange: trunk/reactos/boot/environ/lib/firmware/fwutil.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -45,6 +45,203 @@ { EfiPrintf(L"Disabling graphics\r\n"); return FALSE; +} + +NTSTATUS +DsppLoadFontFile ( + _In_ PWCHAR FontFileName + ) +{ + PBL_DEVICE_DESCRIPTOR FontDevice; + NTSTATUS Status; + ULONG NameLength, DirectoryLength, TotalLength; + PWCHAR FontPath, FontDirectory; + BL_LIBRARY_PARAMETERS LibraryParameters; + BOOLEAN CustomDirectory, CustomDevice; + + /* Initialize locals */ + CustomDirectory = TRUE; + CustomDevice = TRUE; + FontDevice = NULL; + FontPath = NULL; + FontDirectory = NULL; + + /* Check if a custom font path should be used */ + Status = BlGetBootOptionString(BlpApplicationEntry.BcdData, + BcdLibraryString_FontPath, + &FontDirectory); + if (!NT_SUCCESS(Status)) + { + /* Nope, use the one configured by the library */ + CustomDirectory = FALSE; + RtlCopyMemory(&LibraryParameters, + &BlpLibraryParameters, + sizeof(LibraryParameters)), + FontDirectory = LibraryParameters.FontBaseDirectory; + } + + /* Do we still not have a font directory? */ + if (!FontDirectory) + { + /* Use the boot device and boot directory */ + FontDevice = BlpBootDevice; + FontDirectory = L"\\EFI\\Microsoft\\Boot\\Fonts"; + CustomDevice = FALSE; + } + else + { + /* Otherwise, if we have a font directory, what device is the app on? */ + Status = BlGetBootOptionDevice(BlpApplicationEntry.BcdData, + BcdLibraryDevice_ApplicationDevice, + &FontDevice, + NULL); + if (!NT_SUCCESS(Status)) + { + /* If we don't know the device, we can't open the path */ + goto Quickie; + } + } + + /* Figure out the length of the file name, and of the directory */ + NameLength = wcslen(FontFileName); + DirectoryLength = wcslen(FontDirectory); + + /* Safely add them up*/ + Status = RtlULongAdd(NameLength, DirectoryLength, &TotalLength); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Convert to bytes */ + Status = RtlULongLongToULong(TotalLength * sizeof(WCHAR), &TotalLength); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Add a terminating NUL */ + Status = RtlULongAdd(TotalLength, sizeof(UNICODE_NULL), &TotalLength); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Allocate the final buffer for it */ + FontPath = BlMmAllocateHeap(TotalLength); + if (!FontPath) + { + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Concatenate the directory with the file name */ + wcscpy(FontPath, FontDirectory); + wcscat(FontPath, FontFileName); + + /* Try to load this font */ + Status = BfLoadFontFile(FontDevice, FontPath); + +Quickie: + /* Check if we had a custom font device allocated and free it */ + if ((CustomDevice) && (FontDevice)) + { + BlMmFreeHeap(FontDevice); + } + + /* Check if we had a custom font directory allocated and free it */ + if ((FontDirectory) && (CustomDirectory)) + { + BlMmFreeHeap(FontDirectory); + } + + /* Check if we had allocated a font path and free it */ + if (FontPath) + { + BlMmFreeHeap(FontPath); + } + + /* Return back */ + return Status; +} + +NTSTATUS +BlpDisplayRegisterLocale ( + _In_ PWCHAR Locale + ) +{ + BOOLEAN StandardLocale; + NTSTATUS Status; + PWCHAR FontFileName; + PBL_DEFERRED_FONT_FILE DeferredFont; + PLIST_ENTRY NextEntry; + WCHAR Prefix[3]; + + /* Assume custom locale */ + StandardLocale = FALSE; + + /* Bail out if the locale string seems invalid */ + if (wcslen(Locale) < 2) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check the prefix first, then traditional vs. simplified */ + Prefix[0] = Locale[0]; + Prefix[1] = Locale[1]; + Prefix[2] = UNICODE_NULL; + if (!_wcsicmp(Prefix, L"ja")) + { + FontFileName = L"\\jpn_boot.ttf"; + } + else if (!_wcsicmp(Prefix, L"ko")) + { + FontFileName = L"\\kor_boot.ttf"; + } + else if (!(_wcsicmp(Locale, L"zh-CN")) || + !(_wcsicmp(Locale, L"zh-CHS")) || + !(_wcsicmp(Locale, L"zh-Hans"))) + { + FontFileName = L"\\chs_boot.ttf"; + } + else if (!(_wcsicmp(Locale, L"zh-TW")) && + !(_wcsicmp(Locale, L"zh-CHT")) && + !(_wcsicmp(Locale, L"zh-HK")) && + !(_wcsicmp(Locale, L"zh-Hant"))) + { + FontFileName = L"\\cht_boot.ttf"; + } + else + { + StandardLocale = TRUE; + FontFileName = L"\\wgl4_boot.ttf"; + } + + /* Parse all the currently deferred fonts*/ + NextEntry = BfiDeferredListHead.Flink; + while (NextEntry != &BfiDeferredListHead) + { + /* Grab the font */ + DeferredFont = CONTAINING_RECORD(NextEntry, BL_DEFERRED_FONT_FILE, ListEntry); + + /* Move to the next entry, and remove this one */ + NextEntry = NextEntry->Flink; + RemoveEntryList(&DeferredFont->ListEntry); + + /* Free the deferred font, we'll be loading a new one */ + BfiFreeDeferredFontFile(DeferredFont); + } + + /* Load the primary font */ + Status = DsppLoadFontFile(FontFileName); + if (NT_SUCCESS(Status) && !(StandardLocale)) + { + /* Also load the standard US one if we loaded a different one */ + Status = DsppLoadFontFile(L"\\wgl4_boot.ttf"); + } + + /* Return back to caller */ + return Status; } NTSTATUS @@ -277,3 +474,93 @@ *TextHeight = 8; } } + +NTSTATUS +BlDisplaySetScreenResolution ( + VOID + ) +{ + PBL_GRAPHICS_CONSOLE Console; + NTSTATUS Status; + + /* Assume success */ + Status = STATUS_SUCCESS; + + /* Do we have a graphics console? */ + Console = DspGraphicalConsole; + if (Console) + { +#if 0 + /* Is it active? If not, activate it */ + if (((PBL_GRAPHICS_CONSOLE_VTABLE)Console->TextConsole.Callbacks)->IsActive()) + { + return ((PBL_GRAPHICS_CONSOLE_VTABLE)Console->TextConsole.Callbacks)->Activate(Console, FALSE); + } +#else + /* Not yet supported */ + EfiPrintf(L"Graphics not yet supported\r\n"); + //Status = STATUS_NOT_IMPLEMENTED; +#endif + } + + /* Do we have a text console? */ + if (!DspTextConsole) + { + /* Then fail, as no display appears active */ + Status = STATUS_UNSUCCESSFUL; + } + + /* Return back to the caller */ + return Status; +} + +NTSTATUS +BlDisplayGetScreenResolution ( + _Out_ PULONG HRes, + _Out_ PULONG Vres + ) +{ + NTSTATUS Status; +// PULONG Resolution; + + /* Assume failure if no consoles are active */ + Status = STATUS_UNSUCCESSFUL; + + /* Do we have a text console? */ + if (DspTextConsole) + { + /* Do we have an active graphics console? */ + if ((DspGraphicalConsole) +#if 0 + && (((PBL_GRAPHICS_CONSOLE_VTABLE)DspGraphicalConsole->TextConsole.Callbacks)->IsActive()) +#endif + ) + { +#if 0 + /* Get the resolution */ + Status = ((PBL_GRAPHICS_CONSOLE_VTABLE)DspGraphicalConsole->TextConsole.Callbacks)->GetResolution(DspGraphicalConsole, &Resolution); + if (NT_SUCCESS(Status)) + { + /* Return it back to the caller */ + *HRes = Resolution[0]; + *Vres = Resolution[1]; + } +#else + /* Not yet supported */ + EfiPrintf(L"Graphics not yet supported\r\n"); + Status = STATUS_NOT_IMPLEMENTED; + + } + else + { +#endif + /* Return defaults */ + *HRes = 640; + *Vres = 200; + Status = STATUS_SUCCESS; + } + } + + /* Return if we got a valid resolution back */ + return Status; +} Added: trunk/reactos/boot/environ/lib/misc/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/font… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/font.c (added) +++ trunk/reactos/boot/environ/lib/misc/font.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -0,0 +1,138 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/misc/font.c + * PURPOSE: Boot Library Font Functions + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +LIST_ENTRY BfiDeferredListHead; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +BfiLoadFontFile ( + _In_ PBL_DEVICE_DESCRIPTOR FontDevice, + _In_ PWCHAR FontPath + ) +{ + EfiPrintf(L"rotfl font loading\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +VOID +BfiFreeDeferredFontFile ( + _In_ PBL_DEFERRED_FONT_FILE DeferredFontFile + ) +{ + /* Free the device copy if there was one */ + if (DeferredFontFile->Device) + { + BlMmFreeHeap(DeferredFontFile->Device); + } + + /* Free the path copy if there was one */ + if (DeferredFontFile->FontPath) + { + BlMmFreeHeap(DeferredFontFile->FontPath); + } + + /* Free the whole thing */ + BlMmFreeHeap(DeferredFontFile); +} + +NTSTATUS +BfLoadFontFile ( + _In_ PBL_DEVICE_DESCRIPTOR Device, + _In_ PWCHAR FontPath + ) +{ + PBL_DEFERRED_FONT_FILE DeferredFont; + ULONG FontPathSize; + EfiPrintf(L"Adding deferred font: %s\r\n", FontPath); + + /* Allocate the deferred font structure */ + DeferredFont = (PBL_DEFERRED_FONT_FILE)BlMmAllocateHeap(sizeof(*DeferredFont)); + if (!DeferredFont) + { + return STATUS_NO_MEMORY; + } + + /* Zero it out */ + RtlZeroMemory(DeferredFont, sizeof(*DeferredFont)); + + /* Allocate a copy for the file path */ + FontPathSize = sizeof(WCHAR) * wcslen(FontPath) + sizeof(UNICODE_NULL); + DeferredFont->FontPath = (PWCHAR)BlMmAllocateHeap(FontPathSize); + if (!DeferredFont->FontPath) + { + BfiFreeDeferredFontFile(DeferredFont); + return STATUS_NO_MEMORY; + } + + /* Allocate a copy for the device */ + DeferredFont->Device = BlMmAllocateHeap(Device->Size); + if (!DeferredFont->Device) + { + BfiFreeDeferredFontFile(DeferredFont); + return STATUS_NO_MEMORY; + } + + /* Copy the path and device */ + RtlCopyMemory(DeferredFont->FontPath, FontPath, FontPathSize); + RtlCopyMemory(DeferredFont->Device,Device, Device->Size); + + /* Set pending flag? */ + DeferredFont->Flags = 1; + + /* Insert it into the list */ + InsertTailList(&BfiDeferredListHead, &DeferredFont->ListEntry); + return STATUS_SUCCESS; +} + +NTSTATUS +BfLoadDeferredFontFiles ( + VOID + ) +{ + PLIST_ENTRY NextEntry; + PBL_DEFERRED_FONT_FILE DeferredFont; + NTSTATUS Status, LoadStatus; + + /* Assume empty list */ + Status = STATUS_SUCCESS; + + /* Parse the list */ + NextEntry = BfiDeferredListHead.Flink; + while (NextEntry != &BfiDeferredListHead) + { + /* Get the font */ + DeferredFont = CONTAINING_RECORD(NextEntry, BL_DEFERRED_FONT_FILE, ListEntry); + + /* Move to the next entry and remove this one */ + NextEntry = NextEntry->Flink; + RemoveEntryList(&DeferredFont->ListEntry); + + /* Load the font */ + EfiPrintf(L"Found deferred font: %s\r\n", DeferredFont->FontPath); + LoadStatus = BfiLoadFontFile(DeferredFont->Device, + DeferredFont->FontPath); + if (!NT_SUCCESS(LoadStatus)) + { + /* Remember the load failure if there was one */ + Status = LoadStatus; + } + + /* Free the deferred font */ + BfiFreeDeferredFontFile(DeferredFont); + } + + /* Return load status */ + return Status; +} Propchange: trunk/reactos/boot/environ/lib/misc/font.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -551,3 +551,43 @@ return Status; } +PIMAGE_SECTION_HEADER +BlImgFindSection ( + _In_ PVOID ImageBase, + _In_ ULONG ImageSize + ) +{ + PIMAGE_SECTION_HEADER FoundSection; + ULONG i; + PIMAGE_SECTION_HEADER SectionHeader; + PIMAGE_NT_HEADERS NtHeader; + NTSTATUS Status; + + /* Assume failure */ + FoundSection = NULL; + + /* Make sure the image is valid */ + Status = RtlImageNtHeaderEx(0, ImageBase, ImageSize, &NtHeader); + if (NT_SUCCESS(Status)) + { + /* Get the first section and loop through them all */ + SectionHeader = IMAGE_FIRST_SECTION(NtHeader); + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Check if this is the resource section */ + if (!_stricmp((PCCH)SectionHeader->Name, ".rsrc")) + { + /* Yep, we're done */ + FoundSection = SectionHeader; + break; + } + + /* Nope, keep going */ + SectionHeader++; + } + } + + /* Return the matching section */ + return FoundSection; +} + Added: trunk/reactos/boot/environ/lib/misc/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/reso… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/resource.c (added) +++ trunk/reactos/boot/environ/lib/misc/resource.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -0,0 +1,549 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/misc/resource.c + * PURPOSE: Boot Library Resource Functions + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +PVOID ResPeImageBase; +PVOID ResPeImageEnd; +PVOID ResRootDirectory; + +PVOID ResPeImageBasePrimary; +PVOID ResPeImageEndPrimary; +PVOID ResRootDirectoryPrimary; +ULONG_PTR ResRootDirectoryPrimaryOffset; +ULONG_PTR ResRootDirectoryOffset; +ULONG_PTR ResRootDirectoryFallbackOffset; +PVOID ResPeImageBaseFallback; +PVOID ResPeImageEndFallback; +PVOID ResRootDirectoryFallback; + +BOOLEAN ResLoadedFontFiles; +PVOID ResMuiImageBase; +ULONG_PTR ResMuiImageSize; + +PWCHAR ResLocale; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +ResSelectLocale ( + _In_ BOOLEAN Primary + ) +{ + NTSTATUS Status; + + /* Check if we're using the primary (MUI) or fallback resources */ + if (Primary) + { + /* Use the primary ones */ + ResRootDirectory = ResRootDirectoryPrimary; + ResRootDirectoryOffset = ResRootDirectoryPrimaryOffset; + ResPeImageBase = ResPeImageBasePrimary; + ResPeImageEnd = ResPeImageEndPrimary; + + /* Register the locale with the display */ + Status = BlpDisplayRegisterLocale(ResLocale); + } + + /* Check if that failed, or if we're using fallback */ + if (!NT_SUCCESS(Status) || !(Primary)) + { + /* Set the fallback pointers */ + ResRootDirectory = ResRootDirectoryFallback; + ResRootDirectoryOffset = ResRootDirectoryFallbackOffset; + ResPeImageBase = ResPeImageBaseFallback; + ResPeImageEnd = ResPeImageEndFallback; + + /* Register the fallback (America baby!) locale */ + Status = BlpDisplayRegisterLocale(L"en-US"); + if (!NT_SUCCESS(Status)) + { + /* Fallback to text mode (yes, this is the API...) */ + return BlDisplaySetScreenResolution(); + } + } + + /* No fonts loaded -- return failure code */ + ResLoadedFontFiles = FALSE; + return Status; +} + +PIMAGE_RESOURCE_DIRECTORY_ENTRY +ResFindDirectoryEntry ( + _In_ PIMAGE_RESOURCE_DIRECTORY Directory, + _In_opt_ PUSHORT Id, + _In_opt_ PWCHAR Name, + _In_ ULONG_PTR SectionStart + ) +{ + PIMAGE_RESOURCE_DIRECTORY_ENTRY EntryTable, IdEntryTable; + ULONG i; + SIZE_T NameLength; + PIMAGE_RESOURCE_DIRECTORY_STRING NameString; + + /* Are we looking by ID or name? */ + if (Id) + { + /* By ID, so were we passed a name? */ + if (Name) + { + /* That doesn't make sense */ + return NULL; + } + } + else if (!Name) + { + /* By name, but we weren't given one. Also bad. */ + return NULL; + } + + /* Get the table of names */ + EntryTable = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(Directory + 1); + + /* Check if we are doing ID lookup instead */ + if (Id) + { + /* The IDs come after the names */ + IdEntryTable = &EntryTable[Directory->NumberOfNamedEntries]; + + /* Parse them */ + for (i = 0; i < Directory->NumberOfIdEntries; i++) + { + /* Check if the ID matches, or if the wildcard is being used*/ + if ((IdEntryTable[i].Id == *Id) || (*Id == 0xFFFF)) + { + /* Return a pointer to the data */ + return (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(SectionStart + IdEntryTable[i].OffsetToDirectory); + } + } + + /* ID was not found */ + return NULL; + } + + /* Searching by name, so parse them */ + for (i = 0; i < Directory->NumberOfNamedEntries; i++) + { + /* Get the name itself and count its length */ + NameString = (PIMAGE_RESOURCE_DIRECTORY_STRING)(SectionStart + EntryTable[i].NameOffset); + NameLength = wcslen(Name); + + /* If the length matches, compare the bytes */ + if ((NameLength == NameString->Length) && + (RtlCompareMemory(NameString->NameString, Name, NameLength) == NameLength)) + { + /* They both match, so this is our entry. Return it */ + return (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(SectionStart + EntryTable[i].OffsetToDirectory); + } + } + + /* Name was not found */ + return NULL; +} + +NTSTATUS +ResFindDataEntryFromImage ( + _In_opt_ PVOID ImageBase, + _In_opt_ ULONG ImageSize, + _In_ USHORT DirectoryId, + _In_ PUSHORT EntryId, + _In_ PWCHAR Name, + _Out_ PIMAGE_RESOURCE_DATA_ENTRY *DataEntryOut, + _Out_ PVOID* ResourceOut + ) +{ + NTSTATUS Status; + PIMAGE_SECTION_HEADER ResourceSection; + PIMAGE_RESOURCE_DIRECTORY ResourceDir, RootDir; + PIMAGE_RESOURCE_DIRECTORY_ENTRY DirEntry; + PIMAGE_RESOURCE_DATA_ENTRY DataEntry; + PVOID Data, DataEnd, ImageEnd; + BOOLEAN UseFallbackDirectory; + + /* Assume nothing found */ + UseFallbackDirectory = TRUE; + Status = STATUS_NOT_FOUND; + + /* Are we looking at a particular image? */ + if (ImageBase) + { + /* Then make sure we know its size */ + if (!ImageSize) + { + return Status; + } + + /* Find the resource section for it */ + ResourceSection = BlImgFindSection(ImageBase, ImageSize); + if (!ResourceSection) + { + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Remember how big the image is, and find the resource directory */ + ImageEnd = (PVOID)((ULONG_PTR)ImageBase + ImageSize); + RootDir = (PIMAGE_RESOURCE_DIRECTORY)((ULONG_PTR)ImageBase + + ResourceSection->VirtualAddress); + if ((PVOID)RootDir < ImageBase) + { + /* It's out of bounds, so bail out */ + return STATUS_INVALID_PARAMETER; + } + + /* We have a valid directory, don't use fallback for now */ + UseFallbackDirectory = FALSE; + } + else + { + /* We are using the current library settings instead */ + ImageBase = ResPeImageBase; + RootDir = ResRootDirectory; + ImageEnd = ResPeImageEnd; + } + + /* If we don't have a resource directory, there's nothing to find */ + if (!RootDir) + { + return Status; + } + + /* Try two loops, once for primary, once for fallback */ + while (1) + { + /* Find the directory first */ + ResourceDir = (PIMAGE_RESOURCE_DIRECTORY)ResFindDirectoryEntry(RootDir, + &DirectoryId, + NULL, + (ULONG_PTR)RootDir); + if (ResourceDir) + { + break; + } + + /* We didn't find it -- is it time to use the fallback? */ + if (UseFallbackDirectory) + { + /* Were were not using the fallback already? */ + if (RootDir != ResRootDirectoryFallback) + { + /* Then attempt with the fallback instead*/ + RootDir = ResRootDirectoryFallback; + ImageBase = ResPeImageBaseFallback; + ImageEnd = ResPeImageEndFallback; + + /* Making sure we have one... */ + if (RootDir) + { + continue; + } + } + } + + /* Otherwise, return failure here */ + return Status; + } + + /* Now that we are in the right directory, lookup the resource */ + ResourceDir = (PIMAGE_RESOURCE_DIRECTORY)ResFindDirectoryEntry(ResourceDir, + EntryId, + Name, + (ULONG_PTR)RootDir); + if (!ResourceDir) + { + return Status; + } + + /* The entry is right after */ + DirEntry = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(ResourceDir + 1); + if ((PVOID)DirEntry < (PVOID)ResourceDir) + { + return STATUS_INVALID_PARAMETER; + } + + /* Get the data entry for it */ + DataEntry = (PIMAGE_RESOURCE_DATA_ENTRY)((ULONG_PTR)RootDir + + DirEntry->OffsetToData); + + /* Check if the data entry is out of bounds */ + if (((PVOID)DataEntry < ImageBase) || ((PVOID)DataEntry > ImageEnd)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Finally read the data offset */ + Data = (PVOID)((ULONG_PTR)ImageBase + DataEntry->OffsetToData); + + /* Check if the data is out of bounds */ + if (((PVOID)Data < ImageBase) || ((PVOID)Data > ImageEnd)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Make sure the data end isn't out of bounds either */ + DataEnd = (PVOID)((ULONG_PTR)Data + DataEntry->Size); + if (((PVOID)DataEnd < ImageBase) || ((PVOID)DataEnd > ImageEnd)) + { + return STATUS_INVALID_PARAMETER; + } + + /* We finally made it. Return the entry and the raw data */ + *DataEntryOut = DataEntry; + *ResourceOut = Data; + return STATUS_SUCCESS; +} + +PWCHAR +BlResourceFindHtml ( + VOID + ) +{ + NTSTATUS Status; + PIMAGE_RESOURCE_DATA_ENTRY HtmlDataEntry; + PWCHAR Stylesheet; + + /* Assume failure */ + Stylesheet = NULL; + + /* Look for an RT_HTML resource called BOOTMGR.XSL */ + Status = ResFindDataEntryFromImage(NULL, + 0, + 23, + NULL, + L"BOOTMGR.XSL", + &HtmlDataEntry, + (PVOID*)&Stylesheet); + if (!NT_SUCCESS(Status)) + { + return Stylesheet; + } + + /* Check for Unicode BOM */ + if (*Stylesheet == 0xFEFF) + { + /* Overwrite it, and NULL-terminate */ + RtlMoveMemory(Stylesheet, + Stylesheet + 1, + HtmlDataEntry->Size - sizeof(WCHAR)); + Stylesheet[(HtmlDataEntry->Size / sizeof(WCHAR)) - 1] = UNICODE_NULL; + } + else if (Stylesheet[(HtmlDataEntry->Size / sizeof(WCHAR)) - 1] != UNICODE_NULL) + { + /* If it's not NULL-terminated, fail */ + Stylesheet = NULL; + } + + /* Return it back */ + return Stylesheet; +} + +PWCHAR +BlResourceFindMessage ( + _In_ ULONG MsgId + ) +{ + PWCHAR Message; + PIMAGE_RESOURCE_DIRECTORY ResourceDir; + PIMAGE_RESOURCE_DATA_ENTRY DataEntry; + PMESSAGE_RESOURCE_DATA MsgData; + PMESSAGE_RESOURCE_ENTRY MsgEntry; + ULONG i, j; + USHORT Id; + PVOID MsgEnd; + NTSTATUS Status; + + /* Bail out if there's no resource directory */ + Message = NULL; + if (!ResRootDirectory) + { + return Message; + } + + /* Check if we've loaded fonts already */ + if (!ResLoadedFontFiles) + { + /* Nope, load them now */ + Status = BfLoadDeferredFontFiles(); + if (!NT_SUCCESS(Status)) + { + /* We failed to load fonts, fallback to fallback locale */ + Status = ResSelectLocale(FALSE); + if (NT_SUCCESS(Status)) + { + /* Try fonts now */ + Status = BfLoadDeferredFontFiles(); + if (!NT_SUCCESS(Status)) + { + /* Still didn't work -- fallback to text mode */ + Status = BlDisplaySetScreenResolution(); + if (!NT_SUCCESS(Status)) + { + /* That didn't work either. F*ck it. */ + return Message; + } + } + } + } + + /* Now we have a resource directory, and fonts are loaded */ + NT_ASSERT(ResRootDirectory != NULL); + ResLoadedFontFiles = TRUE; + } + + /* Go look for RT_MESSAGETABLE */ + Id = 11; + ResourceDir = (PIMAGE_RESOURCE_DIRECTORY)ResFindDirectoryEntry(ResRootDirectory, + &Id, + NULL, + (ULONG_PTR)ResRootDirectory); + if (!ResourceDir) + { + return Message; + } + + /* Go look for the first directory in the table */ + Id = 1; + ResourceDir = (PIMAGE_RESOURCE_DIRECTORY)ResFindDirectoryEntry(ResourceDir, + &Id, + NULL, + (ULONG_PTR)ResRootDirectory); + if (!ResourceDir) + { + return Message; + } + + /* Go look for any language entry in the table */ + Id = -1; + DataEntry = (PIMAGE_RESOURCE_DATA_ENTRY)ResFindDirectoryEntry(ResourceDir, + &Id, + NULL, + (ULONG_PTR)ResRootDirectory); + if (!DataEntry) + { + return Message; + } + + /* Get the message data*/ + MsgData = (PMESSAGE_RESOURCE_DATA)((ULONG_PTR)ResRootDirectory + + DataEntry->OffsetToData - + ResRootDirectoryOffset); + + /* Loop through the message blocks */ + for (j = 0; j < MsgData->NumberOfBlocks; j++) + { + /* Check if the ID is within this range */ + if ((MsgId >= MsgData->Blocks[j].LowId) && + (MsgId <= MsgData->Blocks[j].HighId)) + { + /* Get the first entry */ + MsgEntry = (PMESSAGE_RESOURCE_ENTRY)((ULONG_PTR)MsgData + + MsgData->Blocks[j].OffsetToEntries); + + /* Loop till we find the right one */ + for (i = MsgId - MsgData->Blocks[j].LowId; i; --i) + { + MsgEntry = (PMESSAGE_RESOURCE_ENTRY)((ULONG_PTR)MsgEntry + + MsgEntry->Length); + } + + /* Find where this message ends */ + MsgEnd = (PVOID)((ULONG_PTR)MsgEntry + MsgEntry->Length); + + /* Now make sure that the message is within bounds */ + if ((MsgEnd >= (PVOID)MsgEntry) && + ((PVOID)MsgEntry >= ResPeImageBase) && + (MsgEnd <= ResPeImageEnd)) + { + /* If so, read the text associated with it */ + Message = (PWCHAR)MsgEntry->Text; + break; + } + } + } + + /* Return the text, if one was found */ + return Message; +} + +NTSTATUS +BlpResourceInitialize ( + VOID + ) +{ + NTSTATUS Status; + PIMAGE_SECTION_HEADER ResourceSection; + PVOID ImageBase; + ULONG ImageSize, VRes, HRes; + BOOLEAN UsePrimary; + + /* Default to using fallback */ + UsePrimary = FALSE; + + /* Initialize all globals */ + ResMuiImageBase = 0; + ResMuiImageSize = 0; + ResRootDirectoryPrimary = 0; + ResRootDirectoryPrimaryOffset = 0; + ResPeImageBasePrimary = 0; + ResPeImageEndPrimary = 0; + ResRootDirectoryFallback = 0; + ResRootDirectoryFallbackOffset = 0; + ResPeImageBaseFallback = 0; + ResPeImageEndFallback = 0; + ResRootDirectory = 0; + ResRootDirectoryOffset = 0; + ResPeImageBase = 0; + ResPeImageEnd = 0; + ResLoadedFontFiles = 0; + + /* Check if we had allocated a locale already */ + if (ResLocale) + { + /* Free it and reset */ + BlMmFreeHeap(ResLocale); + ResLocale = 0; + } + + /* Get our base address and size*/ + Status = BlGetApplicationBaseAndSize(&ImageBase, &ImageSize); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Find our resource section */ + ResourceSection = BlImgFindSection(ImageBase, ImageSize); + if (ResourceSection) + { + /* The resource section will be our fallback. Save down its details */ + ResRootDirectoryFallbackOffset = ResourceSection->VirtualAddress; + ResPeImageBaseFallback = ImageBase; + ResPeImageEndFallback = (PVOID)((ULONG_PTR)ImageBase + ImageSize); + ResRootDirectoryFallback = (PIMAGE_RESOURCE_DIRECTORY)((ULONG_PTR)ImageBase + + ResRootDirectoryFallbackOffset); + } + + /* Get the current screen resolution and check if we're in graphics mode */ + Status = BlDisplayGetScreenResolution(&HRes, &VRes); + if ((NT_SUCCESS(Status)) && ((HRes != 640) || (VRes != 200))) + { + /* We are... we should load MUI data */ + Status = STATUS_NOT_IMPLEMENTED;//ResInitializeMuiResources(); + if (NT_SUCCESS(Status)) + { + /* And not rely on the fallback */ + UsePrimary = TRUE; + } + } + + /* Load the locale resources */ + return ResSelectLocale(UsePrimary); +} Propchange: trunk/reactos/boot/environ/lib/misc/resource.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -28,8 +28,6 @@ BOOLEAN UtlProgressNeedsInfoUpdate; PVOID UtlProgressInfo; -PVOID ResRootDirectory; - /* FUNCTIONS *****************************************************************/ VOID @@ -45,161 +43,6 @@ else if (*Completed) { *Completed = TRUE; - } -} - -PWCHAR -BlResourceFindMessage ( - _In_ ULONG MsgId - ) -{ - PWCHAR Message; - - /* Assume failure */ - Message = NULL; - - /* Check if we've loaded resources */ - if (ResRootDirectory) - { - /* Not yet handled */ - EfiPrintf(L"Not implemented\r\n"); - } - - /* Return the message for this ID */ - return Message; -} - -/*++ - * @name EfiGetEfiStatusCode - * - * The EfiGetEfiStatusCode routine converts an NT Status to an EFI status. - * - * @param Status - * NT Status code to be converted. - * - * @remark Only certain, specific NT status codes are converted to EFI codes. - * - * @return The corresponding EFI Status code, EFI_NO_MAPPING otherwise. - * - *--*/ -EFI_STATUS -EfiGetEfiStatusCode( - _In_ NTSTATUS Status - ) -{ - switch (Status) - { - case STATUS_NOT_SUPPORTED: - return EFI_UNSUPPORTED; - case STATUS_DISK_FULL: - return EFI_VOLUME_FULL; - case STATUS_INSUFFICIENT_RESOURCES: - return EFI_OUT_OF_RESOURCES; - case STATUS_MEDIA_WRITE_PROTECTED: - return EFI_WRITE_PROTECTED; - case STATUS_DEVICE_NOT_READY: - return EFI_NOT_STARTED; - case STATUS_DEVICE_ALREADY_ATTACHED: - return EFI_ALREADY_STARTED; - case STATUS_MEDIA_CHANGED: - return EFI_MEDIA_CHANGED; - case STATUS_INVALID_PARAMETER: - return EFI_INVALID_PARAMETER; - case STATUS_ACCESS_DENIED: - return EFI_ACCESS_DENIED; - case STATUS_BUFFER_TOO_SMALL: - return EFI_BUFFER_TOO_SMALL; - case STATUS_DISK_CORRUPT_ERROR: - return EFI_VOLUME_CORRUPTED; - case STATUS_REQUEST_ABORTED: - return EFI_ABORTED; - case STATUS_NO_MEDIA: - return EFI_NO_MEDIA; - case STATUS_IO_DEVICE_ERROR: - return EFI_DEVICE_ERROR; - case STATUS_INVALID_BUFFER_SIZE: - return EFI_BAD_BUFFER_SIZE; - case STATUS_NOT_FOUND: - return EFI_NOT_FOUND; - case STATUS_DRIVER_UNABLE_TO_LOAD: - return EFI_LOAD_ERROR; - case STATUS_NO_MATCH: - return EFI_NO_MAPPING; - case STATUS_SUCCESS: - return EFI_SUCCESS; - case STATUS_TIMEOUT: - return EFI_TIMEOUT; - default: - return EFI_NO_MAPPING; - } -} - -/*++ - * @name EfiGetNtStatusCode - * - * The EfiGetNtStatusCode routine converts an EFI Status to an NT status. - * - * @param EfiStatus - * EFI Status code to be converted. - * - * @remark Only certain, specific EFI status codes are converted to NT codes. - * - * @return The corresponding NT Status code, STATUS_UNSUCCESSFUL otherwise. - * - *--*/ -NTSTATUS -EfiGetNtStatusCode ( - _In_ EFI_STATUS EfiStatus - ) -{ - switch (EfiStatus) - { - case EFI_NOT_READY: - case EFI_NOT_FOUND: - return STATUS_NOT_FOUND; - case EFI_NO_MEDIA: - return STATUS_NO_MEDIA; - case EFI_MEDIA_CHANGED: - return STATUS_MEDIA_CHANGED; - case EFI_ACCESS_DENIED: - case EFI_SECURITY_VIOLATION: - return STATUS_ACCESS_DENIED; - case EFI_TIMEOUT: - case EFI_NO_RESPONSE: - return STATUS_TIMEOUT; - case EFI_NO_MAPPING: - return STATUS_NO_MATCH; - case EFI_NOT_STARTED: - return STATUS_DEVICE_NOT_READY; - case EFI_ALREADY_STARTED: - return STATUS_DEVICE_ALREADY_ATTACHED; - case EFI_ABORTED: - return STATUS_REQUEST_ABORTED; - case EFI_VOLUME_FULL: - return STATUS_DISK_FULL; - case EFI_DEVICE_ERROR: - return STATUS_IO_DEVICE_ERROR; - case EFI_WRITE_PROTECTED: - return STATUS_MEDIA_WRITE_PROTECTED; - /* @FIXME: ReactOS Headers don't yet have this */ - //case EFI_OUT_OF_RESOURCES: - //return STATUS_INSUFFICIENT_NVRAM_RESOURCES; - case EFI_VOLUME_CORRUPTED: - return STATUS_DISK_CORRUPT_ERROR; - case EFI_BUFFER_TOO_SMALL: - return STATUS_BUFFER_TOO_SMALL; - case EFI_SUCCESS: - return STATUS_SUCCESS; - case EFI_LOAD_ERROR: - return STATUS_DRIVER_UNABLE_TO_LOAD; - case EFI_INVALID_PARAMETER: - return STATUS_INVALID_PARAMETER; - case EFI_UNSUPPORTED: - return STATUS_NOT_SUPPORTED; - case EFI_BAD_BUFFER_SIZE: - return STATUS_INVALID_BUFFER_SIZE; - default: - return STATUS_UNSUCCESSFUL; } } @@ -676,16 +519,3 @@ return Status; } -VOID -BlFwReboot ( - VOID - ) -{ -#ifdef BL_KD_SUPPORTED - /* Stop the boot debugger*/ - BlBdStop(); -#endif - - /* Reset the machine */ - EfiResetSystem(EfiResetCold); -} Modified: trunk/reactos/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/CMakeLi… ============================================================================== --- trunk/reactos/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/CMakeLists.txt [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -1,16 +1,17 @@ list(APPEND ANSI_SOURCE - bugcodes.mc) + bugcodes.mc) list(APPEND UNICODE_SOURCE - errcodes.mc - neteventmsg.mc - ntiologc.mc - ntstatus.mc - pciclass.mc) + errcodes.mc + neteventmsg.mc + ntiologc.mc + ntstatus.mc + pciclass.mc) list(APPEND UNICODE_SOURCE_REALLY - sacmsg.mc) + bootmsg.mc + sacmsg.mc) add_message_headers(ANSI ${ANSI_SOURCE}) # FIXME: this needs testing before switching to unicode Added: trunk/reactos/include/reactos/mc/bootmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bootmsg… ============================================================================== --- trunk/reactos/include/reactos/mc/bootmsg.mc (added) +++ trunk/reactos/include/reactos/mc/bootmsg.mc [iso-8859-1] Wed Jan 6 04:43:23 2016 @@ -0,0 +1,17 @@ +MessageId=9001 +SymbolicName=BM_MSG_FIRST +Language=English +BM_MSG_FIRST +. + +MessageId=9002 +SymbolicName=BM_MSG_BCD_ERROR +Language=English +The Boot Configuration Data for your PC is missing or contains errors. +. + +MessageId=9999 +SymbolicName=BM_MSG_TEST +Language=English +We are A-ok!!! +. Propchange: trunk/reactos/include/reactos/mc/bootmsg.mc ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 8 months

[cfinck] 70503: [WINSPOOL] Add and fully implement IsValidDevmodeA and IsValidDevmodeW. [WINSPOOL_APITEST] Add tests for IsValidDevmodeA and IsValidDevmodeW covering the entire functions.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 6 04:31:53 2016 New Revision: 70503 URL: http://svn.reactos.org/svn/reactos?rev=70503&view=rev Log: [WINSPOOL] Add and fully implement IsValidDevmodeA and IsValidDevmodeW. [WINSPOOL_APITEST] Add tests for IsValidDevmodeA and IsValidDevmodeW covering the entire functions. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/devmode.c (with props) branches/colins-printing-for-freedom/rostests/apitests/winspool/IsValidDevmode.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Wed Jan 6 04:31:53 2016 @@ -4,6 +4,7 @@ spec2def(winspool.drv winspool.spec ADD_IMPORTLIB) list(APPEND SOURCE + devmode.c jobs.c main.c monitors.c Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/devmode.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/devmode.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/devmode.c [iso-8859-1] Wed Jan 6 04:31:53 2016 @@ -0,0 +1,42 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions giving information about DEVMODE structures + * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +IsValidDevmodeA(PDEVMODEA pDevmode, size_t DevmodeSize) +{ + // Check if a Devmode was given, its dmSize member is at least as big as the DEVMODEA structure + // and DevmodeSize is large enough for the public and private members of the structure. + if (!pDevmode || + pDevmode->dmSize < sizeof(DEVMODEA) || + DevmodeSize < pDevmode->dmSize + pDevmode->dmDriverExtra) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + // Return success without setting the error code. + return TRUE; +} + +BOOL WINAPI +IsValidDevmodeW(PDEVMODEW pDevmode, size_t DevmodeSize) +{ + // Check if a Devmode was given, its dmSize member is at least as big as the DEVMODEW structure + // and DevmodeSize is large enough for the public and private members of the structure. + if (!pDevmode || + pDevmode->dmSize < sizeof(DEVMODEW) || + DevmodeSize < pDevmode->dmSize + pDevmode->dmDriverExtra) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + // Return success without setting the error code. + return TRUE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/devmode.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Wed Jan 6 04:31:53 2016 @@ -157,8 +157,8 @@ 256 stdcall GetPrinterDriverW(long wstr long ptr long ptr) 257 stdcall GetPrinterW(long long ptr long ptr) 258 stub GetSpoolFileHandle -259 stub IsValidDevmodeA -260 stub IsValidDevmodeW +259 stdcall IsValidDevmodeA(ptr long) +260 stdcall IsValidDevmodeW(ptr long) 261 stdcall OpenPrinterA(str ptr ptr) 262 stdcall OpenPrinterW(wstr ptr ptr) 263 stub PlayGdiScriptOnPrinterIC Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt [iso-8859-1] Wed Jan 6 04:31:53 2016 @@ -4,6 +4,7 @@ EnumPrinters.c EnumPrintProcessorDatatypes.c GetPrintProcessorDirectory.c + IsValidDevmode.c OpenPrinter.c StartDocPrinter.c testlist.c) Added: branches/colins-printing-for-freedom/rostests/apitests/winspool/IsValidDevmode.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/IsValidDevmode.c (added) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/IsValidDevmode.c [iso-8859-1] Wed Jan 6 04:31:53 2016 @@ -0,0 +1,130 @@ +/* + * PROJECT: ReactOS Print Spooler DLL API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Tests for IsValidDevmodeA/IsValidDevmodeW + * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> + +// With very high probability, this is everything you can test for IsValidDevmode. +// For your own testing, you can fill a DevMode structure with random bytes multiple times, +// always set dmSize and dmDriverExtra appropriately and feed it to IsValidDevmode. +// The function will always succeed. +// I'm not doing that here, because I don't want to introduce randomness. + +START_TEST(IsValidDevmodeA) +{ + DEVMODEA DevMode; + + // Give no Devmode at all, this has to fail without crashing. + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeA(NULL, sizeof(DEVMODEA)), "IsValidDevmodeA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeA returns error %lu!\n", GetLastError()); + + // Give a zeroed Devmode, this has to fail, because dmSize isn't set. + ZeroMemory(&DevMode, sizeof(DEVMODEA)); + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeA(&DevMode, sizeof(DEVMODEA)), "IsValidDevmodeA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeA returns error %lu!\n", GetLastError()); + + // Now set only the dmSize member, IsValidDevmodeA should return TRUE now. The Last Error isn't touched again. + ZeroMemory(&DevMode, sizeof(DEVMODEA)); + DevMode.dmSize = sizeof(DEVMODEA); + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeA(&DevMode, sizeof(DEVMODEA)), "IsValidDevmodeA returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeA returns error %lu!\n", GetLastError()); + + // IsValidDevmodeA should also succeed if the DevMode appears to be larger. + ZeroMemory(&DevMode, sizeof(DEVMODEA)); + DevMode.dmSize = sizeof(DEVMODEA) + 1; + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeA(&DevMode, sizeof(DEVMODEA) + 1), "IsValidDevmodeA returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeA returns error %lu!\n", GetLastError()); + + // The DevmodeSize parameter may be larger than dmSize, but not the other way round! + ZeroMemory(&DevMode, sizeof(DEVMODEA)); + DevMode.dmSize = sizeof(DEVMODEA); + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeA(&DevMode, sizeof(DEVMODEA) + 1), "IsValidDevmodeA returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeA returns error %lu!\n", GetLastError()); + + ZeroMemory(&DevMode, sizeof(DEVMODEA)); + DevMode.dmSize = sizeof(DEVMODEA) + 1; + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeA(&DevMode, sizeof(DEVMODEA)), "IsValidDevmodeA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeA returns error %lu!\n", GetLastError()); + + // dmDriverExtra is also taken into account. + ZeroMemory(&DevMode, sizeof(DEVMODEA)); + DevMode.dmSize = sizeof(DEVMODEA); + DevMode.dmDriverExtra = 1; + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeA(&DevMode, sizeof(DEVMODEA)), "IsValidDevmodeA returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeA returns error %lu!\n", GetLastError()); + + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeA(&DevMode, sizeof(DEVMODEA) + 1), "IsValidDevmodeA returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeA returns error %lu!\n", GetLastError()); +} + +START_TEST(IsValidDevmodeW) +{ + DEVMODEW DevMode; + + // Give no Devmode at all, this has to fail without crashing. + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeW(NULL, sizeof(DEVMODEW)), "IsValidDevmodeW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeW returns error %lu!\n", GetLastError()); + + // Give a zeroed Devmode, this has to fail, because dmSize isn't set. + ZeroMemory(&DevMode, sizeof(DEVMODEW)); + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeW(&DevMode, sizeof(DEVMODEW)), "IsValidDevmodeW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeW returns error %lu!\n", GetLastError()); + + // Now set only the dmSize member, IsValidDevmodeW should return TRUE now. The Last Error isn't touched again. + ZeroMemory(&DevMode, sizeof(DEVMODEW)); + DevMode.dmSize = sizeof(DEVMODEW); + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeW(&DevMode, sizeof(DEVMODEW)), "IsValidDevmodeW returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeW returns error %lu!\n", GetLastError()); + + // IsValidDevmodeW should also succeed if the DevMode appears to be larger. + ZeroMemory(&DevMode, sizeof(DEVMODEW)); + DevMode.dmSize = sizeof(DEVMODEW) + 1; + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeW(&DevMode, sizeof(DEVMODEW) + 1), "IsValidDevmodeW returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeW returns error %lu!\n", GetLastError()); + + // The DevmodeSize parameter may be larger than dmSize, but not the other way round! + ZeroMemory(&DevMode, sizeof(DEVMODEW)); + DevMode.dmSize = sizeof(DEVMODEW); + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeW(&DevMode, sizeof(DEVMODEW) + 1), "IsValidDevmodeW returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeW returns error %lu!\n", GetLastError()); + + ZeroMemory(&DevMode, sizeof(DEVMODEW)); + DevMode.dmSize = sizeof(DEVMODEW) + 1; + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeW(&DevMode, sizeof(DEVMODEW)), "IsValidDevmodeW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeW returns error %lu!\n", GetLastError()); + + // dmDriverExtra is also taken into account. + ZeroMemory(&DevMode, sizeof(DEVMODEW)); + DevMode.dmSize = sizeof(DEVMODEW); + DevMode.dmDriverExtra = 1; + SetLastError(0xDEADBEEF); + ok(!IsValidDevmodeW(&DevMode, sizeof(DEVMODEW)), "IsValidDevmodeW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "IsValidDevmodeW returns error %lu!\n", GetLastError()); + + SetLastError(0xDEADBEEF); + ok(IsValidDevmodeW(&DevMode, sizeof(DEVMODEW) + 1), "IsValidDevmodeW returns FALSE!\n"); + ok(GetLastError() == 0xDEADBEEF, "IsValidDevmodeW returns error %lu!\n", GetLastError()); +} Propchange: branches/colins-printing-for-freedom/rostests/apitests/winspool/IsValidDevmode.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c [iso-8859-1] Wed Jan 6 04:31:53 2016 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler DLL API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Test list - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> */ #define __ROS_LONG64__ @@ -14,6 +14,8 @@ extern void func_EnumPrinters(void); extern void func_EnumPrintProcessorDatatypes(void); extern void func_GetPrintProcessorDirectory(void); +extern void func_IsValidDevmodeA(void); +extern void func_IsValidDevmodeW(void); extern void func_OpenPrinter(void); extern void func_StartDocPrinter(void); @@ -23,6 +25,8 @@ { "EnumPrinters", func_EnumPrinters }, { "EnumPrintProcessorDatatypes", func_EnumPrintProcessorDatatypes }, { "GetPrintProcessorDirectory", func_GetPrintProcessorDirectory }, + { "IsValidDevmodeA", func_IsValidDevmodeA }, + { "IsValidDevmodeW", func_IsValidDevmodeW }, { "OpenPrinter", func_OpenPrinter }, { "StartDocPrinter", func_StartDocPrinter },

8 years, 8 months

[cfinck] 70502: [SKIPLIST] Add a missing dependency to psdk for the skiplist code. Work in this branch continues as long as Trunk still serves a purpose for the 0.4.0 release.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 6 02:31:14 2016 New Revision: 70502 URL: http://svn.reactos.org/svn/reactos?rev=70502&view=rev Log: [SKIPLIST] Add a missing dependency to psdk for the skiplist code. Work in this branch continues as long as Trunk still serves a purpose for the 0.4.0 release. Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt [iso-8859-1] Wed Jan 6 02:31:14 2016 @@ -2,6 +2,7 @@ # The library add_definitions(-DSKIPLIST_LEVELS=16) add_library(skiplist16 skiplist.c) +add_dependencies(skiplist16 psdk) # The Test program add_executable(skiplist_test skiplist_test.c)

8 years, 8 months

[cfinck] 70501: I think almost 10 years of participation suffice to get into this file :)

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 6 02:19:53 2016 New Revision: 70501 URL: http://svn.reactos.org/svn/reactos?rev=70501&view=rev Log: I think almost 10 years of participation suffice to get into this file :) Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=70501&r1=70500… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Wed Jan 6 02:19:53 2016 @@ -13,6 +13,7 @@ Cameron M. Gutman <cgutman(a)reactos.org> Casper S. Hornstrup <chorns(a)users.sourceforge.net> Christoph von Wittich <christoph_vw(a)reactos.org> +Colin Finck <colin(a)reactos.org> Daniel Reimer <reimer.daniel(a)freenet.de> David Welch <welch(a)cwcom.net> Dmitry Chapyshev <dmitry(a)reactos.org>

8 years, 8 months

[pschweitzer] 70500: [ROSVBOXMGMT] Add a new feature to the tool: Let it auto start VBox Shared folders and to browse all the available shares in order to create shell links on desktop. The purpose...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Jan 5 22:56:20 2016 New Revision: 70500 URL: http://svn.reactos.org/svn/reactos?rev=70500&view=rev Log: [ROSVBOXMGMT] Add a new feature to the tool: Let it auto start VBox Shared folders and to browse all the available shares in order to create shell links on desktop. The purpose is to workaround the missing network shares discovery feature in ReactOS while keeping the VBox shared folders usage 'user-friendly'. It has been designed specifically for the coming 0.4.0 release: just put it on autostart for the default user. If there are shares (even new ones), it will create links, if there are no shares, no guest additions, no VBox, it will just exit. See it in action: https://twitter.com/HeisSpiter/status/684506579555741696 CORE-10032 ROSAPPS-303 Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/CMakeLists.txt [iso-8859-1] Tue Jan 5 22:56:20 2016 @@ -1,4 +1,6 @@ add_executable(rosvboxmgmt rosvboxmgmt.c rosvboxmgmt.rc) set_module_type(rosvboxmgmt win32cui UNICODE) -add_importlibs(rosvboxmgmt msvcrt kernel32) +target_link_libraries(rosvboxmgmt uuid) +add_delay_importlibs(rosvboxmgmt shell32) +add_importlibs(rosvboxmgmt msvcrt kernel32 user32 ole32) add_cd_file(TARGET rosvboxmgmt DESTINATION reactos/bin FOR all) Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Tue Jan 5 22:56:20 2016 @@ -9,6 +9,9 @@ #include <stdio.h> #include <wchar.h> #include <windows.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <shlwapi.h> /* DON'T CHANGE ORDER!!!! */ PCWSTR devices[3] = { L"\\\\.\\VBoxMiniRdrDN", L"\\??\\VBoxMiniRdrDN", L"\\Device\\VBoxMiniRdr" }; @@ -123,7 +126,7 @@ return 0; } -PWSTR getGlobalConn(CHAR id) +PCWSTR getGlobalConn(CHAR id) { BOOL ret; static WCHAR name[MAX_LEN]; @@ -157,7 +160,7 @@ { CHAR id = outputBuffer[i]; BOOL active = ((id & 0x80) == 0x80); - PWSTR name = NULL; + PCWSTR name = NULL; if (active) { @@ -169,6 +172,90 @@ } wprintf(L"%c: %s (%s)%c", 'A' + i, (active ? L"Active" : L"Inactive"), name, (i & 1 ? '\n' : '\t')); + } + + return 0; +} + +BOOL CreateUNCShortcut(PCWSTR share) +{ + HRESULT res; + IShellLink *link; + IPersistFile *persist; + WCHAR path[MAX_PATH]; + WCHAR linkPath[MAX_PATH]; + + res = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (void**)&link); + if (FAILED(res)) + { + return FALSE; + } + + res = link->lpVtbl->QueryInterface(link, &IID_IPersistFile, (void **)&persist); + if (FAILED(res)) + { + link->lpVtbl->Release(link); + return FALSE; + } + + wcscpy(path, L"\\\\vboxsvr\\"); + wcscat(path, share); + link->lpVtbl->SetPath(link, path); + + res = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY, NULL, 0, path); + if (FAILED(res)) + { + persist->lpVtbl->Release(persist); + link->lpVtbl->Release(link); + return FALSE; + } + + wsprintf(linkPath, L"%s\\Browse %s (VBox).lnk", path, share); + res = persist->lpVtbl->Save(persist, linkPath, TRUE); + + persist->lpVtbl->Release(persist); + link->lpVtbl->Release(link); + + return SUCCEEDED(res); +} + +int autoStart(void) +{ + short i; + BOOL ret; + DWORD outputBufferSize; + char outputBuffer[_MRX_MAX_DRIVE_LETTERS]; + + if (startVBoxSrv() != 0) + { + return 1; + } + + outputBufferSize = sizeof(outputBuffer); + memset(outputBuffer, 0, outputBufferSize); + ret = performDevIoCtl(IOCTL_MRX_VBOX_GETGLOBALLIST, NULL, 0, &outputBuffer, outputBufferSize); + if (ret == FALSE) + { + return 1; + } + + CoInitialize(NULL); + for (i = 0; i < _MRX_MAX_DRIVE_LETTERS; ++i) + { + CHAR id = outputBuffer[i]; + BOOL active = ((id & 0x80) == 0x80); + PCWSTR name = NULL; + + if (active) + { + name = getGlobalConn(id); + } + if (name == NULL) + { + continue; + } + + CreateUNCShortcut(name); } return 0; @@ -181,6 +268,7 @@ wprintf(L"\taddconn <letter> <share name>: add a connection\n"); wprintf(L"\tgetlist: list connections\n"); wprintf(L"\tgetgloballist: list available shares\n"); + wprintf(L"\tauto: automagically configure the VBox Shared folders and creates desktop folders\n"); } int wmain(int argc, wchar_t *argv[]) @@ -217,6 +305,10 @@ { return getGlobalList(); } + else if (_wcsicmp(cmd, L"auto") == 0) + { + return autoStart(); + } else { printUsage();

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2016