- wine-devel - winehq.org

[PATCH 4/4] winealsa: Move create_stream and release_stream to the unixlib.
by Huw Davies 22 Feb '22

22 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 303 ++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 489 +++-------------------------------- dlls/winealsa.drv/unixlib.h | 21 ++ 3 files changed, 360 insertions(+), 453 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 0680383f59b..f79a655780c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> +#include <pthread.h> #include <alsa/asoundlib.h> @@ -44,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa); +#define EXTRA_SAFE_RT 40000 + static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v'}; @@ -133,6 +136,30 @@ static WCHAR *strdupAtoW(const char *str) return ret; } +/* copied from kernelbase */ +static int muldiv( int a, int b, int c ) +{ + LONGLONG ret; + + if (!c) return -1; + + /* We want to deal with a positive divisor to simplify the logic. */ + if (c < 0) + { + a = -a; + c = -c; + } + + /* If the result is positive, we "add" to round. else, we subtract to round. */ + if ((a < 0 && b < 0) || (a >= 0 && b >= 0)) + ret = (((LONGLONG)a * b) + (c / 2)) / c; + else + ret = (((LONGLONG)a * b) - (c / 2)) / c; + + if (ret > 2147483647 || ret < -2147483647) return -1; + return ret; +} + static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; @@ -663,6 +690,280 @@ static HRESULT map_channels(EDataFlow flow, const WAVEFORMATEX *fmt, int *alsa_c return need_remap ? S_OK : S_FALSE; } +static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); + else + memset(buffer, 0, frames * stream->fmt->nBlockAlign); +} + +static NTSTATUS create_stream(void *args) +{ + struct create_stream_params *params = args; + struct alsa_stream *stream; + snd_pcm_sw_params_t *sw_params = NULL; + snd_pcm_format_t format; + unsigned int rate, alsa_period_us, i; + WAVEFORMATEXTENSIBLE *fmtex; + int err; + SIZE_T size; + + stream = calloc(1, sizeof(*stream)); + if(!stream){ + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + params->result = alsa_open_device(params->alsa_name, params->flow, &stream->pcm_handle, &stream->hw_params); + if(FAILED(params->result)){ + free(stream); + return STATUS_SUCCESS; + } + + stream->need_remapping = map_channels(params->flow, params->fmt, &stream->alsa_channels, stream->alsa_channel_map) == S_OK; + + if((err = snd_pcm_hw_params_any(stream->pcm_handle, stream->hw_params)) < 0){ + WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + if((err = snd_pcm_hw_params_set_access(stream->pcm_handle, stream->hw_params, + SND_PCM_ACCESS_RW_INTERLEAVED)) < 0){ + WARN("Unable to set access: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + format = alsa_format(params->fmt); + if (format == SND_PCM_FORMAT_UNKNOWN){ + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto exit; + } + + if((err = snd_pcm_hw_params_set_format(stream->pcm_handle, stream->hw_params, + format)) < 0){ + WARN("Unable to set ALSA format to %u: %d (%s)\n", format, err, + snd_strerror(err)); + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto exit; + } + + stream->alsa_format = format; + stream->flow = params->flow; + + rate = params->fmt->nSamplesPerSec; + if((err = snd_pcm_hw_params_set_rate_near(stream->pcm_handle, stream->hw_params, + &rate, NULL)) < 0){ + WARN("Unable to set rate to %u: %d (%s)\n", rate, err, + snd_strerror(err)); + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto exit; + } + + if((err = snd_pcm_hw_params_set_channels(stream->pcm_handle, stream->hw_params, + stream->alsa_channels)) < 0){ + WARN("Unable to set channels to %u: %d (%s)\n", params->fmt->nChannels, err, + snd_strerror(err)); + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + goto exit; + } + + stream->mmdev_period_rt = params->period; + alsa_period_us = stream->mmdev_period_rt / 10; + if((err = snd_pcm_hw_params_set_period_time_near(stream->pcm_handle, + stream->hw_params, &alsa_period_us, NULL)) < 0) + WARN("Unable to set period time near %u: %d (%s)\n", alsa_period_us, + err, snd_strerror(err)); + /* ALSA updates the output variable alsa_period_us */ + + stream->mmdev_period_frames = muldiv(params->fmt->nSamplesPerSec, + stream->mmdev_period_rt, 10000000); + + /* Buffer 4 ALSA periods if large enough, else 4 mmdevapi periods */ + stream->alsa_bufsize_frames = stream->mmdev_period_frames * 4; + if(err < 0 || alsa_period_us < params->period / 10) + err = snd_pcm_hw_params_set_buffer_size_near(stream->pcm_handle, + stream->hw_params, &stream->alsa_bufsize_frames); + else{ + unsigned int periods = 4; + err = snd_pcm_hw_params_set_periods_near(stream->pcm_handle, stream->hw_params, &periods, NULL); + } + if(err < 0) + WARN("Unable to set buffer size: %d (%s)\n", err, snd_strerror(err)); + + if((err = snd_pcm_hw_params(stream->pcm_handle, stream->hw_params)) < 0){ + WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + if((err = snd_pcm_hw_params_get_period_size(stream->hw_params, + &stream->alsa_period_frames, NULL)) < 0){ + WARN("Unable to get period size: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + if((err = snd_pcm_hw_params_get_buffer_size(stream->hw_params, + &stream->alsa_bufsize_frames)) < 0){ + WARN("Unable to get buffer size: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + sw_params = calloc(1, snd_pcm_sw_params_sizeof()); + if(!sw_params){ + params->result = E_OUTOFMEMORY; + goto exit; + } + + if((err = snd_pcm_sw_params_current(stream->pcm_handle, sw_params)) < 0){ + WARN("Unable to get sw_params: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + if((err = snd_pcm_sw_params_set_start_threshold(stream->pcm_handle, + sw_params, 1)) < 0){ + WARN("Unable set start threshold to 1: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + if((err = snd_pcm_sw_params_set_stop_threshold(stream->pcm_handle, + sw_params, stream->alsa_bufsize_frames)) < 0){ + WARN("Unable set stop threshold to %lu: %d (%s)\n", + stream->alsa_bufsize_frames, err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + if((err = snd_pcm_sw_params(stream->pcm_handle, sw_params)) < 0){ + WARN("Unable to set sw params: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + if((err = snd_pcm_prepare(stream->pcm_handle)) < 0){ + WARN("Unable to prepare device: %d (%s)\n", err, snd_strerror(err)); + params->result = AUDCLNT_E_ENDPOINT_CREATE_FAILED; + goto exit; + } + + /* Bear in mind weird situations where + * ALSA period (50ms) > mmdevapi buffer (3x10ms) + * or surprising rounding as seen with 22050x8x1 with Pulse: + * ALSA period 220 vs. 221 frames in mmdevapi and + * buffer 883 vs. 2205 frames in mmdevapi! */ + stream->bufsize_frames = muldiv(params->duration, params->fmt->nSamplesPerSec, 10000000); + if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) + stream->bufsize_frames -= stream->bufsize_frames % stream->mmdev_period_frames; + stream->hidden_frames = stream->alsa_period_frames + stream->mmdev_period_frames + + muldiv(params->fmt->nSamplesPerSec, EXTRA_SAFE_RT, 10000000); + /* leave no less than about 1.33ms or 256 bytes of data after a rewind */ + stream->safe_rewind_frames = max(256 / params->fmt->nBlockAlign, muldiv(133, params->fmt->nSamplesPerSec, 100000)); + + /* Check if the ALSA buffer is so small that it will run out before + * the next MMDevAPI period tick occurs. Allow a little wiggle room + * with 120% of the period time. */ + if(stream->alsa_bufsize_frames < 1.2 * stream->mmdev_period_frames) + FIXME("ALSA buffer time is too small. Expect underruns. (%lu < %u * 1.2)\n", + stream->alsa_bufsize_frames, stream->mmdev_period_frames); + + fmtex = clone_format(params->fmt); + if(!fmtex){ + params->result = E_OUTOFMEMORY; + goto exit; + } + stream->fmt = &fmtex->Format; + + size = stream->bufsize_frames * params->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + params->result = E_OUTOFMEMORY; + goto exit; + } + silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); + + stream->silence_buf = malloc(stream->alsa_period_frames * stream->fmt->nBlockAlign); + if(!stream->silence_buf){ + params->result = E_OUTOFMEMORY; + goto exit; + } + silence_buffer(stream, stream->silence_buf, stream->alsa_period_frames); + + stream->vols = malloc(params->fmt->nChannels * sizeof(float)); + if(!stream->vols){ + params->result = E_OUTOFMEMORY; + goto exit; + } + for(i = 0; i < params->fmt->nChannels; ++i) + stream->vols[i] = 1.f; + + stream->share = params->share; + stream->flags = params->flags; + + pthread_mutex_init(&stream->lock, NULL); + + TRACE("ALSA period: %lu frames\n", stream->alsa_period_frames); + TRACE("ALSA buffer: %lu frames\n", stream->alsa_bufsize_frames); + TRACE("MMDevice period: %u frames\n", stream->mmdev_period_frames); + TRACE("MMDevice buffer: %u frames\n", stream->bufsize_frames); + +exit: + free(sw_params); + if(FAILED(params->result)){ + snd_pcm_close(stream->pcm_handle); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } + free(stream->silence_buf); + free(stream->hw_params); + free(stream->fmt); + free(stream->vols); + free(stream); + }else{ + *params->stream = stream; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS release_stream(void *args) +{ + struct release_stream_params *params = args; + struct alsa_stream *stream = params->stream; + SIZE_T size; + + snd_pcm_drop(stream->pcm_handle); + snd_pcm_close(stream->pcm_handle); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + } + /* free(stream->remapping_buf); */ + free(stream->silence_buf); + free(stream->hw_params); + free(stream->fmt); + free(stream->vols); + pthread_mutex_destroy(&stream->lock); + free(stream); + + params->result = S_OK; + return STATUS_SUCCESS; +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -922,6 +1223,8 @@ exit: unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, + create_stream, + release_stream, is_format_supported, get_mix_format, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d89ae4ee9ec..a1477dbe850 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -62,7 +62,6 @@ unixlib_handle_t alsa_handle = 0; static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; -#define EXTRA_SAFE_RT 40000 struct ACImpl; typedef struct ACImpl ACImpl; @@ -253,6 +252,20 @@ static void alsa_unlock(struct alsa_stream *stream) pthread_mutex_unlock(&stream->lock); } +static HRESULT alsa_stream_release(struct alsa_stream *stream) +{ + struct release_stream_params params; + + /* FIXME: to be moved with remap_channels() */ + HeapFree(GetProcessHeap(), 0, stream->remapping_buf); + + params.stream = stream; + + ALSA_CALL(release_stream, &params); + + return params.result; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -325,11 +338,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) -{ - return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; -} - static void set_stream_volumes(ACImpl *This) { struct alsa_stream *stream = This->stream; @@ -459,34 +467,6 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData return FALSE; } -static HRESULT alsa_open_device(const char *alsa_name, EDataFlow flow, snd_pcm_t **pcm_handle, - snd_pcm_hw_params_t **hw_params) -{ - int err; - - if(flow != eRender && flow != eCapture) - return E_UNEXPECTED; - - err = snd_pcm_open(pcm_handle, alsa_name, alsa_get_direction(flow), SND_PCM_NONBLOCK); - if(err < 0){ - WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); - switch(err){ - case -EBUSY: - return AUDCLNT_E_DEVICE_IN_USE; - default: - return AUDCLNT_E_ENDPOINT_CREATE_FAILED; - } - } - - *hw_params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_hw_params_sizeof()); - if(!*hw_params){ - snd_pcm_close(*pcm_handle); - return E_OUTOFMEMORY; - } - - return S_OK; -} - HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; @@ -570,7 +550,6 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; ULONG ref; ref = InterlockedDecrement(&This->ref); @@ -596,26 +575,8 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - if (stream){ - SIZE_T size; - snd_pcm_drop(stream->pcm_handle); - snd_pcm_close(stream->pcm_handle); - if(stream->local_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); - } - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - } - HeapFree(GetProcessHeap(), 0, stream->remapping_buf); - HeapFree(GetProcessHeap(), 0, stream->silence_buf); - HeapFree(GetProcessHeap(), 0, stream->hw_params); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream->vols); - pthread_mutex_destroy(&stream->lock); - HeapFree(GetProcessHeap(), 0, stream); - } + if (This->stream) + alsa_stream_release(This->stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -655,66 +616,6 @@ static void dump_fmt(const WAVEFORMATEX *fmt) } } -static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) -{ - WAVEFORMATEX *ret; - size_t size; - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - size = sizeof(WAVEFORMATEXTENSIBLE); - else - size = sizeof(WAVEFORMATEX); - - ret = CoTaskMemAlloc(size); - if(!ret) - return NULL; - - memcpy(ret, fmt, size); - - ret->cbSize = size - sizeof(WAVEFORMATEX); - - return ret; -} - -static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) -{ - snd_pcm_format_t format = SND_PCM_FORMAT_UNKNOWN; - const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; - - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - if(fmt->wBitsPerSample == 8) - format = SND_PCM_FORMAT_U8; - else if(fmt->wBitsPerSample == 16) - format = SND_PCM_FORMAT_S16_LE; - else if(fmt->wBitsPerSample == 24) - format = SND_PCM_FORMAT_S24_3LE; - else if(fmt->wBitsPerSample == 32) - format = SND_PCM_FORMAT_S32_LE; - else - WARN("Unsupported bit depth: %u\n", fmt->wBitsPerSample); - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmt->wBitsPerSample != fmtex->Samples.wValidBitsPerSample){ - if(fmtex->Samples.wValidBitsPerSample == 20 && fmt->wBitsPerSample == 24) - format = SND_PCM_FORMAT_S20_3LE; - else - WARN("Unsupported ValidBits: %u\n", fmtex->Samples.wValidBitsPerSample); - } - }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->wBitsPerSample == 32) - format = SND_PCM_FORMAT_FLOAT_LE; - else if(fmt->wBitsPerSample == 64) - format = SND_PCM_FORMAT_FLOAT64_LE; - else - WARN("Unsupported float size: %u\n", fmt->wBitsPerSample); - }else - WARN("Unknown wave format: %04x\n", fmt->wFormatTag); - return format; -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -794,123 +695,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static int alsa_channel_index(DWORD flag) -{ - switch(flag){ - case SPEAKER_FRONT_LEFT: - return 0; - case SPEAKER_FRONT_RIGHT: - return 1; - case SPEAKER_BACK_LEFT: - return 2; - case SPEAKER_BACK_RIGHT: - return 3; - case SPEAKER_FRONT_CENTER: - return 4; - case SPEAKER_LOW_FREQUENCY: - return 5; - case SPEAKER_SIDE_LEFT: - return 6; - case SPEAKER_SIDE_RIGHT: - return 7; - } - return -1; -} - -static BOOL need_remapping(ACImpl *This, const WAVEFORMATEX *fmt, int *map) -{ - unsigned int i; - for(i = 0; i < fmt->nChannels; ++i){ - if(map[i] != i) - return TRUE; - } - return FALSE; -} - -static DWORD get_channel_mask(unsigned int channels) -{ - switch(channels){ - case 0: - return 0; - case 1: - return KSAUDIO_SPEAKER_MONO; - case 2: - return KSAUDIO_SPEAKER_STEREO; - case 3: - return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; - case 4: - return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ - case 5: - return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; - case 6: - return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ - case 7: - return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; - case 8: - return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ - } - FIXME("Unknown speaker configuration: %u\n", channels); - return 0; -} - -static HRESULT map_channels(ACImpl *This, const WAVEFORMATEX *fmt, int *alsa_channels, int *map) -{ - BOOL need_remap; - - if(This->dataflow != eCapture && (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE || fmt->nChannels > 2) ){ - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - DWORD mask, flag = SPEAKER_FRONT_LEFT; - UINT i = 0; - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->dwChannelMask != 0) - mask = fmtex->dwChannelMask; - else - mask = get_channel_mask(fmt->nChannels); - - *alsa_channels = 0; - - while(i < fmt->nChannels && !(flag & SPEAKER_RESERVED)){ - if(mask & flag){ - map[i] = alsa_channel_index(flag); - TRACE("Mapping mmdevapi channel %u (0x%x) to ALSA channel %d\n", - i, flag, map[i]); - if(map[i] >= *alsa_channels) - *alsa_channels = map[i] + 1; - ++i; - } - flag <<= 1; - } - - while(i < fmt->nChannels){ - map[i] = *alsa_channels; - TRACE("Mapping mmdevapi channel %u to ALSA channel %d\n", - i, map[i]); - ++*alsa_channels; - ++i; - } - - for(i = 0; i < fmt->nChannels; ++i){ - if(map[i] == -1){ - map[i] = *alsa_channels; - ++*alsa_channels; - TRACE("Remapping mmdevapi channel %u to ALSA channel %d\n", - i, map[i]); - } - } - - need_remap = need_remapping(This, fmt, map); - }else{ - *alsa_channels = fmt->nChannels; - - need_remap = FALSE; - } - - TRACE("need_remapping: %u, alsa_channels: %d\n", need_remap, *alsa_channels); - - return need_remap ? S_OK : S_FALSE; -} - static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 frames) { WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; @@ -929,13 +713,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); + struct create_stream_params params; struct alsa_stream *stream; - snd_pcm_sw_params_t *sw_params = NULL; - snd_pcm_format_t format; - unsigned int rate, alsa_period_us; - int err, i; - HRESULT hr = S_OK; - SIZE_T size; + unsigned int i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -997,237 +777,40 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, dump_fmt(fmt); - stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!stream){ - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } + params.alsa_name = This->alsa_name; + params.flow = This->dataflow; + params.share = mode; + params.flags = flags; + params.duration = duration; + params.period = period; + params.fmt = fmt; + params.stream = &stream; - hr = alsa_open_device(This->alsa_name, This->dataflow, &stream->pcm_handle, &stream->hw_params); - if(FAILED(hr)){ + ALSA_CALL(create_stream, &params); + if(FAILED(params.result)){ LeaveCriticalSection(&g_sessions_lock); - return hr; - } - - stream->need_remapping = map_channels(This, fmt, &stream->alsa_channels, stream->alsa_channel_map) == S_OK; - - if((err = snd_pcm_hw_params_any(stream->pcm_handle, stream->hw_params)) < 0){ - WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - if((err = snd_pcm_hw_params_set_access(stream->pcm_handle, stream->hw_params, - SND_PCM_ACCESS_RW_INTERLEAVED)) < 0){ - WARN("Unable to set access: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - format = alsa_format(fmt); - if (format == SND_PCM_FORMAT_UNKNOWN){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - - if((err = snd_pcm_hw_params_set_format(stream->pcm_handle, stream->hw_params, - format)) < 0){ - WARN("Unable to set ALSA format to %u: %d (%s)\n", format, err, - snd_strerror(err)); - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - - stream->alsa_format = format; - stream->flow = This->dataflow; - - rate = fmt->nSamplesPerSec; - if((err = snd_pcm_hw_params_set_rate_near(stream->pcm_handle, stream->hw_params, - &rate, NULL)) < 0){ - WARN("Unable to set rate to %u: %d (%s)\n", rate, err, - snd_strerror(err)); - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - - if((err = snd_pcm_hw_params_set_channels(stream->pcm_handle, stream->hw_params, - stream->alsa_channels)) < 0){ - WARN("Unable to set channels to %u: %d (%s)\n", fmt->nChannels, err, - snd_strerror(err)); - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - - stream->mmdev_period_rt = period; - alsa_period_us = stream->mmdev_period_rt / 10; - if((err = snd_pcm_hw_params_set_period_time_near(stream->pcm_handle, - stream->hw_params, &alsa_period_us, NULL)) < 0) - WARN("Unable to set period time near %u: %d (%s)\n", alsa_period_us, - err, snd_strerror(err)); - /* ALSA updates the output variable alsa_period_us */ - - stream->mmdev_period_frames = MulDiv(fmt->nSamplesPerSec, - stream->mmdev_period_rt, 10000000); - - /* Buffer 4 ALSA periods if large enough, else 4 mmdevapi periods */ - stream->alsa_bufsize_frames = stream->mmdev_period_frames * 4; - if(err < 0 || alsa_period_us < period / 10) - err = snd_pcm_hw_params_set_buffer_size_near(stream->pcm_handle, - stream->hw_params, &stream->alsa_bufsize_frames); - else{ - unsigned int periods = 4; - err = snd_pcm_hw_params_set_periods_near(stream->pcm_handle, stream->hw_params, &periods, NULL); - } - if(err < 0) - WARN("Unable to set buffer size: %d (%s)\n", err, snd_strerror(err)); - - if((err = snd_pcm_hw_params(stream->pcm_handle, stream->hw_params)) < 0){ - WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; + return params.result; } - if((err = snd_pcm_hw_params_get_period_size(stream->hw_params, - &stream->alsa_period_frames, NULL)) < 0){ - WARN("Unable to get period size: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - if((err = snd_pcm_hw_params_get_buffer_size(stream->hw_params, - &stream->alsa_bufsize_frames)) < 0){ - WARN("Unable to get buffer size: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - sw_params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_sw_params_sizeof()); - if(!sw_params){ - hr = E_OUTOFMEMORY; - goto exit; - } - - if((err = snd_pcm_sw_params_current(stream->pcm_handle, sw_params)) < 0){ - WARN("Unable to get sw_params: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - if((err = snd_pcm_sw_params_set_start_threshold(stream->pcm_handle, - sw_params, 1)) < 0){ - WARN("Unable set start threshold to 1: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - if((err = snd_pcm_sw_params_set_stop_threshold(stream->pcm_handle, - sw_params, stream->alsa_bufsize_frames)) < 0){ - WARN("Unable set stop threshold to %lu: %d (%s)\n", - stream->alsa_bufsize_frames, err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - if((err = snd_pcm_sw_params(stream->pcm_handle, sw_params)) < 0){ - WARN("Unable to set sw params: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - if((err = snd_pcm_prepare(stream->pcm_handle)) < 0){ - WARN("Unable to prepare device: %d (%s)\n", err, snd_strerror(err)); - hr = AUDCLNT_E_ENDPOINT_CREATE_FAILED; - goto exit; - } - - /* Bear in mind weird situations where - * ALSA period (50ms) > mmdevapi buffer (3x10ms) - * or surprising rounding as seen with 22050x8x1 with Pulse: - * ALSA period 220 vs. 221 frames in mmdevapi and - * buffer 883 vs. 2205 frames in mmdevapi! */ - stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - stream->bufsize_frames -= stream->bufsize_frames % stream->mmdev_period_frames; - stream->hidden_frames = stream->alsa_period_frames + stream->mmdev_period_frames + - MulDiv(fmt->nSamplesPerSec, EXTRA_SAFE_RT, 10000000); - /* leave no less than about 1.33ms or 256 bytes of data after a rewind */ - stream->safe_rewind_frames = max(256 / fmt->nBlockAlign, MulDiv(133, fmt->nSamplesPerSec, 100000)); - - /* Check if the ALSA buffer is so small that it will run out before - * the next MMDevAPI period tick occurs. Allow a little wiggle room - * with 120% of the period time. */ - if(stream->alsa_bufsize_frames < 1.2 * stream->mmdev_period_frames) - FIXME("ALSA buffer time is too small. Expect underruns. (%lu < %u * 1.2)\n", - stream->alsa_bufsize_frames, stream->mmdev_period_frames); - - stream->fmt = clone_format(fmt); - if(!stream->fmt){ - hr = E_OUTOFMEMORY; - goto exit; - } - - size = stream->bufsize_frames * fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - hr = E_OUTOFMEMORY; - goto exit; - } - silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); - - stream->silence_buf = HeapAlloc(GetProcessHeap(), 0, - stream->alsa_period_frames * stream->fmt->nBlockAlign); - if(!stream->silence_buf){ - hr = E_OUTOFMEMORY; - goto exit; - } - pthread_mutex_init(&stream->lock, NULL); - silence_buffer(stream, stream->silence_buf, stream->alsa_period_frames); - This->channel_count = fmt->nChannels; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - hr = E_OUTOFMEMORY; + params.result = E_OUTOFMEMORY; goto exit; } - for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; - stream->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); - if(!stream->vols){ - hr = E_OUTOFMEMORY; - goto exit; - } - for(i = 0; i < fmt->nChannels; ++i) - stream->vols[i] = 1.f; - - stream->share = mode; - stream->flags = flags; - - hr = get_audio_session(sessionguid, This->parent, This->channel_count, - &This->session); - if(FAILED(hr)) + params.result = get_audio_session(sessionguid, This->parent, This->channel_count, + &This->session); + if(FAILED(params.result)) goto exit; list_add_tail(&This->session->clients, &This->entry); - TRACE("ALSA period: %lu frames\n", stream->alsa_period_frames); - TRACE("ALSA buffer: %lu frames\n", stream->alsa_bufsize_frames); - TRACE("MMDevice period: %u frames\n", stream->mmdev_period_frames); - TRACE("MMDevice buffer: %u frames\n", stream->bufsize_frames); - exit: - HeapFree(GetProcessHeap(), 0, sw_params); - if(FAILED(hr)){ - snd_pcm_close(stream->pcm_handle); - if(stream->local_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); - } - CoTaskMemFree(stream->fmt); - stream->fmt = NULL; - HeapFree(GetProcessHeap(), 0, stream->vols); - HeapFree(GetProcessHeap(), 0, stream); + if(FAILED(params.result)){ + alsa_stream_release(stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{ @@ -1237,7 +820,7 @@ exit: LeaveCriticalSection(&g_sessions_lock); - return hr; + return params.result; } static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 615eb47c7a5..771f189bca4 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -71,6 +71,25 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct create_stream_params +{ + const char *alsa_name; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + DWORD flags; + REFERENCE_TIME duration; + REFERENCE_TIME period; + const WAVEFORMATEX *fmt; + HRESULT result; + struct alsa_stream **stream; +}; + +struct release_stream_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -92,6 +111,8 @@ struct get_mix_format_params enum alsa_funcs { alsa_get_endpoint_ids, + alsa_create_stream, + alsa_release_stream, alsa_is_format_supported, alsa_get_mix_format, }; -- 2.25.1

