Attachment 135735 Details for Bug 103793 – win version for Error out on save if file has changed since we opened it

[patch] win version for Error out on save if file has changed since we opened it

103793_win32.patch (text/plain), 1.40 KB, created by Thomas Freitag on 2017-11-27 11:09:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2017-11-27 11:09:49 UTC

Size: 1.40 KB

patch

obsolete

>diff --git a/goo/gfile.cc b/goo/gfile.cc
>index be75c5a6..3f05822e 100644
>--- a/goo/gfile.cc
>+++ b/goo/gfile.cc
>@@ -599,6 +599,10 @@ Goffset GoffsetMax() {
> 
> #ifdef _WIN32
> 
>+GooFile::GooFile(HANDLE handleA) : handle(handleA) {
>+  GetFileTime(handleA, NULL, NULL, &modifiedTimeOnOpen);
>+}
>+
> int GooFile::read(char *buf, int n, Goffset offset) const {
>   DWORD m;
>   
>@@ -642,6 +646,14 @@ GooFile* GooFile::open(const wchar_t *fileName) {
>   return handle == INVALID_HANDLE_VALUE ? NULL : new GooFile(handle);
> }
> 
>+bool GooFile::modificationTimeChangedSinceOpen() const
>+{
>+  struct _FILETIME lastModified;
>+  GetFileTime(handle, NULL, NULL, &lastModified);
>+
>+  return modifiedTimeOnOpen.dwHighDateTime != lastModified.dwHighDateTime || modifiedTimeOnOpen.dwLowDateTime != lastModified.dwLowDateTime;
>+}
>+
> #else
> 
> int GooFile::read(char *buf, int n, Goffset offset) const {
>diff --git a/goo/gfile.h b/goo/gfile.h
>index 233c4829..f9cc2609 100644
>--- a/goo/gfile.h
>+++ b/goo/gfile.h
>@@ -147,11 +147,12 @@ public:
>   ~GooFile() { CloseHandle(handle); }
> 
>   // Asuming than on windows you can't change files that are already open
>-  bool modificationTimeChangedSinceOpen() const { return false; };
>+  bool modificationTimeChangedSinceOpen() const;
>   
> private:
>-  GooFile(HANDLE handleA): handle(handleA) {}
>+  GooFile(HANDLE handleA);
>   HANDLE handle;
>+  struct _FILETIME modifiedTimeOnOpen;
> #else
>   ~GooFile() { close(fd); }
>

Actions: View | Splinter Review

Attachments on bug 103793: 135556 | 135735

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.