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

Date:

2011-10-23 10:06:52 (12 years 6 months ago)

Author:

blackosx

Commit:

1653

Parents:

1652

Message:

Merge latest trunk chnages in to my branch.

Changes:

M	/branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings
M	/branches/blackosx/i386/boot2/boot.h
M	/branches/blackosx/package/Resources/mk.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/fr.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/es.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/hr.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/pl.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/it.lproj/Localizable.strings
M	/branches/blackosx/i386/modules/Keylayout/layouts/cham-mklayout.c
M	/branches/blackosx/i386/libsaio/fake_efi.c
M	/branches/blackosx/package/Resources/zh_TW.lproj/Welcome.rtfd/TXT.rtf
M	/branches/blackosx/package/Resources/sr.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/pt-BR.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/ru.lproj/Localizable.strings
M	/branches/blackosx/i386/boot2/options.c
M	/branches/blackosx/package/Resources/de.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/zh_CN.lproj/Welcome.rtfd/TXT.rtf
M	/branches/blackosx/package/Resources/zh_TW.lproj/Localizable.strings
M	/branches/blackosx/package/Resources/id.lproj/Localizable.strings
M	/branches/blackosx
M	/branches/blackosx/i386/boot2/boot.c
M	/branches/blackosx/package/Resources/zh_CN.lproj/Localizable.strings

File differences

-620
621 621
622 622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
623 638
624 639
625 640
... ...
683 698
684 699
685 700
701
702
703
686 704
687 705
688 706
+}␉␉␊
␊
/*␊
 * Populate the chosen node␊
 */␊
void setupChosenNode()␊
{␊
␉Node *chosenNode;␊
␉chosenNode = DT__FindNode("/chosen", false);␊
␉if (chosenNode == 0)␊
␉␉stop("Couldn't get chosen node");␊
␊
␉int bootUUIDLength = strlen(gBootUUIDString);␊
␉if (bootUUIDLength)␊
␉␉DT__AddProperty(chosenNode, "boot-uuid", bootUUIDLength + 1, gBootUUIDString);␊
}␊
␊
/*␊
 * Load the smbios.plist override config file if any␊
 */␊
static void setupSmbiosConfigFile(const char *filename)␊

␉␉gST64->Hdr.CRC32 = 0;␊
␉␉gST64->Hdr.CRC32 = crc32(0L, gST64, gST64->Hdr.HeaderSize);␊
␉}␊
␊
␉// Setup the chosen node␊
␉setupChosenNode();␊
}␊
␊
void saveOriginalSMBIOS(void)␊
 ...
 }␉␉␊
 ␊
 /*␊
+ * Populate the chosen node␊
+ */␊
+void setupChosenNode()␊
+{␊
+␉Node *chosenNode;␊
+␉chosenNode = DT__FindNode("/chosen", false);␊
+␉if (chosenNode == 0)␊
+␉␉stop("Couldn't get chosen node");␊
+␊
+␉int bootUUIDLength = strlen(gBootUUIDString);␊
+␉if (bootUUIDLength)␊
+␉␉DT__AddProperty(chosenNode, "boot-uuid", bootUUIDLength + 1, gBootUUIDString);␊
+}␊
+␊
+/*␊
  * Load the smbios.plist override config file if any␊
  */␊
 static void setupSmbiosConfigFile(const char *filename)␊
 ␉␉gST64->Hdr.CRC32 = 0;␊
 ␉␉gST64->Hdr.CRC32 = crc32(0L, gST64, gST64->Hdr.HeaderSize);␊
 ␉}␊
+␊
+␉// Setup the chosen node␊
+␉setupChosenNode();␊
 }␊
 ␊
 void saveOriginalSMBIOS(void)␊

-72
73 73
74 74
75 
75
76 76
77 77
78 78
+static char␉gCacheNameAdler[64 + 256];␊
char␉␉*gPlatformName = gCacheNameAdler;␊
␊
char␉␉gRootDevice[512];␊
char␉␉gRootDevice[ROOT_DEVICE_SIZE];␊
char␉␉gMKextName[512];␊
char␉␉gMacOSVersion[8];␊
int␉␉␉bvCount = 0, gDeviceCount = 0;␊
 static char␉gCacheNameAdler[64 + 256];␊
 char␉␉*gPlatformName = gCacheNameAdler;␊
 ␊