2 1

[PATCH 3/4] winealsa: Use NtAllocateVirtualMemory() to alloc the buffers returned to the user.
by Huw Davies 22 Feb '22

22 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 52 +++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 23a420c8ac7..d89ae4ee9ec 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -597,12 +597,19 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if (stream){ + SIZE_T size; snd_pcm_drop(stream->pcm_handle); snd_pcm_close(stream->pcm_handle); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + } HeapFree(GetProcessHeap(), 0, stream->remapping_buf); HeapFree(GetProcessHeap(), 0, stream->silence_buf); - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); HeapFree(GetProcessHeap(), 0, stream->hw_params); CoTaskMemFree(stream->fmt); HeapFree(GetProcessHeap(), 0, stream->vols); @@ -928,6 +935,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, unsigned int rate, alsa_period_us; int err, i; HRESULT hr = S_OK; + SIZE_T size; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -1158,9 +1166,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, goto exit; } - stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, - stream->bufsize_frames * fmt->nBlockAlign); - if(!stream->local_buffer){ + size = stream->bufsize_frames * fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ hr = E_OUTOFMEMORY; goto exit; } @@ -1212,8 +1220,10 @@ exit: HeapFree(GetProcessHeap(), 0, sw_params); if(FAILED(hr)){ snd_pcm_close(stream->pcm_handle); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); - stream->local_buffer = NULL; + if(stream->local_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE); + } CoTaskMemFree(stream->fmt); stream->fmt = NULL; HeapFree(GetProcessHeap(), 0, stream->vols); @@ -2297,6 +2307,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, ACImpl *This = impl_from_IAudioRenderClient(iface); struct alsa_stream *stream = This->stream; UINT32 write_pos; + SIZE_T size; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -2325,10 +2336,15 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, write_pos = stream->wri_offs_frames; if(write_pos + frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - frames * stream->fmt->nBlockAlign); - if(!stream->tmp_buffer){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; alsa_unlock(stream); return E_OUTOFMEMORY; } @@ -2465,6 +2481,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, { ACImpl *This = impl_from_IAudioCaptureClient(iface); struct alsa_stream *stream = This->stream; + SIZE_T size; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -2495,10 +2512,15 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(stream->tmp_buffer_frames < *frames){ - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, - *frames * stream->fmt->nBlockAlign); - if(!stream->tmp_buffer){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; alsa_unlock(stream); return E_OUTOFMEMORY; } -- 2.25.1

2 1

[PATCH 2/4] winealsa: Use a pthread mutex for the stream lock.
by Huw Davies 22 Feb '22

22 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 162 +++++++++++++++++------------------ dlls/winealsa.drv/unixlib.h | 2 + 2 files changed, 80 insertions(+), 84 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 4d38240a853..23a420c8ac7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> #include <math.h> +#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -111,8 +112,6 @@ struct ACImpl { HANDLE timer; - CRITICAL_SECTION lock; - AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -244,6 +243,16 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static void alsa_lock(struct alsa_stream *stream) +{ + pthread_mutex_lock(&stream->lock); +} + +static void alsa_unlock(struct alsa_stream *stream) +{ + pthread_mutex_unlock(&stream->lock); +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -515,9 +524,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; memcpy(This->alsa_name, alsa_name, len + 1); - InitializeCriticalSection(&This->lock); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock"); - This->parent = dev; IMMDevice_AddRef(This->parent); @@ -584,8 +590,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); @@ -602,6 +606,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) HeapFree(GetProcessHeap(), 0, stream->hw_params); CoTaskMemFree(stream->fmt); HeapFree(GetProcessHeap(), 0, stream->vols); + pthread_mutex_destroy(&stream->lock); HeapFree(GetProcessHeap(), 0, stream); } HeapFree(GetProcessHeap(), 0, This); @@ -1167,6 +1172,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, hr = E_OUTOFMEMORY; goto exit; } + pthread_mutex_init(&stream->lock, NULL); silence_buffer(stream, stream->silence_buf, stream->alsa_period_frames); This->channel_count = fmt->nChannels; @@ -1235,16 +1241,14 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!out) return E_POINTER; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + alsa_lock(stream); *out = stream->bufsize_frames; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -1260,12 +1264,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!latency) return E_POINTER; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + alsa_lock(stream); /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0 * yet have enough data left to play (as if it were in native's mixer). Add: @@ -1278,7 +1280,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, *latency = MulDiv(stream->alsa_period_frames, 10000000, stream->fmt->nSamplesPerSec) + stream->mmdev_period_rt; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -1294,17 +1296,15 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!out) return E_POINTER; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + alsa_lock(stream); /* padding is solely updated at callback time in shared mode */ *out = stream->held_frames; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); TRACE("pad: %u\n", *out); @@ -1818,7 +1818,7 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) ACImpl *This = user; struct alsa_stream *stream = This->stream; - EnterCriticalSection(&This->lock); + alsa_lock(stream); QueryPerformanceCounter(&stream->last_period_time); @@ -1827,7 +1827,7 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) else if(stream->flow == eCapture) alsa_read_data(stream); - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); } static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) @@ -1880,22 +1880,22 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); EnterCriticalSection(&g_sessions_lock); - EnterCriticalSection(&This->lock); if(!This->stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } + alsa_lock(stream); + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(stream->started){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_STOPPED; } @@ -1932,7 +1932,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(!This->timer){ if(!CreateTimerQueueTimer(&This->timer, g_timer_q, alsa_push_buffer_data, This, 0, stream->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); LeaveCriticalSection(&g_sessions_lock); WARN("Unable to create timer: %u\n", GetLastError()); return E_OUTOFMEMORY; @@ -1941,7 +1941,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) stream->started = TRUE; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; @@ -1954,15 +1954,13 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) TRACE("(%p)\n", This); - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + alsa_lock(stream); if(!stream->started){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_FALSE; } @@ -1971,7 +1969,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) stream->started = FALSE; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -1983,20 +1981,18 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) TRACE("(%p)\n", This); - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + alsa_lock(stream); if(stream->started){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_NOT_STOPPED; } if(stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -2019,7 +2015,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) stream->lcl_offs_frames = 0; stream->wri_offs_frames = 0; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -2035,27 +2031,25 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!event) return E_INVALIDARG; - EnterCriticalSection(&This->lock); - - if(!This->stream){ - LeaveCriticalSection(&This->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + alsa_lock(stream); if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } if (stream->event){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); FIXME("called twice\n"); return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } stream->event = event; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -2310,21 +2304,21 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - EnterCriticalSection(&This->lock); + alsa_lock(stream); if(stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } /* held_frames == GetCurrentPadding_nolock(); */ if(stream->held_frames + frames > stream->bufsize_frames){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_BUFFER_TOO_LARGE; } @@ -2335,7 +2329,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * stream->fmt->nBlockAlign); if(!stream->tmp_buffer){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return E_OUTOFMEMORY; } stream->tmp_buffer_frames = frames; @@ -2349,7 +2343,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, silence_buffer(stream, *data, frames); - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -2380,21 +2374,21 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - EnterCriticalSection(&This->lock); + alsa_lock(stream); if(!written_frames){ stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } if(!stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_INVALID_SIZE; } @@ -2415,7 +2409,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( stream->written_frames += written_frames; stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -2483,17 +2477,17 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - EnterCriticalSection(&This->lock); + alsa_lock(stream); if(stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } /* hr = GetNextPacketSize(iface, frames); */ if(stream->held_frames < stream->mmdev_period_frames){ *frames = 0; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_S_BUFFER_EMPTY; } *frames = stream->mmdev_period_frames; @@ -2505,7 +2499,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, *frames * stream->fmt->nBlockAlign); if(!stream->tmp_buffer){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return E_OUTOFMEMORY; } stream->tmp_buffer_frames = *frames; @@ -2535,7 +2529,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; } - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; } @@ -2548,21 +2542,21 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( TRACE("(%p)->(%u)\n", This, done); - EnterCriticalSection(&This->lock); + alsa_lock(stream); if(!done){ stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } if(!stream->getbuf_last){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_OUT_OF_ORDER; } if(stream->getbuf_last != done){ - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return AUDCLNT_E_INVALID_SIZE; } @@ -2572,7 +2566,7 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( stream->lcl_offs_frames %= stream->bufsize_frames; stream->getbuf_last = 0; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -2588,11 +2582,11 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( if(!frames) return E_POINTER; - EnterCriticalSection(&This->lock); + alsa_lock(stream); *frames = stream->held_frames < stream->mmdev_period_frames ? 0 : stream->mmdev_period_frames; - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); return S_OK; } @@ -2671,7 +2665,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, if(!pos) return E_POINTER; - EnterCriticalSection(&This->lock); + alsa_lock(stream); /* avail_update required to get accurate snd_pcm_state() */ snd_pcm_avail_update(stream->pcm_handle); @@ -2702,7 +2696,7 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, (UINT32)(stream->written_frames%1000000000), stream->held_frames, alsa_state, (UINT32)(position%1000000000)); - LeaveCriticalSection(&This->lock); + alsa_unlock(stream); if(stream->share == AUDCLNT_SHAREMODE_SHARED) *pos = position * stream->fmt->nBlockAlign; @@ -2874,14 +2868,14 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - EnterCriticalSection(&client->lock); + alsa_lock(client->stream); if(client->stream->started){ *state = AudioSessionStateActive; - LeaveCriticalSection(&client->lock); + alsa_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - LeaveCriticalSection(&client->lock); + alsa_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c0dc625e27f..615eb47c7a5 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -51,6 +51,8 @@ struct alsa_stream BYTE *local_buffer, *tmp_buffer, *remapping_buf, *silence_buf; LONG32 getbuf_last; /* <0 when using tmp_buffer */ float *vols; + + pthread_mutex_t lock; }; struct endpoint -- 2.25.1

2 1

[PATCH 1/4] winealsa: Use the sessions lock to lock the client's data.
by Huw Davies 22 Feb '22

22 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 45 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5bb3bdbcc73..4d38240a853 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -976,10 +976,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } EnterCriticalSection(&g_sessions_lock); - EnterCriticalSection(&This->lock); if(This->stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -988,14 +986,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); if(!stream){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } hr = alsa_open_device(This->alsa_name, This->dataflow, &stream->pcm_handle, &stream->hw_params); if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return hr; } @@ -1223,7 +1219,6 @@ exit: set_stream_volumes(This); } - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return hr; @@ -1884,20 +1879,24 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); + EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); if(!This->stream){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(stream->started){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_STOPPED; } @@ -1934,6 +1933,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, alsa_push_buffer_data, This, 0, stream->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); WARN("Unable to create timer: %u\n", GetLastError()); return E_OUTOFMEMORY; } @@ -1942,6 +1942,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) stream->started = TRUE; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2070,23 +2071,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); if(!This->stream){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -2101,7 +2102,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -2112,7 +2113,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -2123,7 +2124,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } }else @@ -2133,11 +2134,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -2843,9 +2844,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - EnterCriticalSection(&This->client->lock); + EnterCriticalSection(&g_sessions_lock); This->client->session_wrapper = NULL; - LeaveCriticalSection(&This->client->lock); + LeaveCriticalSection(&g_sessions_lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -3238,12 +3239,12 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); This->vols[index] = level; set_stream_volumes(This); - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3282,13 +3283,13 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; set_stream_volumes(This); - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3307,12 +3308,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.25.1

2 1

[PATCH] include/wine/test.h: fix winetest_argv[1] in case of single test
by Eric Pouech 22 Feb '22

22 Feb '22

Wine's test infrastructure allows to call ./wine <test>.exe without test name when only a single test is available in <test>.exe. Unfortunately, a lots of tests also rely on winetest_argv[1] to be the name of current test (esp. when respawning themselves to run sub processes). So, ensure wintest_argv is correctly populated in the case of a <test> containing a single test file and called without any argument on command line. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/test.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 599234b3519..fc96bfa9877 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -691,7 +691,11 @@ int main( int argc, char **argv ) if (!argv[1]) { if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */ + { + static char* fake_argv[3] = {argv[0], winetest_testlist[0].name, NULL}; + winetest_argv = fake_argv; return run_test( winetest_testlist[0].name ); + } usage( argv[0] ); } if (!strcmp( argv[1], "--list" ))

2 1

[PATCH 12/12] win32u: Move cursor icon handle management from user32.
by Jacek Caban 22 Feb '22

22 Feb '22

2 1

[PATCH 11/12] win32u: Move user_handles from user32.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This part could be a bit nicer using my shm patches, that's what I originally used to implement this. However, those patches still need more work. Ideally, I'd prototype more of it, but at the same time I don't want to pile even more patches. My current thinking is to continue moving things without shm patches for now, but keep them around to revisit later. I hope to use experience from shm patches to make sure that we match their design where possible. All functions exposed from win32u by this patch are ultimately meant to be internal to win32u. dlls/user32/user_private.h | 13 ----- dlls/user32/win.c | 83 +++----------------------- dlls/user32/win.h | 37 ------------ dlls/win32u/ntuser_private.h | 53 +++++++++++++++++ dlls/win32u/sysparams.c | 11 ++++ dlls/win32u/window.c | 109 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 ++ 7 files changed, 185 insertions(+), 126 deletions(-)

2 1

[PATCH 10/12] win32u: Move user lock from user32.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Ultimately we will want those to be private to win32u (and PE code should never be executed with with the lock). dlls/user32/hook.c | 2 -- dlls/user32/user_main.c | 20 +++--------------- dlls/win32u/hook.c | 2 ++ dlls/win32u/sysparams.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 6 files changed, 48 insertions(+), 19 deletions(-)

3 2

[PATCH 09/12] user32: Simplify icon delay handling.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

2 1

[PATCH 08/12] user32: Use create_cursoricon_object in CURSORICON_CreateIconFromANI.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 122 ++++++++------------------------------- 1 file changed, 24 insertions(+), 98 deletions(-)

3 2

[PATCH 07/12] user32: Use create_cursoricon_object in CreateIconIndirect.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 73 +++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 42 deletions(-)

3 2

[PATCH 06/12] user32: Introduce NtUserSetCursorIconData.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 196 ++++++++++++++++++++++++++++++--------- include/ntuser.h | 15 +++ 2 files changed, 168 insertions(+), 43 deletions(-)

2 1

[PATCH 05/12] user32: Factor out create_icon_frame.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 134 +++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 70 deletions(-)

2 1

[PATCH 04/12] user32: Simplify cursor hotspot handling.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 03/12] user32: Use ntuser object type constants.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 10 +++++----- dlls/user32/menu.c | 8 ++++---- dlls/user32/resource.c | 10 +++++----- dlls/user32/user_private.h | 19 +++++-------------- dlls/user32/win.c | 14 +++++++------- dlls/user32/winpos.c | 6 +++--- include/ntuser.h | 8 ++++++++ 7 files changed, 37 insertions(+), 38 deletions(-)

2 1

[PATCH 02/12] user32: Store module as unicode string in cursoricon_object.
by Jacek Caban 22 Feb '22

22 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 51 +++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 16 deletions(-)

3 2

[PATCH 01/12] user32: Use a single struct for static and animated cursor icons.
by Jacek Caban 22 Feb '22

22 Feb '22

Handle allocation should use a separate from data initialization, so its object layout needs to be independent on data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Most of the series is refactoring cursoricon.c to allow moving handle allocation in the last patch. dlls/user32/cursoricon.c | 117 +++++++++++++++------------------------ 1 file changed, 45 insertions(+), 72 deletions(-)

2 1

[PATCH v2 8/8] combase: Start surrogate local server when required.
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20296 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/rpc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 0a86183030a..79f9b0d9c41 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -522,6 +522,50 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return S_OK; } +static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) +{ + HKEY key; + HRESULT hr; + WCHAR command[MAX_PATH + CHARS_IN_GUID]; + DWORD size; + STARTUPINFOW sinfo; + PROCESS_INFORMATION pinfo; + LONG ret; + + TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); + if (FAILED(hr)) + return hr; + + size = (MAX_PATH + 1) * sizeof(WCHAR); + ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); + RegCloseKey(key); + if (ret || !size || !command[0]) + { + TRACE("No value for DllSurrogate key\n"); + wcscpy(command, L"dllhost.exe "); + } + + /* Surrogate EXE servers are started with the {GUID} switch. */ + StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); + + memset(&sinfo, 0, sizeof(sinfo)); + sinfo.cb = sizeof(sinfo); + + TRACE("Activating surrogate local server %s\n", debugstr_w(command)); + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + return HRESULT_FROM_WIN32(GetLastError()); + } + *process = pinfo.hProcess; + CloseHandle(pinfo.hThread); + + return S_OK; +} + HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) { PMInterfacePointer objref = NULL; @@ -546,7 +590,8 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) if (tries == 1) { - if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) ) + if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) && + (hr = create_surrogate_server(rclsid, &process)) ) return hr; } -- 2.35.1

1 0

[PATCH v2 7/8] dllhost: Periodically call CoFreeUnusedLibraries().
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index f19b22ffce5..4907474ac1c 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -364,7 +364,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - WaitForSingleObject(surrogate.event, INFINITE); + while (WaitForSingleObject(surrogate.event, 30000) != WAIT_OBJECT_0) + CoFreeUnusedLibraries(); } cleanup: -- 2.35.1

1 0

[PATCH v2 6/8] dllhost: Implement IMarshal::MarshalInterface().
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index c792ac3ef09..f19b22ffce5 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -164,9 +164,11 @@ static ULONG WINAPI marshal_Release(IMarshal *iface) static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx,%p): stub\n", iface, wine_dbgstr_guid(iid), pv, + TRACE("(%p,%s,%p,%08lx,%p,%08lx,%p)\n", iface, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags, clsid); - return E_NOTIMPL; + + *clsid = CLSID_StdMarshal; + return S_OK; } static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *pv, @@ -180,8 +182,19 @@ static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, voi static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx): stub\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); - return E_NOTIMPL; + struct factory *factory = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("(%p,%s,%p,%08lx,%p,%08lx)\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); + + hr = CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, (void **)&object); + if (hr == S_OK) + { + hr = CoMarshalInterface(stream, iid, object, dwDestContext, pvDestContext, mshlflags); + IUnknown_Release(object); + } + return hr; } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, -- 2.35.1

1 0

[PATCH v2 4/8] dllhost: Implement IClassFactory::CreateInstance().
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 5c0a93c9a71..24e1242d78b 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -98,8 +98,14 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *punkouter, REFIID iid, void **ppv) { - FIXME("(%p,%p,%s,%p): stub\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); - return E_NOTIMPL; + struct factory *factory = impl_from_IClassFactory(iface); + + TRACE("(%p,%p,%s,%p)\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); + + if (punkouter) + return CLASS_E_NOAGGREGATION; + + return CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, ppv); } static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) -- 2.35.1

