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

Michael Stefaniuc : dmusic: Reimplement ParseDescriptor() for DirectMusicCollection.
by Alexandre Julliard July 16, 2018

July 16, 2018

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 : dmstyle: Reimplement ParseDescriptor() for DirectMusicStyle.
by Alexandre Julliard July 16, 2018

July 16, 2018

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

Józef Kucia : wined3d: Take into account all shader stages when determining feature level.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: d97ca4b86f408b584a82e8500fe6333336301e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97ca4b86f408b584a82e850… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 13 13:52:23 2018 +0200 wined3d: Take into account all shader stages when determining feature level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e422005..bb8d5af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1847,22 +1847,29 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) { + unsigned int shader_model; + + shader_model = min(shader_caps->vs_version, shader_caps->ps_version); + shader_model = min(shader_model, max(shader_caps->gs_version, 3)); + shader_model = min(shader_model, max(shader_caps->hs_version, 4)); + shader_model = min(shader_model, max(shader_caps->ds_version, 4)); + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) { - if (shader_caps->vs_version >= 5 + if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) return WINED3D_FEATURE_LEVEL_11; - if (shader_caps->vs_version == 4) + if (shader_model == 4) return WINED3D_FEATURE_LEVEL_10; } - if (shader_caps->vs_version == 3) + if (shader_model == 3) return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_caps->vs_version == 2) + if (shader_model == 2) return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_caps->vs_version == 1) + if (shader_model == 1) return WINED3D_FEATURE_LEVEL_8; if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3)

1 0

Piotr Caban : msi: Fix condition evaluation when comparing literal and integer.
by Alexandre Julliard July 16, 2018

July 16, 2018

Module: wine Branch: master Commit: 7837ae20cdeabab661da7bb5dae24f5ffefe17ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=7837ae20cdeabab661da7bb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 13 13:12:51 2018 +0200 msi: Fix condition evaluation when comparing literal and integer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45445 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/tests/package.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index ce06199..a8c9734 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -218,7 +218,7 @@ boolean_factor: } else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL) { - $$ = FALSE; + $$ = ($2 == COND_NE || $2 == COND_INE ); } else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */ { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ace9b35..d6d90ce 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2097,6 +2097,10 @@ static void test_condition(void) ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "&nofeature<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "\"\"<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiEvaluateConditionA(hpkg, "$nocomponent=\"\"");

1 0

Michael Stefaniuc : dmband: Reimplement ParseDescriptor() for DirectMusicBand.
by Alexandre Julliard July 16, 2018

July 16, 2018

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 July 16, 2018

July 16, 2018

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

Jactry Zeng : zh-cn: Update Simplified Chinese translation.
by Jeremy Newman July 16, 2018

July 16, 2018

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/WineSendLog: Fix identifying and reporting timeouts to the mailing list.
by Alexandre Julliard July 13, 2018

July 13, 2018

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

Francois Gouget : testbot: Remove the Patch::AffectsTests field.
by Alexandre Julliard July 13, 2018

July 13, 2018

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

Serge Gautherie : guiddef.h: REF* types do not depend on CINTERFACE.
by Alexandre Julliard July 13, 2018

July 13, 2018

Module: wine Branch: master Commit: 54f58769fee73a55675d503e0281e8f381a8e8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f58769fee73a55675d503e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Jul 13 16:30:50 2018 +0200 guiddef.h: REF* types do not depend on CINTERFACE. Addendum to 4626db2bb2a61cdceb00e0e346628062ee51aade. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 36c932c..2adde9c 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -130,12 +130,12 @@ typedef GUID FMTID,*LPFMTID; #define REFCLSID const CLSID & #define REFIID const IID & #define REFFMTID const FMTID & -#else /* !defined(__cplusplus) && !defined(CINTERFACE) */ +#else /* !defined(__cplusplus) */ #define REFGUID const GUID* __MIDL_CONST #define REFCLSID const CLSID* __MIDL_CONST #define REFIID const IID* __MIDL_CONST #define REFFMTID const FMTID* __MIDL_CONST -#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */ +#endif /* !defined(__cplusplus) */ #if defined(__cplusplus) && !defined(CINTERFACE) #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))

1 0