- wine-devel - winehq.org

[PATCH] ntdll: Use %I64x instead of %lx to trace 64-bit values.
by Zebediah Figura 13 May '21

13 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c5a6666f4d2..0396433cb32 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -525,7 +525,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) - TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); + TRACE( " info[%d]=%016I64x\n", c, rec->ExceptionInformation[c] ); if (rec->ExceptionCode == EXCEPTION_WINE_STUB) { @@ -534,7 +534,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], (char*)rec->ExceptionInformation[1] ); else - MESSAGE( "wine: Call from %p to unimplemented function %s.%ld, aborting\n", + MESSAGE( "wine: Call from %p to unimplemented function %s.%I64d, aborting\n", rec->ExceptionAddress, (char*)rec->ExceptionInformation[0], rec->ExceptionInformation[1] ); } @@ -557,13 +557,13 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) else WARN( "%s exception (code=%x) raised\n", debugstr_exception_code(rec->ExceptionCode), rec->ExceptionCode ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", context->R12, context->R13, context->R14, context->R15 ); } @@ -1247,17 +1247,17 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND); - TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016lx\n", + TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016I64x\n", rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, context->Rip ); for (i = 0; i < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); i++) - TRACE( " info[%d]=%016lx\n", i, rec->ExceptionInformation[i] ); - TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + TRACE( " info[%d]=%016I64x\n", i, rec->ExceptionInformation[i] ); + TRACE(" rax=%016I64x rbx=%016I64x rcx=%016I64x rdx=%016I64x\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE(" rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + TRACE(" rsi=%016I64x rdi=%016I64x rbp=%016I64x rsp=%016I64x\n", context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE(" r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + TRACE(" r8=%016I64x r9=%016I64x r10=%016I64x r11=%016I64x\n", context->R8, context->R9, context->R10, context->R11 ); - TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + TRACE(" r12=%016I64x r13=%016I64x r14=%016I64x r15=%016I64x\n", context->R12, context->R13, context->R14, context->R15 ); dispatch.EstablisherFrame = context->Rsp; -- 2.30.2

1 0

[PATCH] quartz/dsoundrender: Remove the no longer used "play_time" field.
by Zebediah Figura 13 May '21

13 May '21

This was used to implement IReferenceClock::GetTime(), which was reimplemented in 63a6b308e9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 4f09a07eb64..36a22da9dbb 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -65,8 +65,6 @@ struct dsound_render DWORD buf_size; DWORD last_playpos, writepos; - REFERENCE_TIME play_time; - LONG volume; LONG pan; }; @@ -123,10 +121,9 @@ static void DSoundRender_UpdatePositions(struct dsound_render *This, DWORD *seqw old_writepos += This->buf_size; IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &playpos, &writepos); - if (old_playpos > playpos) { + if (old_playpos > playpos) adv = This->buf_size + playpos - old_playpos; - This->play_time += time_from_pos(This, This->buf_size); - } else + else adv = playpos - old_playpos; This->last_playpos = playpos; if (adv) { -- 2.31.1

1 0

[tools 1/3] winetest/build-patterns: Remove an unneeded <div class='main'>.
by Francois Gouget 12 May '21

12 May '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I initially modeled this page after those that use summary.css. Those have a main class but report.css does not and pages that use it (report.html) have no equivalent. --- winetest/build-patterns | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 334d28fd0..aa6d29f62 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1114,7 +1114,6 @@ sub write_patterns_page($$$) </head> <body> <div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> -<div class="main"> EOF # Show the test units with recent failures first. @@ -1240,7 +1239,7 @@ EOF write_patterns_list($html, $pagereports, $mainpage, $list); } - print $html "</div></body></html>\n"; + print $html "</body></html>\n"; close($html); if (!rename "$filename.new", "$filename") -- 2.20.1

1 2

[PATCH v2] d3d11/tests: Add more tests for state clear and restore via FinishCommandList and ExecuteCommandList.
by Zebediah Figura 12 May '21

12 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 213 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 202 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 01837a96b53..47c6613d904 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32246,7 +32246,7 @@ static void test_dual_source_blend(void) static void test_deferred_context_state(void) { ID3D11Buffer *green_buffer, *blue_buffer, *ret_buffer; - ID3D11DeviceContext *immediate, *deferred; + ID3D11DeviceContext *immediate, *deferred, *deferred2; ID3D11ShaderResourceView *srv, *ret_srv; struct d3d11_test_context test_context; ID3D11RenderTargetView *rtv, *ret_rtv; @@ -32312,6 +32312,35 @@ static void test_deferred_context_state(void) ID3D11DeviceContext_PSGetConstantBuffers(immediate, 0, 1, &ret_buffer); ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + ID3D11CommandList_Release(list2); + ID3D11CommandList_Release(list1); + + /* Test recording a command list into another deferred context. */ + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred2); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetConstantBuffers(deferred2, 0, 1, &green_buffer); + + hr = ID3D11DeviceContext_FinishCommandList(deferred2, FALSE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetConstantBuffers(deferred, 0, 1, &blue_buffer); + ID3D11DeviceContext_ExecuteCommandList(deferred, list1, TRUE); + ID3D11DeviceContext_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(ret_buffer == blue_buffer, "Got unexpected buffer %p.\n", ret_buffer); + ID3D11Buffer_Release(ret_buffer); + + ID3D11DeviceContext_PSSetConstantBuffers(deferred, 0, 1, &blue_buffer); + ID3D11DeviceContext_ExecuteCommandList(deferred, list1, FALSE); + ID3D11DeviceContext_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + todo_wine ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + if (ret_buffer) + ID3D11Buffer_Release(ret_buffer); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred2); + /* Test unbinding an SRV when using the same resource as RTV. */ ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); @@ -32338,8 +32367,6 @@ static void test_deferred_context_state(void) ID3D11ShaderResourceView_Release(srv); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); - ID3D11CommandList_Release(list2); - ID3D11CommandList_Release(list1); ID3D11DeviceContext_Release(deferred); ID3D11Buffer_Release(blue_buffer); ID3D11Buffer_Release(green_buffer); @@ -32406,19 +32433,24 @@ out: static void test_deferred_context_rendering(void) { - ID3D11DeviceContext *immediate, *deferred; + ID3D11BlendState *red_blend, *green_blend, *blue_blend, *ret_blend; + ID3D11DeviceContext *immediate, *deferred, *deferred2; struct d3d11_test_context test_context; D3D11_TEXTURE2D_DESC texture_desc; ID3D11CommandList *list1, *list2; ID3D11RenderTargetView *rtv; + D3D11_BLEND_DESC blend_desc; ID3D11Texture2D *texture; + float blend_factor[4]; ID3D11Device *device; + UINT sample_mask; DWORD color; HRESULT hr; - static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + static const float black[] = {0.0f, 0.0f, 0.0f, 1.0f}; if (!init_test_context(&test_context, NULL)) return; @@ -32426,8 +32458,6 @@ static void test_deferred_context_rendering(void) device = test_context.device; immediate = test_context.immediate_context; - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); - hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); if (hr != S_OK) @@ -32436,6 +32466,20 @@ static void test_deferred_context_rendering(void) return; } + memset(&blend_desc, 0, sizeof(blend_desc)); + + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_RED; + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &red_blend); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_GREEN; + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &green_blend); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_BLUE; + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blue_blend); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); + ID3D11DeviceContext_ClearRenderTargetView(deferred, test_context.backbuffer_rtv, green); hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); @@ -32451,12 +32495,12 @@ static void test_deferred_context_rendering(void) color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); @@ -32467,7 +32511,7 @@ static void test_deferred_context_rendering(void) hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); @@ -32482,7 +32526,7 @@ static void test_deferred_context_rendering(void) hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); ok(hr == S_OK, "Failed to create view, hr %#x.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, green); hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); @@ -32501,6 +32545,153 @@ static void test_deferred_context_rendering(void) ID3D11CommandList_Release(list1); ID3D11DeviceContext_Release(deferred); + /* As Get* calls imply, state changes recorded into a command list do not + * affect subsequent draws after the state is restored or cleared. */ + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetBlendState(deferred, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + ID3D11DeviceContext_OMSetBlendState(immediate, blue_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + draw_color_quad(&test_context, &white); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffff0000, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_OMGetBlendState(immediate, &ret_blend, blend_factor, &sample_mask); + ok(ret_blend == blue_blend, "Got unexpected blend state %p.\n", ret_blend); + ID3D11BlendState_Release(ret_blend); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + ID3D11DeviceContext_OMSetBlendState(immediate, blue_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); + ID3D11DeviceContext_OMSetRenderTargets(immediate, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(immediate, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + draw_color_quad(&test_context, &white); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_OMGetBlendState(immediate, &ret_blend, blend_factor, &sample_mask); + ok(!ret_blend, "Got unexpected blend state %p.\n", ret_blend); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + + /* The clearing of state done by FinishCommandList is captured by a + * subsequent call to FinishCommandList... */ + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetBlendState(deferred, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + ID3D11CommandList_Release(list1); + + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + ID3D11DeviceContext_OMSetBlendState(immediate, red_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); + color = get_texture_color(test_context.backbuffer, 320, 240); + todo_wine ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + + /* ...and so is the save/restore. */ + + ID3D11DeviceContext_OMSetBlendState(deferred, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + ID3D11CommandList_Release(list1); + + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + ID3D11DeviceContext_OMSetBlendState(immediate, red_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); + color = get_texture_color(test_context.backbuffer, 320, 240); + todo_wine ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + + ID3D11DeviceContext_Release(deferred); + + /* Similarly, clearing of state done by ExecuteCommandList is captured by a + * subsequent call to FinishCommandList. */ + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred2); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetBlendState(deferred2, blue_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + + hr = ID3D11DeviceContext_FinishCommandList(deferred2, FALSE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetBlendState(deferred, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(deferred, list1, FALSE); + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + ID3D11DeviceContext_OMSetBlendState(immediate, red_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, FALSE); + color = get_texture_color(test_context.backbuffer, 320, 240); + todo_wine ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + + /* Make sure that save/restore is handled correctly as well. */ + + ID3D11DeviceContext_OMSetBlendState(deferred, green_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(deferred, list1, TRUE); + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, black); + ID3D11DeviceContext_OMSetBlendState(immediate, red_blend, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, FALSE); + color = get_texture_color(test_context.backbuffer, 320, 240); + todo_wine ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred2); + ID3D11DeviceContext_Release(deferred); + + ID3D11BlendState_Release(red_blend); + ID3D11BlendState_Release(green_blend); + ID3D11BlendState_Release(blue_blend); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); release_test_context(&test_context); -- 2.30.2

3 2

[PATCH 7/7] winepulse: Move pulse stream initialization to unix lib.
by Jacek Caban 12 May '21

12 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 339 +------------------------------ dlls/winepulse.drv/pulse.c | 363 +++++++++++++++++++++++++++++++++- dlls/winepulse.drv/unixlib.h | 13 +- 3 files changed, 377 insertions(+), 338 deletions(-)

2 1

[PATCH 6/7] winepulse: Move pulse stream destruction to unix lib.
by Jacek Caban 12 May '21

12 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 19 ++----------------- dlls/winepulse.drv/pulse.c | 24 ++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 27 insertions(+), 17 deletions(-)

2 1

[PATCH 5/7] winepulse: Introduce pulse_stream struct.
by Jacek Caban 12 May '21

12 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It's in unixlib.h for now, but the plan is for it to be accessible only from pulse.c. dlls/winepulse.drv/mmdevdrv.c | 586 +++++++++++++++++----------------- dlls/winepulse.drv/pulse.c | 1 + dlls/winepulse.drv/unixlib.h | 30 ++ 3 files changed, 319 insertions(+), 298 deletions(-)

2 1

[PATCH 4/7] winepulse: Store channel count directly in ACImpl.
by Jacek Caban 12 May '21

12 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)

2 1

[PATCH 3/7] winepulse: Move pulse main loop to unix lib.
by Jacek Caban 12 May '21

12 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 170 ++++++---------------------------- dlls/winepulse.drv/pulse.c | 81 ++++++++++++++++ dlls/winepulse.drv/unixlib.h | 2 + 3 files changed, 109 insertions(+), 144 deletions(-)

2 1

[PATCH 2/7] winepulse: Move pulse_test_connect to unix lib.
by Jacek Caban 12 May '21

12 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 327 +++---------------------------- dlls/winepulse.drv/pulse.c | 353 ++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 12 ++ 3 files changed, 391 insertions(+), 301 deletions(-)

2 1

[PATCH 1/7] winepulse: Move synchroinzatin functions to unix lib.
by Jacek Caban 12 May '21

12 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/Makefile.in | 3 +- dlls/winepulse.drv/mmdevdrv.c | 199 ++++++++++++++++----------------- dlls/winepulse.drv/pulse.c | 83 ++++++++++++++ dlls/winepulse.drv/unixlib.h | 25 +++++ 4 files changed, 207 insertions(+), 103 deletions(-) create mode 100644 dlls/winepulse.drv/pulse.c create mode 100644 dlls/winepulse.drv/unixlib.h

2 1

[PATCH 3/3] windowscodecs: Implement IWICDdsEncoder_SetParameters.
by Ziqing Hui 12 May '21

12 May '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 77 +++++++++++++++++++++------- dlls/windowscodecs/tests/ddsformat.c | 2 - 2 files changed, 58 insertions(+), 21 deletions(-)

2 1

[PATCH 2/3] windowscodecs: Implement IWICDdsEncoder_GetParameters.
by Ziqing Hui 12 May '21

12 May '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 50 ++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 2 -- 2 files changed, 48 insertions(+), 4 deletions(-)

2 1

[PATCH 1/3] windowscodecs/tests: Test DDS parameters for encoder.
by Ziqing Hui 12 May '21

12 May '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 81 ++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+)

2 1

[PATCH] winevulkan: Add support for unwrapping handles in thunks.
by Derek Lesho 12 May '21

12 May '21

