The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-11-25 20:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fixed no cover image loading for themes

Browse Source 
*Fixed Font loading. The font.ttf is loaded from the path with .thems if it exists there.
When a Theme is loaded and a font.ttf file exists in the defined "Image-Folder:" than this font.ttf will override all others. This ensures support for themes with special fonts.
*Fixed double count on playcount bug
*Updated libext2fs to git snapshot 2010-12-24
*Added proper close of all file systems where the games are loaded from (FAT32/NTFS/EXT)
*Fixed hang bug when reloading into the IOS set in the individual game settings with that (reload to 223, 224, 245, ...)
This commit is contained in:
dimok321 2010-12-28 17:02:10 +00:00
parent 2212f8ded7
commit f1febd91be
52 changed files with 736 additions and 737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HBC/META.XML
View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>1.0 r1020</version> <version>1.0 r1021</version>
<release_date>201012270947</release_date> <release_date>201012271830</release_date>
<short_description>Loads games from USB-devices</short_description> <short_description>Loads games from USB-devices</short_description>
<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. <long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller. The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.

5
Languages/czech.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: David Jelinek (djelinek@hotmail.com) \n" "Last-Translator: David Jelinek (djelinek@hotmail.com) \n"
"Language-Team: r823 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n" "Language-Team: r823 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@ -675,6 +675,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "Kvet" msgstr "Kvet"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Chybející soubory" msgstr "Chybející soubory"

5
Languages/danish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: dorf[dk]\n" "Last-Translator: dorf[dk]\n"
"Language-Team: dorf[dk]\n" "Language-Team: dorf[dk]\n"
@ -675,6 +675,9 @@ msgstr "Makér nye spil"
msgid "May" msgid "May"
msgstr "Maj" msgstr "Maj"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Manglende filer" msgstr "Manglende filer"

5
Languages/dutch.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2010-04-12 07:37+0100\n" "PO-Revision-Date: 2010-04-12 07:37+0100\n"
"Last-Translator: glowy\n" "Last-Translator: glowy\n"
"Language-Team: tj_cool, glowy\n" "Language-Team: tj_cool, glowy\n"
@ -675,6 +675,9 @@ msgstr "Markeer nieuwe spellen"
msgid "May" msgid "May"
msgstr "Mei" msgstr "Mei"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Missende bestanden" msgstr "Missende bestanden"

5
Languages/english.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
@ -675,6 +675,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "" msgstr ""
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "" msgstr ""

5
Languages/finnish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: c64rmx\n" "Last-Translator: c64rmx\n"
"Language-Team: \n" "Language-Team: \n"
@ -675,6 +675,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "touko" msgstr "touko"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "tiedostoja puuttuu" msgstr "tiedostoja puuttuu"

5
Languages/french.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Kin8\n" "Last-Translator: Kin8\n"
"Language-Team: Badablek, Amour, ikya & Kin8\n" "Language-Team: Badablek, Amour, ikya & Kin8\n"
@ -675,6 +675,9 @@ msgstr "Marqueur nouveau jeu"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Fichier(s) manquant(s)" msgstr "Fichier(s) manquant(s)"

5
Languages/german.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: ZEN.13\n" "Last-Translator: ZEN.13\n"
"Language-Team: Snoozer, wishmasterf, Bertilax, ZEN.13\n" "Language-Team: Snoozer, wishmasterf, Bertilax, ZEN.13\n"
@ -675,6 +675,9 @@ msgstr "Neue Spiele markieren"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Fehlende Dateien" msgstr "Fehlende Dateien"

5
Languages/hungarian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-12-29 11:05+0100\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n"
"Last-Translator: Springdale\n" "Last-Translator: Springdale\n"
"Language-Team: Tusk, Springdale\n" "Language-Team: Tusk, Springdale\n"
@ -675,6 +675,9 @@ msgstr "Új játékok megjelölése"
msgid "May" msgid "May"
msgstr "Máj" msgstr "Máj"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Hiányzó fájl" msgstr "Hiányzó fájl"

5
Languages/italian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2010-02-21 08:00+0200\n" "PO-Revision-Date: 2010-02-21 08:00+0200\n"
"Last-Translator: Cambo \n" "Last-Translator: Cambo \n"
"Language-Team: FoxeJoe, Cambo\n" "Language-Team: FoxeJoe, Cambo\n"
@ -675,6 +675,9 @@ msgstr "Evidenzia i nuovi giochi"
msgid "May" msgid "May"
msgstr "maggio" msgstr "maggio"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "File Mancante/i" msgstr "File Mancante/i"

5
Languages/japanese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: hosigumayuugi\n" "Last-Translator: hosigumayuugi\n"
"Language-Team: hosigumayuugi\n" "Language-Team: hosigumayuugi\n"
@ -675,6 +675,9 @@ msgstr "Newマークの表示機能"
msgid "May" msgid "May"
msgstr "5月" msgstr "5月"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "個の画像" msgstr "個の画像"

5
Languages/korean.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: nextos@korea.com\n" "Last-Translator: nextos@korea.com\n"
"Language-Team: \n" "Language-Team: \n"
@ -675,6 +675,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "5월" msgstr "5월"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "파일 누락" msgstr "파일 누락"

5
Languages/norwegian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: raschi\n" "Last-Translator: raschi\n"
"Language-Team: raschi\n" "Language-Team: raschi\n"
@ -675,6 +675,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Manglende filer" msgstr "Manglende filer"

5
Languages/polish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
"Language-Team: \n" "Language-Team: \n"
@ -675,6 +675,9 @@ msgstr "Oznacz nowe gry"
msgid "May" msgid "May"
msgstr "Maj" msgstr "Maj"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Brakuje plikow" msgstr "Brakuje plikow"

5
Languages/portuguese_br.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-23 18:52+0200\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n"
"Last-Translator: aniemotion\n" "Last-Translator: aniemotion\n"
"Language-Team: boto12, aniemotion\n" "Language-Team: boto12, aniemotion\n"
@ -675,6 +675,9 @@ msgstr "Marcar games novos"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Faltando arquivos" msgstr "Faltando arquivos"

5
Languages/portuguese_pt.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2010-03-22 10:55-0000\n" "PO-Revision-Date: 2010-03-22 10:55-0000\n"
"Last-Translator: Sky8000\n" "Last-Translator: Sky8000\n"
"Language-Team: Sky8000 <sky8000@hotmail.com>\n" "Language-Team: Sky8000 <sky8000@hotmail.com>\n"
@ -675,6 +675,9 @@ msgstr "Marcar jogos novos"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Ficheiros em falta" msgstr "Ficheiros em falta"

5
Languages/russian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: nikolai_ca\n" "Last-Translator: nikolai_ca\n"
"Language-Team: Kir, alendit, nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n"
@ -675,6 +675,9 @@ msgstr "Отметить новые игры"
msgid "May" msgid "May"
msgstr "Май" msgstr "Май"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Отсутствующие файлы" msgstr "Отсутствующие файлы"

5
Languages/schinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: knife.hu kavid\n" "Last-Translator: knife.hu kavid\n"
"Language-Team: kavid\n" "Language-Team: kavid\n"
@ -675,6 +675,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "五月" msgstr "五月"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "缺少的文件" msgstr "缺少的文件"

5
Languages/spanish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: SirPalax\n" "Last-Translator: SirPalax\n"
"Language-Team: Penn, SirPalax\n" "Language-Team: Penn, SirPalax\n"
@ -675,6 +675,9 @@ msgstr "Marcar juegos nuevos"
msgid "May" msgid "May"
msgstr "" msgstr ""
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Archivo(s) pendiente(s)" msgstr "Archivo(s) pendiente(s)"

