February 2016 - Wine-Commits

Henri Verbeet : wined3d: Pass a format instead of a surface to wined3d_format_convert_from_float() .
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 0ec540276ae5b7e43e41a794a6d22f5e070571e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec540276ae5b7e43e41a794a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:43 2016 +0100 wined3d: Pass a format instead of a surface to wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 88acca5..86cedb0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4685,7 +4685,7 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d static const RECT src_rect; struct wined3d_blt_fx fx; - fx.fill_color = wined3d_format_convert_from_float(surface, color); + fx.fill_color = wined3d_format_convert_from_float(view->format, color); return surface_cpu_blt(surface, rect, NULL, &src_rect, WINED3D_BLT_COLOR_FILL, &fx, WINED3D_TEXF_POINT); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b52b967..734b265 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4393,7 +4393,7 @@ void get_fog_start_end(const struct wined3d_context *context, const struct wined /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ -DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const struct wined3d_color *color) +DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) { static const struct { @@ -4426,7 +4426,6 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, c {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, {WINED3DFMT_P8_UINT, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, }; - const struct wined3d_format *format = surface->resource.format; unsigned int i; TRACE("Converting color {%.8e %.8e %.8e %.8e} to format %s.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35ece12..4e3d779 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3354,7 +3354,7 @@ void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigne unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; -DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, +DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) DECLSPEC_HIDDEN; BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, const struct wined3d_palette *palette, DWORD color, struct wined3d_color *float_color) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_GetVolumeLevel().
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 03ced2e0d3f0a7898563043cd1d79149332e5e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ced2e0d3f0a7898563043cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 17:28:42 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_GetVolumeLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index b9f5824..bef099a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -986,19 +986,17 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if UINT level, IDirect3DVolume8 **volume) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_volume *volume_impl; TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - volume_impl = wined3d_resource_get_parent(sub_resource); *volume = &volume_impl->IDirect3DVolume8_iface; IDirect3DVolume8_AddRef(*volume); wined3d_mutex_unlock();

1 0

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

Feb. 22, 2016

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 : winepulse: Include a period in the stream latency.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

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

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

Feb. 22, 2016

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

Andrew Eikum : mciqtz: Implement MCI_RESUME.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

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 : winepulse.drv: Avoid unrealistically low period sizes.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

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

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

Feb. 22, 2016

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

Frédéric Delanoy : msi/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 7ab21391918283579a16d8a7a89840291e8ad840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab21391918283579a16d8a7a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:05:53 2016 +0100 msi/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/automation.c | 9 ++------- dlls/msi/tests/package.c | 19 ++++--------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index d02e9a2..e4d2faa 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -601,10 +601,7 @@ static void test_dispid(void) while (ptr->name) { dispid = get_dispid(pInstaller, ptr->name); - if (ptr->todo) - todo_wine - ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); - else + todo_wine_if (ptr->todo) ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); ptr++; } @@ -885,9 +882,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA if (hr == S_OK) { - if (_invoke_todo_vtResult) todo_wine - ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult); - else + todo_wine_if (_invoke_todo_vtResult) ok(V_VT(pVarResult) == vtResult, "Variant result type is %d, expected %d\n", V_VT(pVarResult), vtResult); if (vtResult != VT_EMPTY) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 41f0f9f..60a08ac 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2638,19 +2638,14 @@ static void test_feature_states( UINT line, MSIHANDLE package, const char *featu { ok( state == expected_state, "%u: expected state %d got %d\n", line, expected_state, state ); - if (todo) todo_wine - ok( action == expected_action, "%u: expected action %d got %d\n", - line, expected_action, action ); - else + todo_wine_if (todo) ok( action == expected_action, "%u: expected action %d got %d\n", line, expected_action, action ); } else { ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n", line, state ); - if (todo) todo_wine - ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); - else + todo_wine_if (todo) ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); } @@ -2669,10 +2664,7 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com { ok( state == expected_state, "%u: expected state %d got %d\n", line, expected_state, state ); - if (todo) todo_wine - ok( action == expected_action, "%u: expected action %d got %d\n", - line, expected_action, action ); - else + todo_wine_if (todo) ok( action == expected_action, "%u: expected action %d got %d\n", line, expected_action, action ); } @@ -2680,10 +2672,7 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com { ok( state == 0xdeadbee, "%u: expected state 0xdeadbee got %d\n", line, state ); - if (todo) todo_wine - ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", - line, action ); - else + todo_wine_if (todo) ok( action == 0xdeadbee, "%u: expected action 0xdeadbee got %d\n", line, action ); }

1 0

Frédéric Delanoy : French translation for release 1.9.4
by Jeremy Newman Feb. 19, 2016

Feb. 19, 2016

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