October 2018 - Wine-commits

Daniel Ansorregui : d3d11/tests: Add a blend factor test.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: dfeb51492946c22b465602f04f5d6634032248fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeb51492946c22b465602f0… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Thu Oct 18 02:29:14 2018 +0330 d3d11/tests: Add a blend factor test. Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0939990..74b429f 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);

1 0

Daniel Ansorregui : d3d10core/tests: Add a blend factor test.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 63cd3de5e8c5b7a78c0cb4bc43cd7a85b72a0601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cd3de5e8c5b7a78c0cb4bc… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Thu Oct 18 02:29:15 2018 +0330 d3d10core/tests: Add a blend factor test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 9c6ff96..7773845 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);

1 0

Zebediah Figura : rpcrt4/tests: Add more tests for NdrPointerUnmarshall() and NdrPointerFree() on the server side.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 3efe54f66d888dd98b4980d0ebf20077e4d9664b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3efe54f66d888dd98b4980d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 16 18:49:53 2018 -0500 rpcrt4/tests: Add more tests for NdrPointerUnmarshall() and NdrPointerFree() on the server side. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 151 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2938b87..e4231ae 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -355,6 +355,157 @@ todo_wine { } } } + + /* Server */ + StubMsg.IsClient = 0; + + /* For most basetypes (but not enum16), memory will not be allocated but + * instead point directly to the buffer. */ + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = NULL; + ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + ok(!!mem, "%s: mem was not allocated\n", msgpfx); + ok(!cmp(mem, memsrc, srcsize), "%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] == FC_ENUM16) + ok(my_alloc_called == 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + else +todo_wine_if(formattypes[1] & FC_POINTER_DEREF) + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + ok(!my_free_called, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + NdrPointerFree(&StubMsg, mem, formattypes); + if (formattypes[2] == FC_ENUM16) + ok(my_free_called == 1, "%s: my_free got called %d times\n", msgpfx, my_free_called); + else if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) + { + /* In theory this should be freed to correspond with the allocation, but + * FC_ALLOCED_ON_STACK is set, and NdrPointerFree() has no way of + * knowing that the memory allocated by NdrPointerUnmarshall() isn't + * stack memory. In practice it always *is* stack memory if ON_STACK is + * set, so this leak isn't a concern. */ +todo_wine + ok(my_free_called == 0, "%s: my_free got called %d times\n", msgpfx, my_free_called); + HeapFree(GetProcessHeap(), 0, mem); + } + else +todo_wine_if((formattypes[1] & FC_POINTER_DEREF) && !(formattypes[1] & FC_ALLOCED_ON_STACK)) + ok(my_free_called == num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + /* reset the buffer and call with must alloc */ + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = NULL; + ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 1 ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + ok(!!mem, "%s: mem was not allocated\n", msgpfx); + ok(!cmp(mem, memsrc, srcsize), "%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] == FC_ENUM16) + ok(my_alloc_called == 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + else +todo_wine + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + ok(!my_free_called, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + NdrPointerFree(&StubMsg, mem, formattypes); + if (formattypes[2] == FC_ENUM16) + ok(my_free_called == 1, "%s: my_free got called %d times\n", msgpfx, my_free_called); + else if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) + { +todo_wine + ok(my_free_called == 0, "%s: my_free got called %d times\n", msgpfx, my_free_called); + HeapFree(GetProcessHeap(), 0, mem); + } + else +todo_wine + ok(my_free_called == num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + /* Τest with an existing pointer. Unless it's a stack pointer (and deref'd) + * a new pointer will be allocated anyway (in fact, an invalid pointer works + * in every such case). */ + + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (formattypes[1] & FC_POINTER_DEREF) + *(void**)mem = NULL; + ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) +todo_wine + ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); + else + ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + ok(!cmp(mem, memsrc, srcsize), "%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] == FC_ENUM16) + ok(my_alloc_called == 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + else if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) +todo_wine + ok(my_alloc_called == 0, "%s: my_alloc got called %d times\n", msgpfx, my_free_called); + else +todo_wine_if(formattypes[1] & FC_POINTER_DEREF) + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + ok(!my_free_called, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + NdrPointerFree(&StubMsg, mem, formattypes); + if (formattypes[2] == FC_ENUM16) + ok(my_free_called == 1, "%s: my_free got called %d times\n", msgpfx, my_free_called); + else if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) + { +todo_wine + ok(my_free_called == 0, "%s: my_free got called %d times\n", msgpfx, my_free_called); + HeapFree(GetProcessHeap(), 0, mem); + } + else +todo_wine_if((formattypes[1] & FC_POINTER_DEREF) && !(formattypes[1] & FC_ALLOCED_ON_STACK)) + ok(my_free_called == num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + /* reset the buffer and call with must alloc */ + my_alloc_called = my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (formattypes[1] & FC_POINTER_DEREF) + *(void**)mem = NULL; + ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 1 ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) +todo_wine + ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); + else + ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); + ok(!cmp(mem, memsrc, srcsize), "%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] == FC_ENUM16) + ok(my_alloc_called == 1, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + else if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) +todo_wine + ok(my_alloc_called == 0, "%s: my_alloc got called %d times\n", msgpfx, my_free_called); + else +todo_wine + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + ok(!my_free_called, "%s: my_free got called %d times\n", msgpfx, my_free_called); + + NdrPointerFree(&StubMsg, mem, formattypes); + if (formattypes[2] == FC_ENUM16) + ok(my_free_called == 1, "%s: my_free got called %d times\n", msgpfx, my_free_called); + else if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) + { +todo_wine + ok(my_free_called == 0, "%s: my_free got called %d times\n", msgpfx, my_free_called); + HeapFree(GetProcessHeap(), 0, mem); + } + else +todo_wine + ok(my_free_called == num_additional_allocs, "%s: my_free got called %d times\n", msgpfx, my_free_called); + HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); }