1 0

[PATCH v2] dlls/winmm: enable compilation with long types
by Andrew Eikum 22 Feb '22

22 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix up a EOL whitespace on driver.c:385 while we're changing that line anyway. dlls/winmm/Makefile.in | 2 +- dlls/winmm/driver.c | 18 ++--- dlls/winmm/joystick.c | 24 +++--- dlls/winmm/lolvldrv.c | 16 ++-- dlls/winmm/mci.c | 70 ++++++++-------- dlls/winmm/mmio.c | 48 +++++------ dlls/winmm/playsound.c | 14 ++-- dlls/winmm/time.c | 2 +- dlls/winmm/waveform.c | 178 ++++++++++++++++++++--------------------- dlls/winmm/winmm.c | 50 ++++++------ 10 files changed, 211 insertions(+), 211 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 0d1791b68e6..c515a3aba2e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_WINMM_ +EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm IMPORTS = uuid user32 advapi32 ole32 msacm32 diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 0ddc81dc717..e6412b04d20 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -125,10 +125,10 @@ static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, { LRESULT ret; - TRACE("Before call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx\n", + TRACE("Before call32 proc=%p drvrID=%08Ix hDrv=%p wMsg=%04x p1=%08Ix p2=%08Ix\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, lpDrv, msg, lParam1, lParam2); ret = lpDrv->lpDrvProc(lpDrv->dwDriverID, (HDRVR)lpDrv, msg, lParam1, lParam2); - TRACE("After call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx => %08lx\n", + TRACE("After call32 proc=%p drvrID=%08Ix hDrv=%p wMsg=%04x p1=%08Ix p2=%08Ix => %08Ix\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, lpDrv, msg, lParam1, lParam2, ret); return ret; @@ -144,14 +144,14 @@ LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1, LPWINE_DRIVER lpDrv; LRESULT retval = 0; - TRACE("(%p, %04X, %08lX, %08lX)\n", hDriver, msg, lParam1, lParam2); + TRACE("(%p, %04X, %08IX, %08IX)\n", hDriver, msg, lParam1, lParam2); if ((lpDrv = DRIVER_FindFromHDrvr(hDriver)) != NULL) { retval = DRIVER_SendMessage(lpDrv, msg, lParam1, lParam2); } else { WARN("Bad driver handle %p\n", hDriver); } - TRACE("retval = %ld\n", retval); + TRACE("retval = %Id\n", retval); return retval; } @@ -278,7 +278,7 @@ LPWINE_DRIVER DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2) LPWSTR ptr; LPCSTR cause = 0; - TRACE("(%s, %08lX);\n", debugstr_w(fn), lParam2); + TRACE("(%s, %08IX);\n", debugstr_w(fn), lParam2); if ((ptr = wcschr(fn, ' ')) != NULL) { *ptr++ = '\0'; @@ -382,7 +382,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar WCHAR libName[MAX_PATH + 1]; LPCWSTR lsn = lpSectionName; - TRACE("(%s, %s, 0x%08lx);\n", + TRACE("(%s, %s, 0x%08Ix);\n", debugstr_w(lpDriverName), debugstr_w(lpSectionName), lParam); DRIVER_Dump("BEFORE:"); @@ -418,7 +418,7 @@ LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2) BOOL ret; LPWINE_DRIVER lpDrv; - TRACE("(%p, %08lX, %08lX);\n", hDrvr, lParam1, lParam2); + TRACE("(%p, %08IX, %08IX);\n", hDrvr, lParam1, lParam2); DRIVER_Dump("BEFORE:"); @@ -545,7 +545,7 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD_PTR dwParam2) { BOOL ret = FALSE; - TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n", + TRACE("(%08IX, %s %04lX, %p, %04lX, %08IX, %08IX, %08IX)\n", dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); if (!dwCallBack) return ret; @@ -594,7 +594,7 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, break; #endif default: - WARN("Unknown callback type %d\n", uFlags & DCB_TYPEMASK); + WARN("Unknown callback type %ld\n", uFlags & DCB_TYPEMASK); return FALSE; } if (ret) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5a6e1203513..52094504186 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -156,7 +156,7 @@ static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **cont { HRESULT hr = DirectInput8Create( hWinMM32Instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); - if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#x\n", hr ); + if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#lx\n", hr ); return TRUE; } @@ -191,7 +191,7 @@ static void find_joysticks(void) index = 0; IDirectInput8_EnumDevices( dinput, DI8DEVCLASS_ALL, enum_instances, &index, DIEDFL_ATTACHEDONLY ); - TRACE( "found %u device instances\n", index ); + TRACE( "found %lu device instances\n", index ); while (index--) { @@ -205,18 +205,18 @@ static void find_joysticks(void) } if (!(event = CreateEventW( NULL, FALSE, FALSE, NULL ))) - WARN( "could not event for device, error %u\n", GetLastError() ); + WARN( "could not event for device, error %lu\n", GetLastError() ); else if (FAILED(hr = IDirectInput8_CreateDevice( dinput, &instances[index].guidInstance, &device, NULL ))) - WARN( "could not create device %s instance, hr %#x\n", + WARN( "could not create device %s instance, hr %#lx\n", debugstr_guid( &instances[index].guidInstance ), hr ); else if (FAILED(hr = IDirectInputDevice8_SetEventNotification( device, event ))) - WARN( "SetEventNotification device %p hr %#x\n", device, hr ); + WARN( "SetEventNotification device %p hr %#lx\n", device, hr ); else if (FAILED(hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_NONEXCLUSIVE|DISCL_BACKGROUND ))) - WARN( "SetCooperativeLevel device %p hr %#x\n", device, hr ); + WARN( "SetCooperativeLevel device %p hr %#lx\n", device, hr ); else if (FAILED(hr = IDirectInputDevice8_SetDataFormat( device, &data_format ))) - WARN( "SetDataFormat device %p hr %#x\n", device, hr ); + WARN( "SetDataFormat device %p hr %#lx\n", device, hr ); else if (FAILED(hr = IDirectInputDevice8_Acquire( device ))) - WARN( "Acquire device %p hr %#x\n", device, hr ); + WARN( "Acquire device %p hr %#lx\n", device, hr ); else { TRACE( "opened device %p event %p\n", device, event ); @@ -295,7 +295,7 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD */ MMRESULT WINAPI joyConfigChanged(DWORD flags) { - FIXME( "flags %#x stub!\n", flags ); + FIXME( "flags %#lx stub!\n", flags ); if (flags) return JOYERR_PARMS; return JOYERR_NOERROR; } @@ -351,13 +351,13 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, U if (!(device = joysticks[id].device)) res = JOYERR_PARMS; else if (FAILED(hr = IDirectInputDevice8_GetCapabilities( device, &dicaps ))) { - WARN( "GetCapabilities device %p returned %#x\n", device, hr ); + WARN( "GetCapabilities device %p returned %#lx\n", device, hr ); res = JOYERR_PARMS; } else { hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &diprop.diph ); - if (FAILED(hr)) WARN( "GetProperty device %p returned %#x\n", device, hr ); + if (FAILED(hr)) WARN( "GetProperty device %p returned %#lx\n", device, hr ); else { caps->wMid = LOWORD(diprop.dwData); @@ -487,7 +487,7 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx( UINT id, JOYINFOEX *info ) res = JOYERR_PARMS; else if (FAILED(hr = IDirectInputDevice8_GetDeviceState( device, sizeof(struct joystick_state), &state ))) { - WARN( "GetDeviceState device %p returned %#x\n", device, hr ); + WARN( "GetDeviceState device %p returned %#lx\n", device, hr ); res = JOYERR_PARMS; } else diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index d3bd5536976..ff7e83398f1 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -97,7 +97,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, WINE_MM_DRIVER_PART* part; WINE_LLTYPE* llType = &llTypes[mld->type]; - TRACE("(%s %d %u 0x%08lx 0x%08lx 0x%08lx)\n", + TRACE("(%s %d %u 0x%08Ix 0x%08Ix 0x%08Ix)\n", llTypes[mld->type].typestr, mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); @@ -119,7 +119,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, assert(part->fnMessage32); - TRACE("Calling message(dev=%d msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n", + TRACE("Calling message(dev=%d msg=%u usr=0x%08Ix p1=0x%08Ix p2=0x%08Ix)\n", mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); ret = part->fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); TRACE("=> %s\n", WINMM_ErrorToString(ret)); @@ -195,7 +195,7 @@ DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwFlags) DWORD dwRet = MMSYSERR_BADDEVICEID; DWORD_PTR dwInstance; WINE_LLTYPE* llType = &llTypes[mld->type]; - TRACE("(%p, %04x, 0x%08lx, 0x%08x)\n", mld, wMsg, dwParam1, dwFlags); + TRACE("(%p, %04x, 0x%08Ix, 0x%08lx)\n", mld, wMsg, dwParam1, dwFlags); mld->dwDriverInstance = (DWORD_PTR)&dwInstance; @@ -286,7 +286,7 @@ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, { WINE_MM_DRIVER* lpDrv = &MMDrvs[mld->mmdIndex]; - TRACE("(%p, %04x, %08lx, %08lx)\n", mld, uMsg, dwParam1, dwParam2); + TRACE("(%p, %04x, %08Ix, %08Ix)\n", mld, uMsg, dwParam1, dwParam2); /* all those function calls are undocumented */ switch (uMsg) { @@ -505,20 +505,20 @@ static void MMDRV_Init(void) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); if(FAILED(hr)){ - ERR("CoCreateInstance failed: %08x\n", hr); + ERR("CoCreateInstance failed: %08lx\n", hr); goto exit; } hr = IMMDeviceEnumerator_GetDevice(devenum, L"Wine info device", &device); IMMDeviceEnumerator_Release(devenum); if(FAILED(hr)){ - ERR("GetDevice failed: %08x\n", hr); + ERR("GetDevice failed: %08lx\n", hr); goto exit; } hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - ERR("OpenPropertyStore failed: %08x\n", hr); + ERR("OpenPropertyStore failed: %08lx\n", hr); IMMDevice_Release(device); goto exit; } @@ -528,7 +528,7 @@ static void MMDRV_Init(void) IPropertyStore_Release(ps); IMMDevice_Release(device); if(FAILED(hr)){ - ERR("GetValue failed: %08x\n", hr); + ERR("GetValue failed: %08lx\n", hr); goto exit; } diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 8e43dcc0f62..2aa74fd4127 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1112,7 +1112,7 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, break; case MCI_FLAG: *dwFlags |= flg; - TRACE("flag=%08x\n", flg); + TRACE("flag=%08lx\n", flg); break; case MCI_HWND: case MCI_HPAL: @@ -1122,13 +1122,13 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, data[offset] |= flg; *dwFlags |= cflg; inCst = FALSE; - TRACE("flag=%08x constant=%08x\n", cflg, flg); + TRACE("flag=%08lx constant=%08lx\n", cflg, flg); } else { *dwFlags |= flg; if (!MCI_GetDWord(&(data[offset]), &args)) { return MCIERR_BAD_INTEGER; } - TRACE("flag=%08x int=%d\n", flg, data[offset]); + TRACE("flag=%08lx int=%ld\n", flg, data[offset]); } break; case MCI_RECT: @@ -1140,13 +1140,13 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, !MCI_GetDWord(&(data[offset+3]), &args)) { return MCIERR_BAD_INTEGER; } - TRACE("flag=%08x for rectangle\n", flg); + TRACE("flag=%08lx for rectangle\n", flg); break; case MCI_STRING: *dwFlags |= flg; if ((dwRet = MCI_GetString((LPWSTR*)&data[offset], &args))) return dwRet; - TRACE("flag=%08x string=%s\n", flg, debugstr_w(*(LPWSTR*)&data[offset])); + TRACE("flag=%08lx string=%s\n", flg, debugstr_w(*(LPWSTR*)&data[offset])); break; default: ERR("oops\n"); } @@ -1287,7 +1287,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret swprintf(lpstrRet, uRetLen, L"%d %d %d %d", data[0], data[1], data[2], data[3]); break; } - default: FIXME("Unknown MCI return type %d\n", retType); + default: FIXME("Unknown MCI return type %ld\n", retType); } } return LOWORD(dwRet); @@ -1486,7 +1486,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, offset += sizeof(DWORD_PTR); break; default: - FIXME("Unknown MCI return type %d\n", retType); + FIXME("Unknown MCI return type %ld\n", retType); dwRet = MCIERR_PARSER_INTERNAL; goto errCleanUp; } @@ -1546,7 +1546,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, break; } - TRACE("[%d, %s, %08x, %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x]\n", + TRACE("[%d, %s, %08lx, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", wmd ? wmd->wDeviceID : uDevID, MCI_MessageToString(wMsg), dwFlags, data.dw[0], data.dw[1], data.dw[2], data.dw[3], data.dw[4], data.dw[5], data.dw[6], data.dw[7], data.dw[8], data.dw[9]); @@ -1559,11 +1559,11 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, wMsg, dwFlags, (DWORD_PTR)&data); } if (!LOWORD(dwRet)) { - TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + TRACE("=> 1/ %lx (%s)\n", dwRet, debugstr_w(lpstrRet)); dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, &data.generic, lpstrRet, uRetLen); - TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + TRACE("=> 2/ %lx (%s)\n", dwRet, debugstr_w(lpstrRet)); } else - TRACE("=> %x\n", dwRet); + TRACE("=> %lx\n", dwRet); errCleanUp: if (auto_open) { @@ -1625,7 +1625,7 @@ BOOL WINAPI mciExecute(LPCSTR lpstrCommand) ret = mciSendStringA(lpstrCommand, strRet, sizeof(strRet), 0); if (ret != 0) { if (!mciGetErrorStringA(ret, strRet, sizeof(strRet))) { - sprintf(strRet, "Unknown MCI error (%d)", ret); + sprintf(strRet, "Unknown MCI error (%ld)", ret); } MessageBoxA(0, strRet, "Error in mciExecute()", MB_OK); } @@ -1703,7 +1703,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) DWORD dwRet; LPWINE_MCIDRIVER wmd = NULL; - TRACE("(%08X, %p)\n", dwParam, lpParms); + TRACE("(%08lX, %p)\n", dwParam, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; /* only two low bytes are generic, the other ones are dev type specific */ @@ -1711,7 +1711,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) MCI_OPEN_ALIAS|MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID| \ MCI_NOTIFY|MCI_WAIT) if ((dwParam & ~WINE_MCIDRIVER_SUPP) != 0) - FIXME("Unsupported yet dwFlags=%08X\n", dwParam); + FIXME("Unsupported yet dwFlags=%08lX\n", dwParam); #undef WINE_MCIDRIVER_SUPP strDevTyp[0] = 0; @@ -1801,13 +1801,13 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) } if ((dwRet = MCI_FinishOpen(wmd, lpParms, dwParam))) { - TRACE("Failed to open driver (MCI_OPEN_DRIVER) [%08x], closing\n", dwRet); + TRACE("Failed to open driver (MCI_OPEN_DRIVER) [%08lx], closing\n", dwRet); /* FIXME: is dwRet the correct ret code ? */ goto errCleanUp; } /* only handled devices fall through */ - TRACE("wDevID=%04X wDeviceID=%d dwRet=%d\n", wmd->wDeviceID, lpParms->wDeviceID, dwRet); + TRACE("wDevID=%04X wDeviceID=%d dwRet=%ld\n", wmd->wDeviceID, lpParms->wDeviceID, dwRet); return 0; errCleanUp: @@ -1823,7 +1823,7 @@ static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) DWORD dwRet; LPWINE_MCIDRIVER wmd; - TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwParam, lpParms); /* Every device must handle MCI_NOTIFY on its own. */ if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { @@ -1891,7 +1891,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (lpParms->lpstrReturn == NULL) return MCIERR_PARAM_OVERFLOW; - TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", + TRACE("(%08x, %08lX, %p[num=%ld, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); if ((WORD)MCI_ALL_DEVICE_ID == LOWORD(uDevID)) uDevID = MCI_ALL_DEVICE_ID; /* Be compatible with Win9x */ @@ -1945,7 +1945,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } *(DWORD*)lpParms->lpstrReturn = cnt; - TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); + TRACE("(%ld) => '%ld'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); ret = MCI_INTEGER_RETURNED; /* return ret; Only Win9x sends a notification in this case. */ break; @@ -1958,7 +1958,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = (uDevID == MCI_ALL_DEVICE_ID) ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } - TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); + TRACE("(%ld) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; case MCI_SYSINFO_NAME: s = NULL; @@ -1981,7 +1981,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm LeaveCriticalSection(&WINMM_cs); ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE; } else if (MCI_ALL_DEVICE_ID == uDevID) { - TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber); + TRACE("MCI_SYSINFO_NAME: device #%ld\n", lpParms->dwNumber); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) { if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, @@ -1997,7 +1997,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm if (!s) { if (GetPrivateProfileStringW(L"MCI", 0, L"", buf, ARRAY_SIZE(buf), L"system.ini")) { for (p = buf; *p; p += lstrlenW(p) + 1, cnt++) { - TRACE("%d: %s\n", cnt, debugstr_w(p)); + TRACE("%ld: %s\n", cnt, debugstr_w(p)); if (cnt == lpParms->dwNumber - 1) { s = p; break; @@ -2018,10 +2018,10 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = 0; } } - TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); + TRACE("(%ld) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; default: - TRACE("Unsupported flag value=%08x\n", dwFlags); + TRACE("Unsupported flag value=%08lx\n", dwFlags); ret = MCIERR_UNRECOGNIZED_KEYWORD; } if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) @@ -2039,7 +2039,7 @@ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - TRACE("(%08x, %08X, vkey %04X, hwnd %p)\n", wDevID, dwFlags, + TRACE("(%08x, %08lX, vkey %04X, hwnd %p)\n", wDevID, dwFlags, lpParms->nVirtKey, lpParms->hwndBreak); dwRet = MCI_SendCommandFrom32(wDevID, MCI_BREAK, dwFlags, (DWORD_PTR)lpParms); @@ -2131,7 +2131,7 @@ static LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD_PTR dwParam2) LPMCI_GETDEVCAPS_PARMS lmgp; lmgp = (LPMCI_GETDEVCAPS_PARMS)dwParam2; - TRACE("Changing %08x to %08x\n", lmgp->dwReturn, LOWORD(lmgp->dwReturn)); + TRACE("Changing %08lx to %08x\n", lmgp->dwReturn, LOWORD(lmgp->dwReturn)); lmgp->dwReturn = LOWORD(lmgp->dwReturn); } break; @@ -2154,7 +2154,7 @@ static LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD_PTR dwParam2) LPMCI_STATUS_PARMS lsp; lsp = (LPMCI_STATUS_PARMS)dwParam2; - TRACE("Changing %08lx to %08x\n", lsp->dwReturn, LOWORD(lsp->dwReturn)); + TRACE("Changing %08Ix to %08x\n", lsp->dwReturn, LOWORD(lsp->dwReturn)); lsp->dwReturn = LOWORD(lsp->dwReturn); } break; @@ -2175,7 +2175,7 @@ static LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD_PTR dwParam2) break; default: if (HIWORD(dwRet)) { - FIXME("Got non null hiword for dwRet=0x%08lx for command %s\n", + FIXME("Got non null hiword for dwRet=0x%08Ix for command %s\n", dwRet, MCI_MessageToString(wMsg)); } break; @@ -2253,7 +2253,7 @@ BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD_PTR data) { LPWINE_MCIDRIVER wmd; - TRACE("(%04x, %08lx)\n", uDeviceID, data); + TRACE("(%04x, %08Ix)\n", uDeviceID, data); wmd = MCI_GetDriver(uDeviceID); @@ -2274,12 +2274,12 @@ DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, { DWORD dwRet; - TRACE("(%08x, %s, %08lx, %08lx)\n", + TRACE("(%08x, %s, %08Ix, %08Ix)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); dwRet = MCI_SendCommand(wDevID, wMsg, dwParam1, dwParam2); dwRet = MCI_CleanUp(dwRet, wMsg, dwParam2); - TRACE("=> %08x\n", dwRet); + TRACE("=> %08lx\n", dwRet); return dwRet; } @@ -2291,7 +2291,7 @@ DWORD WINAPI mciSendCommandA(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, DWORD ret; int mapped; - TRACE("(%08x, %s, %08lx, %08lx)\n", + TRACE("(%08x, %s, %08Ix, %08Ix)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); mapped = MCI_MapMsgAtoW(wMsg, dwParam1, &dwParam2); @@ -2338,7 +2338,7 @@ static UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data) INT16 ret; MSG msg; - TRACE("(0x%04x, 0x%08x)\n", wDevID, data); + TRACE("(0x%04x, 0x%08lx)\n", wDevID, data); if ((HIWORD(data) != 0 && HWND_16(GetActiveWindow()) != HIWORD(data)) || (GetAsyncKeyState(LOWORD(data)) & 1) == 0) { @@ -2359,7 +2359,7 @@ BOOL WINAPI mciSetYieldProc(MCIDEVICEID uDeviceID, YIELDPROC fpYieldProc, DWORD { LPWINE_MCIDRIVER wmd; - TRACE("(%u, %p, %08x)\n", uDeviceID, fpYieldProc, dwYieldData); + TRACE("(%u, %p, %08lx)\n", uDeviceID, fpYieldProc, dwYieldData); if (!(wmd = MCI_GetDriver(uDeviceID))) { WARN("Bad uDeviceID\n"); @@ -2396,7 +2396,7 @@ UINT WINAPI mciGetDeviceIDFromElementIDW(DWORD dwElementID, LPCWSTR lpstrType) /* FIXME: that's rather strange, there is no * mciGetDeviceIDFromElementID32A in winmm.spec */ - FIXME("(%u, %s) stub\n", dwElementID, debugstr_w(lpstrType)); + FIXME("(%lu, %s) stub\n", dwElementID, debugstr_w(lpstrType)); return 0; } diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 1255cf69da2..352da62a215 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -97,7 +97,7 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, { LRESULT ret = MMSYSERR_NOERROR; - TRACE("(%p, %X, 0x%lx, 0x%lx);\n", lpmmioinfo, uMessage, lParam1, lParam2); + TRACE("(%p, %X, 0x%Ix, 0x%Ix);\n", lpmmioinfo, uMessage, lParam1, lParam2); switch (uMessage) { case MMIOM_OPEN: @@ -206,7 +206,7 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, static LRESULT CALLBACK mmioMemIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, LPARAM lParam1, LPARAM lParam2) { - TRACE("(%p,0x%04x,0x%08lx,0x%08lx)\n", lpmmioinfo, uMessage, lParam1, lParam2); + TRACE("(%p,0x%04x,0x%08Ix,0x%08Ix)\n", lpmmioinfo, uMessage, lParam1, lParam2); switch (uMessage) { @@ -310,7 +310,7 @@ static LPMMIOPROC MMIO_InstallIOProc(FOURCC fccIOProc, LPMMIOPROC pIOProc, struct IOProcList* pListNode; struct IOProcList** ppListNode; - TRACE("(%08x, %p, %08X, %s)\n", fccIOProc, pIOProc, dwFlags, is_unicode ? "unicode" : "ansi"); + TRACE("(%08lx, %p, %08lX, %s)\n", fccIOProc, pIOProc, dwFlags, is_unicode ? "unicode" : "ansi"); if (dwFlags & MMIO_GLOBALPROC) FIXME("Global procedures not implemented\n"); @@ -563,7 +563,7 @@ static LONG MMIO_GrabNextBuffer(LPWINE_MMIO wm, int for_read) { LONG size = wm->info.cchBuffer; - TRACE("bo=%x do=%x\n", + TRACE("bo=%lx do=%lx\n", wm->info.lBufOffset, wm->info.lDiskOffset); wm->info.lBufOffset = wm->info.lDiskOffset; @@ -590,10 +590,10 @@ static LONG MMIO_GrabNextBuffer(LPWINE_MMIO wm, int for_read) static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, UINT uFlags) { - TRACE("(%p %p %d %u)\n", wm, pchBuffer, cchBuffer, uFlags); + TRACE("(%p %p %ld %u)\n", wm, pchBuffer, cchBuffer, uFlags); if (cchBuffer > 0xFFFF) - WARN("Untested handling of huge mmio buffers (%d >= 64k)\n", cchBuffer); + WARN("Untested handling of huge mmio buffers (%ld >= 64k)\n", cchBuffer); if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) return MMIOERR_CANNOTWRITE; @@ -634,7 +634,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, MMIOINFO mmioinfo; DWORD pos; - TRACE("(%s, %p, %08X, %s);\n", debugstr_a(szFileName), refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); + TRACE("(%s, %p, %08lX, %s);\n", debugstr_a(szFileName), refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); if (!refmminfo) { refmminfo = &mmioinfo; @@ -801,7 +801,7 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) LPWINE_MMIO wm; LONG count; - TRACE("(%p, %p, %d);\n", hmmio, pch, cch); + TRACE("(%p, %p, %ld);\n", hmmio, pch, cch); if ((wm = MMIO_Get(hmmio)) == NULL) return -1; @@ -842,7 +842,7 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) mmioSeek(hmmio, 0, SEEK_CUR); } - TRACE("count=%d\n", count); + TRACE("count=%ld\n", count); return count; } @@ -854,7 +854,7 @@ LONG WINAPI mmioWrite(HMMIO hmmio, HPCSTR pch, LONG cch) LPWINE_MMIO wm; LONG count; - TRACE("(%p, %p, %d);\n", hmmio, pch, cch); + TRACE("(%p, %p, %ld);\n", hmmio, pch, cch); if ((wm = MMIO_Get(hmmio)) == NULL) return -1; @@ -895,7 +895,7 @@ LONG WINAPI mmioWrite(HMMIO hmmio, HPCSTR pch, LONG cch) wm->info.lBufOffset = wm->info.lDiskOffset; } - TRACE("bytes written=%d\n", count); + TRACE("bytes written=%ld\n", count); return count; } @@ -907,7 +907,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) LPWINE_MMIO wm; LONG offset; - TRACE("(%p, %08X, %d);\n", hmmio, lOffset, iOrigin); + TRACE("(%p, %08lX, %d);\n", hmmio, lOffset, iOrigin); if ((wm = MMIO_Get(hmmio)) == NULL) return MMSYSERR_INVALHANDLE; @@ -966,7 +966,7 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) else wm->info.pchNext = wm->info.pchBuffer + (offset - wm->info.lBufOffset); - TRACE("=> %d\n", offset); + TRACE("=> %ld\n", offset); return offset; } @@ -1019,7 +1019,7 @@ MMRESULT WINAPI mmioSetBuffer(HMMIO hmmio, LPSTR pchBuffer, LONG cchBuffer, UINT { LPWINE_MMIO wm; - TRACE("(hmmio=%p, pchBuf=%p, cchBuf=%d, uFlags=%#08x)\n", + TRACE("(hmmio=%p, pchBuf=%p, cchBuf=%ld, uFlags=%#08x)\n", hmmio, pchBuffer, cchBuffer, uFlags); if ((wm = MMIO_Get(hmmio)) == NULL) @@ -1154,7 +1154,7 @@ static LRESULT MMIO_SendMessage(HMMIO hmmio, UINT uMessage, LPARAM lParam1, { LPWINE_MMIO wm; - TRACE("(%p, %u, %ld, %ld, %s)\n", hmmio, uMessage, lParam1, lParam2, is_unicode ? "unicode" : "ansi"); + TRACE("(%p, %u, %Id, %Id, %s)\n", hmmio, uMessage, lParam1, lParam2, is_unicode ? "unicode" : "ansi"); if (uMessage < MMIOM_USER) return MMSYSERR_INVALPARAM; @@ -1190,10 +1190,10 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, return MMSYSERR_INVALPARAM; dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR); - TRACE("dwOldPos=%d\n", dwOldPos); + TRACE("dwOldPos=%ld\n", dwOldPos); if (lpckParent != NULL) { - TRACE("seek inside parent at %d !\n", lpckParent->dwDataOffset); + TRACE("seek inside parent at %ld !\n", lpckParent->dwDataOffset); /* EPP: was dwOldPos = mmioSeek(hmmio,lpckParent->dwDataOffset,SEEK_SET); */ if (dwOldPos < lpckParent->dwDataOffset || dwOldPos >= lpckParent->dwDataOffset + lpckParent->cksize) { @@ -1242,7 +1242,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, } lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD); - TRACE("ckid=%s fcc=%s cksize=%08X !\n", + TRACE("ckid=%s fcc=%s cksize=%08lX !\n", debugstr_an((LPCSTR)&lpck->ckid, 4), srchType ? debugstr_an((LPCSTR)&lpck->fccType, 4) : "<na>", lpck->cksize); @@ -1266,7 +1266,7 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET); lpck->fccType = 0; } - TRACE("lpck: ckid=%s, cksize=%d, dwDataOffset=%d fccType=%08X (%s)!\n", + TRACE("lpck: ckid=%s, cksize=%ld, dwDataOffset=%ld fccType=%08lX (%s)!\n", debugstr_an((LPSTR)&lpck->ckid, 4), lpck->cksize, lpck->dwDataOffset, lpck->fccType, srchType ? debugstr_an((LPSTR)&lpck->fccType, 4):""); return MMSYSERR_NOERROR; @@ -1284,10 +1284,10 @@ MMRESULT WINAPI mmioAscend(HMMIO hmmio, LPMMCKINFO lpck, UINT uFlags) TRACE("Chunk is dirty, checking if chunk's size is correct\n"); dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR); - TRACE("dwOldPos=%d lpck->dwDataOffset = %d\n", dwOldPos, lpck->dwDataOffset); + TRACE("dwOldPos=%ld lpck->dwDataOffset = %ld\n", dwOldPos, lpck->dwDataOffset); dwNewSize = dwOldPos - lpck->dwDataOffset; if (dwNewSize != lpck->cksize) { - TRACE("Nope: lpck->cksize=%d dwNewSize=%d\n", lpck->cksize, dwNewSize); + TRACE("Nope: lpck->cksize=%ld dwNewSize=%ld\n", lpck->cksize, dwNewSize); lpck->cksize = dwNewSize; /* pad odd size with 0 */ @@ -1318,7 +1318,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) TRACE("(%p, %p, %04X);\n", hmmio, lpck, uFlags); dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR); - TRACE("dwOldPos=%d\n", dwOldPos); + TRACE("dwOldPos=%ld\n", dwOldPos); if (uFlags == MMIO_CREATELIST) lpck->ckid = FOURCC_LIST; @@ -1335,7 +1335,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) lpck->dwFlags = MMIO_DIRTY; ix = mmioWrite(hmmio, (LPSTR)lpck, size); - TRACE("after mmioWrite ix = %d req = %d, errno = %d\n", ix, size, errno); + TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n", ix, size, errno); if (ix < size) { mmioSeek(hmmio, dwOldPos, SEEK_SET); WARN("return CannotWrite\n"); @@ -1355,7 +1355,7 @@ MMRESULT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName, struct IOProcList tmp; FOURCC fcc; - TRACE("(%s, %s, %p, %08X);\n", + TRACE("(%s, %s, %p, %08lX);\n", debugstr_a(szFileName), debugstr_a(szNewFileName), lpmmioinfo, dwFlags); /* If both params are NULL, then parse the file name */ diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index d74e5a7af4a..0858f958583 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -159,7 +159,7 @@ static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, break; case WOM_DONE: InterlockedIncrement(&s->dwEventCount); - TRACE("Returning waveHdr=%lx\n", dwParam1); + TRACE("Returning waveHdr=%Ix\n", dwParam1); SetEvent(s->hEvent); break; default: @@ -344,7 +344,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &ckMainRIFF, NULL, 0)) goto errCleanUp; - TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08X\n", + TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&ckMainRIFF.ckid, (LPSTR)&ckMainRIFF.fccType, ckMainRIFF.cksize); if ((ckMainRIFF.ckid != FOURCC_RIFF) || @@ -355,7 +355,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK)) goto errCleanUp; - TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08X\n", + TRACE("Chunk Found ckid=%.4s fccType=%08lx cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -366,8 +366,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag); TRACE("nChannels=%d\n", lpWaveFormat->nChannels); - TRACE("nSamplesPerSec=%d\n", lpWaveFormat->nSamplesPerSec); - TRACE("nAvgBytesPerSec=%d\n", lpWaveFormat->nAvgBytesPerSec); + TRACE("nSamplesPerSec=%ld\n", lpWaveFormat->nSamplesPerSec); + TRACE("nAvgBytesPerSec=%ld\n", lpWaveFormat->nAvgBytesPerSec); TRACE("nBlockAlign=%d\n", lpWaveFormat->nBlockAlign); TRACE("wBitsPerSample=%u !\n", lpWaveFormat->wBitsPerSample); @@ -378,7 +378,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK)) goto errCleanUp; - TRACE("Chunk Found ckid=%.4s fccType=%08x cksize=%08X\n", + TRACE("Chunk Found ckid=%.4s fccType=%08lx cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -469,7 +469,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo { WINE_PLAYSOUND* wps = NULL; - TRACE("pszSound='%p' hmod=%p fdwSound=%08X\n", + TRACE("pszSound='%p' hmod=%p fdwSound=%08lX\n", pszSound, hmod, fdwSound); /* SND_NOWAIT is ignored in w95/2k/xp. */ diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 634b5df7923..e00b5ca7b54 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -271,7 +271,7 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, WORD new_id = 0; int i; - TRACE("(%u, %u, %p, %08lX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); + TRACE("(%u, %u, %p, %08IX, %04X);\n", wDelay, wResol, lpFunc, dwUser, wFlags); if (wDelay < MMSYSTIME_MININTERVAL || wDelay > MMSYSTIME_MAXINTERVAL) return 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 66444ee82dc..ecd2acb8b28 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -737,18 +737,18 @@ static HRESULT reroute_mapper_device(WINMM_Device *device, BOOL is_out) hr = IAudioClient_Stop(device->client); if(FAILED(hr)) - WARN("Stop failed: %08x\n", hr); + WARN("Stop failed: %08lx\n", hr); hr = IAudioClock_GetFrequency(device->clock, &clock_freq); if(FAILED(hr)){ - WARN("GetFrequency failed: %08x\n", hr); + WARN("GetFrequency failed: %08lx\n", hr); LeaveCriticalSection(&device->lock); return hr; } hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); if(FAILED(hr)){ - WARN("GetPosition failed: %08x\n", hr); + WARN("GetPosition failed: %08lx\n", hr); LeaveCriticalSection(&device->lock); return hr; } @@ -852,7 +852,7 @@ static HRESULT WINMM_InitMMDevices(void) hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(devenum, &g_notif); if(FAILED(hr)) - WARN("RegisterEndpointNotificationCallback failed: %08x\n", hr); + WARN("RegisterEndpointNotificationCallback failed: %08lx\n", hr); hr = WINMM_EnumDevices(&g_out_mmdevices, &g_out_map, &g_outmmdevices_count, eRender, devenum); @@ -890,7 +890,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, HRESULT hr; MMRESULT mr; - TRACE("format: %u, channels: %u, sample rate: %u, bit depth: %u\n", + TRACE("format: %u, channels: %u, sample rate: %lu, bit depth: %lu\n", WAVE_FORMAT_PCM, channels, freq, bits_per_samp); target.wFormatTag = WAVE_FORMAT_PCM; @@ -929,7 +929,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, AC_BUFLEN, 0, &target, &device->parent->session); if(hr != S_OK){ - WARN("Initialize failed: %08x\n", hr); + WARN("Initialize failed: %08lx\n", hr); acmStreamClose(device->acm_handle, 0); device->acm_handle = NULL; return MMSYSERR_ERROR; @@ -1073,7 +1073,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IMMDeviceEnumerator_GetDevice(g_devenum, device->parent->dev_id, &device->device); if(FAILED(hr)){ - WARN("Device %s (%s) unavailable: %08x\n", + WARN("Device %s (%s) unavailable: %08lx\n", wine_dbgstr_w(device->parent->dev_id), wine_dbgstr_w(device->parent->out_caps.szPname), hr); ret = MMSYSERR_NODRIVER; @@ -1084,7 +1084,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IMMDevice_Activate(device->device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&device->client); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); ret = hr2mmr(hr); if(ret == MMSYSERR_ERROR) ret = MMSYSERR_NOTENABLED; @@ -1114,7 +1114,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, device->orig_fmt->nBlockAlign = device->orig_fmt->nChannels * device->orig_fmt->wBitsPerSample/8; } if (device->orig_fmt->nAvgBytesPerSec != device->orig_fmt->nSamplesPerSec * device->orig_fmt->nBlockAlign) { - WARN("Fixing bad nAvgBytesPerSec (%u)\n", device->orig_fmt->nAvgBytesPerSec); + WARN("Fixing bad nAvgBytesPerSec (%lu)\n", device->orig_fmt->nAvgBytesPerSec); device->orig_fmt->nAvgBytesPerSec = device->orig_fmt->nSamplesPerSec * device->orig_fmt->nBlockAlign; } }else{ @@ -1146,7 +1146,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY) goto error; }else{ - WARN("Initialize failed: %08x\n", hr); + WARN("Initialize failed: %08lx\n", hr); ret = hr2mmr(hr); goto error; } @@ -1158,14 +1158,14 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IAudioClient_GetService(device->client, &IID_IAudioClock, (void**)&device->clock); if(FAILED(hr)){ - WARN("GetService failed: %08x\n", hr); + WARN("GetService failed: %08lx\n", hr); goto error; } if(!device->event){ device->event = CreateEventW(NULL, FALSE, FALSE, NULL); if(!device->event){ - WARN("CreateEvent failed: %08x\n", hr); + WARN("CreateEvent failed: %08lx\n", hr); goto error; } @@ -1188,7 +1188,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IAudioClient_SetEventHandle(device->client, device->event); if(FAILED(hr)){ - WARN("SetEventHandle failed: %08x\n", hr); + WARN("SetEventHandle failed: %08lx\n", hr); goto error; } @@ -1287,14 +1287,14 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) hr = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, (void**)&device->render); if(FAILED(hr)){ - ERR("GetService failed: %08x\n", hr); + ERR("GetService failed: %08lx\n", hr); goto error; } hr = IAudioClient_GetService(device->client, &IID_IAudioStreamVolume, (void**)&device->volume); if(FAILED(hr)){ - ERR("GetService failed: %08x\n", hr); + ERR("GetService failed: %08lx\n", hr); goto error; } @@ -1376,7 +1376,7 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) hr = IAudioClient_GetService(device->client, &IID_IAudioCaptureClient, (void**)&device->capture); if(FAILED(hr)){ - WARN("GetService failed: %08x\n", hr); + WARN("GetService failed: %08lx\n", hr); goto error; } @@ -1583,13 +1583,13 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) hr = IAudioClock_GetFrequency(device->clock, &clock_freq); if(FAILED(hr)){ - WARN("GetFrequency failed: %08x\n", hr); + WARN("GetFrequency failed: %08lx\n", hr); return NULL; } hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); if(FAILED(hr)){ - WARN("GetPosition failed: %08x\n", hr); + WARN("GetPosition failed: %08lx\n", hr); return NULL; } @@ -1653,13 +1653,13 @@ static void WOD_PushData(WINMM_Device *device) hr = IAudioClient_GetBufferSize(device->client, &bufsize); if(FAILED(hr)){ - WARN("GetBufferSize failed: %08x\n", hr); + WARN("GetBufferSize failed: %08lx\n", hr); goto exit; } hr = IAudioClient_GetCurrentPadding(device->client, &pad); if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); + WARN("GetCurrentPadding failed: %08lx\n", hr); goto exit; } @@ -1692,7 +1692,7 @@ static void WOD_PushData(WINMM_Device *device) hr = IAudioRenderClient_GetBuffer(device->render, avail_frames, &data); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); goto exit; } @@ -1746,7 +1746,7 @@ static void WOD_PushData(WINMM_Device *device) hr = IAudioRenderClient_ReleaseBuffer(device->render, avail_frames, 0); if(FAILED(hr)){ - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); goto exit; } @@ -1784,7 +1784,7 @@ static void WID_PullACMData(WINMM_Device *device) &flags, NULL, NULL); if(hr != S_OK){ if(FAILED(hr)) - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); return; } @@ -1819,7 +1819,7 @@ static void WID_PullACMData(WINMM_Device *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet); if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); device->played_frames += packet; } @@ -1892,7 +1892,7 @@ static void WID_PullData(WINMM_Device *device) &flags, NULL, NULL); if(hr != S_OK){ if(FAILED(hr)) - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); else /* AUDCLNT_S_BUFFER_EMPTY success code */ IAudioCaptureClient_ReleaseBuffer(device->capture, 0); goto exit; @@ -1923,7 +1923,7 @@ static void WID_PullData(WINMM_Device *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_len); if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); if(packet > 0) WARN("losing %u frames\n", packet); @@ -1959,7 +1959,7 @@ static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) hr = IAudioClient_Start(device->client); if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ device->stopped = TRUE; - WARN("Start failed: %08x\n", hr); + WARN("Start failed: %08lx\n", hr); return MMSYSERR_ERROR; } } @@ -1975,7 +1975,7 @@ static LRESULT WINMM_Pause(WINMM_Device *device) hr = IAudioClient_Stop(device->client); if(FAILED(hr)){ - WARN("Stop failed: %08x\n", hr); + WARN("Stop failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -2000,7 +2000,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) hr = IAudioClient_Stop(device->client); if(FAILED(hr)){ LeaveCriticalSection(&device->lock); - WARN("Stop failed: %08x\n", hr); + WARN("Stop failed: %08lx\n", hr); return MMSYSERR_ERROR; } device->stopped = TRUE; @@ -2123,7 +2123,7 @@ static MMRESULT WINMM_SetupMMDeviceVolume(WINMM_MMDevice *mmdevice) hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, &device); if(FAILED(hr)){ - WARN("Device %s (%s) unavailable: %08x\n", + WARN("Device %s (%s) unavailable: %08lx\n", wine_dbgstr_w(mmdevice->dev_id), wine_dbgstr_w(mmdevice->out_caps.szPname), hr); return MMSYSERR_ERROR; @@ -2132,7 +2132,7 @@ static MMRESULT WINMM_SetupMMDeviceVolume(WINMM_MMDevice *mmdevice) hr = IMMDevice_Activate(device, &IID_IAudioSessionManager, CLSCTX_INPROC_SERVER, NULL, (void**)&sesman); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); IMMDevice_Release(device); return MMSYSERR_ERROR; } @@ -2143,7 +2143,7 @@ static MMRESULT WINMM_SetupMMDeviceVolume(WINMM_MMDevice *mmdevice) FALSE, &mmdevice->volume); IAudioSessionManager_Release(sesman); if(FAILED(hr)){ - WARN("GetSimpleAudioVolume failed: %08x\n", hr); + WARN("GetSimpleAudioVolume failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -2186,7 +2186,7 @@ static LRESULT MXD_GetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_GetMasterVolume(mmdevice->volume, &vol); if(FAILED(hr)){ - WARN("GetMasterVolume failed: %08x\n", hr); + WARN("GetMasterVolume failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2205,7 +2205,7 @@ static LRESULT MXD_GetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_GetMute(mmdevice->volume, &mute); if(FAILED(hr)){ - WARN("GetMute failed: %08x\n", hr); + WARN("GetMute failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2269,7 +2269,7 @@ static LRESULT MXD_SetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_SetMasterVolume(mmdevice->volume, vol, NULL); if(FAILED(hr)){ - WARN("SetMasterVolume failed: %08x\n", hr); + WARN("SetMasterVolume failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2288,7 +2288,7 @@ static LRESULT MXD_SetControlDetails(WINMM_ControlDetails *details) hr = ISimpleAudioVolume_SetMute(mmdevice->volume, mute, NULL); if(FAILED(hr)){ - WARN("SetMute failed: %08x\n", hr); + WARN("SetMute failed: %08lx\n", hr); LeaveCriticalSection(&mmdevice->lock); return MMSYSERR_ERROR; } @@ -2342,13 +2342,13 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, &device); if(FAILED(hr)){ - WARN("Device %s unavailable: %08x\n", wine_dbgstr_w(mmdevice->dev_id), hr); + WARN("Device %s unavailable: %08lx\n", wine_dbgstr_w(mmdevice->dev_id), hr); return MMSYSERR_ERROR; } hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); + WARN("OpenPropertyStore failed: %08lx\n", hr); IMMDevice_Release(device); return MMSYSERR_ERROR; } @@ -2356,7 +2356,7 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) PropVariantInit(&pv); hr = IPropertyStore_GetValue(ps, &deviceinterface_key, &pv); if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); + WARN("GetValue failed: %08lx\n", hr); IPropertyStore_Release(ps); IMMDevice_Release(device); return MMSYSERR_ERROR; @@ -2449,7 +2449,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if(FAILED(hr)){ - WARN("CoInitializeEx failed: %08x\n", hr); + WARN("CoInitializeEx failed: %08lx\n", hr); FreeLibraryAndExitThread(g_devthread_module, 1); } @@ -2462,7 +2462,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_devenum); if(FAILED(hr)){ - WARN("CoCreateInstance failed: %08x\n", hr); + WARN("CoCreateInstance failed: %08lx\n", hr); CoUninitialize(); FreeLibraryAndExitThread(g_devthread_module, 1); } @@ -2470,7 +2470,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) g_devices_hwnd = CreateWindowW(L"Message", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); if(!g_devices_hwnd){ - WARN("CreateWindow failed: %d\n", GetLastError()); + WARN("CreateWindow failed: %ld\n", GetLastError()); CoUninitialize(); FreeLibraryAndExitThread(g_devthread_module, 1); } @@ -2499,7 +2499,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) else WID_PullData(device); }else - WARN("Unexpected MsgWait result 0x%x, GLE: %d\n", wait, + WARN("Unexpected MsgWait result 0x%lx, GLE: %ld\n", wait, GetLastError()); if(WINMM_DevicesThreadDone()){ TRACE("Quitting devices thread\n"); @@ -2603,7 +2603,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, WAVEOUTCAPSW wocW; UINT ret; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -2635,7 +2635,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, WAVEOUTCAPSW mapper_caps, *caps; HRESULT hr; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -2735,7 +2735,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, WINMM_OpenInfo info; WINMM_CBInfo cb_info; - TRACE("(%p, %u, %p, %lx, %lx, %08x)\n", lphWaveOut, uDeviceID, lpFormat, + TRACE("(%p, %u, %p, %Ix, %Ix, %08lx)\n", lphWaveOut, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); if(!lphWaveOut && !(dwFlags & WAVE_FORMAT_QUERY)) @@ -2864,7 +2864,7 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) return WAVERR_STILLPLAYING; } - TRACE("dwBufferLength: %u\n", header->dwBufferLength); + TRACE("dwBufferLength: %lu\n", header->dwBufferLength); if(device->acm_handle){ ACMSTREAMHEADER *ash = (ACMSTREAMHEADER*)header->reserved; @@ -3015,7 +3015,7 @@ UINT WINAPI waveOutGetPitch(HWAVEOUT hWaveOut, LPDWORD lpdw) */ UINT WINAPI waveOutSetPitch(HWAVEOUT hWaveOut, DWORD dw) { - TRACE("(%p, %08x)\n", hWaveOut, dw); + TRACE("(%p, %08lx)\n", hWaveOut, dw); return MMSYSERR_NOTSUPPORTED; } @@ -3035,7 +3035,7 @@ UINT WINAPI waveOutGetPlaybackRate(HWAVEOUT hWaveOut, LPDWORD lpdw) */ UINT WINAPI waveOutSetPlaybackRate(HWAVEOUT hWaveOut, DWORD dw) { - TRACE("(%p, %08x)\n", hWaveOut, dw); + TRACE("(%p, %08lx)\n", hWaveOut, dw); return MMSYSERR_NOTSUPPORTED; } @@ -3063,7 +3063,7 @@ UINT WINAPI waveOutGetVolume(HWAVEOUT hWaveOut, DWORD *out) hr = IAudioStreamVolume_GetChannelCount(device->volume, &channels); if(FAILED(hr)){ LeaveCriticalSection(&device->lock); - WARN("GetChannelCount failed: %08x\n", hr); + WARN("GetChannelCount failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3077,7 +3077,7 @@ UINT WINAPI waveOutGetVolume(HWAVEOUT hWaveOut, DWORD *out) if(FAILED(hr)){ LeaveCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, vols); - WARN("GetAllVolumes failed: %08x\n", hr); + WARN("GetAllVolumes failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3102,7 +3102,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) float *vols; HRESULT hr; - TRACE("(%p, %08x)\n", hWaveOut, in); + TRACE("(%p, %08lx)\n", hWaveOut, in); device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); @@ -3112,7 +3112,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) hr = IAudioStreamVolume_GetChannelCount(device->volume, &channels); if(FAILED(hr)){ LeaveCriticalSection(&device->lock); - WARN("GetChannelCount failed: %08x\n", hr); + WARN("GetChannelCount failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3126,7 +3126,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) if(FAILED(hr)){ LeaveCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, vols); - WARN("GetAllVolumes failed: %08x\n", hr); + WARN("GetAllVolumes failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3138,7 +3138,7 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) if(FAILED(hr)){ LeaveCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, vols); - WARN("SetAllVolumes failed: %08x\n", hr); + WARN("SetAllVolumes failed: %08lx\n", hr); return MMSYSERR_ERROR; } @@ -3255,7 +3255,7 @@ static UINT get_device_interface(UINT msg, BOOL is_out, UINT index, WCHAR *out, UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%p, %u, %lx, %lx)\n", hWaveOut, uMessage, dwParam1, dwParam2); + TRACE("(%p, %u, %Ix, %Ix)\n", hWaveOut, uMessage, dwParam1, dwParam2); switch(uMessage){ case DRV_QUERYFUNCTIONINSTANCEIDSIZE: @@ -3317,7 +3317,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi WAVEINCAPSW mapper_caps, *caps; HRESULT hr; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -3364,7 +3364,7 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi UINT ret; WAVEINCAPSW wicW; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3397,7 +3397,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, WINMM_OpenInfo info; WINMM_CBInfo cb_info; - TRACE("(%p, %x, %p, %lx, %lx, %08x)\n", lphWaveIn, uDeviceID, lpFormat, + TRACE("(%p, %x, %p, %Ix, %Ix, %08lx)\n", lphWaveIn, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); if(!lphWaveIn && !(dwFlags & WAVE_FORMAT_QUERY)) @@ -3661,7 +3661,7 @@ UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT* lpuDeviceID) UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%p, %u, %ld, %ld)\n", hWaveIn, uMessage, dwParam1, dwParam2); + TRACE("(%p, %u, %Id, %Id)\n", hWaveIn, uMessage, dwParam1, dwParam2); switch(uMessage){ case DRV_QUERYFUNCTIONINSTANCEIDSIZE: @@ -3722,7 +3722,7 @@ UINT WINAPI mixerGetDevCapsA(UINT_PTR uDeviceID, LPMIXERCAPSA lpCaps, UINT uSize MIXERCAPSW micW; UINT ret; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); if(!lpCaps) return MMSYSERR_INVALPARAM; @@ -3752,7 +3752,7 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize MIXERCAPSW caps; HRESULT hr; - TRACE("(%lu, %p, %u)\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u)\n", uDeviceID, lpCaps, uSize); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -3801,7 +3801,7 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, MMRESULT mr; HRESULT hr; - TRACE("(%p, %d, %lx, %lx, %x)\n", lphMix, uDeviceID, dwCallback, + TRACE("(%p, %d, %Ix, %Ix, %lx)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); hr = WINMM_InitMMDevices(); @@ -3851,7 +3851,7 @@ UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) WINMM_MMDevice *mmdevice; HRESULT hr; - TRACE("(%p, %p, %x)\n", hmix, lpid, fdwID); + TRACE("(%p, %p, %lx)\n", hmix, lpid, fdwID); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -3878,7 +3878,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW { WINMM_ControlDetails details; - TRACE("(%p, %p, %x)\n", hmix, lpmcdW, fdwDetails); + TRACE("(%p, %p, %lx)\n", hmix, lpmcdW, fdwDetails); if(!WINMM_StartDevicesThread()) return MMSYSERR_NODRIVER; @@ -3886,7 +3886,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW if(!lpmcdW || !lpmcdW->paDetails) return MMSYSERR_INVALPARAM; - TRACE("dwControlID: %u\n", lpmcdW->dwControlID); + TRACE("dwControlID: %lu\n", lpmcdW->dwControlID); details.hmix = hmix; details.details = lpmcdW; @@ -3904,7 +3904,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA { UINT ret = MMSYSERR_NOTSUPPORTED; - TRACE("(%p, %p, %08x)\n", hmix, lpmcdA, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hmix, lpmcdA, fdwDetails); if (lpmcdA == NULL || lpmcdA->cbStruct != sizeof(*lpmcdA)) return MMSYSERR_INVALPARAM; @@ -3949,7 +3949,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA } break; default: - WARN("Unsupported fdwDetails=0x%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=0x%08lx\n", fdwDetails); } return ret; @@ -3965,7 +3965,7 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, DWORD ret; unsigned int i; - TRACE("(%p, %p, %x)\n", hmix, lpmlcA, fdwControls); + TRACE("(%p, %p, %lx)\n", hmix, lpmlcA, fdwControls); if (lpmlcA == NULL || lpmlcA->cbStruct != sizeof(*lpmlcA) || lpmlcA->cbmxctrl != sizeof(MIXERCONTROLA)) @@ -4064,7 +4064,7 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, WINMM_MMDevice *mmdevice; HRESULT hr; - TRACE("(%p, %p, %08x)\n", hmix, lpmlcW, fdwControls); + TRACE("(%p, %p, %08lx)\n", hmix, lpmlcW, fdwControls); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -4075,16 +4075,16 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, MIXER_GETLINECONTROLSF_ONEBYTYPE | MIXER_OBJECTF_HMIXER | MIXER_OBJECTF_MIXER)){ - WARN("Unknown GetLineControls flag: %x\n", fdwControls); + WARN("Unknown GetLineControls flag: %lx\n", fdwControls); return MMSYSERR_INVALFLAG; } if(!lpmlcW || lpmlcW->cbStruct < sizeof(*lpmlcW) || !lpmlcW->pamxctrl) return MMSYSERR_INVALPARAM; - TRACE("dwLineID: %u\n", lpmlcW->dwLineID); - TRACE("dwControl: %x\n", lpmlcW->u.dwControlID); - TRACE("cControls: %u\n", lpmlcW->cControls); + TRACE("dwLineID: %lu\n", lpmlcW->dwLineID); + TRACE("dwControl: %lx\n", lpmlcW->u.dwControlID); + TRACE("cControls: %lu\n", lpmlcW->cControls); mmdevice = WINMM_GetMixerMMDevice(hmix, fdwControls, NULL); if(!mmdevice) @@ -4250,7 +4250,7 @@ static UINT WINMM_GetComponentTypeLineInfo(WINMM_MMDevice *mmdevice, return WINMM_GetSourceLineInfo(mmdevice, mmdev_index, info, flags); } - TRACE("Returning INVALLINE on this component type: %u\n", + TRACE("Returning INVALLINE on this component type: %lu\n", info->dwComponentType); return MIXERR_INVALLINE; @@ -4269,7 +4269,7 @@ static UINT WINMM_GetLineIDLineInfo(WINMM_MMDevice *mmdevice, return WINMM_GetSourceLineInfo(mmdevice, mmdev_index, info, flags); } - TRACE("Returning INVALLINE on this dwLineID: %u\n", info->dwLineID); + TRACE("Returning INVALLINE on this dwLineID: %lu\n", info->dwLineID); return MIXERR_INVALLINE; } @@ -4282,7 +4282,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo WINMM_MMDevice *mmdevice; HRESULT hr; - TRACE("(%p, %p, %x)\n", hmix, lpmliW, fdwInfo); + TRACE("(%p, %p, %lx)\n", hmix, lpmliW, fdwInfo); hr = WINMM_InitMMDevices(); if(FAILED(hr)) @@ -4291,11 +4291,11 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo if(!lpmliW || lpmliW->cbStruct < sizeof(MIXERLINEW)) return MMSYSERR_INVALPARAM; - TRACE("dwDestination: %u\n", lpmliW->dwDestination); - TRACE("dwSource: %u\n", lpmliW->dwSource); - TRACE("dwLineID: %u\n", lpmliW->dwLineID); - TRACE("fdwLine: 0x%x\n", lpmliW->fdwLine); - TRACE("dwComponentType: 0x%x\n", lpmliW->dwComponentType); + TRACE("dwDestination: %lu\n", lpmliW->dwDestination); + TRACE("dwSource: %lu\n", lpmliW->dwSource); + TRACE("dwLineID: %lu\n", lpmliW->dwLineID); + TRACE("fdwLine: 0x%lx\n", lpmliW->fdwLine); + TRACE("dwComponentType: 0x%lx\n", lpmliW->dwComponentType); if(fdwInfo & ~(MIXER_GETLINEINFOF_COMPONENTTYPE | MIXER_GETLINEINFOF_DESTINATION | @@ -4304,7 +4304,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo MIXER_GETLINEINFOF_TARGETTYPE | MIXER_OBJECTF_HMIXER | MIXER_OBJECTF_MIXER)){ - WARN("Unknown GetLineInfo flag: %x\n", fdwInfo); + WARN("Unknown GetLineInfo flag: %lx\n", fdwInfo); return MMSYSERR_INVALFLAG; } @@ -4330,7 +4330,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo return MIXERR_INVALLINE; } - TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo); + TRACE("Returning INVALFLAG on these flags: %lx\n", fdwInfo); return MMSYSERR_INVALFLAG; } @@ -4343,7 +4343,7 @@ UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix, LPMIXERLINEA lpmliA, MIXERLINEW mliW; UINT ret; - TRACE("(%p, %p, %x)\n", hmix, lpmliA, fdwInfo); + TRACE("(%p, %p, %lx)\n", hmix, lpmliA, fdwInfo); if (lpmliA == NULL || lpmliA->cbStruct != sizeof(*lpmliA)) return MMSYSERR_INVALPARAM; @@ -4371,7 +4371,7 @@ UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix, LPMIXERLINEA lpmliA, MultiByteToWideChar(CP_ACP, 0, lpmliA->Target.szPname, -1, mliW.Target.szPname, ARRAY_SIZE(mliW.Target.szPname)); break; default: - WARN("Unsupported fdwControls=0x%08x\n", fdwInfo); + WARN("Unsupported fdwControls=0x%08lx\n", fdwInfo); return MMSYSERR_INVALFLAG; } @@ -4412,7 +4412,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, WINMM_ControlDetails details; UINT ret; - TRACE("(%p, %p, %x)\n", hmix, lpmcd, fdwDetails); + TRACE("(%p, %p, %lx)\n", hmix, lpmcd, fdwDetails); if((fdwDetails & MIXER_SETCONTROLDETAILSF_QUERYMASK) == MIXER_SETCONTROLDETAILSF_CUSTOM) @@ -4424,7 +4424,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, if(!WINMM_StartDevicesThread()) return MMSYSERR_NODRIVER; - TRACE("dwControlID: %u\n", lpmcd->dwControlID); + TRACE("dwControlID: %lu\n", lpmcd->dwControlID); details.hmix = hmix; details.details = lpmcd; @@ -4441,7 +4441,7 @@ UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, */ DWORD WINAPI mixerMessage(HMIXER hmix, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%p, %d, %lx, %lx)\n", hmix, uMsg, dwParam1, dwParam2); + TRACE("(%p, %d, %Ix, %Ix)\n", hmix, uMsg, dwParam1, dwParam2); return MMSYSERR_NOTSUPPORTED; } diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index aa2dd50c4c1..31567d33c4f 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -136,7 +136,7 @@ const char* WINMM_ErrorToString(MMRESULT error) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -206,7 +206,7 @@ UINT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; - TRACE("(%04lX, %p, %d) !\n", uDeviceID, lpCaps, uSize); + TRACE("(%04IX, %p, %d) !\n", uDeviceID, lpCaps, uSize); if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -263,7 +263,7 @@ UINT WINAPI auxSetVolume(UINT uDeviceID, DWORD dwVolume) { LPWINE_MLD wmld; - TRACE("(%04X, %u) !\n", uDeviceID, dwVolume); + TRACE("(%04X, %lu) !\n", uDeviceID, dwVolume); if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -299,7 +299,7 @@ UINT WINAPI midiOutGetDevCapsW(UINT_PTR uDeviceID, LPMIDIOUTCAPSW lpCaps, { LPWINE_MLD wmld; - TRACE("(%lu, %p, %u);\n", uDeviceID, lpCaps, uSize); + TRACE("(%Iu, %p, %u);\n", uDeviceID, lpCaps, uSize); if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -425,7 +425,7 @@ MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, LPWINE_MIDI lpwm; MMRESULT dwRet; - TRACE("(%p, %d, %08lX, %08lX, %08X);\n", + TRACE("(%p, %d, %08IX, %08IX, %08lX);\n", lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiOut != NULL) *lphMidiOut = 0; @@ -513,7 +513,7 @@ UINT WINAPI midiOutShortMsg(HMIDIOUT hMidiOut, DWORD dwMsg) { LPWINE_MLD wmld; - TRACE("(%p, %08X)\n", hMidiOut, dwMsg); + TRACE("(%p, %08lX)\n", hMidiOut, dwMsg); if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -574,7 +574,7 @@ UINT WINAPI midiOutSetVolume(HMIDIOUT hMidiOut, DWORD dwVolume) { LPWINE_MLD wmld; - TRACE("(%p, %d);\n", hMidiOut, dwVolume); + TRACE("(%p, %ld);\n", hMidiOut, dwVolume); if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -628,7 +628,7 @@ UINT WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, { LPWINE_MLD wmld; - TRACE("(%p, %04X, %08lX, %08lX)\n", hMidiOut, uMessage, dwParam1, dwParam2); + TRACE("(%p, %04X, %08IX, %08IX)\n", hMidiOut, uMessage, dwParam1, dwParam2); if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, FALSE)) == NULL) { /* HACK... */ @@ -666,7 +666,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSi { LPWINE_MLD wmld; - TRACE("(%ld, %p, %d);\n", uDeviceID, lpCaps, uSize); + TRACE("(%Id, %p, %d);\n", uDeviceID, lpCaps, uSize); if (lpCaps == NULL) return MMSYSERR_INVALPARAM; @@ -711,7 +711,7 @@ MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, LPWINE_MIDI lpwm; MMRESULT dwRet; - TRACE("(%p, %d, %08lX, %08lX, %08X);\n", + TRACE("(%p, %d, %08IX, %08IX, %08lX);\n", lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiIn != NULL) *lphMidiIn = 0; @@ -881,7 +881,7 @@ UINT WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, { LPWINE_MLD wmld; - TRACE("(%p, %04X, %08lX, %08lX)\n", hMidiIn, uMessage, dwParam1, dwParam2); + TRACE("(%p, %04X, %08IX, %08IX)\n", hMidiIn, uMessage, dwParam1, dwParam2); if ((wmld = MMDRV_Get(hMidiIn, MMDRV_MIDIIN, FALSE)) == NULL) return MMSYSERR_INVALHANDLE; @@ -1129,7 +1129,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiStrm->dwStartTicks = timeGetTime(); lpMidiHdr = (LPMIDIHDR)msg->lParam; lpData = (LPBYTE)lpMidiHdr->lpData; - TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBytesRecorded=%u/%u dwFlags=0x%08x size=%lu]\n", + TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBytesRecorded=%lu/%lu dwFlags=0x%08lx size=%Iu]\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", lpMidiHdr, lpData, lpMidiHdr->dwBytesRecorded, lpMidiHdr->dwBufferLength, lpMidiHdr->dwFlags, msg->wParam); @@ -1155,7 +1155,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && ((LPMIDIEVENT)lpData)->dwStreamID != lpMidiStrm->dwStreamID) { - FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", + FIXME("Dropping bad %s lpMidiHdr (streamID=%08lx)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; @@ -1235,7 +1235,7 @@ start_header: dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; - TRACE("%u/%u/%u\n", dwToGo, timeGetTime(), me->dwDeltaTime); + TRACE("%lu/%lu/%lu\n", dwToGo, timeGetTime(), me->dwDeltaTime); while (dwToGo - (dwCurrTC = timeGetTime()) <= MAXLONG) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, dwToGo - dwCurrTC, QS_ALLINPUT) == WAIT_OBJECT_0) { /* got a message, handle it */ @@ -1368,7 +1368,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, LPWINE_MIDI lpwm; HMIDIOUT hMidiOut; - TRACE("(%p, %p, %d, 0x%08lx, 0x%08lx, 0x%08x)!\n", + TRACE("(%p, %p, %ld, 0x%08Ix, 0x%08Ix, 0x%08lx)!\n", lphMidiStrm, lpuDeviceID, cMidi, dwCallback, dwInstance, fdwOpen); if (cMidi != 1 || lphMidiStrm == NULL || lpuDeviceID == NULL) @@ -1496,7 +1496,7 @@ static MMRESULT midistream_post_message_and_wait(WINE_MIDIStream* lpMidiStrm, UI ret = WaitForMultipleObjects(ARRAY_SIZE(hObjects), hObjects, FALSE, INFINITE); if (ret != WAIT_OBJECT_0) { CloseHandle(hObjects[0]); - WARN("bad WaitForSingleObject (%u)\n", ret); + WARN("bad WaitForSingleObject (%lu)\n", ret); return MMSYSERR_ERROR; } } @@ -1562,7 +1562,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm pulses = midistream_get_current_pulse(lpMidiStrm); lpMMT->u.midi.songptrpos = (pulses + tdiv/8) / (tdiv/4); if (!lpMMT->u.midi.songptrpos && pulses) lpMMT->u.midi.songptrpos++; - TRACE("=> song position %d (pulses %u, tdiv %u)\n", lpMMT->u.midi.songptrpos, pulses, tdiv); + TRACE("=> song position %ld (pulses %lu, tdiv %lu)\n", lpMMT->u.midi.songptrpos, pulses, tdiv); break; } /* fall through */ @@ -1572,18 +1572,18 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm /* fall through to alternative format */ case TIME_MS: lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); - TRACE("=> %d ms\n", lpMMT->u.ms); + TRACE("=> %ld ms\n", lpMMT->u.ms); break; case TIME_TICKS: lpMMT->u.ticks = midistream_get_current_pulse(lpMidiStrm); - TRACE("=> %d ticks\n", lpMMT->u.ticks); + TRACE("=> %ld ticks\n", lpMMT->u.ticks); break; default: FIXME("Unsupported time type %x\n", lpMMT->wType); /* use TIME_MS instead */ lpMMT->wType = TIME_MS; lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); - TRACE("=> %d ms\n", lpMMT->u.ms); + TRACE("=> %ld ms\n", lpMMT->u.ms); break; } LeaveCriticalSection(&lpMidiStrm->lock); @@ -1599,7 +1599,7 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD WINE_MIDIStream* lpMidiStrm; MMRESULT ret = MMSYSERR_NOERROR; - TRACE("(%p, %p, %x)\n", hMidiStrm, lpPropData, dwProperty); + TRACE("(%p, %p, %lx)\n", hMidiStrm, lpPropData, dwProperty); if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) { ret = MMSYSERR_INVALHANDLE; @@ -1613,10 +1613,10 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { lpMidiStrm->dwTempo = mpt->dwTempo; - TRACE("Setting tempo to %d\n", mpt->dwTempo); + TRACE("Setting tempo to %ld\n", mpt->dwTempo); } else if (dwProperty & MIDIPROP_GET) { mpt->dwTempo = lpMidiStrm->dwTempo; - TRACE("Getting tempo <= %d\n", mpt->dwTempo); + TRACE("Getting tempo <= %ld\n", mpt->dwTempo); } LeaveCriticalSection(&lpMidiStrm->lock); } else if (dwProperty & MIDIPROP_TIMEDIV) { @@ -1628,14 +1628,14 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD EnterCriticalSection(&lpMidiStrm->lock); if (lpMidiStrm->status != MSM_STATUS_PLAYING) { lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; - TRACE("Setting time div to %d\n", mptd->dwTimeDiv); + TRACE("Setting time div to %ld\n", mptd->dwTimeDiv); } else ret = MMSYSERR_INVALPARAM; LeaveCriticalSection(&lpMidiStrm->lock); } else if (dwProperty & MIDIPROP_GET) { mptd->dwTimeDiv = lpMidiStrm->dwTimeDiv; - TRACE("Getting time div <= %d\n", mptd->dwTimeDiv); + TRACE("Getting time div <= %ld\n", mptd->dwTimeDiv); } } else { ret = MMSYSERR_INVALPARAM; -- 2.35.1

1 0

[PATCH v2] include/wine/test.h: fix winetest_argv[1] in case of single test
by Eric Pouech 22 Feb '22

22 Feb '22

Wine's test infrastructure allows to call ./wine <test>.exe without test name when only a single test is available in <test>.exe. Unfortunately, a lots of tests also rely on winetest_argv[1] to be the name of current test (esp. when respawning themselves to run sub processes). So, ensure wintest_argv is correctly populated in the case of a <test> containing a single test file and called without any argument on command line. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/test.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 599234b3519..bf6f5ad856f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -691,7 +691,11 @@ int main( int argc, char **argv ) if (!argv[1]) { if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */ + { + char* fake_argv[3] = {argv[0], strdup(winetest_testlist[0].name), NULL}; + winetest_argv = fake_argv; return run_test( winetest_testlist[0].name ); + } usage( argv[0] ); } if (!strcmp( argv[1], "--list" ))

1 0

[PATCH] dispex/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 22 Feb '22

22 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dispex/tests/Makefile.in | 1 - dlls/dispex/tests/marshal.c | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dispex/tests/Makefile.in b/dlls/dispex/tests/Makefile.in index ff65a40cbb0..e5ed0baf687 100644 --- a/dlls/dispex/tests/Makefile.in +++ b/dlls/dispex/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dispex.dll IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 99af7d8aea0..137d81b9d8d 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -31,8 +31,6 @@ #include "wine/test.h" -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) - #define RELEASEMARSHALDATA WM_USER struct host_object_data @@ -59,7 +57,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) IMessageFilter * prev_filter = NULL; hr = CoRegisterMessageFilter(data->filter, &prev_filter); if (prev_filter) IMessageFilter_Release(prev_filter); - ok_ole_success(hr, CoRegisterMessageFilter); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); } hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); @@ -132,7 +130,7 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M static void end_host_object(DWORD tid, HANDLE thread) { BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); - ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); + ok(ret, "PostThreadMessage failed with error %ld\n", GetLastError()); /* be careful of races - don't return until hosting thread has terminated */ WaitForSingleObject(thread, INFINITE); CloseHandle(thread); @@ -373,7 +371,7 @@ static void test_dispex(void) EXCEPINFO excepinfo; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); tid = start_host_object(stream, &IID_IDispatchEx, (IUnknown *)dispex, MSHLFLAGS_NORMAL, &thread); IDispatchEx_Release(dispex); if(tid == 0) @@ -384,7 +382,7 @@ static void test_dispex(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(stream, &IID_IDispatchEx, (void **)&dispex); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IStream_Release(stream); params.rgvarg = NULL; @@ -392,7 +390,7 @@ static void test_dispex(void) params.cArgs = 0; params.cNamedArgs = 0; hr = IDispatchEx_InvokeEx(dispex, 1, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); params.rgvarg = args; params.rgdispidNamedArgs = NULL; @@ -404,23 +402,23 @@ static void test_dispex(void) V_INTREF(&args[1]) = &i; i = 0xbeef; hr = IDispatchEx_InvokeEx(dispex, 2, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(i == 0xdead, "got %08x\n", i); /* change one of the argument vts */ i = 0xbeef; hr = IDispatchEx_InvokeEx(dispex, 3, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == DISP_E_BADCALLEE, "got %08x\n", hr); + ok(hr == DISP_E_BADCALLEE, "Unexpected hr %#lx.\n", hr); hr = IDispatchEx_InvokeEx(dispex, 4, LOCALE_SYSTEM_DEFAULT, 0xffff, &params, NULL, NULL, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); params.cArgs = 0; hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); - ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Unexpected hr %#lx.\n", hr); hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, &excepinfo, NULL); - ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr); - ok(excepinfo.scode == E_OUTOFMEMORY, "got scode %08x\n", excepinfo.scode); + ok(hr == DISP_E_EXCEPTION, "Unexpected hr %#lx.\n", hr); + ok(excepinfo.scode == E_OUTOFMEMORY, "got scode %#lx.\n", excepinfo.scode); ok(excepinfo.pfnDeferredFillIn == NULL, "got non-NULL pfnDeferredFillIn\n"); IDispatchEx_Release(dispex); -- 2.34.1

1 0

[PATCH 1/4] dinput: Avoid invalid rglDirection access when effect cAxes is 0.
by Rémi Bernon 22 Feb '22

22 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 00fd01b483a..80991e8c150 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2296,7 +2296,7 @@ static void convert_directions_to_spherical( const DIEFFECT *in, DIEFFECT *out ) tmp = atan2( in->rglDirection[i], tmp ); out->rglDirection[i - 1] = tmp * 18000 / M_PI; } - out->rglDirection[in->cAxes - 1] = 0; + if (in->cAxes) out->rglDirection[in->cAxes - 1] = 0; out->cAxes = in->cAxes; break; case DIEFF_POLAR: @@ -2306,7 +2306,8 @@ static void convert_directions_to_spherical( const DIEFFECT *in, DIEFFECT *out ) out->cAxes = in->cAxes; break; case DIEFF_SPHERICAL: - for (i = 0; i < in->cAxes - 1; ++i) + if (!in->cAxes) i = 0; + else for (i = 0; i < in->cAxes - 1; ++i) { out->rglDirection[i] = in->rglDirection[i] % 36000; if (out->rglDirection[i] < 0) out->rglDirection[i] += 36000; -- 2.34.1

1 3

[PATCH 8/8] combase: Start surrogate local server when required.
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20296 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/rpc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 0a86183030a..79f9b0d9c41 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -522,6 +522,50 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return S_OK; } +static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) +{ + HKEY key; + HRESULT hr; + WCHAR command[MAX_PATH + CHARS_IN_GUID]; + DWORD size; + STARTUPINFOW sinfo; + PROCESS_INFORMATION pinfo; + LONG ret; + + TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); + + hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); + if (FAILED(hr)) + return hr; + + size = (MAX_PATH + 1) * sizeof(WCHAR); + ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); + RegCloseKey(key); + if (ret || !size || !command[0]) + { + TRACE("No value for DllSurrogate key\n"); + wcscpy(command, L"dllhost.exe "); + } + + /* Surrogate EXE servers are started with the {GUID} switch. */ + StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); + + memset(&sinfo, 0, sizeof(sinfo)); + sinfo.cb = sizeof(sinfo); + + TRACE("Activating surrogate local server %s\n", debugstr_w(command)); + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + return HRESULT_FROM_WIN32(GetLastError()); + } + *process = pinfo.hProcess; + CloseHandle(pinfo.hThread); + + return S_OK; +} + HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) { PMInterfacePointer objref = NULL; @@ -546,7 +590,8 @@ HRESULT rpc_get_local_class_object(REFCLSID rclsid, REFIID riid, void **obj) if (tries == 1) { - if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) ) + if ((hr = create_local_service(rclsid)) && (hr = create_server(rclsid, &process)) && + (hr = create_surrogate_server(rclsid, &process)) ) return hr; } -- 2.35.1

