[poppler] Branch 'poppler-0.24' - goo/gfile.cc
Albert Astals Cid
aacid at kemper.freedesktop.org
Sat Sep 21 01:12:27 PDT 2013
goo/gfile.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 1e612d331b79dabec66ad241d7ffe66674a10bc4
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
Date: Sat Sep 21 10:10:16 2013 +0200
Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION
Bug #69597
diff --git a/goo/gfile.cc b/goo/gfile.cc
index c590a19..44beddd 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -24,6 +24,7 @@
// Copyright (C) 2013 Adam Reichold <adamreichold at myopera.com>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Peter Breitenlohner <peb at mppmu.mpg.de>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -621,7 +622,7 @@ Goffset GooFile::size() const {
GooFile* GooFile::open(const GooString *fileName) {
HANDLE handle = CreateFile(fileName->getCString(),
GENERIC_READ,
- FILE_SHARE_READ,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
@@ -632,7 +633,7 @@ GooFile* GooFile::open(const GooString *fileName) {
GooFile* GooFile::open(const wchar_t *fileName) {
HANDLE handle = CreateFileW(fileName,
GENERIC_READ,
- FILE_SHARE_READ,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
More information about the poppler
mailing list