July 2018 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmusic: Reimplement ParseDescriptor() for DirectMusicCollection.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 8e0f94986e245899c11d442c9bd00ff8b2f7ff43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e0f94986e245899c11d442c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:44 2018 +0200 dmusic: Reimplement ParseDescriptor() for DirectMusicCollection. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/collection.c | 208 ++++----------------------------------------- dlls/dmusic/tests/dmusic.c | 18 ++-- 2 files changed, 28 insertions(+), 198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e0f94986e245899c11d…

1 0

Michael Stefaniuc : dmband: Reimplement ParseDescriptor() for DirectMusicBand.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 9348c093d4df2139eb320633f0f6176c441a647a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9348c093d4df2139eb320633… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:45 2018 +0200 dmband: Reimplement ParseDescriptor() for DirectMusicBand. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/band.c | 184 +++++++++------------------------------------ dlls/dmband/tests/dmband.c | 25 ++++-- 2 files changed, 57 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9348c093d4df2139eb32…

1 0

Michael Stefaniuc : dmcompos: Reimplement ParseDescriptor() for DirectMusicChordMap.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 003bdbd50bb0929616af2c7c22571297e095da25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=003bdbd50bb0929616af2c7c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:46 2018 +0200 dmcompos: Reimplement ParseDescriptor() for DirectMusicChordMap. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/chordmap.c | 169 ++++++----------------------------------- dlls/dmcompos/tests/dmcompos.c | 17 +++-- 2 files changed, 37 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=003bdbd50bb0929616af…

1 0

Michael Stefaniuc : dmloader: Reimplement ParseDescriptor() for DirectMusicContainer.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: cb403450ebf66a178e70f6d487b492a6591f741f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb403450ebf66a178e70f6d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:47 2018 +0200 dmloader: Reimplement ParseDescriptor() for DirectMusicContainer. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 197 +++++++------------------------------------ dlls/dmloader/tests/loader.c | 17 +++- 2 files changed, 44 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb403450ebf66a178e70…

1 0

Michael Stefaniuc : dmstyle: Reimplement ParseDescriptor() for DirectMusicStyle.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: 55587efd3a46f15bedf43227da7fd462e8585ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55587efd3a46f15bedf43227… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 15 21:08:48 2018 +0200 dmstyle: Reimplement ParseDescriptor() for DirectMusicStyle. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 177 +++++++------------------------------------ dlls/dmstyle/tests/dmstyle.c | 15 ++-- 2 files changed, 39 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55587efd3a46f15bedf4…

1 0

Jason Edmeades : cmd: Fix handle leak in if exists.
by Alexandre Julliard 16 Jul '18

16 Jul '18

Module: wine Branch: master Commit: f634fe15db1d6f09615505eb445b9e748720dbeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f634fe15db1d6f09615505eb… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:26 2018 +0100 cmd: Fix handle leak in if exists. Fixes regression in f53d57c8549dc439eb73354bfd37acd1e4e86cfd. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 57a41c4..ff58484 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2844,7 +2844,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) WIN32_FIND_DATAW fd; HANDLE hff = FindFirstFileW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), &fd); test = (hff != INVALID_HANDLE_VALUE ); - if (!test) FindClose(hff); + if (test) FindClose(hff); WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); }

1 0

Jactry Zeng : zh-cn: Update Simplified Chinese translation.
by Jeremy Newman 16 Jul '18

16 Jul '18

Module: website Branch: master Commit: e0ddb1a2eca2e72541d88f4f5716e05627d2a24c URL: https://source.winehq.org/git/website.git/?a=commit;h=e0ddb1a2eca2e72541d88… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Jul 13 18:12:09 2018 +0800 zh-cn: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/home.template | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/templates/zh-cn/home.template b/templates/zh-cn/home.template index 6c48ee0..19194e6 100644 --- a/templates/zh-cn/home.template +++ b/templates/zh-cn/home.template @@ -101,7 +101,7 @@ </a> <div class="clear"></div> - <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download_zhcn"> <span class="winehq_badge fa-4x fa-layers fa-fw"> <i class="winehq_badge_inner fas fa-square"></i> <i class="fa-inverse fas fa-download" data-fa-transform="shrink-6"></i> @@ -161,20 +161,6 @@ <h1 class="title"><a href="{$root}/news">新闻与更新</a></h1> - <p class="newstitle"><a href="/news/2018030801">WineConf 2018 - 25 周年庆祝</a></p> - <div class="newsblock"> - <p>The Wine Project is pleased to announce that WineConf 2018 will - take place on June 29 - July 1 2018 in The Hague, The - Netherlands. This will coincide with the 25th anniversary of Wine.</p> - <p>WineConf is the Wine Project's annual conference, where members of - the Wine community, the broader Free Software community and interested - users meet up over food and beverages. We traditionally also have a - number of talks by attendees, as well as some formal and informal - discussions about anything vaguely Wine related.</p> - <p>Please see the <a href="https://wiki.winehq.org/WineConf2018">WineConf2018 page</a> - for further details.</p> - </div> -  <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> 更多新闻...</a></p>

