May 2019 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : winepulse.drv: Adjust the buffer volume before sending it to PulseAudio.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: cad249b6881240e287b8dddda5424b7e1036197f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad249b6881240e287b8dddd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 20 13:41:25 2019 +0300 winepulse.drv: Adjust the buffer volume before sending it to PulseAudio. Only fixes the PulseAudio driver for the first bug, not ALSA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38182 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46450 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 154 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 138 insertions(+), 16 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8d57f1a..5f09332 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -621,6 +621,135 @@ static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); } +static void pulse_free_noop(void *buf) +{ +} + +enum write_buffer_flags +{ + WINEPULSE_WRITE_NOFREE = 0x01, + WINEPULSE_WRITE_SILENT = 0x02 +}; + +static int write_buffer(const ACImpl *This, BYTE *buffer, UINT32 bytes, + enum write_buffer_flags flags) +{ + float vol[PA_CHANNELS_MAX]; + BOOL adjust = FALSE; + UINT32 i, channels; + BYTE *end; + + if (!bytes) return 0; + if (This->session->mute || (flags & WINEPULSE_WRITE_SILENT)) + { + silence_buffer(This->ss.format, buffer, bytes); + goto write; + } + + /* Adjust the buffer based on the volume for each channel */ + channels = This->ss.channels; + for (i = 0; i < channels; i++) + { + vol[i] = This->vol[i] * This->session->master_vol * This->session->channel_vols[i]; + adjust |= vol[i] != 1.0f; + } + if (!adjust) goto write; + + end = buffer + bytes; + switch (This->ss.format) + { +#ifndef WORDS_BIGENDIAN +#define PROCESS_BUFFER(type) do \ +{ \ + type *p = (type*)buffer; \ + do \ + { \ + for (i = 0; i < channels; i++) \ + p[i] = p[i] * vol[i]; \ + p += i; \ + } while ((BYTE*)p != end); \ +} while (0) + case PA_SAMPLE_S16LE: + PROCESS_BUFFER(INT16); + break; + case PA_SAMPLE_S32LE: + PROCESS_BUFFER(INT32); + break; + case PA_SAMPLE_FLOAT32LE: + PROCESS_BUFFER(float); + break; +#undef PROCESS_BUFFER + case PA_SAMPLE_S24_32LE: + { + UINT32 *p = (UINT32*)buffer; + do + { + for (i = 0; i < channels; i++) + { + p[i] = (INT32)((INT32)(p[i] << 8) * vol[i]); + p[i] >>= 8; + } + p += i; + } while ((BYTE*)p != end); + break; + } + case PA_SAMPLE_S24LE: + { + /* do it 12 bytes at a time until it is no longer possible */ + UINT32 *q = (UINT32*)buffer; + BYTE *p; + + i = 0; + while (end - (BYTE*)q >= 12) + { + UINT32 v[4], k; + v[0] = q[0] << 8; + v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); + v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); + v[3] = q[2] & ~0xff; + for (k = 0; k < 4; k++) + { + v[k] = (INT32)((INT32)v[k] * vol[i]); + if (++i == channels) i = 0; + } + *q++ = v[0] >> 8 | (v[1] & ~0xff) << 16; + *q++ = v[1] >> 16 | (v[2] & ~0xff) << 8; + *q++ = v[2] >> 24 | (v[3] & ~0xff); + } + p = (BYTE*)q; + while (p != end) + { + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + *p++ = v >> 8 & 0xff; + *p++ = v >> 16 & 0xff; + *p++ = v >> 24; + if (++i == channels) i = 0; + } + break; + } +#endif + case PA_SAMPLE_U8: + { + UINT8 *p = (UINT8*)buffer; + do + { + for (i = 0; i < channels; i++) + p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p += i; + } while ((BYTE*)p != end); + break; + } + default: + TRACE("Unhandled format %i, not adjusting volume.\n", This->ss.format); + break; + } + +write: + return pa_stream_write(This->stream, buffer, bytes, + (flags & WINEPULSE_WRITE_NOFREE) ? pulse_free_noop : NULL, + 0, PA_SEEK_RELATIVE); +} + static void dump_attr(const pa_buffer_attr *attr) { TRACE("maxlength: %u\n", attr->maxlength); TRACE("minreq: %u\n", attr->minreq); @@ -681,7 +810,7 @@ static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) if(This->lcl_offs_bytes + bytes > This->bufsize_bytes){ to_write = This->bufsize_bytes - This->lcl_offs_bytes; TRACE("writing small chunk of %u bytes\n", to_write); - pa_stream_write(This->stream, buf, to_write, NULL, 0, PA_SEEK_RELATIVE); + write_buffer(This, buf, to_write, 0); This->held_bytes -= to_write; to_write = bytes - to_write; This->lcl_offs_bytes = 0; @@ -690,7 +819,7 @@ static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) to_write = bytes; TRACE("writing main chunk of %u bytes\n", to_write); - pa_stream_write(This->stream, buf, to_write, NULL, 0, PA_SEEK_RELATIVE); + write_buffer(This, buf, to_write, 0); This->lcl_offs_bytes += to_write; This->lcl_offs_bytes %= This->bufsize_bytes; This->held_bytes -= to_write; @@ -2126,10 +2255,6 @@ static void pulse_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_bytes) } } -static void pulse_free_noop(void *buf) -{ -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { @@ -2181,7 +2306,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("pre-writing %u bytes\n", to_write); - e = pa_stream_write(This->stream, buffer, to_write, NULL, 0, PA_SEEK_RELATIVE); + e = write_buffer(This, buffer, to_write, 0); if(e) ERR("pa_stream_write failed: 0x%x\n", e); @@ -2191,15 +2316,12 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } }else{ - if (This->locked_ptr) { - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->ss.format, This->locked_ptr, written_bytes); - pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE); - } else { - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->ss.format, This->tmp_buffer, written_bytes); - pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE); - } + enum write_buffer_flags wr_flags = 0; + + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) wr_flags |= WINEPULSE_WRITE_SILENT; + if (!This->locked_ptr) wr_flags |= WINEPULSE_WRITE_NOFREE; + + write_buffer(This, This->locked_ptr ? This->locked_ptr : This->tmp_buffer, written_bytes, wr_flags); This->pad += written_bytes; }

1 0

Gabriel Ivăncescu : winepulse.drv: Add support for A-law and u-law formats with volume changes.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 1a7026136bcc11f96a42b8c3e4e65283d8f4de25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7026136bcc11f96a42b8c3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 20 13:41:26 2019 +0300 winepulse.drv: Add support for A-law and u-law formats with volume changes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2016 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2016 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a7026136bcc11f96a42…

1 0

Gabriel Ivăncescu : winealsa.drv: Adjust the buffer volume before sending it to ALSA.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 9d48b3294c0bf73f65ccefae28ed225aaba4abab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d48b3294c0bf73f65ccefae… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 20 13:43:36 2019 +0300 winealsa.drv: Adjust the buffer volume before sending it to ALSA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38182 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 137 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 130 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2bf4d73..91aef47 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -126,6 +126,7 @@ struct ACImpl { UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ + UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ UINT32 data_in_alsa_frames; HANDLE timer; @@ -1970,18 +1971,135 @@ static BYTE *remap_channels(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) return This->remapping_buf; } +static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) +{ + float vol[ARRAY_SIZE(This->alsa_channel_map)]; + BOOL adjust = FALSE; + UINT32 i, channels; + BYTE *end; + + if (This->vol_adjusted_frames >= frames) + return; + channels = This->fmt->nChannels; + + if (mute) + { + int err = snd_pcm_format_set_silence(This->alsa_format, buf, frames * channels); + if (err < 0) + WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); + return; + } + + /* Adjust the buffer based on the volume for each channel */ + for (i = 0; i < channels; i++) + vol[i] = This->vols[i] * This->session->master_vol; + for (i = 0; i < min(channels, This->session->channel_count); i++) + { + vol[i] *= This->session->channel_vols[i]; + adjust |= vol[i] != 1.0f; + } + while (i < channels) adjust |= vol[i++] != 1.0f; + if (!adjust) return; + + /* Skip the frames we've already adjusted before */ + end = buf + frames * This->fmt->nBlockAlign; + buf += This->vol_adjusted_frames * This->fmt->nBlockAlign; + + switch (This->alsa_format) + { +#ifndef WORDS_BIGENDIAN +#define PROCESS_BUFFER(type) do \ +{ \ + type *p = (type*)buf; \ + do \ + { \ + for (i = 0; i < channels; i++) \ + p[i] = p[i] * vol[i]; \ + p += i; \ + } while ((BYTE*)p != end); \ +} while (0) + case SND_PCM_FORMAT_S16_LE: + PROCESS_BUFFER(INT16); + break; + case SND_PCM_FORMAT_S32_LE: + PROCESS_BUFFER(INT32); + break; + case SND_PCM_FORMAT_FLOAT_LE: + PROCESS_BUFFER(float); + break; + case SND_PCM_FORMAT_FLOAT64_LE: + PROCESS_BUFFER(double); + break; +#undef PROCESS_BUFFER + case SND_PCM_FORMAT_S20_3LE: + case SND_PCM_FORMAT_S24_3LE: + { + /* Do it 12 bytes at a time until it is no longer possible */ + UINT32 *q = (UINT32*)buf, mask = ~0xff; + BYTE *p; + + /* After we adjust the volume, we need to mask out low bits */ + if (This->alsa_format == SND_PCM_FORMAT_S20_3LE) + mask = ~0x0fff; + + i = 0; + while (end - (BYTE*)q >= 12) + { + UINT32 v[4], k; + v[0] = q[0] << 8; + v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); + v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); + v[3] = q[2] & ~0xff; + for (k = 0; k < 4; k++) + { + v[k] = (INT32)((INT32)v[k] * vol[i]); + v[k] &= mask; + if (++i == channels) i = 0; + } + *q++ = v[0] >> 8 | v[1] << 16; + *q++ = v[1] >> 16 | v[2] << 8; + *q++ = v[2] >> 24 | v[3]; + } + p = (BYTE*)q; + while (p != end) + { + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + v &= mask; + *p++ = v >> 8 & 0xff; + *p++ = v >> 16 & 0xff; + *p++ = v >> 24; + if (++i == channels) i = 0; + } + break; + } +#endif + case SND_PCM_FORMAT_U8: + { + UINT8 *p = (UINT8*)buf; + do + { + for (i = 0; i < channels; i++) + p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p += i; + } while ((BYTE*)p != end); + break; + } + default: + TRACE("Unhandled format %i, not adjusting volume.\n", This->alsa_format); + break; + } +} + static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) { snd_pcm_sframes_t written; - if(mute){ - int err; - if((err = snd_pcm_format_set_silence(This->alsa_format, buf, - frames * This->fmt->nChannels)) < 0) - WARN("Setting buffer to silence failed: %d (%s)\n", err, - snd_strerror(err)); - } + adjust_buffer_volume(This, buf, frames, mute); + + /* Mark the frames we've already adjusted */ + if (This->vol_adjusted_frames < frames) + This->vol_adjusted_frames = frames; buf = remap_channels(This, buf, frames); @@ -2005,6 +2123,8 @@ static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, written = snd_pcm_writei(This->pcm_handle, buf, frames); } + if (written > 0) + This->vol_adjusted_frames -= written; return written; } @@ -2102,7 +2222,10 @@ static void alsa_write_data(ACImpl *This) /* Add a lead-in when starting with too few frames to ensure * continuous rendering. Additional benefit: Force ALSA to start. */ if(This->data_in_alsa_frames == 0 && This->held_frames < This->alsa_period_frames) + { alsa_write_best_effort(This, This->silence_buf, This->alsa_period_frames - This->held_frames, FALSE); + This->vol_adjusted_frames = 0; + } if(This->started) max_copy_frames = data_not_in_alsa(This);

1 0

Huw Davies : msctfp: Define the correct PROXY_CLSID.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 1020db7938c7c3d2ce6250739dfb8df22d5a3745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1020db7938c7c3d2ce625073… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 28 12:59:44 2019 +0100 msctfp: Define the correct PROXY_CLSID. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctfp/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in index 9ff3c3d..992aeef 100644 --- a/dlls/msctfp/Makefile.in +++ b/dlls/msctfp/Makefile.in @@ -3,4 +3,4 @@ IMPORTS = rpcrt4 ole32 oleaut32 IDL_SRCS = msctfp.idl -dlldata_EXTRADEFS = -DWINE_REGISTER_DLL +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer

1 0

Alexandre Julliard : atmlib: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 5c5d84e02822a53527244c90f6d08191cf9a8ee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c5d84e02822a53527244c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:25 2019 +0200 atmlib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atmlib/Makefile.in | 2 ++ dlls/atmlib/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/atmlib/Makefile.in b/dlls/atmlib/Makefile.in index 904cbbb..f8bd675 100644 --- a/dlls/atmlib/Makefile.in +++ b/dlls/atmlib/Makefile.in @@ -1,4 +1,6 @@ MODULE = atmlib.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c index efae51f..4baeb9d 100644 --- a/dlls/atmlib/main.c +++ b/dlls/atmlib/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : authz: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: bc27abc14c49957652d6629cac28d7b68f6ac527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc27abc14c49957652d6629c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:35:45 2019 +0200 authz: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in index 129e2a3..91a0704 100644 --- a/dlls/authz/Makefile.in +++ b/dlls/authz/Makefile.in @@ -1,4 +1,6 @@ MODULE = authz.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ authz.c

1 0

Alexandre Julliard : makefiles: Build fonts in quiet mode.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: d014b627879d2b4036a5ca5fcc63c423f1898ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=d014b627879d2b4036a5ca5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 21:51:00 2019 +0200 makefiles: Build fonts in quiet mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2c5c503..67ff3b9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2826,7 +2826,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, strarray_add( &make->all_targets, xstrdup( font )); output( "%s: %s %s\n", obj_dir_path( make, font ), tools_path( make, "sfnt2fon" ), ttf_file ); - output( "\t%s -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); + output( "\t%s -q -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); add_install_rule( make, source->name, xstrdup(font), strmake( "d$(fontdir)/%s", font )); } }

