Index: branches/ErmaC/Enoch/i386/boot2/drivers.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/drivers.c (revision 2569) +++ branches/ErmaC/Enoch/i386/boot2/drivers.c (revision 2570) @@ -159,7 +159,8 @@ gTempSpec = malloc( 4096 ); gFileName = malloc( 4096 ); - if ( !gExtensionsSpec || !gDriverSpec || !gFileSpec || !gTempSpec || !gFileName ) { + if ( !gExtensionsSpec || !gDriverSpec || !gFileSpec || !gTempSpec || !gFileName ) + { stop("InitDriverSupport error"); } @@ -499,9 +500,12 @@ do{ // Save the driver path. - if(name) { + if(name) + { snprintf(gFileSpec, 4096, "%s/%s/%s", dirSpec, name, (bundleType == kCFBundleType2) ? "Contents/MacOS/" : ""); - } else { + } + else + { snprintf(gFileSpec, 4096, "%s/%s", dirSpec, (bundleType == kCFBundleType2) ? "Contents/MacOS/" : ""); } executablePathLength = strlen(gFileSpec) + 1; @@ -512,15 +516,19 @@ } strcpy(tmpExecutablePath, gFileSpec); - if(name) { + if(name) + { snprintf(gFileSpec, 4096, "%s/%s", dirSpec, name); - } else { + } + else + { snprintf(gFileSpec, 4096, "%s", dirSpec); } bundlePathLength = strlen(gFileSpec) + 1; tmpBundlePath = malloc(bundlePathLength); - if (tmpBundlePath == 0) { + if (tmpBundlePath == 0) + { break; } @@ -528,19 +536,24 @@ // Construct the file spec to the plist, then load it. - if(name) { + if(name) + { snprintf(gFileSpec, 4096, "%s/%s/%sInfo.plist", dirSpec, name, (bundleType == kCFBundleType2) ? "Contents/" : ""); - } else { + } + else + { snprintf(gFileSpec, 4096, "%s/%sInfo.plist", dirSpec, (bundleType == kCFBundleType2) ? "Contents/" : ""); } length = LoadFile(gFileSpec); - if (length == -1) { + if (length == -1) + { break; } length = length + 1; buffer = malloc(length); - if (buffer == 0) { + if (buffer == 0) + { break; } strlcpy(buffer, (char *)kLoadAddr, length); @@ -566,7 +579,8 @@ module->bundlePathLength = bundlePathLength; module->plistAddr = malloc(length); - if ((module->executablePath == 0) || (module->bundlePath == 0) || (module->plistAddr == 0)) { + if ((module->executablePath == 0) || (module->bundlePath == 0) || (module->plistAddr == 0)) + { break; } Index: branches/ErmaC/Enoch/i386/boot2/boot.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/boot.c (revision 2569) +++ branches/ErmaC/Enoch/i386/boot2/boot.c (revision 2570) @@ -423,9 +423,9 @@ bool firstRun = true; bool instantMenu; bool rescanPrompt; - int status; - unsigned int allowBVFlags = kBVFlagSystemVolume | kBVFlagForeignBoot; - unsigned int denyBVFlags = kBVFlagEFISystem; + int status; + unsigned int allowBVFlags = kBVFlagSystemVolume | kBVFlagForeignBoot; + unsigned int denyBVFlags = kBVFlagEFISystem; // Set reminder to unload the PXE base code. Neglect to unload // the base code will result in a hang or kernel panic. Index: branches/ErmaC/Enoch/i386/boot2/modules.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/modules.c (revision 2569) +++ branches/ErmaC/Enoch/i386/boot2/modules.c (revision 2570) @@ -1,5 +1,5 @@ /* - * Copyright 2010 Evan Lojewski. All rights reserved. + * Copyright 2010-2015 Evan Lojewski. All rights reserved. * */ #include "boot.h" @@ -33,9 +33,9 @@ static UInt64 textSection = 0; /** Internal symbols, however there are accessor methods **/ -moduleHook_t* moduleCallbacks = NULL; -moduleList_t* loadedModules = NULL; -symbolList_t* moduleSymbols = NULL; +moduleHook_t *moduleCallbacks = NULL; +moduleList_t *loadedModules = NULL; +symbolList_t *moduleSymbols = NULL; unsigned int (*lookup_symbol)(const char*) = NULL; char *strrchr(const char *s, int c) @@ -142,9 +142,9 @@ return retVal; } -void start_built_in_module(const char* name, - const char* author, - const char* description, +void start_built_in_module(const char *name, + const char *author, + const char *description, UInt32 version, UInt32 compat, void(*start_function)(void)) Index: branches/ErmaC/Enoch/i386/boot2/modules.h =================================================================== --- branches/ErmaC/Enoch/i386/boot2/modules.h (revision 2569) +++ branches/ErmaC/Enoch/i386/boot2/modules.h (revision 2570) @@ -1,6 +1,6 @@ /* * Module Loading functionality - * Copyright 2009 Evan Lojewski. All rights reserved. + * Copyright 2009-2015 Evan Lojewski. All rights reserved. * */ @@ -14,11 +14,11 @@ #define MODULE_PATH "/Extra/modules/" -#define SYMBOLS_MODULE "Symbols.dylib" -#define SYMBOLS_AUTHOR "Chameleon" -#define SYMBOLS_DESCRIPTION "Chameleon symbols for linking" -#define SYMBOLS_VERSION 0 -#define SYMBOLS_COMPAT 0 +#define SYMBOLS_MODULE "Symbols.dylib" +#define SYMBOLS_AUTHOR "Chameleon" +#define SYMBOLS_DESCRIPTION "Chameleon symbols for linking" +#define SYMBOLS_VERSION 0 +#define SYMBOLS_COMPAT 0 #define VOID_SYMBOL "dyld_void_start" @@ -26,9 +26,9 @@ typedef struct symbolList_t { - char* symbol; - UInt64 addr; - struct symbolList_t* next; + char *symbol; + UInt64 addr; + struct symbolList_t *next; } symbolList_t; typedef struct callbackList_t @@ -46,12 +46,13 @@ typedef struct modulesList_t { - const char* name; - const char* author; - const char* description; - UInt32 version; - UInt32 compat; - struct modulesList_t* next; + const char *name; + const char *author; + const char *description; +// const void *base; + UInt32 version; + UInt32 compat; + struct modulesList_t *next; } moduleList_t; @@ -59,11 +60,11 @@ int init_module_system(); void load_all_modules(); -void start_built_in_module(const char* name, - const char* author, - const char* description, - UInt32 version, - UInt32 compat, +void start_built_in_module(const char *name, + const char *author, + const char *description, + UInt32 version, + UInt32 compat, void(*start_function)(void)); int load_module(char* module); Index: branches/ErmaC/Enoch/i386/boot2/options.c =================================================================== --- branches/ErmaC/Enoch/i386/boot2/options.c (revision 2569) +++ branches/ErmaC/Enoch/i386/boot2/options.c (revision 2570) @@ -1104,8 +1104,10 @@ // New behavior: // Switch between text & graphic interfaces // Only Permitted if started in graphics interface - if (useGUI) { - if (bootArgs->Video.v_display != VGA_TEXT_MODE) { + if (useGUI) + { + if (bootArgs->Video.v_display != VGA_TEXT_MODE) + { setVideoMode(VGA_TEXT_MODE, 0); setCursorPosition(0, 0, 0); @@ -1121,7 +1123,8 @@ nextRow = kMenuTopRow; showPrompt = true; - if (gDeviceCount) { + if (gDeviceCount) + { printf("Use \30\31 keys to select the startup volume."); showMenu(menuItems, gDeviceCount, selectIndex, kMenuTopRow + 2, kMenuMaxItems); nextRow += MIN(gDeviceCount, kMenuMaxItems) + 3; @@ -1130,7 +1133,9 @@ showPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot); showBootPrompt(nextRow, showPrompt); //changeCursor( 0, kMenuTopRow, kCursorTypeUnderline, 0 ); - } else { + } + else + { gui.redraw = true; setVideoMode(GRAPHICS_MODE, 0); updateVRAM(); @@ -1518,7 +1523,7 @@ void showTextBuffer(char *buf_orig, int size) { char *bp; - char* buf; + char *buf; int line; int line_offset; int c; Index: branches/ErmaC/Enoch/i386/util/dyldsymboltool.c =================================================================== --- branches/ErmaC/Enoch/i386/util/dyldsymboltool.c (revision 2569) +++ branches/ErmaC/Enoch/i386/util/dyldsymboltool.c (revision 2570) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Evan Lojewski. All rights reserved. + * Copyright (c) 2010-2015 Evan Lojewski. All rights reserved. * * dyldsymboltool * @@ -22,18 +22,18 @@ typedef struct symbols_dylib { - struct mach_header header; + struct mach_header header; struct dylib_command dylib_info; - char module_name[sizeof(DYLIB_NAME)]; + char module_name[sizeof(DYLIB_NAME)]; struct symtab_command symtab; } symbols_dylib_t; typedef struct symbolList_t { - char* name; - uint32_t addr; - int pos; + char *name; + uint32_t addr; + int pos; struct symbolList_t* next; } symbolList_t; @@ -116,9 +116,9 @@ //exit(1); } - else - { - add_symbol(&symbols, START_SYMBOL, start_addr); + else + { + add_symbol(&symbols, START_SYMBOL, start_addr); } /* Header command info */ @@ -135,9 +135,9 @@ dylib.dylib_info.cmd = LC_ID_DYLIB; dylib.dylib_info.cmdsize = sizeof(struct dylib_command) + sizeof(dylib.module_name); // todo: verify dylib.dylib_info.dylib.name.offset = sizeof(struct dylib_command); - dylib.dylib_info.dylib.timestamp = 0; // TODO: populate with time - dylib.dylib_info.dylib.current_version = 0; // TODO - dylib.dylib_info.dylib.compatibility_version = 0; // TODO + dylib.dylib_info.dylib.timestamp = 0; // TODO: populate with time + dylib.dylib_info.dylib.current_version = 0; // TODO + dylib.dylib_info.dylib.compatibility_version = 0; // TODO //int offset = dylib.dylib_info.cmdsize%4 ? 4 - (dylib.dylib_info.cmdsize % 4) : 0; @@ -153,9 +153,8 @@ dylib.symtab.stroff = sizeof(dylib) + dylib.symtab.nsyms * sizeof(struct nlist); dylib.symtab.strsize = string_size(symbols); dylib.symtab.cmdsize = sizeof(struct symtab_command); - - - + + FILE* outfile = fopen(argv[argc-1], "w"); fwrite(&dylib, sizeof(dylib) /* Sizeof header + module name */ , 1, outfile); @@ -183,7 +182,7 @@ } fwrite(orig, - dylib.symtab.stroff + // Sizeof symbol nlists + dylib.symtab.stroff + // Sizeof symbol nlists dylib.symtab.strsize - sizeof(dylib) + 1 // sizeof symbol strings , 1, outfile); @@ -193,7 +192,7 @@ exit(0); } -int num_symbols(symbolList_t* list) +int num_symbols(symbolList_t *list) { int retVal = 0; while(list) @@ -204,7 +203,7 @@ return retVal; } -int string_size(symbolList_t* list) +int string_size(symbolList_t *list) { int retVal = 0; while(list) @@ -216,7 +215,7 @@ } -void add_symbol(symbolList_t** list, char* name, uint32_t addr) +void add_symbol(symbolList_t **list, char *name, uint32_t addr) { symbolList_t* entry = malloc(sizeof(symbolList_t)); entry->next = (*list); Index: branches/ErmaC/Enoch/package/po/mk.po =================================================================== --- branches/ErmaC/Enoch/package/po/mk.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/mk.po (revision 2570) @@ -8,7 +8,7 @@ "Project-Id-Version: Chameleon 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-11-24 20:00-0000\n" +"PO-Revision-Date: 2015-01-18 03:30-0000\n" "Last-Translator: ErmaC\n" "Language-Team: mk \n" "Language: mk\n" Index: branches/ErmaC/Enoch/package/po/nl.po =================================================================== --- branches/ErmaC/Enoch/package/po/nl.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/nl.po (revision 2570) @@ -8,7 +8,7 @@ "Project-Id-Version: Chameleon 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-11-24 19:59-0000\n" +"PO-Revision-Date: 2015-01-18 03:28-0000\n" "Last-Translator: beta992 \n" "Language-Team: nl \n" "Language: nl\n" Index: branches/ErmaC/Enoch/package/po/hr.po =================================================================== --- branches/ErmaC/Enoch/package/po/hr.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/hr.po (revision 2570) @@ -8,7 +8,7 @@ "Project-Id-Version: Chameleon 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-11-24 20:04-0000\n" +"PO-Revision-Date: 2015-01-18 03:31-0000\n" "Last-Translator: Xpam.AmAdEuS \n" "Language-Team: hr \n" "Language: hr\n" Index: branches/ErmaC/Enoch/package/po/pl.po =================================================================== --- branches/ErmaC/Enoch/package/po/pl.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/pl.po (revision 2570) @@ -8,7 +8,7 @@ "Project-Id-Version: Chameleon 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-11-24 19:59-0000\n" +"PO-Revision-Date: 2015-01-18 03:27-0000\n" "Last-Translator: oswaldini \n" "Language-Team: pl \n" "Language: pl\n" Index: branches/ErmaC/Enoch/package/po/hu.po =================================================================== --- branches/ErmaC/Enoch/package/po/hu.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/hu.po (revision 2570) @@ -8,7 +8,7 @@ "Project-Id-Version: Chameleon 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-11-24 20:03-0000\n" +"PO-Revision-Date: 2015-01-18 03:31-0000\n" "Last-Translator: ErmaC\n" "Language-Team: hu \n" "Language: hu\n" Index: branches/ErmaC/Enoch/package/po/ca.po =================================================================== --- branches/ErmaC/Enoch/package/po/ca.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/ca.po (revision 2570) @@ -8,7 +8,7 @@ "Project-Id-Version: Chameleon 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-11-24 20:07-0000\n" +"PO-Revision-Date: 2015-01-18 03:29-0000\n" "Last-Translator: ErmaC \n" "Language-Team: ca \n" "Language: ca\n" Index: branches/ErmaC/Enoch/package/po/sr.po =================================================================== --- branches/ErmaC/Enoch/package/po/sr.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/sr.po (revision 2570) @@ -8,7 +8,7 @@ "Project-Id-Version: Chameleon 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-11-24 19:56-0000\n" +"PO-Revision-Date: 2015-01-18 03:29-0000\n" "Last-Translator: ErmaC\n" "Language-Team: sr \n" "Language: sr\n" Index: branches/ErmaC/Enoch/package/po/fa.po =================================================================== --- branches/ErmaC/Enoch/package/po/fa.po (revision 2569) +++ branches/ErmaC/Enoch/package/po/fa.po (revision 2570) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Chameleon 2.3\n" "POT-Creation-Date: 2015-01-01 21:43+0000\n" -"PO-Revision-Date: 2014-01-05 13:57+0000\n" +"PO-Revision-Date: 2015-01-18 03:33-0000\n" "Last-Translator: minlite \n" "Language-Team: LANGUAGE \n" "Language: fa\n" @@ -601,7 +601,7 @@ #: Resources/templates/Localizable.strings:126 #, no-wrap msgid "PrivateData=No" -msgstr "" +msgstr "‏PrivateData=No" #. type: "PrivateData_description" #: Resources/templates/Localizable.strings:127 @@ -613,7 +613,7 @@ #: Resources/templates/Localizable.strings:131 #, no-wrap msgid "USBBusFix=Yes" -msgstr "" +msgstr "‏USBBusFix=Yes" #. type: "USBBusFix_description" #: Resources/templates/Localizable.strings:132 @@ -623,10 +623,9 @@ #. type: "USBLegacyOff_title" #: Resources/templates/Localizable.strings:134 -#, fuzzy, no-wrap -#| msgid "LegacyLogo=Yes" +#, no-wrap msgid "USBLegacyOff=Yes" -msgstr "LegacyLogo=Yes" +msgstr "‏LegacyLogo=YesUSBLegacyOff=Yes" #. type: "USBLegacyOff_description" #: Resources/templates/Localizable.strings:135 @@ -636,10 +635,9 @@ #. type: "XHCILegacyOff_title" #: Resources/templates/Localizable.strings:137 -#, fuzzy, no-wrap -#| msgid "LegacyLogo=Yes" +#, no-wrap msgid "XHCILegacyOff=Yes" -msgstr "LegacyLogo=Yes" +msgstr "‏XHCILegacyOff=Yes" #. type: "XHCILegacyOff_description" #: Resources/templates/Localizable.strings:138 @@ -651,7 +649,7 @@ #: Resources/templates/Localizable.strings:140 #, no-wrap msgid "UHCIreset=Yes" -msgstr "" +msgstr "‏UHCIreset=Yes" #. type: "UHCIreset_description" #: Resources/templates/Localizable.strings:141 @@ -2317,7 +2315,7 @@ #: Resources/templates/Localizable.strings:635 #, no-wrap msgid "npci=0x2000" -msgstr "" +msgstr "‏npci=0x2000" #. type: "Npci_description" #: Resources/templates/Localizable.strings:636 @@ -2329,7 +2327,7 @@ #: Resources/templates/Localizable.strings:638 #, no-wrap msgid "npci=0x3000" -msgstr "" +msgstr "‏npci=0x3000" #. type: "Npci3_description" #: Resources/templates/Localizable.strings:639 @@ -2356,7 +2354,7 @@ #: Resources/templates/Localizable.strings:646 #, no-wrap msgid "darkwake=0" -msgstr "" +msgstr "‏darkwake=0" #. type: "Darkwake_description" #: Resources/templates/Localizable.strings:647 @@ -2368,7 +2366,7 @@ #: Resources/templates/Localizable.strings:649 #, no-wrap msgid "nvda_drv=1" -msgstr "" +msgstr "‏nvda_drv=1" #. type: "NvdaDrv1_description" #: Resources/templates/Localizable.strings:650 @@ -2384,7 +2382,7 @@ #: Resources/templates/Localizable.strings:655 #, no-wrap msgid "kext-dev-mode=1" -msgstr "" +msgstr "‏kext-dev-mode=1" #. type: "kext-dev-mode1_description" #: Resources/templates/Localizable.strings:656 @@ -2396,7 +2394,7 @@ #: Resources/templates/Localizable.strings:658 #, no-wrap msgid "dart=0" -msgstr "" +msgstr "‏dart=0" #. type: "Dart0_description" #: Resources/templates/Localizable.strings:659