- wine-devel - winehq.org

[PATCH 3/3] d3d10core/tests: Add a blend factor test.
by Henri Verbeet 17 Oct '18

17 Oct '18

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 9c6ff961f91..777384558d6 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5688,8 +5688,8 @@ float4 main(float4 color : COLOR) : SV_TARGET static void test_blend(void) { + ID3D10BlendState *src_blend, *dst_blend, *dst_blend_factor; struct d3d10core_test_context test_context; - ID3D10BlendState *src_blend, *dst_blend; ID3D10RenderTargetView *offscreen_rtv; D3D10_TEXTURE2D_DESC texture_desc; ID3D10InputLayout *input_layout; @@ -5779,7 +5779,7 @@ static void test_blend(void) {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 12, D3D10_INPUT_PER_VERTEX_DATA, 0}, }; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float blend_factor[] = {0.3f, 0.4f, 0.8f, 0.9f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; if (!init_test_context(&test_context)) @@ -5818,6 +5818,14 @@ static void test_blend(void) hr = ID3D10Device_CreateBlendState(device, &blend_desc, &dst_blend); ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + blend_desc.SrcBlend = D3D10_BLEND_BLEND_FACTOR; + blend_desc.DestBlend = D3D10_BLEND_INV_BLEND_FACTOR; + blend_desc.SrcBlendAlpha = D3D10_BLEND_DEST_ALPHA; + blend_desc.DestBlendAlpha = D3D10_BLEND_INV_DEST_ALPHA; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &dst_blend_factor); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_IASetInputLayout(device, input_layout); ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); stride = sizeof(*quads); @@ -5828,9 +5836,9 @@ static void test_blend(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); - ID3D10Device_OMSetBlendState(device, src_blend, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, src_blend, NULL, D3D10_DEFAULT_SAMPLE_MASK); ID3D10Device_Draw(device, 4, 0); - ID3D10Device_OMSetBlendState(device, dst_blend, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, dst_blend, NULL, D3D10_DEFAULT_SAMPLE_MASK); ID3D10Device_Draw(device, 4, 4); color = get_texture_color(test_context.backbuffer, 320, 360); @@ -5838,6 +5846,17 @@ static void test_blend(void) color = get_texture_color(test_context.backbuffer, 320, 120); ok(compare_color(color, 0xa080007f, 1), "Got unexpected color 0x%08x.\n", color); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + + ID3D10Device_OMSetBlendState(device, dst_blend_factor, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_Draw(device, 4, 0); + ID3D10Device_Draw(device, 4, 4); + + color = get_texture_color(test_context.backbuffer, 320, 360); + ok(compare_color(color, 0x600066b3, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 320, 120); + ok(compare_color(color, 0xa0cc00b3, 1), "Got unexpected color 0x%08x.\n", color); + texture_desc.Width = 128; texture_desc.Height = 128; texture_desc.MipLevels = 1; @@ -5866,9 +5885,9 @@ static void test_blend(void) ID3D10Device_ClearRenderTargetView(device, offscreen_rtv, red); - ID3D10Device_OMSetBlendState(device, src_blend, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, src_blend, NULL, D3D10_DEFAULT_SAMPLE_MASK); ID3D10Device_Draw(device, 4, 0); - ID3D10Device_OMSetBlendState(device, dst_blend, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, dst_blend, NULL, D3D10_DEFAULT_SAMPLE_MASK); ID3D10Device_Draw(device, 4, 4); color = get_texture_color(offscreen, 64, 96) & 0x00ffffff; @@ -5879,6 +5898,7 @@ static void test_blend(void) ID3D10RenderTargetView_Release(offscreen_rtv); ID3D10Texture2D_Release(offscreen); done: + ID3D10BlendState_Release(dst_blend_factor); ID3D10BlendState_Release(dst_blend); ID3D10BlendState_Release(src_blend); ID3D10PixelShader_Release(ps); -- 2.11.0

2 1

[PATCH 2/3] d3d11/tests: Add a blend factor test.
by Henri Verbeet 17 Oct '18

17 Oct '18

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0939990e206..74b429f6e39 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6241,7 +6241,7 @@ static void test_device_context_state(void) static void test_blend(void) { - ID3D11BlendState *src_blend, *dst_blend; + ID3D11BlendState *src_blend, *dst_blend, *dst_blend_factor; struct d3d11_test_context test_context; ID3D11RenderTargetView *offscreen_rtv; D3D11_TEXTURE2D_DESC texture_desc; @@ -6333,7 +6333,7 @@ static void test_blend(void) {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float blend_factor[] = {0.3f, 0.4f, 0.8f, 0.9f}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; if (!init_test_context(&test_context, NULL)) @@ -6374,6 +6374,14 @@ static void test_blend(void) hr = ID3D11Device_CreateBlendState(device, &blend_desc, &dst_blend); ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_BLEND_FACTOR; + blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_BLEND_FACTOR; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_DEST_ALPHA; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_DEST_ALPHA; + + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &dst_blend_factor); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); stride = sizeof(*quads); @@ -6384,9 +6392,9 @@ static void test_blend(void) ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); - ID3D11DeviceContext_OMSetBlendState(context, src_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, src_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 0); - ID3D11DeviceContext_OMSetBlendState(context, dst_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, dst_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 4); color = get_texture_color(test_context.backbuffer, 320, 360); @@ -6394,6 +6402,17 @@ static void test_blend(void) color = get_texture_color(test_context.backbuffer, 320, 120); ok(compare_color(color, 0xa080007f, 1), "Got unexpected color 0x%08x.\n", color); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + + ID3D11DeviceContext_OMSetBlendState(context, dst_blend_factor, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_Draw(context, 4, 0); + ID3D11DeviceContext_Draw(context, 4, 4); + + color = get_texture_color(test_context.backbuffer, 320, 360); + ok(compare_color(color, 0x600066b3, 1), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(test_context.backbuffer, 320, 120); + ok(compare_color(color, 0xa0cc00b3, 1), "Got unexpected color 0x%08x.\n", color); + texture_desc.Width = 128; texture_desc.Height = 128; texture_desc.MipLevels = 1; @@ -6422,9 +6441,9 @@ static void test_blend(void) ID3D11DeviceContext_ClearRenderTargetView(context, offscreen_rtv, red); - ID3D11DeviceContext_OMSetBlendState(context, src_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, src_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 0); - ID3D11DeviceContext_OMSetBlendState(context, dst_blend, blend_factor, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_OMSetBlendState(context, dst_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11DeviceContext_Draw(context, 4, 4); color = get_texture_color(offscreen, 64, 96) & 0x00ffffff; @@ -6435,6 +6454,7 @@ static void test_blend(void) ID3D11RenderTargetView_Release(offscreen_rtv); ID3D11Texture2D_Release(offscreen); done: + ID3D11BlendState_Release(dst_blend_factor); ID3D11BlendState_Release(dst_blend); ID3D11BlendState_Release(src_blend); ID3D11PixelShader_Release(ps); -- 2.11.0

2 1

[PATCH 1/3] wined3d: Store the blend factor as a struct wined3d_color.
by Henri Verbeet 17 Oct '18

17 Oct '18

From: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 1 - dlls/d3d11/device.c | 23 ++++++----------------- dlls/d3d9/device.c | 39 ++++++++++++++++++++++++++++++++------- dlls/wined3d/cs.c | 15 ++++++++++++--- dlls/wined3d/device.c | 29 ++++++++++++++++++++--------- dlls/wined3d/state.c | 17 +++++++++-------- dlls/wined3d/stateblock.c | 27 +++++++++++++++++++++++++-- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 12 +++++++++--- include/wine/wined3d.h | 7 ++++--- 11 files changed, 121 insertions(+), 56 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e26554afabf..771e923a5c1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -539,7 +539,6 @@ struct d3d_device struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - float blend_factor[4]; struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; }; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 157ff0341ae..e4c2c80e00b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -710,11 +710,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi blend_factor = default_blend_factor; wined3d_mutex_lock(); - memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); if (!(blend_state_impl = unsafe_impl_from_ID3D11BlendState(blend_state))) { - wined3d_device_set_blend_state(device->wined3d_device, NULL); + wined3d_device_set_blend_state(device->wined3d_device, NULL, + (const struct wined3d_color *)blend_factor); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, D3D11_COLOR_WRITE_ENABLE_ALL); @@ -728,7 +728,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi return; } - wined3d_device_set_blend_state(device->wined3d_device, blend_state_impl->wined3d_state); + wined3d_device_set_blend_state(device->wined3d_device, blend_state_impl->wined3d_state, + (const struct wined3d_color *)blend_factor); desc = &blend_state_impl->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->RenderTarget[0].BlendEnable); @@ -743,13 +744,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, d->SrcBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, d->DestBlendAlpha); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, d->BlendOpAlpha); - - if (memcmp(blend_factor, default_blend_factor, sizeof(default_blend_factor)) - && (d->SrcBlend == D3D11_BLEND_BLEND_FACTOR || d->SrcBlend == D3D11_BLEND_INV_BLEND_FACTOR - || d->DestBlend == D3D11_BLEND_BLEND_FACTOR || d->DestBlend == D3D11_BLEND_INV_BLEND_FACTOR - || d->SrcBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->SrcBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR - || d->DestBlendAlpha == D3D11_BLEND_BLEND_FACTOR || d->DestBlendAlpha == D3D11_BLEND_INV_BLEND_FACTOR)) - FIXME("Ignoring blend factor %s.\n", debug_float4(blend_factor)); } wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask); @@ -1942,7 +1936,8 @@ 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_get_blend_state(device->wined3d_device, + (struct wined3d_color *)blend_factor))) { blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); @@ -1951,7 +1946,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi { *blend_state = NULL; } - memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); wined3d_mutex_unlock(); } @@ -6190,11 +6184,6 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown) d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface); - device->blend_factor[0] = 1.0f; - device->blend_factor[1] = 1.0f; - device->blend_factor[2] = 1.0f; - device->blend_factor[3] = 1.0f; - wine_rb_init(&device->blend_states, d3d_blend_state_compare); wine_rb_init(&device->depthstencil_states, d3d_depthstencil_state_compare); wine_rb_init(&device->rasterizer_states, d3d_rasterizer_state_compare); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a31360886b6..a3f410a7b97 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -32,6 +32,14 @@ const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops = d3d9_null_wined3d_object_destroyed, }; +static void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_colour, D3DCOLOR d3d_colour) +{ + wined3d_colour->r = ((d3d_colour >> 16) & 0xff) / 255.0f; + wined3d_colour->g = ((d3d_colour >> 8) & 0xff) / 255.0f; + wined3d_colour->b = (d3d_colour & 0xff) / 255.0f; + wined3d_colour->a = ((d3d_colour >> 24) & 0xff) / 255.0f; +} + D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) { BYTE *c = (BYTE *)&format; @@ -1980,14 +1988,8 @@ static void d3d9_rts_flag_auto_gen_mipmap(struct d3d9_device *device) static HRESULT WINAPI d3d9_device_Clear(IDirect3DDevice9Ex *iface, DWORD rect_count, const D3DRECT *rects, DWORD flags, D3DCOLOR color, float z, DWORD stencil) { - const struct wined3d_color c = - { - ((color >> 16) & 0xff) / 255.0f, - ((color >> 8) & 0xff) / 255.0f, - (color & 0xff) / 255.0f, - ((color >> 24) & 0xff) / 255.0f, - }; struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_color c; HRESULT hr; TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", @@ -1999,6 +2001,7 @@ static HRESULT WINAPI d3d9_device_Clear(IDirect3DDevice9Ex *iface, DWORD rect_co rect_count = 0; } + wined3d_color_from_d3dcolor(&c, color); wined3d_mutex_lock(); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); if (SUCCEEDED(hr)) @@ -2217,9 +2220,20 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi D3DRENDERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_color factor; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); + if (state == D3DRS_BLENDFACTOR) + { + wined3d_color_from_d3dcolor(&factor, value); + wined3d_mutex_lock(); + wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); + wined3d_mutex_unlock(); + + return D3D_OK; + } + wined3d_mutex_lock(); wined3d_device_set_render_state(device->wined3d_device, state, value); wined3d_mutex_unlock(); @@ -2231,9 +2245,20 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_color factor; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); + if (state == D3DRS_BLENDFACTOR) + { + wined3d_mutex_lock(); + wined3d_device_get_blend_state(device->wined3d_device, &factor); + wined3d_mutex_unlock(); + *value = D3DCOLOR_COLORVALUE(factor.r, factor.g, factor.b, factor.a); + + return D3D_OK; + } + wined3d_mutex_lock(); *value = wined3d_device_get_render_state(device->wined3d_device, state); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index af1dbef84ce..fc3e47e3298 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -264,6 +264,7 @@ struct wined3d_cs_set_blend_state { enum wined3d_cs_op opcode; struct wined3d_blend_state *state; + struct wined3d_color factor; }; struct wined3d_cs_set_rasterizer_state @@ -1539,18 +1540,26 @@ void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_blend_state *op = data; + struct wined3d_state *state = &cs->state; - cs->state.blend_state = op->state; - device_invalidate_state(cs->device, STATE_BLEND); + if (state->blend_state != op->state) + { + state->blend_state = op->state; + device_invalidate_state(cs->device, STATE_BLEND); + } + state->blend_factor = op->factor; + device_invalidate_state(cs->device, STATE_BLEND_FACTOR); } -void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state) +void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state, + const struct wined3d_color *blend_factor) { struct wined3d_cs_set_blend_state *op; op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_BLEND_STATE; op->state = state; + op->factor = *blend_factor; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b90df20a7da..b50d6677ab2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1968,29 +1968,40 @@ static void resolve_depth_buffer(struct wined3d_device *device) src_view->resource, src_view->sub_resource_idx, dst_resource->format->id); } -void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state) +void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, + struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor) { + struct wined3d_state *state = device->update_state; struct wined3d_blend_state *prev; - TRACE("device %p, blend_state %p.\n", device, blend_state); + TRACE("device %p, blend_state %p, blend_factor %s.\n", device, blend_state, debug_color(blend_factor)); - prev = device->update_state->blend_state; - if (prev == blend_state) + if (device->recording) + device->recording->changed.blend_state = TRUE; + + prev = state->blend_state; + if (prev == blend_state && !memcmp(blend_factor, &state->blend_factor, sizeof(*blend_factor))) return; if (blend_state) wined3d_blend_state_incref(blend_state); - device->update_state->blend_state = blend_state; - wined3d_cs_emit_set_blend_state(device->cs, blend_state); + state->blend_state = blend_state; + state->blend_factor = *blend_factor; + if (!device->recording) + wined3d_cs_emit_set_blend_state(device->cs, blend_state, blend_factor); if (prev) wined3d_blend_state_decref(prev); } -struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct wined3d_device *device) +struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct wined3d_device *device, + struct wined3d_color *blend_factor) { - TRACE("device %p.\n", device); + const struct wined3d_state *state = &device->state; + + TRACE("device %p, blend_factor %p.\n", device, blend_factor); - return device->state.blend_state; + *blend_factor = state->blend_factor; + return state->blend_state; } void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 375bc6562ab..fc076bb962a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -597,20 +597,19 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); } -static void state_blendfactor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_blend_factor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { WARN("Unsupported in local OpenGL implementation: glBlendColor.\n"); } -static void state_blendfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_blend_factor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + const struct wined3d_color *factor = &state->blend_factor; const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_color color; - TRACE("Setting blend factor to %#x.\n", state->render_states[WINED3D_RS_BLENDFACTOR]); + TRACE("Setting blend factor to %s.\n", debug_color(factor)); - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_BLENDFACTOR]); - GL_EXTCALL(glBlendColor(color.r, color.g, color.b, color.a)); + GL_EXTCALL(glBlendColor(factor->r, factor->g, factor->b, factor->a)); checkGLcall("glBlendColor"); } @@ -4539,6 +4538,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_DESTBLENDALPHA), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_BLENDOPALPHA), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, state_blend_object }, WINED3D_GL_EXT_NONE }, + { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor }, EXT_BLEND_COLOR }, + { STATE_BLEND_FACTOR, { STATE_BLEND_FACTOR, state_blend_factor_w}, 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 }, @@ -4689,8 +4690,6 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), state_colorwrite3 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDFACTOR), { STATE_RENDER(WINED3D_RS_BLENDFACTOR), state_blendfactor }, EXT_BLEND_COLOR }, - { STATE_RENDER(WINED3D_RS_BLENDFACTOR), { STATE_RENDER(WINED3D_RS_BLENDFACTOR), state_blendfactor_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), state_depthbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZVISIBLE), { STATE_RENDER(WINED3D_RS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, /* Samplers */ @@ -5453,6 +5452,7 @@ static void validate_state_table(struct StateEntry *state_table) {149, 150}, {169, 169}, {177, 177}, + {193, 193}, {196, 197}, { 0, 0}, }; @@ -5488,6 +5488,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_POINT_ENABLE, STATE_COLOR_KEY, STATE_BLEND, + STATE_BLEND_FACTOR, }; unsigned int i, current; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 45a4008ac45..0b2ce50ecd7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -35,7 +35,6 @@ static const DWORD pixel_states_render[] = WINED3D_RS_ALPHAREF, WINED3D_RS_ALPHATESTENABLE, WINED3D_RS_ANTIALIASEDLINEENABLE, - WINED3D_RS_BLENDFACTOR, WINED3D_RS_BLENDOP, WINED3D_RS_BLENDOPALPHA, WINED3D_RS_BACK_STENCILFAIL, @@ -209,6 +208,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->pixelShader = 1; states->vertexShader = 1; states->scissorRect = 1; + states->blend_state = 1; /* Fixed size arrays */ states->streamSource = 0xffff; @@ -236,6 +236,7 @@ static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states unsigned int i; states->pixelShader = 1; + states->blend_state = 1; for (i = 0; i < ARRAY_SIZE(pixel_states_render); ++i) { @@ -839,6 +840,21 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) SetRectEmpty(stateblock->state.scissor_rects); } + if (stateblock->changed.blend_state + && (src_state->blend_state != stateblock->state.blend_state + || memcmp(&src_state->blend_factor, &stateblock->state.blend_factor, + sizeof(stateblock->state.blend_factor)))) + { + TRACE("Updating blend state.\n"); + + if (src_state->blend_state) + wined3d_blend_state_incref(src_state->blend_state); + if (stateblock->state.blend_state) + wined3d_blend_state_decref(stateblock->state.blend_state); + stateblock->state.blend_state = src_state->blend_state; + stateblock->state.blend_factor = src_state->blend_factor; + } + map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { @@ -1074,6 +1090,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count, stateblock->state.scissor_rects); + if (stateblock->changed.blend_state) + wined3d_device_set_blend_state(device, stateblock->state.blend_state, &stateblock->state.blend_factor); + map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { @@ -1255,7 +1274,6 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; - state->render_states[WINED3D_RS_BLENDFACTOR] = 0xffffffff; state->render_states[WINED3D_RS_SRGBWRITEENABLE] = 0; state->render_states[WINED3D_RS_DEPTHBIAS] = 0; state->render_states[WINED3D_RS_WRAP8] = 0; @@ -1314,6 +1332,11 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d /* TODO: Vertex offset in the presampled displacement map. */ state->sampler_states[i][WINED3D_SAMP_DMAP_OFFSET] = 0; } + + state->blend_factor.r = 1.0f; + state->blend_factor.g = 1.0f; + state->blend_factor.b = 1.0f; + state->blend_factor.a = 1.0f; } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index da01bbb0b65..9ddfd5c2059 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4762,7 +4762,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE1); D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE2); D3DSTATE_TO_STR(WINED3D_RS_COLORWRITEENABLE3); - D3DSTATE_TO_STR(WINED3D_RS_BLENDFACTOR); D3DSTATE_TO_STR(WINED3D_RS_SRGBWRITEENABLE); D3DSTATE_TO_STR(WINED3D_RS_DEPTHBIAS); D3DSTATE_TO_STR(WINED3D_RS_WRAP8); @@ -5011,6 +5010,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_STREAM_OUTPUT"; if (STATE_IS_BLEND(state)) return "STATE_BLEND"; + if (STATE_IS_BLEND_FACTOR(state)) + return "STATE_BLEND_FACTOR"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7944387bcab..ee70221191e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -57,7 +57,7 @@ @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) -@ cdecl wined3d_device_get_blend_state(ptr) +@ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @@ -129,7 +129,7 @@ @ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) -@ cdecl wined3d_device_set_blend_state(ptr ptr) +@ cdecl wined3d_device_set_blend_state(ptr ptr ptr) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3761860b0b..d5bf61271e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1645,7 +1645,10 @@ enum wined3d_pipeline #define STATE_BLEND (STATE_STREAM_OUTPUT + 1) #define STATE_IS_BLEND(a) ((a) == STATE_BLEND) -#define STATE_COMPUTE_OFFSET (STATE_BLEND + 1) +#define STATE_BLEND_FACTOR (STATE_BLEND + 1) +#define STATE_IS_BLEND_FACTOR(a) ((a) == STATE_BLEND_FACTOR) + +#define STATE_COMPUTE_OFFSET (STATE_BLEND_FACTOR + 1) #define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) #define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) @@ -2934,6 +2937,7 @@ struct wined3d_state DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; struct wined3d_blend_state *blend_state; + struct wined3d_color blend_factor; struct wined3d_rasterizer_state *rasterizer_state; }; @@ -3504,7 +3508,8 @@ struct wined3d_saved_states DWORD pixelShader : 1; DWORD vertexShader : 1; DWORD scissorRect : 1; - DWORD padding : 5; + DWORD blend_state : 1; + DWORD padding : 4; }; struct StageState { @@ -3646,7 +3651,8 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw const RECT *dst_rect, HWND dst_window_override, unsigned int swap_interval, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend_state *state, + const struct wined3d_color *blend_factor) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c62d3640e58..95549e96cb4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -388,7 +388,6 @@ enum wined3d_render_state WINED3D_RS_COLORWRITEENABLE1 = 190, WINED3D_RS_COLORWRITEENABLE2 = 191, WINED3D_RS_COLORWRITEENABLE3 = 192, - WINED3D_RS_BLENDFACTOR = 193, WINED3D_RS_SRGBWRITEENABLE = 194, WINED3D_RS_DEPTHBIAS = 195, WINED3D_RS_WRAP8 = 198, @@ -2264,7 +2263,8 @@ HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, str void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); -struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device); +struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device, + struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, @@ -2379,7 +2379,8 @@ void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device, void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); -void __cdecl wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state); +void __cdecl wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state, + const struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, -- 2.11.0

1 0

Re: [PATCH 2/6] wined3d: Add blend_factor inside blend_state
by DarkZeros 17 Oct '18

17 Oct '18

Hi, Any comment on this set of patches? (patches 2 - 6) Let me know if you have a different vision on how they should be implemented, or any comments El lun., 15 oct. 2018 a las 22:46, Marvin (<testbot(a)winehq.org>) escribió: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. >

1 0

[PATCH vkd3d 6/7] vkd3d-shader: Translate sample_b instructions.
by Józef Kucia 17 Oct '18

17 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5d34a847b10a..fce6e03909b0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5448,6 +5448,12 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_SAMPLE: op = SpvOpImageSampleImplicitLod; break; + case VKD3DSIH_SAMPLE_B: + op = SpvOpImageSampleImplicitLod; + operands_mask |= SpvImageOperandsBiasMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[3], VKD3DSP_WRITEMASK_0); + break; case VKD3DSIH_SAMPLE_GRAD: op = SpvOpImageSampleExplicitLod; operands_mask |= SpvImageOperandsGradMask; @@ -6458,6 +6464,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break; case VKD3DSIH_SAMPLE: + case VKD3DSIH_SAMPLE_B: case VKD3DSIH_SAMPLE_GRAD: case VKD3DSIH_SAMPLE_LOD: vkd3d_dxbc_compiler_emit_sample(compiler, instruction); -- 2.18.1

2 1

[PATCH vkd3d 7/7] vkd3d-shader: Add support for OpenGL atomic counters.
by Józef Kucia 17 Oct '18

17 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 46 ++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index 121fa7557384..f0ff82b8ce7f 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -96,6 +96,7 @@ struct vkd3d_shader_uav_counter_binding unsigned int register_index; /* u# */ struct vkd3d_shader_descriptor_binding binding; + unsigned int offset; }; struct vkd3d_shader_push_constant_buffer diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fce6e03909b0..7cf58f8eb2f2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1988,6 +1988,11 @@ static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3 return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; } +static bool vkd3d_dxbc_compiler_is_opengl_target(const struct vkd3d_dxbc_compiler *compiler) +{ + return vkd3d_dxbc_compiler_get_target(compiler) == VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5; +} + static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_visibility visibility) { @@ -2062,6 +2067,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_uav_counter_binding *current = &shader_interface->uav_counters[i]; + if (current->offset) + FIXME("Atomic counter offsets are not supported yet.\n"); + /* FIXME: Implement shader visibility for UAV counters. */ if (current->register_index == reg_idx) return current->binding; @@ -3837,11 +3845,11 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw) { - const SpvStorageClass storage_class = SpvStorageClassUniformConstant; + uint32_t counter_type_id, type_id, ptr_type_id, var_id, counter_var_id = 0; const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + SpvStorageClass storage_class = SpvStorageClassUniformConstant; const struct vkd3d_spirv_resource_type *resource_type_info; - uint32_t type_id, ptr_type_id, var_id, counter_var_id = 0; enum vkd3d_component_type sampled_type; struct vkd3d_symbol resource_symbol; bool is_uav; @@ -3872,6 +3880,15 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp if (is_uav && (scan_info->uav_counter_mask & (1u << reg->idx[0].offset))) { assert(structure_stride); /* counters are valid only for structured buffers */ + + if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityAtomicStorage); + storage_class = SpvStorageClassAtomicCounter; + counter_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, counter_type_id); + } + counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); @@ -5901,7 +5918,8 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t ptr_type_id, type_id, image_id, result_id; + unsigned int memory_semantics = SpvMemorySemanticsMaskNone; + uint32_t ptr_type_id, type_id, counter_id, result_id; uint32_t coordinate_id, sample_id, pointer_id; const struct vkd3d_symbol *resource_symbol; uint32_t operands[3]; @@ -5911,18 +5929,26 @@ static void vkd3d_dxbc_compiler_emit_uav_counter_instruction(struct vkd3d_dxbc_c ? SpvOpAtomicIIncrement : SpvOpAtomicIDecrement; resource_symbol = vkd3d_dxbc_compiler_find_resource(compiler, &src->reg); - image_id = resource_symbol->info.resource.uav_counter_id; - assert(image_id); + counter_id = resource_symbol->info.resource.uav_counter_id; + assert(counter_id); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); - coordinate_id = sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); - pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder, - ptr_type_id, image_id, coordinate_id, sample_id); + if (vkd3d_dxbc_compiler_is_opengl_target(compiler)) + { + pointer_id = counter_id; + memory_semantics |= SpvMemorySemanticsAtomicCounterMemoryMask; + } + else + { + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); + coordinate_id = sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + pointer_id = vkd3d_spirv_build_op_image_texel_pointer(builder, + ptr_type_id, counter_id, coordinate_id, sample_id); + } operands[0] = pointer_id; operands[1] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvScopeDevice); - operands[2] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvMemorySemanticsMaskNone); + operands[2] = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_semantics); result_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, operands, ARRAY_SIZE(operands)); if (op == SpvOpAtomicIDecrement) -- 2.18.1

