December 2021 - Wine-commits

Alexandre Julliard : Wine release 7.0-rc1
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: website Branch: master Commit: cca06cab8ca305bea85af582350fef9354c0217c URL: https://source.winehq.org/git/website.git/?a=commit;h=cca06cab8ca305bea85af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 22:08:11 2021 +0100 Wine release 7.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021121002.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2021121002.xml b/news/en/2021121002.xml new file mode 100644 index 00000000..9d850a78 --- /dev/null +++ b/news/en/2021121002.xml @@ -0,0 +1,16 @@ +<news> +<date>December 10, 2021</date> +<title>Wine 7.0-rc1 Released</title> +<body> + The Wine development release 7.0-rc1 is now available. + This is the first release candidate for the upcoming Wine 7.0. It marks the beginning of the yearly code freeze period. Please give this release a good testing and report any issue that you find, to help us make 7.0 as good as possible. + <a href="{$root}/announce/7.0-rc1">What's new</a> in this release: +<ul> + <li>Reimplementation of the WinMM joystick driver.</li> + <li>All Unix libraries converted to the syscall-based interface.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : d3dx10/tests: Remove crashing tests.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 1c7323b1926dbab4c81fd4b22b04d330459c3748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c7323b1926dbab4c81fd4b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 8 21:06:27 2021 +0300 d3dx10/tests: Remove crashing tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51827 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 55a4d057fdf..89a43355756 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2466,12 +2466,11 @@ todo_wine hr = ID3DX10Font_PreloadCharacters(font, 'a', 'z'); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Test multiple textures */ - hr = ID3DX10Font_PreloadGlyphs(font, 0, 1000); + /* Test glyphs that are not rendered */ + hr = ID3DX10Font_PreloadGlyphs(font, 0, 5); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* Test glyphs that are not rendered */ for (glyph = 1; glyph < 4; ++glyph) { srv = (void *)0xdeadbeef;

1 0

Matteo Bruni : d3d10/effect: Validate preshader blob size for index expressions.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 921bade0da03ad28f8b843979ef9b85a3e2d604b URL: https://source.winehq.org/git/wine.git/?a=commit;h=921bade0da03ad28f8b84397… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 10 20:03:37 2021 +0100 d3d10/effect: Validate preshader blob size for index expressions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 190ad19a5f1..61b48cdeacb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2633,6 +2633,12 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size data_ptr = data + code_offset; read_dword(&data_ptr, &blob_size); + if (!require_space(code_offset, 1, sizeof(uint32_t) + blob_size, data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", code_offset, (long)data_size); + return E_FAIL; + } + dep.id = id; dep.idx = idx; dep.operation = operation;

1 0

Christian Costa : d3dx9: Also check for a valid alpha channel for TGA images.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 46f08b169bc58f2ebb29f2bda843401bf2370930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f08b169bc58f2ebb29f2bd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 10 20:03:40 2021 +0100 d3dx9: Also check for a valid alpha channel for TGA images. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48631 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 362113386ea..c3f9f84a789 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -895,7 +895,8 @@ static BOOL image_is_argb(IWICBitmapFrameDecode *frame, const D3DXIMAGE_INFO *in BYTE *buffer; HRESULT hr; - if (info->Format != D3DFMT_X8R8G8B8 || info->ImageFileFormat != D3DXIFF_BMP) + if (info->Format != D3DFMT_X8R8G8B8 || (info->ImageFileFormat != D3DXIFF_BMP + && info->ImageFileFormat != D3DXIFF_TGA)) return FALSE; size = info->Width * info->Height * 4;

1 0

Jacek Caban : mshtml: Fix dispex hooks handling for function objects.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: b650e768bea8a2fc855c005ef6c9bce0c9131dc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b650e768bea8a2fc855c005e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 20:36:49 2021 +0100 mshtml: Fix dispex hooks handling for function objects. Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 40 +++++++++++++++++++++++++++++---------- dlls/mshtml/htmlelem.c | 5 ++--- dlls/mshtml/htmlevent.c | 10 ++++------ dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/tests/documentmode.js | 14 +++++++++++++- dlls/mshtml/xmlhttprequest.c | 5 ++--- 6 files changed, 54 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b650e768bea8a2fc855c…

1 0

Akihiro Sagawa : quartz: Fix a race in IMediaFilter::Pause().
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: bbdb6584026393ef1159bd841b61abcad0f1e247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbdb6584026393ef1159bd84… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 10 23:58:15 2021 +0900 quartz: Fix a race in IMediaFilter::Pause(). Before finishing async run, graph->stream_start isn't stable. This will cause graph->current_pos to be out of playback duration. Since graph->current_pos is out of the range, the playback will be stopped. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52200 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4351eaaffef..d20687c1b38 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5044,7 +5044,7 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) if (graph->defaultclock && !graph->refClock) IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); - if (graph->state == State_Running && graph->refClock) + if (graph->state == State_Running && !graph->needs_async_run && graph->refClock) { REFERENCE_TIME time; IReferenceClock_GetTime(graph->refClock, &time);

1 0

Francois Gouget : ntdll/tests: Fix the spelling of a comment.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 1558b21a9d3dfd0eb3b7c7f7a5c1a343def6ee73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1558b21a9d3dfd0eb3b7c7f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 10 21:01:08 2021 +0100 ntdll/tests: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index 09b9bcc8497..f381f64dbfe 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -99,7 +99,7 @@ static void test_dbg_hidden_thread_creation(void) NULL, NULL, PROCESS_PARAMS_FLAG_NORMALIZED ); ok( status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status ); - /* NtCreateUserProcess() may return STATUS_INVALID_PARAMATER with some unitialized data in create_info. */ + /* NtCreateUserProcess() may return STATUS_INVALID_PARAMETER with some uninitialized data in create_info. */ memset( &create_info, 0, sizeof(create_info) ); create_info.Size = sizeof(create_info);

