Beta 0.6

.gitignore

@@ -1,3 +1,13 @@
 output
 build
 *.cia
+# ignore visual studio project files
+*.opensdf
+*.sdf
+*.sln
+*.suo
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+
+*.log

Makefile

@@ -8,4 +8,4 @@ endif
 # ENABLE_EXCEPTIONS: Enable C++ exceptions.
 #---------------------------------------------------------------------------------
 
-include $(DEVKITPRO)/ctrcommon/tools/make_base
+include $(DEVKITPRO)/citrus/tools/make_base

README.md

@@ -1,7 +1,8 @@
 Free multi Patcher
 ==================================
 
-This application for the 3DS allows to patch systemmodules while using system or emunand,and with and without using firmlaunch. Because of this it allows E-Shop access on all 9.x firmware verions and regionfree cias in Pasta and other CFWs
+This application for the 3DS allows to patch systemmodules while using system or emunand and with and without using firmlaunch. Because of this it allows E-Shop access on all 9.x firmware verions and regionfree in Pasta and other CFWs.
+It also allows other peoples to create, add and share own patches using the patchlayout defined by this [wiki page](https://github.com/hartmannaf/Free-multi-Patcher/wiki/patchlayout)
 
 ### Dependencies
 
@@ -11,4 +12,5 @@ This application for the 3DS allows to patch systemmodules while using system or
 
 ### Credits
 * base application: 	[YGW Eshop Spoofer (Y a Gateway!?)](https://github.com/felipejfc/ygw-eshop-spoofer) by [felipejfc](https://github.com/felipejfc)
-* region free:		[rxtools](https://github.com/roxas75/rxTools) by [roxas](https://github.com/roxas75/rxTools)
+* region free:		[rxtools](https://github.com/roxas75/rxTools) by [roxas](https://github.com/roxas75)
+* CVer and NVER reading [3ds_homemenuhax](https://github.com/yellows8/3ds_homemenuhax) by [yellows8](https://github.com/yellows8)

include/binaryLayouts.h

@@ -0,0 +1,61 @@
+#pragma once
+
+#include <3ds.h>
+#include "constants.h"
+#include "device.h"
+
+/*Patchlayout defined by https://github.com/hartmannaf/Free-multi-Patcher/wiki/patchlayout */
+
+//placeholder for possible later types of emunand
+typedef struct nandTypesStruct
+{
+    u32 System : 1;
+    u32 Emu : 1;
+    u32 placeholder : 6;
+} nands;
+
+typedef struct patchStruct
+{
+    u32   version;              //0 for development, 1 after first release
+    u32   patchSize;
+    u32   patchNameSize;
+    u32   descriptionSize;
+    u32   processNameSize;
+    u32   originalcodeSize;
+    u32   patchcodeSize;
+    u32   processType;          //ARM9 = 0, ARM11 = 1
+    kernelVersion       minKernelVersion;
+    kernelVersion       maxKernelVersion;
+    firmwareVersion     minFirmwareVersion;
+    firmwareVersion     maxFirmwareVersion;
+    devices devicesSupported;
+    regions regionsSupported;
+    nands   nandCompability;
+    u32     patchType;          //0->search code, 1->overwrite code, 2->search String, 3->overwrite string
+    u32     startAddressProcess;
+    u32     startAddressGlobal;
+    u32     searchAreaSize;     //0 overwrite all apearences
+    u32     patchOffset;        //strings offset between each character, code offset where to patch based on originalcode  
+    u32     numberOfReplacements;
+    char binaryData[];
+} binPatch;
+
+
+/*PatchCollectionlayout defined by https://github.com/hartmannaf/Free-multi-Patcher/wiki/patchCollectionlayout */
+
+typedef struct patchCollectionStruct
+{
+    u32   version;
+    u32   collectionNameSize;
+    u32   descriptionSize;
+    u32   numberOfPatches;
+    u32   processType;
+    kernelVersion     minKernelVersion;
+    kernelVersion     maxKernelVersion;
+    firmwareVersion   minFirmwareVersion;
+    firmwareVersion   maxFirmwareVersion;
+    devices devicesSupported;
+    regions regionsSupported;
+    nands   nandCompability;
+    char    binaryData[];
+} binPatchCollection;

include/collectionEntry.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "patchCollections.h"
+#include "defaultMenuEntrys.h"
+
+
+class CollectionEntry : protected YesNoMenuEntry, protected NavigationMenuEntry
+{
+protected:
+    PatchCollection* collection;
+public:
+    CollectionEntry(PatchCollection* collection, MenuManagerM* manager,MenuM* parentMenu);
+    int sideAction();
+    virtual std::string getRow();
+};

include/constants.h

@@ -2,11 +2,37 @@
 
 #include <3ds.h>
 
+#include <string>
+#include <stdio.h>
+#include <string.h>
+
 extern u32 curr_kproc_addr;
 extern u32 kproc_start;
 extern u32 kproc_size;
 extern u32 kproc_num;
 extern u32 kproc_codeset_offset;
 extern u32 kproc_pid_offset;
 
-void SaveVersionConstants();
+void SaveVersionConstants();
+
+//Application Constands 
+static const std::string applicationFolder = "sdmc:/fmp/";
+
+static const std::string patchesFolder = applicationFolder+"patches/";
+static const std::string patchExtension = ".patch";
+static const std::string patchCollectionExtension = ".collection";
+
+static const std::string settingsFolder=applicationFolder+"settings/";
+static const std::string settingsExtension =".cfg";
+static const std::string globalSettingsFileName = "settings";
+
+static const std::string mainUrl = "http://fmp.hartie95.de/";
+static const std::string mainDownloadUrl = mainUrl + "updates/";
+static const std::string versionCheckUrl = mainUrl + "version.txt";
+
+static const std::string mainDownloadUrlDev = mainUrl + "devUpdates/";
+static const std::string VersionCheckUrlDev = mainUrl + "devVersion.txt";
+
+static const u32 version=0x00060471;
+
+std::string generateVersionString(u32 version);

include/defaultMenuEntrys.h

@@ -0,0 +1,69 @@
+#pragma once
+
+#include <3ds.h>
+#include <stdio.h>
+
+#include <string>
+#include "workaround.h"
+
+#define MAXNAMELENGTH 29
+
+class MenuEntry 
+{
+private:
+protected:
+	std::string name;
+	char type;
+	std::string description;
+    u32 maxNameLength = MAXNAMELENGTH;
+    u32 maxDescriptionLength = 40;
+	MenuEntry(){
+
+	}
+public:
+	MenuEntry(std::string name, std::string description);
+	virtual int sideAction();
+	virtual int aAction();
+	virtual std::string getRow();
+	void setName(std::string name);
+	void setDescription(std::string description);
+	std::string getName();
+	std::string getDescription();
+};
+
+class BackMenuEntry : protected MenuEntry 
+{
+private:
+	MenuManagerM* manager;
+public:
+	BackMenuEntry(MenuManagerM* manager,std::string name, std::string description);
+	int aAction();
+	void back();
+};
+
+class NavigationMenuEntry : virtual protected MenuEntry 
+{
+protected:
+	MenuM* 		  menu;
+	MenuManagerM* manager;
+    NavigationMenuEntry(){};
+public:
+	NavigationMenuEntry(MenuManagerM* manager,MenuM* menu,std::string name, std::string description);
+	int aAction();
+	void navigate();
+};
+
+class YesNoMenuEntry : virtual protected MenuEntry 
+{
+private:
+protected:
+	bool* value;
+	std::string getValueString(bool value);
+	YesNoMenuEntry(){
+
+	}
+public:
+	YesNoMenuEntry(bool* value,std::string name, std::string description);
+	virtual int sideAction();
+	virtual std::string getRow();
+};

include/device.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#include <3ds.h>
+
+typedef struct kernelVersionStruct
+{
+	u8 unknown;
+	u8 revision;
+	u8 minor;
+	u8 major;
+}kernelVersion;
+
+typedef struct firmwareVersionStruct
+{
+	u8 major;
+	u8 minor;
+	u8 revision;
+	u8 nver;
+}firmwareVersion;
+
+typedef struct devicesStruct
+{
+	u32 old3DS : 1;
+	u32 old3DSXL : 1;
+	u32 old2DS : 1;
+	u32 new3DS : 1;
+	u32 new3DSXL : 1;
+	u32 placeholder : 3;
+} devices;
+
+//Australia is not used, instead it uses European region
+typedef struct regionsStruct
+{
+	u32 japan : 1;
+	u32 northAmerica : 1;
+	u32 europe : 1;
+	u32 australia : 1;
+	u32 china : 1;
+	u32 korea : 1;
+	u32 taiwan : 1;
+	u32 placeholder : 1;
+} regions;
+
+typedef struct deviceInformationsStruct
+{
+	u8 modelID;
+	u8 region;
+	kernelVersion kernelversion;
+	firmwareVersion firmwareversion;
+} deviceInformations;
+
+
+extern deviceInformations device;
+
+int initDeviceInformations();
+
+int setModelID();
+int setDeviceRegion();
+int setFirmwareVersion();
+int setKernelVersion();

include/helpers.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <3ds.h>
+#include <stdio.h>
+#include <sstream>
+
+void* loadFile(FILE* file, size_t minSize, size_t* fileSize);
+bool checkFolder(std::string name);
+std::string getStringFromDownload(size_t downloadSize, u8* downloadResult);

include/menu.h

@@ -1,39 +1,40 @@
+#pragma once
+
+#ifndef MENU_H
+#define MENU_H
+
 #include <3ds.h>
 
-#include <ctrcommon/input.hpp>
-#include <ctrcommon/service.hpp>
+#include <string>
 #include "constants.h"
 #include <stdio.h>
+#include <vector>
+#include <memory>
+
+#include "defaultMenuEntrys.h"
+
+class MenuManager;
 
-#define SETTING 	0
-#define SAVE 		1
-#define PLACEHOLDER 254
-#define EXIT 		255
+class Menu : MenuM
+{
+private:
+	Menu* parentMenu;
+	MenuManager* parentManager;
+	unsigned int currentSelection;
+	std::vector<MenuEntry*> menuEntrys;
+public:
+	Menu(MenuManager* parentManager,Menu* parentMenu);
+	MenuManager* getParentManager();
+	Menu* getParentMenu();
+	void addEntry(MenuEntry* entry);
 
-#define ESHOPSPOOF		0
-#define REGIONFREE		1
-#define NOAUTODL		2
-#define SERIALCHANGE 	3
+	void menuChangeSelection(std::string direction);
+	short getNumberOfEntrys();
+	void selectionDoSiteAction();
+	void selectionDoAAction();
+	Menu* back();
 
-struct menuEntry{
-	std::string name;
-	std::string description;
-	short type;
+	void drawMenu();
 };
 
-static const menuEntry menu[]={	{"e-shop spoof     ",	"Patches nim for E-Shop access       ", SETTING},
-								{"region patch     ",	"Patches the home menu to show out of\nregion games and nim to ignore out of\nregion Updates", SETTING},
-								{"no auto download ",	"Patches nim to stop automatic update\ndownload\n(Might be unstable)", SETTING},
-								{"serial patch     ",	"Patches the serial to allow E-Shop  \nacces after region change\n(not implemented)", PLACEHOLDER},
-								{"save",				"Save current selection for later use", SAVE},
-								{"exit",				"Exit without applying patches       ", EXIT}
-							};
-
-static const short numberOfEntries = sizeof(menu)/sizeof(menuEntry);
-
-void menuChageSelection(std::string direction);
-void menuChangeStatusOfSelection(bool patchlist[]);
-short getSelectionType();
-short getNumberOfPatches();
-void drowTop();
-void drawMenu(bool patchlist[]);
+#endif