- Wine-Devel - list.winehq.org

[PATCH] gdi32: use 7-bit ascii for unhandled encodings
by Aurélien Inacio Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..c206d6dae57 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -344,8 +344,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_MAC_ENCODING_THAI: return 10021; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; case OPENTYPE_PLATFORM_WIN: @@ -366,8 +366,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case TT_NAME_WIN_ENCODING_JOHAB: return 1361; default: - FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); - break; + WARN( "default ascii encoding used for encoding %d, platform %d\n", encoding, platform ); + return 20127; } break; default: -- 2.30.2

2 1

[PATCH] mshtml: Implement HTMLAnchorElement_get_pathname().
by Hans Leidekker Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..a9c5844d440 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,35 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IUri *uri; + HRESULT hres; + BSTR path; + + TRACE("(%p)->(%p)\n", This, p); + + uri = get_anchor_uri(This); + if(!uri) { + WARN("Could not create IUri\n"); + *p = NULL; + return S_OK; + } + + hres = IUri_GetPath(uri, &path); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + if(path[0] == '/') { + BSTR str = SysAllocString(path + 1); + SysFreeString(path); + if (!str) + return E_OUTOFMEMORY; + *p = str; + } + else + *p = path; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03f5c0431ea..2e5fd58cdfb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1689,6 +1689,22 @@ static void _test_anchor_port(unsigned line, IUnknown *unk, const WCHAR *port) SysFreeString(str); } +#define test_anchor_pathname(a,p) _test_anchor_pathname(__LINE__,a,p) +static void _test_anchor_pathname(unsigned line, IUnknown *unk, const WCHAR *pathname) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_pathname(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_pathname failed: %08x\n", hres); + if(pathname) + ok_(__FILE__,line)(!lstrcmpW(str, pathname), "pathname = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(pathname)); + else + ok_(__FILE__,line)(str == NULL, "pathname = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + #define test_anchor_search(a,h,n) _test_anchor_search(__LINE__,a,h,n) static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *search, BOOL allowbroken) { @@ -9220,12 +9236,14 @@ static void test_elems(IHTMLDocument2 *doc) if(elem) { test_anchor_href((IUnknown*)elem, L"http://test/"); test_anchor_port((IUnknown*)elem, L"80"); + test_anchor_pathname((IUnknown*)elem, L""); /* Change the href */ - test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/"); - test_anchor_href((IUnknown*)elem, L"http://test1:8080/"); + test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/path"); + test_anchor_href((IUnknown*)elem, L"http://test1:8080/path"); test_anchor_hostname((IUnknown*)elem, L"test1"); test_anchor_port((IUnknown*)elem, L"8080"); + test_anchor_pathname((IUnknown*)elem, L"path"); /* Restore the href */ test_anchor_put_href((IUnknown*)elem, L"http://test/"); -- 2.30.2

3 2

[PATCH 1/9] include/wine/mscvpdb.h: update symbol header for linetab2's block size
by Eric Pouech Nov. 2, 2021

Nov. 2, 2021

