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

Re: [PATCH 2/3] vbscript: Implemented CLng(try 2)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7386 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

June 2, 2014

Re: [PATCH 1/3] vbscript: Implemented CDbl(try 2)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7385 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

June 2, 2014

[PATCH 0/4] Improve compilation with musl libc

by Felix Janda

Hello, I'm trying to reduce the number of patches required to build wine on a musl libc[1] based system. The first two patches merely fix warnings because of use of deprecated headers. So they are not strictly necessary. The patches should also update configure but why is configure at all in the git repo? To compile wine without patches two other issues remain: Various tools used during the build expect getopt_long_only() to have GNU semantics. They don't expect that musl's getopt_long_only() stops after the first non-option argument. The cleanest fix seems to be to add a configure check testing whether getopt_long_only() behaves correctly instead of just testing for its existence. Then there are problems with compiling dlls/ws2_32/socket.c related to IPX but I haven't investigated their cause yet. [1]: http://musl-libc.org Felix Janda (4): Use <poll.h> instead of <sys/poll.h> Remove unecessary <sys/signal> includes Add missing includes of <poll.h> (POLLIN,...) dnsapi: Replace NETDB_INTERNAL by -1 configure.ac | 2 -- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dnsapi/query.c | 2 +- dlls/iphlpapi/icmp.c | 4 ++-- dlls/kernel32/console.c | 4 ++-- dlls/ntdll/file.c | 5 +---- dlls/ntdll/serial.c | 4 ++-- dlls/ntdll/signal_arm.c | 3 --- dlls/ntdll/signal_arm64.c | 3 --- dlls/ntdll/signal_i386.c | 3 --- dlls/ntdll/signal_powerpc.c | 4 ---- dlls/ntdll/signal_x86_64.c | 3 --- dlls/ntdll/sync.c | 5 +---- dlls/rpcrt4/rpc_transport.c | 4 ++-- dlls/wineoss.drv/midi.c | 5 +---- dlls/winex11.drv/event.c | 5 +---- dlls/wininet/internet.c | 5 +---- dlls/wininet/netconnection.c | 5 +---- dlls/winmm/time.c | 5 +---- dlls/ws2_32/socket.c | 5 +---- include/config.h.in | 6 ------ programs/winedbg/gdbproxy.c | 4 ++-- server/change.c | 3 +++ server/fd.c | 5 +---- server/file.c | 2 +- server/named_pipe.c | 2 +- server/object.h | 4 ++-- server/process.c | 2 +- server/queue.c | 3 +++ server/request.c | 2 +- server/serial.c | 2 +- server/signal.c | 5 +---- server/sock.c | 3 +++ server/thread.c | 2 +- 35 files changed, 42 insertions(+), 87 deletions(-) -- 1.8.5.5

June 1, 2014

Re: shlwapi/tests: Skip if test ini file wasn't created

by Nikolay Sivov

On 6/1/2014 22:15, Marvin wrote: > Hi, > > While running your changed tests on Windows, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > Full results can be found at > https://testbot.winehq.org/JobDetails.pl?Key=7382 > > Your paranoid android. > > > === wvistau64 (32 bit ordinal) === > ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part > ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part > > === wvistau64 (64 bit ordinal) === > ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part > ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part That's unrelated.

June 1, 2014

Re: shlwapi/tests: Skip if test ini file wasn't created

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=7382 Your paranoid android. === wvistau64 (32 bit ordinal) === ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part === wvistau64 (64 bit ordinal) === ordinal.c:1934: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part ordinal.c:1960: Test failed: expected (L"01 \062c\0648\0627\0646, 2014") got (L"\200f01 \200f\062c\0648\0627\0646, \200f2") for date part

June 1, 2014

Re: ntdll: Use lockfree implementation for get_cached_fd. (try 2)

by Bruno Jesus

Hi, all. I would just like to share my results: http://influenza.blog.br/wine/testpatch.pdf I tested in wine-git with and without the patch, plus a XP VM and Windows 7 (no VM). At least in my computer it looks like wine will beat Windows 7 with the patch while the current implementation is as slow as XP running in the VM. The test files: http://influenza.blog.br/wine/clz.c http://influenza.blog.br/wine/clz.exe Best regards, Bruno On Sat, May 31, 2014 at 2:35 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > On May 31, 2014, at 12:05 PM, Sebastian Lackner wrote: > >> Changes in try 2: >> >> * Always try to access the fd cache two times - this ensures that we >> don't release a file descriptor when its still in use by a second thread. > > Heh. Well, you can ignore that part of my reply to your previous try. :) > > >> * Replace interlocked_xchg() with an assert(). The original code looks >> like its valid that the fd is nonzero at this point, but in fact this >> would cause releasing a file descriptor which is still in use. > > I'll leave it to others to comment on that. > >> Replacing with an assert() also saves a couple of CPU cycles. > > I understand that this is an attempt to improve performance, but I don't think it's necessary to squeeze every last CPU cycle out of this code. > > -Ken >

June 1, 2014

Re: [3/3] msvcrt: Implement 4k block flushing behavior.

by Piotr Caban

