wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

[PATCH vkd3d 1/4] vkd3d-shader: Add shader_ver_ge version comparison function.
by Isabella Bosia 16 Sep '20

16 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fa35bc7..3d29d71 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -300,6 +300,11 @@ shader_input_sysval_semantic_names[] = {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, "finalLineDensityTessFactor"}, }; +static int shader_ver_ge(const struct vkd3d_shader_version *v, int major, int minor) +{ + return v->major > major || (v->major == major && v->minor >= minor); +} + static int VKD3D_PRINTF_FUNC(2, 3) shader_addline(struct vkd3d_string_buffer *buffer, const char *format, ...) { va_list args; @@ -579,7 +584,7 @@ static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, else { /* Pixel shaders 3.0 don't have usage semantics. */ - if (shader_version->major < 3 && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) + if (!shader_ver_ge(shader_version, 3, 0) && shader_version->type == VKD3D_SHADER_TYPE_PIXEL) return; else shader_addline(buffer, "_"); @@ -711,7 +716,7 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, case VKD3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0 use general purpose output registers * (VKD3DSPR_OUTPUT), which can include an address token. */ - if (shader_version->major >= 3) + if (shader_ver_ge(shader_version, 3, 0)) shader_addline(buffer, "o"); else shader_addline(buffer, "oT"); @@ -1239,7 +1244,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_TEX: - if (shader_version->major >= 2 && (ins->flags & VKD3DSI_TEXLD_PROJECT)) + if (shader_ver_ge(shader_version, 2, 0) && (ins->flags & VKD3DSI_TEXLD_PROJECT)) shader_addline(buffer, "p"); break; @@ -1252,7 +1257,7 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, static void shader_dump_register_space(struct vkd3d_string_buffer *buffer, unsigned int register_space, const struct vkd3d_shader_version *shader_version) { - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, ", space=%u", register_space); } @@ -1275,7 +1280,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); - if (shader_version->major >= 5 && shader_version->minor >= 1) + if (shader_ver_ge(shader_version, 5, 1)) shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); -- 2.25.1

2 7

[PATCH v2 3/3] sapi: Improve stub for ISpObjectToken::SetId.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change. .token_key will be used when implementing CreateInstance (for querying CLSID). It's still used in order to check if the registry key exists though (otherwise it would fail more tests). If this is not acceptable (as it is semi-unused), the alternative (I believe) would be to have it be a local variable and introduce a temporary .initialized member instead. Keeping it felt like the cleanest option to me, but please advise if this is not correct. I set function as a semi-stub because it completely ignores the category, which appears to be an important part of the function, even if it is passed as NULL (which auto-detects the category). dlls/sapi/tests/token.c | 16 ++++++++-------- dlls/sapi/token.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 887539778a9..1ca49398ad1 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -202,23 +202,23 @@ static void test_object_token(void) ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, L"bogus", NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\winetest bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); /* SetId succeeds even if the key is invalid, but exists */ hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE", FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); @@ -265,7 +265,7 @@ static void test_object_token(void) /* NULL appears to auto-detect the category */ hr = ISpObjectToken_SetId( token, NULL, token_id, FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index f7a00d73f02..b4a318b4ade 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -781,6 +781,8 @@ struct object_token { ISpObjectToken ISpObjectToken_iface; LONG ref; + + HKEY token_key; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -827,6 +829,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { + if (This->token_key) RegCloseKey( This->token_key ); heap_free( This ); } @@ -923,8 +926,28 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, LPCWSTR category_id, LPCWSTR token_id, BOOL create ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + BOOL res; + HRESULT hr; + HKEY root, key; + const WCHAR *subkey; + + FIXME( "(%p)->(%s %s %d): semi-stub\n", This, debugstr_w( category_id ), + debugstr_w(token_id), create ); + + if (This->token_key) return SPERR_ALREADY_INITIALIZED; + + if (!token_id) return E_POINTER; + + hr = parse_cat_id( token_id, &root, &subkey ); + if (hr != S_OK) return SPERR_NOT_FOUND; + + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (res) return SPERR_NOT_FOUND; + + This->token_key = key; + + return S_OK; } static HRESULT WINAPI token_GetId( ISpObjectToken *iface, @@ -1047,6 +1070,8 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) This->ISpObjectToken_iface.lpVtbl = &token_vtbl; This->ref = 1; + This->token_key = NULL; + hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); ISpObjectToken_Release( &This->ISpObjectToken_iface ); -- 2.28.0

2 1

[PATCH v2 2/2] kernel32: Use uppercase name in UpdateResourceW().
by Ziqing Hui 16 Sep '20

16 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Free allocated unicode string. Question: Do we need _TRY{}_EXCEPT{} here like in FindResourceExW() and FindResourceExA() ? dlls/kernel32/resource.c | 35 ++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/resource.c | 1 - 2 files changed, 33 insertions(+), 3 deletions(-)

2 1

[PATCH v2 1/2] kernel32/tests: Add more tests for UpdateResource.
by Ziqing Hui 16 Sep '20

16 Sep '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Fix test failure on win2008. dlls/kernel32/tests/resource.c | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)

2 1

[PATCH 1/8] gdi32: Implement AddFontMemResourceEx with temp files.
by Rémi Bernon 16 Sep '20

16 Sep '20

This makes WineEngAddFontMemResourceEx, as well as the support for loading font face from memory in freetype.c, obsolete. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/font.c | 68 +++++++++++++++++++++++++---------- dlls/gdi32/freetype.c | 78 ++++++++-------------------------------- dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 65 insertions(+), 84 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e099bec5e81..e176752c2ce 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3749,7 +3749,7 @@ fail: */ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { - int ret = WineEngAddFontResourceEx(str, fl, pdv); + int ret = WineEngAddFontResourceEx( str, fl, pdv, FALSE ); WCHAR *filename; BOOL hidden; @@ -3771,7 +3771,7 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) else if ((filename = get_scalable_filename( str, &hidden )) != NULL) { if (hidden) fl |= FR_PRIVATE | FR_NOT_ENUM; - ret = WineEngAddFontResourceEx( filename, fl, pdv ); + ret = WineEngAddFontResourceEx( filename, fl, pdv, FALSE ); HeapFree( GetProcessHeap(), 0, filename ); } } @@ -3799,8 +3799,13 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR str ) */ HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) { - HANDLE ret; - DWORD num_fonts; + static const WCHAR tmpfmt_w[] = {'%', 's', '\\', 'w', 'i', 'n', 'e', '-', 'f', + 'o', 'n', 't', '-', '%', '#', 'x', '-', '%', + '#', 'x', '.', 't', 'm', 'p', 0}; + HANDLE file; + WCHAR tmppath_w[MAX_PATH], filename_w[MAX_PATH]; + DWORD written; + LUID luid; if (!pbFont || !cbFont || !pcFonts) { @@ -3808,22 +3813,38 @@ HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD return NULL; } - ret = WineEngAddFontMemResourceEx(pbFont, cbFont, pdv, &num_fonts); - if (ret) + __TRY { *pcFonts = 0; } + __EXCEPT_PAGE_FAULT { - __TRY - { - *pcFonts = num_fonts; - } - __EXCEPT_PAGE_FAULT - { - WARN("page fault while writing to *pcFonts (%p)\n", pcFonts); - RemoveFontMemResourceEx(ret); - ret = 0; - } - __ENDTRY + WARN( "page fault while writing to *pcFonts (%p)\n", pcFonts ); + return NULL; } - return ret; + __ENDTRY + + GetTempPathW( MAX_PATH, tmppath_w ); + if (!AllocateLocallyUniqueId( &luid )) return NULL; + sprintfW( filename_w, tmpfmt_w, tmppath_w, luid.LowPart, luid.HighPart ); + TRACE( "writing font to temporary %s\n", debugstr_w(filename_w) ); + + file = CreateFileW( filename_w, GENERIC_WRITE, FILE_SHARE_DELETE, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, NULL ); + if (file == INVALID_HANDLE_VALUE) return NULL; + + if (WriteFile( file, pbFont, cbFont, &written, NULL ) && written == cbFont && + GetFinalPathNameByHandleW( file, filename_w, MAX_PATH, FILE_NAME_NORMALIZED )) + *pcFonts = WineEngAddFontResourceEx( filename_w, FR_PRIVATE, NULL, TRUE ); + + if (*pcFonts == 0) + { + CloseHandle( file ); + return NULL; + } + + /* FIXME: is the handle only for use in RemoveFontMemResourceEx or should it be a true handle? + * For now return something unique but quite random + */ + TRACE( "Returning handle %lx\n", ((INT_PTR)file) ^ 0x87654321 ); + return (HANDLE)(((INT_PTR)file) ^ 0x87654321); } /*********************************************************************** @@ -3831,7 +3852,16 @@ HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD */ BOOL WINAPI RemoveFontMemResourceEx( HANDLE fh ) { - FIXME("(%p) stub\n", fh); + HANDLE file = (HANDLE)(((INT_PTR)fh) ^ 0x87654321); + WCHAR filename_w[MAX_PATH]; + + TRACE( "(%p)\n", fh ); + if (!fh) return TRUE; + + if (GetFinalPathNameByHandleW( file, filename_w, MAX_PATH, FILE_NAME_NORMALIZED )) + WineEngRemoveFontResourceEx( filename_w, FR_PRIVATE, NULL ); + + CloseHandle( file ); return TRUE; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cf53f148ad1..bdd8d97b16d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -295,6 +295,7 @@ typedef struct tagFace { #define ADDFONT_ADD_TO_CACHE 0x04 #define ADDFONT_ADD_RESOURCE 0x08 /* added through AddFontResource */ #define ADDFONT_VERTICAL_FONT 0x10 +#define ADDFONT_ADD_MEMRESOURCE 0x20 /* added through AddFontMemResource */ #define ADDFONT_AA_FLAGS(flags) ((flags) << 16) typedef struct tagFamily { @@ -1044,8 +1045,7 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { - if (!face->file) - continue; + if (face->flags & ADDFONT_ADD_MEMRESOURCE) continue; file = strrchrW(face->file, '/'); if(!file) file = face->file; @@ -2592,8 +2592,7 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { - if (!face->file) - continue; + if (face->flags & ADDFONT_ADD_MEMRESOURCE) continue; file = strrchrW(face->file, '/'); if (!file) file = face->file; @@ -3327,7 +3326,7 @@ static void delete_external_font_keys(void) * WineEngAddFontResourceEx * */ -INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) +INT WineEngAddFontResourceEx( LPCWSTR file, DWORD flags, PVOID pdv, BOOL mem_resource ) { WCHAR path[MAX_PATH]; INT ret = 0; @@ -3337,6 +3336,7 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) if (ft_handle) /* do it only if we have freetype up and running */ { DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; + if (mem_resource) addfont_flags |= ADDFONT_ADD_MEMRESOURCE; EnterCriticalSection( &freetype_cs ); @@ -3346,12 +3346,12 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) if (!ret && !strchrW(file, '\\')) { /* Try in %WINDIR%/fonts, needed for Fotobuch Designer */ get_winfonts_dir_path( file, path ); - ret = add_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); + ret = add_font_resource( path, addfont_flags & ~ADDFONT_ADD_TO_CACHE ); /* Try in datadir/fonts (or builddir/fonts), needed for Magic the Gathering Online */ if (!ret) { get_data_dir_path( file, path ); - ret = add_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); + ret = add_font_resource( path, addfont_flags & ~ADDFONT_ADD_TO_CACHE ); } } @@ -3360,42 +3360,6 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) return ret; } -/************************************************************* - * WineEngAddFontMemResourceEx - * - */ -HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) -{ - GDI_CheckNotLock(); - - if (ft_handle) /* do it only if we have freetype up and running */ - { - PVOID pFontCopy = HeapAlloc(GetProcessHeap(), 0, cbFont); - - TRACE("Copying %d bytes of data from %p to %p\n", cbFont, pbFont, pFontCopy); - memcpy(pFontCopy, pbFont, cbFont); - - EnterCriticalSection( &freetype_cs ); - *pcFonts = AddFontToList(NULL, pFontCopy, cbFont, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE); - LeaveCriticalSection( &freetype_cs ); - - if (*pcFonts == 0) - { - TRACE("AddFontToList failed\n"); - HeapFree(GetProcessHeap(), 0, pFontCopy); - return 0; - } - /* FIXME: is the handle only for use in RemoveFontMemResourceEx or should it be a true handle? - * For now return something unique but quite random - */ - TRACE("Returning handle %lx\n", ((INT_PTR)pFontCopy)^0x87654321); - return (HANDLE)(((INT_PTR)pFontCopy)^0x87654321); - } - - *pcFonts = 0; - return 0; -} - /************************************************************* * WineEngRemoveFontResourceEx * @@ -5519,25 +5483,19 @@ static const VOID * get_GSUB_vert_feature(const GdiFont *font) static void fill_fileinfo_from_face( GdiFont *font, Face *face ) { WIN32_FILE_ATTRIBUTE_DATA info; - int len; + SIZE_T path_size; - if (!face->file) - { - font->fileinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo)); - font->fileinfo->size.QuadPart = face->font_data_size; - return; - } - - len = strlenW(face->file); - font->fileinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); + path_size = strlenW( face->file ) * sizeof(WCHAR); + font->fileinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo) + path_size ); if (GetFileAttributesExW(face->file, GetFileExInfoStandard, &info)) { font->fileinfo->writetime = info.ftLastWriteTime; font->fileinfo->size.QuadPart = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; strcpyW(font->fileinfo->path, face->file); } - else - memset(font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); + + /* clear the path if the face was supposed to be loaded from memory */ + if (face->flags & ADDFONT_ADD_MEMRESOURCE) memset( font->fileinfo->path, 0, path_size ); } /************************************************************* @@ -9292,9 +9250,9 @@ BOOL WineEngInit(void) return FALSE; } -INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) +INT WineEngAddFontResourceEx( LPCWSTR file, DWORD flags, PVOID pdv, BOOL mem_resource ) { - FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); + FIXME( "(%s, %x, %p, %d): stub\n", debugstr_w(file), flags, pdv, mem_resource ); return 1; } @@ -9304,12 +9262,6 @@ INT WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) return TRUE; } -HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) -{ - FIXME("(%p, %u, %p, %p): stub\n", pbFont, cbFont, pdv, pcFonts); - return NULL; -} - BOOL WineEngCreateScalableFontResource( DWORD hidden, LPCWSTR resource, LPCWSTR font_file, LPCWSTR font_path ) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b2502c4586..51398653bd4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -302,8 +302,7 @@ struct char_width_info INT unk; /* unknown */ }; -extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; -extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; +extern INT WineEngAddFontResourceEx( LPCWSTR, DWORD, PVOID, BOOL ) DECLSPEC_HIDDEN; extern BOOL WineEngCreateScalableFontResource(DWORD, LPCWSTR, LPCWSTR, LPCWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; -- 2.28.0

4 16

[PATCH v2 1/4] msxml3: Fix value of 'fetched' in IEnumVARIANT::Next() for IXMLDOMSelection.
by Gijs Vermeulen 16 Sep '20

16 Sep '20

From: Alexandre Abgrall <aabgrall98(a)gmail.com> It must be the number of elements returned in 'var', as specified here: https://docs.microsoft.com/en-us/windows/win32/api/oaidl/nf-oaidl-ienumvari… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40430 Signed-off-by: Alexandre Abgrall <aabgrall98(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msxml3/selection.c | 2 +- dlls/msxml3/tests/domdoc.c | 104 +++++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 31be4d8f10..3698d036d4 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -519,7 +519,7 @@ static HRESULT WINAPI enumvariant_Next( ret_count++; } - if (fetched) (*fetched)++; + if (fetched) *fetched = ret_count; /* we need to advance one step more for some reason */ if (ret_count) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7f3b42d840..8c605573ad 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9976,9 +9976,9 @@ static void test_selection(void) IXMLDOMNode *node; IDispatch *disp; VARIANT_BOOL b; + VARIANT v[3]; HRESULT hr; DISPID did; - VARIANT v; BSTR name; ULONG ret; LONG len; @@ -10148,33 +10148,32 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); /* no-op if zero count */ - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 0, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 0, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_I2, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_I2, "got var type %d\n", V_VT(&v[0])); /* positive count, null array pointer */ hr = IEnumVARIANT_Next(enum1, 1, NULL, NULL); EXPECT_HR(hr, E_INVALIDARG); - ret = 1; hr = IEnumVARIANT_Next(enum1, 1, NULL, &ret); EXPECT_HR(hr, E_INVALIDARG); ok(ret == 0, "got %d\n", ret); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); /* list cursor is updated */ hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10185,18 +10184,18 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); - V_VT(&v) = VT_I2; - hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + V_VT(&v[0]) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v[0], NULL); EXPECT_HR(hr, S_OK); - ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); EXPECT_HR(hr, S_OK); hr = IXMLDOMNode_get_nodeName(node, &name); EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); SysFreeString(name); IXMLDOMNode_Release(node); - VariantClear(&v); + VariantClear(&v[0]); IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); @@ -10207,6 +10206,81 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); + /* getting multiple elements */ + enum1 = NULL; + hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1); + EXPECT_HR(hr, S_OK); + ok(enum1 != NULL, "got %p\n", enum1); + + V_VT(&v[1]) = VT_EMPTY; + V_VT(&v[0]) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum1, 2, v, &ret); + EXPECT_HR(hr, S_OK); + ok(ret == 2, "got %d, expected 2\n", ret); + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1])); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"a"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + ok(!lstrcmpW(name, L"b"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + VariantClear(&v[1]); + VariantClear(&v[0]); + + /* IEnumVARIANT_Next makes the IXMLDOMSelection cursor advance one step more */ + hr = IXMLDOMSelection_nextNode(selection, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + /* The IEnumVARIANT cursor is still at position '2', */ + /* therefore attempting to fetch 4 elements yields 'c' and 'd' */ + V_VT(&v[2]) = VT_NULL; + V_VT(&v[1]) = VT_EMPTY; + V_VT(&v[0]) = VT_EMPTY; + hr = IEnumVARIANT_Next(enum1, 4, &v[0], &ret); + EXPECT_HR(hr, S_FALSE); + ok(ret == 2, "got %d, expected 2\n", ret); + + ok(V_VT(&v[0]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[0]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"c"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[1]) == VT_DISPATCH, "got var type %d\n", V_VT(&v[1])); + hr = IDispatch_QueryInterface(V_DISPATCH(&v[1]), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, L"d"), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + + ok(V_VT(&v[2]) == VT_EMPTY, "got var type %d, expected %d (VT_EMPTY)\n", V_VT(&v[2]), VT_EMPTY); + + VariantClear(&v[1]); + VariantClear(&v[0]); + + IEnumVARIANT_Release(enum1); + IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); IXMLDOMDocument_Release(doc); -- 2.28.0

3 8

[PATCH v2 2/3] sapi: Add stubs for SpObjectToken.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: - Fix test under Windows server (skip was for the wrong function) - Fix GetId test failure (see notes below). - Remove GetId implementation from patchset. The GetId test failure did not occur on my Windows 10 installation, as GetDefaultTokenId had already provided {0.0.0.00000000}.{guid}. Under my installation, the GUID refers to one of two devices in HLKM\Software\Microsoft\Windows\CurrentVersion\MMDevices\Audio\Render. My guess is that the audio device is being instantiated somehow. This would be an interesting area for further research, but for the moment I'd prefer to focus on fixing the bug instead. Since the required functions are SetId and CreateInstance, it doesn't appear that a correct ID is required for stubbing enough of either of these, so I don't believe it matters for this patchset. Regarding the test itself, I've cut the comparison in order to only check up to the length of the result of GetDefaultTokenId. It's admittedly a stop-gap measure, the test could also be removed. Regarding the debian test failures, I believe it's because the classes are not registered, ref. the comment at the top of sapi_classes.idl. It works on my end, after running `wineboot -u`. Original notes below: This patchset is progressing further towards fixing https://bugs.winehq.org/show_bug.cgi?id=49641 Though the tests reference GetCategory, it would require a fair amount of work to implement, so I've left it out of this patchset. I've kept the tests however, as they reveal some information about SetId (the primary target of this patchset). dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/token.c | 125 +++++++++++++++++ dlls/sapi/token.c | 276 +++++++++++++++++++++++++++++++++++++ include/sapi.idl | 13 ++ 6 files changed, 431 insertions(+) diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index e8d4ae01583..9c644001faa 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -110,6 +110,7 @@ static struct class_factory file_stream_cf = { { &class_factory_vtbl }, file_ static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_create }; static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create }; static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create }; +static struct class_factory token_cf = { { &class_factory_vtbl }, token_create }; /****************************************************************** * DllGetClassObject @@ -128,6 +129,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) cf = &token_category_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum )) cf = &token_enum_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_SpObjectToken )) + cf = &token_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpVoice )) cf = &speech_voice_cf.IClassFactory_iface; diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl index ed86d166fcd..082244e0812 100644 --- a/dlls/sapi/sapi_classes.idl +++ b/dlls/sapi/sapi_classes.idl @@ -51,6 +51,19 @@ coclass SpObjectTokenEnum [default] interface IEnumSpObjectTokens; } +[ + uuid(ef411752-3736-4cb4-9c8c-8ef4ccb58efe), + helpstring("Object Token"), + progid("SAPI.SpObjectToken.1"), + vi_progid("SAPI.SpObjectToken"), + threading(both) +] +coclass SpObjectToken +{ + interface ISpObjectToken; + [default] interface ISpDataKey; +} + [ uuid(96749377-3391-11d2-9ee3-00c04f797396), helpstring("Speech Voice"), diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index e9fed0ea443..414dea2755a 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -25,6 +25,7 @@ HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_H HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; static inline LPWSTR heap_strdupW(LPCWSTR str) { diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 58d69920fd5..887539778a9 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -174,6 +174,130 @@ static void test_default_token_id(void) ISpObjectTokenCategory_Release( cat ); } +static void test_object_token(void) +{ + ISpObjectToken *token; + HRESULT hr; + LPWSTR tempW, token_id; + ISpObjectTokenCategory *cat; + + hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectToken, (void **)&token ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectToken_GetId( token, NULL ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + tempW = (LPWSTR)0xdeadbeef; + hr = ISpObjectToken_GetId( token, &tempW ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( tempW == (LPWSTR)0xdeadbeef, "got %s\n", wine_dbgstr_w(tempW) ); + + hr = ISpObjectToken_GetCategory( token, NULL ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + cat = (LPVOID)0xdeadbeef; + hr = ISpObjectToken_GetCategory( token, &cat ); + todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); + + hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + hr = ISpObjectToken_SetId( token, L"bogus", NULL, FALSE ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\winetest bogus", FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + /* SetId succeeds even if the key is invalid, but exists */ + hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE", FALSE ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); + todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); + todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectToken_GetId( token, NULL ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = ISpObjectToken_GetCategory( token, NULL ); + todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + + tempW = NULL; + hr = ISpObjectToken_GetId( token, &tempW ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( tempW != NULL, "got %p\n", tempW ); + if (tempW) { + ok( !wcscmp(tempW, L"HKEY_LOCAL_MACHINE\\SOFTWARE"), "got %s\n", + wine_dbgstr_w(tempW) ); + CoTaskMemFree( tempW ); + } + + cat = (LPVOID)0xdeadbeef; + hr = ISpObjectToken_GetCategory( token, &cat ); + todo_wine ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); + ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); + + /* get the default token id for SPCAT_AUDIOOUT */ + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + if (hr == SPERR_NOT_FOUND) { + skip( "AudioOutput category not found for GetDefaultTokenId\n" ); + return; + } + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + ISpObjectTokenCategory_Release( cat ); + + /* recreate token in order to SetId again */ + ISpObjectToken_Release( token ); + hr = CoCreateInstance( &CLSID_SpObjectToken, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectToken, (void **)&token ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* NULL appears to auto-detect the category */ + hr = ISpObjectToken_SetId( token, NULL, token_id, FALSE ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + tempW = NULL; + hr = ISpObjectToken_GetId( token, &tempW ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( tempW != NULL, "got %p\n", tempW ); + if (tempW) { + ok( !wcsncmp(tempW, token_id, wcslen(token_id)), + "got %s (expected %s)\n", wine_dbgstr_w(tempW), wine_dbgstr_w(token_id) ); + CoTaskMemFree( tempW ); + } + + cat = (LPVOID)0xdeadbeef; + hr = ISpObjectToken_GetCategory( token, &cat ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( cat != (LPVOID)0xdeadbeef, "got %p\n", cat ); + if (cat != (LPVOID)0xdeadbeef) { + tempW = NULL; + hr = ISpObjectTokenCategory_GetId( cat, &tempW ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( tempW != NULL, "got %p\n", tempW ); + if (tempW) { + ok( !wcscmp(tempW, SPCAT_AUDIOOUT), "got %s\n", wine_dbgstr_w(tempW) ); + CoTaskMemFree( tempW ); + } + + /* not freed by ISpObjectToken_Release */ + ISpObjectTokenCategory_Release( cat ); + } + + ISpObjectToken_Release( token ); +} + START_TEST(token) { CoInitialize( NULL ); @@ -181,5 +305,6 @@ START_TEST(token) test_token_category(); test_token_enum(); test_default_token_id(); + test_object_token(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 21cd958282f..f7a00d73f02 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -776,3 +776,279 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) ISpObjectTokenEnumBuilder_Release( &This->ISpObjectTokenEnumBuilder_iface ); return hr; } + +struct object_token +{ + ISpObjectToken ISpObjectToken_iface; + LONG ref; +}; + +static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) +{ + return CONTAINING_RECORD( iface, struct object_token, ISpObjectToken_iface ); +} + +static HRESULT WINAPI token_QueryInterface( ISpObjectToken *iface, + REFIID iid, void **obj ) +{ + struct object_token *This = impl_from_ISpObjectToken( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_ISpDataKey ) || + IsEqualIID( iid, &IID_ISpObjectToken )) + { + ISpObjectToken_AddRef( iface ); + *obj = iface; + return S_OK; + } + + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI token_AddRef( ISpObjectToken *iface ) +{ + struct object_token *This = impl_from_ISpObjectToken( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %u\n", This, ref ); + return ref; +} + +static ULONG WINAPI token_Release( ISpObjectToken *iface ) +{ + struct object_token *This = impl_from_ISpObjectToken( iface ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE( "(%p) ref = %u\n", This, ref ); + + if (!ref) + { + heap_free( This ); + } + + return ref; +} + +static HRESULT WINAPI token_SetData( ISpObjectToken *iface, + LPCWSTR name, ULONG size, + const BYTE *data ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetData( ISpObjectToken *iface, + LPCWSTR name, ULONG *size, + BYTE *data ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_SetStringValue( ISpObjectToken *iface, + LPCWSTR name, LPCWSTR value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetStringValue( ISpObjectToken *iface, + LPCWSTR name, LPWSTR *value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_SetDWORD( ISpObjectToken *iface, + LPCWSTR name, DWORD value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetDWORD( ISpObjectToken *iface, + LPCWSTR name, DWORD *pdwValue ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_OpenKey( ISpObjectToken *iface, + LPCWSTR name, ISpDataKey **sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_CreateKey( ISpObjectToken *iface, + LPCWSTR name, ISpDataKey **sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_DeleteKey( ISpObjectToken *iface, + LPCWSTR name ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_DeleteValue( ISpObjectToken *iface, + LPCWSTR name ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_EnumKeys( ISpObjectToken *iface, + ULONG index, LPWSTR *sub_key ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_EnumValues( ISpObjectToken *iface, + ULONG index, LPWSTR *value ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_SetId( ISpObjectToken *iface, + LPCWSTR category_id, LPCWSTR token_id, + BOOL create ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetId( ISpObjectToken *iface, + LPWSTR *token_id ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetCategory( ISpObjectToken *iface, + ISpObjectTokenCategory **category ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_CreateInstance( ISpObjectToken *iface, + IUnknown *outer, + DWORD class_context, + REFIID riid, + void **object ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_GetStorageFileName( ISpObjectToken *iface, + REFCLSID caller, + LPCWSTR key_name, + LPCWSTR filename, + ULONG folder, + LPWSTR *filepath ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_RemoveStorageFileName( ISpObjectToken *iface, + REFCLSID caller, + LPCWSTR key_name, + BOOL delete_file ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_Remove( ISpObjectToken *iface, + REFCLSID caller ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_IsUISupported( ISpObjectToken *iface, + LPCWSTR ui_type, + void *extra_data, + ULONG extra_data_size, + IUnknown *object, + BOOL *supported ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_DisplayUI( ISpObjectToken *iface, + HWND parent, + LPCWSTR title, + LPCWSTR ui_type, + void *extra_data, + ULONG extra_data_size, + IUnknown *object ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_MatchesAttributes( ISpObjectToken *iface, + LPCWSTR attributes, + BOOL *matches ) +{ + FIXME( "stub\n" ); + return E_NOTIMPL; +} + +const struct ISpObjectTokenVtbl token_vtbl = +{ + token_QueryInterface, + token_AddRef, + token_Release, + token_SetData, + token_GetData, + token_SetStringValue, + token_GetStringValue, + token_SetDWORD, + token_GetDWORD, + token_OpenKey, + token_CreateKey, + token_DeleteKey, + token_DeleteValue, + token_EnumKeys, + token_EnumValues, + token_SetId, + token_GetId, + token_GetCategory, + token_CreateInstance, + token_GetStorageFileName, + token_RemoveStorageFileName, + token_Remove, + token_IsUISupported, + token_DisplayUI, + token_MatchesAttributes +}; + +HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) +{ + struct object_token *This = heap_alloc( sizeof(*This) ); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->ISpObjectToken_iface.lpVtbl = &token_vtbl; + This->ref = 1; + + hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); + + ISpObjectToken_Release( &This->ISpObjectToken_iface ); + return hr; +} diff --git a/include/sapi.idl b/include/sapi.idl index 9e6ba5be5ea..0a7a034cace 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1064,6 +1064,19 @@ library SpeechLib interface ISpObjectTokenCategory; } + [ + uuid(ef411752-3736-4cb4-9c8c-8ef4ccb58efe), + helpstring("Object Token"), + progid("SAPI.SpObjectToken.1"), + vi_progid("SAPI.SpObjectToken"), + threading(both) + ] + coclass SpObjectToken + { + interface ISpObjectToken; + [default] interface ISpDataKey; + } + [ uuid(3bee4890-4fe9-4a37-8c1e-5e7e12791c1f) ] -- 2.28.0

2 1

[PATCH v2 1/3] sapi: Fix MMAudioOut registry key location.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: no change dlls/sapi/sapi.rgs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index 8c5f862d6b7..331e115ae71 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -9,9 +9,12 @@ HKLM NoRemove AudioOutput { val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioOutput\TokenEnums\MMAudioOut\' - NoRemove MMAudioOut + NoRemove TokenEnums { - val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + NoRemove MMAudioOut + { + val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + } } } NoRemove Voices -- 2.28.0

1 0

[PATCH 4/4] sapi: Implement ISpObjectToken::GetId.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This function is not strictly necessary for the bug, but it was simple enough to implement. dlls/sapi/tests/token.c | 14 +++++++------- dlls/sapi/token.c | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index db41de3d53a..3bbecf67e44 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -186,11 +186,11 @@ static void test_object_token(void) ok( hr == S_OK, "got %08x\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); - todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); tempW = (LPWSTR)0xdeadbeef; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); ok( tempW == (LPWSTR)0xdeadbeef, "got %s\n", wine_dbgstr_w(tempW) ); hr = ISpObjectToken_GetCategory( token, NULL ); @@ -221,15 +221,15 @@ static void test_object_token(void) ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_GetCategory( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( tempW != NULL, "got %p\n", tempW ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( tempW != NULL, "got %p\n", tempW ); if (tempW) { ok( !wcscmp(tempW, L"HKEY_LOCAL_MACHINE\\SOFTWARE"), "got %s\n", wine_dbgstr_w(tempW) ); @@ -269,8 +269,8 @@ static void test_object_token(void) tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( tempW != NULL, "got %p\n", tempW ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( tempW != NULL, "got %p\n", tempW ); if (tempW) { ok( !wcscmp(tempW, token_id), "got %s\n", wine_dbgstr_w(tempW) ); CoTaskMemFree( tempW ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b4a318b4ade..955ee738f71 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -783,6 +783,7 @@ struct object_token LONG ref; HKEY token_key; + LPWSTR token_id; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -830,6 +831,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { if (This->token_key) RegCloseKey( This->token_key ); + if (This->token_id) heap_free( This->token_id ); heap_free( This ); } @@ -946,6 +948,7 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, if (res) return SPERR_NOT_FOUND; This->token_key = key; + This->token_id = heap_strdupW( token_id ); return S_OK; } @@ -953,8 +956,18 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, static HRESULT WINAPI token_GetId( ISpObjectToken *iface, LPWSTR *token_id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + + TRACE( "(%p)->(%p)\n", This, token_id ); + + if (!This->token_id) return SPERR_UNINITIALIZED; + + if (!token_id) return E_POINTER; + + *token_id = CoTaskMemAlloc( lstrlenW( This->token_id ) * sizeof( WCHAR ) ); + wcscpy( *token_id, This->token_id ); + + return S_OK; } static HRESULT WINAPI token_GetCategory( ISpObjectToken *iface, @@ -1071,6 +1084,7 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) This->ref = 1; This->token_key = NULL; + This->token_id = NULL; hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); -- 2.28.0

2 1

[PATCH 3/4] sapi: Improve stub for ISpObjectToken::SetId.
by Myah Caron 16 Sep '20

16 Sep '20

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- The last test will likely fail under Marvin due to patch #1. However it succeeds under my prefix (after running `wineboot -u` to update the registry keys). .token_key will be used when implementing CreateInstance (for querying CLSID). It's still used in order to check if the registry key exists though (otherwise it would fail more tests). If this is not acceptable (as it is semi-unused), the alternative (I believe) would be to have it be a local variable instead, and either introduce a temporary .initialized member, or use .token_id from #4. Keeping it felt like the cleanest option to me, but please advise if this is not correct. I set function as a semi-stub because it completely ignores the category, which appears to be an important part of the function, even if it is passed as NULL (which auto-detects the category). dlls/sapi/tests/token.c | 16 ++++++++-------- dlls/sapi/token.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9558022b3f4..db41de3d53a 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -202,23 +202,23 @@ static void test_object_token(void) ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, L"bogus", NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\winetest bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); /* SetId succeeds even if the key is invalid, but exists */ hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE", FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); @@ -265,7 +265,7 @@ static void test_object_token(void) /* NULL appears to auto-detect the category */ hr = ISpObjectToken_SetId( token, NULL, token_id, FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index f7a00d73f02..b4a318b4ade 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -781,6 +781,8 @@ struct object_token { ISpObjectToken ISpObjectToken_iface; LONG ref; + + HKEY token_key; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -827,6 +829,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { + if (This->token_key) RegCloseKey( This->token_key ); heap_free( This ); } @@ -923,8 +926,28 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, LPCWSTR category_id, LPCWSTR token_id, BOOL create ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + BOOL res; + HRESULT hr; + HKEY root, key; + const WCHAR *subkey; + + FIXME( "(%p)->(%s %s %d): semi-stub\n", This, debugstr_w( category_id ), + debugstr_w(token_id), create ); + + if (This->token_key) return SPERR_ALREADY_INITIALIZED; + + if (!token_id) return E_POINTER; + + hr = parse_cat_id( token_id, &root, &subkey ); + if (hr != S_OK) return SPERR_NOT_FOUND; + + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (res) return SPERR_NOT_FOUND; + + This->token_key = key; + + return S_OK; } static HRESULT WINAPI token_GetId( ISpObjectToken *iface, @@ -1047,6 +1070,8 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) This->ISpObjectToken_iface.lpVtbl = &token_vtbl; This->ref = 1; + This->token_key = NULL; + hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); ISpObjectToken_Release( &This->ISpObjectToken_iface ); -- 2.28.0

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel