Force 'captivemodid' checking during any W32 module loading.

[captive.git] / src / install / acquire / moduriload.c

diff --git a/src/install/acquire/moduriload.c b/src/install/acquire/moduriload.c
index 4500716..dbc86fe 100644 (file)
--- a/src/install/acquire/moduriload.c
+++ b/src/install/acquire/moduriload.c
@@ -109,10 +109,10 @@ int dest_fd;
 
        all_modules_found=FALSE;
 
-       best_priority=captive_captivemodid_module_type_best_priority_lookup(module->type);
+       best_priority=captive_captivemodid_module_type_best_priority_lookup(captivemodid,module->type);
        if (best_priority==G_MININT     /* no longer seeking for such module */
                        || module_available->module->priority==best_priority) {
-               if (captive_captivemodid_module_type_best_priority_found(module->type)) {
+               if (captive_captivemodid_module_type_best_priority_found(captivemodid,module->type)) {
                        /* Postpone (*acquire_module_all_modules_found_notify)()
                         * after (*acquire_module_available_notify)().
                         */
@@ -139,7 +139,7 @@ struct captive_captivemodid_module *module;
                return;
 
        file_md5=captive_calc_md5(file_base,file_length);
-       if (!(module=captive_captivemodid_module_md5_lookup(file_md5)))
+       if (!(module=captive_captivemodid_module_md5_lookup(captivemodid,file_md5)))
                goto fail_free_file_md5;
 
        if (strcmp("cabinet",(const char *)module->type))
@@ -239,14 +239,14 @@ GnomeVFSHandle *handle;
                errvfsresult=GNOME_VFS_ERROR_WRONG_FORMAT;
                goto fail_file_info_local_clear;
                }
-       if (!captive_captivemodid_module_length_is_valid(file_info_local.size)) {
+       if (!captive_captivemodid_module_length_is_valid(captivemodid,file_info_local.size)) {
                errvfsresult=GNOME_VFS_ERROR_WRONG_FORMAT;
                goto fail_file_info_local_clear;
                }
        if (file_info_local.size<=MAX_FILE_LOAD_LENGTH)
                mod_uri_load_file_handle_to_memory(handle,&file_info_local,uri);
        else {
-gint cabinet_used=captive_captivemodid_cabinet_length_to_used(file_info_local.size);
+gint cabinet_used=captive_captivemodid_cabinet_length_to_used(captivemodid,file_info_local.size);
 
                mod_uri_load_file_handle_remote_cabinet(&handle,&file_info_local,uri,cabinet_used);
                }