-char␉␉gRootDevice[512];␊
+char␉␉gRootDevice[ROOT_DEVICE_SIZE];␊
 char␉␉gMKextName[512];␊
 char␉␉gMacOSVersion[8];␊
 int␉␉␉bvCount = 0, gDeviceCount = 0;␊

-147
148 148
149 149
150
150 151
151 152
152 153
... ...
224 225
225 226
226 227
227 
228 
229 
228
229
230
231
232
230 233
231 234
232 235
+ * A global set by boot() to record the device that the booter␊
 * was loaded from.␊
 */␊
#define ROOT_DEVICE_SIZE 512␊
extern int  gBIOSDev;␊
extern long gBootMode;␊
extern bool sysConfigValid;␊

/*␊
 * options.c␊
 */␊
extern int getBootOptions(bool firstRun);␊
extern int processBootOptions();␊
extern int selectAlternateBootDevice(int bootdevice);␊
extern char gBootUUIDString[];␊
␊
extern int  getBootOptions(bool firstRun);␊
extern int  processBootOptions();␊
extern int  selectAlternateBootDevice(int bootdevice);␊
extern bool promptForRescanOption(void);␊
␊
void showHelp();␊
 ...
  * A global set by boot() to record the device that the booter␊
  * was loaded from.␊
  */␊
+#define ROOT_DEVICE_SIZE 512␊
 extern int  gBIOSDev;␊
 extern long gBootMode;␊
 extern bool sysConfigValid;␊
 /*␊
  * options.c␊
  */␊
-extern int getBootOptions(bool firstRun);␊
-extern int processBootOptions();␊
-extern int selectAlternateBootDevice(int bootdevice);␊
+extern char gBootUUIDString[];␊
+␊
+extern int  getBootOptions(bool firstRun);␊
+extern int  processBootOptions();␊
+extern int  selectAlternateBootDevice(int bootdevice);␊
 extern bool promptForRescanOption(void);␊
 ␊
 void showHelp();␊

-1063
1064 1064
1065 1065
1066
1066 1067
1067 1068
1068 1069
... ...
1071 1072
1072 1073
1073 1074
1075
1076
1077
1074 1078
1075 1079
1076 1080
... ...
1081 1085
1082 1086
1083 1087
1084 
1085 1088
1089
1086 1090
1087 1091
1088 1092
... ...
1102 1106
1103 1107
1104 1108
1105 
1109
1110
1106 1111
1107 1112
1108 1113
... ...
1119 1124
1120 1125
1121 1126
1122 
1123 
1124 
1127
1128
1125 1129
1126 1130
1127 1131
... ...
1131 1135
1132 1136
1133 1137
1134 
1135 
1136 
1137 
1138 
1139 
1140 
1141 
1142 
1143 
1144 
1138
1139
1140
1141
1142
1143
1144
1145
1146
1145 1147
1146 1148
1147 1149
... ...
1221 1223
1222 1224
1223 1225
1224 
1225 
1226 
1227 
1228 
1229 
1226
1227
1228
1230 1229
1231 1230
1232 1231
1233 1232
1234 
1235 
1236 
1233
1234
1235
1237 1236
1238 
1239 
1240 
1241 
1237
1238
1239
1240
1242 1241
1243 1242
1244 
1245 
1246 
1247 
1248 
1243
1244
1245
1249 1246
1250 
1247
1248
1249
1250
1251 1251
1252 
1252
1253
1253 1254
1254 1255
1255 1256
... ...
1257 1258
1258 1259
1259 1260
1260 
1261
1261 1262
1262 1263
1263 1264
... ...
1276 1277
1277 1278
1278 1279
1279 
1280
1281
1280 1282
1281 1283
1282 1284
+␊
//==========================================================================␊
␊
char gBootUUIDString[32+4+1] = ""; // UUID of the boot volume e.g. 5EB1869F-C4FA-3502-BDEB-3B8ED5D87292␊
extern unsigned char chainbootdev;␊
extern unsigned char chainbootflag;␊
␊

    int argLen = argName ? strlen(argName) : 0;␊
    int len = argLen + cnt + 1;  // +1 to account for space␊