1 0

[PATCH 7/8] dllhost: Periodically call CoFreeUnusedLibraries().
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 8baf5c7c371..2c4d30d2224 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -364,7 +364,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - WaitForSingleObject(surrogate.event, INFINITE); + while (WaitForSingleObject(surrogate.event, 30000) != WAIT_OBJECT_0) + CoFreeUnusedLibraries(); } cleanup: -- 2.35.1

1 0

[PATCH 6/8] dllhost: Implement IMarshal::MarshalInterface().
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index bcd56c1ad50..8baf5c7c371 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -164,9 +164,11 @@ static ULONG WINAPI marshal_Release(IMarshal *iface) static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx,%p): stub\n", iface, wine_dbgstr_guid(iid), pv, + TRACE("(%p,%s,%p,%08lx,%p,%08lx,%p)\n", iface, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags, clsid); - return E_NOTIMPL; + + *clsid = CLSID_StdMarshal; + return S_OK; } static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *pv, @@ -180,8 +182,19 @@ static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, voi static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) { - FIXME("(%p,%s,%p,%08lx,%p,%08lx): stub\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); - return E_NOTIMPL; + struct factory *factory = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("(%p,%s,%p,%08lx,%p,%08lx)\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); + + hr = CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, (void **)&object); + if (hr == S_OK) + { + hr = CoMarshalInterface(stream, iid, object, dwDestContext, pvDestContext, mshlflags); + IUnknown_Release(object); + } + return hr; } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, -- 2.35.1

1 0

[PATCH 5/8] Implement ISurrogate::FreeSurrogate().
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 635cac89d80..bcd56c1ad50 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -221,6 +221,7 @@ struct surrogate ISurrogate ISurrogate_iface; IClassFactory *factory; DWORD cookie; + HANDLE event; LONG ref; }; @@ -284,15 +285,35 @@ static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *cl if (hr != S_OK) IClassFactory_Release(&factory->IClassFactory_iface); else + { surrogate->factory = &factory->IClassFactory_iface; + surrogate->event = CreateEventW(NULL, FALSE, FALSE, NULL); + } return hr; } static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p)\n", iface); + + if (surrogate->cookie) + { + CoRevokeClassObject(surrogate->cookie); + surrogate->cookie = 0; + } + + if (surrogate->factory) + { + IClassFactory_Release(surrogate->factory); + surrogate->factory = NULL; + } + + SetEvent(surrogate->event); + + return S_OK; } static const ISurrogateVtbl Surrogate_Vtbl = @@ -313,6 +334,7 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho surrogate.ISurrogate_iface.lpVtbl = &Surrogate_Vtbl; surrogate.factory = NULL; surrogate.cookie = 0; + surrogate.event = NULL; surrogate.ref = 1; CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -329,8 +351,7 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho goto cleanup; } - /* FIXME: wait for FreeSurrogate being called */ - Sleep(INFINITE); + WaitForSingleObject(surrogate.event, INFINITE); } cleanup: -- 2.35.1