1 0

Zebediah Figura : rpcrt4: Unmarshal into a stack pointer on the server side if possible.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 5fae77e4db87ae9db03dd95c43a8978a374c59b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fae77e4db87ae9db03dd95c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 16 18:49:54 2018 -0500 rpcrt4: Unmarshal into a stack pointer on the server side if possible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 5 ++++- dlls/rpcrt4/tests/ndr_marshall.c | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 58f0108..b48b300 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -944,7 +944,10 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, * setting the pointer to the buffer, if possible, or set fMustAlloc to * TRUE. */ if (attr & FC_POINTER_DEREF) { - fMustAlloc = TRUE; + if (pSrcPointer && (attr & FC_ALLOCED_ON_STACK)) + *pPointer = pSrcPointer; + else + fMustAlloc = TRUE; } else { *current_ptr = NULL; } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index e4231ae..2695d46 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -437,7 +437,6 @@ todo_wine ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); if ((formattypes[1] & FC_ALLOCED_ON_STACK) && (formattypes[1] & FC_POINTER_DEREF)) -todo_wine ok(mem == mem_orig, "%s: mem has changed %p %p\n", msgpfx, mem, mem_orig); else ok(mem != mem_orig, "%s: mem has not changed\n", msgpfx); @@ -849,10 +848,9 @@ static void test_nontrivial_pointer_types(void) *(void **)mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 0); - todo_wine { - ok(mem == mem_orig, "mem alloced\n"); - ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); - } + ok(mem == mem_orig, "mem alloced\n"); +todo_wine + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); my_alloc_called = 0; mem = mem_orig;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Use the optional IACList interface and IACList::Expand, if available.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: ef2558992201f31ec37c8b54399377c8e6d6d80f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2558992201f31ec37c8b54… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 16 14:30:45 2018 +0300 shell32/autocomplete: Use the optional IACList interface and IACList::Expand, if available. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0