2 1

[PATCH vkd3d 5/7] vkd3d-shader: Translate sample_d instructions.
by Józef Kucia 17 Oct '18

17 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e9726dd7f68c..5d34a847b10a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1335,7 +1335,7 @@ static uint32_t vkd3d_spirv_build_op_image_sample(struct vkd3d_spirv_builder *bu const uint32_t operands[] = {sampled_image_id, coordinate_id}; if (op == SpvOpImageSampleExplicitLod) - assert(image_operands_mask & SpvImageOperandsLodMask); + assert(image_operands_mask & (SpvImageOperandsLodMask | SpvImageOperandsGradMask)); else assert(op == SpvOpImageSampleImplicitLod); @@ -1350,7 +1350,7 @@ static uint32_t vkd3d_spirv_build_op_image_sample_dref(struct vkd3d_spirv_builde const uint32_t operands[] = {sampled_image_id, coordinate_id, dref_id}; if (op == SpvOpImageSampleDrefExplicitLod) - assert(image_operands_mask & SpvImageOperandsLodMask); + assert(image_operands_mask & (SpvImageOperandsLodMask | SpvImageOperandsGradMask)); else assert(op == SpvOpImageSampleDrefImplicitLod); @@ -5436,14 +5436,27 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[2]; + uint32_t image_operands[3]; + DWORD coordinate_mask; SpvOp op; + vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, + &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); + switch (instruction->handler_idx) { case VKD3DSIH_SAMPLE: op = SpvOpImageSampleImplicitLod; break; + case VKD3DSIH_SAMPLE_GRAD: + op = SpvOpImageSampleExplicitLod; + operands_mask |= SpvImageOperandsGradMask; + coordinate_mask = (1u << image.resource_type_info->offset_component_count) - 1; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[3], coordinate_mask); + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[4], coordinate_mask); + break; case VKD3DSIH_SAMPLE_LOD: op = SpvOpImageSampleExplicitLod; operands_mask |= SpvImageOperandsLodMask; @@ -5455,9 +5468,6 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler return; } - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, - &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); - if (vkd3d_shader_instruction_has_texel_offset(instruction)) { operands_mask |= SpvImageOperandsConstOffsetMask; @@ -5467,6 +5477,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); + assert(image_operand_count <= ARRAY_SIZE(image_operands)); val_id = vkd3d_spirv_build_op_image_sample(builder, op, sampled_type_id, image.sampled_image_id, coordinate_id, operands_mask, image_operands, image_operand_count); @@ -6447,6 +6458,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break; case VKD3DSIH_SAMPLE: + case VKD3DSIH_SAMPLE_GRAD: case VKD3DSIH_SAMPLE_LOD: vkd3d_dxbc_compiler_emit_sample(compiler, instruction); break; -- 2.18.1