1 0

[PATCH 4/8] dllhost: Implement IClassFactory::CreateInstance().
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 55294efc880..635cac89d80 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -98,8 +98,14 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *punkouter, REFIID iid, void **ppv) { - FIXME("(%p,%p,%s,%p): stub\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); - return E_NOTIMPL; + struct factory *factory = impl_from_IClassFactory(iface); + + TRACE("(%p,%p,%s,%p)\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); + + if (punkouter) + return CLASS_E_NOAGGREGATION; + + return CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, ppv); } static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) -- 2.35.1

1 0

[PATCH 2/8] dllhost: Add ISurrogate stub implementation.
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/Makefile.in | 2 +- programs/dllhost/dllhost.c | 82 +++++++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in index a92add9c2f0..bca6c208cdc 100644 --- a/programs/dllhost/Makefile.in +++ b/programs/dllhost/Makefile.in @@ -1,5 +1,5 @@ MODULE = dllhost.exe -IMPORTS = ole32 +IMPORTS = ole32 uuid EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 10bfb084213..ac1cf0e3d33 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -18,6 +18,8 @@ #include <stdarg.h> +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <objbase.h> @@ -26,6 +28,73 @@ WINE_DEFAULT_DEBUG_CHANNEL(dllhost); +struct surrogate +{ + ISurrogate ISurrogate_iface; + LONG ref; +}; + +static inline struct surrogate *impl_from_ISurrogate(ISurrogate *iface) +{ + return CONTAINING_RECORD(iface, struct surrogate, ISurrogate_iface); +} + +static HRESULT WINAPI surrogate_QueryInterface(ISurrogate *iface, + REFIID iid, void **ppv) +{ + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p,%s,%p)\n", iface, wine_dbgstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_ISurrogate)) + { + ISurrogate_AddRef(&surrogate->ISurrogate_iface); + *ppv = &surrogate->ISurrogate_iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI surrogate_AddRef(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI surrogate_Release(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *clsid) +{ + FIXME("(%p,%s): stub\n", iface, wine_dbgstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static const ISurrogateVtbl Surrogate_Vtbl = +{ + surrogate_QueryInterface, + surrogate_AddRef, + surrogate_Release, + surrogate_LoadDllServer, + surrogate_FreeSurrogate +}; + +static struct surrogate surrogate = { { &Surrogate_Vtbl }, 0 }; + int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) { HRESULT hr; @@ -36,9 +105,20 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho hr = CLSIDFromString(cmdline, &clsid); if (hr == S_OK) { - FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + CoRegisterSurrogate(&surrogate.ISurrogate_iface); + + hr = ISurrogate_LoadDllServer(&surrogate.ISurrogate_iface, &clsid); + if (hr != S_OK) + { + ERR("Can't create instance of %s\n", wine_dbgstr_guid(&clsid)); + goto cleanup; + } + + /* FIXME: wait for FreeSurrogate being called */ + Sleep(INFINITE); } +cleanup: CoUninitialize(); return 0; -- 2.35.1