5
Languages/swedish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2010-01-19 17:39+0200\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n"
"Last-Translator: Katsurou\n" "Last-Translator: Katsurou\n"
"Language-Team: Katsurou, pirateX\n" "Language-Team: Katsurou, pirateX\n"
@ -675,6 +675,9 @@ msgstr "Markera nya spel"
msgid "May" msgid "May"
msgstr "Maj" msgstr "Maj"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Filer som saknas" msgstr "Filer som saknas"

5
Languages/tchinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2010-02-15 21:00+0800\n" "PO-Revision-Date: 2010-02-15 21:00+0800\n"
"Last-Translator: Jane.H\n" "Last-Translator: Jane.H\n"
"Language-Team: kyogc, Miller, Mika Li, Jane.H\n" "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@ -675,6 +675,9 @@ msgstr "標示新遊戲"
msgid "May" msgid "May"
msgstr "五月" msgstr "五月"
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "缺少的文件" msgstr "缺少的文件"

5
Languages/thai.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Nitro_subzero \n" "Last-Translator: Nitro_subzero \n"
"Language-Team: Nitro_subzero\n" "Language-Team: Nitro_subzero\n"
@ -675,6 +675,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "พค." msgstr "พค."
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "ไฟล์ที่หาไม่พบ" msgstr "ไฟล์ที่หาไม่พบ"

5
Languages/turkish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 21:34+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: omercigingelini\n" "Last-Translator: omercigingelini\n"
"Language-Team: omercigingelini\n" "Language-Team: omercigingelini\n"
@ -675,6 +675,9 @@ msgstr "Yeni oyunlari imle"
msgid "May" msgid "May"
msgstr "" msgstr ""
msgid "Messageboard Update"
msgstr ""
msgid "Missing files" msgid "Missing files"
msgstr "Kayıp dosyalar" msgstr "Kayıp dosyalar"

810
Themes/Default.them
View File