--- Right now this patch allows us to remove/shrink some our manual thunks, but as more wrappable handles are added, this should become more useful. --- dlls/winevulkan/make_vulkan | 541 +++++++++++++++++++++++++++++------- dlls/winevulkan/vulkan.c | 32 +-- 2 files changed, 440 insertions(+), 133 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d5cc62d2097..fe62cb0fb35 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -204,14 +204,14 @@ FUNCTION_OVERRIDES = { # VK_KHR_get_surface_capabilities2 "vkGetPhysicalDeviceSurfaceCapabilities2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, - "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_win32_surface "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.NONE}, "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, # VK_KHR_swapchain - "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PRIVATE}, + "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkQueuePresentKHR": {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, @@ -645,6 +645,18 @@ class VkFunction(object): return False + def needs_unwrapping(self): + """ Check if the function needs any input/output type unwrapping. + Functions need input/output unwrapping if struct parameters have + wrapped dispatchable handles. + """ + + for p in self.params: + if p.needs_unwrapping(): + return True + + return False + def needs_dispatch(self): return self.dispatch @@ -748,13 +760,16 @@ class VkFunction(object): # Declare any tmp parameters for conversion. for p in self.params: - if not p.needs_conversion(): - continue - - if p.is_dynamic_array(): - body += " {0}_host *{1}_host;\n".format(p.type, p.name) - else: - body += " {0}_host {1}_host;\n".format(p.type, p.name) + if p.needs_conversion(): + if p.is_dynamic_array(): + body += " {0}_host *{1}_host;\n".format(p.type, p.name) + else: + body += " {0}_host {1}_host;\n".format(p.type, p.name) + elif p.needs_unwrapping(): + if p.is_dynamic_array(): + body += " {0} *{1}_host;\n".format(p.type, p.name) + else: + body += " {0} {1}_host;\n".format(p.type, p.name) if not self.needs_private_thunk(): body += " {0}\n".format(self.trace()) @@ -798,6 +813,51 @@ class VkFunction(object): return body + def body_unwrapping(self): + body = "" + + # Declare a variable to hold the result for non-void functions. + if self.type != "void": + body += " {0} result;\n".format(self.type) + + for p in self.params: + if p.needs_unwrapping(): + if p.is_dynamic_array(): + body += " {0} *{1}_host;\n".format(p.type, p.name) + else: + body += " {0} {1}_host;\n".format(p.type, p.name) + + if not self.needs_private_thunk(): + body += " {0}".format(self.trace()) + + # Call unwrapping win_to_host conversion calls. + for p in self.params: + if p.needs_unwrapping() and p.needs_input_conversion(): + body += p.copy(Direction.INPUT) + + params = ", ".join([p.variable(conv=False) for p in self.params]) + + # Call the native Vulkan function. + if self.type == "void": + body += " {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + else: + body += " result = {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + + body += "\n" + + # Perform any required cleanups. Most of these are for array functions. + for p in self.params: + if not p.needs_free() or not p.needs_unwrapping(): + continue + + body += p.free() + + # Finally return the result. + if self.type != "void": + body += " return result;\n" + + return body + def spec(self, prefix=None, symbol=None): """ Generate spec file entry for this function. @@ -842,8 +902,13 @@ class VkFunction(object): thunk += "#if defined(USE_STRUCT_CONVERSION)\n" thunk += self.body_conversion() thunk += "#else\n" - thunk += self.body() + if self.needs_unwrapping(): + thunk += self.body_unwrapping() + else: + thunk += self.body() thunk += "#endif\n" + elif self.needs_unwrapping(): + thunk += self.body_unwrapping() else: thunk += self.body() @@ -1063,6 +1128,12 @@ class VkHandle(object): def is_wrapped(self): return self.native_handle("test") is not None + def needs_conversion(self): + return False + + def needs_unwrapping(self): + return self.is_wrapped() + class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, values=None): @@ -1148,10 +1219,11 @@ class VkMember(object): return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values) - def copy(self, input, output, direction): - """ Helper method for use by conversion logic to generate a C-code statement to copy this member. """ + def copy(self, input, output, direction, conv): + """ Helper method for use by conversion logic to generate a C-code statement to copy this member. + - `conv` indicates whether the statement is in a struct alignment conversion path. """ - if self.needs_conversion(): + if (conv and self.needs_conversion()) or self.needs_unwrapping(): if self.is_dynamic_array(): if direction == Direction.OUTPUT: LOGGER.warn("TODO: implement copying of returnedonly dynamic array for {0}.{1}".format(self.type, self.name)) @@ -1167,6 +1239,12 @@ class VkMember(object): else: # Nothing needed this yet. LOGGER.warn("TODO: implement copying of static array for {0}.{1}".format(self.type, self.name)) + elif self.is_handle() and self.needs_unwrapping(): + if direction == Direction.OUTPUT: + LOGGER.err("Only INPUT parameters can be unwrapped") + else: + handle = self.type_info["data"] + return "{0}{1} = {2};\n".format(output, self.name, handle.driver_handle("{0}{1}".format(input, self.name))) else: if direction == Direction.OUTPUT: return "convert_{0}_host_to_win(&{2}{1}, &{3}{1});\n".format(self.type, self.name, input, output) @@ -1178,6 +1256,27 @@ class VkMember(object): else: return "{0}{1} = {2}{1};\n".format(output, self.name, input) + def free(self, location, conv): + """ Helper method for use by conversion logic to generate a C-code statement to free this member. """ + + if not self.needs_unwrapping() and not conv: + return "" + + cast = ("(" + self.type + ("_host" if conv and self.needs_conversion() else "") + " *)") if self.is_const() else "" + if self.is_dynamic_array(): + count = self.dyn_array_len if isinstance(self.dyn_array_len, int) else "{0}{1}".format(location, self.dyn_array_len) + if self.is_struct() and self.type_info["data"].returnedonly: + # For returnedonly, counts is stored in a pointer. + return "free_{0}_array({1}{2}{3}, *{4});\n".format(self.type, cast, location, self.name, count) + else: + return "free_{0}_array({1}{2}{3}, {4});\n".format(self.type, cast, location, self.name, count) + else: + # We are operating on a single structure. Some structs (very rare) contain dynamic members, + # which would need freeing. + if self.needs_free(): + return "free_{0}({1}&{2}{3});\n".format(self.type, cast, location, self.name) + return "" + def definition(self, align=False, conv=False): """ Generate prototype for given function. @@ -1216,31 +1315,35 @@ class VkMember(object): # Check if we need conversion either for this member itself or for any child members # in case member represents a struct. - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return None conversions = [] # Collect any conversion for any member structs. - struct = self.type_info["data"] - for m in struct: - m.needs_struct_extensions_conversion() - if m.needs_conversion(): - conversions.extend(m.get_conversions()) + direction = None + if self.is_struct(): + struct = self.type_info["data"] + for m in struct: + m.needs_struct_extensions_conversion() + if m.needs_conversion() or m.needs_unwrapping(): + conversions.extend(m.get_conversions()) - struct.needs_struct_extensions_conversion() + struct.needs_struct_extensions_conversion() + direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT + elif self.is_handle(): + direction = Direction.INPUT - struct = self.type_info["data"] - direction = Direction.OUTPUT if struct.returnedonly else Direction.INPUT + operand = self.type_info["data"] if self.is_dynamic_array(): - conversions.append(ConversionFunction(False, True, direction, struct)) + conversions.append(ConversionFunction(False, True, direction, operand)) elif self.is_static_array(): - conversions.append(ConversionFunction(True, False, direction, struct)) + conversions.append(ConversionFunction(True, False, direction, operand)) else: - conversions.append(ConversionFunction(False, False, direction, struct)) + conversions.append(ConversionFunction(False, False, direction, operand)) if self.needs_free(): - conversions.append(FreeFunction(self.is_dynamic_array(), struct)) + conversions.append(FreeFunction(self.is_dynamic_array(), operand)) return conversions @@ -1307,8 +1410,21 @@ class VkMember(object): struct = self.type_info["data"] return struct.needs_conversion() + def needs_unwrapping(self): + """ Structures with wrapped dispatchable handles, need unwrapping. """ + + if self.is_struct(): + struct = self.type_info["data"] + return struct.needs_unwrapping() + + if self.is_handle(): + handle = self.type_info["data"] + return handle.is_wrapped() + + return False + def needs_free(self): - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return False if self.is_dynamic_array(): @@ -1392,7 +1508,7 @@ class VkParam(object): self.free_func = None self.input_conv = None self.output_conv = None - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return # Input functions require win to host conversion. @@ -1570,7 +1686,7 @@ class VkParam(object): for m in self.struct: m.needs_struct_extensions_conversion() - if not self.needs_conversion(): + if not self.needs_conversion() and not self.needs_unwrapping(): return None conversions = [] @@ -1582,7 +1698,7 @@ class VkParam(object): if not m.is_struct(): continue - if not m.needs_conversion(): + if not m.needs_conversion() and not m.needs_unwrapping(): continue conversions.extend(m.get_conversions()) @@ -1641,6 +1757,15 @@ class VkParam(object): return False + def needs_unwrapping(self): + """ Returns if parameter needs unwrapping of dispatchable handle. """ + + # Wrapped handle parameters are handled seperately, only look for wrapped handles in structs + if self.is_struct(): + return self.struct.needs_unwrapping() + + return False + def needs_free(self): return self.free_func is not None @@ -1880,6 +2005,14 @@ class VkStruct(Sequence): return True return False + def needs_unwrapping(self): + """ Returns if struct members need unwrapping of a dispatchable handle. """ + + for m in self.members: + if m.needs_unwrapping(): + return True + return False + def needs_free(self): """ Check if any struct member needs some memory freeing.""" @@ -1897,7 +2030,10 @@ class VkStruct(Sequence): for e in self.struct_extensions: if e.required and e.needs_conversion(): - LOGGER.error("Unhandled pNext chain conversion for {0}".format(e.name)) + LOGGER.error("Unhandled pNext chain alignment conversion for {0}".format(e.name)) + ret = True + if e.required and e.needs_unwrapping(): + LOGGER.error("Unhandled pNext chain unwrapping conversion for {0}".format(e.name)) ret = True return ret @@ -1913,12 +2049,12 @@ class VkStruct(Sequence): class ConversionFunction(object): - def __init__(self, array, dyn_array, direction, struct): + def __init__(self, array, dyn_array, direction, operand): self.array = array self.direction = direction self.dyn_array = dyn_array - self.struct = struct - self.type = struct.name + self.operand = operand + self.type = operand.name self._set_name() @@ -1926,21 +2062,44 @@ class ConversionFunction(object): return self.name == other.name def _generate_array_conversion_func(self): - """ Helper function for generating a conversion function for array structs. """ + """ Helper function for generating a conversion function for array operands. """ + + body = "" + + if self.operand.needs_conversion(): + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "uint32_t count"] + return_type = self.type + else: + params = ["const {0} *in".format(self.type), "uint32_t count"] + return_type = "{0}_host".format(self.type) + + # Generate function prototype. + body += "static inline {0} *{1}(".format(return_type, self.name) + body += ", ".join(p for p in params) + body += ")\n{\n" + + body += " {0} *out;\n".format(return_type) + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + else: + body += "#endif /* USE_STRUCT_CONVERSION */\n\n" - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "uint32_t count"] - return_type = self.type - else: params = ["const {0} *in".format(self.type), "uint32_t count"] - return_type = "{0}_host".format(self.type) + return_type = "{0}".format(self.type) - # Generate function prototype. - body = "static inline {0} *{1}(".format(return_type, self.name) - body += ", ".join(p for p in params) - body += ")\n{\n" + # Generate function prototype. + body += "static inline {0} *{1}(".format(return_type, self.name) + body += ", ".join(p for p in params) + body += ")\n{\n" + + body += " {0} *out;\n".format(return_type) + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" - body += " {0} *out;\n".format(return_type) body += " unsigned int i;\n\n" body += " if (!in) return NULL;\n\n" @@ -1949,10 +2108,25 @@ class ConversionFunction(object): body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - # TODO: support copying of pNext extension structures! - # Luckily though no extension struct at this point needs conversion. - body += " " + m.copy("in[i].", "out[i].", self.direction) + if isinstance(self.operand, VkStruct): + for m in self.operand: + # TODO: support copying of pNext extension structures! + # Luckily though no extension struct at this point needs conversion. + convert = m.copy("in[i].", "out[i].", self.direction, True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in[i].", "out[i].", self.direction, False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + + elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: + body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" + else: + LOGGER.warn("Unhandled conversion operand type") + body += " out[i] = in[i];\n" body += " }\n\n" body += " return out;\n" @@ -1960,22 +2134,47 @@ class ConversionFunction(object): return body def _generate_conversion_func(self): - """ Helper function for generating a conversion function for non-array structs. """ + """ Helper function for generating a conversion function for non-array operands. """ - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type)] - else: - params = ["const {0} *in".format(self.type), "{0}_host *out".format(self.type)] + # It doesn't make sense to generate conversion functions for non-struct variables + # which aren't in arrays, as this should be handled by the copy() function + if not isinstance(self.operand, VkStruct): + return "" + + body = "" - body = "static inline void {0}(".format(self.name) + if self.operand.needs_conversion(): + body += "static inline void {0}(".format(self.name) - # Generate parameter list - body += ", ".join(p for p in params) - body += ")\n{\n" + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type)] + else: + params = ["const {0} *in".format(self.type), "{0}_host *out".format(self.type)] - body += " if (!in) return;\n\n" + # Generate parameter list + body += ", ".join(p for p in params) + body += ")\n" - if self.direction == Direction.INPUT and "pNext" in self.struct and self.struct.returnedonly: + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + else: + body += "#endif /* USE_STRUCT_CONVERSION */\n\n" + + body += "static inline void {0}(".format(self.name) + + params = ["const {0} *in".format(self.type), "{0} *out".format(self.type)] + + # Generate parameter list + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "{\n if (!in) return;\n\n" + + if self.direction == Direction.INPUT and "pNext" in self.operand and self.operand.returnedonly: # We are dealing with an input_output parameter. For these we only need to copy # pNext and sType as the other fields are filled in by the host. We do potentially # have to iterate over pNext and perform conversions based on switch(sType)! @@ -1984,36 +2183,84 @@ class ConversionFunction(object): body += " out->pNext = in->pNext;\n" body += " out->sType = in->sType;\n" else: - for m in self.struct: + for m in self.operand: # TODO: support copying of pNext extension structures! - body += " " + m.copy("in->", "out->", self.direction) + convert = m.copy("in->", "out->", self.direction, True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in->", "out->", self.direction, False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) body += "}\n\n" + + if self.operand.needs_unwrapping() and not self.operand.needs_free(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + return body def _generate_static_array_conversion_func(self): - """ Helper function for generating a conversion function for array structs. """ + """ Helper function for generating a conversion function for array operands. """ - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - else: - params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] + body = "" - # Generate function prototype. - body = "static inline void {0}(".format(self.name) - body += ", ".join(p for p in params) - body += ")\n{\n" + if self.operand.needs_conversion(): + if self.direction == Direction.OUTPUT: + params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] + else: + params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] + + # Generate function prototype. + body += "static inline void {0}(".format(self.name) + body += ", ".join(p for p in params) + body += ")\n" + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + else: + body += "#endif /* USE_STRUCT_CONVERSION */\n\n" + + params = ["const {0} *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] + + # Generate function prototype. + body += "static inline void {0}(".format(self.name) + body += ", ".join(p for p in params) + body += ")\n" + + body += "{\n" body += " unsigned int i;\n\n" body += " if (!in) return;\n\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - # TODO: support copying of pNext extension structures! - body += " " + m.copy("in[i].", "out[i].", self.direction) + if isinstance(self.operand, VkStruct): + for m in self.operand: + # TODO: support copying of pNext extension structures! + convert = m.copy("in[i].", "out[i].", self.direction, True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert + else: + unwrap = m.copy("in[i].", "out[i].", self.direction, False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: + body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" + else: + LOGGER.warn("Unhandled conversion operand type") + body += " out[i] = in[i];\n" body += " }\n" body += "}\n\n" + + if self.operand.needs_unwrapping(): + body += "#if defined(USE_STRUCT_CONVERSION)\n\n" + return body def _set_name(self): @@ -2044,10 +2291,10 @@ class ConversionFunction(object): class FreeFunction(object): - def __init__(self, dyn_array, struct): + def __init__(self, dyn_array, operand): self.dyn_array = dyn_array - self.struct = struct - self.type = struct.name + self.operand = operand + self.type = operand.name if dyn_array: self.name = "free_{0}_array".format(self.type) @@ -2060,25 +2307,47 @@ class FreeFunction(object): def _generate_array_free_func(self): """ Helper function for cleaning up temporary buffers required for array conversions. """ - # Generate function prototype. - body = "static inline void {0}({1}_host *in, uint32_t count)\n{{\n".format(self.name, self.type) + body = "" + + if self.operand.needs_conversion(): + if self.operand.needs_unwrapping(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + + # Generate function prototype. + body += "static inline void {0}({1}_host *in, uint32_t count)\n".format(self.name, self.type) + + if self.operand.needs_unwrapping(): + if self.operand.needs_conversion(): + body += "#else\n" + + # Generate function prototype. + body += "static inline void {0}({1} *in, uint32_t count)\n".format(self.name, self.type) + + if self.operand.needs_conversion(): + body += "#endif /* USE_STRUCT_CONVERSION */\n" + + body += "{\n" # E.g. VkGraphicsPipelineCreateInfo_host needs freeing for pStages. - if self.struct.needs_free(): + if isinstance(self.operand, VkStruct) and self.operand.needs_free(): body += " unsigned int i;\n\n" body += " if (!in) return;\n\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) + for m in self.operand: + if m.needs_free(): + convert = m.free("in[i].", True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert else: - body += " free_{0}_array(in[i].{1}, in[i].{2});\n".format(m.type, m.name, m.dyn_array_len) - elif m.needs_conversion(): - LOGGER.error("Unhandled conversion for {0}".format(m.name)) + unwrap = m.free("in[i].", False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#endif /* USE_STRUCT_CONVERSION */\n".format(convert) + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) body += " }\n" else: body += " if (!in) return;\n\n" @@ -2086,26 +2355,44 @@ class FreeFunction(object): body += " free(in);\n" body += "}\n\n" + + if self.operand.needs_unwrapping(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + return body def _generate_free_func(self): # E.g. VkCommandBufferBeginInfo.pInheritanceInfo needs freeing. - if not self.struct.needs_free(): + if not self.operand.needs_free(): return "" + if not isinstance(self.operand, VkStruct): + return "" + + body = "" + # Generate function prototype. - body = "static inline void {0}({1}_host *in)\n{{\n".format(self.name, self.type) + body += "static inline void {0}({1}_host *in)\n{{\n".format(self.name, self.type) - for m in self.struct: - if m.needs_conversion() and m.is_dynamic_array(): - count = m.dyn_array_len if isinstance(m.dyn_array_len, int) else "in->{0}".format(m.dyn_array_len) - if m.is_const(): - # Add a cast to ignore const on conversion structs we allocated ourselves. - body += " free_{0}_array(({0}_host *)in->{1}, {2});\n".format(m.type, m.name, count) + for m in self.operand: + if m.needs_free(): + convert = m.free("in->", True) + if self.operand.needs_conversion() and not self.operand.needs_unwrapping(): + body += " " + convert else: - body += " free_{0}_array(in->{1}, {2});\n".format(m.type, m.name, count) + unwrap = m.free("in->", False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#endif /* USE_STRUCT_CONVERSION */\n".format(convert) + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) body += "}\n\n" + + if self.operand.needs_unwrapping(): + body += "#if defined(USE_STRUCT_CONVERSION)\n" + return body def definition(self): @@ -2168,7 +2455,12 @@ class StructChainConversionFunction(object): if m.name == "pNext": body += " out->pNext = NULL;\n" else: - body += " " + m.copy("in->", "out->", self.direction) + convert = m.copy("in->", "out->", self.direction, True) + unwrap = m.copy("in->", "out->", self.direction, False) + if unwrap == convert: + body += " " + unwrap + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) body += "\n out_header->pNext = (VkBaseOutStructure *)out;\n" body += " out_header = out_header->pNext;\n" @@ -2212,7 +2504,41 @@ class FreeStructChainFunction(object): body += " while (header)\n" body += " {\n" - body += " void *prev = header;\n" + body += " void *prev = header;\n\n" + body += " switch (header->sType)\n" + body += " {\n" + + for e in self.struct.struct_extensions: + if not e.required: + continue + + if not any(m.needs_free() for m in e): + continue + + stype = next(x for x in e.members if x.name == "sType") + + body += " case {0}:\n".format(stype.values) + body += " {\n" + body += " {0} *structure = ({0} *) header;\n".format(e.name) + + for m in e: + if m.needs_free(): + convert = m.free("structure->", True) + unwrap = m.free("structure->", False) + if convert == unwrap: + body += " " + unwrap + elif unwrap == "": + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#endif /* USE_STRUCT_CONVERSION */\n".format(convert) + else: + body += "#if defined(USE_STRUCT_CONVERSION)\n {0}#else\n {1}#endif /* USE_STRUCT_CONVERSION */\n".format(convert, unwrap) + + body += " break;\n" + body += " }\n" + + body += " default:\n" + body += " break;\n" + body += " }\n" + body += " header = header->pNext;\n" body += " free(prev);\n" body += " }\n\n" @@ -2235,7 +2561,7 @@ class VkGenerator(object): if not func.is_required(): continue - if not func.needs_conversion(): + if not func.needs_conversion() and not func.needs_unwrapping(): continue conversions = func.get_conversions() @@ -2246,15 +2572,26 @@ class VkGenerator(object): if not any(c == conv for c in self.conversions): self.conversions.append(conv) + if not isinstance(conv.operand, VkStruct): + continue + # Structs can be used in different ways by different conversions # e.g. array vs non-array. Just make sure we pull in each struct once. - if not any(s.name == conv.struct.name for s in self.host_structs): - self.host_structs.append(conv.struct) + if not any(s.name == conv.operand.name for s in self.host_structs): + self.host_structs.append(conv.operand) for struct in self.registry.structs: if struct.name in STRUCT_CHAIN_CONVERSIONS: self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct)) self.struct_chain_conversions.append(FreeStructChainFunction(struct)) + # Once we decide to support pNext chains conversion everywhere, move this under get_conversions + for e in struct.struct_extensions: + for m in e: + if m.needs_conversion() or m.needs_unwrapping(): + conversions = m.get_conversions() + for conv in conversions: + if not any(c == conv for c in self.conversions): + self.conversions.append(conv) def _generate_copyright(self, f, spec_file=False): f.write("# " if spec_file else "/* ") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 45eda78e997..58a67c6d285 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1540,19 +1540,6 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } -VkResult WINAPI wine_vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *create_info, - const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain) -{ - VkSwapchainCreateInfoKHR native_info; - - TRACE("%p, %p, %p, %p\n", device, create_info, allocator, swapchain); - - native_info = *create_info; - native_info.surface = wine_surface_from_handle(create_info->surface)->driver_surface; - - return thunk_vkCreateSwapchainKHR(device, &native_info, allocator, swapchain); -} - VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *createInfo, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { @@ -1601,19 +1588,6 @@ void WINAPI wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, free(object); } -VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice phys_dev, - const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, uint32_t *formats_count, VkSurfaceFormat2KHR *formats) -{ - VkPhysicalDeviceSurfaceInfo2KHR native_info; - - TRACE("%p, %p, %p, %p\n", phys_dev, surface_info, formats_count, formats); - - native_info = *surface_info; - native_info.surface = wine_surface_from_handle(surface_info->surface)->driver_surface; - - return thunk_vkGetPhysicalDeviceSurfaceFormats2KHR(phys_dev, &native_info, formats_count, formats); -} - static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile @@ -1647,15 +1621,11 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) { - VkPhysicalDeviceSurfaceInfo2KHR native_info; VkResult res; TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); - native_info = *surface_info; - native_info.surface = wine_surface_from_handle(surface_info->surface)->driver_surface; - - res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &native_info, capabilities); + res = thunk_vkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, surface_info, capabilities); if (res == VK_SUCCESS) adjust_max_image_count(phys_dev, &capabilities->surfaceCapabilities); -- 2.31.1

2 3

[PATCH] mfplat: Use CRT allocation functions.
by Nikolay Sivov 12 May '21

12 May '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 37 +++--- dlls/mfplat/main.c | 210 +++++++++++++++-------------------- dlls/mfplat/mediatype.c | 37 +++--- dlls/mfplat/mfplat_private.h | 3 +- dlls/mfplat/sample.c | 28 +++-- 5 files changed, 136 insertions(+), 179 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index f428630ea01..e04cc1a9251 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -141,9 +141,9 @@ static ULONG WINAPI memory_buffer_Release(IMFMediaBuffer *iface) clear_attributes_object(&buffer->dxgi_surface.attributes); } DeleteCriticalSection(&buffer->cs); - heap_free(buffer->_2d.linear_buffer); - heap_free(buffer->data); - heap_free(buffer); + free(buffer->_2d.linear_buffer); + free(buffer->data); + free(buffer); } return refcount; @@ -278,7 +278,7 @@ static HRESULT WINAPI memory_1d_2d_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = MF_E_INVALIDREQUEST; else if (!buffer->_2d.linear_buffer) { - if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) hr = E_OUTOFMEMORY; } @@ -310,7 +310,7 @@ static HRESULT WINAPI memory_1d_2d_buffer_Unlock(IMFMediaBuffer *iface) MFCopyImage(buffer->data, buffer->_2d.pitch, buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); - heap_free(buffer->_2d.linear_buffer); + free(buffer->_2d.linear_buffer); buffer->_2d.linear_buffer = NULL; } @@ -349,7 +349,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat { D3DLOCKED_RECT rect; - if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) @@ -401,7 +401,7 @@ static HRESULT WINAPI d3d9_surface_buffer_Unlock(IMFMediaBuffer *iface) IDirect3DSurface9_UnlockRect(buffer->d3d9_surface.surface); } - heap_free(buffer->_2d.linear_buffer); + free(buffer->_2d.linear_buffer); buffer->_2d.linear_buffer = NULL; } @@ -928,7 +928,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Lock(IMFMediaBuffer *iface, BYTE **dat hr = MF_E_INVALIDREQUEST; else if (!buffer->_2d.linear_buffer) { - if (!(buffer->_2d.linear_buffer = heap_alloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) + if (!(buffer->_2d.linear_buffer = malloc(ALIGN_SIZE(buffer->_2d.plane_size, MF_64_BYTE_ALIGNMENT)))) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) @@ -974,7 +974,7 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock(IMFMediaBuffer *iface) buffer->_2d.linear_buffer, buffer->_2d.width, buffer->_2d.width, buffer->_2d.height); dxgi_surface_buffer_unmap(buffer); - heap_free(buffer->_2d.linear_buffer); + free(buffer->_2d.linear_buffer); buffer->_2d.linear_buffer = NULL; } @@ -1225,8 +1225,7 @@ static const IMFDXGIBufferVtbl dxgi_buffer_vtbl = static HRESULT memory_buffer_init(struct buffer *buffer, DWORD max_length, DWORD alignment, const IMFMediaBufferVtbl *vtbl) { - buffer->data = heap_alloc_zero(ALIGN_SIZE(max_length, alignment)); - if (!buffer->data) + if (!(buffer->data = calloc(1, ALIGN_SIZE(max_length, alignment)))) return E_OUTOFMEMORY; buffer->IMFMediaBuffer_iface.lpVtbl = vtbl; @@ -1248,14 +1247,13 @@ static HRESULT create_1d_buffer(DWORD max_length, DWORD alignment, IMFMediaBuffe *buffer = NULL; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; hr = memory_buffer_init(object, max_length, alignment, &memory_1d_buffer_vtbl); if (FAILED(hr)) { - heap_free(object); + free(object); return hr; } @@ -1291,8 +1289,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) return hr; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; switch (fourcc) @@ -1326,7 +1323,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (FAILED(hr = memory_buffer_init(object, max_length, MF_1_BYTE_ALIGNMENT, &memory_1d_2d_buffer_vtbl))) { - heap_free(object); + free(object); return hr; } @@ -1360,8 +1357,7 @@ static HRESULT create_d3d9_surface_buffer(IUnknown *surface, BOOL bottom_up, IMF if (!(stride = mf_format_get_stride(&subtype, desc.Width, &is_yuv))) return MF_E_INVALIDMEDIATYPE; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaBuffer_iface.lpVtbl = &d3d9_surface_1d_buffer_vtbl; @@ -1412,8 +1408,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re return MF_E_INVALIDMEDIATYPE; } - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) { ID3D11Texture2D_Release(texture); return E_OUTOFMEMORY; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c8d74b5d42c..1fc65f54ea2 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -47,27 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -static HRESULT heap_strdupW(const WCHAR *str, WCHAR **dest) -{ - HRESULT hr = S_OK; - - if (str) - { - unsigned int size; - - size = (lstrlenW(str) + 1) * sizeof(WCHAR); - *dest = heap_alloc(size); - if (*dest) - memcpy(*dest, str, size); - else - hr = E_OUTOFMEMORY; - } - else - *dest = NULL; - - return hr; -} - struct local_handler { struct list entry; @@ -204,7 +183,7 @@ static ULONG WINAPI transform_activate_Release(IMFActivate *iface) IClassFactory_Release(activate->factory); if (activate->transform) IMFTransform_Release(activate->transform); - heap_free(activate); + free(activate); } return refcount; @@ -598,13 +577,12 @@ static HRESULT create_transform_activate(IClassFactory *factory, IMFActivate **a struct transform_activate *object; HRESULT hr; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } @@ -745,14 +723,14 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 { if (SUCCEEDED(hr = MFGetAttributesAsBlobSize(attributes, &size))) { - if ((blob = heap_alloc(size))) + if ((blob = malloc(size))) { if (SUCCEEDED(hr = MFGetAttributesAsBlob(attributes, blob, size))) { if ((ret = RegSetValueExW(hclsid, L"Attributes", 0, REG_BINARY, blob, size))) hr = HRESULT_FROM_WIN32(ret); } - heap_free(blob); + free(blob); } else hr = E_OUTOFMEMORY; @@ -813,10 +791,10 @@ static void release_mft_registration(struct mft_registration *mft) { if (mft->factory) IClassFactory_Release(mft->factory); - heap_free(mft->name); - heap_free(mft->input_types); - heap_free(mft->output_types); - heap_free(mft); + free(mft->name); + free(mft->input_types); + free(mft->output_types); + free(mft); } static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUID category, LPCWSTR name, UINT32 flags, @@ -824,7 +802,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI const MFT_REGISTER_TYPE_INFO *output_types) { struct mft_registration *mft, *cur, *unreg_mft = NULL; - HRESULT hr; + HRESULT hr = S_OK; if (!factory && !clsid) { @@ -832,8 +810,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI return E_FAIL; } - mft = heap_alloc_zero(sizeof(*mft)); - if (!mft) + if (!(mft = calloc(1, sizeof(*mft)))) return E_OUTOFMEMORY; mft->factory = factory; @@ -846,13 +823,16 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI flags |= MFT_ENUM_FLAG_SYNCMFT; mft->flags = flags; mft->local = TRUE; - if (FAILED(hr = heap_strdupW(name, &mft->name))) + if (name && !(mft->name = wcsdup(name))) + { + hr = E_OUTOFMEMORY; goto failed; + } if (input_count && input_types) { mft->input_types_count = input_count; - if (!(mft->input_types = heap_calloc(mft->input_types_count, sizeof(*input_types)))) + if (!(mft->input_types = calloc(mft->input_types_count, sizeof(*input_types)))) { hr = E_OUTOFMEMORY; goto failed; @@ -863,7 +843,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI if (output_count && output_types) { mft->output_types_count = output_count; - if (!(mft->output_types = heap_calloc(mft->output_types_count, sizeof(*output_types)))) + if (!(mft->output_types = calloc(mft->output_types_count, sizeof(*output_types)))) { hr = E_OUTOFMEMORY; goto failed; @@ -1063,14 +1043,14 @@ static void mft_get_reg_type_info(const WCHAR *clsidW, const WCHAR *typeW, MFT_R if (!size || size % sizeof(**type)) goto out; - if (!(*type = heap_alloc(size))) + if (!(*type = malloc(size))) goto out; *count = size / sizeof(**type); if (RegQueryValueExW(hfilter, typeW, NULL, &reg_type, (BYTE *)*type, &size)) { - heap_free(*type); + free(*type); *type = NULL; *count = 0; } @@ -1139,12 +1119,12 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { - heap_free(mft.input_types); - heap_free(mft.output_types); + free(mft.input_types); + free(mft.output_types); goto next; } - cur = heap_alloc(sizeof(*cur)); + cur = malloc(sizeof(*cur)); /* Reuse allocated type arrays. */ *cur = mft; list_add_tail(mfts, &cur->entry); @@ -1216,7 +1196,7 @@ static HRESULT mft_enum(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF { if (mft_is_type_info_match(local, &category, flags, plugin_control, input_type, output_type)) { - mft = heap_alloc_zero(sizeof(*mft)); + mft = calloc(1, sizeof(*mft)); mft->clsid = local->clsid; mft->factory = local->factory; @@ -2185,7 +2165,7 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) if (!refcount) { clear_attributes_object(attributes); - heap_free(attributes); + free(attributes); } return refcount; @@ -2671,7 +2651,7 @@ HRESULT attributes_DeleteAllItems(struct attributes *attributes) { PropVariantClear(&attributes->attributes[--attributes->count].value); } - heap_free(attributes->attributes); + free(attributes->attributes); attributes->attributes = NULL; attributes->capacity = 0; @@ -3147,7 +3127,7 @@ void clear_attributes_object(struct attributes *object) for (i = 0; i < object->count; i++) PropVariantClear(&object->attributes[i].value); - heap_free(object->attributes); + free(object->attributes); DeleteCriticalSection(&object->cs); } @@ -3162,13 +3142,12 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size) TRACE("%p, %d\n", attributes, size); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(object, size))) { - heap_free(object); + free(object); return hr; } *attributes = &object->IMFAttributes_iface; @@ -3575,7 +3554,7 @@ static ULONG WINAPI async_stream_op_Release(IUnknown *iface) { if (op->caller) IMFAsyncResult_Release(op->caller); - heap_free(op); + free(op); } return refcount; @@ -3595,7 +3574,7 @@ static HRESULT bytestream_create_io_request(struct bytestream *stream, enum asyn IRtwqAsyncResult *request; HRESULT hr; - op = heap_alloc(sizeof(*op)); + op = malloc(sizeof(*op)); if (!op) return E_OUTOFMEMORY; @@ -3757,7 +3736,7 @@ static ULONG WINAPI bytestream_Release(IMFByteStream *iface) IStream_Release(stream->stream); if (stream->hfile) CloseHandle(stream->hfile); - heap_free(stream); + free(stream); } return refcount; @@ -4320,13 +4299,12 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt TRACE("%p, %p.\n", stream, bytestream); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } @@ -4485,8 +4463,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open if(file == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) { CloseHandle(file); return E_OUTOFMEMORY; @@ -4495,7 +4472,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open if (FAILED(hr = init_attributes_object(&object->attributes, 2))) { CloseHandle(file); - heap_free(object); + free(object); return hr; } object->IMFByteStream_iface.lpVtbl = &bytestream_file_vtbl; @@ -4668,7 +4645,7 @@ static ULONG WINAPI bytestream_wrapper_Release(IMFByteStream *iface) if (wrapper->attributes) IMFAttributes_Release(wrapper->attributes); IMFByteStream_Release(wrapper->stream); - heap_free(wrapper); + free(wrapper); } return refcount; @@ -5545,8 +5522,7 @@ HRESULT WINAPI MFCreateMFByteStreamWrapper(IMFByteStream *stream, IMFByteStream TRACE("%p, %p.\n", stream, wrapper); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFByteStreamCacheControl_iface.lpVtbl = &bytestream_wrapper_cache_control_vtbl; @@ -5738,7 +5714,7 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu IMFSchemeHandler *scheme_handler; } handler; - if (!(queued_result = heap_alloc_zero(sizeof(*queued_result)))) + if (!(queued_result = calloc(1, sizeof(*queued_result)))) return E_OUTOFMEMORY; queued_result->origin = origin; @@ -5823,7 +5799,7 @@ static ULONG WINAPI resolver_cancel_object_Release(IUnknown *iface) if (object->cancel_cookie) IUnknown_Release(object->cancel_cookie); IUnknown_Release(object->u.handler); - heap_free(object); + free(object); } return refcount; @@ -5850,8 +5826,7 @@ static HRESULT resolver_create_cancel_object(IUnknown *handler, enum resolved_ob { struct resolver_cancel_object *object; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IUnknown_iface.lpVtbl = &resolver_cancel_object_vtbl; @@ -6153,7 +6128,7 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch } len = ptr - url; - scheme = heap_alloc((len + 1) * sizeof(WCHAR)); + scheme = malloc((len + 1) * sizeof(WCHAR)); if (!scheme) return E_OUTOFMEMORY; @@ -6164,7 +6139,7 @@ static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSch if (FAILED(hr) && url != fileschemeW) hr = resolver_create_scheme_handler(fileschemeW, flags, handler); - heap_free(scheme); + free(scheme); return hr; } @@ -6202,7 +6177,7 @@ static HRESULT resolver_end_create_object(struct source_resolver *resolver, enum hr = queued_result->hr; if (queued_result->inner_result) IRtwqAsyncResult_Release(queued_result->inner_result); - heap_free(queued_result); + free(queued_result); } else hr = E_UNEXPECTED; @@ -6257,10 +6232,10 @@ static ULONG WINAPI source_resolver_Release(IMFSourceResolver *iface) if (result->object) IUnknown_Release(result->object); list_remove(&result->entry); - heap_free(result); + free(result); } DeleteCriticalSection(&resolver->cs); - heap_free(resolver); + free(resolver); } return refcount; @@ -6488,8 +6463,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) if (!resolver) return E_POINTER; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFSourceResolver_iface.lpVtbl = &mfsourceresolvervtbl; @@ -6564,7 +6538,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) { clear_attributes_object(&event->attributes); PropVariantClear(&event->value); - heap_free(event); + free(event); } return refcount; @@ -6941,13 +6915,13 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR TRACE("%s, %s, %#x, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status, debugstr_propvar(value), event); - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if (!object) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } object->IMFMediaEvent_iface.lpVtbl = &mfmediaevent_vtbl; @@ -7003,7 +6977,7 @@ static IMFMediaEvent *queue_pop_event(struct event_queue *queue) queued_event = LIST_ENTRY(head, struct queued_event, entry); event = queued_event->event; list_remove(&queued_event->entry); - heap_free(queued_event); + free(queued_event); return event; } @@ -7063,7 +7037,7 @@ static ULONG WINAPI eventqueue_Release(IMFMediaEventQueue *iface) { event_queue_cleanup(queue); DeleteCriticalSection(&queue->cs); - heap_free(queue); + free(queue); } return refcount; @@ -7179,7 +7153,7 @@ static HRESULT eventqueue_queue_event(struct event_queue *queue, IMFMediaEvent * struct queued_event *queued_event; HRESULT hr = S_OK; - queued_event = heap_alloc(sizeof(*queued_event)); + queued_event = malloc(sizeof(*queued_event)); if (!queued_event) return E_OUTOFMEMORY; @@ -7199,7 +7173,7 @@ static HRESULT eventqueue_queue_event(struct event_queue *queue, IMFMediaEvent * LeaveCriticalSection(&queue->cs); if (FAILED(hr)) - heap_free(queued_event); + free(queued_event); WakeAllConditionVariable(&queue->update_event); @@ -7298,8 +7272,7 @@ HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue) TRACE("%p\n", queue); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaEventQueue_iface.lpVtbl = &eventqueuevtbl; @@ -7337,7 +7310,7 @@ static void collection_clear(struct collection *collection) IUnknown_Release(collection->elements[i]); } - heap_free(collection->elements); + free(collection->elements); collection->elements = NULL; collection->count = 0; collection->capacity = 0; @@ -7380,8 +7353,8 @@ static ULONG WINAPI collection_Release(IMFCollection *iface) if (!refcount) { collection_clear(collection); - heap_free(collection->elements); - heap_free(collection); + free(collection->elements); + free(collection); } return refcount; @@ -7527,8 +7500,7 @@ HRESULT WINAPI MFCreateCollection(IMFCollection **collection) if (!collection) return E_POINTER; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFCollection_iface.lpVtbl = &mfcollectionvtbl; @@ -7602,7 +7574,7 @@ static ULONG WINAPI system_clock_Release(IMFClock *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) - heap_free(clock); + free(clock); return refcount; } @@ -7676,7 +7648,7 @@ static HRESULT create_system_clock(IMFClock **clock) { struct system_clock *object; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = malloc(sizeof(*object)))) return E_OUTOFMEMORY; object->IMFClock_iface.lpVtbl = &system_clock_vtbl; @@ -7735,7 +7707,7 @@ static ULONG WINAPI system_time_source_Release(IMFPresentationTimeSource *iface) if (source->clock) IMFClock_Release(source->clock); DeleteCriticalSection(&source->cs); - heap_free(source); + free(source); } return refcount; @@ -8025,7 +7997,7 @@ HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **time_source) TRACE("%p.\n", time_source); - object = heap_alloc_zero(sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -8105,8 +8077,8 @@ static ULONG WINAPI async_create_file_callback_Release(IRtwqAsyncCallback *iface if (!refcount) { - heap_free(async->path); - heap_free(async); + free(async->path); + free(async); } return refcount; @@ -8131,7 +8103,7 @@ static HRESULT WINAPI async_create_file_callback_Invoke(IRtwqAsyncCallback *ifac { struct async_create_file_result *result_item; - result_item = heap_alloc(sizeof(*result_item)); + result_item = malloc(sizeof(*result_item)); if (result_item) { result_item->result = caller; @@ -8182,8 +8154,7 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &caller))) return hr; - async = heap_alloc(sizeof(*async)); - if (!async) + if (!(async = malloc(sizeof(*async)))) { hr = E_OUTOFMEMORY; goto failed; @@ -8194,8 +8165,11 @@ HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMOD async->access_mode = access_mode; async->open_mode = open_mode; async->flags = flags; - if (FAILED(hr = heap_strdupW(path, &async->path))) + if (!(async->path = wcsdup(path))) + { + hr = E_OUTOFMEMORY; goto failed; + } hr = RtwqCreateAsyncResult(NULL, &async->IRtwqAsyncCallback_iface, (IUnknown *)caller, &item); if (FAILED(hr)) @@ -8240,7 +8214,7 @@ static HRESULT async_create_file_pull_result(IUnknown *unk, IMFByteStream **stre *stream = item->stream; IRtwqAsyncResult_Release(item->result); list_remove(&item->entry); - heap_free(item); + free(item); break; } } @@ -8289,20 +8263,19 @@ HRESULT WINAPI MFCancelCreateFile(IUnknown *cancel_cookie) HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *activate) { struct local_handler *handler; - HRESULT hr; TRACE("%s, %p.\n", debugstr_w(scheme), activate); if (!scheme || !activate) return E_INVALIDARG; - if (!(handler = heap_alloc(sizeof(*handler)))) + if (!(handler = malloc(sizeof(*handler)))) return E_OUTOFMEMORY; - if (FAILED(hr = heap_strdupW(scheme, &handler->u.scheme))) + if (!(handler->u.scheme = wcsdup(scheme))) { - heap_free(handler); - return hr; + free(handler); + return E_OUTOFMEMORY; } handler->activate = activate; IMFActivate_AddRef(handler->activate); @@ -8320,35 +8293,32 @@ HRESULT WINAPI MFRegisterLocalSchemeHandler(const WCHAR *scheme, IMFActivate *ac HRESULT WINAPI MFRegisterLocalByteStreamHandler(const WCHAR *extension, const WCHAR *mime, IMFActivate *activate) { struct local_handler *handler; - HRESULT hr; TRACE("%s, %s, %p.\n", debugstr_w(extension), debugstr_w(mime), activate); if ((!extension && !mime) || !activate) return E_INVALIDARG; - if (!(handler = heap_alloc_zero(sizeof(*handler)))) + if (!(handler = calloc(1, sizeof(*handler)))) return E_OUTOFMEMORY; - hr = heap_strdupW(extension, &handler->u.bytestream.extension); - if (SUCCEEDED(hr)) - hr = heap_strdupW(mime, &handler->u.bytestream.mime); - - if (FAILED(hr)) + if (extension && !(handler->u.bytestream.extension = wcsdup(extension))) + goto failed; + if (mime && !(handler->u.bytestream.mime = wcsdup(mime))) goto failed; EnterCriticalSection(&local_handlers_section); list_add_head(&local_bytestream_handlers, &handler->entry); LeaveCriticalSection(&local_handlers_section); - return hr; + return S_OK; failed: - heap_free(handler->u.bytestream.extension); - heap_free(handler->u.bytestream.mime); - heap_free(handler); + free(handler->u.bytestream.extension); + free(handler->u.bytestream.mime); + free(handler); - return hr; + return E_OUTOFMEMORY; } struct property_store @@ -8405,8 +8375,8 @@ static ULONG WINAPI property_store_Release(IPropertyStore *iface) if (!refcount) { DeleteCriticalSection(&store->cs); - heap_free(store->values); - heap_free(store); + free(store->values); + free(store); } return refcount; @@ -8540,7 +8510,7 @@ HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) if (!store) return E_INVALIDARG; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IPropertyStore_iface.lpVtbl = &property_store_vtbl; @@ -8640,8 +8610,8 @@ static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) if (manager->device) IDXGIDevice_Release(manager->device); DeleteCriticalSection(&manager->cs); - heap_free(manager->handles); - heap_free(manager); + free(manager->handles); + free(manager); } return refcount; @@ -8926,7 +8896,7 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man if (!token || !manager) return E_POINTER; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 92d219f26e1..61f1a75d90b 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -157,7 +157,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) clear_attributes_object(&media_type->attributes); CoTaskMemFree(media_type->video_format); CoTaskMemFree(media_type->audio_format); - heap_free(media_type); + free(media_type); } return refcount; @@ -1435,13 +1435,12 @@ static HRESULT create_media_type(struct media_type **ret) struct media_type *object; HRESULT hr; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } object->IMFMediaType_iface.lpVtbl = &mediatypevtbl; @@ -1519,11 +1518,11 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface) if (stream_desc->media_types[i]) IMFMediaType_Release(stream_desc->media_types[i]); } - heap_free(stream_desc->media_types); + free(stream_desc->media_types); if (stream_desc->current_type) IMFMediaType_Release(stream_desc->current_type); clear_attributes_object(&stream_desc->attributes); - heap_free(stream_desc); + free(stream_desc); } return refcount; @@ -2052,19 +2051,18 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, if (!count) return E_INVALIDARG; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } object->IMFStreamDescriptor_iface.lpVtbl = &streamdescriptorvtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &mediatypehandlervtbl; object->identifier = identifier; - object->media_types = heap_alloc(count * sizeof(*object->media_types)); + object->media_types = calloc(count, sizeof(*object->media_types)); if (!object->media_types) { IMFStreamDescriptor_Release(&object->IMFStreamDescriptor_iface); @@ -2127,8 +2125,8 @@ static ULONG WINAPI presentation_descriptor_Release(IMFPresentationDescriptor *i IMFStreamDescriptor_Release(presentation_desc->descriptors[i].descriptor); } clear_attributes_object(&presentation_desc->attributes); - heap_free(presentation_desc->descriptors); - heap_free(presentation_desc); + free(presentation_desc->descriptors); + free(presentation_desc); } return refcount; @@ -2491,8 +2489,7 @@ static HRESULT WINAPI presentation_descriptor_Clone(IMFPresentationDescriptor *i TRACE("%p, %p.\n", iface, descriptor); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; presentation_descriptor_init(object, presentation_desc->count); @@ -2563,8 +2560,7 @@ static HRESULT presentation_descriptor_init(struct presentation_desc *object, DW if (FAILED(hr = init_attributes_object(&object->attributes, 0))) return hr; object->IMFPresentationDescriptor_iface.lpVtbl = &presentationdescriptorvtbl; - object->descriptors = heap_alloc_zero(count * sizeof(*object->descriptors)); - if (!object->descriptors) + if (!(object->descriptors = calloc(count, sizeof(*object->descriptors)))) { IMFPresentationDescriptor_Release(&object->IMFPresentationDescriptor_iface); return E_OUTOFMEMORY; @@ -2595,13 +2591,12 @@ HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor * return E_INVALIDARG; } - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = presentation_descriptor_init(object, count))) { - heap_free(object); + free(object); return hr; } @@ -2818,7 +2813,7 @@ HRESULT WINAPI MFWrapMediaType(IMFMediaType *original, REFGUID major, REFGUID su if (FAILED(hr = MFGetAttributesAsBlobSize((IMFAttributes *)original, &size))) return hr; - if (!(buffer = heap_alloc(size))) + if (!(buffer = malloc(size))) return E_OUTOFMEMORY; if (FAILED(hr = MFGetAttributesAsBlob((IMFAttributes *)original, buffer, size))) @@ -2839,7 +2834,7 @@ HRESULT WINAPI MFWrapMediaType(IMFMediaType *original, REFGUID major, REFGUID su *ret = mediatype; failed: - heap_free(buffer); + free(buffer); return hr; } diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 117907bb1a9..b646d9e7cbb 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -25,7 +25,6 @@ #include "mferror.h" #include "d3d9types.h" -#include "wine/heap.h" #include "wine/debug.h" struct attribute @@ -106,7 +105,7 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index cdd3d897169..93c5f923cc2 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -162,8 +162,8 @@ static void release_sample_object(struct sample *sample) for (i = 0; i < sample->buffer_count; ++i) IMFMediaBuffer_Release(sample->buffers[i]); clear_attributes_object(&sample->attributes); - heap_free(sample->buffers); - heap_free(sample); + free(sample->buffers); + free(sample); } static ULONG WINAPI sample_Release(IMFSample *iface) @@ -1020,13 +1020,12 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) TRACE("%p.\n", sample); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } @@ -1049,13 +1048,12 @@ HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample) TRACE("%p.\n", sample); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } @@ -1112,13 +1110,13 @@ static void sample_allocator_release_samples(struct sample_allocator *allocator) { list_remove(&iter->entry); IMFSample_Release(iter->sample); - heap_free(iter); + free(iter); } LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &allocator->used_samples, struct queued_sample, entry) { list_remove(&iter->entry); - heap_free(iter); + free(iter); } allocator->free_sample_count = 0; @@ -1183,7 +1181,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface) sample_allocator_set_attributes(allocator, NULL); sample_allocator_release_samples(allocator); DeleteCriticalSection(&allocator->cs); - heap_free(allocator); + free(allocator); } return refcount; @@ -1308,7 +1306,7 @@ static void sample_allocator_release_surface_service(struct sample_allocator *al static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocator, const struct surface_service *service, IMFSample **sample) { - struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + struct queued_sample *queued_sample = malloc(sizeof(*queued_sample)); IMFTrackedSample *tracked_sample; IMFMediaBuffer *buffer; unsigned int i; @@ -1445,7 +1443,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u if (SUCCEEDED(hr = sample_allocator_allocate_sample(allocator, &service, &sample))) { - queued_sample = heap_alloc(sizeof(*queued_sample)); + queued_sample = malloc(sizeof(*queued_sample)); queued_sample->sample = sample; list_add_tail(&allocator->free_samples, &queued_sample->entry); allocator->free_sample_count++; @@ -1534,7 +1532,7 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocatorEx { if (SUCCEEDED(hr = sample_allocator_track_sample(allocator, sample))) { - struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + struct queued_sample *queued_sample = malloc(sizeof(*queued_sample)); queued_sample->sample = sample; list_add_tail(&allocator->used_samples, &queued_sample->entry); @@ -1738,7 +1736,7 @@ HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFVideoSampleAllocatorEx_iface.lpVtbl = &sample_allocator_vtbl; -- 2.30.2

1 0

[PATCH] reg/tests: Add further syntax tests for the 'copy' command
by Hugh McMaster 12 May '21

12 May '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/copy.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 31223a3d314..0d245dae4da 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -88,11 +88,38 @@ static void test_command_syntax(void) run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC "\\", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC "\\", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC " /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC "\\ /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC "\\ /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC " /s /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC " /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC "\\ /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" COPY_SRC "\\ /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } START_TEST(copy) -- 2.31.1

1 0

[PATCH 1/3] reg: Fail if access is denied when deleting registry data
by Hugh McMaster 12 May '21

12 May '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/delete.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index f8e62e490b9..8804e16e52f 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -18,9 +18,27 @@ #include "reg.h" +static BOOL op_delete_key = TRUE; + +static void output_error(LONG rc) +{ + if (rc == ERROR_FILE_NOT_FOUND) + { + if (op_delete_key) + output_message(STRING_KEY_NONEXIST); + else + output_message(STRING_VALUE_NONEXIST); + } + else + { + output_message(STRING_ACCESS_DENIED); + } +} + static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { + LONG rc; HKEY hkey; if (!force) @@ -44,26 +62,28 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name /* Delete registry key if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) + if ((rc = RegDeleteTreeW(root, path))) { - output_message(STRING_KEY_NONEXIST); + output_error(rc); return 1; } + output_message(STRING_SUCCESS); return 0; } - if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey)) + if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey))) { - output_message(STRING_KEY_NONEXIST); + output_error(rc); return 1; } + op_delete_key = FALSE; + if (value_all) { DWORD max_value_len = 256, value_len; WCHAR *value_name; - LONG rc; value_name = malloc(max_value_len * sizeof(WCHAR)); @@ -79,6 +99,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name free(value_name); RegCloseKey(hkey); output_message(STRING_VALUEALL_FAILED, key_name); + output_error(rc); return 1; } } @@ -93,10 +114,10 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else if (value_name || value_empty) { - if (RegDeleteValueW(hkey, value_name)) + if ((rc = RegDeleteValueW(hkey, value_name))) { RegCloseKey(hkey); - output_message(STRING_VALUE_NONEXIST); + output_error(rc); return 1; } } -- 2.31.1

1 2

[PATCH v6] include: Add IXMLHTTPRequest2/3 interfaces
by Alistair Leslie-Hughes 12 May '21

12 May '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msxml6.idl | 102 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/include/msxml6.idl b/include/msxml6.idl index 5bfb21d04ae..4948de39f1f 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -52,6 +52,8 @@ interface IXMLDOMEntity; interface IXMLDOMEntityReference; interface IXMLDOMParseError; interface IXMLDOMParseErrorCollection; +interface IXMLHTTPRequest2Callback; +interface IXMLHTTPRequest3Callback; interface IXTLRuntime; interface IXSLTemplate; interface IXSLProcessor; @@ -254,6 +256,35 @@ typedef enum _SCHEMATYPEVARIETY } SCHEMATYPEVARIETY; cpp_quote("#endif /* __msxml_som_enums__ */") +typedef [v1_enum] enum _XHR_PROPERTY +{ + XHR_PROP_NO_CRED_PROMPT, + XHR_PROP_NO_AUTH, + XHR_PROP_TIMEOUT, + XHR_PROP_NO_DEFAULT_HEADERS, + XHR_PROP_REPORT_REDIRECT_STATUS, + XHR_PROP_NO_CACHE, + XHR_PROP_EXTENDED_ERROR, + XHR_PROP_QUERY_STRING_UTF8, + XHR_PROP_IGNORE_CERT_ERRORS, +} XHR_PROPERTY; + +typedef struct tagXHR_COOKIE +{ + [ref, string] WCHAR *pwszUrl; + [ref, string] WCHAR *pwszName; + [unique, string] WCHAR *pwszValue; + [unique, string] WCHAR *pwszP3PPolicy; + FILETIME ftExpires; + DWORD dwFlags; +} XHR_COOKIE; + +typedef struct tagXHR_CERT +{ + DWORD cbCert; + [ref, size_is(cbCert)] BYTE *pbCert; +} XHR_CERT; + [ local, object, @@ -1309,6 +1340,66 @@ interface IServerXMLHTTPRequest : IXMLHTTPRequest [in] VARIANT value); } +[ + object, + uuid(e5d37dc0-552a-4d52-9cc0-a14d546fbd04), +] +interface IXMLHTTPRequest2 : IUnknown +{ + HRESULT Open([in, string, ref] const WCHAR *method, [in, string, ref] const WCHAR *url, + [in] IXMLHTTPRequest2Callback *callback, + [in, string, unique] const WCHAR *username, [in, string, unique] const WCHAR *password, + [in, string, unique] const WCHAR *proxyuser, [in, string, unique] const WCHAR *proxypassword); + + HRESULT Send([in, unique] ISequentialStream *body, [in] ULONGLONG length); + HRESULT Abort(); + HRESULT SetCookie([in, ref] const XHR_COOKIE *cookie, [out] DWORD *state); + HRESULT SetCustomResponseStream([in] ISequentialStream *stream); + HRESULT SetProperty([in] XHR_PROPERTY property, [in] ULONGLONG value); + HRESULT SetRequestHeader([in, string, ref] const WCHAR *header, [in, string, unique] const WCHAR *value); + HRESULT GetAllResponseHeaders([out, string] WCHAR **headers); + HRESULT GetCookie( [in, ref, string] const WCHAR *url, [in, unique, string] const WCHAR *name, + [in] DWORD flags, [out] ULONG *cookies_cnt, [out, size_is(,*cookies_cnt)] XHR_COOKIE **cookies); + HRESULT GetResponseHeader([in, string, ref] const WCHAR *header, [out, string] WCHAR **value); +}; + +[ + object, + uuid(a1c9feee-0617-4f23-9d58-8961ea43567c) +] +interface IXMLHTTPRequest3 : IXMLHTTPRequest2 +{ + HRESULT SetClientCertificate([in] DWORD count, [in, unique, size_is(count)] const BYTE *hashes, + [in, string, unique] const WCHAR *pin); +}; + +[ + object, + uuid(a44a9299-e321-40de-8866-341b41669162), + pointer_default(ref) +] +interface IXMLHTTPRequest2Callback : IUnknown +{ + HRESULT OnRedirect([in] IXMLHTTPRequest2 *xhr, [in, string] const WCHAR *url); + HRESULT OnHeadersAvailable([in] IXMLHTTPRequest2 *xhr, [in] DWORD status, [in, string] const WCHAR *msg); + HRESULT OnDataAvailable([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnResponseReceived([in] IXMLHTTPRequest2 *xhr, [in] ISequentialStream *stream); + HRESULT OnError([in] IXMLHTTPRequest2 *xhr, [in] HRESULT error); +}; + +[ + object, + uuid(b9e57830-8c6c-4a6f-9c13-47772bb047bb) +] +interface IXMLHTTPRequest3Callback : IXMLHTTPRequest2Callback +{ + HRESULT OnServerCertificateReceived([in] IXMLHTTPRequest3 *xhr, [in] DWORD errors, + [in] DWORD count, [in, unique, size_is(count)] const XHR_CERT *certificates); + + HRESULT OnClientCertificateRequested([in] IXMLHTTPRequest3 *xhr, + [in] DWORD count, [in, string, unique, size_is(count)] const WCHAR **list); +}; + [ object, dual, @@ -1607,6 +1698,17 @@ interface ISAXDeclHandler : IUnknown [in] int nSystemId); } +[ + helpstring("Free Threaded XML HTTP Request class 6.0"), + progid("Msxml2.FreeThreadedXMLHTTP60.6.0"), + threading(both), + uuid(88d96a09-f192-11d4-a65f-0040963251e5) +] +coclass FreeThreadedXMLHTTP60 +{ + [default] interface IXMLHTTPRequest2; +} + [ object, local, -- 2.30.2

2 1

[PATCH] winemac.drv: Set view.WantsBestResolutionOpenGLSurface.
by Stefan Dösinger 12 May '21

12 May '21

This used to default to false before Catalina, and it still does so when the application is built with XCode 10 or earlier. When building with XCode 11 or later Catalina and newer will create a high DPI GL view even if the window is low dpi. Because we don't adjust glViewport parameters (and glDrawPixels, etc) we render only to the lower left quadrant. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Vulkan via MoltenVK already works correctly. Try 4 with the signed-off-by: This time above the cut... --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..29ac32d6be0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -685,6 +685,7 @@ - (void) setRetinaMode:(int)mode frame.size.width *= scale; frame.size.height *= scale; [self setFrame:frame]; + [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; [super setRetinaMode:mode]; @@ -3575,6 +3576,7 @@ macdrv_view macdrv_create_view(CGRect rect) [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; + [view setWantsBestResolutionOpenGLSurface:retina_on]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification -- 2.30.1 (Apple Git-130)

1 0

[PATCH] winemac.drv: Set view.WantsBestResolutionOpenGLSurface.
by Stefan Dösinger 12 May '21

12 May '21

This used to default to false before Catalina, and it still does so when the application is built with XCode 10 or earlier. When building with XCode 11 or later Catalina and newer will create a high DPI GL view even if the window is low dpi. Because we don't adjust glViewport parameters (and glDrawPixels, etc) we render only to the lower left quadrant. --- Vulkan via MoltenVK already works correctly. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..29ac32d6be0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -685,6 +685,7 @@ - (void) setRetinaMode:(int)mode frame.size.width *= scale; frame.size.height *= scale; [self setFrame:frame]; + [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; [super setRetinaMode:mode]; @@ -3575,6 +3576,7 @@ macdrv_view macdrv_create_view(CGRect rect) [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; + [view setWantsBestResolutionOpenGLSurface:retina_on]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification -- 2.30.1 (Apple Git-130)

1 0

[PATCH] winegstreamer: Ensure that the source reports both PCM and floating point audio formats.
by Giovanni Mascellani 12 May '21

12 May '21

From: Derek Lesho <dlesho(a)codeweavers.com> Unfortunately this causes a small regression in mfreadwrite tests. In an ideal world we would implement everything as in Windows, letting the media source just emit a compressed stream and having the stream reader decompress it to whatever the client is asking for. Since currently the source reader is unable to handle compressed streams, it makes sense to have winegstreamer's media source offer both PCM and floating point streams. The patch is originally by Derek Lesho, with some changes by Giovanni Mascellani. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 1 + dlls/winegstreamer/media_source.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8ea4e5038f6..1967015e865 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -751,6 +751,7 @@ static void test_source_reader(void) IMFMediaType_Release(mediatype); hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 1, &mediatype); +todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); /* Current media type. */ diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..626e273780b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -806,6 +806,34 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; } } + else if (format.major_type == WG_MAJOR_TYPE_AUDIO) + { + /* Expose at least one PCM and one floating point type for the + consumer to pick from. */ + stream_types = malloc( sizeof(IMFMediaType *) * 2 ); + + stream_types[0] = mf_media_type_from_wg_format(&format); + if (stream_types[0]) + { + stream_types[1] = mf_media_type_from_wg_format(&format); + if (stream_types[1]) + { + GUID base_subtype; + IMFMediaType_GetGUID(stream_types[1], &MF_MT_SUBTYPE, &base_subtype); + if (IsEqualGUID(&base_subtype, &MFAudioFormat_Float)) + { + IMFMediaType_SetGUID(stream_types[1], &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); + } + else + { + IMFMediaType_SetGUID(stream_types[1], &MF_MT_SUBTYPE, &MFAudioFormat_Float); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); + } + type_count = 2; + } + } + } else { stream_type = mf_media_type_from_wg_format(&format); -- 2.31.1

2 1

[PATCH 1/4] wined3d: Use the correct device context ops in wined3d_device_context_issue_query().
by Zebediah Figura 12 May '21

12 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b8ec5baa862..38ab2aed900 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5387,7 +5387,7 @@ void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *con { TRACE("context %p, query %p, flags %#x.\n", context, query, flags); - query->device->cs->c.ops->issue_query(context, query, flags); + context->ops->issue_query(context, query, flags); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( -- 2.30.2

5 11

[PATCH v3 1/5] ws2_32/tests: Clean up and expand tests for DisconnectEx().
by Zebediah Figura 12 May '21

12 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: appease Vista again... dlls/ws2_32/tests/sock.c | 194 ++++++++++++++++++++++++++------------- 1 file changed, 130 insertions(+), 64 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 05e5cdd62ad..5da92361bbd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6700,98 +6700,164 @@ static void test_shutdown(void) static void test_DisconnectEx(void) { - SOCKET listener, acceptor, connector; + struct sockaddr_in server_addr, client_addr, addr; + GUID disconnectex_guid = WSAID_DISCONNECTEX; + SOCKET listener, server, client; LPFN_DISCONNECTEX pDisconnectEx; - GUID disconnectExGuid = WSAID_DISCONNECTEX; - struct sockaddr_in address; - DWORD num_bytes, flags; - OVERLAPPED overlapped; - int addrlen, iret; - BOOL bret; + OVERLAPPED overlapped = {0}; + int addrlen, ret; + char buffer[5]; + DWORD size; - connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectExGuid, sizeof(disconnectExGuid), - &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); - if (iret) + client = socket(AF_INET, SOCK_STREAM, 0); + ok(client != INVALID_SOCKET, "failed to create connector socket, error %u\n", WSAGetLastError()); + + ret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectex_guid, sizeof(disconnectex_guid), + &pDisconnectEx, sizeof(pDisconnectEx), &size, NULL, NULL); + if (ret) { win_skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); - closesocket(connector); + closesocket(client); return; } listener = socket(AF_INET, SOCK_STREAM, 0); ok(listener != INVALID_SOCKET, "failed to create listener socket, error %d\n", WSAGetLastError()); - memset(&address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(listener, (struct sockaddr *)&address, sizeof(address)); - ok(iret == 0, "failed to bind, error %d\n", WSAGetLastError()); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(listener, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + addrlen = sizeof(server_addr); + ret = getsockname(listener, (struct sockaddr *)&server_addr, &addrlen); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 1); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); - addrlen = sizeof(address); - iret = getsockname(listener, (struct sockaddr *)&address, &addrlen); - ok(iret == 0, "failed to lookup bind address, error %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(INVALID_SOCKET, &overlapped, 0, 0); + ok(!ret, "expected failure\n"); + ok(WSAGetLastError() == WSAENOTSOCK, "got error %u\n", WSAGetLastError()); - iret = listen(listener, 1); - ok(iret == 0, "failed to listen, error %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + ok(!ret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); - set_blocking(listener, TRUE); + ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); - memset(&overlapped, 0, sizeof(overlapped)); - bret = pDisconnectEx(INVALID_SOCKET, &overlapped, 0, 0); - ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - memset(&overlapped, 0, sizeof(overlapped)); - bret = pDisconnectEx(connector, &overlapped, 0, 0); - ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + if (WSAGetLastError() == ERROR_IO_PENDING) + { + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait timed out\n"); + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + } - iret = connect(connector, (struct sockaddr *)&address, addrlen); - ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); - acceptor = accept(listener, NULL, NULL); - ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = send(client, "test", 5, 0); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); - memset(&overlapped, 0, sizeof(overlapped)); - overlapped.hEvent = WSACreateEvent(); - ok(overlapped.hEvent != WSA_INVALID_EVENT, "WSACreateEvent failed, error %d\n", WSAGetLastError()); - bret = pDisconnectEx(connector, &overlapped, 0, 0); - if (bret) - ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); - else if (WSAGetLastError() == ERROR_IO_PENDING) - bret = WSAGetOverlappedResult(connector, &overlapped, &num_bytes, TRUE, &flags); - ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); - WSACloseEvent(overlapped.hEvent); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(!ret, "got %d\n", ret); - iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); - ok(iret != 0, "connect unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + ret = send(server, "test", 5, 0); + ok(ret == 5, "got %d\n", ret); - closesocket(acceptor); - closesocket(connector); + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == 5, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_an(buffer, ret)); - connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + addrlen = sizeof(addr); + ret = getpeername(client, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n"); - iret = connect(connector, (struct sockaddr *)&address, addrlen); - ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + addrlen = sizeof(client_addr); + ret = getsockname(client, (struct sockaddr *)&client_addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + addrlen = sizeof(addr); + ret = getpeername(server, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n"); - acceptor = accept(listener, NULL, NULL); - ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + closesocket(client); + closesocket(server); - bret = pDisconnectEx(connector, NULL, 0, 0); - ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + /* Test the synchronous case. */ - iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); - ok(iret != 0, "connect unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, NULL, 0, 0); + ok(ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, NULL, 0, 0); + todo_wine ok(ret, "expected success\n"); + todo_wine ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + + ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = send(client, "test", 5, 0); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + + ret = recv(server, buffer, sizeof(buffer), 0); + ok(!ret, "got %d\n", ret); + + ret = send(server, "test", 5, 0); + ok(ret == 5, "got %d\n", ret); + + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == 5, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_an(buffer, ret)); + + addrlen = sizeof(addr); + ret = getpeername(client, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n"); + + addrlen = sizeof(client_addr); + ret = getsockname(client, (struct sockaddr *)&client_addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + addrlen = sizeof(addr); + ret = getpeername(server, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n"); + + closesocket(client); + closesocket(server); - closesocket(acceptor); - closesocket(connector); closesocket(listener); + CloseHandle(overlapped.hEvent); } #define compare_file(h,s,o) compare_file2(h,s,o,__FILE__,__LINE__) -- 2.30.2

1 4

[PATCH] sechost: Allow hexadecimal and string rights flags to be interleaved.
by Zebediah Figura 11 May '21

11 May '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This allows the Unreal Engine 4 prerequisite installer shipped with several games (Everspace 2, POSTAL 4, The Turing Test, KARDS) to run, instead of terminating with an "invalid ACL" message. dlls/advapi32/tests/security.c | 4 ++++ dlls/sechost/security.c | 36 ++++++++++++---------------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 299a340dcf3..b3361795761 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4212,6 +4212,10 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, { "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xDeAdBeEf;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;GR0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, /* test ACE string access right error case */ { "D:(A;;ROB;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, /* test behaviour with empty strings */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 47ffba9ed52..2a28d834ac2 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -868,14 +868,21 @@ static DWORD parse_ace_flag( const WCHAR *string ) return 0; } -static DWORD parse_ace_right( const WCHAR *string ) +static DWORD parse_ace_right( const WCHAR **string_ptr ) { + const WCHAR *string = *string_ptr; unsigned int i; + if (string[0] == '0' && string[1] == 'x') + return wcstoul( string, string_ptr, 16 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) + { + *string_ptr += 2; return ace_rights[i].value; + } } return 0; } @@ -908,30 +915,11 @@ static DWORD parse_ace_rights( const WCHAR **string_ptr ) while (*string == ' ') string++; - if (string[0] == '0' && string[1] == 'x') + while (*string != ';') { - const WCHAR *p = string; - - while (*p && *p != ';') - p++; - - if (p - string <= 10 /* 8 hex digits + "0x" */ ) - { - rights = wcstoul( string, NULL, 16 ); - string = p; - } - else - WARN("Invalid rights string format: %s\n", debugstr_wn(string, p - string)); - } - else - { - while (*string != ';') - { - DWORD right = parse_ace_right( string ); - if (!right) return 0; - rights |= right; - string += 2; - } + DWORD right = parse_ace_right( &string ); + if (!right) return 0; + rights |= right; } *string_ptr = string; -- 2.30.2

1 0

[PATCH] user32: Honor SMTO_ABORTIFHUNG while awaiting reply.
by Shawn M. Chapla 11 May '21

11 May '21

If the SMTO_ABORTIFHUNG flag is set, periodically time out (every 1000ms) to check whether the thread from which a reply is expected has become hung while the sending thread has been waiting for that reply. While it is the case that, when necessary, the wineserver checks whether a thread is hung before putting a message into its queue, this does not account for cases in which a thread becomes hung after that message has been enqueued but before it has been handled. In order to abort when hung in those cases, client code must perform this check itself. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/user32/message.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a54ecccc7cd..6e988a6aeb0 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2949,15 +2949,17 @@ static HANDLE get_server_queue_handle(void) * * Wait until a sent message gets replied to. */ -static void wait_message_reply( UINT flags ) +static void wait_message_reply( UINT flags, HWND hwnd ) { struct user_thread_info *thread_info = get_user_thread_info(); HANDLE server_queue = get_server_queue_handle(); unsigned int wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); + DWORD timeout = (flags & SMTO_ABORTIFHUNG) ? 1000 : INFINITE; for (;;) { unsigned int wake_bits = 0; + DWORD ret = 0; SERVER_START_REQ( set_queue_mask ) { @@ -2978,7 +2980,12 @@ static void wait_message_reply( UINT flags ) continue; } - wow_handlers.wait_message( 1, &server_queue, INFINITE, wake_mask, 0 ); + ret = wow_handlers.wait_message( 1, &server_queue, timeout, wake_mask, 0 ); + + /* If the wait call timed out and the window we're waiting + on is now hung, bail. */ + if (ret == WAIT_TIMEOUT && IsHungAppWindow(hwnd)) + return; } } @@ -3156,7 +3163,7 @@ static LRESULT send_inter_thread_message( const struct send_message_info *info, /* there's no reply to wait for on notify/callback messages */ if (info->type == MSG_NOTIFY || info->type == MSG_CALLBACK) return 1; - wait_message_reply( info->flags ); + wait_message_reply( info->flags, info->hwnd ); return retrieve_reply( info, reply_size, res_ptr ); } @@ -3309,7 +3316,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) if (wait) { LRESULT ignored; - wait_message_reply( 0 ); + wait_message_reply( 0, NULL ); retrieve_reply( &info, 0, &ignored ); } return ret; -- 2.28.0

