/**
* Apply diff to a registry context
*/
-_PUBLIC_ WERROR reg_diff_apply(const char *filename,
- struct registry_context *ctx)
+_PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, const char *filename)
{
struct reg_diff_callbacks callbacks;
WERROR (*done) (void *callback_data);
};
-WERROR reg_diff_apply (const char *filename,
- struct registry_context *ctx);
+WERROR reg_diff_apply(struct registry_context *ctx, const char *filename);
WERROR reg_generate_diff(struct registry_context *ctx1,
struct registry_context *ctx2,
struct registry_key **key);
WERROR get_predefined_key(uint32_t hkey_id, struct registry_key **key);
- WERROR apply_patchfile(const char *filename)
- {
- return reg_diff_apply(filename, $self);
- }
-
+ WERROR apply_patchfile(const char *filename);
WERROR mount_hive(struct hive_key *hive_key, uint32_t hkey_id,
const char **elements=NULL);
poptFreeContext(pc);
- reg_diff_apply(patch, h);
+ reg_diff_apply(h, patch);
return 0;
}