July 2011 - Wine-Commits - list.winehq.org

Andrew Eikum : dsound: Request that WinMM perform audio conversion if the hardware doesn' t support the requested format.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: ca4ee7f60fef3c620c66dfa5cb3773b4073143f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4ee7f60fef3c620c66dfa5c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:25 2011 -0500 dsound: Request that WinMM perform audio conversion if the hardware doesn't support the requested format. --- dlls/dsound/capture.c | 2 +- dlls/dsound/primary.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index f089313..174355a 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -942,7 +942,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( return err; } } else { - DWORD flags = CALLBACK_FUNCTION; + DWORD flags = CALLBACK_FUNCTION | WAVE_MAPPED; err = mmErr(waveInOpen(&(device->hwi), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_capture_callback, (DWORD_PTR)device, flags)); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index aa8450f..8a87c96 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -125,7 +125,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) if (device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMOPEN) { - DWORD flags = CALLBACK_FUNCTION; + DWORD flags = CALLBACK_FUNCTION | WAVE_MAPPED; if (device->driver) flags |= WAVE_DIRECTSOUND;

1 0

André Hentschel : user.exe: Remove dead assignment ( clang).
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: f12e6a11d80008f8341c90e2f84bcac0b368defb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12e6a11d80008f8341c90e2f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 20:33:24 2011 +0200 user.exe: Remove dead assignment (clang). --- dlls/user.exe16/user.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 030dd0d..01125ff 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2506,7 +2506,6 @@ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 args ) /* wsprintf16 ignores null characters */ if (*p != '\0') p++; else if (format.width > 1) *p++ = ' '; - else len = 0; break; case WPR_STRING: if (len) memcpy( p, lpcstr_view, len );

1 0

André Hentschel : user32: Remove dead assignment ( clang).
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: b37051d28b36e1b1a5986b9c123be0ab63e23b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37051d28b36e1b1a5986b9c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 20:33:31 2011 +0200 user32: Remove dead assignment (clang). --- dlls/user32/text.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index c9ded68..fb71fa7 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -723,7 +723,6 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, * pellip->under */ } - line_fits = (size.cx <= max_seg_width); ellipsified = 1; } /* As an optimisation if we have ellipsified and we are expanding

1 0

Andrew Eikum : winmm: Support WAVE_MAPPED flag in waveOut*.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 58bd405778b19097679a23394817d53485c7bc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bd405778b19097679a23394… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:28 2011 -0500 winmm: Support WAVE_MAPPED flag in waveOut*. --- dlls/winmm/waveform.c | 44 +++++++++++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 254bf21..57c6add 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -615,6 +615,11 @@ static UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, return dwRet; } +static inline BOOL WINMM_IsMapper(UINT device) +{ + return (device == WAVE_MAPPER || device == (UINT16)WAVE_MAPPER); +} + static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_out) { @@ -644,15 +649,24 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, /* ACM can convert from src->dst, so try to find a device * that supports dst */ - for(i = 0; i < g_outmmdevices_count; ++i){ + if(WINMM_IsMapper(info->req_device)){ + for(i = 0; i < g_outmmdevices_count; ++i){ + WINMM_OpenInfo l_info = *info; + l_info.req_device = i; + l_info.format = &target; + mr = WOD_Open(&l_info); + if(mr == MMSYSERR_NOERROR){ + info->handle = l_info.handle; + break; + } + } + }else{ WINMM_OpenInfo l_info = *info; - l_info.req_device = i; + l_info.flags &= ~WAVE_MAPPED; l_info.format = &target; mr = WOD_Open(&l_info); - if(mr == MMSYSERR_NOERROR){ + if(mr == MMSYSERR_NOERROR) info->handle = l_info.handle; - break; - } } if(mr != MMSYSERR_NOERROR) return WAVERR_BADFORMAT; @@ -684,8 +698,17 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) /* try to find a direct match */ if(is_out){ WINMM_OpenInfo l_info = *info; - for(i = 0; i < g_outmmdevices_count; ++i){ - l_info.req_device = i; + if(WINMM_IsMapper(info->req_device)){ + for(i = 0; i < g_outmmdevices_count; ++i){ + l_info.req_device = i; + mr = WOD_Open(&l_info); + if(mr == MMSYSERR_NOERROR){ + info->handle = l_info.handle; + return mr; + } + } + }else{ + l_info.flags &= ~WAVE_MAPPED; mr = WOD_Open(&l_info); if(mr == MMSYSERR_NOERROR){ info->handle = l_info.handle; @@ -940,11 +963,6 @@ error: return ret; } -static inline BOOL WINMM_IsMapper(UINT device) -{ - return (device == WAVE_MAPPER || device == (UINT16)WAVE_MAPPER); -} - static LRESULT WOD_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; @@ -955,7 +973,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) TRACE("(%u, %p, %08x)\n", info->req_device, info, info->flags); - if(WINMM_IsMapper(info->req_device)) + if(WINMM_IsMapper(info->req_device) || (info->flags & WAVE_MAPPED)) return WINMM_MapDevice(info, TRUE); if(info->req_device >= g_outmmdevices_count)

1 0

Andrew Eikum : winmm: Remove driver implementation of waveIn*.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: b3ab657c3b905cc597751a5d7a423b8305109deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ab657c3b905cc597751a5d7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:32 2011 -0500 winmm: Remove driver implementation of waveIn*. --- dlls/winmm/waveform.c | 230 ++++++------------------------------------------- 1 files changed, 27 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3ab657c3b905cc597751…

1 0

Akihiro Sagawa : po: Add message contexts for 'Desktop' and update Japanese translation.
by Alexandre Julliard July 14, 2011

July 14, 2011

1 0

Andrew Eikum : mmdevapi: Only enumerate devices that can be opened during initialization.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 2174717fbd01565f7ba1596078cf0c0ccfc02504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2174717fbd01565f7ba159607… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:30:45 2011 -0500 mmdevapi: Only enumerate devices that can be opened during initialization. --- dlls/winealsa.drv/mmdevdrv.c | 18 +++++++++++++++--- dlls/wineoss.drv/mmdevdrv.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index eda8435..080887a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -229,19 +229,22 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; snd_pcm_info_t *info; + snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : + SND_PCM_STREAM_CAPTURE); info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); if(!info) return E_OUTOFMEMORY; snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, - flow == eRender ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE); + snd_pcm_info_set_stream(info, stream); device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; err = snd_ctl_pcm_next_device(ctl, &device)){ const char *devname; + char devnode[32]; + snd_pcm_t *handle; snd_pcm_info_set_device(info, device); @@ -255,6 +258,15 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, continue; } + sprintf(devnode, "hw:%d,%d", card, device); + if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open, pretending it doesn't exist: %d (%s)\n", + devnode, err, snd_strerror(err)); + continue; + } + + snd_pcm_close(handle); + if(ids && keys){ DWORD len, cardlen; @@ -286,7 +298,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, HeapFree(GetProcessHeap(), 0, ids[*num]); return E_OUTOFMEMORY; } - sprintf(keys[*num], "hw:%d,%d", card, device); + memcpy(keys[*num], devnode, sizeof(devnode)); } ++(*num); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2b631f9..32e9354 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -285,6 +285,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, *def_index = -1; for(i = 0; i < sysinfo.numaudios; ++i){ oss_audioinfo ai = {0}; + int fd; ai.dev = i; if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ @@ -293,6 +294,17 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, continue; } + if(flow == eRender) + fd = open(ai.devnode, O_WRONLY, 0); + else + fd = open(ai.devnode, O_RDONLY, 0); + if(fd < 0){ + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)", + ai.devnode, errno, strerror(errno)); + continue; + } + close(fd); + if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ size_t len;