On 05/31/14 01:00, Grazvydas Ignotas wrote: > + } else if(wrcnt >= MSVCRT_WRITE_BLOCK_SIZE) { > + if(msvcrt_set_write_direction(file) != 0) > + break; > + > + if(file->_bufsiz && file->_ptr != file->_base) > + if(msvcrt_flush_buffer(file) == MSVCRT_EOF) > + break; > + > + if(MSVCRT__write(file->_file, ptr, MSVCRT_WRITE_BLOCK_SIZE) <= 0) { > + file->_flag |= MSVCRT__IOERR; > + break; > + } > + written += MSVCRT_WRITE_BLOCK_SIZE; > + wrcnt -= MSVCRT_WRITE_BLOCK_SIZE; > + ptr = (const char*)ptr + MSVCRT_WRITE_BLOCK_SIZE; This doesn't look right for me. It doesn't make sense to have some special size blocks written in different way. I think this is caused by 2 differences in native and wine's implementation of fwrite: - if you check file->_bufsiz value on windows it's set to 4096 (on wine it's 512), this is probably causing the flash to be done when 4096 bytes are written - probably there's some kind of optimization that writes integral number of buffers directly to file - I was not checking it but maybe native flushes the output when buffer is full, wine will exit fwrite with full buffer in this case I've also seen that _bufsiz is set to 0 on wine if buffer was not yet allocated. On windows it's value is 4096 just after opening the file. Cheers, Piotr

June 1, 2014

[PATCH 4/4] dnsapi: Replace NETDB_INTERNAL by -1

by Felix Janda

Fixes compilation of query.c with musl --- dlls/dnsapi/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index b1d80dd..898e1f0 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -146,7 +146,7 @@ static DNS_STATUS dns_map_h_errno( int error ) case HOST_NOT_FOUND: return DNS_ERROR_RCODE_NAME_ERROR; case TRY_AGAIN: return DNS_ERROR_RCODE_SERVER_FAILURE; case NO_RECOVERY: return DNS_ERROR_RCODE_REFUSED; - case NETDB_INTERNAL: return DNS_ERROR_RCODE; + case -1: return DNS_ERROR_RCODE; default: FIXME( "unmapped error code: %d\n", error ); return DNS_ERROR_RCODE_NOT_IMPLEMENTED; -- 1.8.5.5

June 1, 2014

[PATCH 3/4] Add missing includes of <poll.h> (POLLIN,...)

by Felix Janda

--- server/change.c | 3 +++ server/queue.c | 3 +++ server/sock.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/server/change.c b/server/change.c index f6d56b0..3ac70a4 100644 --- a/server/change.c +++ b/server/change.c @@ -32,6 +32,9 @@ #include <limits.h> #include <dirent.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/queue.c b/server/queue.c index 57603e1..601629e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -25,6 +25,9 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/sock.c b/server/sock.c index 5ffb1fe..4adad0f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,6 +30,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H -- 1.8.5.5

June 1, 2014

[PATCH 2/4] Remove unecessary <sys/signal> includes

by Felix Janda

--- configure.ac | 1 - dlls/ntdll/signal_arm.c | 3 --- dlls/ntdll/signal_arm64.c | 3 --- dlls/ntdll/signal_i386.c | 3 --- dlls/ntdll/signal_powerpc.c | 4 ---- dlls/ntdll/signal_x86_64.c | 3 --- include/config.h.in | 3 --- 7 files changed, 20 deletions(-) diff --git a/configure.ac b/configure.ac index 8089957..f2bb616 100644 --- a/configure.ac +++ b/configure.ac @@ -485,7 +485,6 @@ AC_CHECK_HEADERS(\ sys/resource.h \ sys/scsiio.h \ sys/shm.h \ - sys/signal.h \ sys/socket.h \ sys/socketvar.h \ sys/sockio.h \ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0eb7ce0..7cc52c8 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -43,9 +43,6 @@ # include <sys/syscall.h> # endif #endif -#ifdef HAVE_SYS_SIGNAL_H -# include <sys/signal.h> -#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2b82952..53b8938 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -42,9 +42,6 @@ # include <sys/syscall.h> # endif #endif -#ifdef HAVE_SYS_SIGNAL_H -# include <sys/signal.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5f8b8fd..02a8cd3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -48,9 +48,6 @@ # include <sys/vm86.h> #endif -#ifdef HAVE_SYS_SIGNAL_H -# include <sys/signal.h> -#endif #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index a457bdf..9b49c89 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -43,10 +43,6 @@ # endif #endif -#ifdef HAVE_SYS_SIGNAL_H -# include <sys/signal.h> -#endif - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c6e9a9b..40a8ae9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -44,9 +44,6 @@ #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif -#ifdef HAVE_SYS_SIGNAL_H -# include <sys/signal.h> -#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/include/config.h.in b/include/config.h.in index 841c4f5..65bd1e3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -987,9 +987,6 @@ /* Define to 1 if you have the <sys/shm.h> header file. */ #undef HAVE_SYS_SHM_H -/* Define to 1 if you have the <sys/signal.h> header file. */ -#undef HAVE_SYS_SIGNAL_H - /* Define to 1 if you have the <sys/socketvar.h> header file. */ #undef HAVE_SYS_SOCKETVAR_H -- 1.8.5.5

June 1, 2014