2 1

[PATCH vkd3d 4/7] vkd3d: Add asserts() for root descriptor indices.
by Józef Kucia 17 Oct '18

17 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 27c8ad0773ec..e17fca979a9d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3405,6 +3405,7 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, root_parameter, bindings->descriptor_set, NULL, &buffer_info); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + assert(index < ARRAY_SIZE(bindings->push_descriptors)); bindings->push_descriptors[index].u.cbv.vk_buffer = buffer_info.buffer; bindings->push_descriptors[index].u.cbv.offset = buffer_info.offset; bindings->push_descriptor_dirty_mask |= 1u << index; @@ -3478,6 +3479,7 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li root_parameter, bindings->descriptor_set, &vk_buffer_view, NULL); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); + assert(index < ARRAY_SIZE(bindings->push_descriptors)); bindings->push_descriptors[index].u.vk_buffer_view = vk_buffer_view; bindings->push_descriptor_dirty_mask |= 1u << index; bindings->push_descriptor_active_mask |= 1u << index; -- 2.18.1

2 1

[PATCH vkd3d 2/7] vkd3d-shader: Constify vkd3d_dxbc_compiler pointers.
by Józef Kucia 17 Oct '18

17 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 644c0a71d6af..e9726dd7f68c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1982,13 +1982,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader return compiler; } -static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(struct vkd3d_dxbc_compiler *compiler) +static enum vkd3d_shader_target vkd3d_dxbc_compiler_get_target(const struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_compile_arguments *args = compiler->compile_args; return args ? args->target : VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; } -static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_visibility visibility) { switch (visibility) @@ -2012,7 +2012,7 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(struct vkd3d_dxbc_compil } static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer( - struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) + const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg) { unsigned int reg_idx = reg->idx[0].offset; unsigned int i; @@ -2362,7 +2362,7 @@ struct vkd3d_shader_register_info unsigned int structure_stride; }; -static bool vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, struct vkd3d_shader_register_info *register_info) { struct vkd3d_symbol reg_symbol, *symbol; @@ -3044,7 +3044,7 @@ vkd3d_register_builtins[] = }; static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval( - struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) + const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_input_sysval_semantic sysval) { enum vkd3d_shader_target target; unsigned int i; @@ -3080,7 +3080,7 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_register( return NULL; } -static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(struct vkd3d_dxbc_compiler *compiler, +static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(const struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_input_sysval_semantic sysval) { const struct vkd3d_spirv_builtin *builtin; @@ -3293,7 +3293,7 @@ static unsigned int vkd3d_dxbc_compiler_get_output_variable_index( return register_idx; } -static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compiler, +static unsigned int get_shader_output_swizzle(const struct vkd3d_dxbc_compiler *compiler, unsigned int register_idx) { const struct vkd3d_shader_compile_arguments *compile_args; -- 2.18.1

2 1

[PATCH vkd3d 3/7] vkd3d: Use vk_write_descriptor_set_from_root_descriptor() in more places.
by Józef Kucia 17 Oct '18

17 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 59 ++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 437c29f3b229..27c8ad0773ec 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2207,6 +2207,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list VkWriteDescriptorSet *descriptor_writes = NULL, *current_descriptor_write; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VkDescriptorBufferInfo *buffer_infos = NULL, *current_buffer_info; + const struct d3d12_root_parameter *root_parameter; struct vkd3d_push_descriptor *push_descriptor; struct d3d12_device *device = list->device; VkDescriptorBufferInfo *vk_buffer_info; @@ -2231,9 +2232,10 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list if (!(bindings->push_descriptor_dirty_mask & (1u << i))) continue; + root_parameter = &root_signature->parameters[i]; push_descriptor = &bindings->push_descriptors[i]; - if (root_signature->parameters[i].parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) + if (root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) { vk_buffer_view = NULL; vk_buffer_info = current_buffer_info; @@ -2248,8 +2250,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list } if (!vk_write_descriptor_set_from_root_descriptor(current_descriptor_write, - &root_signature->parameters[i], bindings->descriptor_set, - vk_buffer_view, vk_buffer_info)) + root_parameter, bindings->descriptor_set, vk_buffer_view, vk_buffer_info)) continue; ++descriptor_count; @@ -3377,39 +3378,31 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, const struct d3d12_root_signature *root_signature = bindings->root_signature; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; - const struct d3d12_root_descriptor *root_descriptor; + const struct d3d12_root_parameter *root_parameter; struct VkWriteDescriptorSet descriptor_write; struct VkDescriptorBufferInfo buffer_info; struct d3d12_resource *resource; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV); - root_descriptor = &root_signature->parameters[index].u.descriptor; + root_parameter = &root_signature->parameters[index]; + assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV); resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, gpu_address); buffer_info.buffer = resource->u.vk_buffer; buffer_info.offset = gpu_address - resource->gpu_address; buffer_info.range = VK_WHOLE_SIZE; - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - descriptor_write.pNext = NULL; - descriptor_write.dstBinding = root_descriptor->binding; - descriptor_write.dstArrayElement = 0; - descriptor_write.descriptorCount = 1; - descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; - descriptor_write.pImageInfo = NULL; - descriptor_write.pBufferInfo = &buffer_info; - descriptor_write.pTexelBufferView = NULL; - if (vk_info->KHR_push_descriptor) { - descriptor_write.dstSet = VK_NULL_HANDLE; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, VK_NULL_HANDLE, NULL, &buffer_info); VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.dstSet = bindings->descriptor_set; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, bindings->descriptor_set, NULL, &buffer_info); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); bindings->push_descriptors[index].u.cbv.vk_buffer = buffer_info.buffer; @@ -3448,20 +3441,14 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li const struct d3d12_root_signature *root_signature = bindings->root_signature; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; - const struct d3d12_root_descriptor *root_descriptor; + const struct d3d12_root_parameter *root_parameter; struct VkWriteDescriptorSet descriptor_write; VkDevice vk_device = list->device->vk_device; - VkDescriptorType descriptor_type; VkBufferView vk_buffer_view; - assert(root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV - || root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); - root_descriptor = &root_signature->parameters[index].u.descriptor; - - if (root_signature->parameters[index].parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV) - descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - else - descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + root_parameter = &root_signature->parameters[index]; + assert(root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_SRV + || root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_UAV); /* FIXME: Re-use buffer views. */ if (!vkd3d_create_raw_buffer_view(list->device, gpu_address, &vk_buffer_view)) @@ -3477,26 +3464,18 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li return; } - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - descriptor_write.pNext = NULL; - descriptor_write.dstBinding = root_descriptor->binding; - descriptor_write.dstArrayElement = 0; - descriptor_write.descriptorCount = 1; - descriptor_write.descriptorType = descriptor_type; - descriptor_write.pImageInfo = NULL; - descriptor_write.pBufferInfo = NULL; - descriptor_write.pTexelBufferView = &vk_buffer_view; - if (vk_info->KHR_push_descriptor) { - descriptor_write.dstSet = VK_NULL_HANDLE; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, VK_NULL_HANDLE, &vk_buffer_view, NULL); VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.dstSet = bindings->descriptor_set; + vk_write_descriptor_set_from_root_descriptor(&descriptor_write, + root_parameter, bindings->descriptor_set, &vk_buffer_view, NULL); VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); bindings->push_descriptors[index].u.vk_buffer_view = vk_buffer_view; -- 2.18.1

2 1

[PATCH vkd3d 1/7] vkd3d: Remove "unhandled next" warnings.
by Józef Kucia 17 Oct '18

17 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 -- libs/vkd3d/vkd3d_main.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a839dcc4d3b4..727259a92e56 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -475,8 +475,6 @@ HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_in WARN("Invalid structure type %#x.\n", create_info->type); return E_INVALIDARG; } - if (create_info->next) - WARN("Unhandled next %p.\n", create_info->next); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 063a4ca1c9ea..63dabda06395 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -35,8 +35,6 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, WARN("Invalid structure type %#x.\n", create_info->type); return E_INVALIDARG; } - if (create_info->next) - WARN("Unhandled next %p.\n", create_info->next); if (!create_info->instance && !create_info->instance_create_info) { ERR("Instance or instance create info is required.\n"); -- 2.18.1

2 1

[PATCH] testbot/Build: Detect when make_requests needs to be re-run.
by Francois Gouget 17 Oct '18

17 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 11 +++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 2e6cc853b3..aa5c205d2d 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -114,6 +114,17 @@ sub ApplyPatch($$) } my $Impacts = GetPatchImpacts($PatchFile); + if ($Impacts->{MakeRequests}) + { + InfoMsg "\nRunning make_requests\n"; + system("cd '$DataDir/$Dir' && set -x && ./tools/make_requests"); + if ($? != 0) + { + LogMsg "make_requests failed\n"; + return undef; + } + } + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 502a781f6c..7df50f9b21 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -300,6 +300,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/server/protocol\.def$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new"; @@ -344,7 +349,7 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeMakefiles", + foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests", "PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; @@ -435,6 +440,7 @@ sub GetPatchImpacts($) { $Impacts->{Autoconf} ||= $PastImpacts->{Autoconf}; $Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles}; + $Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests}; $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; -- 2.19.1

1 0

[PATCH] testbot/web: Fix picking which module to test.
by Francois Gouget 17 Oct '18

17 Oct '18

Make sure Submit.pl picks the module with the modified tests even if the patch impacts other modules. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This only impacted the suggested command but could be confusing. Whether the command was correct or not depended on the order in the hashtable. testbot/web/Submit.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d0da7a2497..c10a267909 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -604,10 +604,16 @@ sub DetermineFileType($$) } else { - my $TestInfo = (values %{$Impacts->{Tests}})[0]; - $FileType = "patch"; - $ExeBase = $TestInfo->{ExeBase}; - $TestUnit = (keys %{$TestInfo->{Units}})[0]; + foreach my $TestInfo (values %{$Impacts->{Tests}}) + { + if ($TestInfo->{UnitCount}) + { + $FileType = "patch"; + $ExeBase = $TestInfo->{ExeBase}; + $TestUnit = (keys %{$TestInfo->{Units}})[0]; + last; + } + } } } elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip") -- 2.19.1

1 0

[PATCH] testbot: All build scripts have now standardized on the 'Task:' prefix.
by Francois Gouget 17 Oct '18

17 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1bb8f5aa1d..6caa0212c2 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -130,7 +130,7 @@ sub GetLogLineCategory($) $Line =~ /: error: / or $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + $Line =~ /^Task: (?!ok)/ or # Typical perl errors _IsPerlError($Line)) { @@ -152,7 +152,7 @@ sub GetLogLineCategory($) } if (# Build messages $Line =~ /^\+ \S/ or - $Line =~ /^(?:Build|Reconfig|Task): ok/) + $Line =~ /^Task: ok/) { return "info"; } -- 2.19.1

1 0

[PATCH] testbot: Factorize the Perl error detection.
by Francois Gouget 17 Oct '18

17 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17d44a44c0..1bb8f5aa1d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -42,6 +42,27 @@ use WineTestBot::Config; # For $MaxUnitSize # Task log parser # +=pod +=over 12 + +=item C<_IsPerlError()> + +Returns true if the string looks like a Perl error message. + +=back +=cut + +sub _IsPerlError($) +{ + my ($Str) = @_; + + return $Str =~ /^Use of uninitialized value / || + $Str =~ /^Undefined subroutine / || + $Str =~ /^Global symbol / || + $Str =~ /^Possible precedence issue /; +} + + =pod =over 12 @@ -71,11 +92,7 @@ sub ParseTaskLog($) $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^Task: / or - # Typical perl errors - $Line =~ /^Use of uninitialized value / or - $Line =~ /^Undefined subroutine / or - $Line =~ /^Global symbol /) + elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { $Result = "failed"; } @@ -115,9 +132,7 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors - $Line =~ /^Use of uninitialized value / or - $Line =~ /^Undefined subroutine / or - $Line =~ /^Global symbol /) + _IsPerlError($Line)) { return "error"; } -- 2.19.1

1 0

[PATCH] mshtml: Return S_OK in IHTMLDocument2::pur_charset.
by Jacek Caban 17 Oct '18

17 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38189 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 3/3 v2] rpcrt4/tests: Add a test of client reconnecting on send failure.
by Jacek Caban 17 Oct '18

17 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Skip tests on old Windows dlls/rpcrt4/tests/server.c | 163 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 148 insertions(+), 15 deletions(-)

