April 2021 - Wine-devel - list.winehq.org

[PATCH 2/4] jscript: Add Object.getOwnPropertyNames implementation.
by Jacek Caban 20 Apr '21

20 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 34 ++++++++++++++++++++++++++-------- dlls/mshtml/tests/es5.js | 31 +++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 9 deletions(-)

2 1

[PATCH v2 1/4] amstream/tests: Test that streams call IMediaStreamFilter::EndOfStream.
by Anton Baskanov 20 Apr '21

20 Apr '21

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/tests/amstream.c | 54 ++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9cefec12442..e7fd731dd72 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2128,8 +2128,8 @@ static HRESULT WINAPI graph_FindFilterByName(IFilterGraph2 *iface, const WCHAR * static HRESULT WINAPI graph_ConnectDirect(IFilterGraph2 *iface, IPin *source, IPin *sink, const AM_MEDIA_TYPE *mt) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct graph *graph = impl_from_IFilterGraph2(iface); + return IFilterGraph2_ConnectDirect(graph->inner, source, sink, mt); } static HRESULT WINAPI graph_Reconnect(IFilterGraph2 *iface, IPin *pin) @@ -2140,8 +2140,8 @@ static HRESULT WINAPI graph_Reconnect(IFilterGraph2 *iface, IPin *pin) static HRESULT WINAPI graph_Disconnect(IFilterGraph2 *iface, IPin *pin) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct graph *graph = impl_from_IFilterGraph2(iface); + return IFilterGraph2_Disconnect(graph->inner, pin); } static HRESULT WINAPI graph_SetDefaultSyncSource(IFilterGraph2 *iface) @@ -6065,30 +6065,36 @@ static void test_ammediastream_set_state(void) check_ammediastream_set_state(&MSPID_PrimaryVideo); } -static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TYPE *mt) +static void check_ammediastream_end_of_stream(const CLSID *clsid, const MSPID *id, const AM_MEDIA_TYPE *mt) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStreamFilter *filter; struct testfilter source; - IGraphBuilder *graph; IMediaStream *stream; + struct graph graph; HRESULT hr; ULONG ref; IPin *pin; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + graph_init(&graph); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph.IFilterGraph2_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, &stream); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!!graph, "Expected non-NULL graph.\n"); testfilter_init(&source); - hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + source.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IFilterGraph2_AddFilter(&graph.IFilterGraph2_iface, &source.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, mt); + hr = IFilterGraph2_ConnectDirect(&graph.IFilterGraph2_iface, &source.source.pin.IPin_iface, pin, mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_EndOfStream(pin); @@ -6112,12 +6118,28 @@ static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TY hr = IPin_EndOfStream(pin); ok(hr == E_FAIL, "Got hr %#x.\n", hr); - IGraphBuilder_Disconnect(graph, pin); - IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + graph.got_notify = 0; + graph.event_code = 0xcc; + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + todo_wine ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph2_Disconnect(&graph.IFilterGraph2_iface, pin); + IFilterGraph2_Disconnect(&graph.IFilterGraph2_iface, &source.source.pin.IPin_iface); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IGraphBuilder_Release(graph); + graph_destroy(&graph); + ref = IMediaStreamFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); IPin_Release(pin); ref = IMediaStream_Release(stream); @@ -6126,8 +6148,8 @@ static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TY static void test_ammediastream_end_of_stream(void) { - check_ammediastream_end_of_stream(&MSPID_PrimaryAudio, &audio_mt); - check_ammediastream_end_of_stream(&MSPID_PrimaryVideo, &rgb32_mt); + check_ammediastream_end_of_stream(&CLSID_AMAudioStream, &MSPID_PrimaryAudio, &audio_mt); + check_ammediastream_end_of_stream(&CLSID_AMDirectDrawStream, &MSPID_PrimaryVideo, &rgb32_mt); } void test_mediastreamfilter_get_state(void) -- 2.25.1

2 7

[PATCH 1/2] advapi32/tests: Add a test for setting the SD owner of a directory to a group.
by Zebediah Figura 20 Apr '21

