October 2021 - Wine-Commits

Jan Sikorski : dxgi: Don't grab wined3d lock for wined3d_resource_map/unmap().
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 98e2668949f8a75be56891593103942f23a2cc56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98e2668949f8a75be5689159… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:21 2021 +0200 dxgi: Don't grab wined3d lock for wined3d_resource_map/unmap(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 4b1b83b84a9..ad2c0d7ff1e 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -196,14 +196,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAP if (flags & DXGI_MAP_DISCARD) wined3d_map_flags |= WINED3D_MAP_DISCARD; - wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0, &wined3d_map_desc, NULL, wined3d_map_flags))) { mapped_rect->Pitch = wined3d_map_desc.row_pitch; mapped_rect->pBits = wined3d_map_desc.data; } - wined3d_mutex_unlock(); return hr; } @@ -213,11 +211,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0); - wined3d_mutex_unlock(); - return S_OK; }

1 0

Zebediah Figura : d3d11/tests: Test deleting a stream output buffer immediately after drawing into it.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 349d0d9cd42ce28880d188c66084c0c933134bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=349d0d9cd42ce28880d188c6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 18 11:02:01 2021 -0500 d3d11/tests: Test deleting a stream output buffer immediately after drawing into it. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eb8cde40dcc..bd16d7ab8b8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26582,8 +26582,8 @@ static void test_fl10_stream_output_desc(void) static void test_stream_output_resume(void) { + ID3D11Buffer *cb, *so_buffer, *so_buffer2, *buffer; struct d3d11_test_context test_context; - ID3D11Buffer *cb, *so_buffer, *buffer; unsigned int i, j, idx, offset; ID3D11DeviceContext *context; struct resource_readback rb; @@ -26663,16 +26663,22 @@ static void test_stream_output_resume(void) cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constants[0]), &constants[0]); so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); + so_buffer2 = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); ID3D11DeviceContext_GSSetConstantBuffers(context, 0, 1, &cb); - offset = 0; - ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.x); check_texture_color(test_context.backbuffer, 0xffffffff, 0); + /* Draw into a SO buffer and then immediately destroy it, to make sure that + * wined3d doesn't try to rebind transform feedback buffers while transform + * feedback is active. */ + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer2, &offset); + draw_color_quad(&test_context, &red); + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + ID3D11Buffer_Release(so_buffer2); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xffffffff, 0);

1 0

Nikolay Sivov : d3d11: Correctly handle optional arguments in OMGetDepthStencilState().
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 3b860a0378b76a80f5a5fca771a0029bb30e7800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b860a0378b76a80f5a5fca7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 19 09:05:00 2021 +0300 d3d11: Correctly handle optional arguments in OMGetDepthStencilState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 11 +++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++++++----------- dlls/d3d11/tests/d3d11.c | 10 ++++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 85e453c8474..6ec398269fa 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5696,6 +5696,17 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D10DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D10Device_OMGetDepthStencilState(device, NULL, NULL); + stencil_ref = 0; + ID3D10Device_OMGetDepthStencilState(device, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D10Device_OMGetDepthStencilState(device, &tmp_ds_state, NULL); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D10DepthStencilState_Release(tmp_ds_state); + ID3D10Device_OMGetRenderTargets(device, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 248634a245d..6d125e06ace 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2216,19 +2216,25 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetDepthStencilState(ID3D11 struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_depth_stencil_state *wined3d_state; struct d3d_depthstencil_state *state_impl; + UINT stencil_ref_tmp; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref))) + if (!stencil_ref) stencil_ref = &stencil_ref_tmp; + wined3d_state = wined3d_device_context_get_depth_stencil_state(context->wined3d_context, stencil_ref); + if (depth_stencil_state) { - state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); - ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); - } - else - { - *depth_stencil_state = NULL; + if (wined3d_state) + { + state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); + ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); + } + else + { + *depth_stencil_state = NULL; + } } wined3d_mutex_unlock(); } @@ -5554,7 +5560,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); - ID3D11DepthStencilState *d3d11_iface; + ID3D11DepthStencilState *d3d11_iface = NULL; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); @@ -5562,10 +5568,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 d3d11_device_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_iface, stencil_ref); + if (depth_stencil_state) + { + if (d3d11_iface) + { + *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + } + else + *depth_stencil_state = NULL; + } + if (d3d11_iface) - *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; - else - *depth_stencil_state = NULL; + ID3D11DepthStencilState_Release(d3d11_iface); } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bd16d7ab8b8..553caa10e46 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12599,6 +12599,16 @@ static void test_clear_state(void) ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + /* For OMGetDepthStencilState() both arguments are optional. */ + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, NULL); + stencil_ref = 0; + ID3D11DeviceContext_OMGetDepthStencilState(context, NULL, &stencil_ref); + ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); + tmp_ds_state = NULL; + ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); + ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); + ID3D11DepthStencilState_Release(tmp_ds_state); + ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) {

1 0

Eric Pouech : dbghelp: Use wide string literals.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: d3a876f172a86f9c1c3c07052a8666d66fe520c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3a876f172a86f9c1c3c0705… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:50:54 2021 +0200 dbghelp: Use wide string literals. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 10 ++++------ dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/elf_module.c | 8 ++------ dlls/dbghelp/macho_module.c | 15 +++++---------- dlls/dbghelp/minidump.c | 3 +-- dlls/dbghelp/module.c | 34 +++++++++++----------------------- dlls/dbghelp/path.c | 19 ++++++------------- dlls/dbghelp/symbol.c | 8 +++----- 8 files changed, 32 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3a876f172a86f9c1c3c…

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d deferred context functions.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 713d6558dbd059598ff423a19e93bf318120803d URL: https://source.winehq.org/git/wine.git/?a=commit;h=713d6558dbd059598ff423a1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:18 2021 +0200 d3d11: Don't grab wined3d lock for wined3d deferred context functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 67264e1d862..8d88ee26222 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2704,8 +2704,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_FinishCommandList(ID3D11De if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_mutex_lock(); - if (FAILED(hr = wined3d_deferred_context_record_command_list(context->wined3d_context, !!restore, &object->wined3d_list))) { @@ -2714,8 +2712,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_FinishCommandList(ID3D11De return hr; } - wined3d_mutex_unlock(); - object->ID3D11CommandList_iface.lpVtbl = &d3d11_command_list_vtbl; object->refcount = 1; object->device = &context->device->ID3D11Device2_iface; @@ -3687,15 +3683,12 @@ static HRESULT d3d11_deferred_context_create(struct d3d_device *device, return E_OUTOFMEMORY; d3d11_device_context_init(object, device, D3D11_DEVICE_CONTEXT_DEFERRED); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_deferred_context_create(device->wined3d_device, &object->wined3d_context))) { WARN("Failed to create wined3d deferred context, hr %#x.\n", hr); heap_free(object); - wined3d_mutex_unlock(); return hr; } - wined3d_mutex_unlock(); TRACE("Created deferred context %p.\n", object); *context = object;

1 0

Eric Pouech : dbghelp: Start implementing StackWalkEx.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: bef7e1f202d9676256ad8e187d83ce0b468b9614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bef7e1f202d9676256ad8e18… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 19 15:51:18 2021 +0200 dbghelp: Start implementing StackWalkEx. Simple copy of StackWalk implementation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/stack.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index e45ac48acb2..e96c2e0d3fd 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -32,7 +32,7 @@ @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) -@ stub StackWalkEx +@ stdcall StackWalkEx(long long long ptr ptr ptr ptr ptr ptr long) @ stub SymAddSourceStream @ stub SymAddSourceStreamA @ stub SymAddSourceStreamW diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index d04c0163c92..6c70fc805cb 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -245,6 +245,81 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, return TRUE; } +/* all the fields of STACKFRAME64 are present in STACKFRAME_EX at same offset + * So casting down a STACKFRAME_EX into a STACKFRAME64 is valid! + */ +C_ASSERT(sizeof(STACKFRAME64) == FIELD_OFFSET(STACKFRAME_EX, StackFrameSize)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrPC) == FIELD_OFFSET(STACKFRAME_EX, AddrPC)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrReturn) == FIELD_OFFSET(STACKFRAME_EX, AddrReturn)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrFrame) == FIELD_OFFSET(STACKFRAME_EX, AddrFrame)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrStack) == FIELD_OFFSET(STACKFRAME_EX, AddrStack)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, AddrBStore) == FIELD_OFFSET(STACKFRAME_EX, AddrBStore)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, FuncTableEntry) == FIELD_OFFSET(STACKFRAME_EX, FuncTableEntry)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Params) == FIELD_OFFSET(STACKFRAME_EX, Params)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Far) == FIELD_OFFSET(STACKFRAME_EX, Far)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Virtual) == FIELD_OFFSET(STACKFRAME_EX, Virtual)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, Reserved) == FIELD_OFFSET(STACKFRAME_EX, Reserved)); +C_ASSERT(FIELD_OFFSET(STACKFRAME64, KdHelp) == FIELD_OFFSET(STACKFRAME_EX, KdHelp)); + +/*********************************************************************** + * StackWalkEx (DBGHELP.@) + */ +BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread, + LPSTACKFRAME_EX frame, PVOID ctx, + PREAD_PROCESS_MEMORY_ROUTINE64 f_read_mem, + PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, + PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, + PTRANSLATE_ADDRESS_ROUTINE64 f_xlat_adr, + DWORD flags) +{ + struct cpu_stack_walk csw; + struct cpu* cpu; + + TRACE("(%d, %p, %p, %p, %p, %p, %p, %p, %p, 0x%x)\n", + MachineType, hProcess, hThread, frame, ctx, + f_read_mem, FunctionTableAccessRoutine, + GetModuleBaseRoutine, f_xlat_adr, flags); + + if (!(cpu = cpu_find(MachineType))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (frame->StackFrameSize != sizeof(*frame)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (flags != 0) + { + FIXME("Unsupported yet flags 0x%x\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (frame->InlineFrameContext != INLINE_FRAME_CONTEXT_IGNORE) + { + FIXME("Inlined contexts are not supported yet\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + csw.hProcess = hProcess; + csw.hThread = hThread; + csw.is32 = FALSE; + csw.cpu = cpu; + /* sigh... MS isn't even consistent in the func prototypes */ + csw.u.s64.f_read_mem = (f_read_mem) ? f_read_mem : read_mem64; + csw.u.s64.f_xlat_adr = (f_xlat_adr) ? f_xlat_adr : addr_to_linear; + csw.u.s64.f_tabl_acs = (FunctionTableAccessRoutine) ? FunctionTableAccessRoutine : SymFunctionTableAccess64; + csw.u.s64.f_modl_bas = (GetModuleBaseRoutine) ? GetModuleBaseRoutine : SymGetModuleBase64; + + if (!cpu->stack_walk(&csw, (STACKFRAME64*)frame, ctx)) return FALSE; + + /* we don't handle KdHelp */ + + return TRUE; +} + /****************************************************************** * SymRegisterFunctionEntryCallback (DBGHELP.@) *

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_execute_command_list().
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 9457c8d172c450e64df15a9cd5fd824b34139b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9457c8d172c450e64df15a9c… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:17 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_execute_command_list(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6d125e06ace..67264e1d862 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1519,9 +1519,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_ExecuteCommandList(ID3D11Devi TRACE("iface %p, command_list %p, restore_state %#x.\n", iface, command_list, restore_state); - wined3d_mutex_lock(); wined3d_device_context_execute_command_list(context->wined3d_context, list_impl->wined3d_list, !!restore_state); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_HSSetShaderResources(ID3D11DeviceContext1 *iface,

1 0

Alexandre Julliard : libs: Import upstream code from libtiff 4.3.0.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 913dad521fd6a8aa9e2ac487e850da99e56e12db URL: https://source.winehq.org/git/wine.git/?a=commit;h=913dad521fd6a8aa9e2ac487… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 10:54:32 2021 +0200 libs: Import upstream code from libtiff 4.3.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 + configure.ac | 2 + libs/tiff/COPYRIGHT | 21 + libs/tiff/Makefile.in | 34 + libs/tiff/libtiff/t4.h | 290 ++ libs/tiff/libtiff/tif_aux.c | 419 +++ libs/tiff/libtiff/tif_close.c | 138 + libs/tiff/libtiff/tif_codec.c | 171 + libs/tiff/libtiff/tif_compress.c | 302 ++ libs/tiff/libtiff/tif_config.h | 163 + libs/tiff/libtiff/tif_dir.c | 1835 +++++++++++ libs/tiff/libtiff/tif_dir.h | 317 ++ libs/tiff/libtiff/tif_dirinfo.c | 1251 ++++++++ libs/tiff/libtiff/tif_dirread.c | 6495 ++++++++++++++++++++++++++++++++++++++ libs/tiff/libtiff/tif_dirwrite.c | 3738 ++++++++++++++++++++++ libs/tiff/libtiff/tif_dumpmode.c | 133 + libs/tiff/libtiff/tif_error.c | 86 + libs/tiff/libtiff/tif_fax3.c | 1597 ++++++++++ libs/tiff/libtiff/tif_fax3.h | 567 ++++ libs/tiff/libtiff/tif_fax3sm.c | 1261 ++++++++ libs/tiff/libtiff/tif_flush.c | 174 + libs/tiff/libtiff/tif_jpeg.c | 2603 +++++++++++++++ libs/tiff/libtiff/tif_luv.c | 1749 ++++++++++ libs/tiff/libtiff/tif_lzw.c | 1218 +++++++ libs/tiff/libtiff/tif_next.c | 187 ++ libs/tiff/libtiff/tif_open.c | 742 +++++ libs/tiff/libtiff/tif_packbits.c | 309 ++ libs/tiff/libtiff/tif_pixarlog.c | 1480 +++++++++ libs/tiff/libtiff/tif_predict.c | 879 ++++++ libs/tiff/libtiff/tif_predict.h | 81 + libs/tiff/libtiff/tif_read.c | 1556 +++++++++ libs/tiff/libtiff/tif_strip.c | 352 +++ libs/tiff/libtiff/tif_swab.c | 310 ++ libs/tiff/libtiff/tif_thunder.c | 197 ++ libs/tiff/libtiff/tif_tile.c | 299 ++ libs/tiff/libtiff/tif_warning.c | 87 + libs/tiff/libtiff/tif_win32.c | 437 +++ libs/tiff/libtiff/tif_write.c | 857 +++++ libs/tiff/libtiff/tif_zip.c | 700 ++++ libs/tiff/libtiff/tiff.h | 814 +++++ libs/tiff/libtiff/tiffconf.h | 128 + libs/tiff/libtiff/tiffio.h | 574 ++++ libs/tiff/libtiff/tiffiop.h | 448 +++ libs/tiff/libtiff/tiffvers.h | 9 + libs/tiff/libtiff/uvcode.h | 180 ++ 45 files changed, 35215 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=913dad521fd6a8aa9e2a…

1 0

Alexandre Julliard : windowscodecs: Use the bundled libjpeg.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: a6ac035a7454c92bec367b2cd3021f8b98d4d807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ac035a7454c92bec367b2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 19 10:51:56 2021 +0200 windowscodecs: Use the bundled libjpeg. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 4 +- dlls/windowscodecs/libjpeg.c | 155 +++++------------------------------------ dlls/windowscodecs/main.c | 4 +- dlls/windowscodecs/unix_lib.c | 6 -- 4 files changed, 22 insertions(+), 147 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6ac035a7454c92bec36…

1 0

Alex Henrie : ws2_32/tests: Correct name of IPV6_V6ONLY socket option in messages.
by Alexandre Julliard Oct. 19, 2021

Oct. 19, 2021

Module: wine Branch: master Commit: 04f78cb5d0138a1a2ed713673eb4f357ef3a4896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04f78cb5d0138a1a2ed71367… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 18 23:19:44 2021 -0600 ws2_32/tests: Correct name of IPV6_V6ONLY socket option in messages. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 63f8149f160..02713a7c625 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5650,7 +5650,7 @@ static void test_ipv6only(void) enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); @@ -5662,26 +5662,26 @@ static void test_ipv6only(void) todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(!ret, "setsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "setsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); /* bind on IPv4 socket should succeed - IPV6_V6ONLY is enabled by default */ ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); @@ -5690,26 +5690,26 @@ todo_wine { todo_wine { enabled = 2; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 0; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); todo_wine { enabled = 0; ret = getsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(enabled == 1, "expected 1, got %d\n", enabled); } enabled = 1; len = sizeof(enabled); ret = setsockopt(v4, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); - ok(ret, "setsockopt(IPV6_ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); + ok(ret, "setsockopt(IPV6_V6ONLY) succeeded (LastError: %d)\n", WSAGetLastError()); closesocket(v4); closesocket(v6); @@ -5728,7 +5728,7 @@ todo_wine { enabled = 2; ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "expected 0, got %d\n", enabled); /* @@ -5749,7 +5749,7 @@ todo_wine { enabled = 2; len = sizeof(enabled); getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); - ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!ret, "getsockopt(IPV6_V6ONLY) failed (LastError: %d)\n", WSAGetLastError()); ok(!enabled, "IPV6_V6ONLY is enabled after bind\n"); v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);

1 0