February 2016 - Wine-commits

Henri Verbeet : winex11: Get rid of the unused "old_screen_rect" field from struct desktop_resize_data.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 60a7cb663322f55a3b5a05a028737ac9f7a93630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a7cb663322f55a3b5a05a02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:44 2016 +0100 winex11: Get rid of the unused "old_screen_rect" field from struct desktop_resize_data. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 603e19f..9b5e27b 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -180,7 +180,6 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) struct desktop_resize_data { - RECT old_screen_rect; RECT old_virtual_rect; RECT new_virtual_rect; }; @@ -259,7 +258,6 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) HWND hwnd = GetDesktopWindow(); struct desktop_resize_data resize_data; - resize_data.old_screen_rect = get_primary_monitor_rect(); resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height );

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_device_create_surface().
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 55f2d655caab99ff33452a682f1df9d7d3f32716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f2d655caab99ff33452a682… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:45 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_device_create_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 382b971..7b351c3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1108,7 +1108,6 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, void *user_mem) { - struct wined3d_resource *sub_resource; struct wined3d_resource_desc desc; struct d3d9_surface *surface_impl; struct wined3d_texture *texture; @@ -1142,8 +1141,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width return hr; } - sub_resource = wined3d_texture_get_sub_resource(texture, 0); - surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(texture, 0); surface_impl->parent_device = &device->IDirect3DDevice9Ex_iface; *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface);

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture().
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: bd38c16ec201061cbf3d1ae9f429b2c94c16e7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd38c16ec201061cbf3d1ae9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:46 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7b351c3..bac44b6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3689,7 +3689,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } - d3d_surface = wined3d_resource_get_parent(wined3d_texture_get_sub_resource(*texture, 0)); + d3d_surface = wined3d_texture_get_sub_resource_parent(*texture, 0); d3d_surface->parent_device = &device->IDirect3DDevice9Ex_iface; return hr;

1 0

Andrew Eikum : winepulse.drv: Avoid unrealistically low period sizes.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 899c3fc4c404814ae4a22f6cad72a2b0ae49925a URL: http://source.winehq.org/git/wine.git/?a=commit;h=899c3fc4c404814ae4a22f6ca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:47:13 2016 -0600 winepulse.drv: Avoid unrealistically low period sizes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index ef171d3..4ba329e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -412,13 +412,17 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { {} } } + if (stream) pa_stream_unref(stream); + if (length) pulse_def_period[!render] = pulse_min_period[!render] = pa_bytes_to_usec(10 * length, &ss); - else + + if (pulse_min_period[!render] < MinimumPeriod) pulse_min_period[!render] = MinimumPeriod; - if (pulse_def_period[!render] <= DefaultPeriod) + + if (pulse_def_period[!render] < DefaultPeriod) pulse_def_period[!render] = DefaultPeriod; wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE;

1 0

Andrew Eikum : winepulse: Include a period in the stream latency.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 92da5e5d73abad5acc4897c67f35c0cb18f7ab20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92da5e5d73abad5acc4897c67… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:47:21 2016 -0600 winepulse: Include a period in the stream latency. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4ba329e..3f5e3d5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1436,9 +1436,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, return hr; } attr = pa_stream_get_buffer_attr(This->stream); - if (This->dataflow == eRender) + if (This->dataflow == eRender){ lat = attr->minreq / pa_frame_size(&This->ss); - else + lat += pulse_def_period[0]; + }else lat = attr->fragsize / pa_frame_size(&This->ss); *latency = 10000000; *latency *= lat;

1 0

Andrew Eikum : winepulse.drv: Buffer data locally when needed.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 1245f8335c31a6078ed50fc17cff4d60877c72a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1245f8335c31a6078ed50fc17… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:24 2016 -0600 winepulse.drv: Buffer data locally when needed. PulseAudio doesn't make any buffer size guarantees. With some hardware and some configurations, PulseAudio will fail to allocate the full buffer requested by the application. So, we have to store the data within winepulse until there is enough room in the PulseAudio buffer to accept it. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 274 ++++++++++++++++++++++++++++++++---------- 1 file changed, 212 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1245f8335c31a6078ed50…

1 0

