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

[PATCH 1/2] wined3d: Store stencil reference value in wined3d_state.
by Jan Sikorski 03 Feb '21

03 Feb '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 15 +++------------ dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/cs.c | 15 +++++++++++---- dlls/wined3d/device.c | 25 +++++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 4 ++-- 10 files changed, 47 insertions(+), 38 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 7fef636b883..cdae1104efa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -583,8 +583,6 @@ struct d3d_device struct wine_rb_tree depthstencil_states; struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - - UINT stencil_ref; }; static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d24ec0ef0ba..fcbcc64a636 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -881,27 +881,19 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_depthstencil_state *state_impl; - const D3D11_DEPTH_STENCIL_DESC *desc; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - device->stencil_ref = stencil_ref; if (!(state_impl = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL); + wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL, 0); wined3d_mutex_unlock(); return; } - wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state); - desc = &state_impl->desc; - - if (desc->StencilEnable) - { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILREF, stencil_ref); - } + wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state, stencil_ref); wined3d_mutex_unlock(); } @@ -2022,7 +2014,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device))) + if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device, stencil_ref))) { state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); @@ -2031,7 +2023,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 { *depth_stencil_state = NULL; } - *stencil_ref = device->stencil_ref; wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d2ac652ab62..62032fb74c5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -43,6 +43,7 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_STREAMSRC, {STATE_STREAMSRC, state_nop}}, {STATE_VDECL, {STATE_VDECL, state_nop}}, {STATE_DEPTH_STENCIL, {STATE_DEPTH_STENCIL, state_nop}}, + {STATE_STENCIL_REF, {STATE_STENCIL_REF, state_nop}}, {STATE_RASTERIZER, {STATE_RASTERIZER, state_nop}}, {STATE_SCISSORRECT, {STATE_SCISSORRECT, state_nop}}, {STATE_POINTSPRITECOORDORIGIN, {STATE_POINTSPRITECOORDORIGIN, state_nop}}, @@ -116,7 +117,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_ANISOTROPY), {STATE_RENDER(WINED3D_RS_ANISOTROPY), state_nop}}, {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_nop}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), state_nop}}, - {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_RENDER(WINED3D_RS_STENCILREF), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 841b3d742c6..55127e44a00 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2076,7 +2076,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(d->desc.front.func); key->ds_desc.front.compareMask = d->desc.stencil_read_mask; key->ds_desc.front.writeMask = d->desc.stencil_write_mask; - key->ds_desc.front.reference = state->render_states[WINED3D_RS_STENCILREF] + key->ds_desc.front.reference = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); key->ds_desc.back.failOp = vk_stencil_op_from_wined3d(d->desc.back.fail_op); @@ -2085,7 +2085,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.compareOp = vk_compare_op_from_wined3d(d->desc.back.func); key->ds_desc.back.compareMask = d->desc.stencil_read_mask; key->ds_desc.back.writeMask = d->desc.stencil_write_mask; - key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] + key->ds_desc.back.reference = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 56df760145a..e09b1fb9725 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -275,6 +275,7 @@ struct wined3d_cs_set_depth_stencil_state { enum wined3d_cs_op opcode; struct wined3d_depth_stencil_state *state; + unsigned int stencil_ref; }; struct wined3d_cs_set_rasterizer_state @@ -1235,7 +1236,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) device_invalidate_state(device, STATE_RASTERIZER); if (prev->format->stencil_size != op->view->format->stencil_size) - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); + device_invalidate_state(device, STATE_STENCIL_REF); } device_invalidate_state(device, STATE_FRAMEBUFFER); @@ -1665,19 +1666,25 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend static void wined3d_cs_exec_set_depth_stencil_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_depth_stencil_state *op = data; + struct wined3d_state *state = &cs->state; - cs->state.depth_stencil_state = op->state; - device_invalidate_state(cs->device, STATE_DEPTH_STENCIL); + if (state->depth_stencil_state != op->state) { + state->depth_stencil_state = op->state; + device_invalidate_state(cs->device, STATE_DEPTH_STENCIL); + } + state->stencil_ref = op->stencil_ref; + device_invalidate_state(cs->device, STATE_STENCIL_REF); } void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state) + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_cs_set_depth_stencil_state *op; op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE; op->state = state; + op->stencil_ref = stencil_ref; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c16a3c691e..feaef2ef18f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1774,28 +1774,30 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w } void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state) + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_depth_stencil_state *prev; - TRACE("device %p, state %p.\n", device, state); + TRACE("device %p, state %p, stencil_ref %u.\n", device, state, stencil_ref); prev = device->state.depth_stencil_state; - if (prev == state) + if (prev == state && device->state.stencil_ref == stencil_ref) return; if (state) wined3d_depth_stencil_state_incref(state); device->state.depth_stencil_state = state; - wined3d_cs_emit_set_depth_stencil_state(device->cs, state); + device->state.stencil_ref = stencil_ref; + wined3d_cs_emit_set_depth_stencil_state(device->cs, state, stencil_ref); if (prev) wined3d_depth_stencil_state_decref(prev); } -struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device) +struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, unsigned int *stencil_ref) { - TRACE("device %p.\n", device); + TRACE("device %p, stencil_ref %p.\n", device, stencil_ref); + *stencil_ref = device->state.stencil_ref; return device->state.depth_stencil_state; } @@ -3704,6 +3706,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_STENCILENABLE: case WINED3D_RS_STENCILFAIL: case WINED3D_RS_STENCILFUNC: + case WINED3D_RS_STENCILREF: case WINED3D_RS_STENCILMASK: case WINED3D_RS_STENCILPASS: case WINED3D_RS_STENCILWRITEMASK: @@ -3848,6 +3851,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_depth_stencil_state *depth_stencil_state; struct wined3d_depth_stencil_state_desc desc; struct wine_rb_entry *entry; + unsigned int stencil_ref; memset(&desc, 0, sizeof(desc)); switch (state->rs[WINED3D_RS_ZENABLE]) @@ -3887,15 +3891,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.back = desc.front; } + if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_STENCILREF)) + stencil_ref = state->rs[WINED3D_RS_STENCILREF]; + else + wined3d_device_get_depth_stencil_state(device, &stencil_ref); + if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { depth_stencil_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_depth_stencil_state, entry); - wined3d_device_set_depth_stencil_state(device, depth_stencil_state); + wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); } else if (SUCCEEDED(wined3d_depth_stencil_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device, depth_stencil_state); + wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); if (wine_rb_put(&device->depth_stencil_states, &desc, &depth_stencil_state->entry) == -1) { ERR("Failed to insert depth/stencil state.\n"); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 040a9f81083..f72fd3e3ae3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2469,6 +2469,7 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_BLEND_FACTOR, {STATE_VDECL}}, {STATE_SAMPLE_MASK, {STATE_VDECL}}, {STATE_DEPTH_STENCIL, {STATE_VDECL}}, + {STATE_STENCIL_REF, {STATE_VDECL}}, {STATE_STREAMSRC, {STATE_VDECL}}, {STATE_VDECL, {STATE_VDECL, state_nop}}, {STATE_RASTERIZER, {STATE_VDECL}}, @@ -2545,7 +2546,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_ANISOTROPY), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e40c23daf03..f454a7a3801 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1070,7 +1070,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(d->desc.back.func))) func_back = GL_ALWAYS; mask = d->desc.stencil_read_mask; - ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + ref = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(d->desc.front.fail_op); depthFail = gl_stencil_op(d->desc.front.depth_fail_op); stencilPass = gl_stencil_op(d->desc.front.pass_op); @@ -4691,6 +4691,7 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_SAMPLE_MASK, { STATE_SAMPLE_MASK, state_sample_mask_w }, WINED3D_GL_EXT_NONE }, { STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil_2s }, EXT_STENCIL_TWO_SIDE }, { STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil }, WINED3D_GL_EXT_NONE }, + { STATE_STENCIL_REF, { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE }, { STATE_VDECL, { STATE_VDECL, vdecl_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer_cc }, ARB_CLIP_CONTROL }, @@ -4775,7 +4776,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_ANISOTROPY), { STATE_RENDER(WINED3D_RS_ANISOTROPY), state_anisotropy }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FLUSHBATCH), { STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_flushbatch }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),{ STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),state_translucentsi }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_STENCILREF), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, @@ -5574,8 +5574,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 40, 40}, { 42, 45}, { 47, 47}, - { 52, 56}, - { 58, 59}, + { 52, 59}, { 61, 127}, {149, 150}, {162, 162}, @@ -5621,6 +5620,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) STATE_BLEND, STATE_BLEND_FACTOR, STATE_DEPTH_STENCIL, + STATE_STENCIL_REF, }; unsigned int i, current; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 101c0287936..f959cd51d68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1827,7 +1827,10 @@ enum wined3d_pipeline #define STATE_DEPTH_STENCIL (STATE_SAMPLE_MASK + 1) #define STATE_IS_DEPTH_STENCIL(a) ((a) == STATE_DEPTH_STENCIL) -#define STATE_COMPUTE_OFFSET (STATE_DEPTH_STENCIL + 1) +#define STATE_STENCIL_REF (STATE_DEPTH_STENCIL + 1) +#define STATE_IS_SAMPLE_REF(a) ((a) == STATE_STENCIL_REF) + +#define STATE_COMPUTE_OFFSET (STATE_STENCIL_REF + 1) #define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) #define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) @@ -3701,6 +3704,7 @@ struct wined3d_state struct wined3d_color blend_factor; unsigned int sample_mask; struct wined3d_depth_stencil_state *depth_stencil_state; + unsigned int stencil_ref; struct wined3d_rasterizer_state *rasterizer_state; }; @@ -4740,7 +4744,7 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state) DECLSPEC_HIDDEN; + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 310911992ae..96cb6fc1d86 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2392,7 +2392,7 @@ struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wine struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_get_depth_stencil_state( - const struct wined3d_device *device); + const struct wined3d_device *device, unsigned int *stencil_ref); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, @@ -2480,7 +2480,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); void __cdecl wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state); + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); -- 2.30.0

