- Wine-Devel - list.winehq.org

[PATCH v2 1/5] wined3d: Pass a wined3d_device_context to wined3d_device_get_blend_state().
by Zebediah Figura April 16, 2021

April 16, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 4 ++-- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 ++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d93256e77ad..70d14c7f2c5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2137,7 +2137,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext1 *iface, ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; @@ -2145,7 +2145,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_blend_state(device->wined3d_device, + if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, (struct wined3d_color *)blend_factor, sample_mask))) { blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 974db90037d..39701886450 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1603,12 +1603,12 @@ void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, wined3d_device_context_set_blend_state(&device->cs->c, blend_state, blend_factor, sample_mask); } -struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct wined3d_device *device, +struct wined3d_blend_state * CDECL wined3d_device_context_get_blend_state(const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *state = context->state; - TRACE("device %p, blend_factor %p, sample_mask %p.\n", device, blend_factor, sample_mask); + TRACE("context %p, blend_factor %p, sample_mask %p.\n", context, blend_factor, sample_mask); *blend_factor = state->blend_factor; *sample_mask = state->sample_mask; @@ -3921,6 +3921,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; const struct wined3d_saved_states *changed = &stateblock->changed; const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; + struct wined3d_device_context *context = &device->cs->c; unsigned int i, j, start, idx; struct wined3d_range range; uint32_t map; @@ -4153,7 +4154,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, state->rs[WINED3D_RS_BLENDFACTOR]); else - wined3d_device_get_blend_state(device, &colour, &sample_mask); + wined3d_device_context_get_blend_state(context, &colour, &sample_mask); if ((entry = wine_rb_get(&device->blend_states, &desc))) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 406e511c0f6..35fbc44ee64 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -55,7 +55,6 @@ @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) -@ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @@ -170,6 +169,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1a58c671934..5b936017191 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2565,6 +2565,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_blend_state * __cdecl wined3d_device_context_get_blend_state( + const struct wined3d_device_context *context, struct wined3d_color *blend_factor, unsigned int *sample_mask); struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, -- 2.30.2

1 4

[PATCH] mshtml: Fix DISPID_IE8_ELEMENTMAX define.
by Jacek Caban April 15, 2021

April 15, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/documentmode.js | 2 ++ include/mshtmdid.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

2 1

[PATCH 1/4] amstream/tests: Test that streams call IMediaStreamFilter::EndOfStream.
by Anton Baskanov April 15, 2021

