May 2018 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Fix memory leak in shader_glsl_init_transform_feedback().
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: f38de4ff616191a7539fe1d320dc6d73cee19acd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38de4ff616191a7539fe1d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 7 09:45:56 2018 +0200 wined3d: Fix memory leak in shader_glsl_init_transform_feedback(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a9af9ac..eddf35d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -950,6 +950,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co { FIXME("No varyings to record, disabling transform feedback.\n"); shader->u.gs.so_desc.element_count = 0; + string_buffer_release(&priv->string_buffers, buffer); return; }

1 0

Christian Inci : wined3d: Recognize Titan V.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 8e24cb6a32b07a7d698a5ff48edea7f88f0abaeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e24cb6a32b07a7d698a5ff4… Author: Christian Inci <chris.wine(a)broke-the-inter.net> Date: Fri May 11 02:33:30 2018 +0200 wined3d: Recognize Titan V. Signed-off-by: Christian Inci <chris.wine(a)broke-the-inter.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5e10cb1..c058737 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1402,6 +1402,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1890,6 +1891,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b297799..bb20842 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2438,6 +2438,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, + CARD_NVIDIA_TITANV = 0x1d81, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Matteo Bruni : wined3d: Default to using a non-forward-compatible core profile context.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: f942df461b82792b3908e38ad79c22b440b00711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f942df461b82792b3908e38a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 3 00:04:04 2018 +0200 wined3d: Default to using a non-forward-compatible core profile context. It should make it easier for the GL driver to upgrade the context to a GL version higher than strictly requested. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b96733f..300b79b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1849,8 +1849,6 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version >> 16; ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_MINOR_VERSION_ARB; ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version & 0xffff; - if (gl_info->selected_gl_version >= MAKEDWORD_VERSION(3, 2)) - ctx_flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; if (ctx_flags) { ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; @@ -1860,9 +1858,20 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) { - if (ctx_flags & WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB) + if (gl_info->selected_gl_version >= MAKEDWORD_VERSION(3, 2)) { - ctx_attribs[ctx_attrib_idx - 1] &= ~WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; + if (ctx_flags) + { + ctx_flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; + ctx_attribs[ctx_attrib_idx - 1] = ctx_flags; + } + else + { + ctx_flags = WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; + ctx_attribs[ctx_attrib_idx++] = ctx_flags; + ctx_attribs[ctx_attrib_idx] = 0; + } if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) WARN("Failed to create a WGL context with wglCreateContextAttribsARB, last error %#x.\n", GetLastError());

1 0

Jacek Caban : jscript: Get rid of no longer used jsdisp_propput_const.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 827f45901d143baa632eccfd8d8f97c69b039ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=827f45901d143baa632eccfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 13:33:06 2018 +0200 jscript: Get rid of no longer used jsdisp_propput_const. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 714f3a4..17d3f5d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1316,18 +1316,6 @@ HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) return jsdisp_propput(obj, name, PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE, val); } -HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) -{ - dispex_prop_t *prop; - HRESULT hres; - - hres = ensure_prop_name(obj, name, FALSE, 0, &prop); - if(FAILED(hres)) - return hres; - - return jsval_copy(val, &prop->u.val); -} - HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) { return jsdisp_propput(obj, name, PROPF_CONFIGURABLE | PROPF_WRITABLE, val);

1 0

Jacek Caban : jscript: Use jsdisp_define_property for Error object properties.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: ae8c45c6949774855b5125ae069bb8336b907d80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae8c45c6949774855b5125ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 13:33:24 2018 +0200 jscript: Use jsdisp_define_property for Error object properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/error.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index b855b87..8cf52f0 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -193,15 +193,19 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(FAILED(hres)) return hres; - hres = jsdisp_propput_dontenum(err, numberW, jsval_number((INT)number)); + hres = jsdisp_define_data_property(err, numberW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + jsval_number((INT)number)); if(FAILED(hres)) { jsdisp_release(err); return hres; } - hres = jsdisp_propput_name(err, messageW, jsval_string(msg)); + hres = jsdisp_define_data_property(err, messageW, + PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, + jsval_string(msg)); if(SUCCEEDED(hres)) - hres = jsdisp_propput_dontenum(err, descriptionW, jsval_string(msg)); + hres = jsdisp_define_data_property(err, descriptionW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + jsval_string(msg)); if(FAILED(hres)) { jsdisp_release(err); return hres; @@ -355,7 +359,8 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) return E_OUTOFMEMORY; } - hres = jsdisp_propput_dontenum(err, nameW, jsval_string(str)); + hres = jsdisp_define_data_property(err, nameW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + jsval_string(str)); jsstr_release(str); if(SUCCEEDED(hres)) hres = create_builtin_constructor(ctx, constr_val[i], names[i], NULL,

1 0

Nikolay Sivov : d3d11: Partially implement d3d11_immediate_context_UpdateSubresource1().
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: dfb558bbfcf42fba00ad6fda553bbe91b2fb5d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb558bbfcf42fba00ad6fda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 17:14:36 2018 +0430 d3d11: Partially implement d3d11_immediate_context_UpdateSubresource1(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 18fa670..e4d8760 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2603,11 +2603,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, - ID3D11Resource *resource, UINT subresource, const D3D11_BOX *box, const void *data, - UINT rowpitch, UINT depth_pitch, UINT flags) + ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, + UINT row_pitch, UINT depth_pitch, UINT flags) { - FIXME("iface %p, resource %p, subresource %u, box %p, data %p, rowpitch %u, depth_pitch %u, flags %#x stub!\n", - iface, resource, subresource, box, data, rowpitch, depth_pitch, flags); + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", + iface, resource, subresource_idx, box, data, row_pitch, depth_pitch, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + d3d11_immediate_context_UpdateSubresource(iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); } static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface,

1 0

Matteo Bruni : wined3d: Use core functions to set the stencil mask on GL 2.0+.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 16c708c33909fa1fba6e0e160e276ecb3818388f URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c708c33909fa1fba6e0e16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 3 00:04:02 2018 +0200 wined3d: Use core functions to set the stencil mask on GL 2.0+. glStencilMask() is defined as setting both front and back stencil masks in GL 2.0+ and we don't want to use the EXT_stencil_two_side entry points even if they happen to be available there. D3D doesn't support separate front / back stencil write masks anyway. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/state.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 89506b1..164f9c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4049,7 +4049,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_info->supported[WINED3D_GL_BLEND_EQUATION] = TRUE; if (gl_version >= MAKEDWORD_VERSION(2, 0)) + { gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; + /* We want to use the core APIs for two-sided stencil in GL 2.0. */ + gl_info->supported[EXT_STENCIL_TWO_SIDE] = FALSE; + } if (gl_version >= MAKEDWORD_VERSION(3, 2)) gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 175fd14..34e08e9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1003,7 +1003,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ } } -static void state_stencilwrite2s(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_stencilwrite2s_ext(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD mask = state->fb->depth_stencil ? state->render_states[WINED3D_RS_STENCILWRITEMASK] : 0; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4603,7 +4603,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_STENCILFUNC), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILREF), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_STENCILMASK), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite2s}, EXT_STENCIL_TWO_SIDE }, + { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite2s_ext}, EXT_STENCIL_TWO_SIDE }, { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), { STATE_RENDER(WINED3D_RS_STENCILWRITEMASK), state_stencilwrite }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TWOSIDEDSTENCILMODE), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BACK_STENCILFAIL), { STATE_RENDER(WINED3D_RS_STENCILENABLE), NULL }, WINED3D_GL_EXT_NONE },