@ -1,405 +1,405 @@
# USB Loader GX theme source file. # USB Loader GX theme source file.
# don't delete/change this line (é). # don't delete/change this line (é).
# ONLY the value before the '-' char needs to be entered in msgstr "" # ONLY the value before the '-' char needs to be entered in msgstr ""
# not the complete text. # not the complete text.
# It is important that the image folder is defined for the images to load. # It is important that the image folder is defined for the images to load.
# The image folder should be in the same folder as the .them file and include the theme images. # The image folder should be in the same folder as the .them file and include the theme images.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-26 16:16+0100\n" "POT-Creation-Date: 2010-12-27 22:39+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Image-Folder: Example\n" "Image-Folder: Example\n"
"Last-Themer: Example\n" "Last-Themer: Example\n"
"Theme-Team: Example\n" "Theme-Team: Example\n"
msgid "r=0 g=0 b=0 a=255 - prompt windows text color" msgid "r=0 g=0 b=0 a=255 - prompt windows text color"
msgstr "" msgstr ""
msgid "r=0 g=0 b=0 a=255 - settings text color" msgid "r=0 g=0 b=0 a=255 - settings text color"
msgstr "" msgstr ""
msgid "9 - game list browser page size" msgid "9 - game list browser page size"
msgstr "" msgstr ""
msgid "r=0 g=0 b=0 a=255 - game browser list text color" msgid "r=0 g=0 b=0 a=255 - game browser list text color"
msgstr "" msgstr ""
msgid "r=0 g=0 b=0 a=255 - game browser list text color over" msgid "r=0 g=0 b=0 a=255 - game browser list text color over"
msgstr "" msgstr ""
msgid "r=55 g=190 b=237 a=255 - carousel game name text color" msgid "r=55 g=190 b=237 a=255 - carousel game name text color"
msgstr "" msgstr ""
msgid "0 - game grid layout pos x" msgid "0 - game grid layout pos x"
msgstr "" msgstr ""
msgid "20 - game grid layout pos y" msgid "20 - game grid layout pos y"
msgstr "" msgstr ""
msgid "255 - tooltip alpha" msgid "255 - tooltip alpha"
msgstr "" msgstr ""
msgid "r=55 g=190 b=237 a=255 - hdd info color" msgid "r=55 g=190 b=237 a=255 - hdd info color"
msgstr "" msgstr ""
msgid "center - hdd info align ver" msgid "center - hdd info align ver"
msgstr "" msgstr ""
msgid "top - hdd info align hor" msgid "top - hdd info align hor"
msgstr "" msgstr ""
msgid "0 - hdd info pos x" msgid "0 - hdd info pos x"
msgstr "" msgstr ""
msgid "400 - hdd info pos y" msgid "400 - hdd info pos y"
msgstr "" msgstr ""
msgid "r=55 g=190 b=237 a=255 - game count color" msgid "r=55 g=190 b=237 a=255 - game count color"
msgstr "" msgstr ""
msgid "center - game count align ver" msgid "center - game count align ver"
msgstr "" msgstr ""
msgid "top - game count align hor" msgid "top - game count align hor"
msgstr "" msgstr ""
msgid "0 - game count pos x" msgid "0 - game count pos x"
msgstr "" msgstr ""
msgid "420 - game count pos y" msgid "420 - game count pos y"
msgstr "" msgstr ""
msgid "16 - install btn pos x" msgid "16 - install btn pos x"
msgstr "" msgstr ""
msgid "355 - install btn pos y" msgid "355 - install btn pos y"
msgstr "" msgstr ""
msgid "371 - settings btn pos y" msgid "371 - settings btn pos y"
msgstr "" msgstr ""
msgid "64 - settings btn pos x" msgid "64 - settings btn pos x"
msgstr "" msgstr ""
msgid "371 - home menu btn pos x" msgid "371 - home menu btn pos y"
msgstr "" msgstr ""
msgid "489 - home menu btn pos x" msgid "489 - home menu btn pos x"
msgstr "" msgstr ""
msgid "355 - power off btn pos y" msgid "355 - power off btn pos y"
msgstr "" msgstr ""
msgid "576 - power off btn pos x" msgid "576 - power off btn pos x"
msgstr "" msgstr ""
msgid "160 - sd card btn pos x" msgid "160 - sd card btn pos x"
msgstr "" msgstr ""
msgid "395 - sd card btn pos y" msgid "395 - sd card btn pos y"
msgstr "" msgstr ""
msgid "405 - HBC btn pos y" msgid "405 - HBC btn pos y"
msgstr "" msgstr ""
msgid "410 - HBC btn pos x" msgid "410 - HBC btn pos x"
msgstr "" msgstr ""
msgid "26 - cover/download btn pos x" msgid "26 - cover/download btn pos x"
msgstr "" msgstr ""
msgid "58 - cover/download btn pos y" msgid "58 - cover/download btn pos y"
msgstr "" msgstr ""
msgid "305 - gameID btn pos y" msgid "305 - gameID btn pos y"
msgstr "" msgstr ""
msgid "68 - gameID btn pos x" msgid "68 - gameID btn pos x"
msgstr "" msgstr ""
msgid "r=138 g=138 b=138 a=240 - clock color" msgid "r=138 g=138 b=138 a=240 - clock color"
msgstr "" msgstr ""
msgid "left - clock align ver" msgid "left - clock align ver"
msgstr "" msgstr ""
msgid "top - clock align hor" msgid "top - clock align hor"
msgstr "" msgstr ""
msgid "275 - clock pos x" msgid "275 - clock pos x"
msgstr "" msgstr ""
msgid "275 - clock pos y" msgid "275 - clock pos y"
msgstr "" msgstr ""
msgid "260 - list layout favorite btn pos x" msgid "260 - list layout favorite btn pos x"
msgstr "" msgstr ""
msgid "288 - list layout favorite btn pos x widescreen" msgid "288 - list layout favorite btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - list layout favorite btn pos y" msgid "13 - list layout favorite btn pos y"
msgstr "" msgstr ""
msgid "300 - list layout search btn pos x" msgid "300 - list layout search btn pos x"
msgstr "" msgstr ""
msgid "320 - list layout search btn pos x widescreen" msgid "320 - list layout search btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - list layout search btn pos x" msgid "13 - list layout search btn pos x"
msgstr "" msgstr ""
msgid "340 - list layout abc/sort btn pos x" msgid "340 - list layout abc/sort btn pos x"
msgstr "" msgstr ""
msgid "352 - list layout abc/sort btn pos x widescreen" msgid "352 - list layout abc/sort btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - list layout abc/sort btn pos y" msgid "13 - list layout abc/sort btn pos y"
msgstr "" msgstr ""
msgid "380 - list layout list btn pos x" msgid "380 - list layout list btn pos x"
msgstr "" msgstr ""
msgid "384 - list layout list btn pos x widescreen" msgid "384 - list layout list btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - list layout list btn pos y" msgid "13 - list layout list btn pos y"
msgstr "" msgstr ""
msgid "416 - list layout grid btn pos x widescreen" msgid "416 - list layout grid btn pos x widescreen"
msgstr "" msgstr ""
msgid "420 - list layout grid btn pos x" msgid "420 - list layout grid btn pos x"
msgstr "" msgstr ""
msgid "13 - list layout grid btn pos y" msgid "13 - list layout grid btn pos y"
msgstr "" msgstr ""
msgid "448 - list layout carousel btn pos x widescreen" msgid "448 - list layout carousel btn pos x widescreen"
msgstr "" msgstr ""
msgid "460 - list layout carousel btn pos x" msgid "460 - list layout carousel btn pos x"
msgstr "" msgstr ""
msgid "13 - list layout carousel btn pos y" msgid "13 - list layout carousel btn pos y"
msgstr "" msgstr ""
msgid "480 - list layout lock btn pos x widescreen" msgid "480 - list layout lock btn pos x widescreen"
msgstr "" msgstr ""
msgid "500 - list layout lock btn pos x" msgid "500 - list layout lock btn pos x"
msgstr "" msgstr ""
msgid "13 - list layout lock btn pos y" msgid "13 - list layout lock btn pos y"
msgstr "" msgstr ""
msgid "512 - list layout dvd btn pos x widescreen" msgid "512 - list layout dvd btn pos x widescreen"
msgstr "" msgstr ""
msgid "540 - list layout dvd btn pos x" msgid "540 - list layout dvd btn pos x"
msgstr "" msgstr ""
msgid "13 - list layout dvd btn pos y" msgid "13 - list layout dvd btn pos y"
msgstr "" msgstr ""
msgid "280 - game list layout height" msgid "280 - game list layout height"
msgstr "" msgstr ""
msgid "396 - game list layout width" msgid "396 - game list layout width"
msgstr "" msgstr ""
msgid "200 - game list layout pos x" msgid "200 - game list layout pos x"
msgstr "" msgstr ""
msgid "49 - game list layout pos y" msgid "49 - game list layout pos y"
msgstr "" msgstr ""
msgid "200 - grid layout favorite btn pos x" msgid "200 - grid layout favorite btn pos x"
msgstr "" msgstr ""
msgid "224 - grid layout favorite btn pos x widescreen" msgid "224 - grid layout favorite btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - grid layout favorite btn pos y" msgid "13 - grid layout favorite btn pos y"
msgstr "" msgstr ""
msgid "240 - grid layout search btn pos x" msgid "240 - grid layout search btn pos x"
msgstr "" msgstr ""
msgid "256 - grid layout search btn pos x widescreen" msgid "256 - grid layout search btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - grid layout search btn pos x" msgid "13 - grid layout search btn pos x"
msgstr "" msgstr ""
msgid "280 - grid layout abc/sort btn pos x" msgid "280 - grid layout abc/sort btn pos x"
msgstr "" msgstr ""
msgid "288 - grid layout abc/sort btn pos x widescreen" msgid "288 - grid layout abc/sort btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - grid layout abc/sort btn pos y" msgid "13 - grid layout abc/sort btn pos y"
msgstr "" msgstr ""
msgid "320 - grid layout list btn pos x" msgid "320 - grid layout list btn pos x"
msgstr "" msgstr ""
msgid "320 - grid layout list btn pos x widescreen" msgid "320 - grid layout list btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - grid layout list btn pos y" msgid "13 - grid layout list btn pos y"
msgstr "" msgstr ""
msgid "352 - grid layout grid btn pos x widescreen" msgid "352 - grid layout grid btn pos x widescreen"
msgstr "" msgstr ""
msgid "360 - grid layout grid btn pos x" msgid "360 - grid layout grid btn pos x"
msgstr "" msgstr ""
msgid "13 - grid layout grid btn pos y" msgid "13 - grid layout grid btn pos y"
msgstr "" msgstr ""
msgid "384 - grid layout carousel btn pos x widescreen" msgid "384 - grid layout carousel btn pos x widescreen"
msgstr "" msgstr ""
msgid "400 - grid layout carousel btn pos x" msgid "400 - grid layout carousel btn pos x"
msgstr "" msgstr ""
msgid "13 - grid layout carousel btn pos y" msgid "13 - grid layout carousel btn pos y"
msgstr "" msgstr ""
msgid "416 - grid layout lock btn pos x widescreen" msgid "416 - grid layout lock btn pos x widescreen"
msgstr "" msgstr ""
msgid "440 - grid layout lock btn pos x" msgid "440 - grid layout lock btn pos x"
msgstr "" msgstr ""
msgid "13 - grid layout lock btn pos y" msgid "13 - grid layout lock btn pos y"
msgstr "" msgstr ""
msgid "448 - grid layout dvd btn pos x widescreen" msgid "448 - grid layout dvd btn pos x widescreen"
msgstr "" msgstr ""
msgid "480 - grid layout dvd btn pos x" msgid "480 - grid layout dvd btn pos x"
msgstr "" msgstr ""
msgid "13 - grid layout dvd btn pos y" msgid "13 - grid layout dvd btn pos y"
msgstr "" msgstr ""
msgid "400 - game grid layout height" msgid "400 - game grid layout height"
msgstr "" msgstr ""
msgid "640 - game grid layout width" msgid "640 - game grid layout width"
msgstr "" msgstr ""
msgid "200 - carousel layout favorite btn pos x" msgid "200 - carousel layout favorite btn pos x"
msgstr "" msgstr ""
msgid "224 - carousel layout favorite btn pos x widescreen" msgid "224 - carousel layout favorite btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - carousel layout favorite btn pos y" msgid "13 - carousel layout favorite btn pos y"
msgstr "" msgstr ""
msgid "240 - carousel layout search btn pos x" msgid "240 - carousel layout search btn pos x"
msgstr "" msgstr ""
msgid "256 - carousel layout search btn pos x widescreen" msgid "256 - carousel layout search btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - carousel layout search btn pos x" msgid "13 - carousel layout search btn pos x"
msgstr "" msgstr ""
msgid "280 - carousel layout abc/sort btn pos x" msgid "280 - carousel layout abc/sort btn pos x"
msgstr "" msgstr ""
msgid "288 - carousel layout abc/sort btn pos x widescreen" msgid "288 - carousel layout abc/sort btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - carousel layout abc/sort btn pos y" msgid "13 - carousel layout abc/sort btn pos y"
msgstr "" msgstr ""
msgid "320 - carousel layout list btn pos x" msgid "320 - carousel layout list btn pos x"
msgstr "" msgstr ""
msgid "320 - carousel layout list btn pos x widescreen" msgid "320 - carousel layout list btn pos x widescreen"
msgstr "" msgstr ""
msgid "13 - carousel layout list btn pos y" msgid "13 - carousel layout list btn pos y"
msgstr "" msgstr ""
msgid "352 - carousel layout grid btn pos x widescreen" msgid "352 - carousel layout grid btn pos x widescreen"
msgstr "" msgstr ""
msgid "360 - carousel layout grid btn pos x" msgid "360 - carousel layout grid btn pos x"
msgstr "" msgstr ""
msgid "13 - carousel layout grid btn pos y" msgid "13 - carousel layout grid btn pos y"
msgstr "" msgstr ""
msgid "384 - carousel layout carousel btn pos x widescreen" msgid "384 - carousel layout carousel btn pos x widescreen"
msgstr "" msgstr ""
msgid "400 - carousel layout carousel btn pos x" msgid "400 - carousel layout carousel btn pos x"
msgstr "" msgstr ""
msgid "13 - carousel layout carousel btn pos y" msgid "13 - carousel layout carousel btn pos y"
msgstr "" msgstr ""
msgid "416 - carousel layout lock btn pos x widescreen" msgid "416 - carousel layout lock btn pos x widescreen"
msgstr "" msgstr ""
msgid "440 - carousel layout lock btn pos x" msgid "440 - carousel layout lock btn pos x"
msgstr "" msgstr ""
msgid "13 - carousel layout lock btn pos y" msgid "13 - carousel layout lock btn pos y"
msgstr "" msgstr ""
msgid "448 - carousel layout dvd btn pos x widescreen" msgid "448 - carousel layout dvd btn pos x widescreen"
msgstr "" msgstr ""
msgid "480 - carousel layout dvd btn pos x" msgid "480 - carousel layout dvd btn pos x"
msgstr "" msgstr ""
msgid "13 - carousel layout dvd btn pos y" msgid "13 - carousel layout dvd btn pos y"
msgstr "" msgstr ""
msgid "400 - game carousel layout height" msgid "400 - game carousel layout height"
msgstr "" msgstr ""
msgid "640 - game carousel layout width" msgid "640 - game carousel layout width"
msgstr "" msgstr ""
msgid "-20 - game carousel layout pos y" msgid "-20 - game carousel layout pos y"
msgstr "" msgstr ""
msgid "0 - game carousel layout pos x" msgid "0 - game carousel layout pos x"
msgstr "" msgstr ""
msgid "1 - show hdd info: 1 for on and 0 for off" msgid "1 - show hdd info: 1 for on and 0 for off"
msgstr "" msgstr ""
msgid "1 - show game count: 1 for on and 0 for off" msgid "1 - show game count: 1 for on and 0 for off"
msgstr "" msgstr ""
msgid "r=55 g=190 b=237 a=255 - game id text color" msgid "r=55 g=190 b=237 a=255 - game id text color"
msgstr "" msgstr ""
msgid "r=55 g=190 b=237 a=255 - region info text color" msgid "r=55 g=190 b=237 a=255 - region info text color"
msgstr "" msgstr ""
msgid "30 - region info text pos x" msgid "30 - region info text pos x"
msgstr "" msgstr ""
msgid "68 - region info text pos x" msgid "68 - region info text pos x"
msgstr "" msgstr ""
msgid "1 - Enable tooltips: 0 for off and 1 for on" msgid "1 - Enable tooltips: 0 for off and 1 for on"
msgstr "" msgstr ""