Gabriel Ivăncescu : shell32/tests: Test when IACList: :Expand gets called and with what string.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: eabed020c08fe484e8f0bba07a20ee83c476edf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabed020c08fe484e8f0bba0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 16 14:30:46 2018 +0300 shell32/tests: Test when IACList::Expand gets called and with what string. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 114 +++++++++++++++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index e85e30c..66bd472 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -25,8 +25,8 @@ #include "windows.h" #include "shobjidl.h" #include "shlguid.h" -#include "initguid.h" #include "shldisp.h" +#include "shlobj.h" #include "wine/heap.h" #include "wine/test.h" @@ -269,10 +269,13 @@ static LRESULT CALLBACK HijackerWndProc2(HWND hWnd, UINT msg, WPARAM wParam, LPA struct string_enumerator { IEnumString IEnumString_iface; + IACList IACList_iface; LONG ref; WCHAR **data; int data_len; int cur; + UINT num_expand; + WCHAR last_expand[32]; }; static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) @@ -282,15 +285,19 @@ static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) static HRESULT WINAPI string_enumerator_QueryInterface(IEnumString *iface, REFIID riid, void **ppv) { + struct string_enumerator *this = impl_from_IEnumString(iface); if (IsEqualGUID(riid, &IID_IEnumString) || IsEqualGUID(riid, &IID_IUnknown)) + *ppv = &this->IEnumString_iface; + else if (IsEqualGUID(riid, &IID_IACList)) + *ppv = &this->IACList_iface; + else { - IUnknown_AddRef(iface); - *ppv = iface; - return S_OK; + *ppv = NULL; + return E_NOINTERFACE; } - *ppv = NULL; - return E_NOINTERFACE; + IUnknown_AddRef(&this->IEnumString_iface); + return S_OK; } static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) @@ -361,7 +368,7 @@ static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString ** return E_NOTIMPL; } -static IEnumStringVtbl string_enumerator_vtlb = +static IEnumStringVtbl string_enumerator_vtbl = { string_enumerator_QueryInterface, string_enumerator_AddRef, @@ -372,12 +379,54 @@ static IEnumStringVtbl string_enumerator_vtlb = string_enumerator_Clone }; +static struct string_enumerator *impl_from_IACList(IACList *iface) +{ + return CONTAINING_RECORD(iface, struct string_enumerator, IACList_iface); +} + +static HRESULT WINAPI aclist_QueryInterface(IACList *iface, REFIID riid, void **ppv) +{ + return string_enumerator_QueryInterface(&impl_from_IACList(iface)->IEnumString_iface, riid, ppv); +} + +static ULONG WINAPI aclist_AddRef(IACList *iface) +{ + return string_enumerator_AddRef(&impl_from_IACList(iface)->IEnumString_iface); +} + +static ULONG WINAPI aclist_Release(IACList *iface) +{ + return string_enumerator_Release(&impl_from_IACList(iface)->IEnumString_iface); +} + +static HRESULT WINAPI aclist_Expand(IACList *iface, const WCHAR *expand) +{ + struct string_enumerator *this = impl_from_IACList(iface); + + /* see what we get called with and how many times, + don't actually do any expansion of the strings */ + memcpy(this->last_expand, expand, min((lstrlenW(expand) + 1)*sizeof(WCHAR), sizeof(this->last_expand))); + this->last_expand[ARRAY_SIZE(this->last_expand) - 1] = '\0'; + this->num_expand++; + + return S_OK; +} + +static IACListVtbl aclist_vtbl = +{ + aclist_QueryInterface, + aclist_AddRef, + aclist_Release, + aclist_Expand +}; + static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int count) { struct string_enumerator *object; object = heap_alloc_zero(sizeof(*object)); - object->IEnumString_iface.lpVtbl = &string_enumerator_vtlb; + object->IEnumString_iface.lpVtbl = &string_enumerator_vtbl; + object->IACList_iface.lpVtbl = &aclist_vtbl; object->ref = 1; object->data = suggestions; object->data_len = count; @@ -399,6 +448,53 @@ static void dispatch_messages(void) } } +static void test_aclist_expand(HWND hwnd_edit, void *enumerator) +{ + struct string_enumerator *obj = (struct string_enumerator*)enumerator; + static WCHAR str1[] = {'t','e','s','t',0}; + static WCHAR str1a[] = {'t','e','s','t','\\',0}; + static WCHAR str2[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a',0}; + static WCHAR str2a[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\',0}; + static WCHAR str2b[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a','z','_','b','b','q','\\',0}; + + ok(obj->num_expand == 0, "Expected 0 expansions, got %u\n", obj->num_expand); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str1); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1) - 1, ARRAY_SIZE(str1) - 1); + SendMessageW(hwnd_edit, WM_CHAR, '\\', 1); + dispatch_messages(); + ok(obj->num_expand == 1, "Expected 1 expansion, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str2); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str2) - 1, ARRAY_SIZE(str2) - 1); + SendMessageW(hwnd_edit, WM_CHAR, 'z', 1); + dispatch_messages(); + ok(obj->num_expand == 2, "Expected 2 expansions, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str2a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str2a), wine_dbgstr_w(obj->last_expand)); + SetFocus(hwnd_edit); + SendMessageW(hwnd_edit, WM_CHAR, '_', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); + SetFocus(0); + SetFocus(hwnd_edit); + SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'q', 1); + dispatch_messages(); + ok(obj->num_expand == 2, "Expected 2 expansions, got %u\n", obj->num_expand); + SendMessageW(hwnd_edit, WM_CHAR, '\\', 1); + dispatch_messages(); + ok(obj->num_expand == 3, "Expected 3 expansions, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str2b) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str2b), wine_dbgstr_w(obj->last_expand)); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1a) - 1, -1); + SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'y', 1); + dispatch_messages(); + ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1) - 1, -1); + SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); + dispatch_messages(); + ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); +} + static void test_custom_source(void) { static WCHAR str_alpha[] = {'t','e','s','t','1',0}; @@ -464,6 +560,8 @@ static void test_custom_source(void) ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); /* end of hijacks */ + test_aclist_expand(hwnd_edit, enumerator); + ShowWindow(hMainWnd, SW_HIDE); DestroyWindow(hwnd_edit); }

