January 2020 - Wine-Commits

Zebediah Figura : qedit: Use wide character string literals.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: d4bf8b2acd87c98c10ecd21c05363c29e4c5fdbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bf8b2acd87c98c10ecd21c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 20:30:28 2020 -0600 qedit: Use wide character string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 10 +++------- dlls/qedit/nullrenderer.c | 4 +--- dlls/qedit/tests/mediadet.c | 14 ++++++-------- dlls/qedit/tests/nullrenderer.c | 19 ++++++++----------- dlls/qedit/tests/samplegrabber.c | 33 ++++++++++++++------------------- 5 files changed, 32 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4bf8b2acd87c98c10ec…

1 0

Zebediah Figura : compobj: Store the IMalloc pointer as a SEGPTR.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 464b74bf5b4717c08a75664c8b6d785607045337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=464b74bf5b4717c08a75664c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 00:24:29 2020 -0600 compobj: Store the IMalloc pointer as a SEGPTR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/compobj.c | 47 ++++++++++++++--------------------- dlls/compobj.dll16/compobj.dll16.spec | 2 +- 2 files changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index dc5e315b4c..701f0012ff 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -65,7 +65,7 @@ typedef struct typedef struct { SEGPTR lpVtbl; -} IMalloc16, *LPMALLOC16; +} IMalloc16; static SEGPTR call_IMalloc_Alloc(SEGPTR iface, DWORD size) { @@ -82,7 +82,7 @@ static SEGPTR call_IMalloc_Alloc(SEGPTR iface, DWORD size) static HTASK16 hETask = 0; static WORD Table_ETask[62]; -static LPMALLOC16 currentMalloc16=NULL; +static SEGPTR compobj_malloc; /* --- IMalloc16 implementation */ @@ -211,8 +211,7 @@ LPVOID CDECL IMalloc16_fnHeapMinimize(IMalloc16* iface) { /****************************************************************************** * IMalloc16_Constructor [VTABLE] */ -static LPMALLOC16 -IMalloc16_Constructor(void) +static SEGPTR IMalloc16_Constructor(void) { static IMalloc16Vtbl vt16; static SEGPTR msegvt16; @@ -237,7 +236,7 @@ IMalloc16_Constructor(void) } This->IMalloc16_iface.lpVtbl = msegvt16; This->ref = 1; - return (LPMALLOC16)MapLS( This ); + return MapLS(This); } @@ -250,32 +249,24 @@ DWORD WINAPI CoBuildVersion16(void) } /*********************************************************************** - * CoGetMalloc [COMPOBJ.4] - * - * Retrieve the current win16 IMalloc interface. - * - * RETURNS - * The current win16 IMalloc + * CoGetMalloc [COMPOBJ.4] */ -HRESULT WINAPI CoGetMalloc16( - DWORD dwMemContext, /* [in] unknown */ - LPMALLOC16 * lpMalloc /* [out] current win16 malloc interface */ -) { - if(!currentMalloc16) - currentMalloc16 = IMalloc16_Constructor(); - *lpMalloc = currentMalloc16; +HRESULT WINAPI CoGetMalloc16(MEMCTX context, SEGPTR *malloc) +{ + if (!compobj_malloc) + compobj_malloc = IMalloc16_Constructor(); + *malloc = compobj_malloc; return S_OK; } /*********************************************************************** * CoCreateStandardMalloc [COMPOBJ.71] */ -HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, - LPMALLOC16 *lpMalloc) +HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc) { /* FIXME: docu says we shouldn't return the same allocator as in * CoGetMalloc16 */ - *lpMalloc = IMalloc16_Constructor(); + *malloc = IMalloc16_Constructor(); return S_OK; } @@ -292,19 +283,17 @@ SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown) if (unknown) FIXME("Ignoring unknown parameter %#x.\n", unknown); - if (CoGetMalloc16(0, (IMalloc16 **)&malloc)) + if (CoGetMalloc16(0, &malloc)) return 0; return call_IMalloc_Alloc(malloc, size); } -/****************************************************************************** - * CoInitialize [COMPOBJ.2] - * Set the win16 IMalloc used for memory management +/*********************************************************************** + * CoInitialize [COMPOBJ.2] */ -HRESULT WINAPI CoInitialize16( - LPVOID lpReserved /* [in] pointer to win16 malloc interface */ -) { - currentMalloc16 = (LPMALLOC16)lpReserved; +HRESULT WINAPI CoInitialize16(SEGPTR malloc) +{ + compobj_malloc = malloc; return S_OK; } diff --git a/dlls/compobj.dll16/compobj.dll16.spec b/dlls/compobj.dll16/compobj.dll16.spec index 2ef011fcb0..8c0456504d 100644 --- a/dlls/compobj.dll16/compobj.dll16.spec +++ b/dlls/compobj.dll16/compobj.dll16.spec @@ -1,5 +1,5 @@ 1 pascal CoBuildVersion() CoBuildVersion16 -2 pascal CoInitialize(long) CoInitialize16 +2 pascal CoInitialize(segptr) CoInitialize16 3 pascal CoUninitialize() CoUninitialize16 4 pascal CoGetMalloc(long ptr) CoGetMalloc16 5 pascal CoRegisterClassObject(ptr ptr long long ptr) CoRegisterClassObject16

1 0

Zebediah Figura : amstream: Use wide character string literals.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: a456808d8296a6fef52dd20b3580493f558e5a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a456808d8296a6fef52dd20b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 20:30:29 2020 -0600 amstream: Use wide character string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 8 +++----- dlls/amstream/ddrawstream.c | 8 +++----- dlls/amstream/filter.c | 6 +++--- dlls/amstream/multimedia.c | 6 ++---- dlls/amstream/tests/amstream.c | 28 ++++++++++------------------ 5 files changed, 21 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a456808d8296a6fef52d…

1 0

Francois Gouget : testbot: Remove unneeded references to the mailing list name in comments.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: tools Branch: master Commit: 6ce470919b1ccaba42978e145d8f9c57b7599c4b URL: https://source.winehq.org/git/tools.git/?a=commit;h=6ce470919b1ccaba42978e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 22 19:33:11 2020 +0100 testbot: Remove unneeded references to the mailing list name in comments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 49347b5..ca35233 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -611,7 +611,7 @@ sub ClientRead($) This is called on startup and regularly after that to catch things that fall through the cracks, possibly because of an Engine restart. -Specifically it checks the staging directory for wine-patches emails dropped +Specifically it checks the staging directory for mailing list patches dropped by WinePatchesMLSubmit.pl, for notifications of changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and checks whether any pending patchsets are now complete and thus can be scheduled. diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 65fe848..bddd42c 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# This script expects to receive a wine-devel email on stdin and submits it +# This script expects to receive a mailing list email on stdin and submits it # to WineTestBot for testing. It is meant to be called from a tool such as # procmail. # diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2f4b703..6c3c8b7 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -73,8 +73,8 @@ them. A base VM is used for every suitable task. This is the only role that build VMs can play besides retired. For Windows VMs, this means that it will run the -WineTest jobs, the wine-patches jobs, and also the manually submitted jobs -unless the submitter decided otherwise. +WineTest jobs, jobs for the mailing list patches, and also the manually +submitted jobs unless the submitter decided otherwise. =item winetest

1 0

Francois Gouget : testbot: Use a more explicit filename to stage patchsets.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: tools Branch: master Commit: ea5990edc396b92d6abbde64c37a5abcdc8afe7c URL: https://source.winehq.org/git/tools.git/?a=commit;h=ea5990edc396b92d6abbde6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 22 11:16:11 2020 +0100 testbot: Use a more explicit filename to stage patchsets. Use a different filename for patches and patchsets so that in case of trouble one can trace the staging file to its source. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 121a3a6..115b7d5 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n"; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 286b393..5be39e4 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -104,7 +104,7 @@ sub SubmitSubset($$$) { my ($self, $MaxPart, $FinalPatch) = @_; - my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patch"); + my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patchset.diff"); return "Could not create a combined patch file: $!" if (!$CombinedFile); my $ErrMessage;

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix reporting log access errors.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: tools Branch: master Commit: cceea335a9c789272ab0faff56fac6a8ff9ddf52 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cceea335a9c789272ab0faf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 22 11:12:13 2020 +0100 testbot/UpdateTaskLogs: Fix reporting log access errors. Use the error message returned by ParseWineTestReport() when it could not open the report instead of recreating it from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index ae3b305..ca9bf44 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -193,7 +193,7 @@ sub BuildErrFile($$$$) my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); if (!defined $LogFailures and @$LogErrors == 1) { - return "Unable to open '$TaskKey/$ReportName' for reading: $!"; + return "$TaskKey: $LogErrors->[0]"; } return undef if (!@$LogErrors);