2
gui.pnproj
View File

File diff suppressed because one or more lines are too long

81
source/FontSystem.cpp
View File

@ -1,81 +0,0 @@
/****************************************************************************
* Copyright (C) 2010
* by Dimok
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any
* damages arising from the use of this software.
*
* Permission is granted to anyone to use this software for any
* purpose, including commercial applications, and to alter it and
* redistribute it freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you
* must not claim that you wrote the original software. If you use
* this software in a product, an acknowledgment in the product
* documentation would be appreciated but is not required.
*
* 2. Altered source versions must be plainly marked as such, and
* must not be misrepresented as being the original software.
*
* 3. This notice may not be removed or altered from any source
* distribution.
*
* for WiiXplorer 2010
***************************************************************************/
#include "FreeTypeGX.h"
#include "filelist.h"
FreeTypeGX * fontSystem = NULL;
static FT_Byte * MainFont = (FT_Byte *) font_ttf;
static u32 MainFontSize = font_ttf_size;
void ClearFontData()
{
if (fontSystem) delete fontSystem;
fontSystem = NULL;
if (MainFont != (FT_Byte *) font_ttf)
{
if (MainFont != NULL) delete[] MainFont;
MainFont = (FT_Byte *) font_ttf;
MainFontSize = font_ttf_size;
}
}
bool SetupDefaultFont(const char *path)
{
bool result = false;
FILE *pfile = NULL;
char FontPath[300];
ClearFontData();
snprintf(FontPath, sizeof(FontPath), "%sfont.ttf", path);
pfile = fopen(FontPath, "rb");
if (pfile)
{
fseek(pfile, 0, SEEK_END);
MainFontSize = ftell(pfile);
rewind(pfile);
MainFont = new (std::nothrow) FT_Byte[MainFontSize];
if (!MainFont)
{
MainFont = (FT_Byte *) font_ttf;
MainFontSize = font_ttf_size;
}
else
{
fread(MainFont, 1, MainFontSize, pfile);
result = true;
}
fclose(pfile);
}
fontSystem = new FreeTypeGX(MainFont, MainFontSize);
return result;
}

32
source/FontSystem.h
View File

@ -1,32 +0,0 @@
/****************************************************************************
* Copyright (C) 2010
* by Dimok
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any
* damages arising from the use of this software.
*
* Permission is granted to anyone to use this software for any
* purpose, including commercial applications, and to alter it and
* redistribute it freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you
* must not claim that you wrote the original software. If you use
* this software in a product, an acknowledgment in the product
* documentation would be appreciated but is not required.
*
* 2. Altered source versions must be plainly marked as such, and
* must not be misrepresented as being the original software.
*
* 3. This notice may not be removed or altered from any source
* distribution.
*
* for WiiXplorer 2010
***************************************************************************/
#ifndef FONTSYSTEM_H_
#define FONTSYSTEM_H_
bool SetupDefaultFont(const char *path);
void ClearFontData();
#endif

4
source/GameBootProcess.cpp
View File

@ -21,7 +21,6 @@
#include "menu/menus.h" #include "menu/menus.h"
#include "memory/memory.h" #include "memory/memory.h"
#include "fatmounter.h" #include "fatmounter.h"
#include "FontSystem.h"
#include "sys.h" #include "sys.h"
//appentrypoint has to be global because of asm //appentrypoint has to be global because of asm
@ -209,8 +208,7 @@ int BootGame(const char * gameID)
} }
shadow_mload(); shadow_mload();
UnmountNTFS(); WBFS_Close();
UnmountEXT();
SDCard_deInit(); SDCard_deInit();
USBDevice_deInit(); USBDevice_deInit();
USB_Deinitialize(); USB_Deinitialize();

113
source/fatmounter.c
View File