1 0

[PATCH 2/3] rpcrt4: Add RpcExceptionFilter implementation.
by Jacek Caban 17 Oct '18

17 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/rpcrt4.spec | 3 ++- dlls/rpcrt4/rpcrt4_main.c | 3 ++- dlls/rpcrt4/tests/rpc.c | 23 ++++++++++++----------- include/rpcdce.h | 2 ++ 4 files changed, 18 insertions(+), 13 deletions(-)

1 0

[PATCH 1/3] rpcrt4/tests: Get rid of no loner needed win9x checks.
by Jacek Caban 17 Oct '18

17 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 32 +++++++++----------------------- dlls/rpcrt4/tests/rpc_async.c | 23 ++++++----------------- 2 files changed, 15 insertions(+), 40 deletions(-)

1 0

[PATCH 8/8] msvcrt: Don't forward strpbrk to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

1 0

[PATCH 7/8] msvcrt: Don't forward strcspn to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

1 0

[PATCH 6/8] msvcrt: Don't forward wcstol to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

1 0

[PATCH 5/8] msvcrt: Don't forward wcsrchr to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

1 0

[PATCH 4/8] msvcrt: Don't forward wcscmp to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

1 0

[PATCH 3/8] msvcrt: Don't forward atol to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

1 0

[PATCH 2/8] msvcrt: Don't forward _wcsupr to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

1 0

[PATCH 1/8] msvcrt: Don't forward _atoi64 to ntdll.
by Piotr Caban 17 Oct '18

17 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45922 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 25 insertions(+), 17 deletions(-)

1 0

[PATCH] ntdll: Fix overflow if running 32bit app w/ wine64
by Brendan McGrath 17 Oct '18

17 Oct '18

wine64 was using IMAGE_NT_HEADERS to access header information regardless of the execution type; hence it would use IMAGE_OPTIONAL_HEADER64 for a 32bit app. This could result in an overflow and a request to mmap for a huge amount of memory causing an out of memory error. This patch ensures IMAGE_OPTIONAL_HEADER32 is used for a 32-bit app and IMAGE_OPTIONAL_HEADER64 is used for a 64-bit app Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- This fix is pretty much a copy and paste of code from server/mapping.c. But I'm not sure if it is the right way to go. There may already be a sanitized location for these values available within virtual_alloc_thread_stack that I just couldn't find. dlls/ntdll/virtual.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index af1509eae5d..8acea14af93 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1933,9 +1933,26 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi if (!reserve_size || !commit_size) { - IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); - if (!reserve_size) reserve_size = nt->OptionalHeader.SizeOfStackReserve; - if (!commit_size) commit_size = nt->OptionalHeader.SizeOfStackCommit; + struct nt + { + DWORD Signature; + IMAGE_FILE_HEADER FileHeader; + union + { + IMAGE_OPTIONAL_HEADER32 hdr32; + IMAGE_OPTIONAL_HEADER64 hdr64; + } opt; + }; + + struct nt *nt = (struct nt*) RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + if (nt->opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { + if (!reserve_size) reserve_size = nt->opt.hdr32.SizeOfStackReserve; + if (!commit_size) commit_size = nt->opt.hdr32.SizeOfStackCommit; + } else { + if (!reserve_size) reserve_size = nt->opt.hdr64.SizeOfStackReserve; + if (!commit_size) commit_size = nt->opt.hdr64.SizeOfStackCommit; + } + TRACE("reserve_size: %lu, commit_size: %lu", reserve_size, commit_size); } size = max( reserve_size, commit_size ); -- 2.17.1

3 4

[PATCH 4/4] webservices: Add more tests for default envelope and adressing versions.
by Hans Leidekker 17 Oct '18

17 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/msg.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 22d69ece2c..766c2c5acf 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -104,6 +104,7 @@ static void test_WsCreateMessageForChannel(void) hr = WsCreateMessageForChannel( NULL, NULL, 0, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + /* HTTP */ hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -154,6 +155,52 @@ static void test_WsCreateMessageForChannel(void) WsFreeChannel( channel ); WsFreeMessage( msg ); + + /* TCP */ + hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, + &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + + WsFreeChannel( channel ); + WsFreeMessage( msg ); + + /* UDP */ + hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX, WS_UDP_CHANNEL_BINDING, NULL, 0, NULL, + &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + + WsFreeChannel( channel ); + WsFreeMessage( msg ); } static void test_WsInitializeMessage(void) -- 2.11.0

1 0

[PATCH 3/4] webservices: Trace return values.
by Hans Leidekker 17 Oct '18