1 0

Alexandre Julliard : Add link to the 5.0 announce file.
by Alexandre Julliard Jan. 21, 2020

Jan. 21, 2020

Module: website Branch: master Commit: 34164adee44386b1aba1153f6c54a7e9f177f05f URL: https://source.winehq.org/git/website.git/?a=commit;h=34164adee44386b1aba11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 21 20:02:23 2020 +0100 Add link to the 5.0 announce file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020012101.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/en/2020012101.xml b/news/en/2020012101.xml index c8f50938..2d6b9836 100644 --- a/news/en/2020012101.xml +++ b/news/en/2020012101.xml @@ -3,7 +3,7 @@ <title>Wine 5.0 Released</title> <body> The Wine team is proud to announce that the stable release Wine 5.0 is now available. - This release represents a year of development effort and over 7,400 individual changes. It contains a large number of improvements that are listed in the release notes below. The main highlights are: + This release represents a year of development effort and over 7,400 individual changes. It contains a large number of improvements that are listed in the <a href="{$root}/announce/5.0">release notes</a> below. The main highlights are: <ul> <li>Builtin modules in PE format.</li> <li>Multi-monitor support.</li>

1 0

Alexandre Julliard : Wine release 5.0
by Alexandre Julliard Jan. 21, 2020

Jan. 21, 2020