Andrew Eikum : mciqtz: Implement MCI_RESUME.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 924c97fe9070c62652c0b19d71469a07a6dd7a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924c97fe9070c62652c0b19d7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:52 2016 -0600 mciqtz: Implement MCI_RESUME. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index aa257a0..4e559b6 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -584,6 +584,29 @@ static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP } /*************************************************************************** + * MCIQTZ_mciResume [internal] + */ +static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Run(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot run filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -1126,6 +1149,9 @@ static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) case MCI_PAUSE: task->res = MCIQTZ_mciPause(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); break; + case MCI_RESUME: + task->res = MCIQTZ_mciResume(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; case MCI_GETDEVCAPS: task->res = MCIQTZ_mciGetDevCaps(task->devid, task->flags, (LPMCI_GETDEVCAPS_PARMS)task->parms); break; @@ -1209,6 +1235,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: case MCI_STOP: case MCI_PAUSE: + case MCI_RESUME: return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: @@ -1218,7 +1245,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, if (!dwParam2) return MCIERR_NULL_PARAMETER_BLOCK; return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); case MCI_RECORD: - case MCI_RESUME: case MCI_INFO: case MCI_LOAD: case MCI_SAVE:

1 0

Andrew Eikum : winegstreamer: Fix usage of gst_audio_format_build_integer.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 3fb8ec59ffcc3e60ae41d364ed9e1f2bd40d4b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb8ec59ffcc3e60ae41d364e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 14:11:53 2016 -0600 winegstreamer: Fix usage of gst_audio_format_build_integer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index b8435ba..72eeda2 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -838,12 +838,15 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P inisfloat = IsEqualGUID(&inwfx->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); if (inwfx->Samples.wValidBitsPerSample) indepth = inwfx->Samples.wValidBitsPerSample; - } + } else if (inwfe->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) + inisfloat = TRUE; + + if (inisfloat) + format = inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE; + else + format = gst_audio_format_build_integer(inwfe->wBitsPerSample == 8 ? FALSE : TRUE, + G_LITTLE_ENDIAN, inwfe->wBitsPerSample, indepth); - format = inisfloat ? (inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE) - : gst_audio_format_build_integer(inwfe->wBitsPerSample == 8 ? FALSE : TRUE, - inwfe->wBitsPerSample, - indepth, G_LITTLE_ENDIAN); capsin = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING, gst_audio_format_to_string(format), "channels", G_TYPE_INT, inwfe->nChannels,

1 0

Piotr Caban : msvcrt: Don' t close HANDLE if stdout or stderr is sharing it.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 781b069ed813927d00fb53e84731186eb58d9d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=781b069ed813927d00fb53e84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 19 18:43:20 2016 +0100 msvcrt: Don't close HANDLE if stdout or stderr is sharing it. Based on Qian Hong patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9f35a62..fc9f1ae 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1021,6 +1021,14 @@ int CDECL MSVCRT__close(int fd) TRACE(":fd (%d) handle (%p)\n", fd, info->handle); if (!(info->wxflag & WX_OPEN)) { ret = -1; + } else if (fd == MSVCRT_STDOUT_FILENO && + info->handle == get_ioinfo_nolock(MSVCRT_STDERR_FILENO)->handle) { + msvcrt_free_fd(fd); + ret = 0; + } else if (fd == MSVCRT_STDERR_FILENO && + info->handle == get_ioinfo_nolock(MSVCRT_STDOUT_FILENO)->handle) { + msvcrt_free_fd(fd); + ret = 0; } else { ret = CloseHandle(info->handle) ? 0 : -1; msvcrt_free_fd(fd);

1 0

Frédéric Delanoy : French translation for release 1.9.4
by Jeremy Newman 19 Feb '16

19 Feb '16

Module: website Branch: master Commit: f90f4b6f2fd7b878a53106c65ab3d89001083198 URL: http://source.winehq.org/git/website.git/?a=commit;h=f90f4b6f2fd7b878a53106… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 17:42:13 2016 +0100 French translation for release 1.9.4 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016021901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016021901.xml b/news/fr/2016021901.xml new file mode 100644 index 0000000..604f08a --- /dev/null +++ b/news/fr/2016021901.xml @@ -0,0 +1,15 @@ +<news> +<date>19 février 2016</date> +<title>Sortie de Wine 1.9.4</title> +<body> +La version de développement 1.9.4 de Wine est disponible. +<a href="{$root}/announce/1.9.4">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des glyphes couleur et des polices de rechange dans DirectWrite.</li> + <li>Améliorations dans le lecteur WebServices.</li> + <li>Prise en charge de formats supplémentaires dans Direct3D 11.</li> + <li>Syntaxe simplifiée et nettoyage de tests marqués todo.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.4.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0