1 0

Alistair Leslie-Hughes : hnetcfg: Add test for IProvideClassInfo interface.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 13a330273421292a974b9da02b46b05bbb5adeca URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a330273421292a974b9da0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 17 04:06:16 2018 +0000 hnetcfg: Add test for IProvideClassInfo interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0

Hans Leidekker : webservices: Add a version resource.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: bdce25213630155441be61993b172a725349b5ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdce25213630155441be6199… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 13:42:34 2018 +0200 webservices: Add a version resource. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 2 ++ dlls/webservices/rsrc.rc | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index 58dac38..b58714d 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 0000000..ef8d5c0 --- /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"

1 0

Hans Leidekker : webservices: Don' t set the critical section name in the Windows build.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 91ef13ce7e5db4c14880d6fa53df79416ad1bd4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91ef13ce7e5db4c14880d6fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 13:42:35 2018 +0200 webservices: Don't set the critical section name in the Windows build. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0cd8b91..5d3ca34 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 780040e..970c12e 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 93e647a..93c8c44 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 0189059..2e8286e 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 0706346..48b4ec5 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 5122892..92406f1 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 296043f..7288c4b 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 ef8f919..7631f4e 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 ); }

1 0

Hans Leidekker : webservices: Trace return values.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 366e693f6b58630a01db10c120a7b47ba09e05a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=366e693f6b58630a01db10c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 13:42:36 2018 +0200 webservices: Trace return values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=366e693f6b58630a01db…

1 0