2 2

[PATCH v2 1/5] ws2_32/tests: Do not close the port passed to CreateIoCompletionPort separately from the port returned.
by Zebediah Figura 11 May '21

11 May '21

They are the same port handle. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 60 +++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 24259ad4cf2..885bfc2fd67 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5730,7 +5730,7 @@ static void test_ConnectEx(void) OVERLAPPED overlapped, *olp; LPFN_CONNECTEX pConnectEx; GUID connectExGuid = WSAID_CONNECTEX; - HANDLE previous_port, io_port; + HANDLE io_port; DWORD bytesReturned; char buffer[1024]; ULONG_PTR key; @@ -5853,10 +5853,7 @@ static void test_ConnectEx(void) address.sin_port = htons(1); - previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); - - io_port = CreateIoCompletionPort((HANDLE)connector, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)connector, NULL, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = SetFileCompletionNotificationModes((HANDLE)connector, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); @@ -5884,8 +5881,6 @@ static void test_ConnectEx(void) WSACloseEvent(overlapped.hEvent); closesocket(connector); - - CloseHandle(previous_port); } static void test_AcceptEx(void) @@ -7068,7 +7063,7 @@ todo_wine static void test_synchronous_WSAIoctl(void) { - HANDLE previous_port, io_port; + HANDLE io_port; WSAOVERLAPPED overlapped, *olp; SOCKET socket; ULONG on; @@ -7077,13 +7072,10 @@ static void test_synchronous_WSAIoctl(void) BOOL ret; int res; - previous_port = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 0, 0 ); - ok( previous_port != NULL, "failed to create completion port %u\n", GetLastError() ); - socket = WSASocketW( AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED ); ok( socket != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError() ); - io_port = CreateIoCompletionPort( (HANDLE)socket, previous_port, 0, 0 ); + io_port = CreateIoCompletionPort( (HANDLE)socket, NULL, 0, 0 ); ok( io_port != NULL, "failed to create completion port %u\n", GetLastError() ); on = 1; @@ -7096,7 +7088,6 @@ static void test_synchronous_WSAIoctl(void) CloseHandle( io_port ); closesocket( socket ); - CloseHandle( previous_port ); } /* @@ -7131,7 +7122,7 @@ static SOCKET setup_iocp_src(struct sockaddr_in *bindAddress) static void test_completion_port(void) { - HANDLE previous_port, io_port; + HANDLE io_port; WSAOVERLAPPED ov, *olp; SOCKET src, dest, dup, connector = INVALID_SOCKET; WSAPROTOCOL_INFOA info; @@ -7148,8 +7139,8 @@ static void test_completion_port(void) fd_set fds_recv; memset(buf, 0, sizeof(buf)); - previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + io_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( io_port != NULL, "Failed to create completion port %u\n", GetLastError()); memset(&ov, 0, sizeof(ov)); @@ -7164,7 +7155,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort( (HANDLE)dest, previous_port, 125, 0 ); + io_port = CreateIoCompletionPort( (HANDLE)dest, io_port, 125, 0 ); ok(io_port != NULL, "Failed to create completion port %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7218,7 +7209,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7263,7 +7254,7 @@ static void test_completion_port(void) ok(!iret, "WSASend failed - %d, last error %u\n", iret, GetLastError()); ok(num_bytes == sizeof(buf), "Managed to send %d\n", num_bytes); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7336,7 +7327,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7374,7 +7365,7 @@ static void test_completion_port(void) dest = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(dest != INVALID_SOCKET, "socket() failed\n"); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7421,7 +7412,7 @@ static void test_completion_port(void) ok(bret == FALSE, "AcceptEx returned %d\n", bret); ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); closesocket(src); @@ -7457,7 +7448,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7499,7 +7490,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7557,7 +7548,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7623,7 +7614,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7678,7 +7669,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); closesocket(src); @@ -7702,10 +7693,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7759,10 +7750,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7821,10 +7812,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7864,10 +7855,9 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - closesocket(src); closesocket(connector); - CloseHandle(previous_port); + CloseHandle(io_port); } static void test_address_list_query(void) -- 2.30.2

2 7

[PATCH v2] windowscodecs: Add stub for IWICDdsEncoder.
by Ziqing Hui 11 May '21

11 May '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Fix typo in QueryInterface. dlls/windowscodecs/ddsformat.c | 63 ++++++++++++++++++++++++++++++++-- include/wincodec.idl | 19 ++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-)

2 1

[tools] winetest: Share the group definitions.
by Francois Gouget 11 May '21

11 May '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-index | 36 +------------------------- winetest/gather | 59 +++++------------------------------------- winetest/winetest.conf | 27 +++++++++++++++++++ 3 files changed, 35 insertions(+), 87 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index e69ea1f28..d6f04a0c1 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -32,7 +32,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb @groups/; require "winetest.conf"; my $name0=$0; @@ -80,40 +80,6 @@ sub short_date($) } -# This should match the definitions in gather - -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %w2k8 = (name => "2008"); -my %win7 = (name => "Win7"); -my %win8 = (name => "Win8"); -my %win1507 = (name => "Win1507+"); -my %win1709 = (name => "Win1709+"); -my %win1909 = (name => "Win1909+"); -my %win10 = (name => "Win10"); -my %win10l = (name => "Win10L"); -my %unknown = (name => "Other"); -my %linux = (name => "Linux"); -my %mac = (name => "Mac"); -my %bsd = (name => "BSD"); -my %solaris = (name => "Solaris"); -my %wine = (name => "Wine"); - -# Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, - \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, - \%win1507, \%win1709, \%win1909, \%win10, \%win10l, - \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); - - # # Command line processing # diff --git a/winetest/gather b/winetest/gather index b4b9464e4..e00077792 100755 --- a/winetest/gather +++ b/winetest/gather @@ -32,7 +32,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb @groups/; require "winetest.conf"; my $name0=$0; @@ -126,57 +126,12 @@ sub short_date($) # errors The number of unit tests with errors. # todos The number of unit tests with no error but todos. -# This should match the definitions in build-index - -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %w2k8 = (name => "2008"); -my %win7 = (name => "Win7"); -my %win8 = (name => "Win8"); -my %win1507 = (name => "Win1507+"); -my %win1709 = (name => "Win1709+"); -my %win1909 = (name => "Win1909+"); -my %win10 = (name => "Win10"); -my %win10l = (name => "Win10L"); -my %unknown = (name => "Other"); -my %linux = (name => "Linux"); -my %mac = (name => "Mac"); -my %bsd = (name => "BSD"); -my %solaris = (name => "Solaris"); -my %wine = (name => "Wine"); - -# Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, - \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, - \%win1507, \%win1709, \%win1909, \%win10, \%win10l, - \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); - -# Map dissect's IDs to the above hashes -my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, - nt3 => \%nt3, nt4 => \%nt4, 2000 => \%w2k, - xp => \%xp, 2003 => \%w2k3, - vista => \%vista, 2008 => \%w2k8, - win7 => \%win7, - win8 => \%win8, win81 => \%win8, - win1507 => \%win1507, win1511 => \%win1507, - win1607 => \%win1507, win1703 => \%win1507, - win1709 => \%win1709, win1803 => \%win1709, - win1809 => \%win1709, win1903 => \%win1709, - win1909 => \%win1909, - win2004 => \%win10l, - win2009 => \%win10, - win10 => \%win10, # for backward compatibility - unknown => \%unknown, - wine => \%wine, linux => \%linux, mac => \%mac, - bsd => \%bsd, solaris => \%solaris); +# Map dissect's IDs to the platform groups +my %idmap; +foreach my $group (@groups) +{ + map { $idmap{$_} = $group } @{$group->{ids}}; +} # diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 1f587b3bc..3041cf7df 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -30,4 +30,31 @@ $patternbuilds = 10; # Probability above which a failure is considered to be fixed (0..1) $fixed_threshold = 0.99; +# Define how and in which order to group the platform results +@groups = ( + { name => "Win95", ids => [ "95" ] }, + { name => "Win98", ids => [ "98" ] }, + { name => "Me", ids => [ "me" ] }, + { name => "NT3", ids => [ "nt3" ] }, + { name => "NT4", ids => [ "nt4" ] }, + { name => "2000", ids => [ "2000" ] }, + { name => "XP", ids => [ "xp" ] }, + { name => "2003", ids => [ "2003" ] }, + { name => "Vista", ids => [ "vista" ] }, + { name => "2008", ids => [ "2008" ] }, + { name => "Win7", ids => [ "win7" ] }, + { name => "Win8", ids => [ "win8", "win81" ] }, + { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, + { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, + { name => "Win1909+", ids => [ "win1909" ] }, + { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility + { name => "Win10L", ids => [ "win2004" ] }, + { name => "Other", ids => [ "unknown" ] }, + { name => "Linux", ids => [ "linux" ] }, + { name => "Mac", ids => [ "mac" ] }, + { name => "BSD", ids => [ "bsd" ] }, + { name => "Solaris", ids => [ "solaris" ] }, + { name => "Wine", ids => [ "wine" ] }, +); + 1; # keep require happy -- 2.20.1

1 0

[PATCH] winemac.drv: Set view.WantsBestResolutionOpenGLSurface.
by Stefan Dösinger 11 May '21

11 May '21

This used to default to false before Catalina, and it still does so when the application is built with XCode 10 or earlier. When building with XCode 11 or later Catalina and newer will create a high DPI GL view even if the window is low dpi. Because we don't adjust glViewport parameters (and glDrawPixels, etc) we render only to the lower left quadrant. --- Vulkan via MoltenVK already works correctly. --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..29ac32d6be0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -685,6 +685,7 @@ - (void) setRetinaMode:(int)mode frame.size.width *= scale; frame.size.height *= scale; [self setFrame:frame]; + [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; [super setRetinaMode:mode]; @@ -3575,6 +3576,7 @@ macdrv_view macdrv_create_view(CGRect rect) [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; + [view setWantsBestResolutionOpenGLSurface:retina_on]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification -- 2.30.1 (Apple Git-130)

1 2

[tools] winetest/build-patterns: Identify commits indirectly related to a test unit.
by Francois Gouget 11 May '21

11 May '21

Some test units depend on files other than the main C source file such as resource file, JavaScript source, etc. Patches modifying these files could also impact the test results. Also tests may fail in Wine because of modifications to the Wine module rather than to the test. So report patches to any of these components, but hide the more indirect and numerous ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 144 ++++++++++++++++++++++++++++++++-------- winetest/report.css | 9 +++ 2 files changed, 127 insertions(+), 26 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index eb152c872..10cc0214c 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -312,6 +312,9 @@ my %reports; # by commit id. my %tests; +# A set containing the test units source files. +my %testsources; + foreach my $build (@sortedbuilds) { my $filename = "data/$build->{name}/testresults.txt"; @@ -360,6 +363,7 @@ foreach my $build (@sortedbuilds) name => $testname, source => $source, }; + $testsources{$source} = 1; } foreach my $statreps (@items) @@ -679,7 +683,34 @@ if (open(my $fh, "-|", $cmd)) foreach my $filename ($path1, $path2) { next if (!$filename); - $path2commits{$filename}->{$commit->{id}} = $commit; + + if ($filename =~ m~((?:dlls|programs)/([^/]+))/tests/([^/]+)\.c$~) + { + my ($moddir, $module, $unit) = ($1, $2, $3); + if ($tests{"$module:$unit"}) + { + $path2commits{$filename}->{$commit->{id}} = $commit; + } + else + { + # This C file is not the source for a test unit + # so it could impact any test in that directory + $path2commits{"$moddir/tests"}->{$commit->{id}} = $commit; + } + } + elsif ($filename =~ m~((?:dlls|programs)/[^/]+)/tests/~) + { + my $moddir = $1; + # This is not not a C file so it could impact any test in + # that directory + $path2commits{"$moddir/tests"}->{$commit->{id}} = $commit; + } + elsif ($filename =~ m~((?:dlls|programs)/[^/]+)/~) + { + my $moddir = $1; + $path2commits{$moddir}->{$commit->{id}} = $commit; + } + # ignore changes to other files } } else @@ -924,44 +955,85 @@ sub index2symbol($) return $symbols[$index % 62]; } +my %scope_descs = ( + U => "Modifies this test", + t => "Modifies a test resource (maybe for another test)", + m => "Modifies the module", +); + sub write_commits($$) { my ($html, $test) = @_; print $html "<div class='pattern'>"; my $i = 0; - my @symbuilds; + my (@udescs, @tmdescs); foreach my $build (@sortedbuilds) { - if ($test->{commits}->{$build->{name}}) - { - my $symbol = index2symbol($i++); - push @symbuilds, [$symbol, $build]; - printf $html "<a title='%s'>%s</a>", - short_date($build->{date}), $symbol; - } - else + my $buildcommits = $test->{commits}->{$build->{name}}; + if (!$buildcommits) { print $html " "; + next; } - } - print $html "</div> <i>← potentially related commits</i>\n"; - if (@symbuilds) - { - print $html "\n"; - foreach my $symbuild (@symbuilds) + my $symbol = index2symbol($i++); + my ($ucount, $tcount, $tmcount) = (0, 0, 0); + foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) { - my $first = 1; - my ($symbol, $build) = @$symbuild; - my $buildcommits = $test->{commits}->{$build->{name}}; - foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) + my $scope = "m"; + if ($path2commits{$test->{source}}->{$commit->{id}}) { - print $html $first ? "$symbol." : " "; - $first = undef; - printf $html " <a href='%s/commitdiff/%s' title='%s'>%s</a>\n", $gitweb, $commit->{id}, short_date($build->{date}), $commit->{summary}; + $scope = "U"; + } + else + { + my $testdir = $test->{source}; + $testdir =~ s~/[^/]+$~~; + if ($path2commits{$testdir}->{$commit->{id}}) + { + $scope = "t"; + $tcount++; + } + } + + my $desc = sprintf(" <a class='commit%s' title='%s'>%s</a> <a href='%s/commitdiff/%s' title='%s'>%s</a>", + $scope, $scope_descs{$scope}, $scope, + $gitweb, $commit->{id}, + short_date($build->{date}), + $commit->{summary}); + if ($scope eq "U") + { + push @udescs, ($ucount ? "\n " : "\n$symbol."), $desc; + $ucount++; + } + else + { + push @tmdescs, ($tmcount ? " " : "$symbol."), $desc, "\n"; + $tmcount++; } } + push @udescs, " <i>[+$tmcount in details]</i>" if ($ucount and $tmcount); + + my @impacts; + push @impacts, "this test" if ($ucount); + push @impacts, "test resources" if ($tcount); + push @impacts, "the module" if ($tmcount > $tcount); + my $scope = $ucount ? "U" : $tcount ? "t" : "m"; + my $count = $ucount + $tmcount; + printf $html "<a class='commit%s' title='%s : %s commit%s to %s'>%s</a>", + $scope, short_date($build->{date}), + $count, $count > 1 ? "s" : "", + join(", ", @impacts), $symbol; + } + print $html "</div> <i>← potentially related commits</i>\n"; + + print $html @udescs if (@udescs); + if (@tmdescs) + { + print $html "<details><summary>Test and module patch details</summary>"; + print $html @tmdescs; + print $html "</details>"; } } @@ -1012,6 +1084,18 @@ sub write_patterns_list($$$$) } } +sub add_path_commits($$) +{ + my ($commits, $path) = @_; + + return if (!$path2commits{$path}); + foreach my $commit (values %{$path2commits{$path}}) + { + my $buildname = $commit->{build}->{name}; + $commits->{$buildname}->{$commit->{id}} = $commit; + } +} + sub write_patterns_page($$$) { my ($pagereports, $subpage, $title) = (@_); @@ -1055,6 +1139,7 @@ EOF $test->{colors} = {}; $test->{commits} = {}; + my $has_wine_failures; my $first = @sortedbuilds; my $last = -1; my $fixed = 1; @@ -1073,6 +1158,8 @@ EOF $testreport->{first}; $last = $replast if ($replast > $last); + $has_wine_failures ||= $reports{$reportdir}->{is_wine}; + for my $i (0..@sortedbuilds-1) { my $build = $sortedbuilds[$i]; @@ -1103,10 +1190,15 @@ EOF "regular"; push @{$lists{$listid}->{testnames}}, $testname; - foreach my $commit (values %{$path2commits{$test->{source}}}) + add_path_commits($test->{commits}, $test->{source}); + # Also take into account commits to test resources + my $moddir = $test->{source}; + $moddir =~ s~/tests/[^/]+$~~; + add_path_commits($test->{commits}, "$moddir/tests"); + if ($has_wine_failures) { - my $buildname = $commit->{build}->{name}; - $test->{commits}->{$buildname}->{$commit->{id}} = $commit; + # In Wine any patch to the module could have caused the failures + add_path_commits($test->{commits}, $moddir); } } diff --git a/winetest/report.css b/winetest/report.css index 2cc466304..4c9197250 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -111,3 +111,12 @@ div.pattern :hover { color: black; text-decoration: underline; } .patL { /* error while getting the test list */ background-color: #80aaff; } + +.commitU { + font-weight: bold; +} +.committ { +} +.commitm { + font-style: italic; +} -- 2.20.1