20 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/security.c | 69 ++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d18a8943ed2..31b56fa1bc6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8911,6 +8911,74 @@ static void test_shell_token(void) CloseHandle(token); } +static void test_group_as_file_owner(void) +{ + char sd_buffer[200], sid_buffer[100]; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)sd_buffer; + char temp_path[MAX_PATH], path[MAX_PATH]; + SID *admin_sid = (SID *)sid_buffer; + BOOL ret, present, defaulted; + SECURITY_DESCRIPTOR new_sd; + HANDLE file; + DWORD size; + ACL *dacl; + + /* The EA Origin client sets the SD owner of a directory to Administrators, + * while using the default DACL, and subsequently tries to create + * subdirectories. */ + + size = sizeof(sid_buffer); + CreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &size); + + ret = CheckTokenMembership(NULL, admin_sid, &present); + ok(ret, "got error %u\n", GetLastError()); + if (!present) + { + skip("user is not an administrator\n"); + return; + } + + GetTempPathA(ARRAY_SIZE(temp_path), temp_path); + sprintf(path, "%s\\testdir", temp_path); + + ret = CreateDirectoryA(path, NULL); + ok(ret, "got error %u\n", GetLastError()); + + file = CreateFileA(path, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(file, DACL_SECURITY_INFORMATION, sd_buffer, sizeof(sd_buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + + InitializeSecurityDescriptor(&new_sd, SECURITY_DESCRIPTOR_REVISION); + + ret = SetSecurityDescriptorOwner(&new_sd, admin_sid, FALSE); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(&new_sd, present, dacl, defaulted); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(file, OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, &new_sd); + ok(ret, "got error %u\n", GetLastError()); + + CloseHandle(file); + + sprintf(path, "%s\\testdir\\subdir", temp_path); + ret = CreateDirectoryA(path, NULL); + todo_wine ok(ret, "got error %u\n", GetLastError()); + + ret = RemoveDirectoryA(path); + todo_wine ok(ret, "got error %u\n", GetLastError()); + sprintf(path, "%s\\testdir", temp_path); + ret = RemoveDirectoryA(path); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -8983,6 +9051,7 @@ START_TEST(security) test_elevation(); test_mandatory_integrity(); test_shell_token(); + test_group_as_file_owner(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.30.2

2 3

[PATCH 4/4] jscript: Support replacer argument in JSON.stringify.
by Jacek Caban 20 Apr '21

20 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/json.c | 38 +++++++++++++++++++++++++++++++------- dlls/jscript/tests/api.js | 21 ++++++++++++++++++++- 2 files changed, 51 insertions(+), 8 deletions(-)

1 0

[PATCH 3/4] jscript: Pass container object and property name to stringify.
by Jacek Caban 20 Apr '21

20 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/json.c | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-)

1 0

[PATCH 1/4] jscript: Use enum to pass enumeration type to jsdisp_next_prop.
by Jacek Caban 20 Apr '21

20 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 8 ++++---- dlls/jscript/jscript.h | 7 ++++++- dlls/jscript/object.c | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-)

1 0

[PATCH 1/5] wined3d: Pass a wined3d_device_context to wined3d_device_get_rendertarget_view().
by Zebediah Figura 20 Apr '21

20 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 6 ++++-- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 460e9c2bf4a..b95423c4c7c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2054,6 +2054,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D UINT render_target_view_count, ID3D11RenderTargetView **render_target_views, ID3D11DepthStencilView **depth_stencil_view) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_rendertarget_view *wined3d_view; @@ -2068,7 +2069,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D for (i = 0; i < render_target_view_count; ++i) { - if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + if (!(wined3d_view = wined3d_device_context_get_rendertarget_view(context->wined3d_context, i)) || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { render_target_views[i] = NULL; @@ -5417,7 +5418,8 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa for (i = 0; i < view_count; ++i) { - if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + if (!(wined3d_view = wined3d_device_context_get_rendertarget_view( + device->immediate_context.wined3d_context, i)) || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { render_target_views[i] = NULL; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fe36f70c075..4f76a55172c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1505,7 +1505,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, /* If no render target is passed in check the size against the current RT */ if (!render_target) { - if (!(original_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(original_rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return D3DERR_NOTFOUND; @@ -1570,7 +1570,7 @@ static HRESULT WINAPI d3d8_device_GetRenderTarget(IDirect3DDevice8 *iface, IDire return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if ((wined3d_rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { /* We want the sub resource parent here, since the view itself may be * internal to wined3d and may not have a parent. */ @@ -1737,7 +1737,7 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return D3DERR_NOTFOUND; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 139e4f3f6e4..f7a6e04beae 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1151,7 +1151,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, } } - rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); + rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent(rtv); for (i = 1; i < ARRAY_SIZE(device->render_targets); ++i) device->render_targets[i] = NULL; @@ -2060,7 +2060,7 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO } wined3d_mutex_lock(); - if ((wined3d_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, idx))) + if ((wined3d_rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, idx))) { /* We want the sub resource parent here, since the view itself may be * internal to wined3d and may not have a parent. */ @@ -4852,7 +4852,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine * generation). */ wined3d_mutex_lock(); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent( - wined3d_device_get_rendertarget_view(device->wined3d_device, 0)); + wined3d_device_context_get_rendertarget_view(device->immediate_context, 0)); wined3d_mutex_unlock(); IDirect3D9Ex_AddRef(&parent->IDirect3D9Ex_iface); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5582e9862a1..9063c64b41f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -931,7 +931,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, goto done; } - rtv = wined3d_device_get_rendertarget_view(ddraw->wined3d_device, 0); + rtv = wined3d_device_context_get_rendertarget_view(ddraw->immediate_context, 0); /* Rendering to ddraw->wined3d_frontbuffer. */ if (rtv && !wined3d_rendertarget_view_get_sub_resource_parent(rtv)) rtv = NULL; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0a0d1edd848..c3681cc9440 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3434,7 +3434,7 @@ static void d3d_device_sync_rendertarget(struct d3d_device *device) if (device->hardware_device) return; - if ((rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if ((rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) ddraw_surface_get_draw_texture(wined3d_rendertarget_view_get_parent(rtv), DDRAW_SURFACE_RW); if ((rtv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) @@ -5359,7 +5359,7 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return DDERR_INVALIDCAPS; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 86cda045d92..51179db05dd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1343,7 +1343,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * if (dst_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; - rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0); + rtv = wined3d_device_context_get_rendertarget_view(dst_impl->ddraw->immediate_context, 0); dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); texture_memory = dst_ddraw_texture->texture_memory; draw_texture = dst_impl->draw_texture; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 4a415c4daf1..ada3f1757b7 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -406,7 +406,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE if (device->version > 1) { - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return DDERR_INVALIDCAPS; @@ -1035,7 +1035,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI if (device->version > 1) { - if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + if (!(rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) { wined3d_mutex_unlock(); return DDERR_INVALIDCAPS; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 33b06b44c29..40ee9739c5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5391,21 +5391,21 @@ void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *con query->state = QUERY_SIGNALLED; } -struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, - unsigned int view_idx) +struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( + const struct wined3d_device_context *context, unsigned int view_idx) { unsigned int max_rt_count; - TRACE("device %p, view_idx %u.\n", device, view_idx); + TRACE("context %p, view_idx %u.\n", context, view_idx); - max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + max_rt_count = context->device->adapter->d3d_info.limits.max_rt_count; if (view_idx >= max_rt_count) { WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } - return device->cs->c.state->fb.render_targets[view_idx]; + return context->state->fb.render_targets[view_idx]; } struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 442b06ed4ea..8a01bf1711f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -85,7 +85,6 @@ @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) -@ cdecl wined3d_device_get_rendertarget_view(ptr long) @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_state(ptr) @ cdecl wined3d_device_get_stream_output(ptr long ptr) @@ -169,6 +168,7 @@ @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) +@ cdecl wined3d_device_context_get_rendertarget_view(ptr long) @ cdecl wined3d_device_context_get_sampler(ptr long long) @ cdecl wined3d_device_context_get_scissor_rects(ptr ptr ptr) @ cdecl wined3d_device_context_get_shader(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e5e522e9fb2..fd9840379d3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2418,8 +2418,6 @@ struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wine HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); -struct wined3d_rendertarget_view * __cdecl wined3d_device_get_rendertarget_view(const struct wined3d_device *device, - unsigned int view_idx); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); struct wined3d_state * __cdecl wined3d_device_get_state(struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_stream_output(struct wined3d_device *device, @@ -2564,6 +2562,8 @@ struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_st const struct wined3d_device_context *context, unsigned int *stencil_ref); struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state( struct wined3d_device_context *context); +struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_rendertarget_view( + const struct wined3d_device_context *context, unsigned int view_idx); struct wined3d_sampler * __cdecl wined3d_device_context_get_sampler(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_context_get_scissor_rects(const struct wined3d_device_context *context, -- 2.30.2

4 12

[PATCH v2] wined3d: Prevent buildup of retired buffer objects' memory.
by Jan Sikorski 20 Apr '21

20 Apr '21

Submit current command buffer in wined3d_context_vk_get_command_buffer() and return a new one if the total size of retired buffer objects on that command buffer crosses a predefined threshold. One way this issue may arise is when an application, by repeatedly doing resource updates, does not trigger a flush of the command buffer and accumulates transient staging buffers. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2: Changed accumulator type to VkDeviceSize, changed naming, added extra explanation to the commit message. --- dlls/wined3d/context_vk.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 45133eabb69..8719d54644b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -921,6 +921,9 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); + + if (bo->command_buffer_id == context_vk->current_command_buffer.id) + context_vk->retired_bo_size += bo->size; } void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) @@ -1509,9 +1512,14 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk buffer = &context_vk->current_command_buffer; if (buffer->vk_command_buffer) { - TRACE("Returning existing command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - return buffer->vk_command_buffer; + if (context_vk->retired_bo_size > WINED3D_RETIRED_BO_SIZE_THRESHOLD) + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + else + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } } command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; @@ -1628,6 +1636,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->completed_command_buffer_id = 0; buffer->id = 1; } + context_vk->retired_bo_size = 0; wined3d_context_vk_cleanup_resources(context_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3e3752ed71..0ef6e89f1f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2549,6 +2549,7 @@ struct wined3d_context_vk VkCommandPool vk_command_pool; struct wined3d_command_buffer_vk current_command_buffer; uint64_t completed_command_buffer_id; + VkDeviceSize retired_bo_size; struct { @@ -3921,6 +3922,7 @@ struct wined3d_null_views_vk #define WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT 15 #define WINED3D_ALLOCATOR_MIN_BLOCK_SIZE (WINED3D_ALLOCATOR_CHUNK_SIZE >> (WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1)) #define WINED3D_SLAB_BO_MIN_OBJECT_ALIGN 16 +#define WINED3D_RETIRED_BO_SIZE_THRESHOLD (64 * 1024 * 1024) struct wined3d_allocator_chunk { -- 2.31.0

2 1

[PATCH] wined3d: Use wglSetPixelFormatWINE() in wined3d_context_gl_set_pixel_format() if we can.
by Henri Verbeet 20 Apr '21

20 Apr '21

Based on a patch by Connor McAdams. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 63 ++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 123214afd5d..43c086ac758 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1186,6 +1186,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte int format = context_gl->pixel_format; HDC dc = context_gl->dc; int current; + HWND win; if (private && context_gl->dc_has_format) return TRUE; @@ -1196,55 +1197,43 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); if (current == format) goto success; - if (!current) - { - if (!SetPixelFormat(dc, format, NULL)) - { - /* This may also happen if the dc belongs to a destroyed window. */ - WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", - format, dc, GetLastError()); - return FALSE; - } - - context_gl->restore_pf = 0; - context_gl->restore_pf_win = private ? NULL : WindowFromDC(dc); - goto success; - } - /* By default WGL doesn't allow pixel format adjustments but we need it * here. For this reason there's a Wine specific wglSetPixelFormat() - * which allows us to set the pixel format multiple times. Only use it - * when really needed. */ + * which allows us to set the pixel format multiple times. Use it when we + * can, because even though no pixel format may currently be set, the + * application may try to set one later. */ if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HWND win; - if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format))) { ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", format, dc); return FALSE; } - - win = private ? NULL : WindowFromDC(dc); - if (win != context_gl->restore_pf_win) - { - wined3d_context_gl_restore_pixel_format(context_gl); - - context_gl->restore_pf = private ? 0 : current; - context_gl->restore_pf_win = win; - } - - goto success; + } + else if (current) + { + /* OpenGL doesn't allow pixel format adjustments. Print an error and + * continue using the old format. There's a big chance that the old + * format works although with a performance hit and perhaps rendering + * errors. */ + ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", + format, dc, current); + return TRUE; + } + else if (!SetPixelFormat(dc, format, NULL)) + { + /* This may also happen if the dc belongs to a destroyed window. */ + WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", + format, dc, GetLastError()); + return FALSE; } - /* OpenGL doesn't allow pixel format adjustments. Print an error and - * continue using the old format. There's a big chance that the old - * format works although with a performance hit and perhaps rendering - * errors. */ - ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", - format, dc, current); - return TRUE; + win = private ? NULL : WindowFromDC(dc); + if (win != context_gl->restore_pf_win) + wined3d_context_gl_restore_pixel_format(context_gl); + context_gl->restore_pf = private ? 0 : current; + context_gl->restore_pf_win = win; success: if (private) -- 2.20.1

1 0

[PATCH] ntdll: Implement NtGetNextThread().
by Paul Gofman 20 Apr '21

20 Apr '21

Largely based on a patch by Nikolay Sivov for NtGetNextProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Used by Forza Horizon 4. dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/om.c | 86 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 26 ++++++++++++ server/protocol.def | 12 ++++++ server/thread.c | 52 ++++++++++++++++++++++++ 5 files changed, 177 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a93fa08c406..cade83da4b1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -223,6 +223,7 @@ @ stdcall -norelay -syscall NtGetContextThread(long ptr) @ stdcall -syscall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState +@ stdcall -syscall NtGetNextThread(ptr ptr long long long ptr) @ stdcall -syscall NtGetNlsSectionPtr(long long long ptr ptr) @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e0988769c9c..eb1ebe8dd80 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -78,6 +78,7 @@ static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); static NTSTATUS (WINAPI *pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); +static NTSTATUS (WINAPI *pNtGetNextThread)(HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes, ULONG flags, HANDLE *handle); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2564,6 +2565,89 @@ static void test_object_types(void) } } +static DWORD WINAPI test_get_next_thread_proc( void *arg ) +{ + HANDLE event = (HANDLE)arg; + + WaitForSingleObject(event, INFINITE); + return 0; +} + +static void test_get_next_thread(void) +{ + HANDLE hprocess = GetCurrentProcess(); + HANDLE handle, thread, event, prev; + NTSTATUS status; + DWORD thread_id; + BOOL found; + + if (!pNtGetNextThread) + { + win_skip("NtGetNextThread is not available.\n"); + return; + } + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + + thread = CreateThread( NULL, 0, test_get_next_thread_proc, event, 0, &thread_id ); + + status = pNtGetNextThread(hprocess, NULL, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexected status %#x.\n", status); + + found = FALSE; + prev = NULL; + while (!(status = pNtGetNextThread(hprocess, prev, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle))) + { + if (prev) + { + if (GetThreadId(handle) == thread_id) + found = TRUE; + pNtClose(prev); + } + else + { + ok(GetThreadId(handle) == GetCurrentThreadId(), "Got unexpected thread id %04x, current %04x.\n", + GetThreadId(handle), GetCurrentThreadId()); + } + prev = handle; + } + pNtClose(prev); + ok(status == STATUS_NO_MORE_ENTRIES, "Unexpected status %#x.\n", status); + ok(found, "Thread not found.\n"); + + status = pNtGetNextThread((void *)0xdeadbeef, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + status = pNtGetNextThread(hprocess, (void *)0xdeadbeef, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + + /* Reversed search only supported in recent enough Win10. */ + status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 1, &handle); + ok(!status || broken(status == STATUS_INVALID_PARAMETER), "Unexpected status %#x.\n", status); + if (!status) + pNtClose(handle); + + status = pNtGetNextThread(hprocess, 0, PROCESS_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 2, &handle); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %#x.\n", status); + + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + + found = FALSE; + prev = NULL; + while (!(status = pNtGetNextThread(hprocess, prev, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, &handle))) + { + if (prev) + pNtClose(prev); + if (GetThreadId(handle) == thread_id) + found = TRUE; + prev = handle; + } + pNtClose(prev); + ok(found, "Thread not found.\n"); + + CloseHandle(thread); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2615,6 +2699,7 @@ START_TEST(om) pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); pNtCreateDebugObject = (void *)GetProcAddress(hntdll, "NtCreateDebugObject"); + pNtGetNextThread = (void *)GetProcAddress(hntdll, "NtGetNextThread"); test_case_sensitive(); test_namespace_pipe(); @@ -2632,4 +2717,5 @@ START_TEST(om) test_wait_on_address(); test_process(); test_object_types(); + test_get_next_thread(); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index b1c64f6f7a8..62cee1d848b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1382,3 +1382,29 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void) /* fallback to the first processor */ return 0; } + + +/****************************************************************************** + * NtGetNextThread (NTDLL.@) + */ +NTSTATUS WINAPI NtGetNextThread(HANDLE hprocess, HANDLE hthread, ACCESS_MASK access, ULONG attributes, + ULONG flags, HANDLE *handle) +{ + NTSTATUS ret; + + TRACE( "hprocess %p, hthread %p, access %#x, attributes %#x, flags %#x, handle %p.\n", + hprocess, hthread, access, attributes, flags, handle ); + + SERVER_START_REQ( get_next_thread ) + { + req->process = wine_server_obj_handle( hprocess ); + req->last = wine_server_obj_handle( hthread ); + req->access = access; + req->attributes = attributes; + req->flags = flags; + ret = wine_server_call( req ); + if (!ret) *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/server/protocol.def b/server/protocol.def index 9ea6967acdd..a5ba8a4ca35 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3699,3 +3699,15 @@ struct handle_info @REQ(resume_process) obj_handle_t handle; /* process handle */ @END + + +/* Iterate thread list for process */ +(a)REQ(get_next_thread) + obj_handle_t process; /* process handle */ + obj_handle_t last; /* thread handle to start with */ + unsigned int access; /* desired access for returned handle */ + unsigned int attributes; /* returned handle attributes */ + unsigned int flags; /* controls iteration direction */ +(a)REPLY + obj_handle_t handle; /* next thread handle */ +(a)END diff --git a/server/thread.c b/server/thread.c index fe9f9bdec37..bdfafeec25a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1950,3 +1950,55 @@ DECL_HANDLER(get_selector_entry) release_object( thread ); } } + +/* Iterate thread list for process. Use global thread list to also + * return terminated but not yet destroyed threads. */ +DECL_HANDLER(get_next_thread) +{ + struct thread *thread, *next; + struct process *process; + struct list *ptr; + + reply->handle = 0; + + if ( req->flags > 1 ) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!(process = get_process_from_handle( req->process, PROCESS_QUERY_INFORMATION ))) + return; + + if (!req->last) + { + ptr = req->flags ? list_tail( &thread_list ) : list_head( &thread_list ); + } + else if ((thread = get_thread_from_handle( req->last, 0 ))) + { + ptr = req->flags ? list_prev( &thread_list, &thread->entry ) : + list_next( &thread_list, &thread->entry ); + release_object( thread ); + } + else + { + release_object( process ); + return; + } + + while (ptr) + { + next = LIST_ENTRY( ptr, struct thread, entry ); + if (next->process == process + && (reply->handle = alloc_handle( current->process, next, req->access, req->attributes ))) + { + release_object( process ); + return; + } + ptr = req->flags ? list_prev( &thread_list, &next->entry ) + : list_next( &thread_list, &next->entry ); + } + + set_error( STATUS_NO_MORE_ENTRIES ); + release_object( process ); +} -- 2.30.2

2 1