@ -40,15 +40,6 @@ sec_t fat_sd_sec = 0; // u32
int fat_usb_mount = 0; int fat_usb_mount = 0;
sec_t fat_usb_sec = 0; sec_t fat_usb_sec = 0;
int fat_wbfs_mount = 0;
sec_t fat_wbfs_sec = 0;
int fs_ntfs_mount = 0;
sec_t fs_ntfs_sec = 0;
int fs_ext_mount = 0;
sec_t fs_ext_sec = 0;
int USBDevice_Init() int USBDevice_Init()
{ {
//closing all open Files write back the cache and then shutdown em! //closing all open Files write back the cache and then shutdown em!
@ -124,30 +115,6 @@ void USBDevice_deInit()
fat_usb_sec = 0; fat_usb_sec = 0;
} }
int WBFSDevice_Init(u32 sector)
{
//closing all open Files write back the cache and then shutdown em!
fatUnmount("WBFS:/");
if (!fatMount("WBFS", &__io_usbstorage2, 0, CACHE, SECTORS))
{
return -1;
}
fat_wbfs_mount = 1;
fat_wbfs_sec = _FAT_startSector;
return 0;
}
void WBFSDevice_deInit()
{
fatUnmount("WBFS:/");
fat_wbfs_mount = 0;
fat_wbfs_sec = 0;
}
int isInserted(const char *path) int isInserted(const char *path)
{ {
if (!strncmp(path, "USB:", 4)) return 1; if (!strncmp(path, "USB:", 4)) return 1;
@ -189,83 +156,3 @@ void SDCard_deInit()
fat_sd_mount = MOUNT_NONE; fat_sd_mount = MOUNT_NONE;
fat_sd_sec = 0; fat_sd_sec = 0;
} }
s32 MountNTFS(u32 sector)
{
s32 ret;
if (fs_ntfs_mount)
return 0;
if (wbfsDev == WBFS_DEVICE_USB)
{
ret = ntfsMount("NTFS", &__io_usbstorage2, sector, CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER);
if (!ret)
return -2;
}
else if (wbfsDev == WBFS_DEVICE_SDHC)
{
if (sdhc_mode_sd == 0)
{
ret = ntfsMount("NTFS", &__io_sdhc, 0, CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER);
}
else
{
ret = ntfsMount("NTFS", &__io_sdhc, 0, CACHE, SECTORS_SD, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER);
}
if (!ret)
{
return -5;
}
}
// ntfsInit() resets locals
// which breaks unicode in console
// so we change it back to C-UTF-8
setlocale(LC_CTYPE, "C-UTF-8");
setlocale(LC_MESSAGES, "C-UTF-8");
fs_ntfs_mount = 1;
fs_ntfs_sec = sector;
return 0;
}
s32 UnmountNTFS(void)
{
/* Unmount device */
ntfsUnmount("NTFS:/", true);
fs_ntfs_mount = 0;
fs_ntfs_sec = 0;
return 0;
}
s32 MountEXT(u32 sector)
{
s32 ret;
if (fs_ext_mount)
return 0;
ret = ext2Mount("EXT", &__io_usbstorage2, sector, CACHE, SECTORS, EXT2_FLAG_DEFAULT);
if (!ret)
return -2;
fs_ext_mount = 1;
fs_ext_sec = sector;
return 0;
}
s32 UnmountEXT(void)
{
/* Unmount device */
ext2Unmount("EXT:/");
fs_ext_mount = 0;
fs_ext_sec = 0;
return 0;
}

BIN
source/libs/libext2fs/libcustomext2fs.a
View File

Binary file not shown.

2
source/libwiigui/gui_gamecarousel.cpp
View File