17 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 37 +++--- dlls/webservices/error.c | 15 ++- dlls/webservices/heap.c | 5 +- dlls/webservices/listener.c | 82 +++++++------ dlls/webservices/msg.c | 222 ++++++++++++++------------------- dlls/webservices/proxy.c | 17 +-- dlls/webservices/reader.c | 264 +++++++++++++++++---------------------- dlls/webservices/writer.c | 293 +++++++++++++++++++------------------------- 8 files changed, 424 insertions(+), 511 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5d3ca347da..464645b095 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -518,6 +518,7 @@ void WINAPI WsFreeChannel( WS_CHANNEL *handle ) HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + HRESULT hr = S_OK; TRACE( "%p %p\n", handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -533,15 +534,13 @@ HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) } if (channel->state != WS_CHANNEL_STATE_CREATED && channel->state != WS_CHANNEL_STATE_CLOSED) - { - LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; - } - - reset_channel( channel ); + hr = WS_E_INVALID_OPERATION; + else + reset_channel( channel ); LeaveCriticalSection( &channel->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -583,6 +582,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID } LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -611,6 +611,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID hr = prop_set( channel->prop, channel->prop_count, id, value, size ); LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -653,15 +654,11 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return E_INVALIDARG; } - if (channel->state != WS_CHANNEL_STATE_CREATED) - { - LeaveCriticalSection( &channel->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = open_channel( channel, endpoint ); + if (channel->state != WS_CHANNEL_STATE_CREATED) hr = WS_E_INVALID_OPERATION; + else hr = open_channel( channel, endpoint ); LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -734,6 +731,7 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT hr = shutdown_session( channel ); LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -749,6 +747,7 @@ static void close_channel( struct channel *channel ) HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -767,7 +766,8 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, close_channel( channel ); LeaveCriticalSection( &channel->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT parse_http_url( const WCHAR *url, ULONG len, URL_COMPONENTS *uc ) @@ -1348,6 +1348,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS done: LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1388,6 +1389,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS done: LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1959,6 +1961,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M hr = receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index ); LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1991,6 +1994,7 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS } LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2020,6 +2024,7 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A hr = WsReadEnvelopeEnd( msg, NULL ); LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2052,6 +2057,7 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W done: LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2081,6 +2087,7 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message( channel, msg ); LeaveCriticalSection( &channel->cs ); + TRACE( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index 970c12e1e3..03f71a6489 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -151,6 +151,7 @@ void WINAPI WsFreeError( WS_ERROR *handle ) HRESULT WINAPI WsResetError( WS_ERROR *handle ) { struct error *error = (struct error *)handle; + HRESULT hr = S_OK; TRACE( "%p\n", handle ); @@ -167,7 +168,8 @@ HRESULT WINAPI WsResetError( WS_ERROR *handle ) reset_error( error ); LeaveCriticalSection( &error->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -194,6 +196,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo hr = prop_get( error->prop, error->prop_count, id, buf, size ); LeaveCriticalSection( &error->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -227,14 +230,10 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co return E_INVALIDARG; } - if (id == WS_ERROR_PROPERTY_LANGID) - { - LeaveCriticalSection( &error->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = prop_set( error->prop, error->prop_count, id, value, size ); + if (id == WS_ERROR_PROPERTY_LANGID) hr = WS_E_INVALID_OPERATION; + else hr = prop_set( error->prop, error->prop_count, id, value, size ); LeaveCriticalSection( &error->cs ); + TRACE( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 93c8c4499a..1e22a24b34 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -260,6 +260,7 @@ void WINAPI WsFreeHeap( WS_HEAP *handle ) HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error ) { struct heap *heap = (struct heap *)handle; + HRESULT hr = S_OK; TRACE( "%p %p\n", handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -277,7 +278,8 @@ HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error ) reset_heap( heap ); LeaveCriticalSection( &heap->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -317,6 +319,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } LeaveCriticalSection( &heap->cs ); + TRACE( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 2e8286e144..e06b39447f 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -469,15 +469,11 @@ HRESULT WINAPI WsOpenListener( WS_LISTENER *handle, WS_STRING *url, const WS_ASY return E_INVALIDARG; } - if (listener->state != WS_LISTENER_STATE_CREATED) - { - LeaveCriticalSection( &listener->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = open_listener( listener, url ); + if (listener->state != WS_LISTENER_STATE_CREATED) hr = WS_E_INVALID_OPERATION; + else hr = open_listener( listener, url ); LeaveCriticalSection( &listener->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -493,6 +489,7 @@ static void close_listener( struct listener *listener ) HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct listener *listener = (struct listener *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -511,7 +508,8 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx close_listener( listener ); LeaveCriticalSection( &listener->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -520,6 +518,7 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) { struct listener *listener = (struct listener *)handle; + HRESULT hr = S_OK; TRACE( "%p %p\n", handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -535,15 +534,13 @@ HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) } if (listener->state != WS_LISTENER_STATE_CREATED && listener->state != WS_LISTENER_STATE_CLOSED) - { - LeaveCriticalSection( &listener->cs ); - return WS_E_INVALID_OPERATION; - } - - reset_listener( listener ); + hr = WS_E_INVALID_OPERATION; + else + reset_listener( listener ); LeaveCriticalSection( &listener->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -590,6 +587,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ } LeaveCriticalSection( &listener->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -618,6 +616,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ hr = prop_set( listener->prop, listener->prop_count, id, value, size ); LeaveCriticalSection( &listener->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -645,37 +644,40 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, return E_INVALIDARG; } - if (listener->state != WS_LISTENER_STATE_OPEN || listener->channel) + if (listener->state != WS_LISTENER_STATE_OPEN || listener->channel) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &listener->cs ); - return WS_E_INVALID_OPERATION; - } - - wait = listener->wait; - cancel = listener->cancel; - listener->channel = channel_handle; + wait = listener->wait; + cancel = listener->cancel; + listener->channel = channel_handle; - switch (listener->binding) - { - case WS_TCP_CHANNEL_BINDING: - { - SOCKET socket = listener->u.tcp.socket; + switch (listener->binding) + { + case WS_TCP_CHANNEL_BINDING: + { + SOCKET socket = listener->u.tcp.socket; - LeaveCriticalSection( &listener->cs ); - return channel_accept_tcp( socket, wait, cancel, channel_handle ); - } - case WS_UDP_CHANNEL_BINDING: - { - SOCKET socket = listener->u.udp.socket; + LeaveCriticalSection( &listener->cs ); + hr = channel_accept_tcp( socket, wait, cancel, channel_handle ); + TRACE( "returning %08x\n", hr ); + return hr; + } + case WS_UDP_CHANNEL_BINDING: + { + SOCKET socket = listener->u.udp.socket; - LeaveCriticalSection( &listener->cs ); - return channel_accept_udp( socket, wait, cancel, channel_handle ); - } - default: - FIXME( "listener binding %u not supported\n", listener->binding ); - break; + LeaveCriticalSection( &listener->cs ); + hr = channel_accept_udp( socket, wait, cancel, channel_handle ); + TRACE( "returning %08x\n", hr ); + return hr; + } + default: + FIXME( "listener binding %u not supported\n", listener->binding ); + break; + } } LeaveCriticalSection( &listener->cs ); + TRACE( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 48b4ec561d..4ccf82eacc 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -294,6 +294,7 @@ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error ) { struct msg *msg = (struct msg *)handle; + HRESULT hr = S_OK; TRACE( "%p %p\n", handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -311,7 +312,8 @@ HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error ) reset_msg( msg ); LeaveCriticalSection( &msg->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -383,6 +385,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -423,6 +426,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -452,25 +456,23 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS * return E_INVALIDARG; } - if (msg->state < WS_MESSAGE_STATE_INITIALIZED || msg->is_addressed) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - if (addr && addr->url.length) + if (msg->state < WS_MESSAGE_STATE_INITIALIZED || msg->is_addressed) hr = WS_E_INVALID_OPERATION; + else { - if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; - else + if (addr && addr->url.length) { - memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); - msg->addr.length = addr->url.length; + if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; + else + { + memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); + msg->addr.length = addr->url.length; + } } } - if (hr == S_OK) msg->is_addressed = TRUE; LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -743,20 +745,16 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, return E_INVALIDARG; } - if (msg->state != WS_MESSAGE_STATE_INITIALIZED) + if (msg->state != WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else if ((hr = write_envelope( msg )) == S_OK && + (hr = write_envelope_start( msg, writer )) == S_OK) { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; + msg->writer_body = writer; + msg->state = WS_MESSAGE_STATE_WRITING; } - if ((hr = write_envelope( msg )) != S_OK) goto done; - if ((hr = write_envelope_start( msg, writer )) != S_OK) goto done; - - msg->writer_body = writer; - msg->state = WS_MESSAGE_STATE_WRITING; - -done: LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -781,15 +779,12 @@ HRESULT WINAPI WsWriteEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) return E_INVALIDARG; } - if (msg->state != WS_MESSAGE_STATE_WRITING) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - if ((hr = write_envelope_end( msg->writer_body )) == S_OK) msg->state = WS_MESSAGE_STATE_DONE; + if (msg->state != WS_MESSAGE_STATE_WRITING) hr = WS_E_INVALID_OPERATION; + else if ((hr = write_envelope_end( msg->writer_body )) == S_OK) + msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -817,8 +812,8 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de if (msg->state != WS_MESSAGE_STATE_WRITING) { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } if (desc->elementLocalName && @@ -832,6 +827,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de done: LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -917,20 +913,16 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W return E_INVALIDARG; } - if (msg->state != WS_MESSAGE_STATE_EMPTY) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - if ((hr = read_envelope_start( msg, reader )) == S_OK && - (hr = create_header_buffer( reader, msg->heap, &msg->buf )) == S_OK) + if (msg->state != WS_MESSAGE_STATE_EMPTY) hr = WS_E_INVALID_OPERATION; + else if ((hr = read_envelope_start( msg, reader )) == S_OK && + (hr = create_header_buffer( reader, msg->heap, &msg->buf )) == S_OK) { msg->reader_body = reader; msg->state = WS_MESSAGE_STATE_READING; } LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -962,15 +954,12 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) return E_INVALIDARG; } - if (msg->state != WS_MESSAGE_STATE_READING) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - if ((hr = read_envelope_end( msg->reader_body )) == S_OK) msg->state = WS_MESSAGE_STATE_DONE; + if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION; + else if ((hr = read_envelope_end( msg->reader_body )) == S_OK) + msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -996,15 +985,11 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des return E_INVALIDARG; } - if (msg->state != WS_MESSAGE_STATE_READING) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); + if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION; + else hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1035,19 +1020,15 @@ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATIO return E_INVALIDARG; } - if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - if ((hr = write_envelope( msg )) == S_OK) + if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else if ((hr = write_envelope( msg )) == S_OK) { msg->init = init; msg->state = WS_MESSAGE_STATE_INITIALIZED; } LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1164,8 +1145,8 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val if (msg->state < WS_MESSAGE_STATE_INITIALIZED) { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } for (i = 0; i < msg->header_count; i++) @@ -1194,6 +1175,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val done: LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1256,15 +1238,11 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val return E_INVALIDARG; } - if (msg->state < WS_MESSAGE_STATE_INITIALIZED) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = get_standard_header( msg, type, value_type, option, heap, value, size ); + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else hr = get_standard_header( msg, type, value_type, option, heap, value, size ); LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1298,31 +1276,24 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR return E_INVALIDARG; } - if (msg->state < WS_MESSAGE_STATE_INITIALIZED) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - if (type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) - { - LeaveCriticalSection( &msg->cs ); - return E_INVALIDARG; - } - - for (i = 0; i < msg->header_count; i++) + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else if (type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) hr = E_INVALIDARG; + else { - if (msg->header[i]->type == type) + for (i = 0; i < msg->header_count; i++) { - remove_header( msg, i ); - removed = TRUE; - break; + if (msg->header[i]->type == type) + { + remove_header( msg, i ); + removed = TRUE; + break; + } } + if (removed) hr = write_envelope( msg ); } - if (removed) hr = write_envelope( msg ); - LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1440,8 +1411,8 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, if (msg->state < WS_MESSAGE_STATE_INITIALIZED) { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } for (i = 0; i < msg->header_count; i++) @@ -1469,6 +1440,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, done: LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1478,6 +1450,7 @@ done: HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_ERROR *error ) { struct msg *msg = (struct msg *)handle; + HRESULT hr = S_OK; ULONG i; TRACE( "%p %s %p\n", handle, debugstr_xmlstr(name), error ); @@ -1493,24 +1466,23 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na return E_INVALIDARG; } - if (msg->state < WS_MESSAGE_STATE_INITIALIZED) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - for (i = 0; i < msg->header_count; i++) + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else { - if (msg->header[i]->type || !msg->header[i]->mapped) continue; - if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + for (i = 0; i < msg->header_count; i++) { - remove_header( msg, i ); - break; + if (msg->header[i]->type || !msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + { + remove_header( msg, i ); + break; + } } } LeaveCriticalSection( &msg->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT write_custom_header( WS_XML_WRITER *writer, const WS_XML_STRING *name, const WS_XML_STRING *ns, @@ -1572,8 +1544,8 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI if (msg->state < WS_MESSAGE_STATE_INITIALIZED) { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } if ((hr = grow_header_array( msg, msg->header_count + 1 )) != S_OK) goto done; @@ -1584,6 +1556,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI done: LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1636,15 +1609,11 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI return E_INVALIDARG; } - if (msg->state < WS_MESSAGE_STATE_INITIALIZED) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = get_custom_header( msg, desc, option, heap, value, size ); + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else hr = get_custom_header( msg, desc, option, heap, value, size ); LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1672,27 +1641,25 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na return E_INVALIDARG; } - if (msg->state < WS_MESSAGE_STATE_INITIALIZED) - { - LeaveCriticalSection( &msg->cs ); - return WS_E_INVALID_OPERATION; - } - - for (i = 0; i < msg->header_count; i++) + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else { - if (msg->header[i]->type || msg->header[i]->mapped) continue; - if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK && - WsXmlStringEquals( ns, &msg->header[i]->ns, NULL ) == S_OK) + for (i = 0; i < msg->header_count; i++) { - remove_header( msg, i ); - removed = TRUE; - i--; + if (msg->header[i]->type || msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK && + WsXmlStringEquals( ns, &msg->header[i]->ns, NULL ) == S_OK) + { + remove_header( msg, i ); + removed = TRUE; + i--; + } } + if (removed) hr = write_envelope( msg ); } - if (removed) hr = write_envelope( msg ); - LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1817,6 +1784,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) done: heap_free( header ); LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 92406f15df..811aa8d9ae 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -219,6 +219,7 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, HRESULT WINAPI WsResetServiceProxy( WS_SERVICE_PROXY *handle, WS_ERROR *error ) { struct proxy *proxy = (struct proxy *)handle; + HRESULT hr = S_OK; TRACE( "%p %p\n", handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -234,15 +235,13 @@ HRESULT WINAPI WsResetServiceProxy( WS_SERVICE_PROXY *handle, WS_ERROR *error ) } if (proxy->state != WS_SERVICE_PROXY_STATE_CREATED && proxy->state != WS_SERVICE_PROXY_STATE_CLOSED) - { - LeaveCriticalSection( &proxy->cs ); - return WS_E_INVALID_OPERATION; - } - - reset_proxy( proxy ); + hr = WS_E_INVALID_OPERATION; + else + reset_proxy( proxy ); LeaveCriticalSection( &proxy->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -304,6 +303,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO } LeaveCriticalSection( &proxy->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -334,6 +334,7 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A proxy->state = WS_SERVICE_PROXY_STATE_OPEN; LeaveCriticalSection( &proxy->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -363,6 +364,7 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON proxy->state = WS_SERVICE_PROXY_STATE_CLOSED; LeaveCriticalSection( &proxy->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -544,5 +546,6 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION done: WsFreeMessage( msg ); LeaveCriticalSection( &proxy->cs ); + TRACE( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7288c4b966..a5ff59a417 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -622,6 +622,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + HRESULT hr = S_OK; TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -641,7 +642,8 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY reader->read_pos = 0; LeaveCriticalSection( &reader->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -657,6 +659,7 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR static const WS_XML_STRING xmlns_ns = {29, (BYTE *)"http://www.w3.org/2000/xmlns/"}; struct reader *reader = (struct reader *)handle; BOOL found = FALSE; + HRESULT hr = S_OK; TRACE( "%p %s %d %p %p\n", handle, debugstr_xmlstr(prefix), required, ns, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -671,13 +674,8 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR return E_INVALIDARG; } - if (reader->state != READER_STATE_STARTELEMENT) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; - } - - if (!prefix->length) + if (reader->state != READER_STATE_STARTELEMENT) hr = WS_E_INVALID_OPERATION; + else if (!prefix->length) { *ns = &empty_ns; found = TRUE; @@ -711,14 +709,18 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR LeaveCriticalSection( &reader->cs ); - if (!found) + if (hr == S_OK && !found) { - if (required) return WS_E_INVALID_FORMAT; - *ns = NULL; - return S_FALSE; + if (required) hr = WS_E_INVALID_FORMAT; + else + { + *ns = NULL; + hr = S_FALSE; + } } - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -728,6 +730,7 @@ HRESULT WINAPI WsGetReaderNode( WS_XML_READER *handle, const WS_XML_NODE **node, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %p\n", handle, node, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -745,6 +748,7 @@ HRESULT WINAPI WsGetReaderNode( WS_XML_READER *handle, const WS_XML_NODE **node, *node = &reader->current->hdr.node; LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return S_OK; } @@ -778,16 +782,12 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT return E_INVALIDARG; } - if (!reader->input_type) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; - } - - if (id == WS_XML_READER_PROPERTY_CHARSET) hr = get_charset( reader, buf, size ); + if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + else if (id == WS_XML_READER_PROPERTY_CHARSET) hr = get_charset( reader, buf, size ); else hr = prop_get( reader->prop, reader->prop_count, id, buf, size ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3098,6 +3098,7 @@ HRESULT WINAPI WsReadEndElement( WS_XML_READER *handle, WS_ERROR *error ) hr = read_endelement( reader ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3125,6 +3126,7 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error ) hr = read_node( reader ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3171,6 +3173,7 @@ HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error ) hr = skip_node( reader ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3198,6 +3201,7 @@ HRESULT WINAPI WsReadStartElement( WS_XML_READER *handle, WS_ERROR *error ) hr = read_startelement( reader ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3227,6 +3231,7 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING hr = read_to_startelement( reader, found ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3523,15 +3528,11 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found return E_INVALIDARG; } - if (!reader->input_type) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = read_move_to( reader, move, found ); + if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + else hr = read_move_to( reader, move, found ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3542,6 +3543,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO { struct reader *reader = (struct reader *)handle; const WS_XML_ELEMENT_NODE *elem; + HRESULT hr = S_OK; TRACE( "%p %u %p\n", handle, index, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -3557,16 +3559,15 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO } elem = &reader->current->hdr; - if (reader->state != READER_STATE_STARTELEMENT || index >= elem->attributeCount) + if (reader->state != READER_STATE_STARTELEMENT || index >= elem->attributeCount) hr = WS_E_INVALID_FORMAT; + else { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_FORMAT; + reader->current_attr = index; + reader->state = READER_STATE_STARTATTRIBUTE; } - reader->current_attr = index; - reader->state = READER_STATE_STARTATTRIBUTE; - LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return S_OK; } @@ -3576,6 +3577,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO HRESULT WINAPI WsReadEndAttribute( WS_XML_READER *handle, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + HRESULT hr = S_OK; TRACE( "%p %p\n", handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -3590,16 +3592,12 @@ HRESULT WINAPI WsReadEndAttribute( WS_XML_READER *handle, WS_ERROR *error ) return E_INVALIDARG; } - if (reader->state != READER_STATE_STARTATTRIBUTE) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_FORMAT; - } - - reader->state = READER_STATE_STARTELEMENT; + if (reader->state != READER_STATE_STARTATTRIBUTE) hr = WS_E_INVALID_FORMAT; + else reader->state = READER_STATE_STARTELEMENT; LeaveCriticalSection( &reader->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT str_to_bool( const unsigned char *str, ULONG len, BOOL *ret ) @@ -4061,27 +4059,13 @@ HRESULT WINAPI WsReadQualifiedName( WS_XML_READER *handle, WS_HEAP *heap, WS_XML return E_INVALIDARG; } - if (!reader->input_type) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; - } - - if (!localname) - { - LeaveCriticalSection( &reader->cs ); - return E_INVALIDARG; - } - - if (reader->state != READER_STATE_TEXT) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_FORMAT; - } - - hr = read_qualified_name( reader, heap, prefix, localname, ns ); + if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + else if (!localname) hr = E_INVALIDARG; + else if (reader->state != READER_STATE_TEXT) hr = WS_E_INVALID_FORMAT; + else hr = read_qualified_name( reader, heap, prefix, localname, ns ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4299,13 +4283,8 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca return E_INVALIDARG; } - if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; - } - - if (!find_attribute( reader, localname, ns, index )) + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) hr = WS_E_INVALID_OPERATION; + else if (!find_attribute( reader, localname, ns, index )) { if (required) hr = WS_E_INVALID_FORMAT; else @@ -4316,6 +4295,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca } LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -6701,25 +6681,22 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY return E_INVALIDARG; } - if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size, &found )) != S_OK) - { - LeaveCriticalSection( &reader->cs ); - return hr; - } - - switch (mapping) + if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size, &found )) == S_OK) { - case WS_ELEMENT_TYPE_MAPPING: - hr = read_node( reader ); - break; + switch (mapping) + { + case WS_ELEMENT_TYPE_MAPPING: + hr = read_node( reader ); + break; - default: - break; + default: + break; + } + if (hr == S_OK && !read_end_of_data( reader )) hr = WS_E_INVALID_FORMAT; } - if (hr == S_OK && !read_end_of_data( reader )) hr = WS_E_INVALID_FORMAT; - LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -6774,6 +6751,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO desc->elementNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -6805,6 +6783,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi NULL, value, size, &found ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -6832,16 +6811,12 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI return E_INVALIDARG; } - if (!reader->input_type) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->attributeLocalName, - desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); + if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + else hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->attributeLocalName, + desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -6984,6 +6959,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * done: LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -7033,6 +7009,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, done: LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -7042,6 +7019,7 @@ done: HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION *pos, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %p\n", handle, pos, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -7056,17 +7034,16 @@ HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION return E_INVALIDARG; } - if (!reader->input_buf) + if (!reader->input_buf) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; + pos->buffer = (WS_XML_BUFFER *)reader->input_buf; + pos->node = reader->current; } - pos->buffer = (WS_XML_BUFFER *)reader->input_buf; - pos->node = reader->current; - LeaveCriticalSection( &reader->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -7075,6 +7052,7 @@ HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION HRESULT WINAPI WsSetReaderPosition( WS_XML_READER *handle, const WS_XML_NODE_POSITION *pos, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %p\n", handle, pos, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -7089,16 +7067,12 @@ HRESULT WINAPI WsSetReaderPosition( WS_XML_READER *handle, const WS_XML_NODE_POS return E_INVALIDARG; } - if (!reader->input_buf) - { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; - } - - reader->current = pos->node; + if (!reader->input_buf) hr = WS_E_INVALID_OPERATION; + else reader->current = pos->node; LeaveCriticalSection( &reader->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT utf8_to_base64( const WS_XML_UTF8_TEXT *utf8, WS_XML_BASE64_TEXT *base64 ) @@ -7115,7 +7089,7 @@ static HRESULT utf8_to_base64( const WS_XML_UTF8_TEXT *utf8, WS_XML_BASE64_TEXT HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, ULONG *count, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; - HRESULT hr; + HRESULT hr = S_OK; TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -7132,14 +7106,13 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, if (!reader->input_type) { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } - if (!count) { - LeaveCriticalSection( &reader->cs ); - return E_INVALIDARG; + hr = E_INVALIDARG; + goto done; } *count = 0; @@ -7148,17 +7121,12 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)reader->current; WS_XML_BASE64_TEXT base64; - if ((hr = utf8_to_base64( (const WS_XML_UTF8_TEXT *)text->text, &base64 )) != S_OK) - { - LeaveCriticalSection( &reader->cs ); - return hr; - } + if ((hr = utf8_to_base64( (const WS_XML_UTF8_TEXT *)text->text, &base64 )) != S_OK) goto done; if (reader->text_conv_offset == base64.length) { heap_free( base64.bytes ); hr = read_node( reader ); - LeaveCriticalSection( &reader->cs ); - return hr; + goto done; } *count = min( base64.length - reader->text_conv_offset, max_count ); memcpy( bytes, base64.bytes + reader->text_conv_offset, *count ); @@ -7166,8 +7134,10 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, heap_free( base64.bytes ); } +done: LeaveCriticalSection( &reader->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT utf8_to_utf16( const WS_XML_UTF8_TEXT *utf8, WS_XML_UTF16_TEXT *utf16 ) @@ -7185,6 +7155,7 @@ static HRESULT utf8_to_utf16( const WS_XML_UTF8_TEXT *utf8, WS_XML_UTF16_TEXT *u HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count, ULONG *count, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %u %p %p\n", handle, chars, max_count, count, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -7201,14 +7172,13 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count if (!reader->input_type) { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } - if (!count) { - LeaveCriticalSection( &reader->cs ); - return E_INVALIDARG; + hr = E_INVALIDARG; + goto done; } *count = 0; @@ -7218,17 +7188,12 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count WS_XML_UTF16_TEXT utf16; HRESULT hr; - if ((hr = utf8_to_utf16( (const WS_XML_UTF8_TEXT *)text->text, &utf16 )) != S_OK) - { - LeaveCriticalSection( &reader->cs ); - return hr; - } + if ((hr = utf8_to_utf16( (const WS_XML_UTF8_TEXT *)text->text, &utf16 )) != S_OK) goto done; if (reader->text_conv_offset == utf16.byteCount / sizeof(WCHAR)) { heap_free( utf16.bytes ); hr = read_node( reader ); - LeaveCriticalSection( &reader->cs ); - return hr; + goto done; } *count = min( utf16.byteCount / sizeof(WCHAR) - reader->text_conv_offset, max_count ); memcpy( chars, utf16.bytes + reader->text_conv_offset * sizeof(WCHAR), *count * sizeof(WCHAR) ); @@ -7236,8 +7201,10 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count heap_free( utf16.bytes ); } +done: LeaveCriticalSection( &reader->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -7246,7 +7213,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_count, ULONG *count, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; - HRESULT hr; + HRESULT hr = S_OK; TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -7263,14 +7230,13 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co if (!reader->input_type) { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } - if (!count) { - LeaveCriticalSection( &reader->cs ); - return E_INVALIDARG; + hr = E_INVALIDARG; + goto done; } *count = 0; @@ -7282,16 +7248,17 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co if (reader->text_conv_offset == utf8->value.length) { hr = read_node( reader ); - LeaveCriticalSection( &reader->cs ); - return hr; + goto done; } *count = min( utf8->value.length - reader->text_conv_offset, max_count ); memcpy( bytes, utf8->value.bytes + reader->text_conv_offset, *count ); reader->text_conv_offset += *count; } +done: LeaveCriticalSection( &reader->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT move_to_element( struct reader *reader ) @@ -7328,7 +7295,7 @@ HRESULT WINAPI WsReadXmlBuffer( WS_XML_READER *handle, WS_HEAP *heap, WS_XML_BUF { struct reader *reader = (struct reader *)handle; WS_XML_WRITER *writer = NULL; - WS_XML_BUFFER *buffer; + WS_XML_BUFFER *buffer = NULL; HRESULT hr; TRACE( "%p %p %p %p\n", handle, heap, ret, error ); @@ -7345,21 +7312,20 @@ HRESULT WINAPI WsReadXmlBuffer( WS_XML_READER *handle, WS_HEAP *heap, WS_XML_BUF return E_INVALIDARG; } - if (!reader->input_type) + if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &reader->cs ); - return WS_E_INVALID_OPERATION; + if ((hr = WsCreateWriter( NULL, 0, &writer, NULL )) != S_OK) goto done; + if ((hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL )) != S_OK) goto done; + if ((hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL )) != S_OK) goto done; + if ((hr = copy_tree( reader, writer )) == S_OK) *ret = buffer; } - if ((hr = WsCreateWriter( NULL, 0, &writer, NULL )) != S_OK) goto done; - if ((hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL )) != S_OK) goto done; - if ((hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL )) != S_OK) goto done; - if ((hr = copy_tree( reader, writer )) == S_OK) *ret = buffer; - done: if (hr != S_OK) free_xmlbuf( (struct xmlbuf *)buffer ); WsFreeWriter( writer ); LeaveCriticalSection( &reader->cs ); + TRACE( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 7631f4ebe8..ff633a656c 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -294,43 +294,42 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT return E_INVALIDARG; } - if (!writer->output_type) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - switch (id) - { - case WS_XML_WRITER_PROPERTY_BYTES: + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else { - WS_BYTES *bytes = buf; - if (size != sizeof(*bytes)) hr = E_INVALIDARG; - else + switch (id) { - bytes->bytes = writer->output_buf->bytes.bytes; - bytes->length = writer->output_buf->bytes.length; - } - break; - } - case WS_XML_WRITER_PROPERTY_BUFFERS: - if (writer->output_buf->bytes.length) + case WS_XML_WRITER_PROPERTY_BYTES: { - WS_BUFFERS *buffers = buf; - if (size != sizeof(*buffers)) hr = E_INVALIDARG; + WS_BYTES *bytes = buf; + if (size != sizeof(*bytes)) hr = E_INVALIDARG; else { - buffers->bufferCount = 1; - buffers->buffers = &writer->output_buf->bytes; + bytes->bytes = writer->output_buf->bytes.bytes; + bytes->length = writer->output_buf->bytes.length; } break; } - /* fall through */ - default: - hr = prop_get( writer->prop, writer->prop_count, id, buf, size ); + case WS_XML_WRITER_PROPERTY_BUFFERS: + if (writer->output_buf->bytes.length) + { + WS_BUFFERS *buffers = buf; + if (size != sizeof(*buffers)) hr = E_INVALIDARG; + else + { + buffers->bufferCount = 1; + buffers->buffers = &writer->output_buf->bytes; + } + break; + } + /* fall through */ + default: + hr = prop_get( writer->prop, writer->prop_count, id, buf, size ); + } } LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -438,6 +437,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -485,6 +485,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1476,6 +1477,7 @@ HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STR } LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1654,6 +1656,7 @@ static HRESULT set_namespaces( struct writer *writer ) HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) { struct writer *writer = (struct writer *)handle; + HRESULT hr = S_OK; TRACE( "%p %p\n", handle, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -1671,7 +1674,8 @@ HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) writer->state = WRITER_STATE_STARTELEMENT; LeaveCriticalSection( &writer->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT write_attributes( struct writer *writer, const WS_XML_ELEMENT_NODE *elem ) @@ -1913,6 +1917,7 @@ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error ) hr = write_endelement_node( writer ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -1957,19 +1962,18 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) return E_INVALIDARG; } - if (writer->state != WRITER_STATE_STARTELEMENT) + if (writer->state != WRITER_STATE_STARTELEMENT) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; + if ((hr = set_namespaces( writer )) != S_OK) goto done; + if ((hr = write_startelement( writer )) != S_OK) goto done; + if ((hr = write_endstartelement( writer )) != S_OK) goto done; + writer->state = WRITER_STATE_ENDSTARTELEMENT; } - if ((hr = set_namespaces( writer )) != S_OK) goto done; - if ((hr = write_startelement( writer )) != S_OK) goto done; - if ((hr = write_endstartelement( writer )) != S_OK) goto done; - writer->state = WRITER_STATE_ENDSTARTELEMENT; - done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2033,16 +2037,12 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING return E_INVALIDARG; } - if (writer->state != WRITER_STATE_STARTELEMENT) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - if ((hr = write_add_attribute( writer, prefix, localname, ns, single )) == S_OK) + if (writer->state != WRITER_STATE_STARTELEMENT) hr = WS_E_INVALID_OPERATION; + else if ((hr = write_add_attribute( writer, prefix, localname, ns, single )) == S_OK) writer->state = WRITER_STATE_STARTATTRIBUTE; LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2121,6 +2121,7 @@ HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error ) hr = write_cdata_node( writer ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2162,15 +2163,11 @@ HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) return E_INVALIDARG; } - if (writer->state != WRITER_STATE_TEXT) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = write_endcdata_node( writer ); + if (writer->state != WRITER_STATE_TEXT) hr = WS_E_INVALID_OPERATION; + else hr = write_endcdata_node( writer ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2257,6 +2254,7 @@ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING * hr = write_element_node( writer, prefix, localname, ns ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2892,6 +2890,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E else hr = write_text_node( writer, text ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2917,20 +2916,19 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou return E_INVALIDARG; } - if (!writer->output_type) + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - base64.text.textType = WS_XML_TEXT_TYPE_BASE64; - base64.bytes = (BYTE *)bytes; - base64.length = count; + base64.text.textType = WS_XML_TEXT_TYPE_BASE64; + base64.bytes = (BYTE *)bytes; + base64.length = count; - if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &base64.text ); - else hr = write_text_node( writer, &base64.text ); + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &base64.text ); + else hr = write_text_node( writer, &base64.text ); + } LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2956,20 +2954,19 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co return E_INVALIDARG; } - if (!writer->output_type) + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; - utf16.bytes = (BYTE *)chars; - utf16.byteCount = count * sizeof(WCHAR); + utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16.bytes = (BYTE *)chars; + utf16.byteCount = count * sizeof(WCHAR); - if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &utf16.text ); - else hr = write_text_node( writer, &utf16.text ); + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &utf16.text ); + else hr = write_text_node( writer, &utf16.text ); + } LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -2995,20 +2992,19 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG return E_INVALIDARG; } - if (!writer->output_type) + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; - utf8.value.bytes = (BYTE *)bytes; - utf8.value.length = count; + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = (BYTE *)bytes; + utf8.value.length = count; - if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &utf8.text ); - else hr = write_text_node( writer, &utf8.text ); + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &utf8.text ); + else hr = write_text_node( writer, &utf8.text ); + } LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3892,22 +3888,15 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR return E_INVALIDARG; } - if (writer->state != WRITER_STATE_STARTELEMENT) + if (writer->state != WRITER_STATE_STARTELEMENT) hr = WS_E_INVALID_OPERATION; + else if ((hr = write_add_attribute( writer, NULL, desc->attributeLocalName, desc->attributeNs, FALSE )) == S_OK) { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - if ((hr = write_add_attribute( writer, NULL, desc->attributeLocalName, desc->attributeNs, FALSE )) != S_OK) - { - LeaveCriticalSection( &writer->cs ); - return hr; + writer->state = WRITER_STATE_STARTATTRIBUTE; + hr = write_type( writer, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->typeDescription, option, value, size ); } - writer->state = WRITER_STATE_STARTATTRIBUTE; - - hr = write_type( writer, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->typeDescription, option, value, size ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3944,6 +3933,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -3990,6 +3980,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T } LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4059,6 +4050,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co if (hr == S_OK) hr = write_type( writer, mapping, type, NULL, WS_WRITE_REQUIRED_VALUE, value, size ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4090,21 +4082,21 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna if (!writer->output_type) { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; + hr = WS_E_INVALID_OPERATION; + goto done; } if (!localname || !ns || (type = map_value_type( value_type )) == ~0u) { - LeaveCriticalSection( &writer->cs ); - return E_INVALIDARG; + hr = E_INVALIDARG; + goto done; } type_size = get_type_size( type, NULL ); if (size % type_size || (offset + count) * type_size > size || (count && !array)) { - LeaveCriticalSection( &writer->cs ); - return E_INVALIDARG; + hr = E_INVALIDARG; + goto done; } for (i = offset; i < count; i++) @@ -4118,6 +4110,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4156,6 +4149,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4210,6 +4204,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4236,16 +4231,12 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING return E_INVALIDARG; } - if (writer->state != WRITER_STATE_STARTELEMENT) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - if (!namespace_in_scope( &writer->current->hdr, prefix, ns )) + if (writer->state != WRITER_STATE_STARTELEMENT) hr = WS_E_INVALID_OPERATION; + else if (!namespace_in_scope( &writer->current->hdr, prefix, ns )) hr = add_namespace_attribute( writer, prefix, ns, single ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4290,27 +4281,13 @@ HRESULT WINAPI WsWriteQualifiedName( WS_XML_WRITER *handle, const WS_XML_STRING return E_INVALIDARG; } - if (!writer->output_type) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - if (writer->state != WRITER_STATE_STARTELEMENT) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_FORMAT; - } - - if (!localname || (!prefix && !ns)) - { - LeaveCriticalSection( &writer->cs ); - return E_INVALIDARG; - } - - hr = write_qualified_name( writer, prefix, localname, ns ); + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else if (writer->state != WRITER_STATE_STARTELEMENT) hr = WS_E_INVALID_FORMAT; + else if (!localname || (!prefix && !ns)) hr = E_INVALIDARG; + else hr = write_qualified_name( writer, prefix, localname, ns ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4406,15 +4383,11 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found return E_INVALIDARG; } - if (!writer->output_type) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = write_move_to( writer, move, found ); + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else hr = write_move_to( writer, move, found ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4424,6 +4397,7 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION *pos, WS_ERROR *error ) { struct writer *writer = (struct writer *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %p\n", handle, pos, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4438,17 +4412,16 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION return E_INVALIDARG; } - if (!writer->output_type) + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; + pos->buffer = (WS_XML_BUFFER *)writer->output_buf; + pos->node = writer->current; } - pos->buffer = (WS_XML_BUFFER *)writer->output_buf; - pos->node = writer->current; - LeaveCriticalSection( &writer->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } /************************************************************************** @@ -4457,6 +4430,7 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POSITION *pos, WS_ERROR *error ) { struct writer *writer = (struct writer *)handle; + HRESULT hr = S_OK; TRACE( "%p %p %p\n", handle, pos, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4471,16 +4445,12 @@ HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POS return E_INVALIDARG; } - if (!writer->output_type) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - writer->current = pos->node; + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else writer->current = pos->node; LeaveCriticalSection( &writer->cs ); - return S_OK; + TRACE( "returning %08x\n", hr ); + return hr; } static HRESULT write_add_comment_node( struct writer *writer, const WS_XML_STRING *value ) @@ -4635,15 +4605,11 @@ HRESULT WINAPI WsWriteNode( WS_XML_WRITER *handle, const WS_XML_NODE *node, WS_E return E_INVALIDARG; } - if (!writer->output_type) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = write_node( writer, node ); + if (!writer->output_type) hr = WS_E_INVALID_OPERATION; + else hr = write_node( writer, node ); LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } @@ -4758,24 +4724,23 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO return E_INVALIDARG; } - if (!(parent = find_parent( writer ))) + if (!(parent = find_parent( writer ))) hr = WS_E_INVALID_FORMAT; + else { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_FORMAT; - } + if ((hr = copy_node( reader, writer->output_enc, &node )) != S_OK) goto done; + current = writer->current; + write_insert_node( writer, parent, node ); - if ((hr = copy_node( reader, writer->output_enc, &node )) != S_OK) goto done; - current = writer->current; - write_insert_node( writer, parent, node ); - - write_rewind( writer ); - if ((hr = write_tree( writer )) != S_OK) goto done; - writer->current = current; + write_rewind( writer ); + if ((hr = write_tree( writer )) != S_OK) goto done; + writer->current = current; - WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); + WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); + } done: LeaveCriticalSection( &writer->cs ); + TRACE( "returning %08x\n", hr ); return hr; } -- 2.11.0

1 0

[PATCH 2/4] webservices: Don't set the critical section name in the Windows build.
by Hans Leidekker 17 Oct '18

17 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 16 ++++++++-------- dlls/webservices/error.c | 4 ++++ dlls/webservices/heap.c | 4 ++++ dlls/webservices/listener.c | 4 ++++ dlls/webservices/msg.c | 4 ++++ dlls/webservices/proxy.c | 4 ++++ dlls/webservices/reader.c | 5 +++++ dlls/webservices/writer.c | 4 ++++ 8 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 0cd8b910e8..5d3ca347da 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -251,13 +251,13 @@ static struct channel *alloc_channel(void) ret->magic = CHANNEL_MAGIC; InitializeCriticalSection( &ret->cs ); - ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.cs"); - InitializeCriticalSection( &ret->send_q.cs ); - ret->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.send_q.cs"); - InitializeCriticalSection( &ret->recv_q.cs ); +#ifndef __MINGW32__ + ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.cs"); + ret->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.send_q.cs"); ret->recv_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.recv_q.cs"); +#endif prop_init( channel_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -342,13 +342,13 @@ static void free_channel( struct channel *channel ) heap_free( channel->read_buf ); +#ifndef __MINGW32__ channel->send_q.cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &channel->send_q.cs ); - channel->recv_q.cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &channel->recv_q.cs ); - channel->cs.DebugInfo->Spare[0] = 0; +#endif + DeleteCriticalSection( &channel->send_q.cs ); + DeleteCriticalSection( &channel->recv_q.cs ); DeleteCriticalSection( &channel->cs ); heap_free( channel ); } diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index 780040e51e..970c12e1e3 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -57,7 +57,9 @@ static struct error *alloc_error(void) ret->magic = ERROR_MAGIC; InitializeCriticalSection( &ret->cs ); +#ifndef __MINGW32__ ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": error.cs"); +#endif prop_init( error_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -66,7 +68,9 @@ static struct error *alloc_error(void) static void free_error( struct error *error ) { +#ifndef __MINGW32__ error->cs.DebugInfo->Spare[0] = 0; +#endif DeleteCriticalSection( &error->cs ); heap_free( error ); } diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 93e647abc6..93c8c4499a 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -185,7 +185,9 @@ static struct heap *alloc_heap(void) ret->magic = HEAP_MAGIC; InitializeCriticalSection( &ret->cs ); +#ifndef __MINGW32__ ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); +#endif prop_init( heap_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -245,7 +247,9 @@ void WINAPI WsFreeHeap( WS_HEAP *handle ) LeaveCriticalSection( &heap->cs ); +#ifndef __MINGW32__ heap->cs.DebugInfo->Spare[0] = 0; +#endif DeleteCriticalSection( &heap->cs ); heap_free( heap ); } diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 0189059aa7..2e8286e144 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -139,7 +139,9 @@ static struct listener *alloc_listener(void) return NULL; } InitializeCriticalSection( &ret->cs ); +#ifndef __MINGW32__ ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": listener.cs"); +#endif prop_init( listener_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -175,7 +177,9 @@ static void free_listener( struct listener *listener ) CloseHandle( listener->wait ); CloseHandle( listener->cancel ); +#ifndef __MINGW32__ listener->cs.DebugInfo->Spare[0] = 0; +#endif DeleteCriticalSection( &listener->cs ); heap_free( listener ); } diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 07063460be..48b4ec561d 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -106,7 +106,9 @@ static struct msg *alloc_msg(void) ret->header_size = HEADER_ARRAY_SIZE; InitializeCriticalSection( &ret->cs ); +#ifndef __MINGW32__ ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": msg.cs"); +#endif prop_init( msg_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -162,7 +164,9 @@ static void free_msg( struct msg *msg ) WsFreeHeap( msg->heap ); heap_free( msg->header ); +#ifndef __MINGW32__ msg->cs.DebugInfo->Spare[0] = 0; +#endif DeleteCriticalSection( &msg->cs ); heap_free( msg ); } diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 5122892704..92406f15df 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -63,7 +63,9 @@ static struct proxy *alloc_proxy(void) ret->magic = PROXY_MAGIC; InitializeCriticalSection( &ret->cs ); +#ifndef __MINGW32__ ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy.cs"); +#endif prop_init( proxy_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -81,7 +83,9 @@ static void free_proxy( struct proxy *proxy ) reset_proxy( proxy ); WsFreeChannel( proxy->channel ); +#ifndef __MINGW32__ proxy->cs.DebugInfo->Spare[0] = 0; +#endif DeleteCriticalSection( &proxy->cs ); heap_free( proxy ); } diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 296043fa25..7288c4b966 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -418,7 +418,9 @@ static struct reader *alloc_reader(void) ret->magic = READER_MAGIC; InitializeCriticalSection( &ret->cs ); +#ifndef __MINGW32__ ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.cs"); +#endif prop_init( reader_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -513,7 +515,10 @@ static void free_reader( struct reader *reader ) destroy_nodes( reader->root ); clear_prefixes( reader->prefixes, reader->nb_prefixes ); heap_free( reader->prefixes ); + +#ifndef __MINGW32__ reader->cs.DebugInfo->Spare[0] = 0; +#endif DeleteCriticalSection( &reader->cs ); heap_free( reader ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ef8f9193a0..7631f4ebe8 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -107,7 +107,9 @@ static struct writer *alloc_writer(void) ret->magic = WRITER_MAGIC; InitializeCriticalSection( &ret->cs ); +#ifndef __MINGW32__ ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": writer.cs"); +#endif prop_init( writer_props, count, ret->prop, &ret[1] ); ret->prop_count = count; @@ -120,7 +122,9 @@ static void free_writer( struct writer *writer ) free_xml_string( writer->current_ns ); WsFreeHeap( writer->output_heap ); +#ifndef __MINGW32__ writer->cs.DebugInfo->Spare[0] = 0; +#endif DeleteCriticalSection( &writer->cs ); heap_free( writer ); } -- 2.11.0

1 0

[PATCH 1/4] webservices: Add a version resource.
by Hans Leidekker 17 Oct '18

17 Oct '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/Makefile.in | 2 ++ dlls/webservices/rsrc.rc | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 dlls/webservices/rsrc.rc diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index 58dac38b74..b58714d325 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -13,3 +13,5 @@ C_SRCS = \ string.c \ url.c \ writer.c + +RC_SRCS = rsrc.rc diff --git a/dlls/webservices/rsrc.rc b/dlls/webservices/rsrc.rc new file mode 100644 index 0000000000..ef8d5c0950 --- /dev/null +++ b/dlls/webservices/rsrc.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2018 Hans Leidekker for CodeWeavers + * + * 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 WINE_FILEDESCRIPTION_STR "Wine Web Services" +#define WINE_FILENAME_STR "webservices.dll" +#define WINE_FILEVERSION_MAJOR 10 +#define WINE_FILEVERSION_MINOR 0 +#define WINE_FILEVERSION_BUILD 14393 +#define WINE_FILEVERSION_PLATFORMID 0 + +#define WINE_PRODUCTVERSION 10,0,14993,0 +#define WINE_PRODUCTVERSION_STR "10.0.14993.0" + +#include "wine/wine_common_ver.rc" -- 2.11.0

1 0

[PATCH] advapi32: Don't create a WoW6432 MachineGuid
by Brendan McGrath 17 Oct '18

17 Oct '18

Wine currently creates a MachineGuid (of different values) for: a) the 64bit branch of registry; and b) the Wow6432 branch Windows doesn't create a MachineGuid for Wow6432. This patch brings wine inline with Windows by ensuring a MachineGuid is not created for Wow6432. It should be noted that this could create an issue for 32bit Mono applications that are currently being ran with 'wine' as a work-around for issues within 'wine64'. The workaround to this would be to manually add a Wow6432 MachineGuid. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 01d58804235..ab1e5982da3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -281,7 +281,7 @@ static void CRYPT_CreateMachineGuid(void) LONG r; HKEY key; - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, KEY_ALL_ACCESS, + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &key); if (!r) { -- 2.17.1

