April 2023 - Wine-commits - list.winehq.org

Ziqing Hui : winegstreamer: Implement wg_format_from_caps_video_wmv.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: 3cef365f63a14912d958ba80c2e28b03e96cfa5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3cef365f63a14912d958ba80c2e28b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Mar 13 12:28:13 2023 +0800 winegstreamer: Implement wg_format_from_caps_video_wmv. --- dlls/winegstreamer/wg_format.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 6317a69edee..da0cd052804 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -229,6 +229,59 @@ static void wg_format_from_caps_video_cinepak(struct wg_format *format, const Gs format->u.video_cinepak.fps_d = fps_d; } +static void wg_format_from_caps_video_wmv(struct wg_format *format, const GstCaps *caps) +{ + const GstStructure *structure = gst_caps_get_structure(caps, 0); + gint width, height, fps_n, fps_d, wmv_version = 0; + gchar format_buffer[5] = {'W','M','V','0',0}; + enum wg_wmv_video_format wmv_format; + const gchar *wmv_format_str = NULL; + + if (!gst_structure_get_int(structure, "width", &width)) + { + GST_WARNING("Missing \"width\" value."); + return; + } + if (!gst_structure_get_int(structure, "height", &height)) + { + GST_WARNING("Missing \"height\" value."); + return; + } + + if (!(wmv_format_str = gst_structure_get_string(structure, "format"))) + { + if (!gst_structure_get_int(structure, "wmvversion", &wmv_version)) + GST_WARNING("Unable to get WMV format."); + format_buffer[3] += wmv_version; + wmv_format_str = format_buffer; + } + if (!strcmp(wmv_format_str, "WMV1")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMV1; + else if (!strcmp(wmv_format_str, "WMV2")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMV2; + else if (!strcmp(wmv_format_str, "WMV3")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMV3; + else if (!strcmp(wmv_format_str, "WMVA")) + wmv_format = WG_WMV_VIDEO_FORMAT_WMVA; + else if (!strcmp(wmv_format_str, "WVC1")) + wmv_format = WG_WMV_VIDEO_FORMAT_WVC1; + else + wmv_format = WG_WMV_VIDEO_FORMAT_UNKNOWN; + + if (!gst_structure_get_fraction(structure, "framerate", &fps_n, &fps_d)) + { + fps_n = 0; + fps_d = 1; + } + + format->major_type = WG_MAJOR_TYPE_VIDEO_WMV; + format->u.video_wmv.width = width; + format->u.video_wmv.height = height; + format->u.video_wmv.format = wmv_format; + format->u.video_wmv.fps_n = fps_n; + format->u.video_wmv.fps_d = fps_d; +} + void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { const GstStructure *structure = gst_caps_get_structure(caps, 0); @@ -258,6 +311,10 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) { wg_format_from_caps_video_cinepak(format, caps); } + else if (!strcmp(name, "video/x-wmv")) + { + wg_format_from_caps_video_wmv(format, caps); + } else { gchar *str = gst_caps_to_string(caps);

1 0

Ziqing Hui : wingstreamer: Create extra decodebin to decode compressed stream.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: 992984f12c18183e477be9ba2668bf42567f4e0a URL: https://gitlab.winehq.org/wine/wine/-/commit/992984f12c18183e477be9ba2668bf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 3 16:32:05 2023 +0800 wingstreamer: Create extra decodebin to decode compressed stream. --- dlls/winegstreamer/wg_parser.c | 191 +++++++++++++++++++++++++++++++++++------ 1 file changed, 163 insertions(+), 28 deletions(-)

1 0

Anton Baskanov : winegstreamer: Fix negative height image size calculation.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: wine Branch: master Commit: a455dd53d5af144aae70263d9f4e798a305ab775 URL: https://gitlab.winehq.org/wine/wine/-/commit/a455dd53d5af144aae70263d9f4e79… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Apr 15 13:33:41 2023 +0700 winegstreamer: Fix negative height image size calculation. Fixes intro video playback in multiple games (e.g. Earth 2150). --- dlls/winegstreamer/quartz_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 590ef48fef4..de62187cd7d 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -286,7 +286,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) { case WG_MAJOR_TYPE_VIDEO: { - unsigned int width = format->u.video.width, height = format->u.video.height; + unsigned int width = format->u.video.width, height = abs(format->u.video.height); switch (format->u.video.format) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Sort only uniforms by name in the sm1 backend.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: vkd3d Branch: master Commit: 98e2461392a4ff98c7e15afeefe69cefc1f83701 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98e2461392a4ff98c7e15afeefe69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 23 23:27:29 2023 -0600 vkd3d-shader/hlsl: Sort only uniforms by name in the sm1 backend. --- libs/vkd3d-shader/hlsl_sm1.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index be665981..73ec8453 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -302,7 +302,10 @@ static void sm1_sort_externs(struct hlsl_ctx *ctx) struct hlsl_ir_var *var, *next; LIST_FOR_EACH_ENTRY_SAFE(var, next, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) - sm1_sort_extern(&sorted, var); + { + if (var->is_uniform) + sm1_sort_extern(&sorted, var); + } list_move_tail(&ctx->extern_vars, &sorted); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Map ps_1_* color and texcoord semantics to registers.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: vkd3d Branch: master Commit: 99d413206b9409971e856c50640d8afcaefdd293 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99d413206b9409971e856c50640d8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 24 12:51:33 2023 -0600 vkd3d-shader/hlsl: Map ps_1_* color and texcoord semantics to registers. --- libs/vkd3d-shader/hlsl_sm1.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 73ec8453..69b881c4 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -37,6 +37,9 @@ bool hlsl_sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_sem } register_table[] = { + {"color", false, VKD3D_SHADER_TYPE_PIXEL, 1, D3DSPR_INPUT}, + {"texcoord", false, VKD3D_SHADER_TYPE_PIXEL, 1, D3DSPR_TEXTURE}, + {"color", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_COLOROUT}, {"depth", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_DEPTHOUT}, {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_DEPTHOUT},

1 0

Zebediah Figura : vkd3d-shader/hlsl: Do not write DCL instructions for ps_1_* shaders.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: vkd3d Branch: master Commit: b19105eaeb9d919da72c5a45d37736cb5e2b4365 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b19105eaeb9d919da72c5a45d3773… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 24 12:52:07 2023 -0600 vkd3d-shader/hlsl: Do not write DCL instructions for ps_1_* shaders. --- libs/vkd3d-shader/hlsl_sm1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 69b881c4..0afeac68 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -645,7 +645,7 @@ static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ bool write_in = false, write_out = false; struct hlsl_ir_var *var; - if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) + if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL && ctx->profile->major_version >= 2) write_in = true; else if (ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX && ctx->profile->major_version == 3) write_in = write_out = true;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allow VPOS and VFACE to be specified in sm3 pixel shaders.
by Alexandre Julliard 18 Apr '23

18 Apr '23

Module: vkd3d Branch: master Commit: 0654d88edd53b0721e071084004eb42619cbd6fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0654d88edd53b0721e071084004eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 24 13:11:06 2023 -0600 vkd3d-shader/hlsl: Allow VPOS and VFACE to be specified in sm3 pixel shaders. We were previously (accidentally) rejecting them because they didn't have a usage. --- libs/vkd3d-shader/hlsl_codegen.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c8130a3f..adaf8201 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2921,7 +2921,8 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var D3DDECLUSAGE usage; uint32_t usage_idx; - if (!hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) + builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); + if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Invalid semantic '%s'.", var->semantic.name); @@ -2930,8 +2931,6 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if ((!output && !var->last_read) || (output && !var->first_write)) return; - - builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); } else {

1 0

Hans Leidekker : wine.inf: Use FLG_ADDREG_NOCLOBBER for CurrentMajor/MinorVersionNumber.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 956e580f0656a8191489d1fd354f3038d0ea1431 URL: https://gitlab.winehq.org/wine/wine/-/commit/956e580f0656a8191489d1fd354f30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 17 10:16:08 2023 +0200 wine.inf: Use FLG_ADDREG_NOCLOBBER for CurrentMajor/MinorVersionNumber. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54844 --- loader/wine.inf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 38103d12876..347af35af6d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2500,8 +2500,8 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.3" -HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,10 -HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,0 +HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10003,10 +HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10003,0 HKLM,%CurrentVersionNT%,"CurrentBuild",2,"18362" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"18362" HKLM,%CurrentVersionNT%,"CurrentType",2,"Multiprocessor Free"

1 0

Bernhard Übelacker : ntoskrnl: Do not leak memory by setting input buffer to NULL.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 07c0cd6ba5f4b1d6ef738ad7f3cad9992947dd3d URL: https://gitlab.winehq.org/wine/wine/-/commit/07c0cd6ba5f4b1d6ef738ad7f3cad9… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Jan 11 22:15:26 2022 +0100 ntoskrnl: Do not leak memory by setting input buffer to NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52322 --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2d506402036..02b58d1311e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -832,7 +832,6 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context ) irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ return dispatch_irp( device, irp, context );

1 0

Connor McAdams : uiautomationcore: Implement UIA_ControlTypePropertyId for default HWND provider.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: cee22e0cb6ca43503c9df7518bec1bee2e4b06a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/cee22e0cb6ca43503c9df7518bec1b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 23 10:48:38 2023 -0400 uiautomationcore: Implement UIA_ControlTypePropertyId for default HWND provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 86 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 52 ++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index ddeb3f3f055..6e84124d1b5 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -12361,12 +12361,49 @@ static void test_node_hwnd_provider_(HUIANODE node, HWND hwnd, const char *file, winetest_pop_context(); } +enum { + PARENT_HWND_NULL, + PARENT_HWND_HWND, + PARENT_HWND_DESKTOP, +}; + +struct uia_hwnd_control_type_test { + DWORD style; + DWORD style_ex; + int exp_control_type; + int parent_hwnd_type; +}; + +static const struct uia_hwnd_control_type_test hwnd_control_type_test[] = { + { WS_OVERLAPPEDWINDOW, 0, UIA_WindowControlTypeId, PARENT_HWND_NULL }, + /* Top-level window (parent is desktop window) is always a window control. */ + { WS_CHILD, 0, UIA_WindowControlTypeId, PARENT_HWND_DESKTOP }, + /* Not a top-level window, considered a pane. */ + { WS_CHILD, 0, UIA_PaneControlTypeId, PARENT_HWND_HWND }, + /* Not a top-level window, but WS_EX_APPWINDOW is always considered a window. */ + { WS_CHILD, WS_EX_APPWINDOW, UIA_WindowControlTypeId, PARENT_HWND_HWND }, + /* + * WS_POPUP is always a pane regardless of being a top level window, + * unless WS_CAPTION is set. + */ + { WS_CAPTION | WS_POPUP, 0, UIA_WindowControlTypeId, PARENT_HWND_DESKTOP }, + { WS_BORDER | WS_POPUP, 0, UIA_PaneControlTypeId, PARENT_HWND_DESKTOP }, + { WS_POPUP, 0, UIA_PaneControlTypeId, PARENT_HWND_DESKTOP }, + /* + * Top level window with WS_EX_TOOLWINDOW and without WS_CAPTION is + * considered a pane. + */ + { WS_CHILD, WS_EX_TOOLWINDOW, UIA_PaneControlTypeId, PARENT_HWND_DESKTOP }, + { WS_CHILD | WS_CAPTION, WS_EX_TOOLWINDOW, UIA_WindowControlTypeId, PARENT_HWND_DESKTOP }, +}; + static void test_default_clientside_providers(void) { HUIANODE node; HRESULT hr; HWND hwnd; VARIANT v; + int i; CoInitializeEx(NULL, COINIT_MULTITHREADED); hwnd = create_test_hwnd("test_default_clientside_providers class"); @@ -12411,6 +12448,55 @@ static void test_default_clientside_providers(void) ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); ok(Provider_nc.ref == 1, "Unexpected refcnt %ld\n", Provider_nc.ref); + method_sequences_enabled = FALSE; + VariantInit(&v); + for (i = 0; i < ARRAY_SIZE(hwnd_control_type_test); i++) + { + const struct uia_hwnd_control_type_test *test = &hwnd_control_type_test[i]; + HWND hwnd2, parent; + + if (test->parent_hwnd_type == PARENT_HWND_HWND) + parent = hwnd; + else if (test->parent_hwnd_type == PARENT_HWND_DESKTOP) + parent = GetDesktopWindow(); + else + parent = NULL; + + hwnd2 = CreateWindowExA(test->style_ex, "test_default_clientside_providers class", "Test window", test->style, + 0, 0, 100, 100, parent, NULL, NULL, NULL); + initialize_provider(&Provider_nc, ProviderOptions_ClientSideProvider | ProviderOptions_NonClientAreaProvider, hwnd2, TRUE); + initialize_provider(&Provider, ProviderOptions_ClientSideProvider, hwnd2, TRUE); + Provider_nc.ignore_hwnd_prop = Provider.ignore_hwnd_prop = TRUE; + Provider.ret_invalid_prop_type = Provider_nc.ret_invalid_prop_type = TRUE; + + /* If parent is hwnd, it will be queried for an override provider. */ + if (test->style == WS_CHILD && (parent == hwnd)) + SET_EXPECT_MULTI(winproc_GETOBJECT_UiaRoot, 2); + else + SET_EXPECT(winproc_GETOBJECT_UiaRoot); + /* Only sent on Win7. */ + SET_EXPECT(winproc_GETOBJECT_CLIENT); + hr = UiaNodeFromProvider(&Provider_nc.IRawElementProviderSimple_iface, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + ok(Provider_nc.ref == 2, "Unexpected refcnt %ld\n", Provider_nc.ref); + if (hwnd_control_type_test[i].style == WS_CHILD && (parent == hwnd)) + todo_wine CHECK_CALLED_MULTI(winproc_GETOBJECT_UiaRoot, 2); + else + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + called_winproc_GETOBJECT_CLIENT = expect_winproc_GETOBJECT_CLIENT = 0; + + hr = UiaGetPropertyValue(node, UIA_ControlTypePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); + ok(V_I4(&v) == test->exp_control_type, "Unexpected control type %ld\n", V_I4(&v)); + VariantClear(&v); + + UiaNodeRelease(node); + DestroyWindow(hwnd2); + } + + method_sequences_enabled = TRUE; DestroyWindow(hwnd); UnregisterClassA("test_default_clientside_providers class", NULL); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index ed00abaf33b..1609d53fe3c 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1229,6 +1229,45 @@ static HRESULT uia_send_message_timeout(HWND hwnd, UINT msg, WPARAM wparam, LPAR return S_OK; } +static BOOL is_top_level_hwnd(HWND hwnd) +{ + return (GetAncestor(hwnd, GA_PARENT) == GetDesktopWindow()) ? TRUE : FALSE; +} + +static HRESULT get_uia_control_type_for_hwnd(HWND hwnd, int *control_type) +{ + LONG_PTR style, ex_style; + + *control_type = 0; + if ((ex_style = GetWindowLongPtrW(hwnd, GWL_EXSTYLE)) & WS_EX_APPWINDOW) + { + *control_type = UIA_WindowControlTypeId; + return S_OK; + } + + SetLastError(NO_ERROR); + if (!(style = GetWindowLongPtrW(hwnd, GWL_STYLE)) && (GetLastError() != NO_ERROR)) + return uia_get_hr_for_last_error(); + + /* + * Non-caption HWNDs that are popups or tool windows aren't considered full + * windows, only panes. + */ + if (((style & WS_CAPTION) != WS_CAPTION) && ((ex_style & WS_EX_TOOLWINDOW) || (style & WS_POPUP))) + { + *control_type = UIA_PaneControlTypeId; + return S_OK; + } + + /* Non top-level HWNDs are considered panes as well. */ + if (!is_top_level_hwnd(hwnd)) + *control_type = UIA_PaneControlTypeId; + else + *control_type = UIA_WindowControlTypeId; + + return S_OK; +} + /* * Default ProviderType_BaseHwnd IRawElementProviderSimple interface. */ @@ -1366,6 +1405,19 @@ static HRESULT WINAPI base_hwnd_provider_GetPropertyValue(IRawElementProviderSim break; } + case UIA_ControlTypePropertyId: + { + int control_type; + + hr = get_uia_control_type_for_hwnd(base_hwnd_prov->hwnd, &control_type); + if (SUCCEEDED(hr)) + { + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = control_type; + } + break; + } + default: break; }

1 0