June 2020 - Wine-commits - list.winehq.org

Daniel Lehman : tzres: Add Haiti Time Zone.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 627f01947d044ba243abf5c4482a7e8d6397c095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=627f01947d044ba243abf5c4… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Feb 12 19:34:52 2020 -0800 tzres: Add Haiti Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a832b2b799921ba0825eda22986bb9ecb914ccfc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 22 +++++ po/ar.po | 238 +++++++++++++++++++++++++++------------------------ po/ast.po | 238 +++++++++++++++++++++++++++------------------------ po/bg.po | 234 ++++++++++++++++++++++++++------------------------ po/ca.po | 238 +++++++++++++++++++++++++++------------------------ po/cs.po | 238 +++++++++++++++++++++++++++------------------------ po/da.po | 238 +++++++++++++++++++++++++++------------------------ po/de.po | 238 +++++++++++++++++++++++++++------------------------ po/el.po | 234 ++++++++++++++++++++++++++------------------------ po/en.po | 234 ++++++++++++++++++++++++++------------------------ po/en_US.po | 234 ++++++++++++++++++++++++++------------------------ po/eo.po | 238 +++++++++++++++++++++++++++------------------------ po/es.po | 238 +++++++++++++++++++++++++++------------------------ po/fa.po | 236 ++++++++++++++++++++++++++------------------------ po/fi.po | 238 +++++++++++++++++++++++++++------------------------ po/fr.po | 238 +++++++++++++++++++++++++++------------------------ po/he.po | 238 +++++++++++++++++++++++++++------------------------ po/hi.po | 234 ++++++++++++++++++++++++++------------------------ po/hr.po | 238 +++++++++++++++++++++++++++------------------------ po/hu.po | 238 +++++++++++++++++++++++++++------------------------ po/it.po | 238 +++++++++++++++++++++++++++------------------------ po/ja.po | 238 +++++++++++++++++++++++++++------------------------ po/ko.po | 238 +++++++++++++++++++++++++++------------------------ po/lt.po | 238 +++++++++++++++++++++++++++------------------------ po/ml.po | 234 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 238 +++++++++++++++++++++++++++------------------------ po/nl.po | 238 +++++++++++++++++++++++++++------------------------ po/or.po | 234 ++++++++++++++++++++++++++------------------------ po/pa.po | 234 ++++++++++++++++++++++++++------------------------ po/pl.po | 238 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 238 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 238 +++++++++++++++++++++++++++------------------------ po/rm.po | 234 ++++++++++++++++++++++++++------------------------ po/ro.po | 238 +++++++++++++++++++++++++++------------------------ po/ru.po | 234 ++++++++++++++++++++++++++------------------------ po/si.po | 238 +++++++++++++++++++++++++++------------------------ po/sk.po | 238 +++++++++++++++++++++++++++------------------------ po/sl.po | 238 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 236 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 236 ++++++++++++++++++++++++++------------------------ po/sv.po | 238 +++++++++++++++++++++++++++------------------------ po/ta.po | 234 ++++++++++++++++++++++++++------------------------ po/te.po | 234 ++++++++++++++++++++++++++------------------------ po/th.po | 236 ++++++++++++++++++++++++++------------------------ po/tr.po | 238 +++++++++++++++++++++++++++------------------------ po/uk.po | 234 ++++++++++++++++++++++++++------------------------ po/wa.po | 236 ++++++++++++++++++++++++++------------------------ po/wine.pot | 234 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 238 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 238 +++++++++++++++++++++++++++------------------------ 51 files changed, 6083 insertions(+), 5537 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=627f01947d044ba243ab…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 8d251f02df068f930e1cb0aee8b8d703d70e2070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d251f02df068f930e1cb0ae… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 14 08:13:01 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 56c5b064b835361d1987fa584d7c600530a2af99) Conflicts: po/lt.po Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9b0431fe86..ae7f975da8 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-13 10:36+0200\n" +"PO-Revision-Date: 2020-02-14 08:12+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9506,16 +9506,12 @@ msgid "Cape Verde Daylight Time" msgstr "Žaliojo Kyšulio vasaros laikas" #: tzres.rc:114 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Havajų juostinis laikas" +msgstr "Haičio juostinis laikas" #: tzres.rc:115 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Havajų vasaros laikas" +msgstr "Haičio vasaros laikas" #: tzres.rc:74 msgid "Central European Standard Time"

1 0

