aboutsummaryrefslogtreecommitdiff
path: root/zucchini_integration.cc
diff options
context:
space:
mode:
Diffstat (limited to 'zucchini_integration.cc')
-rw-r--r--zucchini_integration.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/zucchini_integration.cc b/zucchini_integration.cc
index bf28b3c..c654a08 100644
--- a/zucchini_integration.cc
+++ b/zucchini_integration.cc
@@ -184,11 +184,12 @@ status::Code Generate(const base::FilePath& old_path,
std::string imposed_matches) {
using base::File;
File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ |
- base::File::FLAG_SHARE_DELETE);
+ base::File::FLAG_WIN_SHARE_DELETE);
File new_file(new_path, File::FLAG_OPEN | File::FLAG_READ |
- base::File::FLAG_SHARE_DELETE);
+ base::File::FLAG_WIN_SHARE_DELETE);
File patch_file(patch_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ |
- File::FLAG_WRITE | File::FLAG_SHARE_DELETE |
+ File::FLAG_WRITE |
+ File::FLAG_WIN_SHARE_DELETE |
File::FLAG_CAN_DELETE_ON_CLOSE);
const FileNames file_names(old_path, new_path, patch_path);
return GenerateCommon(std::move(old_file), std::move(new_file),
@@ -211,11 +212,11 @@ status::Code Apply(const base::FilePath& old_path,
bool force_keep) {
using base::File;
File old_file(old_path, File::FLAG_OPEN | File::FLAG_READ |
- base::File::FLAG_SHARE_DELETE);
+ base::File::FLAG_WIN_SHARE_DELETE);
File patch_file(patch_path, File::FLAG_OPEN | File::FLAG_READ |
- base::File::FLAG_SHARE_DELETE);
+ base::File::FLAG_WIN_SHARE_DELETE);
File new_file(new_path, File::FLAG_CREATE_ALWAYS | File::FLAG_READ |
- File::FLAG_WRITE | File::FLAG_SHARE_DELETE |
+ File::FLAG_WRITE | File::FLAG_WIN_SHARE_DELETE |
File::FLAG_CAN_DELETE_ON_CLOSE);
const FileNames file_names(old_path, new_path, patch_path);
return ApplyCommon(std::move(old_file), std::move(patch_file),