@ -47,7 +47,7 @@ static GuiImageData *GameCarouselLoadCoverImage(void * Arg)
* Constructor for the GuiGameCarousel class. * Constructor for the GuiGameCarousel class.
*/ */
GuiGameCarousel::GuiGameCarousel(int w, int h, const char *themePath, const u8 *imagebg, int imagebgsize, int selectedGame) : GuiGameCarousel::GuiGameCarousel(int w, int h, const char *themePath, const u8 *imagebg, int imagebgsize, int selectedGame) :
noCover(nocover_png, nocover_png_size) noCover(Resources::GetFile("nocover.png"), Resources::GetFileSize("nocover.png"))
{ {
width = w; width = w;
height = h; height = h;

2
source/libwiigui/gui_gamegrid.cpp
View File

@ -203,7 +203,7 @@ static GuiImageData *GameGridLoadCoverImage(void * Arg)
* Constructor for the GuiGamegrid class. * Constructor for the GuiGamegrid class.
*/ */
GuiGameGrid::GuiGameGrid(int w, int h, const char *themePath, const u8 *imagebg, int selectedGame) : GuiGameGrid::GuiGameGrid(int w, int h, const char *themePath, const u8 *imagebg, int selectedGame) :
noCover(nocoverFlat_png, nocoverFlat_png_size) noCover(Resources::GetFile("nocoverFlat.png"), Resources::GetFileSize("nocoverFlat.png"))
{ {
width = w; width = w;
height = h; height = h;

3
source/main.cpp
View File

@ -23,8 +23,6 @@
#include "language/gettext.h" #include "language/gettext.h"
#include "mload/mload.h" #include "mload/mload.h"
#include "mload/mload_modules.h" #include "mload/mload_modules.h"
#include "FreeTypeGX.h"
#include "FontSystem.h"
#include "video.h" #include "video.h"
#include "audio.h" #include "audio.h"
#include "menu/menus.h" #include "menu/menus.h"
@ -91,7 +89,6 @@ int main(int argc, char *argv[])
printf("\tLoading game settings...%s\n", GameSettings.Load(Settings.ConfigPath) ? "done" : "failed"); printf("\tLoading game settings...%s\n", GameSettings.Load(Settings.ConfigPath) ? "done" : "failed");
printf("\tLoading game statistics...%s\n", GameStatistics.Load(Settings.ConfigPath) ? "done" : "failed"); printf("\tLoading game statistics...%s\n", GameStatistics.Load(Settings.ConfigPath) ? "done" : "failed");
printf("\tLoading theme...%s\n", Theme::Load(Settings.theme_path) ? "done" : "failed (using default)"); printf("\tLoading theme...%s\n", Theme::Load(Settings.theme_path) ? "done" : "failed (using default)");
printf("\tLoading font system...%s\n", SetupDefaultFont(Settings.theme_path) ? "done" : "failed (using default)");
VIDEO_SetWidescreen(Settings.widescreen); VIDEO_SetWidescreen(Settings.widescreen);

2
source/menu/GameBrowseMenu.cpp
View File

@ -166,7 +166,7 @@ GameBrowseMenu::GameBrowseMenu()
homeBtnImgOver = new GuiImage(btnhomeOver); homeBtnImgOver = new GuiImage(btnhomeOver);
homeBtnImgOver->SetWidescreen(Settings.widescreen); homeBtnImgOver->SetWidescreen(Settings.widescreen);
homeBtn = new GuiButton(homeBtnImg, homeBtnImgOver, 0, 3, homeBtn = new GuiButton(homeBtnImg, homeBtnImgOver, 0, 3,
thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos x"), thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos y"),
trigA, btnSoundOver, btnSoundClick2, 1, homeBtnTT, 15, -30, 1, 5); trigA, btnSoundOver, btnSoundClick2, 1, homeBtnTT, 15, -30, 1, 5);
homeBtn->RemoveSoundClick(); homeBtn->RemoveSoundClick();
homeBtn->SetTrigger(trigHome); homeBtn->SetTrigger(trigHome);

2
source/menu/menu_partition_selection.cpp
View File

@ -69,7 +69,7 @@ int SelectPartitionMenu()
exitBtnImg.SetWidescreen(Settings.widescreen); exitBtnImg.SetWidescreen(Settings.widescreen);
exitBtnImgOver.SetWidescreen(Settings.widescreen); exitBtnImgOver.SetWidescreen(Settings.widescreen);
GuiButton exitBtn(&exitBtnImg, &exitBtnImgOver, 0, 3, GuiButton exitBtn(&exitBtnImg, &exitBtnImgOver, 0, 3,
thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos x"), thInt("489 - home menu btn pos x"), thInt("371 - home menu btn pos y"),
&trigA, btnSoundOver, btnSoundClick2, 1); &trigA, btnSoundOver, btnSoundClick2, 1);
exitBtn.SetTrigger(&trigHome); exitBtn.SetTrigger(&trigHome);

3
source/prompts/GameWindow.cpp
View File

@ -472,9 +472,6 @@ int GameWindow::MainLoop()
} }
else if (gameBtn->GetState() == STATE_CLICKED) else if (gameBtn->GetState() == STATE_CLICKED)
{ {
struct discHdr * header = (mountMethod ? dvdheader : gameList[gameSelected]);
GameStatistics.SetPlayCount(header->id, GameStatistics.GetPlayCount(header->id)+1);
GameStatistics.Save();
returnVal = 1; returnVal = 1;
} }
else if (backBtn->GetState() == STATE_CLICKED) //back else if (backBtn->GetState() == STATE_CLICKED) //back

27
source/settings/SettingsPrompts.cpp
View File

@ -272,14 +272,13 @@ int MenuLanguageSelect()
w.Append( &pathBtn ); w.Append( &pathBtn );
w.Append( &backBtn ); w.Append( &backBtn );
w.Append( &defaultBtn ); w.Append( &defaultBtn );
if ( result == 1 ) if (result == 1)
{ {
int len = ( strlen( entered ) - 1 ); if (entered[strlen(entered)-1] != '/')
if ( entered[len] != '/' ) strcat (entered, "/");
strncat ( entered, "/", 1 ); snprintf(Settings.languagefiles_path, sizeof(Settings.languagefiles_path), entered);
strlcpy( Settings.languagefiles_path, entered, sizeof( Settings.languagefiles_path ) ); WindowPrompt(tr("Languagepath changed."), 0, tr("OK"));
WindowPrompt( tr( "Languagepath changed." ), 0, tr( "OK" ) ); if (isInserted(Settings.BootDevice))
if ( isInserted( Settings.BootDevice ) )
{ {
Settings.Save(); Settings.Save();
returnhere = 1; returnhere = 1;
@ -299,19 +298,19 @@ int MenuLanguageSelect()
ret = optionBrowser4.GetClickedOption(); ret = optionBrowser4.GetClickedOption();
if ( ret >= 0 ) if (ret >= 0)
{ {
choice = WindowPrompt( tr( "Do you want to change language?" ), 0, tr( "Yes" ), tr( "Cancel" ) ); choice = WindowPrompt( tr( "Do you want to change language?" ), 0, tr( "Yes" ), tr( "Cancel" ) );
if ( choice == 1 ) if (choice == 1)
{ {
char newLangPath[150]; char newLangPath[150];
snprintf( Settings.languagefiles_path, sizeof( Settings.languagefiles_path ), "%s", Dir.GetFilepath(ret)); snprintf(Settings.languagefiles_path, sizeof( Settings.languagefiles_path ), "%s", Dir.GetFilepath(ret));
char * ptr = strrchr(Settings.languagefiles_path, '/'); char * ptr = strrchr(Settings.languagefiles_path, '/');
if(ptr) ptr[1] = 0; if(ptr) ptr[1] = 0;
snprintf( newLangPath, sizeof( newLangPath ), "%s", Dir.GetFilepath(ret)); snprintf(newLangPath, sizeof(newLangPath), "%s", Dir.GetFilepath(ret));
if ( !CheckFile( newLangPath ) ) if (!CheckFile(newLangPath))
{ {
WindowPrompt( tr( "File not found." ), tr( "Loading standard language." ), tr( "OK" ) ); WindowPrompt(tr("File not found."), tr("Loading standard language."), tr("OK"));
Settings.LoadLanguage(NULL, APP_DEFAULT); Settings.LoadLanguage(NULL, APP_DEFAULT);
} }
else else
@ -521,7 +520,9 @@ int MenuThemeSelect()
} }
else else
{ {
HaltGui();
Theme::Load(Settings.theme_path); Theme::Load(Settings.theme_path);
ResumeGui();
} }
Settings.Save(); Settings.Save();
returnVal = 1; returnVal = 1;

8
source/sys.cpp
View File

@ -9,7 +9,8 @@
#include "network/networkops.h" #include "network/networkops.h"
#include "utils/ResourceManager.h" #include "utils/ResourceManager.h"
#include "usbloader/playlog.h" #include "usbloader/playlog.h"
#include "FontSystem.h" #include "usbloader/wbfs.h"
#include "themes/CTheme.h"
#include "audio.h" #include "audio.h"
#include "fatmounter.h" #include "fatmounter.h"
#include "lstub.h" #include "lstub.h"
@ -77,7 +78,7 @@ void AppCleanUp(void)
gettextCleanUp(); gettextCleanUp();
CloseXMLDatabase(); CloseXMLDatabase();
ClearFontData(); Theme::CleanUp();
NewTitles::DestroyInstance(); NewTitles::DestroyInstance();
DeinitNetwork(); DeinitNetwork();
@ -94,8 +95,7 @@ void AppCleanUp(void)
void ExitApp(void) void ExitApp(void)
{ {
AppCleanUp(); AppCleanUp();
UnmountNTFS(); WBFS_Close();
UnmountEXT();
SDCard_deInit(); SDCard_deInit();
USBDevice_deInit(); USBDevice_deInit();
USB_Deinitialize(); USB_Deinitialize();

88
source/themes/CTheme.cpp
View File

@ -28,30 +28,45 @@
#include "CTheme.h" #include "CTheme.h"
#include "libwiigui/gui.h" #include "libwiigui/gui.h"
#include "FileOperations/fileops.h"
#include "FreeTypeGX.h"
FreeTypeGX * fontSystem = NULL;
static FT_Byte * MainFont = (FT_Byte *) font_ttf;
static u32 MainFontSize = font_ttf_size;
bool Theme::ShowTooltips = true; bool Theme::ShowTooltips = true;
void Theme::SetDefault() void Theme::CleanUp()
{ {
Theme::ShowTooltips = true;
ThemeCleanUp(); ThemeCleanUp();
Resources::Clear(); Resources::Clear();
ClearFontData();
}
void Theme::SetDefault()
{
ShowTooltips = true;
CleanUp();
LoadFont("");
} }
bool Theme::Load(const char * theme_file_path) bool Theme::Load(const char * theme_file_path)
{ {
bool result = LoadTheme(theme_file_path);
if(!result)
return result;
Theme::ShowTooltips = (thInt("1 - Enable tooltips: 0 for off and 1 for on") != 0);
char theme_path[300]; char theme_path[300];
snprintf(theme_path, sizeof(theme_path), theme_file_path); snprintf(theme_path, sizeof(theme_path), theme_file_path);
char * ptr = strrchr(theme_path, '/'); char * ptr = strrchr(theme_path, '/');
if(ptr) *ptr = '\0'; if(ptr) *ptr = '\0';
Theme::LoadFont(theme_path); //! support old font style
bool result = LoadTheme(theme_file_path);
if(!result)
return result;
Theme::ShowTooltips = (thInt("1 - Enable tooltips: 0 for off and 1 for on") != 0);
FILE * file = fopen(theme_file_path, "rb"); FILE * file = fopen(theme_file_path, "rb");
if(!file) if(!file)
return false; return false;
@ -85,5 +100,62 @@ bool Theme::Load(const char * theme_file_path)
snprintf(theme_path, sizeof(theme_path), "%s/%s", theme_path, Foldername); snprintf(theme_path, sizeof(theme_path), "%s/%s", theme_path, Foldername);
Resources::LoadFiles(theme_path); Resources::LoadFiles(theme_path);
//! Override font.ttf with the theme font.ttf if it exists in the image folder
char FontPath[300];
snprintf(FontPath, sizeof(FontPath), "%s/font.ttf", theme_path);
if(CheckFile(FontPath))
Theme::LoadFont(theme_path);
return result; return result;
} }
bool Theme::LoadFont(const char *path)
{
char FontPath[300];
bool result = false;
FILE *pfile = NULL;
ClearFontData();
snprintf(FontPath, sizeof(FontPath), "%s/font.ttf", path);
pfile = fopen(FontPath, "rb");
if (pfile)
{
fseek(pfile, 0, SEEK_END);
MainFontSize = ftell(pfile);
rewind(pfile);
MainFont = new (std::nothrow) FT_Byte[MainFontSize];
if (!MainFont)
{
MainFont = (FT_Byte *) font_ttf;
MainFontSize = font_ttf_size;
}
else
{
fread(MainFont, 1, MainFontSize, pfile);
result = true;
}
fclose(pfile);
}
fontSystem = new FreeTypeGX(MainFont, MainFontSize);
return result;
}
void Theme::ClearFontData()
{
if (fontSystem) delete fontSystem;
fontSystem = NULL;
if (MainFont != (FT_Byte *) font_ttf)
{
if (MainFont != NULL) delete [] MainFont;
MainFont = (FT_Byte *) font_ttf;
MainFontSize = font_ttf_size;
}
}

8
source/themes/CTheme.h
View File

@ -14,8 +14,16 @@ class Theme
static void SetDefault(); static void SetDefault();
//!Load //!Load
static bool Load(const char * path); static bool Load(const char * path);
//!Load font data
static bool LoadFont(const char *path);
//!Clear all image/font/theme data and free the memory
static void CleanUp();
//!Enable tooltips: special case treaded because it is called every frame //!Enable tooltips: special case treaded because it is called every frame
static bool ShowTooltips; static bool ShowTooltips;
private:
//!Clear the font data and free the memory
static void ClearFontData();
}; };
#endif #endif

8
source/usbloader/frag.c
View File

@ -18,8 +18,8 @@
#define SAFE_FREE(x) if(x) { free(x); x = NULL; } #define SAFE_FREE(x) if(x) { free(x); x = NULL; }
extern sec_t fs_ntfs_sec; extern sec_t ntfs_wbfs_sec;
extern sec_t fs_ext_sec; extern sec_t ext_wbfs_sec;
static FragList *frag_list = NULL; static FragList *frag_list = NULL;
@ -212,7 +212,7 @@ int get_frag_list_for_file(char *fname, u8 *id)
} }
// offset to start of partition // offset to start of partition
for (j=0; j<fs->num; j++) { for (j=0; j<fs->num; j++) {
fs->frag[j].sector += fs_ntfs_sec; fs->frag[j].sector += ntfs_wbfs_sec;
} }
} else if (wbfs_part_fs == PART_FS_EXT) { } else if (wbfs_part_fs == PART_FS_EXT) {
ret = _EXT2_get_fragments(fname, &_frag_append, fs); ret = _EXT2_get_fragments(fname, &_frag_append, fs);
@ -222,7 +222,7 @@ int get_frag_list_for_file(char *fname, u8 *id)
} }
// offset to start of partition // offset to start of partition
for (j=0; j<fs->num; j++) { for (j=0; j<fs->num; j++) {
fs->frag[j].sector += fs_ext_sec; fs->frag[j].sector += ext_wbfs_sec;
} }
} }
frag_concat(fa, fs); frag_concat(fa, fs);

11
source/usbloader/wbfs/wbfs_base.cpp
View File

@ -71,17 +71,6 @@ s32 Wbfs::Init(u32 device)
return 0; return 0;
} }
void Wbfs::Close()
{
if (hdd)
{
wbfs_close(hdd);
hdd = NULL;
}
WBFSDevice_deInit();
}
// Default behavior: can't format // Default behavior: can't format
s32 Wbfs::Format() s32 Wbfs::Format()
{ {

5
source/usbloader/wbfs/wbfs_base.h
View File

@ -5,6 +5,9 @@
#include "usbloader/utils.h" #include "usbloader/utils.h"
#include "usbloader/frag.h" #include "usbloader/frag.h"
#define CACHE_SIZE 32
#define CACHED_SECTORS 64
class Wbfs class Wbfs
{ {
public: public:
@ -12,7 +15,6 @@ class Wbfs
void GetProgressValue(s32 * d, s32 * m); void GetProgressValue(s32 * d, s32 * m);
static s32 Init(u32); static s32 Init(u32);
void Close();
s32 CheckGame(u8 *); s32 CheckGame(u8 *);
s32 GameSize(u8 *, f32 *); s32 GameSize(u8 *, f32 *);
wbfs_t *GetHddInfo(void); wbfs_t *GetHddInfo(void);
@ -21,6 +23,7 @@ class Wbfs
virtual bool ShowFreeSpace(void); virtual bool ShowFreeSpace(void);
virtual s32 Open() = 0; virtual s32 Open() = 0;
virtual void Close() = 0;
virtual wbfs_disc_t* OpenDisc(u8 *discid) = 0; virtual wbfs_disc_t* OpenDisc(u8 *discid) = 0;
virtual void CloseDisc(wbfs_disc_t *disc) = 0; virtual void CloseDisc(wbfs_disc_t *disc) = 0;
virtual s32 Format(); virtual s32 Format();

37
source/usbloader/wbfs/wbfs_ext.cpp Normal file
View File

@ -0,0 +1,37 @@
#include <ext2.h>
#include "usbloader/usbstorage2.h"
#include "wbfs_ext.h"
sec_t ext_wbfs_sec = 0;
s32 Wbfs_Ext::Open()
{
Close();
strcpy(wbfs_fs_drive, "EXT:");
if (Mounted)
return 0;
Mounted = ext2Mount("EXT", &__io_usbstorage2, lba, CACHE_SIZE, CACHED_SECTORS, EXT2_FLAG_DEFAULT);
if (!Mounted)
return -2;
ext_wbfs_sec = lba;
return 0;
}
void Wbfs_Ext::Close()
{
if (hdd)
{
wbfs_close(hdd);
hdd = NULL;
}
/* Unmount device */
ext2Unmount("EXT:/");
Mounted = false;
ext_wbfs_sec = 0;
}

8
source/usbloader/wbfs/wbfs_ext.h
View File

@ -13,12 +13,8 @@ class Wbfs_Ext: public Wbfs_Fat
{ {
} }
virtual s32 Open() virtual s32 Open();
{ virtual void Close();
strcpy(wbfs_fs_drive, "EXT:");
return MountEXT(lba);
};
bool ShowFreeSpace(void) { return true; }; bool ShowFreeSpace(void) { return true; };
}; };

46
source/usbloader/wbfs/wbfs_fat.cpp
View File

@ -10,10 +10,13 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/statvfs.h> #include <sys/statvfs.h>
#include <ctype.h> #include <ctype.h>
#include <fat.h>
#include "settings/CSettings.h" #include "settings/CSettings.h"
#include "settings/GameTitles.h" #include "settings/GameTitles.h"
#include "usbloader/disc.h" #include "usbloader/disc.h"
#include "usbloader/usbstorage2.h"
#include "libs/libfat/fatfile_frag.h"
#include "fatmounter.h" #include "fatmounter.h"
#include "wbfs_fat.h" #include "wbfs_fat.h"
#include "prompts/ProgressWindow.h" #include "prompts/ProgressWindow.h"
@ -26,44 +29,59 @@
using namespace std; using namespace std;
sec_t fat_wbfs_sec = 0;
char Wbfs_Fat::wbfs_fs_drive[16]; char Wbfs_Fat::wbfs_fs_drive[16];
char Wbfs_Fat::wbfs_fat_dir[16] = "/wbfs"; char Wbfs_Fat::wbfs_fat_dir[16] = "/wbfs";
char Wbfs_Fat::invalid_path[] = "/\\:|<>?*\"'"; char Wbfs_Fat::invalid_path[] = "/\\:|<>?*\"'";
struct discHdr *Wbfs_Fat::fat_hdr_list = NULL; struct discHdr *Wbfs_Fat::fat_hdr_list = NULL;
u32 Wbfs_Fat::fat_hdr_count = 0; u32 Wbfs_Fat::fat_hdr_count = 0;
extern "C"
{
int _FAT_get_fragments(const char *path, _frag_append_t append_fragment, void *callback_data);
extern FragList *frag_list;
}
u32 Wbfs_Fat::fat_sector_size = 512; u32 Wbfs_Fat::fat_sector_size = 512;
Wbfs_Fat::Wbfs_Fat(u32 device, u32 lba, u32 size) : Wbfs_Fat::Wbfs_Fat(u32 device, u32 lba, u32 size) :
Wbfs(device, lba, size) Wbfs(device, lba, size), Mounted(false)
{ {
} }
s32 Wbfs_Fat::Open() s32 Wbfs_Fat::Open()
{ {
Close();
if (device == WBFS_DEVICE_USB && lba == fat_usb_sec) if (device == WBFS_DEVICE_USB && lba == fat_usb_sec)
{ {
strcpy(wbfs_fs_drive, "USB:"); strcpy(wbfs_fs_drive, "USB:");
} Mounted = true;
else if (device == WBFS_DEVICE_SDHC && lba == fat_sd_sec)
{
strcpy(wbfs_fs_drive, "SD:");
} }
else else
{ {
if (WBFSDevice_Init(lba)) return -1; //closing all open Files write back the cache and then shutdown em!
strcpy(wbfs_fs_drive, "WBFS:"); fatUnmount("FAT32:/");
Mounted = fatMount("FAT32", &__io_usbstorage2, lba, CACHE_SIZE, CACHED_SECTORS);
if (!Mounted)
return -1;
fat_wbfs_sec = lba;
strcpy(wbfs_fs_drive, "FAT32:");
} }
return 0; return 0;
} }
void Wbfs_Fat::Close()
{
if (hdd)
{
wbfs_close(hdd);
hdd = NULL;
}
fatUnmount("FAT32:/");
Mounted = false;
fat_wbfs_sec = 0;
}
wbfs_disc_t* Wbfs_Fat::OpenDisc(u8 *discid) wbfs_disc_t* Wbfs_Fat::OpenDisc(u8 *discid)
{ {
char fname[MAX_FAT_PATH]; char fname[MAX_FAT_PATH];

2
source/usbloader/wbfs/wbfs_fat.h
View File

@ -13,6 +13,7 @@ class Wbfs_Fat: public Wbfs
~Wbfs_Fat(); ~Wbfs_Fat();
virtual s32 Open(); virtual s32 Open();
virtual void Close();
wbfs_disc_t* OpenDisc(u8 *); wbfs_disc_t* OpenDisc(u8 *);
void CloseDisc(wbfs_disc_t *); void CloseDisc(wbfs_disc_t *);
@ -34,6 +35,7 @@ class Wbfs_Fat: public Wbfs
protected: protected:
static char wbfs_fs_drive[16]; static char wbfs_fs_drive[16];
bool Mounted;
private: private:
split_info_t split; split_info_t split;

40
source/usbloader/wbfs/wbfs_ntfs.cpp
View File

@ -1,14 +1,44 @@
#include <ntfs.h>
#include <locale.h>
#include "wbfs_ntfs.h" #include "wbfs_ntfs.h"
#include "fatmounter.h" #include "usbloader/usbstorage2.h"
#include "libs/libntfs/ntfsfile_frag.h"
sec_t ntfs_wbfs_sec = 0;
s32 Wbfs_Ntfs::Open() s32 Wbfs_Ntfs::Open()
{ {
Close();
strcpy(wbfs_fs_drive, "NTFS:"); strcpy(wbfs_fs_drive, "NTFS:");
return MountNTFS(lba);
if (Mounted)
return 0;
Mounted = ntfsMount("NTFS", &__io_usbstorage2, lba, CACHE_SIZE, CACHED_SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER);
if (!Mounted)
return -2;
// ntfsInit() resets locals
// which breaks unicode in console
// so we change it back to C-UTF-8
setlocale(LC_CTYPE, "C-UTF-8");
setlocale(LC_MESSAGES, "C-UTF-8");
ntfs_wbfs_sec = lba;
return 0;
} }
bool Wbfs_Ntfs::ShowFreeSpace(void) void Wbfs_Ntfs::Close()
{ {
return true; if (hdd)
{
wbfs_close(hdd);
hdd = NULL;
}
ntfsUnmount("NTFS:/", true);
Mounted = false;
ntfs_wbfs_sec = 0;
} }

3
source/usbloader/wbfs/wbfs_ntfs.h
View File

@ -12,8 +12,9 @@ class Wbfs_Ntfs: public Wbfs_Fat
} }
virtual s32 Open(); virtual s32 Open();
virtual void Close();
bool ShowFreeSpace(void); bool ShowFreeSpace(void) { return true; };
}; };
#endif //_WBFS_NTFS_H #endif //_WBFS_NTFS_H

