- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Default to the SEH channel on x86-64.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 2e63272f2fcfc32521e744e342dd16d3179a2121 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e63272f2fcfc32521e744e342dd16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 20 15:14:49 2024 +0100 ntdll: Default to the SEH channel on x86-64. The unwind info is now printed from unwind.c. --- dlls/ntdll/signal_x86_64.c | 71 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 36 deletions(-)

1 0

Rémi Bernon : win32u: Deduce monitor device flags from their adapter.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: e4ff578bcc294cf05ca000d5f3b3cf3c4936fa52 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ff578bcc294cf05ca000d5f3b3cf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:12:21 2024 +0100 win32u: Deduce monitor device flags from their adapter. --- dlls/win32u/sysparams.c | 47 +++++++++------------------------------- dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/cocoa_display.m | 1 - dlls/winemac.drv/display.c | 1 - dlls/winemac.drv/macdrv_cocoa.h | 5 ----- dlls/winewayland.drv/display.c | 7 ++---- dlls/winex11.drv/xinerama.c | 3 --- dlls/winex11.drv/xrandr.c | 5 ----- include/wine/gdi_driver.h | 1 - 9 files changed, 12 insertions(+), 59 deletions(-)

1 0

Rémi Bernon : win32u: Only consider active monitors for clone detection.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: db391c37a9bfba0a89321be02ca6a641dec41cf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/db391c37a9bfba0a89321be02ca6a6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:21:51 2024 +0100 win32u: Only consider active monitors for clone detection. --- dlls/win32u/sysparams.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 693d8839028..edf68859aa8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1746,14 +1746,15 @@ static BOOL update_display_cache_from_registry(void) if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE; - } - LIST_FOR_EACH_ENTRY(monitor2, &monitors, struct monitor, entry) - { - if (EqualRect(&monitor2->rc_monitor, &monitor->rc_monitor)) + LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) { - monitor->is_clone = TRUE; - break; + if (!(monitor2->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) + { + monitor->is_clone = TRUE; + break; + } } }

1 0

Brendan Shanks : ntdll: On x86_64, don't access %gs in signal_start_thread().
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: e628eb2c6ff84ff347d78b0c7a601665a51dbcef URL: https://gitlab.winehq.org/wine/wine/-/commit/e628eb2c6ff84ff347d78b0c7a6016… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 20 21:49:36 2024 -0800 ntdll: On x86_64, don't access %gs in signal_start_thread(). %gs is not set until call_init_thunk(). Also, adjust other TEB accesses to be consistent with the surrounding functions. Fixes a crash on macOS introduced by 7ae488a2bb58501684c6475d4942277b852475fc ("ntdll: Don't hardcode xstate size in syscall frame.") --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 21 +++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 93bcf607f41..3ac12a35db6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1618,7 +1618,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movl 0x18(%ebp),%edx\n\t" /* teb */ "pushl 0(%edx)\n\t" /* teb->Tib.ExceptionList */ "subl $0x280,%esp\n\t" /* sizeof(struct syscall_frame) */ - "subl %fs:0x204,%esp\n\t" /* x86_thread_data()->xstate_features_size */ + "subl 0x204(%edx),%esp\n\t" /* x86_thread_data()->xstate_features_size */ "andl $~63,%esp\n\t" "leal 8(%ebp),%eax\n\t" "movl %eax,0x38(%esp)\n\t" /* frame->syscall_cfa */ @@ -2547,7 +2547,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "orl %eax,%eax\n\t" "jnz 1f\n\t" "leal -0x280(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ - "subl %fs:0x204,%eax\n\t" /* x86_thread_data()->xstate_features_size */ + "subl 0x204(%ecx),%eax\n\t" /* x86_thread_data()->xstate_features_size */ "andl $~63,%eax\n\t" "movl %eax,0x1f8(%ecx)\n" /* x86_thread_data()->syscall_frame */ /* switch to kernel stack */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 501ae14cae5..01bbd2e3572 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1584,12 +1584,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movq %rsi,-0x38(%rbp)\n\t" /* ret_ptr */ "movq %rdx,-0x40(%rbp)\n\t" /* ret_len */ "subq $0x308,%rsp\n\t" /* sizeof(struct syscall_frame) + exception */ -#ifdef __APPLE__ - "movq %gs:0x30,%rsi\n\t" - "movl 0x33c(%rsi),%esi\n\t" -#else - "movl %gs:0x33c,%esi\n\t" /* amd64_thread_data()->xstate_features_size */ -#endif + "movl 0x33c(%r8),%esi\n\t" /* amd64_thread_data()->xstate_features_size */ "subq %rsi,%rsp\n\t" "andq $~63,%rsp\n\t" "leaq 0x10(%rbp),%rax\n\t" @@ -1629,12 +1624,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, __ASM_CFI(".cfi_rel_offset %r13,-0x18\n\t") __ASM_CFI(".cfi_rel_offset %r14,-0x20\n\t") __ASM_CFI(".cfi_rel_offset %r15,-0x28\n\t") -#ifdef __APPLE__ - "movq %gs:0x30,%rax\n\t" - "movl 0x33c(%rax),%eax\n\t" -#else - "movl %gs:0x33c,%eax\n\t" /* amd64_thread_data()->xstate_features_size */ -#endif + "movl 0x33c(%rcx),%eax\n\t" /* amd64_thread_data()->xstate_features_size */ "movq 0x300(%r10,%rax),%rax\n\t" /* exception list */ "movq %rax,0(%rcx)\n\t" /* teb->Tib.ExceptionList */ "movq -0x38(%rbp),%r10\n\t" /* ret_ptr */ @@ -2600,12 +2590,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "orq %r8,%r8\n\t" "jnz 1f\n\t" "leaq -0x300(%rsp),%r8\n\t" /* sizeof(struct syscall_frame) */ -#ifdef __APPLE__ - "movq %gs:0x30,%rax\n\t" - "movl 0x33c(%rax),%eax\n\t" -#else - "movl %gs:0x33c,%eax\n\t" /* amd64_thread_data()->xstate_features_size */ -#endif + "movl 0x33c(%rcx),%eax\n\t" /* amd64_thread_data()->xstate_features_size */ "subq %rax,%r8\n\t" "andq $~63,%r8\n\t" "movq %r8,0x328(%rcx)\n" /* amd64_thread_data()->syscall_frame */

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle resource descriptor additional tag/value pairs.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: vkd3d Branch: master Commit: d9c68ee481367d90da949cbd41b09ceb4b6a3823 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d9c68ee481367d90da949cbd41b09… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 16 14:37:43 2024 +1000 vkd3d-shader/dxil: Handle resource descriptor additional tag/value pairs. These are tag/value pairs, and the current code only works if an element type or element stride pair is present at index zero. --- libs/vkd3d-shader/dxil.c | 165 ++++++++++++++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 58 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 9b609168..2ca3aa95 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -199,10 +199,12 @@ enum dxil_resource_kind RESOURCE_KIND_FEEDBACKTEXTURE2DARRAY = 18, }; -enum dxil_resource_type +enum dxil_resource_tag { - RESOURCE_TYPE_NON_RAW_STRUCTURED = 0, - RESOURCE_TYPE_RAW_STRUCTURED = 1, + RESOURCE_TAG_ELEMENT_TYPE = 0, + RESOURCE_TAG_ELEMENT_STRIDE = 1, + RESOURCE_TAG_SAMPLER_FEEDBACK_KIND = 2, + RESOURCE_TAG_ENABLE_ATOMIC_64 = 3, }; enum dxil_component_type @@ -6673,15 +6675,97 @@ static enum vkd3d_data_type vkd3d_data_type_from_dxil_component_type(enum dxil_c return data_type; } +struct resource_additional_values +{ + enum vkd3d_data_type data_type; + unsigned int byte_stride; +}; + +static bool resources_load_additional_values(struct resource_additional_values *info, + const struct sm6_metadata_node *node, enum dxil_resource_kind kind, struct sm6_parser *sm6) +{ + unsigned int i, operand_count, tag, value; + + info->data_type = VKD3D_DATA_UNUSED; + info->byte_stride = 0; + + if (node->operand_count & 1) + { + WARN("Operand count is not even.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Operand count for resource descriptor tag/value pairs is not even."); + } + operand_count = node->operand_count & ~1u; + + for (i = 0; i < operand_count; i += 2) + { + if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &tag) + || !sm6_metadata_get_uint_value(sm6, node->operands[i + 1], &value)) + { + WARN("Failed to load tag/value pair at index %u.\n", i); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource descriptor tag/value pair at index %u is not an integer pair.", i); + return false; + } + + switch (tag) + { + case RESOURCE_TAG_ELEMENT_TYPE: + if (value && kind != RESOURCE_KIND_TYPEDBUFFER && !resource_kind_is_texture(kind)) + { + WARN("Invalid type %u for an untyped resource.\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "An untyped resource has type %u.", value); + return false; + } + info->data_type = vkd3d_data_type_from_dxil_component_type(value, sm6); + break; + + case RESOURCE_TAG_ELEMENT_STRIDE: + if (value && kind != RESOURCE_KIND_STRUCTUREDBUFFER) + { + WARN("Invalid stride %u for an unstructured resource.\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "An unstructured resource has a byte stride."); + return false; + } + info->byte_stride = value; + break; + + case RESOURCE_TAG_SAMPLER_FEEDBACK_KIND: + /* MinMip = 0, MipRegionUsed = 1 */ + FIXME("Unhandled sampler feedback kind %u.\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Sampler feedback kind %u is unhandled.", value); + break; + + case RESOURCE_TAG_ENABLE_ATOMIC_64: + if (value) + { + FIXME("Unsupported 64-bit atomic ops.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "64-bit atomic ops on resources are not supported."); + } + break; + + default: + FIXME("Unhandled tag %u, value %u.\n", tag, value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Tag %u for resource descriptor additional value %u is unhandled.", tag, value); + break; + } + } + + return true; +} + static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struct sm6_parser *sm6, const struct sm6_metadata_value *type_value, bool is_uav, enum dxil_resource_kind kind, const struct sm6_metadata_value *m, struct vkd3d_shader_instruction *ins) { + struct resource_additional_values resource_values; enum vkd3d_shader_resource_type resource_type; - enum dxil_resource_type dxil_resource_type; - const struct sm6_metadata_node *node; - enum vkd3d_data_type data_type; - unsigned int i, values[2]; + unsigned int i; if (!(resource_type = shader_resource_type_from_dxil_resource_kind(kind))) { @@ -6707,72 +6791,37 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc return NULL; } - node = m->u.node; - - if (node->operand_count < 2) - { - WARN("Invalid operand count %u.\n", node->operand_count); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, - "Invalid operand count %u for a resource descriptor.", node->operand_count); + if (!resources_load_additional_values(&resource_values, m->u.node, kind, sm6)) return NULL; - } - if (node->operand_count > 2) - { - WARN("Ignoring %u extra operands.\n", node->operand_count - 2); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring %u extra operands for a resource descriptor.", node->operand_count - 2); - } - - for (i = 0; i < 2; ++i) - { - if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &values[i])) - { - WARN("Failed to load uint value at index %u.\n", i); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "A resource descriptor operand metadata value is not an integer."); - return NULL; - } - } - if ((dxil_resource_type = values[0]) == RESOURCE_TYPE_NON_RAW_STRUCTURED) + if (kind == RESOURCE_KIND_TYPEDBUFFER || resource_kind_is_texture(kind)) { - if (kind != RESOURCE_KIND_TYPEDBUFFER && !resource_kind_is_texture(kind)) + if (resource_values.data_type == VKD3D_DATA_UNUSED) { - WARN("Unhandled resource kind %u.\n", kind); + WARN("No data type defined.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "Resource kind %u for a typed resource is unhandled.", kind); - return NULL; + "A typed resource has no data type."); } - data_type = vkd3d_data_type_from_dxil_component_type(values[1], sm6); ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_TYPED : VKD3DSIH_DCL; for (i = 0; i < VKD3D_VEC4_SIZE; ++i) - ins->declaration.semantic.resource_data_type[i] = data_type; + ins->declaration.semantic.resource_data_type[i] = resource_values.data_type; ins->declaration.semantic.resource_type = resource_type; ins->declaration.semantic.resource.reg.write_mask = VKD3DSP_WRITEMASK_ALL; return &ins->declaration.semantic.resource; } - else if (dxil_resource_type == RESOURCE_TYPE_RAW_STRUCTURED) + else if (kind == RESOURCE_KIND_RAWBUFFER) { - if (kind == RESOURCE_KIND_RAWBUFFER) - { - ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; - ins->declaration.raw_resource.resource.reg.write_mask = 0; - - return &ins->declaration.raw_resource.resource; - } - - if (kind != RESOURCE_KIND_STRUCTUREDBUFFER) - { - WARN("Unhandled resource kind %u.\n", kind); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "Resource kind %u for a raw or structured buffer is unhandled.", kind); - return NULL; - } + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; + ins->declaration.raw_resource.resource.reg.write_mask = 0; + return &ins->declaration.raw_resource.resource; + } + else if (kind == RESOURCE_KIND_STRUCTUREDBUFFER) + { ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_STRUCTURED : VKD3DSIH_DCL_RESOURCE_STRUCTURED; - ins->declaration.structured_resource.byte_stride = values[1]; + ins->declaration.structured_resource.byte_stride = resource_values.byte_stride; ins->declaration.structured_resource.resource.reg.write_mask = 0; /* TODO: 16-bit resources. */ @@ -6788,9 +6837,9 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc } else { - FIXME("Unhandled resource type %u.\n", dxil_resource_type); + FIXME("Unhandled resource kind %u.\n", kind); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "Resource type %u is unhandled.", dxil_resource_type); + "Resource kind %u is unhandled.", kind); } return NULL;

1 0

Alex Henrie : wined3d: Use CRT allocation functions.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 340a4b05b50fce02215213c21993fdf793e9d519 URL: https://gitlab.winehq.org/wine/wine/-/commit/340a4b05b50fce02215213c21993fd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 19 18:40:27 2024 -0700 wined3d: Use CRT allocation functions. --- dlls/wined3d/adapter_gl.c | 66 ++++++++--------- dlls/wined3d/adapter_vk.c | 84 +++++++++++----------- dlls/wined3d/arb_program_shader.c | 104 +++++++++++++-------------- dlls/wined3d/ati_fragment_shader.c | 12 ++-- dlls/wined3d/buffer.c | 32 ++++----- dlls/wined3d/context_gl.c | 30 ++++---- dlls/wined3d/context_vk.c | 58 +++++++-------- dlls/wined3d/cs.c | 60 ++++++++-------- dlls/wined3d/device.c | 42 +++++------ dlls/wined3d/directx.c | 68 +++++++++--------- dlls/wined3d/ffp_gl.c | 6 +- dlls/wined3d/glsl_shader.c | 144 ++++++++++++++++++------------------- dlls/wined3d/palette.c | 6 +- dlls/wined3d/query.c | 38 +++++----- dlls/wined3d/resource.c | 4 +- dlls/wined3d/shader.c | 108 ++++++++++++++-------------- dlls/wined3d/shader_sm1.c | 6 +- dlls/wined3d/shader_sm4.c | 14 ++-- dlls/wined3d/shader_spirv.c | 22 +++--- dlls/wined3d/stateblock.c | 18 ++--- dlls/wined3d/surface.c | 12 ++-- dlls/wined3d/swapchain.c | 48 ++++++------- dlls/wined3d/texture.c | 64 ++++++++--------- dlls/wined3d/utils.c | 21 +++--- dlls/wined3d/vertexdeclaration.c | 18 ++--- dlls/wined3d/wined3d_main.c | 14 ++-- dlls/wined3d/wined3d_private.h | 3 +- 27 files changed, 548 insertions(+), 554 deletions(-)

1 0

Biswapriyo Nath : include: Add DetectedFace runtimeclass in windows.media.faceanalysis.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: f0ab43fea2790810b017d0814a398ebdd706b98b URL: https://gitlab.winehq.org/wine/wine/-/commit/f0ab43fea2790810b017d0814a398e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add DetectedFace runtimeclass in windows.media.faceanalysis.idl. --- include/windows.graphics.imaging.idl | 11 ++++++ include/windows.media.faceanalysis.idl | 64 ++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl index 6c78663a473..4ca51490dcd 100644 --- a/include/windows.graphics.imaging.idl +++ b/include/windows.graphics.imaging.idl @@ -32,6 +32,7 @@ namespace Windows.Graphics.Imaging { typedef enum BitmapAlphaMode BitmapAlphaMode; typedef enum BitmapBufferAccessMode BitmapBufferAccessMode; typedef enum BitmapPixelFormat BitmapPixelFormat; + typedef struct BitmapBounds BitmapBounds; typedef struct BitmapPlaneDescription BitmapPlaneDescription; interface IBitmapBuffer; @@ -50,6 +51,7 @@ namespace Windows.Graphics.Imaging { interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.Imaging.BitmapPixelFormat>; interface Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.IReference<Windows.Graphics.Imaging.BitmapBounds>; } [contract(Windows.Foundation.UniversalApiContract, 1.0)] @@ -87,6 +89,15 @@ namespace Windows.Graphics.Imaging { Yuy2 = 107, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct BitmapBounds + { + UINT32 X; + UINT32 Y; + UINT32 Width; + UINT32 Height; + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct BitmapPlaneDescription { diff --git a/include/windows.media.faceanalysis.idl b/include/windows.media.faceanalysis.idl new file mode 100644 index 00000000000..de5cf136ab9 --- /dev/null +++ b/include/windows.media.faceanalysis.idl @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2024 Biswapriyo Nath + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.graphics.imaging.idl"; +import "windows.media.idl"; + +namespace Windows.Media.FaceAnalysis { + interface IDetectedFace; + + runtimeclass DetectedFace; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.Collections.IIterator<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.FaceAnalysis.DetectedFace), + uuid(8200d454-66bc-34df-9410-e89400195414) + ] + interface IDetectedFace : IInspectable + { + [propget] HRESULT FaceBox([out, retval] Windows.Graphics.Imaging.BitmapBounds *return_value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass DetectedFace + { + [default] interface Windows.Media.FaceAnalysis.IDetectedFace; + } +}

1 0

Biswapriyo Nath : include: Add SoftwareBitmap runtimeclass in windows.graphics.imaging.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: fbe99509d6ca79038cba651b9e255817fd0fbb76 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbe99509d6ca79038cba651b9e2558… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add SoftwareBitmap runtimeclass in windows.graphics.imaging.idl. --- include/windows.graphics.imaging.idl | 157 +++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl index 5c6a6c2ea60..6c78663a473 100644 --- a/include/windows.graphics.imaging.idl +++ b/include/windows.graphics.imaging.idl @@ -29,11 +29,63 @@ import "windows.graphics.directx.direct3d11.idl"; import "windows.storage.streams.idl"; namespace Windows.Graphics.Imaging { + typedef enum BitmapAlphaMode BitmapAlphaMode; + typedef enum BitmapBufferAccessMode BitmapBufferAccessMode; + typedef enum BitmapPixelFormat BitmapPixelFormat; typedef struct BitmapPlaneDescription BitmapPlaneDescription; interface IBitmapBuffer; + interface ISoftwareBitmap; + interface ISoftwareBitmapFactory; + interface ISoftwareBitmapStatics; runtimeclass BitmapBuffer; + runtimeclass SoftwareBitmap; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.Imaging.BitmapPixelFormat>; + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.Imaging.BitmapPixelFormat>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.Imaging.BitmapPixelFormat>; + interface Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Graphics.Imaging.SoftwareBitmap *>; + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BitmapAlphaMode + { + Premultiplied = 0, + Straight = 1, + Ignore = 2, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BitmapBufferAccessMode + { + Read = 0, + ReadWrite = 1, + Write = 2, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BitmapPixelFormat + { + Unknown = 0, + Rgba16 = 12, + Rgba8 = 30, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Gray16 = 57, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Gray8 = 62, + Bgra8 = 87, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Nv12 = 103, + [contract(Windows.Foundation.UniversalApiContract, 6.0)] + P010 = 104, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Yuy2 = 107, + }; [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct BitmapPlaneDescription @@ -56,6 +108,98 @@ namespace Windows.Graphics.Imaging { HRESULT GetPlaneDescription([in] INT32 index, [out, retval] Windows.Graphics.Imaging.BitmapPlaneDescription *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.SoftwareBitmap), + uuid(689e0708-7eef-483f-963f-da938818e073) + ] + interface ISoftwareBitmap : IInspectable + requires Windows.Foundation.IClosable + { + [propget] HRESULT BitmapPixelFormat([out, retval] Windows.Graphics.Imaging.BitmapPixelFormat *value); + [propget] HRESULT BitmapAlphaMode([out, retval] Windows.Graphics.Imaging.BitmapAlphaMode *value); + [propget] HRESULT PixelWidth([out, retval] INT32 *value); + [propget] HRESULT PixelHeight([out, retval] INT32 *value); + [propget] HRESULT IsReadOnly([out, retval] boolean *value); + [propput] HRESULT DpiX([in] DOUBLE value); + [propget] HRESULT DpiX([out, retval] DOUBLE *value); + [propput] HRESULT DpiY([in] DOUBLE value); + [propget] HRESULT DpiY([out, retval] DOUBLE *value); + HRESULT LockBuffer([in] Windows.Graphics.Imaging.BitmapBufferAccessMode mode, + [out, retval] Windows.Graphics.Imaging.BitmapBuffer **value); + HRESULT CopyTo([in] Windows.Graphics.Imaging.SoftwareBitmap *bitmap); + HRESULT CopyFromBuffer([in] Windows.Storage.Streams.IBuffer *buffer); + HRESULT CopyToBuffer([in] Windows.Storage.Streams.IBuffer *buffer); + HRESULT GetReadOnlyView([out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.SoftwareBitmap), + uuid(c99feb69-2d62-4d47-a6b3-4fdb6a07fdf8) + ] + interface ISoftwareBitmapFactory : IInspectable + { + HRESULT Create( + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + HRESULT CreateWithAlpha( + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.SoftwareBitmap), + uuid(df0385db-672f-4a9d-806e-c2442f343e86) + ] + interface ISoftwareBitmapStatics : IInspectable + { + HRESULT Copy( + [in] Windows.Graphics.Imaging.SoftwareBitmap *source, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("Convert")] + HRESULT Convert( + [in] Windows.Graphics.Imaging.SoftwareBitmap *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("Convert")] + HRESULT ConvertWithAlpha( + [in] Windows.Graphics.Imaging.SoftwareBitmap *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("CreateCopyFromBuffer")] + HRESULT CreateCopyFromBuffer( + [in] Windows.Storage.Streams.IBuffer *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("CreateCopyFromBuffer")] + HRESULT CreateCopyWithAlphaFromBuffer( + [in] Windows.Storage.Streams.IBuffer *source, + [in] Windows.Graphics.Imaging.BitmapPixelFormat format, + [in] INT32 width, + [in] INT32 height, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Graphics.Imaging.SoftwareBitmap **value); + [overload("CreateCopyFromSurfaceAsync")] + HRESULT CreateCopyFromSurfaceAsync( + [in] Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *surface, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *> **value); + [overload("CreateCopyFromSurfaceAsync")] + HRESULT CreateCopyWithAlphaFromSurfaceAsync( + [in] Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *surface, + [in] Windows.Graphics.Imaging.BitmapAlphaMode alpha, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Graphics.Imaging.SoftwareBitmap *> **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -67,4 +211,17 @@ namespace Windows.Graphics.Imaging { interface Windows.Foundation.IMemoryBuffer; interface Windows.Foundation.IClosable; } + + [ + activatable(Windows.Graphics.Imaging.ISoftwareBitmapFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Graphics.Imaging.ISoftwareBitmapStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass SoftwareBitmap + { + [default] interface Windows.Graphics.Imaging.ISoftwareBitmap; + interface Windows.Foundation.IClosable; + } }

1 0

Biswapriyo Nath : include: Add FaceDetector runtimeclass in windows.media.faceanalysis.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 6ec9f446eb8bed66fb368834d23660fac115de52 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec9f446eb8bed66fb368834d23660… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add FaceDetector runtimeclass in windows.media.faceanalysis.idl. --- include/windows.graphics.imaging.idl | 8 ++++++ include/windows.media.faceanalysis.idl | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl index 4ca51490dcd..5409481f043 100644 --- a/include/windows.graphics.imaging.idl +++ b/include/windows.graphics.imaging.idl @@ -34,6 +34,7 @@ namespace Windows.Graphics.Imaging { typedef enum BitmapPixelFormat BitmapPixelFormat; typedef struct BitmapBounds BitmapBounds; typedef struct BitmapPlaneDescription BitmapPlaneDescription; + typedef struct BitmapSize BitmapSize; interface IBitmapBuffer; interface ISoftwareBitmap; @@ -107,6 +108,13 @@ namespace Windows.Graphics.Imaging { INT32 Stride; }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct BitmapSize + { + UINT32 Width; + UINT32 Height; + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Graphics.Imaging.BitmapBuffer), diff --git a/include/windows.media.faceanalysis.idl b/include/windows.media.faceanalysis.idl index de5cf136ab9..595d36186b6 100644 --- a/include/windows.media.faceanalysis.idl +++ b/include/windows.media.faceanalysis.idl @@ -30,14 +30,19 @@ import "windows.media.idl"; namespace Windows.Media.FaceAnalysis { interface IDetectedFace; + interface IFaceDetector; + interface IFaceDetectorStatics; runtimeclass DetectedFace; + runtimeclass FaceDetector; declare { interface Windows.Foundation.Collections.IIterable<Windows.Media.FaceAnalysis.DetectedFace *>; interface Windows.Foundation.Collections.IIterator<Windows.Media.FaceAnalysis.DetectedFace *>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.FaceAnalysis.DetectedFace *>; interface Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.FaceAnalysis.FaceDetector *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.FaceAnalysis.FaceDetector *>; interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *>; } @@ -52,6 +57,41 @@ namespace Windows.Media.FaceAnalysis { [propget] HRESULT FaceBox([out, retval] Windows.Graphics.Imaging.BitmapBounds *return_value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.FaceAnalysis.FaceDetector), + uuid(16b672dc-fe6f-3117-8d95-c3f04d51630c) + ] + interface IFaceDetector : IInspectable + { + [overload("DetectFacesAsync")] + HRESULT DetectFacesAsync( + [in] Windows.Graphics.Imaging.SoftwareBitmap *image, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *> **return_value); + [overload("DetectFacesAsync")] + HRESULT DetectFacesWithSearchAreaAsync( + [in] Windows.Graphics.Imaging.SoftwareBitmap *image, + [in] Windows.Graphics.Imaging.BitmapBounds search_area, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVector<Windows.Media.FaceAnalysis.DetectedFace *> *> **return_value); + [propget] HRESULT MinDetectableFaceSize([out, retval] Windows.Graphics.Imaging.BitmapSize *return_value); + [propput] HRESULT MinDetectableFaceSize([in] Windows.Graphics.Imaging.BitmapSize value); + [propget] HRESULT MaxDetectableFaceSize([out, retval] Windows.Graphics.Imaging.BitmapSize *return_value); + [propput] HRESULT MaxDetectableFaceSize([in] Windows.Graphics.Imaging.BitmapSize value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.FaceAnalysis.FaceDetector), + uuid(bc042d67-9047-33f6-881b-6746c1b218b8) + ] + interface IFaceDetectorStatics : IInspectable + { + HRESULT CreateAsync([out, retval] Windows.Foundation.IAsyncOperation<Windows.Media.FaceAnalysis.FaceDetector *> **return_value); + HRESULT GetSupportedBitmapPixelFormats([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Graphics.Imaging.BitmapPixelFormat> **result); + HRESULT IsBitmapPixelFormatSupported([in] Windows.Graphics.Imaging.BitmapPixelFormat bitmap_pixel_format, [out, retval] boolean *result); + [propget] HRESULT IsSupported([out, retval] boolean *return_value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -61,4 +101,15 @@ namespace Windows.Media.FaceAnalysis { { [default] interface Windows.Media.FaceAnalysis.IDetectedFace; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.FaceAnalysis.IFaceDetectorStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass FaceDetector + { + [default] interface Windows.Media.FaceAnalysis.IFaceDetector; + } }

1 0

Biswapriyo Nath : include: Add BitmapBuffer runtimeclass in windows.graphics.imaging.idl.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: af4838321e3a2d04ac134b35f6d12aef4b9552ff URL: https://gitlab.winehq.org/wine/wine/-/commit/af4838321e3a2d04ac134b35f6d12a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add BitmapBuffer runtimeclass in windows.graphics.imaging.idl. --- include/windows.graphics.imaging.idl | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl new file mode 100644 index 00000000000..5c6a6c2ea60 --- /dev/null +++ b/include/windows.graphics.imaging.idl @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2024 Biswapriyo Nath + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.graphics.directx.direct3d11.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Graphics.Imaging { + typedef struct BitmapPlaneDescription BitmapPlaneDescription; + + interface IBitmapBuffer; + + runtimeclass BitmapBuffer; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct BitmapPlaneDescription + { + INT32 StartIndex; + INT32 Width; + INT32 Height; + INT32 Stride; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.BitmapBuffer), + uuid(a53e04c4-399c-438c-b28f-a63a6b83d1a1) + ] + interface IBitmapBuffer : IInspectable + requires Windows.Foundation.IMemoryBuffer, Windows.Foundation.IClosable + { + HRESULT GetPlaneCount([out, retval] INT32 *value); + HRESULT GetPlaneDescription([in] INT32 index, [out, retval] Windows.Graphics.Imaging.BitmapPlaneDescription *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass BitmapBuffer + { + [default] interface Windows.Graphics.Imaging.IBitmapBuffer; + interface Windows.Foundation.IMemoryBuffer; + interface Windows.Foundation.IClosable; + } +}

1 0