1 0

Proposal for joining OSPP Summer Code 2021
by litimetal＠gmail.com 11 May '21

11 May '21

Hi all, Institute of Software Chinese Academy of Sciences[1] (ISCAS) and openEuler community are jointly organizing Summer 2021 of Open Source Promotion Plan (OSPP). This project[3] is very similar to Google Summer of Code (GSoC) and Outreachy[4]. OSPP opens to all projects with OSI-approved licenses, and worldwide students. When students finish their projects, both students and mentors will be paid. OSPP committee will process international wire transfers if needed[5]. One interesting point, OSPP is providing three different levels[6], with different awards (about USD 1.8k, 1.4k, 0.9k)[7]. That might make it easier to find projects/students (Thanks to Austin English to notice it) If we're going to participate in OSPP, we could reuse our GSoC page[8]. Our GSoC history[9] could also be a guide for new candidates. Obviously, new ideas are welcome. If an idea is interesting but too easy for GSoC, please consider sending it to OSPP with medium/low difficulty. Please send your questions/doubts/complaints/etc to wine-devel. If we're going to participate in OSPP 2021, I will submit the Wine community's application before May 20th (deadline for community). Disclaimer: I am not affiliated, associated, or endorsed by ISCAS/openEuler. [1]: http://english.is.cas.cn/au/ [2]: https://openeuler.org/en/ [3]: https://summer.iscas.ac.cn/help/en/ [4]: https://wiki.winehq.org/Outreachy [5]: https://summer.iscas.ac.cn/help/en/mentor/ [6]: https://summer.iscas.ac.cn/help/en/community/#how-to-set-project-difficulty… [7]: https://summer.iscas.ac.cn/help/en/student/ [8]: https://wiki.winehq.org/Summer_Of_Code [9]: https://wiki.winehq.org/Previous_Summers_of_Code [10]: (Chinese page) https://isrc.iscas.ac.cn/summer2020/#/announcement Sincerely,Zhenbo Li