9
source/usbloader/wbfs/wbfs_wbfs.cpp
View File

@ -23,6 +23,15 @@ s32 Wbfs_Wbfs::Open()
return 0; return 0;
} }
void Wbfs_Wbfs::Close()
{
if (hdd)
{
wbfs_close(hdd);
hdd = NULL;
}
}
wbfs_disc_t* Wbfs_Wbfs::OpenDisc(u8 *discid) wbfs_disc_t* Wbfs_Wbfs::OpenDisc(u8 *discid)
{ {
/* No device open */ /* No device open */

1
source/usbloader/wbfs/wbfs_wbfs.h
View File

@ -13,6 +13,7 @@ class Wbfs_Wbfs: public Wbfs
} }
s32 Open(); s32 Open();
virtual void Close();
wbfs_disc_t* OpenDisc(u8 *); wbfs_disc_t* OpenDisc(u8 *);
void CloseDisc(wbfs_disc_t *); void CloseDisc(wbfs_disc_t *);

2
source/utils/wifi_gecko.c
View File

@ -69,7 +69,7 @@ int WifiGecko_Connect()
int WifiGecko_Send(const char * data, int datasize) int WifiGecko_Send(const char * data, int datasize)
{ {
if(!WifiGecko_Connect()) if(WifiGecko_Connect() < 0)
return connection; return connection;
int ret = 0, done = 0, blocksize = 1024; int ret = 0, done = 0, blocksize = 1024;