␊
␉if (argName)␊
␉␉len++; // +1 to account for '='␊
␊
    if (len > *cntRemainingP) {␊
        error("Warning: boot arguments too long, truncating\n");␊
        return false;␊

        *argP += argLen;␊
        *argP[0] = '=';␊
        (*argP)++;␊
        len++; // +1 to account for '='␊
    }␊
␊
    strncpy( *argP, val, cnt );␊
    *argP += cnt;␊
    *argP[0] = ' ';␊

                    const char *configTable,␊
                    char **argP,                // Output value␊
                    int *cntRemainingP,         // Output count␊
                    char *foundVal              // found value␊
                    char *foundVal,             // found value␊
                    int  foundValSize           // max found value size␊
                    )␊
{␊
    const char *val;␊

        copyArgument(argName, val, cnt, argP, cntRemainingP);␊
        found = true;␊
    }␊
    if (found && foundVal) {␊
        strlcpy(foundVal, val, cnt+1);␊
    }␊
    if (found && foundVal)␊
        strlcpy(foundVal, val, foundValSize);␊
    return found;␊
}␊
␊

int␊
processBootOptions()␊
{␊
    const char *     cp  = gBootArgs;␊
    const char *     val = 0;␊
    const char *     kernel;␊
    int              cnt;␊
    int␉␉     userCnt;␊
    int              cntRemaining;␊
    char *           argP;␊
    char             uuidStr[64];␊
    bool             uuidSet = false;␊
    char *           configKernelFlags;␊
    char *           valueBuffer;␊
    const char *cp  = gBootArgs;␊
    const char *val = 0;␊
    const char *kernel;␊
    int         cnt;␊
    int         userCnt;␊
    int         cntRemaining;␊
    char       *argP;␊
    char       *configKernelFlags;␊
    char       *valueBuffer;␊
␊
    valueBuffer = malloc(VALUE_SIZE);␊
    ␊

    configKernelFlags = malloc(cnt + 1);␊
    strlcpy(configKernelFlags, val, cnt + 1);␊
␊
    if (processBootArgument(kBootUUIDKey, cp, configKernelFlags, bootInfo->config, &argP, &cntRemaining, 0)) {␊
        // boot-uuid was set either on the command-line␊
        // or in the config file.␊
        uuidSet = true;␊
    } else {␊
␊
    // boot-uuid can be set either on the command-line or in the config file␊
␉if (!processBootArgument(kBootUUIDKey, cp, configKernelFlags, bootInfo->config,␊
                             &argP, &cntRemaining, gBootUUIDString, sizeof(gBootUUIDString))) {␊
        //␊
        // Try an alternate method for getting the root UUID on boot helper partitions.␊
        //␊
        if (gBootVolume->flags & kBVFlagBooter)␊
        {␊
        ␉if((loadHelperConfig(&bootInfo->helperConfig) == 0)␊
        ␉    && getValueForKey(kHelperRootUUIDKey, &val, &cnt, &bootInfo->helperConfig) )␊
␉␉{␊
␉␉␉// Load the configuration store in the boot helper partition␊
␉␉␉if (loadHelperConfig(&bootInfo->helperConfig) == 0)␊
        ␉{␊
          ␉getValueForKey(kHelperRootUUIDKey, &val, &cnt, &bootInfo->helperConfig);␊
            copyArgument(kBootUUIDKey, val, cnt, &argP, &cntRemaining);␊
            uuidSet = true;␊
        ␉}␊
␉␉␉␉val = getStringForKey(kHelperRootUUIDKey, &bootInfo->helperConfig);␊
␉␉␉␉if (val != NULL)␊
␉␉␉␉␉strlcpy(gBootUUIDString, val, sizeof(gBootUUIDString));␊
␉␉␉}␊
        }␊
        ␊
        if (!uuidSet && gBootVolume->fs_getuuid && gBootVolume->fs_getuuid (gBootVolume, uuidStr) == 0) {␊
            verbose("Setting boot-uuid to: %s\n", uuidStr);␊
            copyArgument(kBootUUIDKey, uuidStr, strlen(uuidStr), &argP, &cntRemaining);␊
            uuidSet = true;␊
        }␊
        // Try to get the volume uuid string␊
␉␉if (!strlen(gBootUUIDString) && gBootVolume->fs_getuuid)␊
␉␉␉gBootVolume->fs_getuuid(gBootVolume, gBootUUIDString);␊
         ␊
    }␊
␉␉// If we have the volume uuid add it to the commandline arguments␊
␉␉if (strlen(gBootUUIDString))␊
␉␉␉copyArgument(kBootUUIDKey, gBootUUIDString, strlen(gBootUUIDString), &argP, &cntRemaining);␊
␉}␊
␊
    if (!processBootArgument(kRootDeviceKey, cp, configKernelFlags, bootInfo->config, &argP, &cntRemaining, gRootDevice)) {␊
    if (!processBootArgument(kRootDeviceKey, cp, configKernelFlags, bootInfo->config,␊
                             &argP, &cntRemaining, gRootDevice, ROOT_DEVICE_SIZE)) {␊
        cnt = 0;␊
        if ( getValueForKey( kBootDeviceKey, &val, &cnt, &bootInfo->chameleonConfig)) {␊
            valueBuffer[0] = '*';␊

            strlcpy(valueBuffer + 1, val, cnt);␊
            val = valueBuffer;␊
        } else {␊
            if (uuidSet) {␊
            if (strlen(gBootUUIDString)) {␊
                val = "*uuid";␊
                cnt = 5;␊
            } else {␊

    /*␊
     * Removed. We don't need this anymore.␊
     *␊
    if (!processBootArgument(kPlatformKey, cp, configKernelFlags, bootInfo->config, &argP, &cntRemaining, gPlatformName)) {␊
    if (!processBootArgument(kPlatformKey, cp, configKernelFlags, bootInfo->config,␊
␉␉␉␉␉␉␉ &argP, &cntRemaining, gPlatformName, sizeof(gCacheNameAdler))) {␊
        getPlatformName(gPlatformName);␊
        copyArgument(kPlatformKey, gPlatformName, strlen(gPlatformName), &argP, &cntRemaining);␊
    }␊
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ...
 ␊
 //==========================================================================␊
 ␊
+char gBootUUIDString[32+4+1] = ""; // UUID of the boot volume e.g. 5EB1869F-C4FA-3502-BDEB-3B8ED5D87292␊
 extern unsigned char chainbootdev;␊
 extern unsigned char chainbootflag;␊
 ␊
     int argLen = argName ? strlen(argName) : 0;␊
     int len = argLen + cnt + 1;  // +1 to account for space␊
 ␊
+␉if (argName)␊
+␉␉len++; // +1 to account for '='␊
+␊
     if (len > *cntRemainingP) {␊
         error("Warning: boot arguments too long, truncating\n");␊
         return false;␊
         *argP += argLen;␊
         *argP[0] = '=';␊
         (*argP)++;␊
-        len++; // +1 to account for '='␊
     }␊
+␊
     strncpy( *argP, val, cnt );␊
     *argP += cnt;␊
     *argP[0] = ' ';␊
                     const char *configTable,␊
                     char **argP,                // Output value␊
                     int *cntRemainingP,         // Output count␊
-                    char *foundVal              // found value␊
+                    char *foundVal,             // found value␊
+                    int  foundValSize           // max found value size␊
                     )␊
 {␊
     const char *val;␊
         copyArgument(argName, val, cnt, argP, cntRemainingP);␊
         found = true;␊
     }␊
-    if (found && foundVal) {␊
-        strlcpy(foundVal, val, cnt+1);␊
-    }␊
+    if (found && foundVal)␊
+        strlcpy(foundVal, val, foundValSize);␊
     return found;␊
 }␊
 ␊
 int␊
 processBootOptions()␊
 {␊
-    const char *     cp  = gBootArgs;␊
-    const char *     val = 0;␊
-    const char *     kernel;␊
-    int              cnt;␊
-    int␉␉     userCnt;␊
-    int              cntRemaining;␊
-    char *           argP;␊
-    char             uuidStr[64];␊
-    bool             uuidSet = false;␊
-    char *           configKernelFlags;␊
-    char *           valueBuffer;␊
+    const char *cp  = gBootArgs;␊
+    const char *val = 0;␊
+    const char *kernel;␊
+    int         cnt;␊
+    int         userCnt;␊
+    int         cntRemaining;␊
+    char       *argP;␊
+    char       *configKernelFlags;␊
+    char       *valueBuffer;␊
 ␊
     valueBuffer = malloc(VALUE_SIZE);␊
     ␊
     configKernelFlags = malloc(cnt + 1);␊
     strlcpy(configKernelFlags, val, cnt + 1);␊
 ␊
-    if (processBootArgument(kBootUUIDKey, cp, configKernelFlags, bootInfo->config, &argP, &cntRemaining, 0)) {␊
-        // boot-uuid was set either on the command-line␊
-        // or in the config file.␊
-        uuidSet = true;␊
-    } else {␊
-␊
+    // boot-uuid can be set either on the command-line or in the config file␊
+␉if (!processBootArgument(kBootUUIDKey, cp, configKernelFlags, bootInfo->config,␊
+                             &argP, &cntRemaining, gBootUUIDString, sizeof(gBootUUIDString))) {␊
         //␊
         // Try an alternate method for getting the root UUID on boot helper partitions.␊
         //␊
         if (gBootVolume->flags & kBVFlagBooter)␊
-        {␊
-        ␉if((loadHelperConfig(&bootInfo->helperConfig) == 0)␊
-        ␉    && getValueForKey(kHelperRootUUIDKey, &val, &cnt, &bootInfo->helperConfig) )␊
+␉␉{␊
+␉␉␉// Load the configuration store in the boot helper partition␊
+␉␉␉if (loadHelperConfig(&bootInfo->helperConfig) == 0)␊
         ␉{␊
-          ␉getValueForKey(kHelperRootUUIDKey, &val, &cnt, &bootInfo->helperConfig);␊
-            copyArgument(kBootUUIDKey, val, cnt, &argP, &cntRemaining);␊
-            uuidSet = true;␊
-        ␉}␊
+␉␉␉␉val = getStringForKey(kHelperRootUUIDKey, &bootInfo->helperConfig);␊
+␉␉␉␉if (val != NULL)␊
+␉␉␉␉␉strlcpy(gBootUUIDString, val, sizeof(gBootUUIDString));␊
+␉␉␉}␊
         }␊
         ␊
-        if (!uuidSet && gBootVolume->fs_getuuid && gBootVolume->fs_getuuid (gBootVolume, uuidStr) == 0) {␊
-            verbose("Setting boot-uuid to: %s\n", uuidStr);␊
-            copyArgument(kBootUUIDKey, uuidStr, strlen(uuidStr), &argP, &cntRemaining);␊
-            uuidSet = true;␊
-        }␊
+        // Try to get the volume uuid string␊
+␉␉if (!strlen(gBootUUIDString) && gBootVolume->fs_getuuid)␊
+␉␉␉gBootVolume->fs_getuuid(gBootVolume, gBootUUIDString);␊
          ␊
-    }␊
+␉␉// If we have the volume uuid add it to the commandline arguments␊
+␉␉if (strlen(gBootUUIDString))␊
+␉␉␉copyArgument(kBootUUIDKey, gBootUUIDString, strlen(gBootUUIDString), &argP, &cntRemaining);␊
+␉}␊
 ␊
-    if (!processBootArgument(kRootDeviceKey, cp, configKernelFlags, bootInfo->config, &argP, &cntRemaining, gRootDevice)) {␊
+    if (!processBootArgument(kRootDeviceKey, cp, configKernelFlags, bootInfo->config,␊
+                             &argP, &cntRemaining, gRootDevice, ROOT_DEVICE_SIZE)) {␊
         cnt = 0;␊
         if ( getValueForKey( kBootDeviceKey, &val, &cnt, &bootInfo->chameleonConfig)) {␊
             valueBuffer[0] = '*';␊
             strlcpy(valueBuffer + 1, val, cnt);␊
             val = valueBuffer;␊
         } else {␊
-            if (uuidSet) {␊
+            if (strlen(gBootUUIDString)) {␊
                 val = "*uuid";␊
                 cnt = 5;␊
             } else {␊
     /*␊
      * Removed. We don't need this anymore.␊
      *␊
-    if (!processBootArgument(kPlatformKey, cp, configKernelFlags, bootInfo->config, &argP, &cntRemaining, gPlatformName)) {␊
+    if (!processBootArgument(kPlatformKey, cp, configKernelFlags, bootInfo->config,␊
+␉␉␉␉␉␉␉ &argP, &cntRemaining, gPlatformName, sizeof(gCacheNameAdler))) {␊
         getPlatformName(gPlatformName);␊
         copyArgument(kPlatformKey, gPlatformName, strlen(gPlatformName), &argP, &cntRemaining);␊
     }␊

-14
15 15
16 16
17 
17
18 18
19 19
20 20
+#include <errno.h>␊
#include "stdint.h"␊
#include "term.h"␊
#include "keylayout.h"␊
#include "Keylayout.h"␊
␊
#define PACKAGE_NAME␉"chameleon"␊
#define PROGRAM_VERSION␉"1.0"␊
 #include <errno.h>␊
 #include "stdint.h"␊
 #include "term.h"␊
-#include "keylayout.h"␊
+#include "Keylayout.h"␊
 ␊
 #define PACKAGE_NAME␉"chameleon"␊
 #define PROGRAM_VERSION␉"1.0"␊

-25
26 26
27 27
28 
28
29 29
30 30
31 31
... ...
41 41
42 42
43 43
44 
44
+\f0  : %DEVELOP%\␊
\␊
␊
\f1 \'b7\'50\'c1\'c2\'a8\'f3\'a7\'55␊
\f1 \'b7\'50\'c1\'c2␊
\f0  : %CREDITS%\␊
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
␊

␊
\fs26 \cf0 Copyright \'a9 2011 ␊
\f2\b \'b7\'ad\'d7\'67␊
\f0  : crazybirdy, ultimate}␊
\f0  : crazybirdy, Ulimate}␊
 ...
 \f0  : %DEVELOP%\␊
 \␊
 ␊
-\f1 \'b7\'50\'c1\'c2\'a8\'f3\'a7\'55␊
+\f1 \'b7\'50\'c1\'c2␊
 \f0  : %CREDITS%\␊
 \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
 ␊
 ␊
 \fs26 \cf0 Copyright \'a9 2011 ␊
 \f2\b \'b7\'ad\'d7\'67␊
-\f0  : crazybirdy, ultimate}␊
+\f0  : crazybirdy, Ulimate}␊

-25
26 26
27 27
28 
28
29 29
30 30
31 31
... ...
41 41
42 42
43 43
44 
44
+\f0  : %DEVELOP%\␊
\␊
␊
\f1 \'b7\'50\uc0\u35874 \u21327 \'a7\'55␊
\f1 \'b7\'50\uc0\u35874 ␊
\f0  : %CREDITS%\␊
\pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
␊

␊
\fs26 \cf0 Copyright \'a9 2011 ␊
\f2\b \'b7\'ad\'d2\'eb␊
\f0  : crazybirdy, ultimate}␊
\f0  : crazybirdy, Ulimate}␊
 ...
 \f0  : %DEVELOP%\␊
 \␊
 ␊
-\f1 \'b7\'50\uc0\u35874 \u21327 \'a7\'55␊
+\f1 \'b7\'50\uc0\u35874 ␊
 \f0  : %CREDITS%\␊
 \pard\tx360\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural␊
 ␊
 ␊
 \fs26 \cf0 Copyright \'a9 2011 ␊
 \f2\b \'b7\'ad\'d2\'eb␊
-\f0  : crazybirdy, ultimate}␊
+\f0  : crazybirdy, Ulimate}␊

Download the corresponding diff file