June 2014 - Wine-commits - list.winehq.org

Grazvydas Ignotas : msvcrt/tests: Test _cnt value after rewind/fflush.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 47909d8d8b33a2c849477477bf0e063c326b2f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47909d8d8b33a2c849477477b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:51 2014 +0300 msvcrt/tests: Test _cnt value after rewind/fflush. --- dlls/msvcrt/tests/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 73965f3..353ebb4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2232,12 +2232,14 @@ static void test_write_flush_size(FILE *file, int bufsize) for (size = bufsize + 1; size >= bufsize - 1; size--) { rewind(file); + ok(file->_cnt == 0, "_cnt should be 0 after rewind, but is %d\n", file->_cnt); fwrite(outbuffer, 1, size, file); /* lseek() below intentionally redirects the write in fflush() to detect * if fwrite() has already flushed the whole buffer or not. */ lseek(fd, 1, SEEK_SET); fflush(file); + todo_wine ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize)

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 6144bae7f873e2881c554762dc01c87cb9200aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144bae7f873e2881c554762d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 19 00:27:53 2014 +0900 po: Update Japanese translation. --- po/ja.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 82d4e3e..8214d10 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-05-22 01:00+0900\n" -"Last-Translator: Toshiaki Hirose <t_hirose(a)aol.com>\n" +"PO-Revision-Date: 2014-06-19 00:15+0900\n" +"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" @@ -6581,10 +6581,8 @@ msgid "This network connection does not exist.\n" msgstr "このネットワーク接続は存在しません。\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "接続は拒否されました。\n" +msgstr "相手側により接続がリセットされました。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Francois Gouget : ole32: FileLockBytesImpl_WriteAt() should return STG_E_WRITEFAULT for write errors.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: cc4ad353d765234901ddd0c94e9db97db379e4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4ad353d765234901ddd0c94… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:44:12 2014 +0200 ole32: FileLockBytesImpl_WriteAt() should return STG_E_WRITEFAULT for write errors. --- dlls/ole32/filelockbytes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 52c1d26..1c8c938 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -265,14 +265,14 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( ret = SetFilePointerEx(This->hfile, offset, NULL, FILE_BEGIN); if (!ret) - return STG_E_READFAULT; + return STG_E_WRITEFAULT; while (bytes_left) { ret = WriteFile(This->hfile, writePtr, bytes_left, &cbWritten, NULL); if (!ret) - return STG_E_READFAULT; + return STG_E_WRITEFAULT; if (pcbWritten) *pcbWritten += cbWritten;

1 0

Francois Gouget : server: Treat ENOTSUP the same way as ENOLCK, consider locking to be non-functional on that filesystem.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: f4c7e6d607d15c681daa60cfb12b128e4376b809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c7e6d607d15c681daa60cfb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:53:06 2014 +0200 server: Treat ENOTSUP the same way as ENOLCK, consider locking to be non-functional on that filesystem. --- server/fd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/fd.c b/server/fd.c index 7043d04..e3b722c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1167,6 +1167,7 @@ static int set_unix_lock( struct fd *fd, file_pos_t start, file_pos_t end, int t /* fall through */ case EIO: case ENOLCK: + case ENOTSUP: /* no locking on this fs, just ignore it */ fd->fs_locks = 0; return 1;

1 0

Francois Gouget : ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: bea2c6f2d5a345b3e1b1a534eaa65fd80d429caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea2c6f2d5a345b3e1b1a534e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:53:48 2014 +0200 ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention. --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f425d87..6ebc1e7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2885,12 +2885,12 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs { hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); - if (hr == STG_E_ACCESSDENIED) + if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) { Sleep(delay); if (delay < 150) delay++; } - } while (hr == STG_E_ACCESSDENIED); + } while (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION); return hr; } @@ -2907,7 +2907,7 @@ static HRESULT StorageImpl_CheckLockRange(StorageImpl *This, ULONG start, hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); if (SUCCEEDED(hr)) ILockBytes_UnlockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); - if (hr == STG_E_ACCESSDENIED) + if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) return fail_hr; else return S_OK; @@ -2925,7 +2925,7 @@ static HRESULT StorageImpl_LockOne(StorageImpl *This, ULONG start, ULONG end) { offset.QuadPart = i; hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); - if (hr != STG_E_ACCESSDENIED) + if (hr != STG_E_ACCESSDENIED && hr != STG_E_LOCKVIOLATION) break; }