4 6

[PATCH] dwrite: Check for allocation failures of glyph buffers.
by Nikolay Sivov 11 May '21

11 May '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 93d507cf3dc..89c76da0bb9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1190,6 +1190,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, *actual_glyph_count = 0; + if (!context.u.subst.glyphs || !context.u.subst.glyph_props || !context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_glyphs(&context, scriptprops->scripttags); if (SUCCEEDED(hr)) @@ -1199,6 +1205,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props)); } +failed: heap_free(context.u.subst.glyph_props); heap_free(context.u.subst.glyphs); heap_free(context.glyph_infos); @@ -1261,12 +1268,19 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; - context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gpos; + if (!context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); +failed: heap_free(context.glyph_infos); return hr; @@ -1331,12 +1345,19 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; - context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gpos; + if (!context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); +failed: heap_free(context.glyph_infos); return hr; @@ -1805,7 +1826,8 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna context.cache = fontface_get_shaping_cache(font_obj); context.language_tag = get_opentype_language(locale); - context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); + if (!(context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)))) + return E_OUTOFMEMORY; props = &dwritescripts_properties[sa.script]; @@ -2355,7 +2377,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping->ranges = heap_calloc(ranges_count, sizeof(*mapping->ranges)); memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); mapping->ranges_count = ranges_count; - mapping->families = heap_alloc_zero(sizeof(*mapping->families) * families_count); + mapping->families = heap_calloc(families_count, sizeof(*mapping->families)); mapping->families_count = families_count; for (i = 0; i < families_count; i++) mapping->families[i] = heap_strdupW(target_families[i]); -- 2.30.2