Module: website Branch: master Commit: 1f0352ad092fd204f6a97c9ee8d5a89f6ce38c5d URL: https://source.winehq.org/git/website.git/?a=commit;h=1f0352ad092fd204f6a97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 21 18:05:08 2020 +0100 Wine release 5.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020012101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020012101.xml b/news/en/2020012101.xml new file mode 100644 index 00000000..c8f50938 --- /dev/null +++ b/news/en/2020012101.xml @@ -0,0 +1,16 @@ +<news> +<date>January 21, 2020</date> +<title>Wine 5.0 Released</title> +<body> + The Wine team is proud to announce that the stable release Wine 5.0 is now available. + This release represents a year of development effort and over 7,400 individual changes. It contains a large number of improvements that are listed in the release notes below. The main highlights are: +<ul> + <li>Builtin modules in PE format.</li> + <li>Multi-monitor support.</li> + <li>XAudio2 reimplementation.</li> + <li>Vulkan 1.1 support.</li> +</ul> + This release is dedicated to the memory of Józef Kucia, who passed away in August 2019 at the young age of 30. Józef was a major contributor to Wine's Direct3D implementation, and the lead developer of the vkd3d project. His skills and his kindness are sorely missed by all of us. +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.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

Alexandre Julliard : Release 5.0.
by Alexandre Julliard Jan. 21, 2020

Jan. 21, 2020

Module: wine Branch: master Commit: da816802e022e8aa8eb197de94e18305a92766c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da816802e022e8aa8eb197de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 21 18:03:21 2020 +0100 Release 5.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 510 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 411 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da816802e022e8aa8eb1…

1 0

Tag wine-5.0 : Alexandre Julliard : Release 5.0
by Alexandre Julliard Jan. 21, 2020

Jan. 21, 2020

Module: wine Branch: refs/tags/wine-5.0 Tag: 3aff0a58f185944036fb0c140462e07b0ab881aa URL: https://source.winehq.org/git/wine.git/?a=tag;h=3aff0a58f185944036fb0c14046… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 21 18:03:21 2020 +0100 Release 5.0

1 0