2 6

[PATCH v3] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

v3: Fixed test failures under Windows Vista. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 16 ++++++++++++---- dlls/shell32/tests/shelllink.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 46d9bc994ff..69d610f2503 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + if (!This->filepath) return S_OK; + + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +384,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1d..7245f5533f6 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -451,6 +451,12 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) IPersistFile_GetCurFile(pf, NULL); } + r = IPersistFile_Save(pf, NULL, FALSE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); @@ -467,6 +473,16 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); CoTaskMemFree(str); + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + IPersistFile_Release(pf); } -- 2.29.2

1 0

[PATCH v2] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 16 ++++++++++++---- dlls/shell32/tests/shelllink.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 46d9bc994ff..69d610f2503 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + if (!This->filepath) return S_OK; + + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +384,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1d..60271ace2ce 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -451,6 +451,12 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) IPersistFile_GetCurFile(pf, NULL); } + r = IPersistFile_Save(pf, NULL, FALSE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); @@ -467,6 +473,16 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); CoTaskMemFree(str); + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + IPersistFile_Release(pf); } -- 2.29.2

2 1

[PATCH 2/2] msvcp90: Add _Wcsxfrm implementation.
by Piotr Caban 03 Feb '21

03 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50401 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 37 +++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 24 +++++++++++++++++++ 10 files changed, 69 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] msvcp90: Return required buffer size in _Strxfrm.
by Piotr Caban 03 Feb '21