1 0

Akihiro Sagawa : po: Add message contexts for 'Restore' and update Japanese translation.
by Alexandre Julliard July 14, 2011

July 14, 2011

1 0

Lucas Fialho Zawacki : dinput: Corrected misuse of index in EnumDevicesBySemantics.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 4958db8ebae1acfaa7828cec719ae1af375dad72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4958db8ebae1acfaa7828cec7… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Wed Jul 13 20:54:57 2011 -0300 dinput: Corrected misuse of index in EnumDevicesBySemantics. --- dlls/dinput/dinput_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 821a9a0..b653307 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -902,7 +902,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( /* If there's at least one action for the device it's priority 1 */ for(j=0; j < lpdiActionFormat->dwActionSize; j++) - if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j]) + if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[i]) == actionMasks[i]) callbackFlags |= DIEDBS_MAPPEDPRI1; if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) @@ -967,7 +967,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( /* If there's at least one action for the device it's priority 1 */ for(j=0; j < lpdiActionFormat->dwActionSize; j++) - if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[j]) == actionMasks[j]) + if ((lpdiActionFormat->rgoAction[j].dwSemantic & actionMasks[i]) == actionMasks[i]) callbackFlags |= DIEDBS_MAPPEDPRI1; if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP)

1 0

Henri Verbeet : wined3d: Pass a wined3d_state pointer to state handlers.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: e4d2d785006ef174c2db73ffb7143170f14372a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d2d785006ef174c2db73ffb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 14 01:02:48 2011 +0200 wined3d: Pass a wined3d_state pointer to state handlers. Instead of an entire stateblock. This is mainly useful is we ever want to call state handlers on state not stored in a stateblock. --- dlls/wined3d/arb_program_shader.c | 125 ++-- dlls/wined3d/ati_fragment_shader.c | 65 +- dlls/wined3d/context.c | 15 +- dlls/wined3d/nvidia_texture_shader.c | 33 +- dlls/wined3d/state.c | 1198 +++++++++++++++++----------------- dlls/wined3d/utils.c | 24 +- dlls/wined3d/wined3d_private.h | 54 +- 7 files changed, 752 insertions(+), 762 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4d2d785006ef174c2db7…

1 0