1 0

[PATCH 1/8] dllhost: Add stub implementation.
by Dmitry Timoshkov 22 Feb '22

22 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure | 2 ++ configure.ac | 1 + programs/dllhost/Makefile.in | 7 ++++++ programs/dllhost/dllhost.c | 45 ++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 programs/dllhost/Makefile.in create mode 100644 programs/dllhost/dllhost.c diff --git a/configure b/configure index 5dadd827dbd..30bb02edf67 100755 --- a/configure +++ b/configure @@ -1849,6 +1849,7 @@ enable_conhost enable_control enable_cscript enable_dism +enable_dllhost enable_dplaysvr enable_dpnsvr enable_dpvsetup @@ -22658,6 +22659,7 @@ wine_fn_config_makefile programs/conhost/tests enable_tests wine_fn_config_makefile programs/control enable_control wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism +wine_fn_config_makefile programs/dllhost enable_dllhost wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr wine_fn_config_makefile programs/dpvsetup enable_dpvsetup diff --git a/configure.ac b/configure.ac index e3d797d790d..194fe8df783 100644 --- a/configure.ac +++ b/configure.ac @@ -3549,6 +3549,7 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dllhost) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dpvsetup) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in new file mode 100644 index 00000000000..a92add9c2f0 --- /dev/null +++ b/programs/dllhost/Makefile.in @@ -0,0 +1,7 @@ +MODULE = dllhost.exe +IMPORTS = ole32 + +EXTRADLLFLAGS = -mwindows -municode + +C_SRCS = \ + dllhost.c diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c new file mode 100644 index 00000000000..10bfb084213 --- /dev/null +++ b/programs/dllhost/dllhost.c @@ -0,0 +1,45 @@ +/* + * Copyright 2022 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dllhost); + +int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) +{ + HRESULT hr; + CLSID clsid; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CLSIDFromString(cmdline, &clsid); + if (hr == S_OK) + { + FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + } + + CoUninitialize(); + + return 0; +} -- 2.35.1

1 0

[PATCH v3 1/5] winegstreamer: Remove \n at the end of GST log messages.
by Rémi Bernon 22 Feb '22

22 Feb '22

GStreamer already adds one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Avoid potential NULL pointer dereference. v2: * Refactor the error cleanup path so that the destroy function doesn't need to handle partially constructed transform. * Small tweaks to the code to make it terser and remove unnecessary variables. dlls/winegstreamer/wg_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a2e970a4dd..37da2d1e1c4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1443,7 +1443,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1472,7 +1472,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1493,7 +1493,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1503,7 +1503,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1527,7 +1527,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1538,7 +1538,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1566,7 +1566,7 @@ static void init_gstreamer_once(void) GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } @@ -1604,7 +1604,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering; - GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; } -- 2.34.1

1 4

[PATCH v2 1/5] winegstreamer: Remove \n at the end of GST log messages.
by Rémi Bernon 22 Feb '22

22 Feb '22

GStreamer already adds one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a2e970a4dd..37da2d1e1c4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1443,7 +1443,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1472,7 +1472,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1493,7 +1493,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1503,7 +1503,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1527,7 +1527,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1538,7 +1538,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1566,7 +1566,7 @@ static void init_gstreamer_once(void) GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } @@ -1604,7 +1604,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering; - GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; } -- 2.34.1

2 7

[PATCH] include/*: only use long types for cross-compilation
by Eric Pouech 22 Feb '22

22 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/bcrypt/gnutls.c | 4 ++-- include/ntdef.h | 2 +- include/windef.h | 4 ++-- include/winerror.h | 2 +- include/winnt.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e1b32be32a4..51ab8bb7d7d 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -688,7 +688,7 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ if (*pubkey_len < sizeof(*ecc_blob) + size * 2) { - FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*ecc_blob) + size * 2 ); + FIXME( "wrong pubkey len %u / %zu\n", *pubkey_len, sizeof(*ecc_blob) + size * 2 ); pgnutls_perror( ret ); free( x.data ); free( y.data ); return STATUS_BUFFER_TOO_SMALL; @@ -730,7 +730,7 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit if (*pubkey_len < sizeof(*dsa_blob) + bitlen / 8 * 3) { - FIXME( "wrong pubkey len %u / %lu\n", *pubkey_len, sizeof(*dsa_blob) + bitlen / 8 * 3 ); + FIXME( "wrong pubkey len %u / %zu\n", *pubkey_len, sizeof(*dsa_blob) + bitlen / 8 * 3 ); pgnutls_perror( ret ); free( p.data ); free( q.data ); free( g.data ); free( y.data ); return STATUS_NO_MEMORY; diff --git a/include/ntdef.h b/include/ntdef.h index 92366c3f3bb..3f4f5fbd026 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -55,7 +55,7 @@ typedef enum _WAIT_TYPE { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && defined(__WINE_PE_BUILD) typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; diff --git a/include/windef.h b/include/windef.h index cb7eb1179c8..b929774ed89 100644 --- a/include/windef.h +++ b/include/windef.h @@ -237,7 +237,7 @@ extern "C" { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && defined(__WINE_PE_BUILD) typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; @@ -253,7 +253,7 @@ typedef int INT, *PINT, *LPINT; typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; typedef char *PSZ; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && defined(__WINE_PE_BUILD) typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; #else diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..07ecb403ad3 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -89,7 +89,7 @@ #define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) > 0 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)(x) ) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && defined(__WINE_PE_BUILD) typedef long HRESULT; #else typedef int HRESULT; diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..4b2f1bbff31 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -467,7 +467,7 @@ typedef VOID *PVOID64; typedef BYTE BOOLEAN, *PBOOLEAN; typedef char CHAR, *PCHAR; typedef short SHORT, *PSHORT; -#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) && defined(__WINE_PE_BUILD) typedef long LONG, *PLONG; #else typedef int LONG, *PLONG;

1 0

[PATCH v2 2/2] winex11.drv: Call XIconifyWindow() after XMapWindow() for minimized windows.
by Zhiyi Zhang 22 Feb '22

22 Feb '22

Mutter always unminimizes a window when handling map requests. So a window could be in normal state as far as Mutter concerns while Wine mistakenly considers it still minimized. Fix Disgaea PC black screen after Alt+Tab in fullscreen mode. Also see https://gitlab.gnome.org/GNOME/mutter/-/blob/main/src/x11/events.c#L1525 for how map requests are handled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 1 - dlls/winex11.drv/window.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dcd84d0202d..770540c73c9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7714,7 +7714,6 @@ static void test_ShowWindow(HWND hwnd_main) /* The window rectangle of hwndMain is (100, 100, 200, 200). If the window manager unminimizes * hwnd, hwnd will end up obscuring hwndMain. Mutter is such a window manager that unminimizes * windows when handling map requests and thus can demonstrate this bug */ - todo_wine_if(color != 0xffffff) ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); ReleaseDC(0, hdc); DestroyWindow(hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 36fb41ac710..7ccb139ba5d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1129,6 +1129,9 @@ static void map_window( HWND hwnd, DWORD new_style ) update_net_wm_states( data ); sync_window_style( data ); XMapWindow( data->display, data->whole_window ); + /* Mutter always unminimizes windows when handling map requests. Restore iconic state */ + if (new_style & WS_MINIMIZE) + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); XFlush( data->display ); if (data->surface && data->vis.visualid != default_visual.visualid) data->surface->funcs->flush( data->surface ); @@ -2528,9 +2531,17 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->iconic = (new_style & WS_MINIMIZE) != 0; TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); if (data->iconic) + { XIconifyWindow( data->display, data->whole_window, data->vis.screen ); + } else if (is_window_rect_mapped( rectWindow )) + { + /* whole_window could be both iconic and mapped. Since XMapWindow() doesn't do + * anything if the window is already mapped, we need to unmap it first */ + if (data->mapped) + XUnmapWindow( data->display, data->whole_window ); XMapWindow( data->display, data->whole_window ); + } update_net_wm_states( data ); } else -- 2.32.0

2 2

