wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 924858 - Part 2: Implement |append| mode for OS.File.open on Windows. r=yoric

Browse Source
This commit is contained in:
Nils Maier 2013-10-27 08:03:35 -04:00
parent 478358da08
commit ae72453a40
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
toolkit/components/osfile/modules/osfile_win_front.jsm
View File

@ -134,6 +134,11 @@
* @throws {OS.File.Error} In case of I/O error.
*/
File.prototype._write = function _write(buffer, nbytes, options) {
if (this._appendMode) {
// Need to manually seek on Windows, as O_APPEND is not supported.
// This is, of course, a race, but there is no real way around this.
this.setPosition(0, File.POS_END);
}
// |gBytesWrittenPtr| is a pointer to |gBytesWritten|.
throw_on_zero("write",
WinFile.WriteFile(this.fd, buffer, nbytes, gBytesWrittenPtr, null)
@ -225,8 +230,11 @@
* on the other fields of |mode|.
* - {bool} write If |true|, the file will be opened for
* writing. The file may also be opened for reading, depending
* on the other fields of |mode|. If neither |truncate| nor
* |create| is specified, the file is opened for appending.
* on the other fields of |mode|.
* - {bool} append If |true|, the file will be opened for appending,
* meaning the equivalent of |.setPosition(0, POS_END)| is executed
* before each write. The default is |true|, i.e. opening a file for
* appending. Specify |append: false| to open the file in regular mode.
*
* If neither |truncate|, |create| or |write| is specified, the file
* is opened for reading.
@ -264,6 +272,9 @@
let template = options.winTemplate ? options.winTemplate._fd : null;
let access;
let disposition;
mode = OS.Shared.AbstractFile.normalizeOpenMode(mode);
if ("winAccess" in options && "winDisposition" in options) {
access = options.winAccess;
disposition = options.winDisposition;
@ -272,7 +283,6 @@
throw new TypeError("OS.File.open requires either both options " +
"winAccess and winDisposition or neither");
} else {
mode = OS.Shared.AbstractFile.normalizeOpenMode(mode);
if (mode.read) {
access |= Const.GENERIC_READ;
}
@ -293,16 +303,18 @@
disposition = Const.CREATE_NEW;
} else if (mode.read && !mode.write) {
disposition = Const.OPEN_EXISTING;
} else /*append*/ {
if (mode.existing) {
disposition = Const.OPEN_EXISTING;
} else {
disposition = Const.OPEN_ALWAYS;
}
} else if (mode.existing) {
disposition = Const.OPEN_EXISTING;
} else {
disposition = Const.OPEN_ALWAYS;
}
}
let file = error_or_file(WinFile.CreateFile(path,
access, share, security, disposition, flags, template));
file._appendMode = !!mode.append;
if (!(mode.trunc && mode.existing)) {
return file;
}