1 0

[PATCH] fonts: Add Hebrew glyphs to Tahoma Bold font.
by katahiromz 17 Oct '18

17 Oct '18

Add Hebrew characters to Tahoma Bold font (fonts/tahomabd.sdf and fonts/tahomabd.ttf). Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> --- https://jira.reactos.org/browse/CORE-14880

2 3

[PATCH] advapi32: MachineGUID to have same value in WoW64
by Brendan McGrath 17 Oct '18

17 Oct '18

Currently, when running the following two commands in a new prefix: wine reg query 'HKLM\Software\Microsoft\Cryptography' /v MachineGuid wine64 reg query 'HKLM\Software\Microsoft\Cryptography' /v MachineGuid Two different values are returned. This can cause an issue when, for example, a 32-bit Launcher and 64-bit application expect the same value. This patch ensures that when the 64-bit GUID is created, the 32-bit GUID is created as well (with the same value). Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- I considered a few options on how to achieve this; but ended up with this option as it seemed the simplest. However, it does leave the possiblity for an application or user to change one and leave the other. I did note that Windows doesn't appear to have a MachineGuid entry for WoW, so it looks like Windows just uses the one entry. But I wasn't sure of the best way to achieve that in Wine (and couldn't find a precedent). dlls/advapi32/crypt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 01d58804235..0ea64b52226 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -313,6 +313,14 @@ static void CRYPT_CreateMachineGuid(void) RegSetValueExW(key, machineGuidW, 0, REG_SZ, (const BYTE *)buf, (lstrlenW(buf)+1)*sizeof(WCHAR)); + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, + KEY_ALL_ACCESS | KEY_WOW64_32KEY, &key); + if (!r) + { + RegSetValueExW(key, machineGuidW, 0, REG_SZ, + (const BYTE *)buf, + (lstrlenW(buf)+1)*sizeof(WCHAR)); + } } } RegCloseKey(key); -- 2.17.1

3 9

[PATCH v3 1/2] shell32/autocomplete: Use the optional IACList interface and IACList::Expand, if available
by Gabriel Ivăncescu 17 Oct '18

17 Oct '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Use strpbrkW and a helper function, and make it return TRUE when it expands, which will be useful in the future. Also avoid (extremely rare?) reference leak when E_OUTOFMEMORY is returned. dlls/shell32/autocomplete.c | 70 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 11e9317..dfe7638 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -2,6 +2,7 @@ * AutoComplete interfaces implementation. * * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> + * Copyright 2018 Gabriel Ivăncescu <gabrielopcode(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -68,6 +69,7 @@ typedef struct WCHAR *txtbackup; WCHAR *quickComplete; IEnumString *enumstr; + IACList *aclist; AUTOCOMPLETEOPTIONS options; WCHAR no_fwd_char; } IAutoCompleteImpl; @@ -221,6 +223,49 @@ static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) return 0; } +static BOOL do_aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt, WCHAR *last_delim) +{ + WCHAR c = last_delim[1]; + last_delim[1] = '\0'; + IACList_Expand(ac->aclist, txt); + last_delim[1] = c; + return TRUE; +} + +static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) +{ + /* call IACList::Expand only when needed, if the + new txt and old_txt require different expansions */ + WCHAR c, *p, *last_delim, *old_txt = ac->txtbackup; + size_t i = 0; + + /* '/' is allowed as a delim for unix paths */ + static const WCHAR delims[] = { '\\', '/', 0 }; + + /* skip the shared prefix */ + while ((c = tolowerW(txt[i])) == tolowerW(old_txt[i])) + { + if (c == '\0') return FALSE; + i++; + } + + /* they differ at this point, check for a delim further in txt */ + for (last_delim = NULL, p = &txt[i]; (p = strpbrkW(p, delims)) != NULL; p++) + last_delim = p; + if (last_delim) return do_aclist_expand(ac, txt, last_delim); + + /* txt has no delim after i, check for a delim further in old_txt */ + if (strpbrkW(&old_txt[i], delims)) + { + /* scan backwards to find the first delim before txt[i] (if any) */ + while (i--) + if (strchrW(delims, txt[i])) + return do_aclist_expand(ac, txt, &txt[i]); + } + + return FALSE; +} + static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR *str, HWND hwnd) { DWORD sel_start; @@ -268,6 +313,17 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (len + 1 != size) text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); + /* Reset it here to simplify the logic in aclist_expand for + empty strings, since it tracks changes using txtbackup, + and Reset needs to be called before IACList::Expand */ + IEnumString_Reset(ac->enumstr); + if (ac->aclist) + { + aclist_expand(ac, text); + if (text[len - 1] == '\\' || text[len - 1] == '/') + flag = autoappend_flag_no; + } + /* Set txtbackup to point to text itself (which must not be released) */ heap_free(ac->txtbackup); ac->txtbackup = text; @@ -277,7 +333,6 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); } - IEnumString_Reset(ac->enumstr); for (cpt = 0;;) { LPOLESTR strs = NULL; @@ -607,6 +662,8 @@ static ULONG WINAPI IAutoComplete2_fnRelease( heap_free(This->txtbackup); if (This->enumstr) IEnumString_Release(This->enumstr); + if (This->aclist) + IACList_Release(This->aclist); heap_free(This); } return refCount; @@ -663,6 +720,17 @@ static HRESULT WINAPI IAutoComplete2_fnInit( return E_NOINTERFACE; } + /* Prevent txtbackup from ever being NULL to simplify aclist_expand */ + if ((This->txtbackup = heap_alloc_zero(sizeof(WCHAR))) == NULL) + { + IEnumString_Release(This->enumstr); + This->enumstr = NULL; + return E_OUTOFMEMORY; + } + + if (FAILED (IUnknown_QueryInterface (punkACL, &IID_IACList, (LPVOID*)&This->aclist))) + This->aclist = NULL; + This->initialized = TRUE; This->hwndEdit = hwndEdit; -- 1.9.1

2 4

[PATCH 1/4] rpcrt4/tests: Use publicly defined NDR constants.
by Zebediah Figura 17 Oct '18

17 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 21baba7..586a7ef 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -35,6 +35,7 @@ #include "rpcdce.h" #include "rpcproxy.h" #include "midles.h" +#include "ndrtypes.h" static int my_alloc_called; static int my_free_called; @@ -154,17 +155,17 @@ static void test_ndr_simple_type(void) StubMsg.BufferLength = 16; StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); l = 0xcafebabe; - NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 4, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(*(LONG*)StubMsg.BufferStart == l, "%d\n", *(LONG*)StubMsg.BufferStart); StubMsg.Buffer = StubMsg.BufferStart + 1; - NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, 8 /* FC_LONG */); + NdrSimpleTypeMarshall(&StubMsg, (unsigned char*)&l, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(*(LONG*)(StubMsg.BufferStart + 4) == l, "%d\n", *(LONG*)StubMsg.BufferStart); StubMsg.Buffer = StubMsg.BufferStart + 1; - NdrSimpleTypeUnmarshall(&StubMsg, (unsigned char*)&l2, 8 /* FC_LONG */); + NdrSimpleTypeUnmarshall(&StubMsg, (unsigned char*)&l2, FC_LONG); ok(StubMsg.Buffer == StubMsg.BufferStart + 8, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); ok(l2 == l, "%d\n", l2); @@ -230,7 +231,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize, "%s: mem size %u\n", msgpfx, size); @@ -240,7 +241,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *) + 16, "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + 16, "%s: mem size %u\n", msgpfx, size); @@ -250,19 +251,19 @@ static void test_pointer_marshal(const unsigned char *formattypes, size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) ok(size == srcsize + sizeof(void *) + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); size = srcsize; - if(formattypes[1] & 0x10) size += 4; + if (formattypes[1] & FC_POINTER_DEREF) size += 4; StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); @@ -275,7 +276,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, /* reset the buffer and call with must alloc */ StubMsg.Buffer = StubMsg.BufferStart; - if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) + if (formattypes[1] & FC_POINTER_DEREF) *(void**)mem = NULL; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 1 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); @@ -291,7 +292,7 @@ todo_wine { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); } my_alloc_called = 0; - if(formattypes[0] != 0x11 /* FC_RP */) + if (formattypes[0] != FC_RP) { /* now pass the address of a NULL ptr */ mem = NULL; @@ -314,14 +315,15 @@ todo_wine { StubMsg.IsClient = 0; ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - if (formattypes[2] == 0xd /* FC_ENUM16 */) + if (formattypes[2] == FC_ENUM16) ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); else ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); - if (formattypes[2] != 0xd /* FC_ENUM16 */) { + if (formattypes[2] != FC_ENUM16) + { ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); my_alloc_called = 0; } -- 2.7.4

2 7

[PATCH] wbemprox: Return NULL signature when there are no input parameters
by Piotr Caban 17 Oct '18

17 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/class.c | 14 +++++++++++--- dlls/wbemprox/tests/query.c | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-)