Jacek Caban : rpcrt4: Use MustFree for all non-base types in get_param_pointer_info.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 663cbd7fd5a719149102626d5ad4d2fc1bc62f0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=663cbd7fd5a719149102626d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 30 20:02:53 2020 +0100 rpcrt4: Use MustFree for all non-base types in get_param_pointer_info. Fixes a leak for VT_VARIANT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1980fcafe111c5e6958bc01b121cfbd0a42a5abd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index fb78c9b5ab..c90c60c7b8 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -925,12 +925,6 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int ITypeInfo_ReleaseTypeAttr(refinfo, attr); ITypeInfo_Release(refinfo); break; - case VT_BSTR: - *flags |= IsSimpleRef | MustFree; - *tfs_tdesc = tdesc; - if (!is_in && is_out) - *server_size = sizeof(void *); - break; default: *flags |= IsSimpleRef; *tfs_tdesc = tdesc; @@ -938,6 +932,8 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int *server_size = type_memsize(typeinfo, tdesc); if ((*basetype = get_basetype(typeinfo, tdesc))) *flags |= IsBasetype; + else + *flags |= MustFree; break; }

1 0

Zebediah Figura : ddraw: Avoid leaking the primary stateblock.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: f35542ec2ecaa2e400c6432428392d301d496f19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f35542ec2ecaa2e400c64324… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:08 2020 -0600 ddraw: Avoid leaking the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d22647506c99300954f54d2c902355d7a39a899) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0999c01cb2..03b9676b92 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -245,6 +245,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) wined3d_device_set_rendertarget_view(This->wined3d_device, 0, NULL, FALSE); + wined3d_stateblock_decref(This->state); if (This->recording) wined3d_stateblock_decref(This->recording);

1 0

Piotr Caban : winemac: Fix leaks in macdrv_surface_destroy.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 7c113aff87da77bce20793f10664c5e6982ba9c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c113aff87da77bce20793f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 4 18:22:23 2020 +0100 winemac: Fix leaks in macdrv_surface_destroy. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c4becb85f17c1406ff8d05aca5ecabaa8d304b48) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 73daecaa81..9850c92aaa 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -208,6 +208,9 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) struct macdrv_window_surface *surface = get_mac_surface(window_surface); TRACE("freeing %p bits %p\n", surface, surface->bits); + if (surface->region) DeleteObject(surface->region); + if (surface->drawn) DeleteObject(surface->drawn); + HeapFree(GetProcessHeap(), 0, surface->blit_data); HeapFree(GetProcessHeap(), 0, surface->bits); pthread_mutex_destroy(&surface->mutex); HeapFree(GetProcessHeap(), 0, surface);

1 0

Piotr Caban : gdiplus: Fix gdi handles leak in GdipMeasureCharacterRanges.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 3b2dc114fb883358a6f3cf8042d0d804d27aed4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2dc114fb883358a6f3cf80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 5 16:04:16 2020 +0100 gdiplus: Fix gdi handles leak in GdipMeasureCharacterRanges. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c74d909e3b89246ca9ed7431a2da59ffa9549501) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 810300ae59..a93ccb1baf 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5364,7 +5364,13 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, { stat = GdipSetEmpty(regions[i]); if (stat != Ok) + { + SelectObject(hdc, oldfont); + DeleteObject(gdifont); + if (temp_hdc) + DeleteDC(temp_hdc); return stat; + } } args.regions = regions;

1 0

Piotr Caban : gdiplus: Fix leak in SOFTWARE_GdipDrawDriverString.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 37a1205885a80733a2e64fa2978ce3c0230a0794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a1205885a80733a2e64fa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 5 16:04:31 2020 +0100 gdiplus: Fix leak in SOFTWARE_GdipDrawDriverString. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f65cca4de3f6a97f0c3f6837036864719e714520) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a93ccb1baf..2d7f4bdb80 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7215,8 +7215,13 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI } if (max_glyphsize == 0) + { /* Nothing to draw. */ + heap_free(pti); + DeleteDC(hdc); + DeleteObject(hfont); return Ok; + } glyph_mask = heap_alloc_zero(max_glyphsize); text_mask = heap_alloc_zero((max_x - min_x) * (max_y - min_y));

1 0