April 15, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/tests/amstream.c | 233 ++++++++++++++++++++++++++++++++- 1 file changed, 230 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9cefec12442..2f7854606f4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1313,6 +1313,208 @@ static const IMediaSeekingVtbl testsource_seeking_vtbl = testsource_seeking_GetPreroll, }; +struct testmediastreamfilter +{ + IMediaStreamFilter IMediaStreamFilter_iface; + LONG refcount; + unsigned int got_end_of_stream; +}; + +static inline struct testmediastreamfilter *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) +{ + return CONTAINING_RECORD(iface, struct testmediastreamfilter, IMediaStreamFilter_iface); +} + +static HRESULT WINAPI testmediastreamfilter_QueryInterface(IMediaStreamFilter *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IPersist) + || IsEqualGUID(iid, &IID_IMediaFilter) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &IID_IMediaStreamFilter)) + { + IMediaStreamFilter_AddRef(iface); + *out = iface; + return S_OK; + } + + ok(0, "Unexpected interface %s.\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI testmediastreamfilter_AddRef(IMediaStreamFilter *iface) +{ + struct testmediastreamfilter *filter = impl_from_IMediaStreamFilter(iface); + return InterlockedIncrement(&filter->refcount); +} + +static ULONG WINAPI testmediastreamfilter_Release(IMediaStreamFilter *iface) +{ + struct testmediastreamfilter *filter = impl_from_IMediaStreamFilter(iface); + return InterlockedDecrement(&filter->refcount); +} + +static HRESULT WINAPI testmediastreamfilter_GetClassID(IMediaStreamFilter *iface, CLSID *clsid) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_Stop(IMediaStreamFilter *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_Pause(IMediaStreamFilter *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_GetState(IMediaStreamFilter *iface, DWORD timeout, FILTER_STATE *state) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_SetSyncSource(IMediaStreamFilter *iface, IReferenceClock *clock) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_GetSyncSource(IMediaStreamFilter *iface, IReferenceClock **clock) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enum_pins) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_FindPin(IMediaStreamFilter *iface, const WCHAR *id, IPin **pin) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *pInfo) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_JoinFilterGraph(IMediaStreamFilter *iface, IFilterGraph *graph, const WCHAR *name) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_QueryVendorInfo(IMediaStreamFilter *iface, WCHAR **vendor_info) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaStream *stream) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_GetMediaStream(IMediaStreamFilter *iface, const MSPID *purpose_id, IMediaStream **stream) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_EnumMediaStreams(IMediaStreamFilter *iface, LONG index, IMediaStream **stream) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_SupportSeeking(IMediaStreamFilter *iface, BOOL renderer) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_Flush(IMediaStreamFilter *iface, BOOL cancel_eos) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testmediastreamfilter_EndOfStream(IMediaStreamFilter *iface) +{ + struct testmediastreamfilter *filter = impl_from_IMediaStreamFilter(iface); + ++filter->got_end_of_stream; + return S_OK; +} + +static IMediaStreamFilterVtbl testmediastreamfilter_vtbl = +{ + testmediastreamfilter_QueryInterface, + testmediastreamfilter_AddRef, + testmediastreamfilter_Release, + testmediastreamfilter_GetClassID, + testmediastreamfilter_Stop, + testmediastreamfilter_Pause, + testmediastreamfilter_Run, + testmediastreamfilter_GetState, + testmediastreamfilter_SetSyncSource, + testmediastreamfilter_GetSyncSource, + testmediastreamfilter_EnumPins, + testmediastreamfilter_FindPin, + testmediastreamfilter_QueryFilterInfo, + testmediastreamfilter_JoinFilterGraph, + testmediastreamfilter_QueryVendorInfo, + testmediastreamfilter_AddMediaStream, + testmediastreamfilter_GetMediaStream, + testmediastreamfilter_EnumMediaStreams, + testmediastreamfilter_SupportSeeking, + testmediastreamfilter_ReferenceTimeToStreamTime, + testmediastreamfilter_GetCurrentStreamTime, + testmediastreamfilter_WaitUntil, + testmediastreamfilter_Flush, + testmediastreamfilter_EndOfStream, +}; + +static void testmediastreamfilter_init(struct testmediastreamfilter *filter) +{ + memset(filter, 0, sizeof(*filter)); + filter->IMediaStreamFilter_iface.lpVtbl = &testmediastreamfilter_vtbl; +} + #define check_get_stream(a,b,c,d) check_get_stream_(__LINE__,a,b,c,d) static void check_get_stream_(int line, IAMMultiMediaStream *mmstream, IMediaStreamFilter *filter, const GUID *mspid, IMediaStream *expect) @@ -6065,9 +6267,11 @@ 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(); + struct testmediastreamfilter filter; + IAMMediaStream *am_stream; struct testfilter source; IGraphBuilder *graph; IMediaStream *stream; @@ -6122,12 +6326,35 @@ static void check_ammediastream_end_of_stream(const MSPID *id, const AM_MEDIA_TY IPin_Release(pin); ref = IMediaStream_Release(stream); ok(!ref, "Got outstanding refcount %d.\n", ref); + + testmediastreamfilter_init(&filter); + + hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&am_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(am_stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_JoinFilter(am_stream, &filter.IMediaStreamFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filter.got_end_of_stream = 0; + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(filter.got_end_of_stream == 1, "Got %d calls to IMediaStreamFilter::EndOfStream().\n", filter.got_end_of_stream); + + hr = IPin_EndOfStream(pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + todo_wine ok(filter.got_end_of_stream == 1, "Got %d calls to IMediaStreamFilter::EndOfStream().\n", filter.got_end_of_stream); + + IPin_Release(pin); + ref = IAMMediaStream_Release(am_stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); } 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 5

[PATCH] wined3d: Make some functions static.
by Henri Verbeet April 15, 2021

April 15, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c3ce959a14f..990991e2e3d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4279,13 +4279,13 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) heap_free(device_gl); } -struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { return wined3d_context_gl_acquire(device, texture, sub_resource_idx); } -void adapter_gl_release_context(struct wined3d_context *context) +static void adapter_gl_release_context(struct wined3d_context *context) { return wined3d_context_gl_release(wined3d_context_gl(context)); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7303c994eb4..0abae24fd1f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -536,7 +536,7 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) heap_free(device_vk); } -struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -549,7 +549,7 @@ struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device return &wined3d_device_vk(device)->context_vk.c; } -void adapter_vk_release_context(struct wined3d_context *context) +static void adapter_vk_release_context(struct wined3d_context *context) { TRACE("context %p.\n", context); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0a3c547e7a9..9883017f932 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2687,7 +2687,7 @@ static void adapter_no3d_destroy_device(struct wined3d_device *device) heap_free(device); } -struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -2700,7 +2700,7 @@ struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *devi return &wined3d_device_no3d(device)->context_no3d; } -void adapter_no3d_release_context(struct wined3d_context *context) +static void adapter_no3d_release_context(struct wined3d_context *context) { TRACE("context %p.\n", context); } @@ -3044,7 +3044,7 @@ static void adapter_no3d_dispatch_compute(struct wined3d_device *device, ERR("device %p, state %p, parameters %p.\n", device, state, parameters); } -void adapter_no3d_clear_uav(struct wined3d_context *context, +static void adapter_no3d_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { ERR("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8ca7afb2ec7..45e7ecd4850 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -419,7 +419,7 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -unsigned int shader_glsl_full_ffp_varyings(const struct wined3d_gl_info *gl_info) +static unsigned int shader_glsl_full_ffp_varyings(const struct wined3d_gl_info *gl_info) { /* On core profile we have to also count diffuse and specular colours and * the fog coordinate. */ -- 2.20.1

1 0

[PATCH 1/5] wined3d: Introduce wined3d_device_context_get_shader().
by Zebediah Figura April 15, 2021

April 15, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6406c7a04f..cf1e0e207de 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1901,6 +1901,14 @@ void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *cont wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type) +{ + TRACE("context %p, type %#x, shader %p.\n", context, type, shader); + + return context->state->shader[type]; +} + void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 34eba025b8a..ada2c79fb77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db5f75d7aca..33844349968 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2567,6 +2567,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context, -- 2.30.2

3 9

[PATCH v2 1/5] wined3d: Introduce wined3d_device_context_get_shader().
by Zebediah Figura April 15, 2021

April 15, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6406c7a04f..731a304a779 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1901,6 +1901,14 @@ void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *cont wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type) +{ + TRACE("context %p, type %#x.\n", context, type); + + return context->state->shader[type]; +} + void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 34eba025b8a..ada2c79fb77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db5f75d7aca..33844349968 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2567,6 +2567,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context, -- 2.30.2

3 8

[PATCH 3/3] crypt32: Handle CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG when verifying chain policy.
by Piotr Caban April 15, 2021

April 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crypt32/chain.c | 6 ++++-- dlls/crypt32/tests/chain.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH 2/3] crypt32/tests: Fix tests skipped on all test bot machines.
by Piotr Caban April 15, 2021