1 0

Francois Gouget : ole32: Return the correct error in FileLockBytesImpl_*LockRegion*().
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 082d0910290e609a58ccd1c7c6d5b866f36c6ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082d0910290e609a58ccd1c7c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:55:13 2014 +0200 ole32: Return the correct error in FileLockBytesImpl_*LockRegion*(). --- dlls/ole32/filelockbytes.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 1c8c938..605b5df 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -313,6 +313,19 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE return hr; } +static HRESULT get_lock_error(void) +{ + switch (GetLastError()) + { + case ERROR_LOCK_VIOLATION: return STG_E_LOCKVIOLATION; break; + case ERROR_ACCESS_DENIED: return STG_E_ACCESSDENIED; break; + case ERROR_NOT_SUPPORTED: return STG_E_INVALIDFUNCTION; break; + default: + FIXME("no mapping for error %d\n", GetLastError()); + return STG_E_INVALIDFUNCTION; + } +} + static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { @@ -334,8 +347,7 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, if (LockFileEx(This->hfile, lock_flags, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, @@ -353,8 +365,7 @@ HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, if (LockFileEx(This->hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, @@ -374,8 +385,7 @@ static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, if (UnlockFileEx(This->hfile, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface,

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: eb4d39b9eec312dc880b8d78f17bd27a23c72671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d39b9eec312dc880b8d78f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 18:03:40 2014 +0200 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 353ebb4..97e70f0 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2270,7 +2270,7 @@ static void test_write_flush(void) ok(file != NULL, "unable to create test file\n"); iobuf[0] = 0; fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ - ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); + ok(file->_bufsiz == 4096, "incorrect default buffer size: %d\n", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); test_write_flush_size(file, sizeof(iobuf));

1 0

Francois Gouget : testbot/lib: Improve the methods argument handling.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: tools Branch: master Commit: f792f79622fdb823f91f7809714fcfca36467414 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f792f79622fdb823f91f7809… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 18 13:45:36 2014 +0200 testbot/lib: Improve the methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/WineTestBot/Branches.pm | 14 ++--- testbot/lib/WineTestBot/Jobs.pm | 46 +++++++------- testbot/lib/WineTestBot/Patches.pm | 35 +++++------ testbot/lib/WineTestBot/PendingPatchSets.pm | 33 +++++----- testbot/lib/WineTestBot/PendingPatches.pm | 4 +- testbot/lib/WineTestBot/Roles.pm | 4 +- testbot/lib/WineTestBot/Steps.pm | 14 ++--- testbot/lib/WineTestBot/StepsTasks.pm | 13 ++-- testbot/lib/WineTestBot/Tasks.pm | 11 ++-- testbot/lib/WineTestBot/UserRoles.pm | 4 +- testbot/lib/WineTestBot/Users.pm | 81 +++++++++++-------------- testbot/lib/WineTestBot/VMs.pm | 56 ++++++++--------- testbot/lib/WineTestBot/WineTestBotObjects.pm | 6 +- 13 files changed, 146 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f792f79622fdb823f91f…

1 0

Francois Gouget : testbot/lib: Fix the UseDBIBackEnd() export directive.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: tools Branch: master Commit: d351d076e44489eca812d6abde4cef422a78aeb4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d351d076e44489eca812d6ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 18 13:45:47 2014 +0200 testbot/lib: Fix the UseDBIBackEnd() export directive. --- testbot/lib/ObjectModel/DBIBackEnd.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 45bd1f6..1378f63 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -38,7 +38,7 @@ use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(ObjectModel::BackEnd Exporter); -(a)EXPORT = qw(&UseDBIBackend); +(a)EXPORT = qw(&UseDBIBackEnd); sub GetDb($) {

1 0

Francois Gouget : patches: Update the sample Apache configuration file so it works with 2.4.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: tools Branch: master Commit: f2bf7041960e53b00dd162f4e63531620cd7fb62 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f2bf7041960e53b00dd162f4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 18 13:46:15 2014 +0200 patches: Update the sample Apache configuration file so it works with 2.4. --- patches/doc/vhost_source.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 30bfca5..60a5bb5 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -5,7 +5,10 @@ ServerAdmin winehq(a)example.com <Directory /home/winehq/opt/source> + # Access control the Apache 2.2 way Order allow,deny Allow from all + # And the Apache 2.4 way + Require all granted </Directory> </VirtualHost>

1 0