Fixed tools/winedump and dlls/dbghelp to use that information (instead of trying to guess it, with an erroneous result) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 7 ++++--- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a1f009cf678..4aaee196370 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2424,6 +2424,7 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, sfile->range.index = sym_file->range.index; sfile->symbol_size = sym_file->symbol_size; sfile->lineno_size = sym_file->lineno_size; + sfile->lineno2_size = sym_file->lineno2_size; *size = sizeof(PDB_SYMBOL_FILE) - 1; } else @@ -2818,14 +2819,14 @@ static BOOL pdb_process_internal(const struct process* pcs, codeview_snarf(msc_dbg, modimage, sizeof(DWORD), sfile.symbol_size, TRUE); + if (sfile.lineno_size && sfile.lineno2_size) FIXME("Both line info present... only supporting first\n"); if (sfile.lineno_size) codeview_snarf_linetab(msc_dbg, modimage + sfile.symbol_size, sfile.lineno_size, pdb_file->kind == PDB_JG); - if (files_image) - codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size + sfile.lineno_size, - pdb_get_file_size(pdb_file, sfile.file) - sfile.symbol_size - sfile.lineno_size, + else if (sfile.lineno2_size && files_image) + codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size, sfile.lineno2_size, files_image + 12, files_size); pdb_free(modimage); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 1ede937abc4..53eeec96916 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2343,7 +2343,7 @@ typedef struct _PDB_SYMBOL_FILE WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; CHAR filename[1]; @@ -2357,7 +2357,7 @@ typedef struct _PDB_SYMBOL_FILE_EX WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; DWORD reserved[2]; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 71a2bc49cc8..bbaf1cb94e8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -466,7 +466,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file = (const char*)symbols + sizeof(PDB_SYMBOLS); while (file - (const char*)symbols < sizeof(PDB_SYMBOLS) + symbols->module_size) { - int file_nr, symbol_size, lineno_size; + int file_nr, symbol_size, lineno_size, lineno2_size; const char* file_name; if (symbols->version < 19970000) @@ -476,6 +476,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\tgot symbol_file\n" "\t\tunknown1: %08x\n" @@ -491,7 +492,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n", sym_file->unknown1, @@ -506,7 +507,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute); } @@ -517,6 +518,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\t\tunknown1: %08x\n" "\t\trange\n" @@ -533,7 +535,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n" "\t\treserved/0: %08x\n" @@ -552,7 +554,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute, sym_file->reserved[0], @@ -569,15 +571,13 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx /* line number info */ if (lineno_size) codeview_dump_linetab((const char*)modimage + symbol_size, TRUE, " "); - /* anyway, lineno_size doesn't see to really be the size of the line number information, and - * it's not clear yet when to call for linetab2... - */ - codeview_dump_linetab2((const char*)modimage + symbol_size + lineno_size, - total_size - (symbol_size + lineno_size), - filesimage ? filesimage + 12 : NULL, filessize, " "); + else if (lineno2_size) /* actually, only one of the 2 lineno should be present */ + codeview_dump_linetab2((const char*)modimage + symbol_size, lineno2_size, + filesimage ? filesimage + 12 : NULL, filessize, " "); /* what's that part ??? */ if (0) - dump_data(modimage + symbol_size + lineno_size, total_size - (symbol_size + lineno_size), " "); + dump_data(modimage + symbol_size + lineno_size + lineno2_size, + total_size - (symbol_size + lineno_size + lineno2_size), " "); free(modimage); }

1 8