1 0

Alexandre Julliard : Release 7.0-rc1.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 533616d23f9832596e41f839356830c7679df930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533616d23f9832596e41f839… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 22:06:01 2021 +0100 Release 7.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 876 +++++++++++++++++++++++--------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 339 insertions(+), 558 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=533616d23f9832596e41…

1 0

Tag wine-7.0-rc1 : Alexandre Julliard : Release 7.0-rc1
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: refs/tags/wine-7.0-rc1 Tag: c75a47e84ac9a621b04ce85d5609ef807dfa7884 URL: https://source.winehq.org/git/wine.git/?a=tag;h=c75a47e84ac9a621b04ce85d560… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 22:06:01 2021 +0100 Release 7.0-rc1

1 0

Eric Pouech : dbghelp: Implement SymEnumTypesByName(W).
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: a6bf722bffb6cd731667151eab61f36b60caec9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bf722bffb6cd731667151e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:45:02 2021 +0100 dbghelp: Implement SymEnumTypesByName(W). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/type.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ include/dbghelp.h | 2 + 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 471d9b6141c..87861cd87ce 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -57,8 +57,8 @@ @ stub SymEnumSymbolsForAddrW @ stdcall SymEnumSymbolsW(ptr int64 wstr ptr ptr) @ stdcall SymEnumTypes(ptr int64 ptr ptr) -@ stub SymEnumTypesByName -@ stub SymEnumTypesByNameW +@ stdcall SymEnumTypesByName(ptr int64 str ptr ptr) +@ stdcall SymEnumTypesByNameW(ptr int64 wstr ptr ptr) @ stdcall SymEnumTypesW(ptr int64 ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) @ stdcall SymEnumerateModules64(long ptr ptr) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 3140d30e0bc..67f4265ddc9 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -544,6 +544,122 @@ BOOL WINAPI SymEnumTypesW(HANDLE hProcess, ULONG64 BaseOfDll, return SymEnumTypes(hProcess, BaseOfDll, enum_types_AtoW, &et); } +static void enum_types_of_module(struct module_pair* pair, const char* name, PSYM_ENUMERATESYMBOLS_CALLBACK cb, PVOID user) +{ + char buffer[sizeof(SYMBOL_INFO) + 256]; + SYMBOL_INFO* sym_info = (SYMBOL_INFO*)buffer; + struct symt* type; + DWORD64 size; + unsigned i; + const char* tname; + + sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); + sym_info->MaxNameLen = sizeof(buffer) - sizeof(SYMBOL_INFO); + + for (i = 0; i < vector_length(&pair->effective->vtypes); i++) + { + type = *(struct symt**)vector_at(&pair->effective->vtypes, i); + tname = symt_get_name(type); + if (tname && SymMatchStringA(tname, name, TRUE)) + { + sym_info->TypeIndex = symt_ptr2index(pair->effective, type); + sym_info->Index = 0; /* FIXME */ + symt_get_info(pair->effective, type, TI_GET_LENGTH, &size); + sym_info->Size = size; + sym_info->ModBase = pair->requested->module.BaseOfImage; + sym_info->Flags = 0; /* FIXME */ + sym_info->Value = 0; /* FIXME */ + sym_info->Address = 0; /* FIXME */ + sym_info->Register = 0; /* FIXME */ + sym_info->Scope = 0; /* FIXME */ + sym_info->Tag = type->tag; + symbol_setname(sym_info, tname); + if (!cb(sym_info, sym_info->Size, user)) break; + } + } +} + +static BOOL walk_modules(struct module_pair* pair) +{ + /* first walk PE only modules */ + if (!pair->requested || pair->requested->type == DMT_PE) + { + while ((pair->requested = pair->requested ? pair->requested->next : pair->pcs->lmodules) != NULL) + { + if (pair->requested->type == DMT_PE && module_get_debug(pair)) return TRUE; + } + } + /* then walk ELF or Mach-O modules, not containing PE modules */ + while ((pair->requested = pair->requested ? pair->requested->next : pair->pcs->lmodules) != NULL) + { + if ((pair->requested->type == DMT_ELF || pair->requested->type == DMT_MACHO) && + !module_get_containee(pair->pcs, pair->requested) && + module_get_debug(pair)) + return TRUE; + } + return FALSE; +} + +BOOL WINAPI SymEnumTypesByName(HANDLE proc, ULONG64 base, PCSTR name, PSYM_ENUMERATESYMBOLS_CALLBACK cb, PVOID user) +{ + struct module_pair pair; + const char* bang; + + TRACE("(%p %I64x %s %p %p)\n", proc, base, wine_dbgstr_a(name), cb, user); + + if (!name) return SymEnumTypes(proc, base, cb, user); + bang = strchr(name, '!'); + if (bang) + { + DWORD sz; + WCHAR* modW; + pair.pcs = process_find_by_handle(proc); + if (bang == name) return FALSE; + if (!pair.pcs) return FALSE; + sz = MultiByteToWideChar(CP_ACP, 0, name, bang - name, NULL, 0) + 1; + if ((modW = malloc(sz * sizeof(WCHAR))) == NULL) return FALSE; + MultiByteToWideChar(CP_ACP, 0, name, bang - name, modW, sz); + modW[sz - 1] = L'\0'; + pair.requested = NULL; + while (walk_modules(&pair)) + { + if (SymMatchStringW(pair.requested->modulename, modW, FALSE)) + enum_types_of_module(&pair, bang + 1, cb, user); + } + free(modW); + } + else + { + if (!module_init_pair(&pair, proc, base) || !module_get_debug(&pair)) return FALSE; + enum_types_of_module(&pair, name, cb, user); + } + return TRUE; +} + +BOOL WINAPI SymEnumTypesByNameW(HANDLE proc, ULONG64 base, PCWSTR nameW, PSYM_ENUMERATESYMBOLS_CALLBACKW cb, PVOID user) +{ + struct enum_types_AtoW et; + DWORD len = nameW ? WideCharToMultiByte(CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL) : 0; + char* name; + BOOL ret; + + TRACE("(%p %I64x %s %p %p)\n", proc, base, wine_dbgstr_w(nameW), cb, user); + + if (len) + { + if (!(name = malloc(len))) return FALSE; + WideCharToMultiByte(CP_ACP, 0, nameW, -1, name, len, NULL, NULL); + } + else name = NULL; + + et.callback = cb; + et.user = user; + + ret = SymEnumTypesByName(proc, base, name, enum_types_AtoW, &et); + free(name); + return ret; +} + /****************************************************************** * symt_get_info * diff --git a/include/dbghelp.h b/include/dbghelp.h index 248b3ab418d..07fa429809a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1081,6 +1081,8 @@ typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVO typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)(PSYMBOL_INFOW, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); BOOL WINAPI SymEnumTypesW(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); +BOOL WINAPI SymEnumTypesByName(HANDLE, ULONG64, PCSTR, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); +BOOL WINAPI SymEnumTypesByNameW(HANDLE, ULONG64, PCWSTR, PSYM_ENUMERATESYMBOLS_CALLBACKW, PVOID); BOOL WINAPI SymFromAddr(HANDLE, DWORD64, DWORD64*, SYMBOL_INFO*); BOOL WINAPI SymFromAddrW(HANDLE, DWORD64, DWORD64*, SYMBOL_INFOW*); BOOL WINAPI SymFromInlineContext(HANDLE, DWORD64, ULONG, PDWORD64, PSYMBOL_INFO);

1 0