1 0

Francois Gouget : testbot: Remove the Patch::AffectsTests field.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: tools Branch: master Commit: d050ff8d64e99d34f3bf72d7c7b77f73c633194c URL: https://source.winehq.org/git/tools.git/?a=commit;h=d050ff8d64e99d34f3bf72d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 13 12:05:19 2018 +0200 testbot: Remove the Patch::AffectsTests field. Patches which impact Wine must be tested too so this field is unused and no longer relevant. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update40.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Patches.pm | 1 - 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/testbot/ddl/update40.sql b/testbot/ddl/update40.sql new file mode 100644 index 0000000..8fa4606 --- /dev/null +++ b/testbot/ddl/update40.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Patches + DROP AffectsTests; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 96fcdcb..8862c6c 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -68,7 +68,6 @@ CREATE TABLE Patches WebPatchId INT(7) NULL, Received DATETIME NOT NULL, Disposition VARCHAR(40) NOT NULL, - AffectsTests ENUM('Y', 'N') NOT NULL, FromName VARCHAR(40) NULL, FromEMail VARCHAR(40) NULL, Subject VARCHAR(120) NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index d3efcb8..c54897a 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1092,29 +1092,6 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> - <dia:string>#AffectsTests#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> <dia:string>#FromName#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 23b9217..f5ef431 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -346,7 +346,6 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), - CreateBasicPropertyDescriptor("AffectsTests", "Affects tests", !1, 1, "B", 1), CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120),

1 0

Francois Gouget : testbot/WineSendLog: Fix identifying and reporting timeouts to the mailing list.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: tools Branch: master Commit: 074f362dc9ba3694982530a6cdf7b5623c58891b URL: https://source.winehq.org/git/tools.git/?a=commit;h=074f362dc9ba3694982530a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 13 12:07:04 2018 +0200 testbot/WineSendLog: Fix identifying and reporting timeouts to the mailing list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f095bce..ac14e11 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -139,9 +139,9 @@ sub ReadLog($$$) while (! $Found && defined($Line = <LOG>)) { $Line =~ s/[\r\n]*$//; - if ($Line =~ m/${BaseName}:${TestSet} done/) + if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done/) { - if ($Line =~ m/${BaseName}:${TestSet} done $258$/) + if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done $258$/) { push @Messages, "The test timed out"; } @@ -192,7 +192,7 @@ sub CompareLogs($$$$) { if ($Line =~ m/: Test failed: / || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at / || - $Line =~ m/Timeout/i) + $Line =~ m/The test timed out/) { $Messages .= "$Line\n"; } @@ -301,7 +301,7 @@ EOF print SENDMAIL "\n$CurrentDll:\n"; $PrintedDll = $CurrentDll; } - if ($Line =~ m/^[^:]+:([^ ]+) done $258$/) + if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done $258$/) { print SENDMAIL "$1: The test timed out\n"; }

1 0

Michael Stefaniuc : msg711.acm: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 13 Jul '18

13 Jul '18

Module: wine Branch: master Commit: 29db42279474c3e80e286e47fe790ceaae8f2a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29db42279474c3e80e286e47… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:10 2018 +0200 msg711.acm: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index dc1661c..cb8b762 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -87,10 +87,6 @@ static const Format ULaw_Formats[] = {1, 8, 22050}, {2, 8, 22050}, {1, 8, 44100}, {2, 8, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ALAW_FORMATS (sizeof(ALaw_Formats) / sizeof(ALaw_Formats[0])) -#define NUM_ULAW_FORMATS (sizeof(ULaw_Formats) / sizeof(ULaw_Formats[0])) - /*********************************************************************** * G711_GetFormatIndex */ @@ -102,15 +98,15 @@ static DWORD G711_GetFormatIndex(const WAVEFORMATEX *wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_ALAW: - hi = NUM_ALAW_FORMATS; + hi = ARRAY_SIZE(ALaw_Formats); fmts = ALaw_Formats; break; case WAVE_FORMAT_MULAW: - hi = NUM_ULAW_FORMATS; + hi = ARRAY_SIZE(ULaw_Formats); fmts = ULaw_Formats; break; default: @@ -716,19 +712,19 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ALAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); - aftd->cStandardFormats = NUM_ALAW_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats); lstrcpyW(aftd->szFormatTag, szALaw); break; case 2: aftd->dwFormatTag = WAVE_FORMAT_MULAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); - aftd->cStandardFormats = NUM_ULAW_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats); lstrcpyW(aftd->szFormatTag, szULaw); break; } @@ -751,7 +747,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; @@ -759,7 +755,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_ALAW: - if (afd->dwFormatIndex >= NUM_ALAW_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ALaw_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ALaw_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ALaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ALaw_Formats[afd->dwFormatIndex].nBits; @@ -768,7 +764,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->cbSize = 0; break; case WAVE_FORMAT_MULAW: - if (afd->dwFormatIndex >= NUM_ULAW_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ULaw_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ULaw_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ULaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ULaw_Formats[afd->dwFormatIndex].nBits;

1 0