[v2 PATCH] d3d11: Correctly handle optional arguments in OMGetBlendState().
by Nikolay Sivov Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 14 ++++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++---------- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6ec398269fa..b8338152bb7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5533,6 +5533,20 @@ float4 main(float4 color : COLOR) : SV_TARGET blend_factor[2] = 0.3f; blend_factor[3] = 0.4f; ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + /* OMGetBlendState() arguments are optional */ + ID3D10Device_OMGetBlendState(device, NULL, NULL, NULL); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, NULL, NULL); + ID3D10BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D10Device_OMGetBlendState(device, NULL, NULL, &sample_mask); + ok(sample_mask == D3D10_DEFAULT_SAMPLE_MASK, "Unexpected sample mask %#x.\n", sample_mask); + memset(tmp_blend_factor, 0, sizeof(tmp_blend_factor)); + ID3D10Device_OMGetBlendState(device, NULL, tmp_blend_factor, NULL); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8d88ee26222..417638bf314 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2190,20 +2190,26 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; + unsigned int tmp_sample_mask; + float tmp_blend_factor[4]; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, - (struct wined3d_color *)blend_factor, sample_mask))) + if (!blend_factor) blend_factor = tmp_blend_factor; + if (!sample_mask) sample_mask = &tmp_sample_mask; + wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, + (struct wined3d_color *)blend_factor, sample_mask); + if (blend_state) { - blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); - } - else - { - *blend_state = NULL; + if (wined3d_state) + { + blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + } + else + *blend_state = NULL; } wined3d_mutex_unlock(); } @@ -5541,10 +5547,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, d3d11_device_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_blend_state, blend_factor, sample_mask); + if (blend_state) + { + if (d3d11_blend_state) + { + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + ID3D10BlendState_AddRef(*blend_state); + } + else + *blend_state = NULL; + } + if (d3d11_blend_state) - *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; - else - *blend_state = NULL; + ID3D11BlendState_Release(d3d11_blend_state); } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 553caa10e46..2ed9aed490e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12608,6 +12608,20 @@ static void test_clear_state(void) ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); + /* OMGetBlendState() arguments are optional */ + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, NULL); + ID3D11DeviceContext_OMGetBlendState(context, &tmp_blend_state, NULL, NULL); + ok(tmp_blend_state == blend_state, "Got unexpected blend state %p, expected %p.\n", tmp_blend_state, blend_state); + ID3D11BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, &sample_mask); + ok(sample_mask == 0xff00ff00, "Got unexpected sample mask %#x.\n", sample_mask); + memset(blend_factor, 0, sizeof(blend_factor)); + ID3D11DeviceContext_OMGetBlendState(context, NULL, blend_factor, NULL); + ok(blend_factor[0] == 0.1f && blend_factor[1] == 0.2f + && blend_factor[2] == 0.3f && blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) -- 2.33.0

3 2

[PATCH] kernel32: Correctly restore protection in set_entry_point().
by Paul Gofman Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Passing NULL old protection results in VirtualProtect failure. dlls/kernel32/kernel_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 89394e16430..4467af739e0 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -65,7 +65,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva ); VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot ); functions[ordinal] = rva; - VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, NULL ); + VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, &oldprot ); return; } if (res > 0) max = pos - 1; -- 2.31.1

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.197.
by Georg Lehmann Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 0a22834dc4d..e84442d7a79 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.196" +VK_XML_VERSION = "1.2.197" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.33.1

1 0