1 0

Matteo Bruni : wined3d: Skip match_allows_spec_alpha() on core profile.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: ac213630d93658f4d243b7d206a0aac0b93f55d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac213630d93658f4d243b7d2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 3 00:04:03 2018 +0200 wined3d: Skip match_allows_spec_alpha() on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 164f9c9..5e10cb1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -674,7 +674,7 @@ static BOOL match_allows_spec_alpha(const struct wined3d_gl_info *gl_info, struc GLenum error; DWORD data[16]; - if (!gl_info->supported[EXT_SECONDARY_COLOR]) + if (!gl_info->supported[EXT_SECONDARY_COLOR] || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return FALSE; while (gl_info->gl_ops.gl.p_glGetError());

1 0

Nikolay Sivov : d3d9: Implement setting the maximum frame latency.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 8376010b954090a4ca579393e9e539d260b735f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8376010b954090a4ca579393… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 14 17:14:35 2018 +0430 d3d9: Implement setting the maximum frame latency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 20 +++++++++++++++----- dlls/d3d9/tests/d3d9ex.c | 10 +++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2134257..e3562c7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3762,21 +3762,31 @@ static HRESULT WINAPI d3d9_device_CheckResourceResidency(IDirect3DDevice9Ex *ifa static HRESULT WINAPI d3d9_device_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + TRACE("iface %p, max_latency %u.\n", iface, max_latency); - if (max_latency) - FIXME("Ignoring max_latency %u.\n", max_latency); + if (max_latency > 30) + return D3DERR_INVALIDCALL; + + wined3d_mutex_lock(); + wined3d_device_set_max_frame_latency(device->wined3d_device, max_latency); + wined3d_mutex_unlock(); return S_OK; } static HRESULT WINAPI d3d9_device_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency) { - FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - *max_latency = 2; + TRACE("iface %p, max_latency %p.\n", iface, max_latency); - return E_NOTIMPL; + wined3d_mutex_lock(); + *max_latency = wined3d_device_get_max_frame_latency(device->wined3d_device); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT WINAPI d3d9_device_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7c36e6e..d210b8b 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4060,31 +4060,27 @@ static void test_frame_latency(void) } hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 1); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 1, "Unexpected max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 0); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 30); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 31); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); refcount = IDirect3DDevice9Ex_Release(device);

1 0

Zebediah Figura : advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: master Commit: 3b8ec3046a62588a145ba8a92a2c257f0a06bbdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b8ec3046a62588a145ba8a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 12 17:25:16 2018 -0500 advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index c78edb2..11f4da0 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2448,6 +2448,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, LPVOID lpInfo) { + SERVICE_RPC_REQUIRED_PRIVILEGES_INFO rpc_privinfo; DWORD err; __TRY @@ -2455,7 +2456,19 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, SC_RPC_CONFIG_INFOW info; info.dwInfoLevel = dwInfoLevel; - info.u.descr = lpInfo; + if (dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) + { + SERVICE_REQUIRED_PRIVILEGES_INFOW *privinfo = lpInfo; + WCHAR *p; + + for (p = privinfo->pmszRequiredPrivileges; *p; p += strlenW(p) + 1); + rpc_privinfo.cbRequiredPrivileges = + (p - privinfo->pmszRequiredPrivileges + 1) * sizeof(WCHAR); + rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; + info.u.privinfo = &rpc_privinfo; + } + else + info.u.descr = lpInfo; err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter)

1 0