April 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crypt32/tests/chain.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

1 0

[PATCH 1/3] crypt32/tests: Fix tests on systems where google chain root is not trusted.
by Piotr Caban April 15, 2021

April 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crypt32/tests/chain.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

1 0

[PATCH 1/3] user32: Add nulldrv TRACE messages.
by Rémi Bernon April 15, 2021

April 15, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Identifying failures caused by the graphics driver from failures caused by some user32 bug is difficult, especially as X11 behavior changes depending on the WM. So the idea here is to make it easier to use the nulldrv driver, and try improving it so that we can run the user32 tests with it. dlls/user32/driver.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7ac77141696..68c10bf4d9a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); WINE_DECLARE_DEBUG_CHANNEL(winediag); +WINE_DECLARE_DEBUG_CHANNEL(nulldrv); static USER_DRIVER null_driver, lazy_load_driver; @@ -189,11 +190,13 @@ void USER_unload_driver(void) static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { + TRACE_(nulldrv)("layout %p, flags %x.\n", layout, flags); return 0; } static void CDECL nulldrv_Beep(void) { + TRACE_(nulldrv)("\n"); } static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) @@ -204,6 +207,8 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) ULONG_PTR baselayout; LANGID langid; + TRACE_(nulldrv)("size %d, layouts %p.\n", size, layouts); + baselayout = GetUserDefaultLCID(); langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout)); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) @@ -255,47 +260,57 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { + TRACE_(nulldrv)("lparam %d, buffer %p, size %d.\n", lparam, buffer, size); return 0; } static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) { + TRACE_(nulldrv)("thread_id %u.\n", thread_id); return 0; } static BOOL CDECL nulldrv_GetKeyboardLayoutName( LPWSTR name ) { + TRACE_(nulldrv)("name %p.\n", name); return FALSE; } static HKL CDECL nulldrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { + TRACE_(nulldrv)("name %p, flags %x.\n", name, flags); return 0; } static UINT CDECL nulldrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout ) { + TRACE_(nulldrv)("code %u, type %u, layout %p.\n", code, type, layout); return 0; } static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { + TRACE_(nulldrv)("hwnd %p, modifiers %u, vk %u.\n", hwnd, modifiers, vk); return TRUE; } static INT CDECL nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { + TRACE_(nulldrv)("virt %u, scan %u, state %p, str %p, size %d, flags %x, layout %p.\n", + virt, scan, state, str, size, flags, layout); return 0; } static BOOL CDECL nulldrv_UnloadKeyboardLayout( HKL layout ) { + TRACE_(nulldrv)("layout %p.\n", layout); return 0; } static void CDECL nulldrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { + TRACE_(nulldrv)("hwnd %p, modifiers %u, vk %u.\n", hwnd, modifiers, vk); } static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) @@ -307,49 +322,59 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) 0x258, 0x259, 0x25a, 0x01b, 0x2dc, 0x2dd, 0x336, 0x3bd }; + TRACE_(nulldrv)("ch %s, layout %p.\n", wine_dbgstr_wn(&ch, 1), layout); return ch < ARRAY_SIZE(ctrl_vks) ? ctrl_vks[ch] : -1; } static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) { + TRACE_(nulldrv)("cursor %p.\n", cursor); } static void CDECL nulldrv_SetCursor( HCURSOR cursor ) { + TRACE_(nulldrv)("cursor %p.\n", cursor); } static BOOL CDECL nulldrv_GetCursorPos( LPPOINT pt ) { + TRACE_(nulldrv)("pt %p.\n", pt); return FALSE; } static BOOL CDECL nulldrv_SetCursorPos( INT x, INT y ) { + TRACE_(nulldrv)("x %d, y %d.\n", x, y); return FALSE; } static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) { + TRACE_(nulldrv)("clip %s.\n", wine_dbgstr_rect(clip)); return FALSE; } static void CDECL nulldrv_UpdateClipboard(void) { + TRACE_(nulldrv)("\n"); } static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode, HWND hwnd, DWORD flags, LPVOID lparam ) { + TRACE_(nulldrv)("name %s, mode %p, hwnd %p, flags %x, lparam %p.\n", wine_dbgstr_w(name), mode, hwnd, flags, lparam); return DISP_CHANGE_FAILED; } static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) { + TRACE_(nulldrv)("name %s, num %#x, mode %p, flags %x.\n", wine_dbgstr_w(name), num, mode, flags); return FALSE; } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { + TRACE_(nulldrv)("hwnd %p.\n", hwnd); return TRUE; } @@ -369,37 +394,46 @@ static BOOL CDECL nodrv_CreateWindow( HWND hwnd ) static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) { + TRACE_(nulldrv)("hwnd %p.\n", hwnd); return TRUE; } static void CDECL nulldrv_DestroyWindow( HWND hwnd ) { + TRACE_(nulldrv)("hwnd %p.\n", hwnd); } static void CDECL nulldrv_FlashWindowEx( FLASHWINFO *info ) { + TRACE_(nulldrv)("info %p.\n", info); } static void CDECL nulldrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { + TRACE_(nulldrv)("hdc %p, hwnd %p, top_win %p, win_rect %s, top_rect %s, flags %x.\n", + hdc, hwnd, top_win, wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect), + flags); } static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { + TRACE_(nulldrv)("count %u, handles %p, timeout %u, mask %u, flags %x.\n", count, handles, timeout, mask, flags); return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, timeout, flags & MWMO_ALERTABLE ); } static void CDECL nulldrv_ReleaseDC( HWND hwnd, HDC hdc ) { + TRACE_(nulldrv)("hwnd %p, hdc %p.\n", hwnd, hdc); } static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) { RECT rect; + TRACE_(nulldrv)("hdc %p, dx %d, dy %d, update %p.\n", hdc, dx, dy, update); GetClipBox( hdc, &rect ); return BitBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, hdc, rect.left - dx, rect.top - dy, SRCCOPY ); @@ -407,54 +441,66 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags ) { + TRACE_(nulldrv)("hwnd %p, flags %x.\n", hwnd, flags); } static void CDECL nulldrv_SetFocus( HWND hwnd ) { + TRACE_(nulldrv)("hwnd %p.\n", hwnd); } static void CDECL nulldrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) { + TRACE_(nulldrv)("hwnd %p, key %u, alpha %d, flags %x.\n", hwnd, key, alpha, flags); } static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { + TRACE_(nulldrv)("hwnd %p, parent %p, old_parent %p.\n", hwnd, parent, old_parent); } static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { + TRACE_(nulldrv)("hwnd %p, hrgn %p, redraw %d.\n", hwnd, hrgn, redraw); } static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { + TRACE_(nulldrv)("hwnd %p, type %u, icon %p.\n", hwnd, type, icon); } static void CDECL nulldrv_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { + TRACE_(nulldrv)("hwnd %p, offset %d, style %p.\n", hwnd, offset, style); } static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text ) { + TRACE_(nulldrv)("hwnd %p, text %p.\n", hwnd, text); } static UINT CDECL nulldrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { + TRACE_(nulldrv)("hwnd %p, cmd %d, rect %s, swp %u.\n", hwnd, cmd, wine_dbgstr_rect(rect), swp); return swp; } static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { + TRACE_(nulldrv)("hwnd %p, wparam %lu, lparam %ld.\n", hwnd, wparam, lparam); return -1; } static BOOL CDECL nulldrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, const RECT *window_rect ) { + TRACE_(nulldrv)("hwnd %p, info %p, window_rect %s.\n", hwnd, info, wine_dbgstr_rect(window_rect)); return TRUE; } static LRESULT CDECL nulldrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { + TRACE_(nulldrv)("hwnd %p, msg %u, wparam %lu, lparam %ld.\n", hwnd, msg, wparam, lparam); return 0; } @@ -462,6 +508,9 @@ static void CDECL nulldrv_WindowPosChanging( HWND hwnd, HWND insert_after, UINT const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, struct window_surface **surface ) { + TRACE_(nulldrv)("hwnd %p, insert_after %p, swp_flags %x, window_rect %s, client_rect %s, visible_rect %s, surface %p.\n", + hwnd, insert_after, swp_flags, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), + wine_dbgstr_rect(visible_rect), surface); } static void CDECL nulldrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, @@ -469,15 +518,20 @@ static void CDECL nulldrv_WindowPosChanged( HWND hwnd, HWND insert_after, UINT s const RECT *visible_rect, const RECT *valid_rects, struct window_surface *surface ) { + TRACE_(nulldrv)("hwnd %p, insert_after %p, swp_flags %x, window_rect %s, client_rect %s, visible_rect %s, valid_rects %s, surface %p.\n", + hwnd, insert_after, swp_flags, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), wine_dbgstr_rect(visible_rect), + wine_dbgstr_rect(valid_rects), surface); } static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) { + TRACE_(nulldrv)("action %u, int_param %u, ptr_param %p, flags %x.\n", action, int_param, ptr_param, flags); return FALSE; } static void CDECL nulldrv_ThreadDetach( void ) { + TRACE_(nulldrv)("\n"); } static USER_DRIVER null_driver = -- 2.31.0

3 7