1 0

Alexandre Julliard : makefiles: Default to ms_abi for 64-bit msvcrt builds.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: cdf55b77e0e198d039c527314189fd92dc80d796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf55b77e0e198d039c52731… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 12:06:33 2019 +0200 makefiles: Default to ms_abi for 64-bit msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 37 +++++++++++++++++++++++++++++++------ configure.ac | 14 ++++++++------ loader/Makefile.in | 2 +- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 90c8e1a..910bb57 100755 --- a/configure +++ b/configure @@ -17197,8 +17197,8 @@ if test "x$ac_cv_cflags__fshort_wchar" = xyes; then : fi ;; esac - case $host_cpu in - *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 + case $host_cpu in + *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 $as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then : $as_echo_n "(cached) " >&6 @@ -17223,10 +17223,9 @@ $as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } if test "x$ac_cv_cflags__fno_omit_frame_pointer" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" fi ;; - esac - - case $host in - x86_64-*mingw32*|x86_64-*cygwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 + *x86_64*) + case $host_os in + cygwin*|mingw32*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 $as_echo_n "checking whether the compiler supports -Wno-format... " >&6; } if ${ac_cv_cflags__Wno_format+:} false; then : $as_echo_n "(cached) " >&6 @@ -17251,6 +17250,32 @@ $as_echo "$ac_cv_cflags__Wno_format" >&6; } if test "x$ac_cv_cflags__Wno_format" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-format" fi ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -mabi=ms" >&5 +$as_echo_n "checking whether the compiler supports -mabi=ms... " >&6; } +if ${ac_cv_cflags__mabi_ms+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -mabi=ms" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__mabi_ms=yes +else + ac_cv_cflags__mabi_ms=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__mabi_ms" >&5 +$as_echo "$ac_cv_cflags__mabi_ms" >&6; } +if test "x$ac_cv_cflags__mabi_ms" = xyes; then : + MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" +fi ;; + esac ;; esac if test "x$enable_maintainer_mode" = "xyes" diff --git a/configure.ac b/configure.ac index ef7af70..be15cca 100644 --- a/configure.ac +++ b/configure.ac @@ -2022,14 +2022,16 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac - dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; - esac - - dnl mingw uses Windows 64-bit types, not Unix ones - case $host in - x86_64-*mingw32*|x86_64-*cygwin*) WINE_TRY_CFLAGS([-Wno-format]) ;; + *x86_64*) + case $host_os in + dnl Mingw uses Windows 64-bit types, not Unix ones + cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;; + dnl Default to ms_abi on 64-bit + *) WINE_TRY_CFLAGS([-mabi=ms],[MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"]) ;; + esac ;; esac dnl Enable -Werror for maintainer mode diff --git a/loader/Makefile.in b/loader/Makefile.in index a5e04dd..a776c85 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -14,7 +14,7 @@ SOURCES = \ PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) -preloader_EXTRADEFS = $(MSVCRTFLAGS) +preloader_EXTRADEFS = -fno-builtin wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS)

1 0

Zebediah Figura : setupapi/tests: Test calling SetupDiEnumDeviceInterfaces () with a NULL device.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: bf09cca85090094121a390b2f83b1a10b5862aa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf09cca85090094121a390b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:14 2019 -0500 setupapi/tests: Test calling SetupDiEnumDeviceInterfaces() with a NULL device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 8477020..53e50b8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1055,8 +1055,8 @@ static void test_device_iface(void) { char buffer[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buffer; + SP_DEVINFO_DATA device = {0}, device2 = {sizeof(device2)}; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; - SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; @@ -1154,6 +1154,16 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device2); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device2, &guid, NULL, 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + check_device_iface(set, NULL, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, NULL, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, NULL, &guid, 2, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0001#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}"); + check_device_iface(set, NULL, &guid, 3, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); }

1 0

Zebediah Figura : setupapi/tests: Add some tests for SetupDiGetClassDevs() .
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 301f66bf9661fbdd9f1ec73ed5c540ec5ee0f27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=301f66bf9661fbdd9f1ec73e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 27 22:13:15 2019 -0500 setupapi/tests: Add some tests for SetupDiGetClassDevs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 156 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 53e50b8..053802e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -37,6 +37,7 @@ /* This is a unique guid for testing purposes */ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; +static GUID iface_guid = {0xdeadbeef, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD); BOOL (WINAPI *pSetupDiGetDevicePropertyW)(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD); @@ -2691,6 +2692,160 @@ static void test_call_class_installer(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void check_all_devices_enumerated_(int line, HDEVINFO set) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + BOOL ret, found_dev1 = 0, found_dev2 = 0, found_dev3 = 0; + char id[50]; + DWORD i; + + for (i = 0; SetupDiEnumDeviceInfo(set, i, &device); ++i) + { + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + if (!ret) continue; + + if (!strcasecmp(id, "Root\\LEGACY_BOGUS\\foo")) + { + found_dev1 = 1; + ok_(__FILE__, line)(IsEqualGUID(&device.ClassGuid, &guid), + "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + } + else if (!strcasecmp(id, "Root\\LEGACY_BOGUS\\qux")) + { + found_dev2 = 1; + ok_(__FILE__, line)(IsEqualGUID(&device.ClassGuid, &guid), + "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + } + else if (!strcasecmp(id, "Root\\LEGACY_BOGUS\\bar")) + { + found_dev3 = 1; + ok_(__FILE__, line)(IsEqualGUID(&device.ClassGuid, &guid2), + "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + } + } + ok_(__FILE__, line)(found_dev1, "Expected device 1 to be enumerated.\n"); + ok_(__FILE__, line)(found_dev2, "Expected device 2 to be enumerated.\n"); + ok_(__FILE__, line)(found_dev3, "Expected device 2 to be enumerated.\n"); +} +#define check_all_devices_enumerated(a) check_all_devices_enumerated_(__LINE__,a) + +static void test_get_class_devs(void) +{ + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA device = {sizeof(device)}; + HDEVINFO set; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(NULL, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\foo", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &iface_guid, NULL, 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\qux", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\bar", &guid2, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + set = SetupDiGetClassDevsA(NULL, NULL, NULL, 0); + ok(set == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(NULL, NULL, NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_all_devices_enumerated(set); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); + check_device_info(set, 2, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_all_devices_enumerated(set); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + set = SetupDiGetClassDevsA(NULL, "ROOT", NULL, 0); + ok(set == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(NULL, "ROOT", NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + check_all_devices_enumerated(set); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(NULL, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); +todo_wine { + check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); +} + check_device_info(set, 3, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, 0); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); +todo_wine { + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); +} + check_device_info(set, 2, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); +todo_wine { + check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); + check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); +} + check_device_info(set, 3, NULL, NULL); + check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + SetupDiEnumDeviceInfo(set, 0, &device); + SetupDiRemoveDevice(set, &device); + SetupDiEnumDeviceInfo(set, 1, &device); + SetupDiRemoveDevice(set, &device); + SetupDiDestroyDeviceInfoList(set); + set = SetupDiGetClassDevsA(&guid2, NULL, NULL, 0); + SetupDiEnumDeviceInfo(set, 0, &device); + SetupDiRemoveDevice(set, &device); + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); @@ -2728,4 +2883,5 @@ START_TEST(devinst) test_device_install_params(); test_driver_list(); test_call_class_installer(); + test_get_class_devs(); }

1 0