Sven Baars : wined3d: Avoid accessing freed memory in wined3d_view_gl_destroy() (Valgrind).
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 1653bff66610b6f3d3696fcbb404326f15937a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1653bff66610b6f3d3696fcb… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Feb 2 14:45:51 2020 +0100 wined3d: Avoid accessing freed memory in wined3d_view_gl_destroy() (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4128e457a97d02c4b49c4414829afdbc6d1cb869) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c84348afd1..4a0803a626 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4851,7 +4851,7 @@ static void wined3d_view_gl_destroy(struct wined3d_device *device, ctx->free = ctx != &c ? ctx : NULL; wined3d_cs_destroy_object(device->cs, wined3d_view_gl_destroy_object, ctx); - if (!ctx->free) + if (ctx == &c) device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); }

1 0

Henri Verbeet : wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity).
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 0813ec9c917fe4f40a1e9c70e9b3e97f161c4d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0813ec9c917fe4f40a1e9c70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 7 16:20:03 2020 +0330 wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 125ba807e0d56a2da15875cb485067216505271a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/stateblock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f6d36f8c25..499d23fbbd 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1459,10 +1459,10 @@ void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock return; } - if (stage > WINED3D_MAX_TEXTURES) + if (stage >= WINED3D_MAX_TEXTURES) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", - stage, WINED3D_MAX_TEXTURES); + stage, WINED3D_MAX_TEXTURES - 1); return; }

1 0

Francois Gouget : kernel32/tests: Fix test_Toolhelp()'s nested process lookup.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: ad4516ff51d5877a8d8bb1664a90dda036b76f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad4516ff51d5877a8d8bb166… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 2 18:27:30 2020 +0100 kernel32/tests: Fix test_Toolhelp()'s nested process lookup. On Windows, processes are not reassigned to pid 1 when their parent dies. This means many processes could have the same ppid despite being started by unrelated processes. It also means test_Toolhelp() cannot reliably look up the nested process by its ppid. So look up for the nested process by its pid and only then check its ppid, executable file, etc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48664 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4c15b5bbd567694dbcdb142751e7410e323c691) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/process.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 89ad4175c7..69eb0acf45 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1141,6 +1141,7 @@ static void test_Toolhelp(void) STARTUPINFOA startup; PROCESS_INFORMATION info; HANDLE process, thread, snapshot; + DWORD nested_pid; PROCESSENTRY32 pe; THREADENTRY32 te; DWORD ret; @@ -1193,17 +1194,24 @@ static void test_Toolhelp(void) /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ ok(i < 20 || broken(i == 20), "process object not released\n"); + /* Look for the nested process by pid */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + nested_pid = GetPrivateProfileIntA("Nested", "Pid", 0, resfile); + DeleteFileA(resfile); + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); memset(&pe, 0, sizeof(pe)); pe.dwSize = sizeof(pe); if (pProcess32First(snapshot, &pe)) { - while (pe.th32ParentProcessID != info.dwProcessId) + while (pe.th32ProcessID != nested_pid) if (!pProcess32Next(snapshot, &pe)) break; } CloseHandle(snapshot); - ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); + ok(pe.th32ProcessID == nested_pid, "failed to find nested child process\n"); + ok(pe.th32ParentProcessID == info.dwProcessId, "nested child process has parent %u instead of %u\n", pe.th32ParentProcessID, info.dwProcessId); + ok(stricmp(pe.szExeFile, exename) == 0, "nested executable is %s instead of %s\n", pe.szExeFile, exename); process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); @@ -1226,7 +1234,8 @@ static void test_Toolhelp(void) ok(ret == 1, "expected 1, got %u\n", ret); CloseHandle(thread); - ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + ret = WaitForSingleObject(process, 30000); + ok(ret == WAIT_OBJECT_0, "Child process termination got %u le=%u\n", ret, GetLastError()); CloseHandle(process); WritePrivateProfileStringA(NULL, NULL, NULL, resfile); @@ -4037,6 +4046,7 @@ START_TEST(process) char buffer[MAX_PATH]; STARTUPINFOA startup; PROCESS_INFORMATION info; + HANDLE hFile; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -4047,6 +4057,14 @@ START_TEST(process) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); CloseHandle(info.hProcess); CloseHandle(info.hThread); + + /* The nested process is suspended so we can use the same resource + * file and it's up to the parent to read it before resuming the + * nested process. + */ + hFile = CreateFileA(myARGV[3], GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + childPrintf(hFile, "[Nested]\nPid=%08u\n", info.dwProcessId); + CloseHandle(hFile); return; } else if (!strcmp(myARGV[2], "parent") && myARGC >= 5)

1 0