2 1

[PATCH 2/2] include: Register interface proxies for IUPnPNAT
by Alistair Leslie-Hughes 17 Oct '18

17 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34711 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/natupnp.idl | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/include/natupnp.idl b/include/natupnp.idl index 83b48a3..0ba546f 100644 --- a/include/natupnp.idl +++ b/include/natupnp.idl @@ -26,7 +26,7 @@ import "ocidl.idl"; [ object, - uuid(6F10711F-729B-41E5-93B8-F21D0F818DF1), + uuid(6f10711f-729b-41e5-93b8-f21d0f818df1), dual, pointer_default(unique) ] @@ -93,7 +93,7 @@ interface IStaticPortMappingCollection : IDispatch [ object, - uuid(4FC80282-23B6-4378-9A27-CD8F17C9400C), + uuid(4fc80282-23b6-4378-9a27-cd8f17c9400c), dual, pointer_default(unique) ] @@ -185,24 +185,6 @@ interface INATEventManager : IDispatch }; [ - object, - uuid(b171c812-cc76-485a-94d8-b6b3a2794e99), - dual, - pointer_default(unique) -] -interface IUPnPNAT : IDispatch -{ - [propget, id(1)] - HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection); - - [propget, id(2)] - HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection); - - [propget, id(3)] - HRESULT NATEventManager ([out, retval] INATEventManager **manager); -}; - -[ id(2), uuid(1c565858-f302-471e-b409-f180aa4abec6), version(1.0) @@ -212,6 +194,25 @@ library NATUPNPLib importlib("stdole2.tlb"); [ + object, + uuid(b171c812-cc76-485a-94d8-b6b3a2794e99), + dual, + oleautomation, + pointer_default(unique) + ] + interface IUPnPNAT : IDispatch + { + [propget, id(1)] + HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection); + + [propget, id(2)] + HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection); + + [propget, id(3)] + HRESULT NATEventManager ([out, retval] INATEventManager **manager); + }; + + [ vi_progid("HNetCfg.NATUPnP"), progid("HNetCfg.NATUPnP.1"), threading(apartment), -- 1.9.1

2 1

[PATCH 1/2] hnetcfg: Add test for IProvideClassInfo interface
by Alistair Leslie-Hughes 17 Oct '18

17 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/port.c | 5 +++++ dlls/hnetcfg/tests/policy.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index f497bcb..7f3f6c5 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -629,6 +629,11 @@ static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void { *object = iface; } + else if(IsEqualGUID( riid, &IID_IProvideClassInfo)) + { + TRACE("IProvideClassInfo not supported."); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 61175f9..3fa8348 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -167,11 +167,15 @@ static void test_IUPnPNAT(void) IStaticPortMappingCollection *static_ports; IDynamicPortMappingCollection *dync_ports; INATEventManager *manager; + IProvideClassInfo *provider; HRESULT hr; hr = CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUPnPNAT, (void**)&nat); ok(hr == S_OK, "got: %08x\n", hr); + hr = IUPnPNAT_QueryInterface(nat, &IID_IProvideClassInfo, (void**)&provider); + ok(hr == E_NOINTERFACE, "got: %08x\n", hr); + hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); todo_wine ok(hr == S_OK, "got: %08x\n", hr); if(hr == S_OK && static_ports) -- 1.9.1

