Skip to content

Implement ea3-ident.xml overrides #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shizmob wants to merge 3 commits into from
Closed

Implement ea3-ident.xml overrides #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd52867
imports: add property_node_clone() and property_node_traversal()
shizmob May 1, 2023
cc73131
imports: clarify property_node_clone() prototype
shizmob May 1, 2023
df882f4
launcher: override ea3 config using ea3-ident.xml
shizmob May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/imports/avs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ int property_psmap_export(
const struct property_psmap *psmap);

struct property_node *property_node_clone(
struct property *new_parent,
int unk0,
struct property *parent_prop,
struct property_node *parent_node,
struct property_node *src,
bool deep);
struct property_node *property_node_create(
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_32_1101_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ EXPORTS
property_node_datasize @267 NONAME
property_node_refer @278 NONAME
property_node_remove @279 NONAME
property_node_clone @280 NONAME
property_node_traversal @282 NONAME
property_psmap_import @288 NONAME
property_psmap_export @287 NONAME
property_read_query_memsize @291 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_32_1304_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ EXPORTS
property_node_datasize @249 NONAME
property_node_refer @268 NONAME
property_node_remove @129 NONAME
property_node_clone @130 NONAME
property_node_traversal @132 NONAME
property_psmap_import @102 NONAME
property_psmap_export @110 NONAME
property_read_query_memsize @100 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_32_1403_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ EXPORTS
property_destroy @130 NONAME
property_insert_read @133 NONAME
property_node_remove @148 NONAME
property_node_clone @149 NONAME
property_node_traversal @151 NONAME
property_psmap_import @163 NONAME
property_psmap_export @164 NONAME
property_read_query_memsize @161 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_32_1508_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ EXPORTS
property_node_create @145 NONAME
property_node_refer @158 NONAME
property_node_remove @146 NONAME
property_node_clone @147 NONAME
property_node_traversal @149 NONAME
property_psmap_export @162 NONAME
property_psmap_import @161 NONAME
property_read_query_memsize @159 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_32_1601_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ EXPORTS
property_search @141 NONAME
property_node_create @142 NONAME
property_node_remove @143 NONAME
property_node_clone @144 NONAME
property_node_traversal @146 NONAME
property_node_refer @155 NONAME
property_read_query_memsize @156 NONAME
property_psmap_export @159 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_32_1603_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ EXPORTS
property_search @162 NONAME
property_node_create @163 NONAME
property_node_remove @164 NONAME
property_node_clone @165 NONAME
property_node_traversal @167 NONAME
property_node_refer @176 NONAME
property_read_query_memsize @177 NONAME
property_psmap_import @179 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_32_1700_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ EXPORTS
property_search @162 NONAME
property_node_create @163 NONAME
property_node_remove @164 NONAME
property_node_clone @165 NONAME
property_node_traversal @167 NONAME
property_node_refer @176 NONAME
property_read_query_memsize @177 NONAME
property_psmap_import @179 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_64_1508_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ EXPORTS
property_node_create @145 NONAME
property_node_refer @158 NONAME
property_node_remove @146 NONAME
property_node_clone @147 NONAME
property_node_traversal @149 NONAME
property_psmap_export @162 NONAME
property_psmap_import @161 NONAME
property_read_query_memsize @159 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_64_1509_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ EXPORTS
property_node_create @145 NONAME
property_node_refer @158 NONAME
property_node_remove @146 NONAME
property_node_clone @147 NONAME
property_node_traversal @149 NONAME
property_psmap_export @162 NONAME
property_psmap_import @161 NONAME
property_read_query_memsize @159 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_64_1601_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ EXPORTS
property_search @141 NONAME
property_node_create @142 NONAME
property_node_remove @143 NONAME
property_node_clone @144 NONAME
property_node_traversal @146 NONAME
property_node_refer @155 NONAME
property_read_query_memsize @156 NONAME
property_psmap_export @159 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_64_1603_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ EXPORTS
property_search @162 NONAME
property_node_create @163 NONAME
property_node_remove @164 NONAME
property_node_clone @165 NONAME
property_node_traversal @167 NONAME
property_node_refer @176 NONAME
property_read_query_memsize @177 NONAME
property_psmap_import @179 NONAME
Expand Down
2 changes: 2 additions & 0 deletions src/imports/import_64_1700_avs.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ EXPORTS
property_search @162 NONAME
property_node_create @163 NONAME
property_node_remove @164 NONAME
property_node_clone @165 NONAME
property_node_traversal @167 NONAME
property_node_refer @176 NONAME
property_read_query_memsize @177 NONAME
property_psmap_import @179 NONAME
Expand Down
17 changes: 17 additions & 0 deletions src/main/launcher/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,23 @@ int main(int argc, const char **argv)
log_fatal("%s: /ea3 missing", options.ea3_config_path);
}

if (path_exists(options.ea3_ident_path)) {
log_info("%s: loading override", options.ea3_ident_path);
struct property *ea3_ident = boot_property_load(options.ea3_ident_path);
struct property_node *node =
property_search(ea3_ident, NULL, "/ea3_conf");
if (node == NULL) {
log_fatal("%s: /ea3_conf missing", options.ea3_ident_path);
}

for (node = property_node_traversal(node, TRAVERSE_FIRST_CHILD); node;
node = property_node_traversal(node, TRAVERSE_NEXT_SIBLING)) {
property_node_clone(NULL, ea3_config_root, node, TRUE);
}

boot_property_free(ea3_ident);
}

ea3_ident_init(&ea3);

if (!ea3_ident_from_property(&ea3, ea3_config)) {
Expand Down
1 change: 1 addition & 0 deletions src/main/launcher/options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ void options_init(struct options *options)
options->app_config_path = "prop/app-config.xml";
options->avs_config_path = "prop/avs-config.xml";
options->ea3_config_path = "prop/ea3-config.xml";
options->ea3_ident_path = "prop/ea3-ident.xml";
Copy link
Contributor

@icex2 icex2 May 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default is ok, but I don't see any parsing for this in options_read_cmdline allowing users to set this one to a path (and file) of their choice.

options->softid = NULL;
options->pcbid = NULL;
options->module = NULL;
Expand Down
1 change: 1 addition & 0 deletions src/main/launcher/options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ struct options {
const char *app_config_path;
const char *avs_config_path;
const char *ea3_config_path;
const char *ea3_ident_path;
const char *softid;
const char *pcbid;
const char *module;
Expand Down