03 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH] msvcr120: Run strtof tests once.
by Piotr Caban 03 Feb '21

03 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] wbemprox: Fix Windows 8/8.1 caption.
by Hans Leidekker 03 Feb '21

03 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50610 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1cf75ab380..b86326327fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3436,8 +3436,8 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win8W, sizeof(win8W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win8W, sizeof(win8W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) { if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, win7W, sizeof(win7W) ); -- 2.30.0

1 0

[PATCH v2 1/2] wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

For some reason testbot chokes on UTF-8 character in Copyright while applying the patch, this version of the patch doesn't change the Copyright header. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 27 +++++++++++++++++++++++++++ include/winevt.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index f7aa7a2a593..1e06a2089e9 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -19,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winevt.h" @@ -26,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); +static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log"; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -63,6 +68,28 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, { FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, PropertyValueBuffer, PropertyValueBufferUsed); + + switch (PropertyId) + { + case EvtChannelLoggingConfigLogFilePath: + *PropertyValueBufferUsed = sizeof(log_pathW) + sizeof(EVT_VARIANT); + + if (PropertyValueBufferSize < sizeof(log_pathW) + sizeof(EVT_VARIANT) || !PropertyValueBuffer) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + PropertyValueBuffer->u.StringVal = (LPWSTR)(PropertyValueBuffer + 1); + wcscpy((LPWSTR)PropertyValueBuffer->u.StringVal, log_pathW); + PropertyValueBuffer->Type = EvtVarTypeString; + return TRUE; + + default: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + } + return FALSE; } diff --git a/include/winevt.h b/include/winevt.h index a37954f2f94..c41ca7b5ffa 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -62,6 +62,36 @@ typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionDeliver } EVT_SUBSCRIBE_NOTIFY_ACTION; +typedef enum _EVT_VARIANT_TYPE { + EvtVarTypeNull, + EvtVarTypeString, + EvtVarTypeAnsiString, + EvtVarTypeSByte, + EvtVarTypeByte, + EvtVarTypeInt16, + EvtVarTypeUInt16, + EvtVarTypeInt32, + EvtVarTypeUInt32, + EvtVarTypeInt64, + EvtVarTypeUInt64, + EvtVarTypeSingle, + EvtVarTypeDouble, + EvtVarTypeBoolean, + EvtVarTypeBinary, + EvtVarTypeGuid, + EvtVarTypeSizeT, + EvtVarTypeFileTime, + EvtVarTypeSysTime, + EvtVarTypeSid, + EvtVarTypeHexInt32, + EvtVarTypeHexInt64, + EvtVarTypeEvtHandle = 32, + EvtVarTypeEvtXml = 35 +} EVT_VARIANT_TYPE; + +#define EVT_VARIANT_TYPE_MASK 0x7f +#define EVT_VARIANT_TYPE_ARRAY 128 + typedef struct _EVT_VARIANT { union { BOOL BooleanVal; -- 2.29.2

2 1

[PATCH v2 2/2] wevtapi/tests: Add some EvtGetChannelConfigProperty() tests.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wevtapi/Makefile.in | 1 + dlls/wevtapi/main.c | 1 - dlls/wevtapi/tests/Makefile.in | 5 +++ dlls/wevtapi/tests/wevtapi.c | 74 ++++++++++++++++++++++++++++++++++ include/winevt.h | 1 + 6 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 dlls/wevtapi/tests/Makefile.in create mode 100644 dlls/wevtapi/tests/wevtapi.c diff --git a/configure.ac b/configure.ac index a9003523700..3a0bc6e713a 100644 --- a/configure.ac +++ b/configure.ac @@ -3756,6 +3756,7 @@ WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) +WINE_CONFIG_MAKEFILE(dlls/wevtapi/tests) WINE_CONFIG_MAKEFILE(dlls/wevtsvc) WINE_CONFIG_MAKEFILE(dlls/wiaservc) WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index 9b742fe9aeb..c80aac26d3a 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = wevtapi.dll +IMPORTLIB = wevtapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in new file mode 100644 index 00000000000..47fde74b0eb --- /dev/null +++ b/dlls/wevtapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wevtapi.dll +IMPORTS = wevtapi advapi32 + +C_SRCS = \ + wevtapi.c diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c new file mode 100644 index 00000000000..a0a21aa9971 --- /dev/null +++ b/dlls/wevtapi/tests/wevtapi.c @@ -0,0 +1,74 @@ +/* + * Copyright 2021 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winevt.h" +#include "wine/test.h" + +static void test_EvtGetChannelConfigProperty(void) +{ + HKEY key; + EVT_HANDLE config; + DWORD size, ret; + struct + { + EVT_VARIANT var; + WCHAR buf[MAX_PATH]; + } path; + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\EventLog\\Winetest", &key); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not enough privileges to modify HKLM\n"); + return; + } + ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret); + + config = EvtOpenChannelConfig(NULL, L"Winetest", 0); + ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError()); + + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size); + ok(!ret, "EvtGetChannelConfigProperty should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size < sizeof(path), "got %u\n", size); + + memset(&path, 0, sizeof(path)); + path.var.Count = 0xdeadbeef; + path.var.Type = 0xdeadbeef; + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size); + ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError()); + ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count); + ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size); + ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); + + EvtClose(config); + + RegDeleteKeyW(key, L""); + RegCloseKey(key); +} + +START_TEST(wevtapi) +{ + test_EvtGetChannelConfigProperty(); +} diff --git a/include/winevt.h b/include/winevt.h index c41ca7b5ffa..f9f73ba18c4 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -144,6 +144,7 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); +BOOL WINAPI EvtClose(EVT_HANDLE); BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, -- 2.29.2

1 0

[PATCH v2 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye 03 Feb '21

03 Feb '21

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 78 ++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..9d74caca986 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2338,6 +2338,83 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ptr = ptr->Next; + } + ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} START_TEST(iphlpapi) { @@ -2370,6 +2447,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1

1 1