1 0

[PATCH 1/6] d2d1: Use default NULL argument in SetBlendState call
by Daniel Ansorregui 17 Oct '18

17 Oct '18

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/d2d1/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index ff5caac5d8..2593413661 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -131,8 +131,6 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en D3D10_VIEWPORT vp; HRESULT hr; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; - vp.TopLeftX = 0; vp.TopLeftY = 0; vp.Width = render_target->pixel_size.width; @@ -180,7 +178,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { - ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, device, 0); } if (opacity_brush) -- 2.17.1

4 9

[PATCH] wined3d: Avoid accessing the device after deactivation some more.
by Henri Verbeet 16 Oct '18

16 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Apparently I got "lucky" running the tests yesterday. Today, ddraw's test_killfocus() was consistently crashing on this. --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70d43e07e39..b90df20a7da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5315,9 +5315,13 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_ACTIVATEAPP) { - UINT i; + unsigned int i = device->swapchain_count; - for (i = 0; i < device->swapchain_count; i++) + /* Deactivating the implicit swapchain may cause the application + * (e.g. Deus Ex: GOTY) to destroy the device, so take care to + * deactivate the implicit swapchain last, and to avoid accessing the + * "device" pointer afterwards. */ + while (i--) wined3d_swapchain_activate(device->swapchains[i], wparam); } else if (message == WM_SYSCOMMAND) -- 2.11.0

1 0

[PATCH] jscript: Allow trailing comma in object literals.
by Jacek Caban 16 Oct '18

16 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.y | 8 ++++++++ dlls/jscript/tests/lang.js | 14 ++++++++++++++ 2 files changed, 22 insertions(+)

1 0

[PATCH] mshtml: Try to avoid use_event_quirks in call_event_handlers if possible.
by Jacek Caban 16 Oct '18

16 Oct '18

It may cause an unintended lock on document mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)

1 0

[Bugzilla] Update bug statuses descriptions.
by Andrey Gusev 16 Oct '18

16 Oct '18

For https://bugs.winehq.org/show_bug.cgi?id=39470 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- template/en/default/pages/fields.html.tmpl | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index f7437a0..d015fb9 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -90,6 +90,22 @@ either marked [% display_value("bug_status", "ASSIGNED") FILTER html %] or [% display_value("bug_status", "RESOLVED") FILTER html %]. </dd> + + <dt> + [% display_value("bug_status", "NEEDINFO") FILTER html %] + </dt> + <dd> + This [% terms.bug %] has an unclear description or the reporter didn't + provide a requested information. In such case, after some time a [% terms.bug %] can be closed as + [% display_value("resolution", "ABANDONED") FILTER html %]. + </dd> + + <dt> + [% display_value("bug_status", "STAGED") FILTER html %] + </dt> + <dd> + This [% terms.bug %] has an experimental patches for testing before integration into the development branch. + </dd> </dl> </td> @@ -186,13 +202,12 @@ </dd> <dt> - [% display_value("resolution", "UPSTREAM") FILTER html %] + [% display_value("resolution", "NOTOURBUG") FILTER html %] </dt> <dd> The problem is not a [% terms.bug %] in Wine, but in some upstream software Wine depends on or broken packages in distributions. - Note: Most other bug trackers call this "NOTOURBUG". </dd> </dl> </td> -- 2.17.2

1 0

[PATCH] gdiplus/tests: Don't fail if fonts are missing
by Alex Henrie 16 Oct '18

16 Oct '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This should fix the test failures on Debian. --- dlls/gdiplus/tests/font.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 961d8459cb..bbddcce345 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -430,28 +430,34 @@ static void test_getgenerics (void) int missingfonts = 0; stat = GdipGetGenericFontFamilySansSerif(&family); - expect (Ok, stat); if (stat == FontFamilyNotFound) missingfonts = 1; else + { + expect(Ok, stat); check_family("Sans Serif", family, sansname); + } stat = GdipGetGenericFontFamilySerif(&family); - expect (Ok, stat); if (stat == FontFamilyNotFound) missingfonts = 1; else + { + expect(Ok, stat); check_family("Serif", family, serifname); + } stat = GdipGetGenericFontFamilyMonospace(&family); - expect (Ok, stat); if (stat == FontFamilyNotFound) missingfonts = 1; else + { + expect(Ok, stat); check_family("Monospace", family, mononame); + } - if (missingfonts && strcmp(winetest_platform, "wine") == 0) - trace("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n"); + if (missingfonts) + skip("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n"); /* Check that the family names are all different */ ok(lstrcmpiW(sansname, serifname) != 0, "Sans Serif and Serif families should be different: %s\n", wine_dbgstr_w(sansname)); -- 2.18.0

3 4

[PATCH 3/3] rpcrt4/tests: Add a test of client reconnecting on send failure.
by Jacek Caban 16 Oct '18

16 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/server.c | 157 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 142 insertions(+), 15 deletions(-)

2 1

[PATCH 2/3] rpcrt4: Try reconnecting when to server in IRpcSend on broken connection.
by Jacek Caban 16 Oct '18

16 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/rpc_assoc.c | 12 +++++++++--- dlls/rpcrt4/rpc_assoc.h | 2 +- dlls/rpcrt4/rpc_binding.c | 4 ++-- dlls/rpcrt4/rpc_binding.h | 3 ++- dlls/rpcrt4/rpc_message.c | 42 ++++++++++++++++++++++++++++-------------- 5 files changed, 42 insertions(+), 21 deletions(-)

1 0

[PATCH 1/3] rpcrt4: Reset assoc_group_id on associations with no active connection.
by Jacek Caban 16 Oct '18

16 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/rpc_assoc.c | 11 +++++++++++ dlls/rpcrt4/rpc_assoc.h | 2 ++ dlls/rpcrt4/rpc_transport.c | 1 + 3 files changed, 14 insertions(+)

1 0

[PATCH 1/3] rpcrt4: Discriminants can't be int3264.
by Zebediah Figura 16 Oct '18

16 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_marshall.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 52e2716..58f0108 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2762,8 +2762,6 @@ static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, case FC_LONG: case FC_ULONG: case FC_ENUM32: - case FC_INT3264: - case FC_UINT3264: return sizeof(ULONG); case FC_FLOAT: return sizeof(float); @@ -5642,9 +5640,6 @@ static ULONG get_discriminant(unsigned char fc, const unsigned char *pMemory) case FC_ULONG: case FC_ENUM32: return *(const ULONG *)pMemory; - case FC_INT3264: - case FC_UINT3264: - return *(const ULONG_PTR *)pMemory; default: FIXME("Unhandled base type: 0x%02x\n", fc); return 0; -- 2.7.4

2 8

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel