October 2022 - Wine-Commits

Francois Gouget : d3d9/tests: Mark the test_cursor_pos() tests failing randomly on Windows as flaky.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: fc5bb4deef2127b0ecd57078c45bbfe82db9d6f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc5bb4deef2127b0ecd57078c45bbf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 10:39:11 2022 +0200 d3d9/tests: Mark the test_cursor_pos() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53194 --- dlls/d3d9/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index dbdce1e5871..9fe05625190 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5287,6 +5287,7 @@ static void test_cursor_pos(void) ok(ret, "Failed to set cursor position.\n"); flush_events(); + flaky ok((!expect_pos->x && !expect_pos->y) || broken(expect_pos - points == 7), "Didn't receive MOUSEMOVE %u (%ld, %ld).\n", (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y);

1 0

Alistair Leslie-Hughes : sapi: Store the token id in ISpObjectToken SetId.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 01b4286f8282518164ced9284800464f64dca89c URL: https://gitlab.winehq.org/wine/wine/-/commit/01b4286f8282518164ced928480046… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 8 20:04:00 2022 +1100 sapi: Store the token id in ISpObjectToken SetId. --- dlls/sapi/token.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 2de3553b3ab..fe84a07d3c6 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -784,6 +784,7 @@ struct object_token LONG ref; HKEY token_key; + WCHAR *token_id; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -831,6 +832,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { if (This->token_key) RegCloseKey( This->token_key ); + free(This->token_id); heap_free( This ); } @@ -950,6 +952,7 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, if (res) return SPERR_NOT_FOUND; This->token_key = key; + This->token_id = wcsdup(token_id); return S_OK; } @@ -1075,6 +1078,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 );

1 0

Alistair Leslie-Hughes : sapi: Implement ISpObjectToken GetId.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 688ba6ae314baaec1a7b6a181583cffab36e957e URL: https://gitlab.winehq.org/wine/wine/-/commit/688ba6ae314baaec1a7b6a181583cf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 8 20:07:55 2022 +1100 sapi: Implement ISpObjectToken GetId. --- dlls/sapi/tests/token.c | 14 +++++++------- dlls/sapi/token.c | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9473d56b4d1..a65669b585a 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -185,11 +185,11 @@ static void test_object_token(void) ok( hr == S_OK, "got %08lx\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); - todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); + ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); tempW = (LPWSTR)0xdeadbeef; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); + ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); ok( tempW == (LPWSTR)0xdeadbeef, "got %s\n", wine_dbgstr_w(tempW) ); hr = ISpObjectToken_GetCategory( token, NULL ); @@ -220,15 +220,15 @@ static void test_object_token(void) ok( hr == SPERR_ALREADY_INITIALIZED, "got %08lx\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); - todo_wine ok( hr == E_POINTER, "got %08lx\n", hr ); + ok( hr == E_POINTER, "got %08lx\n", hr ); hr = ISpObjectToken_GetCategory( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08lx\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == S_OK, "got %08lx\n", hr ); - todo_wine ok( tempW != NULL, "got %p\n", tempW ); + ok( hr == S_OK, "got %08lx\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) ); @@ -268,8 +268,8 @@ static void test_object_token(void) tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == S_OK, "got %08lx\n", hr ); - todo_wine ok( tempW != NULL, "got %p\n", tempW ); + ok( hr == S_OK, "got %08lx\n", hr ); + 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) ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index fe84a07d3c6..6993ffdbac1 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -960,8 +960,28 @@ 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_key) + return SPERR_UNINITIALIZED; + + if (!token_id) + return E_POINTER; + + if (!This->token_id) + { + FIXME("Loading default category not supported.\n"); + return E_POINTER; + } + + *token_id = CoTaskMemAlloc( (wcslen(This->token_id) + 1) * sizeof(WCHAR)); + if (!*token_id) + return E_OUTOFMEMORY; + + wcscpy(*token_id, This->token_id); + return S_OK; } static HRESULT WINAPI token_GetCategory( ISpObjectToken *iface,

1 0

Eric Pouech : dbghelp: No longer use wine_dbgstr_longlong.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 106a056c992da7806d69578dd68bd4068c0d67af URL: https://gitlab.winehq.org/wine/wine/-/commit/106a056c992da7806d69578dd68bd4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:39:56 2022 +0200 dbghelp: No longer use wine_dbgstr_longlong. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/coff.c | 10 ++++------ dlls/dbghelp/cpu_arm.c | 8 ++++---- dlls/dbghelp/cpu_arm64.c | 8 ++++---- dlls/dbghelp/cpu_i386.c | 12 ++++++------ dlls/dbghelp/cpu_x86_64.c | 10 +++++----- dlls/dbghelp/dbghelp.c | 14 ++++++-------- dlls/dbghelp/dwarf.c | 10 +++++----- dlls/dbghelp/elf_module.c | 8 ++++---- dlls/dbghelp/macho_module.c | 6 +++--- dlls/dbghelp/module.c | 16 +++++++--------- dlls/dbghelp/pe_module.c | 8 ++++---- dlls/dbghelp/source.c | 16 ++++++++-------- dlls/dbghelp/stack.c | 6 +++--- dlls/dbghelp/symbol.c | 41 ++++++++++++++++++----------------------- dlls/dbghelp/type.c | 4 +--- 15 files changed, 82 insertions(+), 95 deletions(-)

1 0

Eric Pouech : dbghelp: Silence some FIXME for SymGetTypeInfo/TI_GET_OFFSET.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 96c3f58783a7dcc5fcf386efcaed98f638f48864 URL: https://gitlab.winehq.org/wine/wine/-/commit/96c3f58783a7dcc5fcf386efcaed98… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:39:57 2022 +0200 dbghelp: Silence some FIXME for SymGetTypeInfo/TI_GET_OFFSET. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index a3b9dab0fbb..b39cd86248a 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -983,6 +983,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagLabel: case SymTagInlineSite: case SymTagCustom: + case SymTagPublicSymbol: + case SymTagThunk: return FALSE; } break;

1 0

Eric Pouech : dbghelp: Keep compiland's address for Dwarf debug format.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 6f8ba8119ae6d40621e499d8d34d5379eccad084 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f8ba8119ae6d40621e499d8d34d53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:39:59 2022 +0200 dbghelp: Keep compiland's address for Dwarf debug format. Partly reverting 99eb63bd7a41b87d472bb622a5faf24d1fcd91c5 (it's still needed on Dwarf for blocks with multiple non-contiguous address ranges). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 6 +++++- dlls/dbghelp/symbol.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af703c90f9e..92229552929 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2970,7 +2970,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) struct vector* children; dwarf2_debug_info_t* child = NULL; unsigned int i; - struct attribute stmt_list; + struct attribute stmt_list, low_pc; struct attribute comp_dir; struct attribute language; @@ -2981,6 +2981,9 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) if (!dwarf2_find_attribute(di, DW_AT_comp_dir, &comp_dir)) comp_dir.u.string = NULL; + if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc)) + low_pc.u.uvalue = 0; + if (!dwarf2_find_attribute(di, DW_AT_language, &language)) language.u.uvalue = DW_LANG_C; @@ -2988,6 +2991,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) ctx->compiland = symt_new_compiland(ctx->module_ctx->module, source_new(ctx->module_ctx->module, comp_dir.u.string, name.u.string)); + ctx->compiland->address = ctx->module_ctx->load_offset + low_pc.u.uvalue; dwarf2_cache_cuhead(ctx->module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx->compiland, &ctx->head); di->symt = &ctx->compiland->symt; children = dwarf2_get_di_children(di); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index a020c0b2a57..98e25a32b30 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -239,6 +239,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, unsigned src_id { sym->symt.tag = SymTagCompiland; sym->container = module->top; + sym->address = 0; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL;

1 0

Marcus Meissner : ntdll: Fix GetTempPathW() call passing wrong unit for the buffer size.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: b402ce89447cbce370e375079b41943ee5b0bd80 URL: https://gitlab.winehq.org/wine/wine/-/commit/b402ce89447cbce370e375079b4194… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Sep 23 13:51:18 2022 +0200 ntdll: Fix GetTempPathW() call passing wrong unit for the buffer size. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/ntdll/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index c7d9d7e4c7f..4b0e558e271 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2312,7 +2312,7 @@ static void test_NtRegLoadKeyEx(void) UNICODE_STRING hivefile_pathW, key_pathW; HANDLE key = 0; - GetTempPathW(sizeof(temp_path), temp_path); + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); GetTempFileNameW(temp_path, L"key", 0, hivefile_path); DeleteFileW(hivefile_path); RtlDosPathNameToNtPathName_U(hivefile_path, &hivefile_pathW, NULL, NULL);

1 0

David Kahurani : xmllite/writer: Properly validate DocType name.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: fa591d3c5603f15328b7321f79dfaf86eb9b4033 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa591d3c5603f15328b7321f79dfaf… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Fri Oct 7 10:57:06 2022 +0300 xmllite/writer: Properly validate DocType name. Current code skips a character and goes on to run is_namechar the next instead of the current character ultimately always running a null string on is_namechar and therefore always returning error on multi-character strings Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/tests/writer.c | 8 ++++++++ dlls/xmllite/writer.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7b98f61a207..c4ab079373c 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -2145,6 +2145,14 @@ static void test_WriteDocType(void) hr = IXmlWriter_WriteDocType(writer, L"a", pubidW, NULL, NULL); ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr); + /* Invalid multi-character string */ + hr = IXmlWriter_WriteDocType(writer, L":ax>m", NULL, NULL, NULL); + ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr); + + /* Valid multi-character string */ + hr = IXmlWriter_WriteDocType(writer, L"root", NULL, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IStream_Release(stream); for (i = 0; i < ARRAY_SIZE(doctype_tests); i++) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 1e1a8e8ddb8..c4f9ed2f440 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -376,11 +376,12 @@ static HRESULT is_valid_name(const WCHAR *str, unsigned int *out) if (!is_namestartchar(*str++)) return WC_E_NAMECHARACTER; - while (*str++) + while (*str) { if (!is_namechar(*str)) return WC_E_NAMECHARACTER; len++; + str++; } *out = len;

1 0

Zebediah Figura : d3d8: Use a separate draw texture for managed resources.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: ec6b6f38be970fc6af67f4f0710fc74e1ce0964b URL: https://gitlab.winehq.org/wine/wine/-/commit/ec6b6f38be970fc6af67f4f0710fc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 17:36:17 2022 -0500 d3d8: Use a separate draw texture for managed resources. --- dlls/d3d8/d3d8_private.h | 7 ++++- dlls/d3d8/device.c | 33 +++++++++++++++++-- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d8/texture.c | 82 +++++++++++++++++++++++++++++++++++------------- 4 files changed, 98 insertions(+), 26 deletions(-)

1 0

Zebediah Figura : d3d8: Introduce a d3d8_texture_preload() helper.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 99cee90c19951bf4fb00d41146ebfa86bafad895 URL: https://gitlab.winehq.org/wine/wine/-/commit/99cee90c19951bf4fb00d41146ebfa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 15:13:16 2022 -0500 d3d8: Introduce a d3d8_texture_preload() helper. --- dlls/d3d8/texture.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 5946f6aa2fd..bb0c4e5bd24 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -20,6 +20,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static void d3d8_texture_preload(struct d3d8_texture *texture) +{ + wined3d_mutex_lock(); + wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); + wined3d_mutex_unlock(); +} + static inline struct d3d8_texture *impl_from_IDirect3DTexture8(IDirect3DTexture8 *iface) { return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface); @@ -185,9 +192,7 @@ static void WINAPI d3d8_texture_2d_PreLoad(IDirect3DTexture8 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); - wined3d_mutex_unlock(); + d3d8_texture_preload(texture); } static D3DRESOURCETYPE WINAPI d3d8_texture_2d_GetType(IDirect3DTexture8 *iface) @@ -526,9 +531,7 @@ static void WINAPI d3d8_texture_cube_PreLoad(IDirect3DCubeTexture8 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); - wined3d_mutex_unlock(); + d3d8_texture_preload(texture); } static D3DRESOURCETYPE WINAPI d3d8_texture_cube_GetType(IDirect3DCubeTexture8 *iface) @@ -877,9 +880,7 @@ static void WINAPI d3d8_texture_3d_PreLoad(IDirect3DVolumeTexture8 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - wined3d_resource_preload(wined3d_texture_get_resource(texture->wined3d_texture)); - wined3d_mutex_unlock(); + d3d8_texture_preload(texture); } static D3DRESOURCETYPE WINAPI d3d8_texture_3d_GetType(IDirect3DVolumeTexture8 *iface)

1 0