[PATCH] atlthunk/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 22 Feb '22

22 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/atlthunk/tests/Makefile.in | 1 - dlls/atlthunk/tests/atlthunk.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/atlthunk/tests/Makefile.in b/dlls/atlthunk/tests/Makefile.in index 1927af38900..9da3a9696ad 100644 --- a/dlls/atlthunk/tests/Makefile.in +++ b/dlls/atlthunk/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = atlthunk.dll IMPORTS = atlthunk diff --git a/dlls/atlthunk/tests/atlthunk.c b/dlls/atlthunk/tests/atlthunk.c index b316ae1eae1..ca719e0836a 100644 --- a/dlls/atlthunk/tests/atlthunk.c +++ b/dlls/atlthunk/tests/atlthunk.c @@ -23,8 +23,8 @@ static LRESULT WINAPI test_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { ok(msg == 1, "msg = %u\n", msg); - ok(wparam == 2, "wparam = %lu\n", wparam); - ok(lparam == 3, "lparam = %lu\n", lparam); + ok(wparam == 2, "wparam = %Id\n", wparam); + ok(lparam == 3, "lparam = %Id\n", lparam); return (LRESULT)hwnd | 0x1000; } @@ -49,7 +49,7 @@ static void test_thunk_proc(void) ok(thunk_proc != NULL, "thunk_proc = NULL\n"); res = thunk_proc((HWND)0x1234, 1, 2, 3); - ok(res == (i | 0x1000), "res = %lu\n", res); + ok(res == (i | 0x1000), "res = %Iu\n", res); } for(i=0; i < ARRAY_SIZE(thunks); i++) -- 2.34.1

1 0

[PATCH] browseui/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 22 Feb '22

22 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/browseui/tests/Makefile.in | 1 - dlls/browseui/tests/autocomplete.c | 85 +++++++++++++++--------------- dlls/browseui/tests/progressdlg.c | 15 +++--- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in index 61c86018ab2..70de3ab4785 100644 --- a/dlls/browseui/tests/Makefile.in +++ b/dlls/browseui/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = browseui.dll IMPORTS = ole32 diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 5ff274da729..ff1033fc6ff 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -34,7 +34,7 @@ { \ HRESULT res = (exp); \ if (res != S_OK) \ - ok(FALSE, #exp " failed: %x\n", res); \ + ok(FALSE, #exp " failed: %#lx\n", res); \ } static LPWSTR strdup_AtoW(LPCSTR str) @@ -86,7 +86,7 @@ static TestACL *TestACL_Constructor(int limit, const char **strings) static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) { TestACL *This = impl_from_IEnumString(iface); - trace("ACL(%p): addref (%d)\n", This, This->ref+1); + trace("ACL(%p): addref (%ld)\n", This, This->ref+1); return InterlockedIncrement(&This->ref); } @@ -96,7 +96,7 @@ static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) ULONG res; res = InterlockedDecrement(&This->ref); - trace("ACL(%p): release (%d)\n", This, res); + trace("ACL(%p): release (%ld)\n", This, res); return res; } @@ -129,7 +129,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LP TestACL *This = impl_from_IEnumString(iface); ULONG i; - trace("ACL(%p): read %d item(s)\n", This, celt); + trace("ACL(%p): read %ld item(s)\n", This, celt); for (i = 0; i < celt; i++) { if (This->pos >= This->limit) @@ -215,14 +215,11 @@ IACListVtbl TestACL_ACListVtbl = #define expect_str(obj, str) \ { \ ole_ok(IEnumString_Next(obj, 1, &wstr, &i)); \ - ok(i == 1, "Expected i == 1, got %d\n", i); \ + ok(i == 1, "Expected i == 1, got %ld\n", i); \ ok(str[0] == wstr[0], "String mismatch\n"); \ CoTaskMemFree(wstr); \ } -#define expect_end(obj) \ - ok(IEnumString_Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n"); - static void test_ACLMulti(void) { const char *strings1[] = {"a", "c", "e"}; @@ -236,122 +233,124 @@ static void test_ACLMulti(void) IObjMgr *mgr; LPWSTR wstr; LPWSTR wstrtab[15]; + ULONG ref, i; LPVOID tmp; - ULONG ref; - UINT i; hr = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC, &IID_IEnumString, (void**)&obj); - ok(hr == S_OK, "failed to create ACLMulti instance, 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr != S_OK) return; hr = IEnumString_QueryInterface(obj, &IID_IACList, (void**)&acl); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(obj, &IID_IACList2, &tmp); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(obj, &IID_IObjMgr, (void**)&mgr); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); if (hr == E_NOINTERFACE) todo_wine win_skip("IEnumACString is not supported, skipping tests\n"); else { - ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (unk != NULL) IEnumACString_Release(unk); } i = -1; hr = IEnumString_Next(obj, 1, (LPOLESTR *)&tmp, &i); - ok(hr == S_FALSE, "got 0x%08x\n", hr); - ok(i == 0, "Unexpected fetched value %d\n", i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + ok(i == 0, "Unexpected fetched value %ld\n", i); hr = IEnumString_Next(obj, 44, (LPOLESTR *)&tmp, &i); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Skip(obj, 1); - ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Clone(obj, (IEnumString **)&tmp); - ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY, "Unexpected hr %#lx.\n", hr); hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); acl1 = TestACL_Constructor(3, strings1); acl2 = TestACL_Constructor(3, strings2); hr = IObjMgr_Append(mgr, (IUnknown *)&acl1->IACList_iface); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IObjMgr_Append(mgr, (IUnknown *)&acl2->IACList_iface); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IObjMgr_Append(mgr, NULL); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); expect_str(obj, "a"); expect_str(obj, "c"); expect_str(obj, "e"); expect_str(obj, "a"); expect_str(obj, "b"); expect_str(obj, "d"); - expect_end(obj); + hr = IEnumString_Next(obj, 1, &wstr, &i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Reset(obj); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->pos == 0, "acl1 not reset\n"); ok(acl2->pos == 0, "acl2 not reset\n"); hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 1, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 1 /* Vista */, "expcount - expected 0 or 1, got %d\n", acl2->expcount); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(i == 1, "Expected i == 1, got %d\n", i); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(i == 1, "Expected i == 1, got %ld\n", i); CoTaskMemFree(wstrtab[0]); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CoTaskMemFree(wstrtab[0]); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CoTaskMemFree(wstrtab[0]); hr = IEnumString_Next(obj, 15, wstrtab, &i); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CoTaskMemFree(wstrtab[0]); hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */, "expcount - expected 0 or 2, got %d\n", acl2->expcount); acl1->expret = S_FALSE; hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 1 /* XP */ || acl2->expcount == 3 /* Vista */, "expcount - expected 0 or 3, got %d\n", acl2->expcount); acl1->expret = E_NOTIMPL; hr = IACList_Expand(acl, exp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 2 /* XP */ || acl2->expcount == 4 /* Vista */, "expcount - expected 0 or 4, got %d\n", acl2->expcount); acl2->expret = E_OUTOFMEMORY; hr = IACList_Expand(acl, exp); - ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY, "Unexpected hr %#lx.\n", hr); acl2->expret = E_FAIL; hr = IACList_Expand(acl, exp); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); hr = IObjMgr_Remove(mgr, (IUnknown *)&acl1->IACList_iface); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(acl1->ref == 1, "acl1 not released\n"); - expect_end(obj); + hr = IEnumString_Next(obj, 1, &wstr, &i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); IEnumString_Reset(obj); expect_str(obj, "a"); expect_str(obj, "b"); expect_str(obj, "d"); - expect_end(obj); + hr = IEnumString_Next(obj, 1, &wstr, &i); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); IEnumString_Release(obj); IACList_Release(acl); @@ -371,13 +370,13 @@ static void test_ACListISF(void) HRESULT hr; hr = CoCreateInstance(&CLSID_ACListISF, NULL, CLSCTX_INPROC, &IID_IACList, (void**)&list); - ok(hr == S_OK, "failed to create ACListISF instance, 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IACList_QueryInterface(list, &IID_IEnumString, (void**)&enumstring); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_QueryInterface(enumstring, &IID_IACList, (void**)&list2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(list == list2, "got %p, %p\n", list, list2); IACList_Release(list2); diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c index 22037141d60..c8dec007ff1 100644 --- a/dlls/browseui/tests/progressdlg.c +++ b/dlls/browseui/tests/progressdlg.c @@ -33,26 +33,27 @@ static void test_IProgressDialog_QueryInterface(void) IUnknown *unk; HRESULT hr; - hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void*)&dlg); - if (FAILED(hr)) { - win_skip("CoCreateInstance for IProgressDialog returned 0x%x\n", hr); + hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void **)&dlg); + if (FAILED(hr)) + { + win_skip("ProgressDialog is not supported, hr %#lx.\n", hr); return; } hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IProgressDialog_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { IUnknown_Release(unk); } hr = IProgressDialog_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); - ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { hr = IOleWindow_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); - ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { IProgressDialog_Release(dlg2); } -- 2.34.1

1 0

[PATCH 1/2] user32/tests: Test clicking taskbar icons of minimized windows.
by Zhiyi Zhang 22 Feb '22

22 Feb '22

When a minimized window doesn't handle WM_SYSCOMMAND SC_RESTORE messages, the window should remain minimized when its taskbar icon gets clicked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 77 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f0e0d0fba76..3c4cb084d8e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18735,6 +18735,82 @@ static void test_button_style(void) } } +static BOOL sc_restore_received; + +static LRESULT CALLBACK test_taskbar_msg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_SYSCOMMAND && wp == SC_RESTORE) + { + sc_restore_received = TRUE; + return 0; + } + + return DefWindowProcA(hwnd, msg, wp, lp); +} + +static void test_taskbar_messages(void) +{ + HWND hwnd, background; + int timeout = 0; + COLORREF color; + WNDCLASSA cls; + HDC hdc; + + if (!winetest_interactive) + return; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = DefWindowProcA; + cls.hInstance = GetModuleHandleA(NULL); + cls.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "test_taskbar_background_class"; + RegisterClassA(&cls); + + cls.lpfnWndProc = test_taskbar_msg_proc; + cls.hbrBackground = GetStockObject(GRAY_BRUSH); + cls.lpszClassName = "test_taskbar_class"; + RegisterClassA(&cls); + + background = CreateWindowA("test_taskbar_background_class", "background", WS_POPUP | WS_VISIBLE, + 100, 100, 200, 200, NULL, NULL, NULL, NULL); + ok(background != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + hwnd = CreateWindowA("test_taskbar_class", "test", WS_POPUP, 100, 100, 200, 200, NULL, NULL, NULL, + NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + ShowWindow(hwnd, SW_SHOWMINIMIZED); + flush_events(); + + trace("Click the taskbar icon of the test window within 5 seconds.\n"); + while (!sc_restore_received && timeout < 5000) + { + flush_events(); + timeout += 200; + } + ok(timeout < 5000 && sc_restore_received, "Didn't receive clicks on the taskbar icon.\n"); + + /* Desktop pixels may take a while to update */ + timeout = 0; + hdc = GetDC(0); + color = GetPixel(hdc, 150, 150); + while (color != 0xffffff && timeout < 1000) + { + flush_events(); + timeout += 200; + color = GetPixel(hdc, 150, 150); + } + /* The background window rectangle is (100, 100, 200, 200). If hwnd gets unminimized, it will + * end up obscuring the background window. */ + todo_wine_if(color != 0xffffff) + ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); + + ReleaseDC(0, hdc); + DestroyWindow(hwnd); + DestroyWindow(background); + UnregisterClassA("test_taskbar_class", GetModuleHandleA(NULL)); + UnregisterClassA("test_taskbar_background_class", GetModuleHandleA(NULL)); +} + START_TEST(msg) { char **test_argv; @@ -18860,6 +18936,7 @@ START_TEST(msg) test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); test_DoubleSetCapture(); + test_taskbar_messages(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */ -- 2.32.0

2 1

[v2 PATCH 1/2] comctl32/listview: Send change notifications when inserting (LVIS_SELECTED|LVIS_FOCUSED) items.
by Nikolay Sivov 22 Feb '22

22 Feb '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 22 +++++++++++++--------- dlls/comctl32/tests/listview.c | 6 +++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd7fec28e27..d8abd8236eb 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4200,6 +4200,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL LVITEMW item; /* stateMask is ignored for LVM_INSERTITEM */ UINT stateMask = isNew ? ~0 : lpLVItem->stateMask; + BOOL send_change_notification; TRACE("()\n"); @@ -4260,11 +4261,16 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; - /* Send LVN_ITEMCHANGING notification, if the item is not being inserted + /* Send change notification if the item is not being inserted, or inserted (selected|focused), and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications - are enabled. Even nothing really changed we still need to send this, + are enabled. Even if nothing really changed we still need to send this, in this case uChanged mask is just set to passed item mask. */ - if (lpItem && !isNew && (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE)) + + send_change_notification = !isNew; + send_change_notification |= (uChanged & LVIF_STATE) && (lpLVItem->state & (LVIS_FOCUSED | LVIS_SELECTED)); + send_change_notification &= !!(infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE); + + if (lpItem && send_change_notification) { HWND hwndSelf = infoPtr->hwndSelf; @@ -4352,13 +4358,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL } } - /* if we're inserting the item, we're done */ - if (isNew) return TRUE; - - /* send LVN_ITEMCHANGED notification */ - if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; - if (infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE) + if (send_change_notification) + { + if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4c2dd534dbd..92e11685331 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6023,7 +6023,7 @@ static void test_LVM_INSERTITEM(void) if ((insert_item[i].mask & LVIF_STATE) && (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED))) { sprintf(buf, "%d: insert focused", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, insert_item[i].mask != LVIF_STATE); } else { @@ -6060,7 +6060,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -6073,7 +6073,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); -- 2.34.1

1 1

[PATCH 2/2] winex11.drv: Restore iconic state if a window doesn't want to be restored.
by Zhiyi Zhang 22 Feb '22

22 Feb '22

Fix Excel 2007 and 2010 showing small black windows after clicking their taskbar icons when opening multiple documents in one instance. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 1 - dlls/winex11.drv/event.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3c4cb084d8e..f2a9c2c2f4a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18801,7 +18801,6 @@ static void test_taskbar_messages(void) } /* The background window rectangle is (100, 100, 200, 200). If hwnd gets unminimized, it will * end up obscuring the background window. */ - todo_wine_if(color != 0xffffff) ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); ReleaseDC(0, hdc); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..0e963f6e399 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1314,6 +1314,12 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + /* The window doesn't want to unminimize, restore iconic state */ + if (GetWindowLongW( data->hwnd, GWL_STYLE ) & WS_MINIMIZE) + { + data->iconic = TRUE; + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); + } return; } TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); -- 2.32.0

1 0

[PATCH v2 1/2] user32/tests: Test that ShowWindow(SW_SHOWMINIMIZED) shouldn't make a window visible.
by Zhiyi Zhang 22 Feb '22

22 Feb '22

This bug can be triggered on Mutter because it unminimizes windows when handling map requests. Also see https://gitlab.gnome.org/GNOME/mutter/-/blob/main/src/x11/events.c#L1525 for how map requests are handled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d6087873f21..dcd84d0202d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7413,7 +7413,7 @@ static void test_set_window_style(void) UnregisterClassA(cls.lpszClassName, cls.hInstance); } -static void test_ShowWindow(void) +static void test_ShowWindow(HWND hwnd_main) { HWND hwnd; DWORD style; @@ -7421,6 +7421,9 @@ static void test_ShowWindow(void) LPARAM ret; MONITORINFO mon_info; unsigned int i; + int timeout = 0; + COLORREF color; + HDC hdc; DWORD test_style[] = { @@ -7693,6 +7696,29 @@ static void test_ShowWindow(void) flush_events(TRUE); + /* Test SW_SHOWMINIMIZED shouldn't restore windows from minimized state */ + hwnd = CreateWindowA("static", "test", WS_POPUP, 100, 100, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + ShowWindow(hwnd, SW_SHOWMINIMIZED); + flush_events(TRUE); + + hdc = GetDC(0); + color = GetPixel(hdc, 150, 150); + /* Desktop pixels may take a while to update */ + while (color != 0xffffff && timeout < 1000) + { + Sleep(100); + timeout += 100; + color = GetPixel(hdc, 150, 150); + } + /* The window rectangle of hwndMain is (100, 100, 200, 200). If the window manager unminimizes + * hwnd, hwnd will end up obscuring hwndMain. Mutter is such a window manager that unminimizes + * windows when handling map requests and thus can demonstrate this bug */ + todo_wine_if(color != 0xffffff) + ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); + ReleaseDC(0, hdc); + DestroyWindow(hwnd); + /* test maximize and restore windows without setting WS_CAPTION */ for (i = 0; i < ARRAY_SIZE(test_style); ++i) @@ -13132,7 +13158,7 @@ START_TEST(win) test_csparentdc(); test_SetWindowLong(); test_set_window_style(); - test_ShowWindow(); + test_ShowWindow(hwndMain); test_ShowWindow_owned(hwndMain); test_ShowWindow_child(hwndMain); test_ShowWindow_mdichild(hwndMain); -- 2.32.0

1 0

[PATCH 0/4] Fix LVN_ODSTATECHANGED handling.
by Angelo Haller 22 Feb '22

22 Feb '22

From: Angelo Haller <angelo(a)szanni.org> Warning: I have had access to the Windows Research Kernel (WRK) 1.2 ~10 years ago. These changes are regarding comctrl32 which is NOT part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this should therefore satisfy the requirement of ONLY submitting patches to components I have NOT had access to. Angelo Haller (4): comctl32/listview: Move LVN_ODSTATECHANGED notification to function. comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists. comctl32/listview: Send LVN_ODSTATECHANGED notification. comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges. dlls/comctl32/listview.c | 59 ++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 12 deletions(-) Signed-off-by: Angelo Haller <angelo(a)szanni.org> -- 2.35.1

2 9

[PATCH 1/4] quartz/tests: Reset sink event counters when initializing the stream.
by Zebediah Figura 22 Feb '22

22 Feb '22

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Should hopefully fix some intermittent test failures caused by receiving EOS events inside of test_filter_state(). dlls/quartz/tests/avisplit.c | 13 +++++++++++-- dlls/quartz/tests/mpegsplit.c | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 06c2f5fed3c..f295c074d5a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -836,10 +836,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) strmbase_filter_cleanup(&filter->filter); } +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, }; static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1689,7 +1700,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1716,7 +1726,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 0809c5f861f..5a9efe84551 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1125,10 +1125,21 @@ static void testfilter_destroy(struct strmbase_filter *iface) CloseHandle(filter->eos_event); } +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->new_segment_count = 0; + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; +} + static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, }; static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -1842,7 +1853,6 @@ static void test_streaming(void) ok(WaitForSingleObject(testsink.eos_event, 100) == WAIT_TIMEOUT, "Got more than one EOS.\n"); ok(testsink.sample_count, "Expected at least one sample.\n"); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); @@ -1869,7 +1879,6 @@ static void test_streaming(void) ok(start == testsink.seek_start, "Expected start position %I64u, got %I64u.\n", testsink.seek_start, start); ok(end == testsink.seek_end, "Expected end position %I64u, got %I64u.\n", testsink.seek_end, end); - testsink.sample_count = testsink.eos_count = 0; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); -- 2.35.1

1 3

[PATCH 1/5] winegstreamer: Remove \n at the end of GST log messages.
by Rémi Bernon 22 Feb '22

22 Feb '22

GStreamer already adds one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a2e970a4dd..37da2d1e1c4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1443,7 +1443,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1472,7 +1472,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; } @@ -1493,7 +1493,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1503,7 +1503,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1527,7 +1527,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; } @@ -1538,7 +1538,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1566,7 +1566,7 @@ static void init_gstreamer_once(void) GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); - GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } @@ -1604,7 +1604,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering; - GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; } -- 2.34.1

2 7

[PATCH 4/4] dmusic: Forward GetFormat() to the corresponding synth & sink methods
by Michael Stefaniuc 21 Feb '22

21 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 59 ++++++++++---------------------------- dlls/dmusic/tests/dmusic.c | 21 ++++++++++++++ 2 files changed, 36 insertions(+), 44 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index d593d739a9e..8549c62c4b1 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -510,50 +510,21 @@ static HRESULT WINAPI synth_port_SetDirectSound(IDirectMusicPort *iface, IDirect return S_OK; } -static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *pWaveFormatEx, - DWORD *pdwWaveFormatExSize, DWORD *pdwBufferSize) -{ - struct synth_port *This = synth_from_IDirectMusicPort(iface); - WAVEFORMATEX format; - FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize); - - if (pWaveFormatEx == NULL) - { - if (pdwWaveFormatExSize) - *pdwWaveFormatExSize = sizeof(format); - else - return E_POINTER; - } - else - { - if (pdwWaveFormatExSize == NULL) - return E_POINTER; - - /* Just fill this in with something that will not crash Direct Sound for now. */ - /* It won't be used anyway until Performances are completed */ - format.wFormatTag = WAVE_FORMAT_PCM; - format.nChannels = 2; /* This->params.dwAudioChannels; */ - format.nSamplesPerSec = 44100; /* This->params.dwSampleRate; */ - format.wBitsPerSample = 16; /* FIXME: check this */ - format.nBlockAlign = (format.wBitsPerSample * format.nChannels) / 8; - format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; - format.cbSize = 0; - - if (*pdwWaveFormatExSize >= sizeof(format)) - { - CopyMemory(pWaveFormatEx, &format, min(sizeof(format), *pdwWaveFormatExSize)); - *pdwWaveFormatExSize = sizeof(format); /* FIXME check if this is set */ - } - else - return E_POINTER; /* FIXME find right error */ - } - - if (pdwBufferSize) - *pdwBufferSize = 44100 * 2 * 2; - else - return E_POINTER; - - return S_OK; +static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *format, + DWORD *fmtsize, DWORD *bufsize) +{ + struct synth_port *This = synth_from_IDirectMusicPort(iface); + HRESULT hr; + + TRACE("(%p, %p, %p, %p)\n", This, format, fmtsize, bufsize); + + if (FAILED(hr = IDirectMusicSynth_GetFormat(This->synth, format, fmtsize))) + return hr; + + if (bufsize) + hr = IDirectMusicSynthSink_GetDesiredBufferSize(This->synth_sink, bufsize); + + return hr; } static const IDirectMusicPortVtbl synth_port_vtbl = { diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index d8fc6affd9b..37b517fe0ca 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -877,6 +877,9 @@ static void test_synthport(void) IDirectMusicPort *port; DMUS_BUFFERDESC desc; DMUS_PORTCAPS caps; + WAVEFORMATEX fmt; + DWORD fmtsize, bufsize; + HRESULT hr; port = create_synth_port(&dmusic); @@ -922,6 +925,24 @@ static void test_synthport(void) ok(caps.dwEffectFlags == DMUS_EFFECT_REVERB, "Unexpected dwEffectFlags returned: %#lx\n", caps.dwEffectFlags); trace("Port wszDescription: %s\n", wine_dbgstr_w(caps.wszDescription)); + /* GetFormat */ + hr = IDirectMusicPort_GetFormat(port, NULL, NULL, NULL); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, NULL, &fmtsize, NULL); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(fmtsize == sizeof(fmt), "format size; %ld\n", fmtsize); + fmtsize = 0; + hr = IDirectMusicPort_GetFormat(port, &fmt, &fmtsize, NULL); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(fmtsize == sizeof(fmt), "format size; %ld\n", fmtsize); + hr = IDirectMusicPort_GetFormat(port, NULL, NULL, &bufsize); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, NULL, &fmtsize, &bufsize); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicPort_GetFormat(port, &fmt, &fmtsize, &bufsize); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(bufsize == fmt.nSamplesPerSec * fmt.nChannels * 4, "buffer size: %ld\n", bufsize); + IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); } -- 2.34.1

1 0

[PATCH 3/4] dmsynth: Implement the sink GetDesiredBufferSize method
by Michael Stefaniuc 21 Feb '22

21 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synthsink.c | 15 +++++++++++++-- dlls/dmsynth/tests/dmsynth.c | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index fe578086a23..d34bcf9df5e 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -180,11 +180,22 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetDirectSound(IDirectMusicSynth } static HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize(IDirectMusicSynthSink *iface, - DWORD *buffer_size_in_samples) + DWORD *size) { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); + WAVEFORMATEX format; + DWORD fmtsize = sizeof(format); - FIXME("(%p)->(%p): stub\n", This, buffer_size_in_samples); + TRACE("(%p, %p)\n", This, size); + + if (!size) + return E_POINTER; + if (!This->synth) + return DMUS_E_SYNTHNOTCONFIGURED; + + if (FAILED(IDirectMusicSynth_GetFormat(This->synth, &format, &fmtsize))) + return E_UNEXPECTED; + *size = format.nSamplesPerSec * format.nChannels * 4; return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index ab3349f666b..a8bf65cd73e 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -149,6 +149,8 @@ static void test_dmsynth(void) /* Synth isn't fully initialized yet */ hr = IDirectMusicSynth_Activate(dmsynth, TRUE); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == DMUS_E_SYNTHNOTCONFIGURED, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); /* Open / Close */ hr = IDirectMusicSynth_Open(dmsynth, NULL); @@ -274,6 +276,28 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_GetFormat(dmsynth, &format, &size); ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + IDirectMusicSynth_Close(dmsynth); + + /* GetDesiredBufferSize */ + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, NULL); + ok(hr == E_POINTER, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == E_UNEXPECTED, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + params.dwValidParams = 0; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == S_OK, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + ok(size == params.dwSampleRate * params.dwAudioChannels * 4, "size: %ld\n", size); + IDirectMusicSynth_Close(dmsynth); + params.dwValidParams = DMUS_PORTPARAMS_AUDIOCHANNELS; + params.dwAudioChannels = 1; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynthSink_GetDesiredBufferSize(dmsynth_sink, &size); + ok(hr == S_OK, "IDirectMusicSynthSink_GetDesiredBufferSize returned: %#lx\n", hr); + ok(size == params.dwSampleRate * params.dwAudioChannels * 4, "size: %ld\n", size); + IDirectMusicSynth_Close(dmsynth); if (control_synth) IDirectMusicSynth_Release(control_synth); -- 2.34.1

1 0

[PATCH 2/4] dmsynth/tests: Add synth GetFormat tests
by Michael Stefaniuc 21 Feb '22

21 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 93212c0ae9f..ab3349f666b 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -51,6 +51,30 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +static void test_synth_getformat(IDirectMusicSynth *synth, DMUS_PORTPARAMS *params, const char *context) +{ + WAVEFORMATEX format; + DWORD size; + HRESULT hr; + + winetest_push_context(context); + + size = sizeof(format); + hr = IDirectMusicSynth_GetFormat(synth, &format, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(format.wFormatTag == WAVE_FORMAT_PCM, "wFormatTag: %#x\n", format.wFormatTag); + ok(format.nChannels == params->dwAudioChannels, "nChannels: %d\n", format.nChannels); + ok(format.nSamplesPerSec == params->dwSampleRate, "nSamplesPerSec: %ld\n", format.nSamplesPerSec); + ok(format.wBitsPerSample == 16, "wBitsPerSample: %d\n", format.wBitsPerSample); + ok(format.nBlockAlign == params->dwAudioChannels * format.wBitsPerSample / 8, "nBlockAlign: %d\n", + format.nBlockAlign); + ok(format.nAvgBytesPerSec == params->dwSampleRate * format.nBlockAlign, "nAvgBytesPerSec: %ld\n", + format.nAvgBytesPerSec); + ok(format.cbSize == 0, "cbSize: %d\n", format.cbSize); + + winetest_pop_context(); +} + static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; @@ -68,6 +92,8 @@ static void test_dmsynth(void) DMUS_PORTPARAMS params; const DWORD all_params = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS|DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; + WAVEFORMATEX format; + DWORD size; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %#lx\n", hr); @@ -154,6 +180,7 @@ static void test_dmsynth(void) ok(params.dwEffectFlags == DMUS_EFFECT_REVERB, "params.dwEffectFlags: %#lx\n", params.dwEffectFlags); ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); ok(params.dwFeatures == 0, "dwFeatures: %#lx\n", params.dwFeatures); + test_synth_getformat(dmsynth, &params, "defaults"); IDirectMusicSynth_Close(dmsynth); /* Requesting more than supported */ params.dwValidParams = DMUS_PORTPARAMS_SAMPLERATE; @@ -162,6 +189,7 @@ static void test_dmsynth(void) ok(hr == S_FALSE, "Open failed: %#lx\n", hr); ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); ok(params.dwSampleRate == 96000, "dwSampleRate: %ld\n", params.dwSampleRate); + test_synth_getformat(dmsynth, &params, "max"); IDirectMusicSynth_Close(dmsynth); /* Minimums */ params.dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| @@ -177,6 +205,7 @@ static void test_dmsynth(void) ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups); ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate); + test_synth_getformat(dmsynth, &params, "min"); IDirectMusicSynth_Close(dmsynth); /* Test share and features */ params.dwValidParams = DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; @@ -188,6 +217,7 @@ static void test_dmsynth(void) ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); ok(params.dwFeatures == (DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING), "dwFeatures: %#lx\n", params.dwFeatures); + test_synth_getformat(dmsynth, &params, "features"); IDirectMusicSynth_Close(dmsynth); /* Synth has no default clock */ @@ -226,6 +256,25 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); ok(hr == S_OK, "GetPortCaps failed: %#lx\n", hr); + /* GetFormat */ + hr = IDirectMusicSynth_GetFormat(dmsynth, NULL, NULL); + ok(hr == E_POINTER, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicSynth_GetFormat(dmsynth, NULL, &size); + ok(hr == DMUS_E_SYNTHNOTCONFIGURED, "GetFormat failed: %#lx\n", hr); + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_GetFormat(dmsynth, NULL, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + size = 1; + hr = IDirectMusicSynth_GetFormat(dmsynth, &format, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + size = sizeof(format) + 1; + hr = IDirectMusicSynth_GetFormat(dmsynth, &format, &size); + ok(hr == S_OK, "GetFormat failed: %#lx\n", hr); + ok(size == sizeof(format), "GetFormat size mismatch, got %ld\n", size); + if (control_synth) IDirectMusicSynth_Release(control_synth); if (control_sink) -- 2.34.1

1 0

[PATCH 1/4] dmsynth: Implement the synth GetFormat method
by Michael Stefaniuc 21 Feb '22

21 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 2db80726408..d96ee943a5e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -505,11 +505,29 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority(IDirectMusicSynt } static HRESULT WINAPI IDirectMusicSynth8Impl_GetFormat(IDirectMusicSynth8 *iface, - WAVEFORMATEX *wave_format, DWORD *wave_format_size) + WAVEFORMATEX *format, DWORD *size) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + WAVEFORMATEX fmt; - FIXME("(%p)->(%p, %p): stub\n", This, wave_format, wave_format_size); + TRACE("(%p, %p, %p)\n", This, format, size); + + if (!size) + return E_POINTER; + if (!This->open) + return DMUS_E_SYNTHNOTCONFIGURED; + + if (format) { + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = This->params.dwAudioChannels; + fmt.nSamplesPerSec = This->params.dwSampleRate; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = This->params.dwAudioChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = This->params.dwSampleRate * fmt.nBlockAlign; + fmt.cbSize = 0; + memcpy(format, &fmt, min(*size, sizeof(fmt))); + } + *size = sizeof(fmt); return S_OK; } -- 2.34.1

1 0

[PATCH v5 1/5] winepulse.drv: Expose audio devices to the application.
by Gabriel Ivăncescu 21 Feb '22

21 Feb '22

This exposes the actual devices (and virtual sinks/sources) as reported by PulseAudio to an application, allowing it to select the devices itself and, for example, record from (or render to) two devices at the same time. The "PulseAudio" device (which is movable) is still the default, as before, with the same GUID to preserve compatibility with existing setups. Based on a patch by Mark Harmstone <mark(a)harmstone.com>, with changes by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Minor issue when allocating, it multiplied by sizeof(WCHAR) again... dlls/winepulse.drv/mmdevdrv.c | 205 ++++++++++++++++++++++++++++------ dlls/winepulse.drv/pulse.c | 140 +++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 20 ++++ 3 files changed, 321 insertions(+), 44 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e3d5ea9..8ef3575 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -69,6 +69,8 @@ static GUID pulse_render_guid = static GUID pulse_capture_guid = { 0x25da76d0, 0x033c, 0x4235, { 0x90, 0x02, 0x19, 0xf4, 0x88, 0x94, 0xac, 0x6f } }; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winepulse.drv\\devices"; + static CRITICAL_SECTION session_cs; static CRITICAL_SECTION_DEBUG session_cs_debug = { 0, 0, &session_cs, @@ -145,9 +147,9 @@ struct ACImpl { AudioSession *session; AudioSessionWrapper *session_wrapper; -}; -static const WCHAR defaultW[] = L"PulseAudio"; + char pulse_name[0]; +}; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -267,39 +269,108 @@ static void set_stream_volumes(ACImpl *This) pulse_call(set_volumes, &params); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, - UINT *num, UINT *def_index) +static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name, GUID *guid) { - WCHAR *id; + WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; + DWORD type, size = sizeof(*guid); + LSTATUS status; + HKEY dev_key; - TRACE("%d %p %p %p\n", flow, ids, num, def_index); + if (!pulse_name[0]) { + *guid = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; + return; + } - *num = 1; - *def_index = 0; + if (!drv_key) { + CoCreateGuid(guid); + return; + } - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(**ids)); - *keys = NULL; - if (!*ids) - return E_OUTOFMEMORY; + key_name[0] = (flow == eRender) ? '0' : '1'; + key_name[1] = ','; + MultiByteToWideChar(CP_UNIXCP, 0, pulse_name, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); - (*ids)[0] = id = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(**keys)); - if (!*keys || !id) { - HeapFree(GetProcessHeap(), 0, id); - HeapFree(GetProcessHeap(), 0, *keys); - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - *keys = NULL; - return E_OUTOFMEMORY; + status = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, + NULL, &dev_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open registry key for device %s: %u\n", pulse_name, status); + CoCreateGuid(guid); + return; } - memcpy(id, defaultW, sizeof(defaultW)); - if (flow == eRender) - (*keys)[0] = pulse_render_guid; - else - (*keys)[0] = pulse_capture_guid; + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size); + if (status != ERROR_SUCCESS || type != REG_BINARY || size != sizeof(*guid)) { + CoCreateGuid(guid); + status = RegSetValueExW(dev_key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(*guid)); + if (status != ERROR_SUCCESS) + ERR("Failed to store device GUID for %s to registry: %u\n", pulse_name, status); + } + RegCloseKey(dev_key); +} - return S_OK; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i = 0; + LSTATUS status; + HKEY drv_key; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = MAX_PULSE_NAME_LEN * 4; + params.endpoints = NULL; + do { + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + pulse_call(get_endpoint_ids, &params); + } while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if (FAILED(params.result)) + goto end; + + ids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if (!ids || !guids) { + params.result = E_OUTOFMEMORY; + goto end; + } + + status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, + KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open devices registry key: %u\n", status); + drv_key = NULL; + } + + for (i = 0; i < params.num; i++) { + unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, size))) { + params.result = E_OUTOFMEMORY; + break; + } + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(drv_key, flow, params.endpoints[i].pulse_name, &guids[i]); + } + if (drv_key) + RegCloseKey(drv_key); + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if (FAILED(params.result)) { + HeapFree(GetProcessHeap(), 0, guids); + while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } else { + *ids_out = ids; + *keys = guids; + *num = params.num; + *def_index = params.default_idx; + } + return params.result; } int WINAPI AUDDRV_GetPriority(void) @@ -314,23 +385,87 @@ int WINAPI AUDDRV_GetPriority(void) return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable; } +static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_NAME_LEN], EDataFlow *flow) +{ + WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; + DWORD key_name_size; + DWORD index = 0; + HKEY key; + + /* Return empty string for default PulseAudio device */ + pulse_name[0] = 0; + if (IsEqualGUID(guid, &pulse_render_guid)) { + *flow = eRender; + return TRUE; + } else if (IsEqualGUID(guid, &pulse_capture_guid)) { + *flow = eCapture; + return TRUE; + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { + WARN("No devices found in registry\n"); + return FALSE; + } + + for (;;) { + DWORD size, type; + LSTATUS status; + GUID reg_guid; + HKEY dev_key; + + key_name_size = ARRAY_SIZE(key_name); + if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyExW(key, key_name, 0, KEY_READ | KEY_WOW64_64KEY, &dev_key) != ERROR_SUCCESS) { + ERR("Couldn't open key: %s\n", wine_dbgstr_w(key_name)); + continue; + } + + size = sizeof(reg_guid); + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE *)&reg_guid, &size); + RegCloseKey(dev_key); + + if (status == ERROR_SUCCESS && type == REG_BINARY && size == sizeof(reg_guid) && IsEqualGUID(&reg_guid, guid)) { + RegCloseKey(key); + + TRACE("Found matching device key: %s\n", wine_dbgstr_w(key_name)); + + if (key_name[0] == '0') + *flow = eRender; + else if (key_name[0] == '1') + *flow = eCapture; + else { + WARN("Unknown device type: %c\n", key_name[0]); + return FALSE; + } + + return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, pulse_name, MAX_PULSE_NAME_LEN, NULL, NULL); + } + } + + RegCloseKey(key); + WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); + return FALSE; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; + char pulse_name[MAX_PULSE_NAME_LEN]; EDataFlow dataflow; + unsigned len; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if (IsEqualGUID(guid, &pulse_render_guid)) - dataflow = eRender; - else if (IsEqualGUID(guid, &pulse_capture_guid)) - dataflow = eCapture; - else - return E_UNEXPECTED; + + if (!get_pulse_name_by_guid(guid, pulse_name, &dataflow)) + return AUDCLNT_E_DEVICE_INVALIDATED; *out = NULL; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + len = strlen(pulse_name) + 1; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(ACImpl, pulse_name[len])); if (!This) return E_OUTOFMEMORY; @@ -342,6 +477,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; This->dataflow = dataflow; This->parent = dev; + memcpy(This->pulse_name, pulse_name, len); hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); if (FAILED(hr)) { @@ -609,6 +745,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } params.name = name = get_application_name(); + params.pulse_name = This->pulse_name; params.dataflow = This->dataflow; params.mode = mode; params.flags = flags; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 3e65936..311c9bb 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -81,6 +81,12 @@ typedef struct _ACPacket UINT32 discont; } ACPacket; +typedef struct _PhysDevice { + struct list entry; + WCHAR *name; + char pulse_name[0]; +} PhysDevice; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -89,6 +95,8 @@ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; static UINT g_phys_speakers_mask = 0; +static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); +static struct list g_phys_sources = LIST_INIT(g_phys_sources); static const REFERENCE_TIME MinimumPeriod = 30000; static const REFERENCE_TIME DefaultPeriod = 100000; @@ -128,6 +136,20 @@ static void dump_attr(const pa_buffer_attr *attr) TRACE("prebuf: %u\n", attr->prebuf); } +static void free_phys_device_lists(void) +{ + static struct list *const lists[] = { &g_phys_speakers, &g_phys_sources, NULL }; + struct list *const *list = lists; + PhysDevice *dev, *dev_next; + + do { + LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, *list, PhysDevice, entry) { + free(dev->name); + free(dev); + } + } while (*(++list)); +} + /* copied from kernelbase */ static int muldiv(int a, int b, int c) { @@ -190,6 +212,7 @@ static NTSTATUS pulse_process_attach(void *args) static NTSTATUS pulse_process_detach(void *args) { + free_phys_device_lists(); if (pulse_ctx) { pa_context_disconnect(pulse_ctx); @@ -215,6 +238,44 @@ static NTSTATUS pulse_main_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS pulse_get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; + struct endpoint *endpoint = params->endpoints; + DWORD len, name_len, needed; + PhysDevice *dev; + char *ptr; + + params->num = list_count(list); + needed = params->num * sizeof(*params->endpoints); + ptr = (char*)(endpoint + params->num); + + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + name_len = lstrlenW(dev->name) + 1; + len = strlen(dev->pulse_name) + 1; + needed += name_len * sizeof(WCHAR) + ((len + 1) & ~1); + + if (needed <= params->size) { + endpoint->name = (WCHAR*)ptr; + memcpy(endpoint->name, dev->name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->pulse_name = ptr; + memcpy(endpoint->pulse_name, dev->pulse_name, len); + ptr += (len + 1) & ~1; + endpoint++; + } + } + params->default_idx = 0; + + if (needed > params->size) { + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + return STATUS_SUCCESS; +} + static void pulse_contextcallback(pa_context *c, void *userdata) { switch (pa_context_get_state(c)) { @@ -357,12 +418,49 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } -/* For default PulseAudio render device, OR together all of the - * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void pulse_add_device(struct list *list, const char *pulse_name, const char *name) +{ + DWORD len = strlen(pulse_name), name_len = strlen(name); + PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, pulse_name[len + 1])); + WCHAR *wname; + + if (!dev) + return; + + if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + free(dev); + return; + } + + if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || + !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { + free(wname); + free(dev); + return; + } + dev->name[name_len] = 0; + memcpy(dev->pulse_name, pulse_name, len + 1); + + list_add_tail(list, &dev->entry); +} + static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { - if (i) - g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + if (!i || !i->name || !i->name[0]) + return; + + /* For default PulseAudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ + g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + + pulse_add_device(&g_phys_speakers, i->name, i->description); +} + +static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) +{ + if (!i || !i->name || !i->name[0]) + return; + pulse_add_device(&g_phys_sources, i->name, i->description); } /* For most hardware on Windows, users must choose a configuration with an even @@ -579,7 +677,14 @@ static NTSTATUS pulse_test_connect(void *args) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + free_phys_device_lists(); + list_init(&g_phys_speakers); + list_init(&g_phys_sources); g_phys_speakers_mask = 0; + + pulse_add_device(&g_phys_speakers, "", "PulseAudio"); + pulse_add_device(&g_phys_sources, "", "PulseAudio"); + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && @@ -588,6 +693,14 @@ static NTSTATUS pulse_test_connect(void *args) pa_operation_unref(o); } + o = pa_context_get_source_info_list(pulse_ctx, &pulse_phys_sources_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -771,8 +884,9 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV return S_OK; } -static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_bytes) +static HRESULT pulse_stream_connect(struct pulse_stream *stream, const char *pulse_name, UINT32 period_bytes) { + pa_stream_flags_t flags = PA_STREAM_START_CORKED | PA_STREAM_START_UNMUTED | PA_STREAM_ADJUST_LATENCY; int ret; char buffer[64]; static LONG number; @@ -797,12 +911,17 @@ static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_b attr.maxlength = stream->bufsize_frames * pa_frame_size(&stream->ss); attr.prebuf = pa_frame_size(&stream->ss); dump_attr(&attr); + + /* If specific device was requested, use it exactly */ + if (pulse_name[0]) + flags |= PA_STREAM_DONT_MOVE; + else + pulse_name = NULL; /* use default */ + if (stream->dataflow == eRender) - ret = pa_stream_connect_playback(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY, NULL, NULL); + ret = pa_stream_connect_playback(stream->stream, pulse_name, &attr, flags, NULL, NULL); else - ret = pa_stream_connect_record(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY); + ret = pa_stream_connect_record(stream->stream, pulse_name, &attr, flags); if (ret < 0) { WARN("Returns %i\n", ret); return AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -864,7 +983,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->share = params->mode; stream->flags = params->flags; - hr = pulse_stream_connect(stream, stream->period_bytes); + hr = pulse_stream_connect(stream, params->pulse_name, stream->period_bytes); if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); @@ -1967,6 +2086,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_process_attach, pulse_process_detach, pulse_main_loop, + pulse_get_endpoint_ids, pulse_create_stream, pulse_release_stream, pulse_start, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index d28a73c..982704a 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -19,6 +19,8 @@ #include "wine/list.h" #include "wine/unixlib.h" +#define MAX_PULSE_NAME_LEN 256 + struct pulse_stream; struct pulse_config @@ -32,14 +34,31 @@ struct pulse_config unsigned int speakers_mask; }; +struct endpoint +{ + WCHAR *name; + char *pulse_name; +}; + struct main_loop_params { HANDLE event; }; +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + struct create_stream_params { const char *name; + const char *pulse_name; EDataFlow dataflow; AUDCLNT_SHAREMODE mode; DWORD flags; @@ -191,6 +210,7 @@ enum unix_funcs process_attach, process_detach, main_loop, + get_endpoint_ids, create_stream, release_stream, start, -- 2.34.1

2 9

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel