- Wine-Commits - list.winehq.org

Henri Verbeet : tests: Implement check_requirements() for the OpenGL shader runner.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 0f3a42c34b3d8d8b38564f79029e9ac8758d22dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f3a42c34b3d8d8b38564f79029e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 12 19:57:42 2024 +0100 tests: Implement check_requirements() for the OpenGL shader runner. --- tests/shader_runner.c | 4 +--- tests/shader_runner_gl.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index a683866c..c645e6c0 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1350,10 +1350,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o case STATE_REQUIRE: if (runner->maximum_shader_model < runner->minimum_shader_model - || (runner->ops->check_requirements && !runner->ops->check_requirements(runner))) - { + || !runner->ops->check_requirements(runner)) skip_tests = true; - } break; case STATE_RESOURCE: diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index a898d021..881ca77a 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -59,6 +59,12 @@ struct gl_runner { struct shader_runner r; + struct + { + bool float64; + bool int64; + } caps; + EGLDisplay display; EGLContext context; @@ -93,7 +99,7 @@ static bool check_gl_extension(const char *extension, GLint extension_count) return false; } -static bool check_gl_extensions(void) +static bool check_gl_extensions(struct gl_runner *runner) { GLint count; @@ -114,6 +120,11 @@ static bool check_gl_extensions(void) return false; } + if (check_gl_extension("GL_ARB_gpu_shader_fp64", count)) + runner->caps.float64 = true; + if (check_gl_extension("GL_ARB_gpu_shader_int64", count)) + runner->caps.int64 = true; + return true; } @@ -210,7 +221,8 @@ static bool gl_runner_init(struct gl_runner *runner) continue; } - if (!check_gl_extensions()) + memset(&runner->caps, 0, sizeof(runner->caps)); + if (!check_gl_extensions(runner)) { trace("Device %u lacks required extensions.\n", i); eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); @@ -237,6 +249,9 @@ static bool gl_runner_init(struct gl_runner *runner) trace("GL_RENDERER: %s\n", glGetString(GL_RENDERER)); trace(" GL_VERSION: %s\n", glGetString(GL_VERSION)); + trace(" float64: %u.\n", runner->caps.float64); + trace(" int64: %u.\n", runner->caps.int64); + p_glSpecializeShader = (void *)eglGetProcAddress("glSpecializeShader"); glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_NOTIFICATION, 0, NULL, GL_FALSE); @@ -274,6 +289,18 @@ static void gl_runner_cleanup(struct gl_runner *runner) ok(ret, "Failed to terminate EGL display connection.\n"); } +static bool gl_runner_check_requirements(struct shader_runner *r) +{ + struct gl_runner *runner = gl_runner(r); + + if (r->require_float64 && !runner->caps.float64) + return false; + if (r->require_int64 && !runner->caps.int64) + return false; + + return true; +} + static const struct format_info *get_format_info(enum DXGI_FORMAT format) { size_t i; @@ -979,6 +1006,7 @@ static void gl_runner_release_readback(struct shader_runner *runner, struct reso static const struct shader_runner_ops gl_runner_ops = { + .check_requirements = gl_runner_check_requirements, .create_resource = gl_runner_create_resource, .destroy_resource = gl_runner_destroy_resource, .dispatch = gl_runner_dispatch,

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS11 in CheckFeatureSupport().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 68663b4fefef422ea6a37c4d55eda7a567e67bb6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68663b4fefef422ea6a37c4d55eda… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 9 23:29:59 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS11 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 98e21ed3..40e42913 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3451,6 +3451,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS11: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS11 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->AtomicInt64OnDescriptorHeapResourceSupported = FALSE; + + TRACE("Atomic int64 on descriptor heap resource %#x.\n", data->AtomicInt64OnDescriptorHeapResourceSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS10 in CheckFeatureSupport().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: a0bb055ad25a4a4d4a8badf9e79fb27c1965b847 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a0bb055ad25a4a4d4a8badf9e79fb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 9 23:27:24 2024 +1000 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS10 in CheckFeatureSupport(). --- libs/vkd3d/device.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 1e094690..98e21ed3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3433,6 +3433,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device7 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS10: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS10 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + data->VariableRateShadingSumCombinerSupported = FALSE; + data->MeshShaderPerPrimitiveShadingRateSupported = FALSE; + + TRACE("Variable rate shading sum combiner %#x.\n", data->VariableRateShadingSumCombinerSupported); + TRACE("Mesh shader per primitive shading rate %#x.\n", data->MeshShaderPerPrimitiveShadingRateSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Zhiyi Zhang : include: Rename DF_WINE_CREATE_DESKTOP to DF_WINE_VIRTUAL_DESKTOP.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 2990a4f8c35498a48ce9c2cfd0a8cf5651af7070 URL: https://gitlab.winehq.org/wine/wine/-/commit/2990a4f8c35498a48ce9c2cfd0a8cf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 10 17:22:50 2024 +0800 include: Rename DF_WINE_CREATE_DESKTOP to DF_WINE_VIRTUAL_DESKTOP. --- dlls/user32/winstation.c | 2 +- dlls/win32u/winstation.c | 6 +++--- include/ntuser.h | 2 +- programs/explorer/desktop.c | 2 +- server/winstation.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 62593ca046f..c433ea6ec88 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -256,7 +256,7 @@ HDESK WINAPI CreateDesktopW( LPCWSTR name, LPCWSTR device, LPDEVMODEW devmode, OBJECT_ATTRIBUTES attr; UNICODE_STRING str; - if (device || (devmode && !(flags & DF_WINE_CREATE_DESKTOP))) + if (device || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP))) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index b187b246941..9df27517a43 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -47,7 +47,7 @@ BOOL is_virtual_desktop(void) DWORD len; if (!NtUserGetObjectInformation( desktop, UOI_FLAGS, &flags, sizeof(flags), &len )) return FALSE; - return !!(flags.dwFlags & DF_WINE_CREATE_DESKTOP); + return !!(flags.dwFlags & DF_WINE_VIRTUAL_DESKTOP); } /*********************************************************************** @@ -154,7 +154,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *dev WCHAR buffer[MAX_PATH]; HANDLE ret; - if ((device && device->Length) || (devmode && !(flags & DF_WINE_CREATE_DESKTOP))) + if ((device && device->Length) || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP))) { RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return 0; @@ -184,7 +184,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *dev } /* force update display cache to use virtual desktop display settings */ - if (flags & DF_WINE_CREATE_DESKTOP) update_display_cache( TRUE ); + if (flags & DF_WINE_VIRTUAL_DESKTOP) update_display_cache( TRUE ); return ret; } diff --git a/include/ntuser.h b/include/ntuser.h index 31b93ef36e9..e60efc11b6f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,7 +297,7 @@ struct unpack_dde_message_result #define SPY_RESULT_DEFWND 0x0002 /* CreateDesktop wine specific flag */ -#define DF_WINE_CREATE_DESKTOP 0x80000000 +#define DF_WINE_VIRTUAL_DESKTOP 0x80000000 /* NtUserMessageCall codes */ enum diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 65a89862190..aa80e353143 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1095,7 +1095,7 @@ void manage_desktop( WCHAR *arg ) DEVMODEW devmode = {.dmPelsWidth = width, .dmPelsHeight = height}; /* magic: desktop "root" means use the root window */ if ((using_root = !wcsicmp( name, L"root" ))) desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - else desktop = CreateDesktopW( name, NULL, &devmode, DF_WINE_CREATE_DESKTOP, DESKTOP_ALL_ACCESS, NULL ); + else desktop = CreateDesktopW( name, NULL, &devmode, DF_WINE_VIRTUAL_DESKTOP, DESKTOP_ALL_ACCESS, NULL ); if (!desktop) { ERR( "failed to create desktop %s error %ld\n", debugstr_w(name), GetLastError() ); diff --git a/server/winstation.c b/server/winstation.c index 5903497d61e..5c59fbffae1 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -243,7 +243,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned } else { - desktop->flags |= (flags & DF_WINE_CREATE_DESKTOP); + desktop->flags |= (flags & DF_WINE_VIRTUAL_DESKTOP); clear_error(); } }

1 0

Shaun Ren : sapi: Implement ISpeechObjectTokens::Invoke.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 6e8d4508048941015e62c42372a584d9e0dd4931 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e8d4508048941015e62c42372a584… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sun Feb 11 00:29:46 2024 -0500 sapi: Implement ISpeechObjectTokens::Invoke. --- dlls/sapi/dispatch.c | 1 + dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/token.c | 11 ++++++++++- dlls/sapi/token.c | 14 ++++++++++++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/dispatch.c b/dlls/sapi/dispatch.c index df0c6c9bf9c..731ae9ae48f 100644 --- a/dlls/sapi/dispatch.c +++ b/dlls/sapi/dispatch.c @@ -35,6 +35,7 @@ static ITypeInfo *typeinfos[last_tid]; static REFIID tid_id[] = { &IID_ISpeechObjectToken, + &IID_ISpeechObjectTokens, }; HRESULT get_typeinfo(enum type_id tid, ITypeInfo **ret) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 9a3c92cc4dc..55e1460ad38 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -56,6 +56,7 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ); enum type_id { ISpeechObjectToken_tid, + ISpeechObjectTokens_tid, last_tid }; diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 89cbb5150a4..6d2c40ea154 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -256,7 +256,8 @@ static void test_token_enum(void) ISpObjectToken *out_tokens[5]; WCHAR token_id[MAX_PATH]; ULONG count; - VARIANT vars[3]; + VARIANT vars[3], ret; + DISPPARAMS params; int i; hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, @@ -402,6 +403,14 @@ static void test_token_enum(void) IEnumVARIANT_Release( enumvar ); + memset( &params, 0, sizeof(params) ); + VariantInit( &ret ); + hr = ISpeechObjectTokens_Invoke( speech_tokens, DISPID_SOTsCount, &IID_NULL, 0, + DISPATCH_PROPERTYGET, &params, &ret, NULL, NULL ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( V_VT( &ret ) == VT_I4, "got %#x\n", V_VT( &ret ) ); + ok( V_I4( &ret ) == 3, "got %ld\n", V_I4( &ret ) ); + ISpeechObjectTokens_Release( speech_tokens ); ISpObjectTokenEnumBuilder_Release( token_enum ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b7f78fe98bd..ad8163c9567 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -1339,8 +1339,18 @@ static HRESULT WINAPI speech_tokens_Invoke( ISpeechObjectTokens *iface, EXCEPINFO *excepinfo, UINT *argerr ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + ITypeInfo *ti; + HRESULT hr; + + TRACE( "(%p)->(%ld %s %#lx %#x %p %p %p %p)\n", iface, dispid, + debugstr_guid( iid ), lcid, flags, params, result, excepinfo, argerr ); + + if (FAILED(hr = get_typeinfo( ISpeechObjectTokens_tid, &ti ))) + return hr; + hr = ITypeInfo_Invoke( ti, iface, dispid, flags, params, result, excepinfo, argerr ); + ITypeInfo_Release( ti ); + + return hr; } static HRESULT WINAPI speech_tokens_get_Count( ISpeechObjectTokens *iface,

1 0

Zhiyi Zhang : server: Inherit internal desktop flags when creating desktops.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: ca97cb87008293f7893a5dd4d082b50c2cfbfb81 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca97cb87008293f7893a5dd4d082b5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 7 22:25:24 2024 +0800 server: Inherit internal desktop flags when creating desktops. Based on Rémi's idea. CEF applications create their own desktops and so is_virtual_desktop() could incorrectly report that virtual desktop is off if DF_WINE_VIRTUAL_DESKTOP is not inherited. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55810 --- dlls/user32/winstation.c | 3 ++- include/ntuser.h | 1 + programs/explorer/desktop.c | 2 +- server/winstation.c | 14 ++++++++++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index c433ea6ec88..ec8be243b32 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -256,7 +256,8 @@ HDESK WINAPI CreateDesktopW( LPCWSTR name, LPCWSTR device, LPDEVMODEW devmode, OBJECT_ATTRIBUTES attr; UNICODE_STRING str; - if (device || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP))) + if (device || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP)) + || (flags & DF_WINE_ROOT_DESKTOP && flags & DF_WINE_VIRTUAL_DESKTOP)) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index e60efc11b6f..86f847b8b83 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,6 +297,7 @@ struct unpack_dde_message_result #define SPY_RESULT_DEFWND 0x0002 /* CreateDesktop wine specific flag */ +#define DF_WINE_ROOT_DESKTOP 0x40000000 #define DF_WINE_VIRTUAL_DESKTOP 0x80000000 /* NtUserMessageCall codes */ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index aa80e353143..4e8f9a84c07 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1094,7 +1094,7 @@ void manage_desktop( WCHAR *arg ) { DEVMODEW devmode = {.dmPelsWidth = width, .dmPelsHeight = height}; /* magic: desktop "root" means use the root window */ - if ((using_root = !wcsicmp( name, L"root" ))) desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + if ((using_root = !wcsicmp( name, L"root" ))) desktop = CreateDesktopW( name, NULL, NULL, DF_WINE_ROOT_DESKTOP, DESKTOP_ALL_ACCESS, NULL ); else desktop = CreateDesktopW( name, NULL, &devmode, DF_WINE_VIRTUAL_DESKTOP, DESKTOP_ALL_ACCESS, NULL ); if (!desktop) { diff --git a/server/winstation.c b/server/winstation.c index 5c59fbffae1..930c5c90d97 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -221,14 +221,24 @@ struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, u static struct desktop *create_desktop( const struct unicode_str *name, unsigned int attr, unsigned int flags, struct winstation *winstation ) { - struct desktop *desktop; + struct desktop *desktop, *current_desktop; if ((desktop = create_named_object( &winstation->obj, &desktop_ops, name, attr, NULL ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { /* initialize it if it didn't already exist */ + desktop->flags = flags; + + /* inherit DF_WINE_*_DESKTOP flags if none of them are specified */ + if (!(flags & (DF_WINE_ROOT_DESKTOP | DF_WINE_VIRTUAL_DESKTOP)) + && (current_desktop = get_thread_desktop( current, 0 ))) + { + desktop->flags |= current_desktop->flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP); + release_object( current_desktop ); + } + desktop->winstation = (struct winstation *)grab_object( winstation ); desktop->top_window = NULL; desktop->msg_window = NULL; @@ -243,7 +253,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned } else { - desktop->flags |= (flags & DF_WINE_VIRTUAL_DESKTOP); + desktop->flags |= flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP); clear_error(); } }

1 0

Shaun Ren : sapi: Implement ISpeechObjectToken::GetIDsOfNames.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 59a7ee1a2cf8b0b399e3c4201706197b7b035224 URL: https://gitlab.winehq.org/wine/wine/-/commit/59a7ee1a2cf8b0b399e3c420170619… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sun Feb 11 14:21:50 2024 -0500 sapi: Implement ISpeechObjectToken::GetIDsOfNames. --- dlls/sapi/tests/token.c | 7 +++++++ dlls/sapi/token.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index ec8a101fea4..6265cde2bc3 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -660,6 +660,7 @@ static IClassFactory test_class_cf = { &ClassFactoryVtbl }; static void test_object_token(void) { static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Winetest\\sapi\\TestToken"; + static const WCHAR *get_description = L"GetDescription"; ISpObjectToken *token; IDispatch *disp; @@ -671,6 +672,7 @@ static void test_object_token(void) ISpObjectTokenCategory *cat; DWORD regid; IUnknown *obj; + DISPID dispid; DISPPARAMS params; VARIANT arg, ret; @@ -919,6 +921,11 @@ static void test_object_token(void) ok( tempB && !wcscmp( tempB, L"TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) ); SysFreeString( tempB ); + dispid = 0xdeadbeef; + hr = ISpeechObjectToken_GetIDsOfNames( speech_token, &IID_NULL, (WCHAR **)&get_description, 1, 0x409, &dispid ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( dispid == DISPID_SOTGetDescription, "got %08lx\n", dispid ); + memset( &params, 0, sizeof(params) ); params.cArgs = 1; params.cNamedArgs = 0; diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index c8cb806bbae..888da86d7a4 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -1787,8 +1787,18 @@ static HRESULT WINAPI speech_token_GetIDsOfNames( ISpeechObjectToken *iface, LCID lcid, DISPID *dispids ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + ITypeInfo *ti; + HRESULT hr; + + TRACE( "(%p)->(%s %p %u %#lx %p)\n", + iface, debugstr_guid( iid ), names, count, lcid, dispids ); + + if (FAILED(hr = get_typeinfo( ISpeechObjectToken_tid, &ti ))) + return hr; + hr = ITypeInfo_GetIDsOfNames( ti, names, count, dispids ); + ITypeInfo_Release( ti ); + + return hr; } static HRESULT WINAPI speech_token_Invoke( ISpeechObjectToken *iface,

1 0

Shaun Ren : sapi: Implement ISpeechObjectToken::GetDescription.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: b6c1760727dae433570ef0dffb985c751d4dc0bc URL: https://gitlab.winehq.org/wine/wine/-/commit/b6c1760727dae433570ef0dffb985c… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Feb 8 20:20:36 2024 -0500 sapi: Implement ISpeechObjectToken::GetDescription. --- dlls/sapi/Makefile.in | 2 +- dlls/sapi/tests/Makefile.in | 2 +- dlls/sapi/tests/token.c | 58 +++++++++++++++++++++++++++++++++++++++++++-- dlls/sapi/token.c | 23 ++++++++++++++++-- 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index 008d0f74545..24a1e055766 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -1,5 +1,5 @@ MODULE = sapi.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = uuid ole32 oleaut32 user32 advapi32 DELAYIMPORTS = winmm SOURCES = \ diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in index 4c107d5e994..4e792f2daae 100644 --- a/dlls/sapi/tests/Makefile.in +++ b/dlls/sapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = sapi.dll -IMPORTS = ole32 user32 advapi32 winmm +IMPORTS = ole32 oleaut32 user32 advapi32 winmm SOURCES = \ automation.c \ diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 543b19ec69a..a651eb47c62 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -657,7 +657,7 @@ static IClassFactory test_class_cf = { &ClassFactoryVtbl }; static void test_object_token(void) { - static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Wine\\Winetest\\sapi\\TestToken"; + static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Winetest\\sapi\\TestToken"; ISpObjectToken *token; IDispatch *disp; @@ -665,6 +665,7 @@ static void test_object_token(void) ISpDataKey *sub_key; HRESULT hr; LPWSTR tempW, token_id; + BSTR tempB; ISpObjectTokenCategory *cat; DWORD regid; IUnknown *obj; @@ -863,11 +864,64 @@ static void test_object_token(void) CoTaskMemFree( tempW ); } + hr = ISpObjectToken_SetStringValue( token, L"409", L"409 - TestToken" ); + ok( hr == S_OK, "got %08lx\n", hr ); + hr = ISpObjectToken_SetStringValue( token, L"407", L"407 - TestToken" ); + ok( hr == S_OK, "got %08lx\n", hr ); + hr = ISpObjectToken_SetStringValue( token, L"E40C", L"E40C - TestToken" ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpObjectToken_QueryInterface( token, &IID_ISpeechObjectToken, (void **)&speech_token ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpeechObjectToken_GetDescription( speech_token, 0x409, NULL ); + ok( hr == E_POINTER, "got %08lx\n", hr ); + + tempB = NULL; + hr = ISpeechObjectToken_GetDescription( speech_token, 0x409, &tempB ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( tempB && !wcscmp( tempB, L"409 - TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) ); + SysFreeString( tempB ); + + tempB = NULL; + hr = ISpeechObjectToken_GetDescription( speech_token, 0x10407, &tempB ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( tempB && !wcscmp( tempB, L"407 - TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) ); + SysFreeString( tempB ); + + tempB = NULL; + hr = ISpeechObjectToken_GetDescription( speech_token, 0xE40C, &tempB ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( tempB && !wcscmp( tempB, L"E40C - TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) ); + SysFreeString( tempB ); + + tempB = (BSTR)0xdeadbeef; + hr = ISpeechObjectToken_GetDescription( speech_token, 0x406, &tempB ); + ok( hr == SPERR_NOT_FOUND, "got %08lx\n", hr ); + ok( tempB == (BSTR)0xdeadbeef || broken(tempB == NULL) /* < win7 */, "got %p\n", tempB ); + + hr = ISpObjectToken_SetStringValue( token, NULL, L"TestToken" ); + ok( hr == S_OK, "got %08lx\n", hr ); + + tempB = NULL; + hr = ISpeechObjectToken_GetDescription( speech_token, 0x406, &tempB ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( tempB && !wcscmp( tempB, L"TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) ); + SysFreeString( tempB ); + + tempB = NULL; + hr = ISpeechObjectToken_GetDescription( speech_token, 0x0, &tempB ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( tempB && !wcscmp( tempB, L"TestToken" ), "got %s\n", wine_dbgstr_w( tempB ) ); + SysFreeString( tempB ); + + ISpeechObjectToken_Release( speech_token ); + ISpObjectToken_Release( test_class_token ); IUnknown_Release( obj ); ISpObjectToken_Release( token ); - RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest\\sapi" ); + RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Winetest\\sapi" ); } START_TEST(token) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 53b64a4383f..e5d87505e34 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -1829,8 +1829,27 @@ static HRESULT WINAPI speech_token_get_Category( ISpeechObjectToken *iface, static HRESULT WINAPI speech_token_GetDescription( ISpeechObjectToken *iface, LONG locale, BSTR *desc ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpeechObjectToken( iface ); + WCHAR langid[5]; + WCHAR *desc_wstr = NULL; + HRESULT hr; + + TRACE( "(%p)->(%#lx %p)\n", This, locale, desc ); + + if (!desc) return E_POINTER; + + swprintf( langid, ARRAY_SIZE( langid ), L"%X", LANGIDFROMLCID( locale ) ); + + hr = ISpObjectToken_GetStringValue( &This->ISpObjectToken_iface, langid, &desc_wstr ); + if (hr == SPERR_NOT_FOUND) + hr = ISpObjectToken_GetStringValue( &This->ISpObjectToken_iface, NULL, &desc_wstr ); + if (FAILED(hr)) + return hr; + + *desc = SysAllocString( desc_wstr ); + + CoTaskMemFree( desc_wstr ); + return *desc ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI speech_token_SetId( ISpeechObjectToken *iface,

1 0

Mohamad Al-Jaf : windows.security.authentication.onlineid: Implement IOnlineIdSystemAuthenticatorStatics::get_Default().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 23f360b1dbeae91a8da217fdd0b16a9a5083963b URL: https://gitlab.winehq.org/wine/wine/-/commit/23f360b1dbeae91a8da217fdd0b16a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Aug 9 01:53:10 2023 -0400 windows.security.authentication.onlineid: Implement IOnlineIdSystemAuthenticatorStatics::get_Default(). Called by Minecraft Education Edition. --- .../authenticator.c | 125 ++++++++++++++++++++- .../tests/onlineid.c | 9 ++ 2 files changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/windows.security.authentication.onlineid/authenticator.c b/dlls/windows.security.authentication.onlineid/authenticator.c index c79dbdc89b6..b781be2595f 100644 --- a/dlls/windows.security.authentication.onlineid/authenticator.c +++ b/dlls/windows.security.authentication.onlineid/authenticator.c @@ -115,13 +115,134 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct authenticator +{ + IOnlineIdSystemAuthenticatorForUser IOnlineIdSystemAuthenticatorForUser_iface; + LONG ref; +}; + +static inline struct authenticator *impl_from_IOnlineIdSystemAuthenticatorForUser( IOnlineIdSystemAuthenticatorForUser *iface ) +{ + return CONTAINING_RECORD( iface, struct authenticator, IOnlineIdSystemAuthenticatorForUser_iface ); +} + +static HRESULT WINAPI authenticator_QueryInterface( IOnlineIdSystemAuthenticatorForUser *iface, REFIID iid, void **out ) +{ + struct authenticator *impl = impl_from_IOnlineIdSystemAuthenticatorForUser( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IOnlineIdSystemAuthenticatorForUser )) + { + *out = &impl->IOnlineIdSystemAuthenticatorForUser_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI authenticator_AddRef( IOnlineIdSystemAuthenticatorForUser *iface ) +{ + struct authenticator *impl = impl_from_IOnlineIdSystemAuthenticatorForUser( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI authenticator_Release( IOnlineIdSystemAuthenticatorForUser *iface ) +{ + struct authenticator *impl = impl_from_IOnlineIdSystemAuthenticatorForUser( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI authenticator_GetIids( IOnlineIdSystemAuthenticatorForUser *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_GetRuntimeClassName( IOnlineIdSystemAuthenticatorForUser *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_GetTrustLevel( IOnlineIdSystemAuthenticatorForUser *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_GetTicketAsync( IOnlineIdSystemAuthenticatorForUser *iface, IOnlineIdServiceTicketRequest *request, + IAsyncOperation_OnlineIdSystemTicketResult **operation ) +{ + FIXME( "iface %p, request %p, operation %p stub!\n", iface, request, operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_put_ApplicationId( IOnlineIdSystemAuthenticatorForUser *iface, GUID value ) +{ + FIXME( "iface %p, value %s stub!\n", iface, debugstr_guid( &value ) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_get_ApplicationId( IOnlineIdSystemAuthenticatorForUser *iface, GUID *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI authenticator_get_User( IOnlineIdSystemAuthenticatorForUser *iface, __x_ABI_CWindows_CSystem_CIUser **user ) +{ + FIXME( "iface %p, user %p stub!\n", iface, user ); + return E_NOTIMPL; +} + +static const struct IOnlineIdSystemAuthenticatorForUserVtbl authenticator_vtbl = +{ + authenticator_QueryInterface, + authenticator_AddRef, + authenticator_Release, + /* IInspectable methods */ + authenticator_GetIids, + authenticator_GetRuntimeClassName, + authenticator_GetTrustLevel, + /* IOnlineIdSystemAuthenticatorForUser methods */ + authenticator_GetTicketAsync, + authenticator_put_ApplicationId, + authenticator_get_ApplicationId, + authenticator_get_User, +}; + DEFINE_IINSPECTABLE( authenticator_statics, IOnlineIdSystemAuthenticatorStatics, struct authenticator_statics, IActivationFactory_iface ) static HRESULT WINAPI authenticator_statics_get_Default( IOnlineIdSystemAuthenticatorStatics *iface, IOnlineIdSystemAuthenticatorForUser **value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct authenticator *impl; + + TRACE( "iface %p, value %p\n", iface, value ); + + if (!value) return E_POINTER; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IOnlineIdSystemAuthenticatorForUser_iface.lpVtbl = &authenticator_vtbl; + impl->ref = 1; + + *value = &impl->IOnlineIdSystemAuthenticatorForUser_iface; + TRACE( "created IOnlineIdSystemAuthenticatorForUser %p.\n", *value ); + return S_OK; } static HRESULT WINAPI authenticator_statics_GetForUser( IOnlineIdSystemAuthenticatorStatics *iface, __x_ABI_CWindows_CSystem_CIUser *user, diff --git a/dlls/windows.security.authentication.onlineid/tests/onlineid.c b/dlls/windows.security.authentication.onlineid/tests/onlineid.c index f58fbb09078..e8f4e06ded3 100644 --- a/dlls/windows.security.authentication.onlineid/tests/onlineid.c +++ b/dlls/windows.security.authentication.onlineid/tests/onlineid.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_AuthenticatorStatics(void) { static const WCHAR *authenticator_statics_name = L"Windows.Security.Authentication.OnlineId.OnlineIdSystemAuthenticator"; + IOnlineIdSystemAuthenticatorForUser *authenticator_for_user = (void *)0xdeadbeef; IOnlineIdSystemAuthenticatorStatics *authenticator_statics = (void *)0xdeadbeef; IActivationFactory *factory = (void *)0xdeadbeef; HSTRING str; @@ -73,6 +74,14 @@ static void test_AuthenticatorStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IOnlineIdSystemAuthenticatorStatics, (void **)&authenticator_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IOnlineIdSystemAuthenticatorStatics_get_Default( authenticator_statics, NULL ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + hr = IOnlineIdSystemAuthenticatorStatics_get_Default( authenticator_statics, &authenticator_for_user ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( authenticator_for_user, &IID_IAgileObject ); + + IOnlineIdSystemAuthenticatorForUser_Release( authenticator_for_user ); ref = IOnlineIdSystemAuthenticatorStatics_Release( authenticator_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Shaun Ren : sapi: Implement IEnumVARIANT::Next for ISpeechObjectTokens.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 6f2a0c412fb5d09cf40b13e773529f4b9acd9ad3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f2a0c412fb5d09cf40b13e773529f… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue Feb 6 17:17:02 2024 -0500 sapi: Implement IEnumVARIANT::Next for ISpeechObjectTokens. --- dlls/sapi/tests/token.c | 28 ++++++++++++++++++++++++++++ dlls/sapi/token.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index a68a0b7cd46..89cbb5150a4 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -256,6 +256,7 @@ static void test_token_enum(void) ISpObjectToken *out_tokens[5]; WCHAR token_id[MAX_PATH]; ULONG count; + VARIANT vars[3]; int i; hr = CoCreateInstance( &CLSID_SpObjectTokenEnum, NULL, CLSCTX_INPROC_SERVER, @@ -372,6 +373,33 @@ static void test_token_enum(void) hr = IUnknown_QueryInterface( unk, &IID_IEnumVARIANT, (void **)&enumvar ); ok( hr == S_OK, "got %08lx\n", hr ); IUnknown_Release( unk ); + + V_VT( &vars[0] ) = VT_ILLEGAL; + V_DISPATCH( &vars[0] ) = (IDispatch *)0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 1, vars, NULL ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( V_VT( &vars[0] ) == VT_DISPATCH, "got %#x\n", V_VT( &vars[0] ) ); + ok( V_DISPATCH( &vars[0] ) != (IDispatch *)0xdeadbeef && V_DISPATCH( &vars[0] ) != NULL, + "got %p\n", V_DISPATCH( &vars[0] ) ); + VariantClear( &vars[0] ); + + for ( i = 0; i < 3; i++ ) { + V_VT( &vars[i] ) = VT_ILLEGAL; + V_DISPATCH( &vars[i] ) = (IDispatch *)0xdeadbeef; + } + count = 0xdeadbeef; + + hr = IEnumVARIANT_Next( enumvar, 3, vars, &count ); + ok( hr == S_FALSE, "got %08lx\n", hr ); + ok( count == 2, "got %lu\n", count ); + for ( i = 0; i < 2; i++ ) { + ok( V_VT( &vars[i] ) == VT_DISPATCH, "got %#x\n", V_VT( &vars[i] ) ); + ok( V_DISPATCH( &vars[i] ) != (IDispatch *)0xdeadbeef && V_DISPATCH( &vars[i] ) != NULL, + "got %p\n", V_DISPATCH( &vars[i] ) ); + VariantClear( &vars[i] ); + } + ok( V_VT( &vars[2] ) == VT_ILLEGAL, "got %#x\n", V_VT( &vars[2] ) ); + IEnumVARIANT_Release( enumvar ); ISpeechObjectTokens_Release( speech_tokens ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 2cfc34304c9..b7f78fe98bd 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -1206,8 +1206,41 @@ static ULONG WINAPI enum_var_Release( IEnumVARIANT *iface ) static HRESULT WINAPI enum_var_Next( IEnumVARIANT *iface, ULONG count, VARIANT *vars, ULONG *fetched ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct enum_var *This = impl_from_IEnumVARIANT( iface ); + ULONG i, total; + HRESULT hr; + + TRACE( "(%p)->(%lu %p %p)\n", This, count, vars, fetched ); + + if (fetched) *fetched = 0; + + if (FAILED(hr = ISpObjectTokenEnumBuilder_GetCount( This->token_enum, &total ))) + return hr; + + for ( i = 0; i < count && This->index < total; i++, This->index++ ) + { + ISpObjectToken *token; + IDispatch *disp; + + if (FAILED(hr = ISpObjectTokenEnumBuilder_Item( This->token_enum, This->index, &token ))) + goto fail; + + hr = ISpObjectToken_QueryInterface( token, &IID_IDispatch, (void **)&disp ); + ISpObjectToken_Release( token ); + if (FAILED(hr)) goto fail; + + VariantInit( &vars[i] ); + V_VT( &vars[i] ) = VT_DISPATCH; + V_DISPATCH( &vars[i] ) = disp; + } + + if (fetched) *fetched = i; + return i == count ? S_OK : S_FALSE; + +fail: + while (i--) + VariantClear( &vars[i] ); + return hr; } static HRESULT WINAPI enum_var_Skip( IEnumVARIANT *iface, ULONG count )

1 0