diff --git a/Module.mk b/Module.mk index 24c9ee1..eb6f897 100644 --- a/Module.mk +++ b/Module.mk @@ -72,7 +72,7 @@ cflags += \ # that is still ABI-compatible with the real build its target links against. avsvers_32 := 1700 1603 1601 1508 1403 1304 1101 803 0 -avsvers_64 := 1700 1603 1601 1508 +avsvers_64 := 1700 1603 1601 1509 1508 imps += avs avs-ea3 diff --git a/src/imports/import_64_1509_avs-ea3.def b/src/imports/import_64_1509_avs-ea3.def new file mode 100644 index 0000000..9c4a2b3 --- /dev/null +++ b/src/imports/import_64_1509_avs-ea3.def @@ -0,0 +1,7 @@ +LIBRARY libavs-win64-ea3 + +EXPORTS + ea3_boot @8 NONAME + ea3_get_boot_status @11 NONAME + ea3_get_pp_status @10 NONAME + ea3_shutdown @9 NONAME diff --git a/src/imports/import_64_1509_avs.def b/src/imports/import_64_1509_avs.def new file mode 100644 index 0000000..ae6110a --- /dev/null +++ b/src/imports/import_64_1509_avs.def @@ -0,0 +1,32 @@ +LIBRARY libavs-win64 + +EXPORTS + avs_boot @285 NONAME + avs_fs_close @65 NONAME + avs_fs_lseek @59 NONAME + avs_fs_lseek64 @60 NONAME + avs_fs_open @58 NONAME + avs_fs_read @61 NONAME + avs_net_ctrl @98 NONAME + avs_shutdown @286 NONAME + avs_thread_create @6 NONAME + avs_thread_destroy @8 NONAME + avs_thread_exit @12 NONAME + avs_thread_join @13 NONAME + log_body_fatal @357 NONAME + log_body_info @359 NONAME + log_body_misc @360 NONAME + log_body_warning @358 NONAME + property_create @127 NONAME + property_desc_to_buffer @129 NONAME + property_destroy @128 NONAME + property_insert_read @131 NONAME + property_node_create @145 NONAME + property_node_refer @158 NONAME + property_node_remove @146 NONAME + property_psmap_export @162 NONAME + property_psmap_import @161 NONAME + property_read_query_memsize @159 NONAME + property_search @144 NONAME + std_getenv @207 NONAME + std_setenv @208 NONAME diff --git a/src/main/launcher/property.c b/src/main/launcher/property.c index 368b092..2f5ded9 100644 --- a/src/main/launcher/property.c +++ b/src/main/launcher/property.c @@ -64,7 +64,7 @@ struct property *boot_property_load(const char *filename) nbytes = property_read_query_memsize(boot_property_fread, f_keyhole, 0, 0); if (nbytes < 0) { - log_fatal("%s: Error parsing configuration file", filename); + log_fatal("%s: Error querying configuration file", filename); } buffer = xmalloc(nbytes); @@ -76,7 +76,7 @@ struct property *boot_property_load(const char *filename) rewind(f); if (!property_insert_read(prop, 0, boot_property_fread, f_keyhole)) { - log_fatal("%s: Error parsing configuration file", filename); + log_fatal("%s: Error reading configuration file", filename); } TlsFree(f_keyhole); diff --git a/src/main/launcher/stubs.c b/src/main/launcher/stubs.c index 08311c7..a524273 100644 --- a/src/main/launcher/stubs.c +++ b/src/main/launcher/stubs.c @@ -35,7 +35,7 @@ static void *STDCALL my_GetProcAddress(HMODULE dll, const char *name); static void bt_get_ikey_status(struct ikey_status *ik); -#if AVS_VERSION >= 1600 +#if AVS_VERSION >= 1509 static void bt_get_fucked(bt_get_fucked_t callback, uint32_t ctx); #endif @@ -48,7 +48,7 @@ static HMODULE(STDCALL *real_GetModuleHandleW)(const wchar_t *name); static void *(STDCALL *real_GetProcAddress)(HMODULE dll, const char *name); static struct stub stub_list[] = { -#if AVS_VERSION >= 1600 +#if AVS_VERSION >= 1509 {"k_bt0001", bt_get_ikey_status}, {"k_bt0002", bt_get_fucked}, #else @@ -134,7 +134,7 @@ static void bt_get_ikey_status(struct ikey_status *ik) ik[1].cert_valid_end = -1; } -#if AVS_VERSION >= 1600 +#if AVS_VERSION >= 1509 static void bt_get_fucked(bt_get_fucked_t callback, uint32_t ctx) { log_info(">>> k_bt0002");