1 0

[PATCH 1/2] winevulkan: Allow some experimental VK extensions to be translated.
by Liam Middlebrook 11 May '21

11 May '21

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 76d5fa94155..201fe46d935 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -131,6 +131,13 @@ CORE_EXTENSIONS = [ "VK_KHR_win32_surface", ] +# Some experimental extensions are used by shipping applications so their API is extremely unlikely +# to change in a backwards-incompatible way. Allow translation of those extensions with WineVulkan. +ALLOWED_X_EXTENSIONS = [ + "VK_NVX_binary_import", + "VK_NVX_image_view_handle", +] + # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES @@ -3095,7 +3102,7 @@ class VkRegistry(object): # Disable highly experimental extensions as the APIs are unstable and can # change between minor Vulkan revisions until API is final and becomes KHR # or NV. - if "KHX" in ext_name or "NVX" in ext_name: + if ("KHX" in ext_name or "NVX" in ext_name) and ext_name not in ALLOWED_X_EXTENSIONS: LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) skipped_exts.append(ext_name) return -- 2.31.1

2 4

[PATCH v2] ws2_32: Check if waiting asyncs exist in WSARecv/WSASend
by Dongwan Kim 11 May '21

11 May '21

WSARecv call should not intercept message for the waiting overlapped WSARecv. To do that, We should know if waiting asyncs exist before trying ws2_recv/ws2_send. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ws2_32/socket.c | 31 +++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/protocol.def | 8 ++++++++ server/request.h | 8 ++++++++ server/sock.c | 26 ++++++++++++++++++++++++++ server/trace.c | 12 ++++++++++++ 6 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3a8bfa0ce41..cf76d96894c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2016,6 +2016,23 @@ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserv release_async_io( &wsa->io ); } +/* query if the socket has pending asyncs */ +static int WS_QueryAsyncWaiting( SOCKET sock, int type ) +{ + int result=0; + + SERVER_START_REQ( query_async_waiting ) + { + req->handle = wine_server_obj_handle( SOCKET2HANDLE(sock) ); + req->type = type; + wine_server_call(req); + result = reply->state; + } + SERVER_END_REQ; + return result; + +} + /*********************************************************************** * WS2_recv (INTERNAL) * @@ -5049,7 +5066,12 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } flags = convert_flags(dwFlags); - n = WS2_send( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s , ASYNC_TYPE_WRITE)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_send( fd, wsa, flags ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -6129,7 +6151,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, flags = convert_flags(wsa->flags); for (;;) { - n = WS2_recv( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s, ASYNC_TYPE_READ)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_recv( fd, wsa, flags ); if (n == -1) { /* Unix-like systems return EINVAL when attempting to read OOB data from diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f326d78bc3c..949e0cbda6e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5392,6 +5392,21 @@ struct get_next_thread_reply char __pad_12[4]; }; +struct query_async_waiting_request +{ + struct request_header __header; + obj_handle_t handle; + int type; + char __pad_20[4]; + +}; +struct query_async_waiting_reply +{ + struct reply_header __header; + int state; + char __pad_12[4]; +}; + enum request { @@ -5669,6 +5684,7 @@ enum request REQ_suspend_process, REQ_resume_process, REQ_get_next_thread, + REQ_query_async_waiting, REQ_NB_REQUESTS }; @@ -5950,6 +5966,7 @@ union generic_request struct suspend_process_request suspend_process_request; struct resume_process_request resume_process_request; struct get_next_thread_request get_next_thread_request; + struct query_async_waiting_request query_async_waiting_request; }; union generic_reply { @@ -6229,11 +6246,12 @@ union generic_reply struct suspend_process_reply suspend_process_reply; struct resume_process_reply resume_process_reply; struct get_next_thread_reply get_next_thread_reply; + struct query_async_waiting_reply query_async_waiting_reply; }; /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 698 +#define SERVER_PROTOCOL_VERSION 699 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index abfd6d70240..cab791bb089 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3700,3 +3700,11 @@ struct handle_info @REPLY obj_handle_t handle; /* next thread handle */ @END + +/* Query if there are waiting asyncs of the socket */ +@REQ(query_async_waiting) + obj_handle_t handle; /* socket handle */ + int type; /* async type */ +@REPLY + int state; /* waiting async exists */ +@END diff --git a/server/request.h b/server/request.h index ec5595bedf2..450667e9cf3 100644 --- a/server/request.h +++ b/server/request.h @@ -393,6 +393,7 @@ DECL_HANDLER(terminate_job); DECL_HANDLER(suspend_process); DECL_HANDLER(resume_process); DECL_HANDLER(get_next_thread); +DECL_HANDLER(query_async_waiting); #ifdef WANT_REQUEST_HANDLERS @@ -673,6 +674,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_suspend_process, (req_handler)req_resume_process, (req_handler)req_get_next_thread, + (req_handler)req_query_async_waiting, }; C_ASSERT( sizeof(abstime_t) == 8 ); @@ -2236,6 +2238,12 @@ C_ASSERT( FIELD_OFFSET(struct get_next_thread_request, flags) == 28 ); C_ASSERT( sizeof(struct get_next_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_thread_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_next_thread_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, type) == 16 ); +C_ASSERT( sizeof(struct query_async_waiting_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_reply, state) == 8 ); +C_ASSERT( sizeof(struct query_async_waiting_reply) == 16 ); + #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/sock.c b/server/sock.c index 36fda31f9c1..a2704a31287 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1889,3 +1889,29 @@ DECL_HANDLER(get_socket_info) release_object( &sock->obj ); } + +DECL_HANDLER( query_async_waiting ) +{ + struct sock *sock; + struct async *async; + reply->state = 0; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, + FILE_READ_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; + + if (is_fd_overlapped( sock->fd )) + { + if(req->type == ASYNC_TYPE_READ && ( async = find_pending_async(&sock->read_q) )) { + reply->state = 1; + release_object(async); + } + if(req->type == ASYNC_TYPE_WRITE && ( async = find_pending_async(&sock->write_q )) ) + { + reply->state = 1; + release_object(async); + } + } + release_object( &sock->obj ); + +} diff --git a/server/trace.c b/server/trace.c index 6b8c1ad3342..0787e717d09 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4450,6 +4450,15 @@ static void dump_get_next_thread_reply( const struct get_next_thread_reply *req { fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_query_async_waiting_request( const struct query_async_waiting_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", type=%d", req->type ); +} +static void dump_query_async_waiting_reply( const struct query_async_waiting_reply *req ) +{ + fprintf( stderr, " state=%d", req->state ); +} static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, @@ -4726,6 +4735,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_suspend_process_request, (dump_func)dump_resume_process_request, (dump_func)dump_get_next_thread_request, + (dump_func)dump_query_async_waiting_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5003,6 +5013,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_next_thread_reply, + (dump_func)dump_query_async_waiting_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5280,6 +5291,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "suspend_process", "resume_process", "get_next_thread", + "query_async_waiting", }; static const struct -- 2.30.2