[PATCH 1/5] ntdll: Allocate DDAG node for module.
by Paul Gofman Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 6 +++--- dlls/ntdll/loader.c | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index fd369ff33e9..7c4b690fb39 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1358,7 +1358,7 @@ static void test_ddag_node(void) if (!(node = mod->DdagNode)) { - skip( "DdagNode is NULL, skipping tests.\n" ); + win_skip( "DdagNode is NULL, skipping tests.\n" ); return; } @@ -1376,11 +1376,11 @@ static void test_ddag_node(void) ok( !node->IncomingDependencies.Tail, "Expected empty incoming dependencies list.\n" ); /* node->Dependencies.Tail is NULL on Windows 10 1507-1607 32 bit test, maybe due to broken structure layout. */ - ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail), + todo_wine ok( !!node->Dependencies.Tail || broken( sizeof(void *) == 4 && !node->Dependencies.Tail ), "Expected nonempty dependencies list.\n" ); if (!node->Dependencies.Tail) { - win_skip( "Empty dependencies list.\n" ); + skip( "Empty dependencies list.\n" ); return; } ok( node->LoadCount == -1, "Got unexpected LoadCount %d.\n", node->LoadCount ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dd41d6b66d2..c946b39574a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1203,7 +1203,6 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) return status; } - /************************************************************************* * alloc_module * @@ -1232,6 +1231,16 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name RtlFreeHeap( GetProcessHeap(), 0, wm ); return NULL; } + + if (!(wm->ldr.DdagNode = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wm->ldr.DdagNode) ))) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + RtlFreeHeap( GetProcessHeap(), 0, wm ); + return NULL; + } + InitializeListHead(&wm->ldr.DdagNode->Modules); + InsertTailList(&wm->ldr.DdagNode->Modules, &wm->ldr.NodeModuleLink); + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; if ((p = wcsrchr( buffer, '\\' ))) p++; @@ -3518,6 +3527,10 @@ static void free_modref( WINE_MODREF *wm ) if (wm->ldr.InInitializationOrderLinks.Flink) RemoveEntryList(&wm->ldr.InInitializationOrderLinks); + RemoveEntryList(&wm->ldr.NodeModuleLink); + if (IsListEmpty(&wm->ldr.DdagNode->Modules)) + RtlFreeHeap( GetProcessHeap(), 0, wm->ldr.DdagNode ); + TRACE(" unloading %s\n", debugstr_w(wm->ldr.FullDllName.Buffer)); if (!TRACE_ON(module)) TRACE_(loaddll)("Unloaded module %s : %s\n", -- 2.31.1

1 4

libFAudio-dev -build requirement
by Sveinar Søpler Nov. 2, 2021

Nov. 2, 2021

Hi I see now as of wine-devel-6.20, wine is built with /libs/faudio source as PE. I know the overall plan is to get distro's to provide the PE packages, but i would think this is still a bit ahead in time (atleast for some distro's) ref: [ https://github.com/wine-mirror/wine/commit/6b45777121fcd50d9b7d5b649c671006… | https://github.com/wine-mirror/wine/commit/6b45777121fcd50d9b7d5b649c671006… ] [ https://github.com/wine-mirror/wine/commit/d8be85863fedf6982944d06ebd1ce590… | https://github.com/wine-mirror/wine/commit/d8be85863fedf6982944d06ebd1ce590… ] and libs: Import code from upstream FAudio 21.10. xaudio: Use the bundled FAudio and build with msvcrt. Does this mean that libFAudio-dev requirement for package build on OBS can be dropped? Distro(s) in question is then Debian/Ubuntu, and packages would be wine-devel-6.21+ and wine-staging-6.21+ The note on libFAudio-21.11 also sais this: Deprecated Features: * GStreamer support is now deprecated. o Wine users should migrate to 6.20 and newer, and everyone else should move to codecs that are not patent-encumbered. o GStreamer support will be fully removed in the first release after Wine 7.0. Removed Features: * Removed the C++ wrapper. Use the headers/PE binaries found in Wine 6.20 and newer. PS. I am aware that libFAudio.so.0 would still be required for < wine-devel/staging-6.19 and wine-stable-6.0, but the above would (to me) indicate that configure no longer checks for the systemlib development package, and thus build-depends: libFAudio-dev could be dropped when building packages. Sveinar

2 1

[PATCH 2/2] comctl32/button: Use BS_PUSHLIKE instead of WS_EX_RIGHT in BUTTON_PositionRect().
by Zhiyi Zhang Nov. 2, 2021

Nov. 2, 2021

BS_PUSHLIKE and WS_EX_RIGHT have the same value and it was a typo to use WS_EX_RIGHT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b3331e179cd..fbe060513d2 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1122,7 +1122,7 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe INT width = innerRect->right - innerRect->left; INT height = innerRect->bottom - innerRect->top; - if ((style & WS_EX_RIGHT) && !(style & BS_CENTER)) style |= BS_CENTER; + if ((style & BS_PUSHLIKE) && !(style & BS_CENTER)) style |= BS_CENTER; if (!(style & BS_CENTER)) { -- 2.32.0

1 0

[PATCH 1/2] comctl32/button: Remove useless calculation for drawing group boxes.
by Zhiyi Zhang Nov. 2, 2021

Nov. 2, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b576e6c6db6..b3331e179cd 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2113,10 +2113,6 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) labelRect.right++; labelRect.bottom++; FillRect(hDC, &labelRect, hbr); - labelRect.left++; - labelRect.right--; - labelRect.bottom--; - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); } SelectClipRgn( hDC, hrgn ); -- 2.32.0

1 0