October 2021 - Wine-Commits

Conor McCarthy : tests: Test a UINT_MAX layer count in test_clear_unordered_access_view_image().
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: e3495613fbb52b343dd1263a86880c4a5298c879 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3495613fbb52b343dd1263… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:14 2021 +0200 tests: Test a UINT_MAX layer count in test_clear_unordered_access_view_image(). Testing without the fixes in vkd3d_create_texture_uav() has nasty results in radv and possibly others. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d1337e2..ac1e24d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5014,6 +5014,8 @@ static void test_clear_unordered_access_view_image(void) {0x3f000000, 0, 0, 0}, 0x3f000000, true}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, + /* Test clearing a UINT_MAX layer count. */ + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, UINT_MAX, 0, {}, {1, 0, 0, 0}, 1}, /* Test a single clear rect. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, {1, 0, 0, 0}, 1},

1 0

Conor McCarthy : vkd3d: Normalise layer counts in d3d12_dsv_desc_create_dsv().
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: 3f6f615e50a096e00c2c8fdbd49af42e47ff1e87 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3f6f615e50a096e00c2c8fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:12 2021 +0200 vkd3d: Normalise layer counts in d3d12_dsv_desc_create_dsv(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 30d7d2c..bf01a64 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3296,6 +3296,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_DSV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3304,6 +3305,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension);

1 0

Conor McCarthy : vkd3d-shader/spirv: Correctly handle bit shifts greater than 31 bits.
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: 85def272ae4793698cfdfc76a847311b43988f12 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=85def272ae4793698cfdfc7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:09 2021 +0200 vkd3d-shader/spirv: Correctly handle bit shifts greater than 31 bits. This is undefined behaviour in SPIR-V, but well-defined in Direct3D, so we should explicitly 'and' the shift amount with 31. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ebaf163..58bf3d9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6840,6 +6840,21 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler for (i = 0; i < instruction->src_count; ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); + /* The SPIR-V specification states, "The resulting value is undefined if + * Shift is greater than or equal to the bit width of the components of + * Base." Direct3D applies only the lowest 5 bits of the shift. + * + * Microsoft fxc will compile immediate constants larger than 5 bits. + * Fixing up the constants would be more elegant, but the simplest way is + * to let this handle constants too. */ + if (instruction->handler_idx == VKD3DSIH_ISHL || instruction->handler_idx == VKD3DSIH_ISHR + || instruction->handler_idx == VKD3DSIH_USHR) + { + uint32_t mask_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, + VKD3D_SHADER_COMPONENT_UINT, vkd3d_write_mask_component_count(dst->write_mask), 0x1f); + src_ids[1] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[1], mask_id); + } + val_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, instruction->src_count); if (instruction->flags & VKD3DSI_PRECISE_XYZW)

1 0

Henri Verbeet : vkd3d: Normalise layer counts in d3d12_desc_create_srv().
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: 8577747879bcab16101ad0bdeb964a95195c4878 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8577747879bcab16101ad0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 18:31:13 2021 +0200 vkd3d: Normalise layer counts in d3d12_desc_create_srv(). I'm not aware of any issue caused by not normalising SRV layer counts, but this makes it consistent with the other view types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bf01a64..d6e5d4b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2753,6 +2753,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -2761,6 +2762,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; @@ -2783,10 +2785,11 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; vkd3d_desc.layer_count = desc->u.TextureCubeArray.NumCubes; - if (vkd3d_desc.layer_count != VK_REMAINING_ARRAY_LAYERS) + if (vkd3d_desc.layer_count != UINT_MAX) vkd3d_desc.layer_count *= 6; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension);

1 0

Conor McCarthy : vkd3d: Normalise layer counts in vkd3d_create_texture_uav().
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: bec4f0a85ecd3ee6e1f7bbae5dd8545170507f20 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bec4f0a85ecd3ee6e1f7bba… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:10 2021 +0200 vkd3d: Normalise layer counts in vkd3d_create_texture_uav(). Passing UINT_MAX as layer count to Direct3D behaves similar to passing VK_REMAINING_ARRAY_LAYERS to Vulkan. Since these have the same value, everything usually works out even without normalisation. However, there are some exceptions; for example, we calculate workgroup counts for UAV clears from layer counts using vkd3d_compute_workgroup_count(), which doesn't handle UINT_MAX. Normalising layer counts during view creation avoids having to handle this issue in the rest of the code. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a51f579..854e73a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2477,6 +2477,27 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } +static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *desc, + const D3D12_RESOURCE_DESC *resource_desc) +{ + unsigned int max_layer_count = resource_desc->DepthOrArraySize; + + if (desc->layer_idx >= max_layer_count) + { + WARN("Layer index %u exceeds maximum available layer %u.\n", desc->layer_idx, max_layer_count - 1); + desc->layer_count = 1; + return; + } + + max_layer_count -= desc->layer_idx; + if (desc->layer_count <= max_layer_count) + return; + + if (desc->layer_count != UINT_MAX) + WARN("Layer count %u exceeds maximum %u.\n", desc->layer_count, max_layer_count); + desc->layer_count = max_layer_count; +} + bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -2920,6 +2941,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D;

1 0

Conor McCarthy : vkd3d: Normalise layer counts in d3d12_rtv_desc_create_rtv().
by Alexandre Julliard Oct. 12, 2021

Oct. 12, 2021

Module: vkd3d Branch: master Commit: 4c07252da6c9b8779e3d09c8000a31ad87f1116f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c07252da6c9b8779e3d09c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:11 2021 +0200 vkd3d: Normalise layer counts in d3d12_rtv_desc_create_rtv(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 854e73a..30d7d2c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2480,7 +2480,19 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *desc, const D3D12_RESOURCE_DESC *resource_desc) { - unsigned int max_layer_count = resource_desc->DepthOrArraySize; + unsigned int max_layer_count; + + if (resource_desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + if (desc->view_type == VK_IMAGE_VIEW_TYPE_2D_ARRAY) + max_layer_count = max(1, resource_desc->DepthOrArraySize >> desc->miplevel_idx); + else + max_layer_count = 1; + } + else + { + max_layer_count = resource_desc->DepthOrArraySize; + } if (desc->layer_idx >= max_layer_count) { @@ -3186,6 +3198,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3194,12 +3207,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension);

1 0

Jan Sikorski : wined3d: Use atomic instructions for resource view bind counts.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: dfeded6460ce067fe1c0540306c2964a170bed2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeded6460ce067fe1c05403… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:27 2021 +0200 wined3d: Use atomic instructions for resource view bind counts. 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/wined3d/wined3d_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 657b6acee39..56c90ba6606 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4157,8 +4157,8 @@ struct wined3d_resource struct list resource_list_entry; - uint32_t srv_bind_count_device; - uint32_t rtv_bind_count_device; + int32_t srv_bind_count_device; + int32_t rtv_bind_count_device; }; static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) @@ -6329,22 +6329,22 @@ static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarge static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) { - ++srv->resource->srv_bind_count_device; + InterlockedIncrement(&srv->resource->srv_bind_count_device); } static inline void wined3d_srv_bind_count_dec(struct wined3d_shader_resource_view *srv) { - --srv->resource->srv_bind_count_device; + InterlockedDecrement(&srv->resource->srv_bind_count_device); } static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) { - ++rtv->resource->rtv_bind_count_device; + InterlockedIncrement(&rtv->resource->rtv_bind_count_device); } static inline void wined3d_rtv_bind_count_dec(struct wined3d_rendertarget_view *rtv) { - --rtv->resource->rtv_bind_count_device; + InterlockedDecrement(&rtv->resource->rtv_bind_count_device); } static inline bool wined3d_rtv_overlaps_srv(const struct wined3d_rendertarget_view *rtv,

1 0

Jan Sikorski : wined3d: Make wined3d_device_context procedures thread safe.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 6d2d43bb057958890745b8ecc2811b24a28df8d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2d43bb057958890745b8ec… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:25 2021 +0200 wined3d: Make wined3d_device_context procedures thread safe. 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/wined3d/cs.c | 13 ++++++ dlls/wined3d/device.c | 123 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 118 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d2d43bb057958890745…

1 0

Jacek Caban : win32u: Use syscall interface for some mapping functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 21009822a38ad4b670cdfdb2c0719126af30bda6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21009822a38ad4b670cdfdb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:50:37 2021 +0200 win32u: Use syscall interface for some mapping functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/gdi.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 4 +++- 7 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 046ccffdc17..0c355f4d94c 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1176,7 +1176,6 @@ static struct unix_funcs unix_funcs = NtGdiSetMagicColors, NtGdiSetPixel, NtGdiSetSystemPaletteUse, - NtGdiSetVirtualResolution, NtGdiStartDoc, NtGdiStartPage, NtGdiStretchBlt, @@ -1184,7 +1183,6 @@ static struct unix_funcs unix_funcs = NtGdiStrokeAndFillPath, NtGdiStrokePath, NtGdiTransparentBlt, - NtGdiTransformPoints, NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5f664da96c7..984e7b13e7a 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -78,7 +78,9 @@ static void * const syscalls[] = NtGdiSetPixelFormat, NtGdiSetRectRgn, NtGdiSetTextJustification, + NtGdiSetVirtualResolution, NtGdiSwapBuffers, + NtGdiTransformPoints, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 02030d15418..8874894d4e7 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -617,7 +617,7 @@ @ stdcall NtGdiSetSystemPaletteUse(long long) @ stdcall -syscall NtGdiSetTextJustification(long long long) @ stub NtGdiSetUMPDSandboxState -@ stdcall NtGdiSetVirtualResolution(long long long long long) +@ stdcall -syscall NtGdiSetVirtualResolution(long long long long long) @ stdcall NtGdiStartDoc(long ptr ptr long) @ stdcall NtGdiStartPage(long) @ stdcall NtGdiStretchBlt(long long long long long long long long long long long long) @@ -625,7 +625,7 @@ @ stdcall NtGdiStrokeAndFillPath(long) @ stdcall NtGdiStrokePath(long) @ stdcall -syscall NtGdiSwapBuffers(long) -@ stdcall NtGdiTransformPoints(long ptr ptr long long) +@ stdcall -syscall NtGdiTransformPoints(long ptr ptr long long) @ stdcall NtGdiTransparentBlt(long long long long long long long long long long long) @ stub NtGdiUMPDEngFreeUserMem @ stub NtGdiUnloadPrinterDriver diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c4e32ced460..ff956dbf167 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -193,8 +193,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiSetMagicColors)( HDC hdc, DWORD magic, ULONG index ); COLORREF (WINAPI *pNtGdiSetPixel)( HDC hdc, INT x, INT y, COLORREF color ); UINT (WINAPI *pNtGdiSetSystemPaletteUse)( HDC hdc, UINT use ); - BOOL (WINAPI *pNtGdiSetVirtualResolution)( HDC hdc, DWORD horz_res, DWORD vert_res, - DWORD horz_size, DWORD vert_size ); INT (WINAPI *pNtGdiStartDoc)( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ); INT (WINAPI *pNtGdiStartPage)( HDC hdc ); BOOL (WINAPI *pNtGdiStretchBlt)( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT height_dst, @@ -210,8 +208,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiTransparentBlt)( HDC hdc, int x_dst, int y_dst, int width_dst, int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, int height_src, UINT color ); - BOOL (WINAPI *pNtGdiTransformPoints)( HDC hdc, const POINT *points_in, POINT *points_out, - INT count, UINT mode ); BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 3854ba9b6f8..dea3e072a3d 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -571,12 +571,6 @@ UINT WINAPI NtGdiSetSystemPaletteUse( HDC hdc, UINT use ) return unix_funcs->pNtGdiSetSystemPaletteUse( hdc, use ); } -BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res, - DWORD horz_size, DWORD vert_size ) -{ - return unix_funcs->pNtGdiSetVirtualResolution( hdc, horz_res, vert_res, horz_size, vert_size ); -} - INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ) { return unix_funcs->pNtGdiStartDoc( hdc, doc, banding, job ); @@ -624,12 +618,6 @@ BOOL WINAPI NtGdiTransparentBlt( HDC hdc, int x_dst, int y_dst, int width_dst, i x_src, y_src, width_src, height_src, color ); } -BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out, - INT count, UINT mode ) -{ - return unix_funcs->pNtGdiTransformPoints( hdc, points_in, points_out, count, mode ); -} - BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) { return unix_funcs->pNtGdiUnrealizeObject( obj ); diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index b113179f432..42a13cc3676 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -450,6 +450,28 @@ NTSTATUS WINAPI wow64_NtGdiSetColorAdjustment( UINT *args ) return NtGdiSetColorAdjustment( hdc, ca ); } +NTSTATUS WINAPI wow64_NtGdiSetVirtualResolution( UINT *args ) +{ + HDC hdc = get_handle( &args ); + DWORD horz_res = get_ulong( &args ); + DWORD vert_res = get_ulong( &args ); + DWORD horz_size = get_ulong( &args ); + DWORD vert_size = get_ulong( &args ); + + return NtGdiSetVirtualResolution( hdc, horz_res, vert_res, horz_size, vert_size ); +} + +NTSTATUS WINAPI wow64_NtGdiTransformPoints( UINT *args ) +{ + HDC hdc = get_handle( &args ); + const POINT *points_in = get_ptr( &args ); + POINT *points_out = get_ptr( &args ); + INT count = get_ulong( &args ); + UINT mode = get_ulong( &args ); + + return NtGdiTransformPoints( hdc, points_in, points_out, count, mode ); +} + NTSTATUS WINAPI wow64_NtGdiFlush( UINT *args ) { return NtGdiFlush(); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index fd8b9f95365..c5f04b240bd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -66,6 +66,8 @@ SYSCALL_ENTRY( NtGdiSetPixelFormat ) \ SYSCALL_ENTRY( NtGdiSetRectRgn ) \ SYSCALL_ENTRY( NtGdiSetTextJustification ) \ - SYSCALL_ENTRY( NtGdiSwapBuffers ) + SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ + SYSCALL_ENTRY( NtGdiSwapBuffers ) \ + SYSCALL_ENTRY( NtGdiTransformPoints ) #endif /* __WOW64WIN_SYSCALL_H */

1 0

Hans Leidekker : wpcap: Accept interfaces without associated IPv4 or IPv6 address.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 487ec2d4568a1b1e81781d648a5686a91617dafb URL: https://source.winehq.org/git/wine.git/?a=commit;h=487ec2d4568a1b1e81781d64… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 11 16:54:39 2021 +0200 wpcap: Accept interfaces without associated IPv4 or IPv6 address. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 3a0b2381697..67d55b8f3f0 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -323,7 +323,7 @@ static struct pcap_interface *build_win32_device( const struct pcap_interface *u if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; if (!(ret->name = build_win32_name( source, adapter_name ))) goto err; if (!(ret->description = build_win32_description( unix_dev ))) goto err; - if (!(ret->addresses = build_win32_addresses( unix_dev->addresses ))) goto err; + ret->addresses = build_win32_addresses( unix_dev->addresses ); ret->flags = unix_dev->flags; return ret;

1 0