2 1

[PATCH 1/5] server: Add process argument to find_rawinput_device.
by Rémi Bernon 11 May '21

11 May '21

And use it to find registered HID rawinput devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- server/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index b026c03e13d..3a37dd96385 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1489,11 +1489,11 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -static struct rawinput_device_entry *find_rawinput_device( unsigned short usage_page, unsigned short usage ) +static struct rawinput_device_entry *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) { struct rawinput_device_entry *e; - LIST_FOR_EACH_ENTRY( e, &current->process->rawinput_devices, struct rawinput_device_entry, entry ) + LIST_FOR_EACH_ENTRY( e, &process->rawinput_devices, struct rawinput_device_entry, entry ) { if (e->device.usage_page != usage_page || e->device.usage != usage) continue; return e; @@ -1506,7 +1506,7 @@ static void update_rawinput_device(const struct rawinput_device *device) { struct rawinput_device_entry *e; - if (!(e = find_rawinput_device( device->usage_page, device->usage ))) + if (!(e = find_rawinput_device( current->process, device->usage_page, device->usage ))) { if (!(e = mem_alloc( sizeof(*e) ))) return; list_add_tail( &current->process->rawinput_devices, &e->entry ); @@ -1669,6 +1669,7 @@ struct rawinput_message static int queue_rawinput_message( struct process* process, void *arg ) { const struct rawinput_message* raw_msg = arg; + const struct rawinput_device_entry *entry; const struct rawinput_device *device = NULL; struct desktop *target_desktop = NULL; struct thread *target_thread = NULL; @@ -1679,6 +1680,8 @@ static int queue_rawinput_message( struct process* process, void *arg ) device = process->rawinput_mouse; else if (raw_msg->data.rawinput.type == RIM_TYPEKEYBOARD) device = process->rawinput_kbd; + else if ((entry = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage_page, raw_msg->data.rawinput.hid.usage ))) + device = &entry->device; if (!device) return 0; if (process != raw_msg->foreground->process) @@ -3296,9 +3299,9 @@ DECL_HANDLER(update_rawinput_devices) update_rawinput_device(&devices[i]); } - e = find_rawinput_device( 1, 2 ); + e = find_rawinput_device( current->process, 1, 2 ); current->process->rawinput_mouse = e ? &e->device : NULL; - e = find_rawinput_device( 1, 6 ); + e = find_rawinput_device( current->process, 1, 6 ); current->process->rawinput_kbd = e ? &e->device : NULL; } -- 2.31.0

1 4

[PATCH 1/5] ws2_32/tests: Do not close the port passed to CreateIoCompletionPort separately from the port returned.
by Zebediah Figura 11 May '21

11 May '21

They are the same port handle. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 60 +++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 24259ad4cf2..885bfc2fd67 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5730,7 +5730,7 @@ static void test_ConnectEx(void) OVERLAPPED overlapped, *olp; LPFN_CONNECTEX pConnectEx; GUID connectExGuid = WSAID_CONNECTEX; - HANDLE previous_port, io_port; + HANDLE io_port; DWORD bytesReturned; char buffer[1024]; ULONG_PTR key; @@ -5853,10 +5853,7 @@ static void test_ConnectEx(void) address.sin_port = htons(1); - previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); - - io_port = CreateIoCompletionPort((HANDLE)connector, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)connector, NULL, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = SetFileCompletionNotificationModes((HANDLE)connector, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); @@ -5884,8 +5881,6 @@ static void test_ConnectEx(void) WSACloseEvent(overlapped.hEvent); closesocket(connector); - - CloseHandle(previous_port); } static void test_AcceptEx(void) @@ -7068,7 +7063,7 @@ todo_wine static void test_synchronous_WSAIoctl(void) { - HANDLE previous_port, io_port; + HANDLE io_port; WSAOVERLAPPED overlapped, *olp; SOCKET socket; ULONG on; @@ -7077,13 +7072,10 @@ static void test_synchronous_WSAIoctl(void) BOOL ret; int res; - previous_port = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 0, 0 ); - ok( previous_port != NULL, "failed to create completion port %u\n", GetLastError() ); - socket = WSASocketW( AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED ); ok( socket != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError() ); - io_port = CreateIoCompletionPort( (HANDLE)socket, previous_port, 0, 0 ); + io_port = CreateIoCompletionPort( (HANDLE)socket, NULL, 0, 0 ); ok( io_port != NULL, "failed to create completion port %u\n", GetLastError() ); on = 1; @@ -7096,7 +7088,6 @@ static void test_synchronous_WSAIoctl(void) CloseHandle( io_port ); closesocket( socket ); - CloseHandle( previous_port ); } /* @@ -7131,7 +7122,7 @@ static SOCKET setup_iocp_src(struct sockaddr_in *bindAddress) static void test_completion_port(void) { - HANDLE previous_port, io_port; + HANDLE io_port; WSAOVERLAPPED ov, *olp; SOCKET src, dest, dup, connector = INVALID_SOCKET; WSAPROTOCOL_INFOA info; @@ -7148,8 +7139,8 @@ static void test_completion_port(void) fd_set fds_recv; memset(buf, 0, sizeof(buf)); - previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + io_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( io_port != NULL, "Failed to create completion port %u\n", GetLastError()); memset(&ov, 0, sizeof(ov)); @@ -7164,7 +7155,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort( (HANDLE)dest, previous_port, 125, 0 ); + io_port = CreateIoCompletionPort( (HANDLE)dest, io_port, 125, 0 ); ok(io_port != NULL, "Failed to create completion port %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7218,7 +7209,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7263,7 +7254,7 @@ static void test_completion_port(void) ok(!iret, "WSASend failed - %d, last error %u\n", iret, GetLastError()); ok(num_bytes == sizeof(buf), "Managed to send %d\n", num_bytes); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7336,7 +7327,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7374,7 +7365,7 @@ static void test_completion_port(void) dest = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(dest != INVALID_SOCKET, "socket() failed\n"); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7421,7 +7412,7 @@ static void test_completion_port(void) ok(bret == FALSE, "AcceptEx returned %d\n", bret); ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); closesocket(src); @@ -7457,7 +7448,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7499,7 +7490,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7557,7 +7548,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7623,7 +7614,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7678,7 +7669,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); closesocket(src); @@ -7702,10 +7693,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7759,10 +7750,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7821,10 +7812,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7864,10 +7855,9 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - closesocket(src); closesocket(connector); - CloseHandle(previous_port); + CloseHandle(io_port); } static void test_address_list_query(void) -- 2.30.2

2 7

[PATCH 7/7 v2] msvcrt: Implement llrintf using rintf function.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 9 insertions(+), 16 deletions(-)

1 0

[PATCH 6/7 v2] msvcrt: Implement llrint using rint function.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 9 insertions(+), 16 deletions(-)

1 0

[PATCH 5/7 v2] msvcrt: Implement lrintf using rintf function.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 9 insertions(+), 16 deletions(-)

1 0

[PATCH 4/7 v2] msvcrt: Implement lrint using rint function.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 9 insertions(+), 16 deletions(-)

1 0

[PATCH 3/7 v2] msvcrt: Import rintf implementation from musl.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 19 ++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 18 insertions(+), 16 deletions(-)

1 0

[PATCH 2/7 v2] msvcrt: Import rint implementation from musl.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 31 ++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 30 insertions(+), 16 deletions(-)

1 0

[PATCH 1/7 v2] msvcrt: Don't compalie msvcr120 math functions in older versions.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fixed range check in patches 4-7 dlls/msvcrt/math.c | 64 +++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-)

1 0

[PATCH 4/7] msvcrt: Implement lrint using rint function.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 9 ++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 8 insertions(+), 16 deletions(-)

1 1

[PATCH 1/2] ntdll/tests: Check that creating huge thread stacks should work.
by Rémi Bernon 10 May '21

10 May '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not completely sure what 789c1db18a4e192425da3771cac4726cda77130b was for, but it seems to be causing spurious failures. This fix is trying to keep the current behavior, but it may be better to completely revert the commit as, although less likely, TEB allocation could also fail much more often. dlls/ntdll/tests/virtual.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 8f5b0092bea..686b4076801 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -488,6 +488,11 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) return 0; } +static DWORD WINAPI test_stack_size_dummy_thread(void *ptr) +{ + return 0; +} + static void test_RtlCreateUserStack(void) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); @@ -563,6 +568,11 @@ static void test_RtlCreateUserStack(void) thread = CreateThread(NULL, 0x3ff000, test_stack_size_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + + thread = CreateThread(NULL, 0x80000000, test_stack_size_dummy_thread, NULL, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + todo_wine ok(thread != NULL, "CreateThread with huge stack failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); } static void test_NtMapViewOfSection(void) -- 2.31.0

3 11

[PATCH 6/7] msvcrt: Implement llrint using rint function.
by Piotr Caban 10 May '21

10 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 9 ++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 8 insertions(+), 16 deletions(-)

2 1

[PATCH v2 1/5] server: Avoid calling get_unix_fd() in IOCTL_AFD_CREATE.
by Zebediah Figura 10 May '21

10 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 36fda31f9c1..24a826e4ce5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1087,7 +1087,6 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u return -1; } sock_reselect( sock ); - clear_error(); return 0; } @@ -1354,7 +1353,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); - if (get_unix_fd( fd ) == -1 && code != IOCTL_AFD_CREATE) return 0; + if (code != IOCTL_AFD_CREATE && get_unix_fd( fd ) < 0) return 0; switch(code) { -- 2.30.2

2 5

[PATCH] winex11.drv: Initialize areas outside of the window to black when copying the surface.
by Giovanni Mascellani 10 May '21

10 May '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winex11.drv/bitblt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index fad183b0b01..ffa2c319210 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1364,6 +1364,9 @@ DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, /* use a temporary pixmap to avoid the BadMatch error */ Pixmap pixmap = XCreatePixmap( gdi_display, root_window, width, height, vis.depth ); GC gc = XCreateGC( gdi_display, pixmap, 0, NULL ); + int black = BlackPixel( gdi_display, DefaultScreen(gdi_display) ); + XSetForeground( gdi_display, gc, black ); + XFillRectangle( gdi_display, pixmap, gc, 0, 0, width, height ); XSetGraphicsExposures( gdi_display, gc, False ); XCopyArea( gdi_display, physdev->drawable, pixmap, gc, -- 2.31.1

1 0

[PATCH vkd3d v2 1/7] vkd3d-shader: Rename name_offset to name_bytecode_offset.
by Zebediah Figura 10 May '21

10 May '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: No changes. libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3dc7a26b..0c755f46 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -136,9 +136,9 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; const char *semantic; - unsigned int reg_offset; - unsigned int name_offset; + + unsigned int name_bytecode_offset; }; struct hlsl_reg diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 1b5e8a27..2c07171b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1051,7 +1051,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ { LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - field->name_offset = buffer->count; + field->name_bytecode_offset = buffer->count; put_string(buffer, field->name); write_sm1_type(buffer, field->type, ctab_start); } @@ -1060,7 +1060,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - put_dword(buffer, (field->name_offset - ctab_start) * sizeof(*buffer->data)); + put_dword(buffer, (field->name_bytecode_offset - ctab_start) * sizeof(*buffer->data)); put_dword(buffer, (field->type->bytecode_offset - ctab_start) * sizeof(*buffer->data)); ++field_count; } -- 2.31.1

5 23

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