April 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : packaging: Add Ubuntu 22.04.
by Alexandre Julliard 10 Apr '22

10 Apr '22

Module: tools Branch: master Commit: a86d8d25f72d64b4d50ac2d18e166c8594d1a0d8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a86d8d25f72d64b4d50ac2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 9 08:43:12 2022 +0200 packaging: Add Ubuntu 22.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/apt-override | 1 + packaging/obs/obs-sync | 7 ++++--- packaging/obs/rsync-filter | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 079a68a..613acb9 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -38,4 +38,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/apt-override b/packaging/obs/apt-override index 8e82e55..45eb6a3 100644 --- a/packaging/obs/apt-override +++ b/packaging/obs/apt-override @@ -1,2 +1,3 @@ wine otherosfs wine-staging otherosfs +vkd3d otherosfs diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index b0ec672..9a063cd 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -80,9 +80,9 @@ add_deb () dscverify -u $obsdir/$source_pkg\~$2-$build.dsc if test -f $obsdir/$source_pkg\~$2-$build.diff.gz then - rsync -aq $obsdir/$source_pkg\~$2-$build.dsc $obsdir/$source_pkg\~$2-$build.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-$build.dsc $obsdir/$source_pkg\~$2-$build.diff.gz $obsdir/$source_pkg\~$2.orig.tar.[gx]z $dstdir/source/ else - rsync -aq $obsdir/$source_pkg\~$2-$build.dsc $obsdir/$source_pkg\~$2-$build.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-$build.dsc $obsdir/$source_pkg\~$2-$build.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.[gx]z $dstdir/source/ fi if test -n "$4" @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="34 35 buster bullseye bookworm bionic focal impish" +distros="34 35 buster bullseye bookworm bionic focal impish jammy" dry_run= build=1 @@ -244,6 +244,7 @@ do bionic) add_deb ubuntu $i xUbuntu_18.04 ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; impish) add_deb ubuntu $i xUbuntu_21.10 ;; + jammy) add_deb ubuntu $i xUbuntu_22.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 7b8299e..4d818b3 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -19,6 +19,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/impish ++ /ubuntu/dists/jammy - /ubuntu/dists/* - /ubuntu/*

1 0

Floris Renaud : packaging: Create apt sources files.
by Alexandre Julliard 10 Apr '22

10 Apr '22

Module: tools Branch: master Commit: c1127ebd8a1999f2d43f726877160393103982ff URL: https://source.winehq.org/git/tools.git/?a=commit;h=c1127ebd8a1999f2d43f726… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Apr 6 00:45:09 2022 +0200 packaging: Create apt sources files. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 9a063cd..0b81755 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -135,11 +135,26 @@ Architecture: $2 EOF } +# create an apt .sources file +# usage: make_apt_sources <platform> <codename> +make_apt_sources () +{ + cat <<EOF +Types: deb +URIs: https://dl.winehq.org/wine-builds/$1 +Suites: $2 +Components: main +Architectures: amd64 i386 +Signed-By: /usr/share/keyrings/winehq-archive.key +EOF +} + # index debian packages for a single suite # usage: index_deb <platform> <codename> [<suite>] index_deb () { dest=dest/$1/dists/$2 + make_apt_sources $1 $2 >$dest/winehq-$2.sources apt_ftparchive="apt-ftparchive -c $basedir/apt.cfg -d $basedir/.cache/apt-cache-$2.db -s $basedir/apt-override" for arch in $deb_archs

1 0

Alexandre Julliard : Wine release 7.6
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: website Branch: master Commit: c61ece7075f29625dd33339e5f321f0a8107a64b URL: https://source.winehq.org/git/website.git/?a=commit;h=c61ece7075f29625dd333… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 8 21:52:53 2022 +0200 Wine release 7.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022040801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022040801.xml b/news/en/2022040801.xml new file mode 100644 index 00000000..70b412d9 --- /dev/null +++ b/news/en/2022040801.xml @@ -0,0 +1,16 @@ +<news> +<date>April 8, 2022</date> +<title>Wine 7.6 Released</title> +<body> + The Wine development release 7.6 is now available. + <a href="{$root}/announce/7.6">What's new</a> in this release: +<ul> + <li>Mono engine updated to version 7.2.0.</li> + <li>More progress on the PE conversion of graphics drivers.</li> + <li>Locale support using the new CLDR-based database.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.6.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

Eric Pouech : winedbg: Trace 64-bit integers with I64 width modifier.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: wine Branch: master Commit: 27c6ac568991fddb554487ddbe42b84930e785ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=27c6ac568991fddb554487dd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 8 09:12:30 2022 +0200 winedbg: Trace 64-bit integers with I64 width modifier. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 208526739e2..3118637cb5e 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -114,8 +114,8 @@ BOOL memory_write_value(const struct dbg_lvalue* lvalue, DWORD size, void* value if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &os)) return FALSE; if (size != os) { - dbg_printf("Size mismatch in memory_write_value, got %lu from type while expecting %lu\n", - (DWORD)os, size); + dbg_printf("Size mismatch in memory_write_value, got %I64u from type while expecting %lu\n", + os, size); return FALSE; }

1 0

Mohamad Al-Jaf : ncrypt: Map STATUS_NO_MEMORY to NTE_NO_MEMORY.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: wine Branch: master Commit: dc702f79aa173481d060712b4772ff29455af8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc702f79aa173481d060712b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Apr 7 22:50:18 2022 -0400 ncrypt: Map STATUS_NO_MEMORY to NTE_NO_MEMORY. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 10cec633269..58503338d6e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -40,6 +40,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; case STATUS_SUCCESS: return ERROR_SUCCESS; case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case STATUS_NO_MEMORY: return NTE_NO_MEMORY; case STATUS_NOT_SUPPORTED: return NTE_NOT_SUPPORTED; case NTE_BAD_DATA: return NTE_BAD_DATA; default:

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: wine Branch: master Commit: dccbfe660e5e114cb51f868f5d0cc30764f56fae URL: https://source.winehq.org/git/wine.git/?a=commit;h=dccbfe660e5e114cb51f868f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Fri Apr 8 07:17:28 2022 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 123 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 57 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dccbfe660e5e114cb51f…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: wine Branch: master Commit: a7dd77209b278e876a16c45bf720c18f1027c49e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7dd77209b278e876a16c45b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Apr 8 09:15:10 2022 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/po/fi.po b/po/fi.po index 187d288f20e..566fdd5c4f3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4003,45 +4003,39 @@ msgstr "Wine" #: dlls/kernelbase/kernelbase.rc:29 msgid "Western Europe and United States" -msgstr "" +msgstr "Länsi-Eurooppa ja Yhdysvallat" #: dlls/kernelbase/kernelbase.rc:30 -#, fuzzy -#| msgid "Central European" msgid "Central Europe" -msgstr "Keskieurooppalainen" +msgstr "Keskieurooppa" #: dlls/kernelbase/kernelbase.rc:34 -#, fuzzy -#| msgid "Turkish" msgid "Turkic" -msgstr "Turkkilainen" +msgstr "Turkki" #: dlls/kernelbase/kernelbase.rc:36 msgid "Korean" -msgstr "" +msgstr "Korea" #: dlls/kernelbase/kernelbase.rc:37 -#, fuzzy -#| msgid "Operation Ceased" msgid "Traditional Chinese" -msgstr "Toiminta lakannut" +msgstr "Kiina (perinteinen)" #: dlls/kernelbase/kernelbase.rc:38 msgid "Simplified Chinese" -msgstr "" +msgstr "Kiina (yksinkertaistettu)" #: dlls/kernelbase/kernelbase.rc:43 msgid "Indic" -msgstr "" +msgstr "Intia" #: dlls/kernelbase/kernelbase.rc:44 msgid "Georgian" -msgstr "" +msgstr "Georgia" #: dlls/kernelbase/kernelbase.rc:45 msgid "Armenian" -msgstr "" +msgstr "Armenia" #: dlls/kernelbase/winerror.mc:28 msgid "Success.\n"

1 0

Jacek Caban : win32u: Use more consistent NtUserMessageCall constant names.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: wine Branch: master Commit: a94eab5acf5e9b9aaf47573713532d22f1f0b62d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a94eab5acf5e9b9aaf475737… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:30:22 2022 +0200 win32u: Use more consistent NtUserMessageCall constant names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 12 ++++++------ dlls/user32/message.c | 20 ++++++++++---------- dlls/user32/nonclient.c | 2 +- dlls/user32/user_main.c | 4 ++-- dlls/user32/winproc.c | 4 ++-- dlls/win32u/clipboard.c | 4 ++-- dlls/win32u/input.c | 4 ++-- dlls/win32u/message.c | 22 +++++++++++----------- dlls/win32u/tests/win32u.c | 24 ++++++++++++------------ dlls/win32u/window.c | 10 +++++----- include/ntuser.h | 18 +++++++++--------- 11 files changed, 62 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a94eab5acf5e9b9aaf47…

1 0

Jinoh Kang : riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: wine Branch: master Commit: 95b4072cc774ba7a7eabb0d4c114b933b7d71105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95b4072cc774ba7a7eabb0d4… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Apr 8 01:08:27 2022 +0900 riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 266 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 255 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95b4072cc774ba7a7eab…

1 0

Jinoh Kang : riched20: Implement callback to IRichEditOleCallback_QueryInsertObject.
by Alexandre Julliard 08 Apr '22

08 Apr '22

Module: wine Branch: master Commit: 10667b39aad6710668f60c1ba8f10e50aeb87242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10667b39aad6710668f60c1b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Apr 8 01:09:07 2022 +0900 riched20: Implement callback to IRichEditOleCallback_QueryInsertObject. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 11 ++++++++++- dlls/riched20/editor.c | 3 +-- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 6 +++++- dlls/riched20/tests/richole.c | 6 ++---- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c8658098e18..09ec0ffc735 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -456,13 +456,21 @@ static struct re_object* create_re_object(const REOBJECT *reo, ME_Run *run) return reobj; } -void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) +HRESULT editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) { ME_Run *run, *prev; const WCHAR space = ' '; struct re_object *reobj_prev = NULL; ME_Cursor *cursor, cursor_from_ofs; ME_Style *style; + HRESULT hr; + + if (editor->lpOleCallback) + { + hr = IRichEditOleCallback_QueryInsertObject(editor->lpOleCallback, (LPCLSID)&reo->clsid, reo->pstg, REO_CP_SELECTION); + if (hr != S_OK) + return hr; + } if (reo->cp == REO_CP_SELECTION) cursor = editor->pCursors; @@ -495,6 +503,7 @@ void editor_insert_oleobj(ME_TextEditor *editor, const REOBJECT *reo) list_add_head(&editor->reobj_list, &run->reobj->entry); ME_ReleaseStyle( style ); + return S_OK; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..3628e51ac9b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1171,8 +1171,7 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB reobject.dwFlags = 0; /* FIXME */ reobject.dwUser = 0; - editor_insert_oleobj(editor, &reobject); - hr = S_OK; + hr = editor_insert_oleobj(editor, &reobject); } if (lpObject) IOleObject_Release(lpObject); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e0df63ae92d..3028d9bdbd5 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -187,7 +187,7 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) DEC BOOL ME_IsSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DeleteSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SendSelChange(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ) DECLSPEC_HIDDEN; +HRESULT editor_insert_oleobj( ME_TextEditor *editor, const REOBJECT *reo ) DECLSPEC_HIDDEN; BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) DECLSPEC_HIDDEN; int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a23f4c82730..936f1c928b3 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1361,6 +1361,7 @@ static HRESULT WINAPI IRichEditOle_fnInsertObject(IRichEditOle *iface, REOBJECT *reo) { struct text_services *services = impl_from_IRichEditOle( iface ); + HRESULT hr; TRACE("(%p,%p)\n", services, reo); @@ -1369,7 +1370,10 @@ IRichEditOle_fnInsertObject(IRichEditOle *iface, REOBJECT *reo) if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; - editor_insert_oleobj(services->editor, reo); + hr = editor_insert_oleobj(services->editor, reo); + if (hr != S_OK) + return hr; + ME_CommitUndo(services->editor); ME_UpdateRepaint(services->editor, FALSE); return S_OK; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 65c07162421..c85a621b80b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3420,7 +3420,7 @@ static void _insert_reobject(struct reolecb_obj *callback, IRichEditOle *reole, IOleClientSite *clientsite; HRESULT hr; - olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, + olecb_expect_QueryInsertObject(callback, line, 1, &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); @@ -3495,18 +3495,16 @@ static void subtest_InsertObject(struct reolecb_obj *callback) hr = IRichEditOle_GetClientSite(reole, &clientsite); ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); - olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, + olecb_expect_QueryInsertObject(callback, __LINE__, 1, &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); hr = IRichEditOle_InsertObject(reole, &reobj); - todo_wine ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); olecb_check_QueryInsertObject(callback, __LINE__); IOleClientSite_Release(clientsite); count = IRichEditOle_GetObjectCount(reole); - todo_wine ok(count == 3, "got wrong object count: %ld\n", count); }

1 0