June 2021 - Wine-Commits - list.winehq.org

Francois Gouget : css: Fix the spelling of a comment.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: website Branch: master Commit: 446934b192e99e7f544ffffad434f96e74472f0e URL: https://source.winehq.org/git/website.git/?a=commit;h=446934b192e99e7f544ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:52:39 2021 +0200 css: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6dbda392..cf76dcc2 100644 --- a/css/styles.css +++ b/css/styles.css @@ -125,7 +125,7 @@ SPAN.link:active { color: #FF0000; text-decoration: none; } /* blockquote */ blockquote { font-size: inherit; } -/* horizonal rules */ +/* horizontal rules */ HR { border-top: 1px solid #d4d4d4; } /* DIV styles */ @@ -612,4 +612,4 @@ BODY.rtl { margin-left: 10px; } -} \ No newline at end of file +}

1 0

Francois Gouget : php: Fix the spelling of PHP comments.
by Alexandre Julliard June 21, 2021

June 21, 2021

Module: website Branch: master Commit: 69d0de55cab9df822716f1182d0c537c80d1c9aa URL: https://source.winehq.org/git/website.git/?a=commit;h=69d0de55cab9df822716f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:53:12 2021 +0200 php: Fix the spelling of PHP comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/incl.php | 4 ++-- include/utils.php | 2 +- include/wwn.php | 2 +- site.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/incl.php b/include/incl.php index 4a528614..443bde2c 100644 --- a/include/incl.php +++ b/include/incl.php @@ -84,7 +84,7 @@ else $avail = array_map("strtolower", $avail); foreach ($avail as $inLang) { - // check to see if langage is available + // check to see if language is available if (in_array($inLang, $GLOBALS['config']->languages)) { debug("global", "lang from browser: {$inLang}"); @@ -92,7 +92,7 @@ else break; } - // check to see if variation of langage is available + // check to see if variation of language is available if (strlen($inLang) > 2) { $inLangAlt = substr($inLang, 0, 2); diff --git a/include/utils.php b/include/utils.php index 4876bd89..7052f67e 100644 --- a/include/utils.php +++ b/include/utils.php @@ -357,7 +357,7 @@ function array_finder ($array, $filter) return $ret; } -// sort a multi-dimentional array by one of the keys +// sort a multi-dimensional array by one of the keys function array_qsort (&$array, $column=0, $order=SORT_ASC, $first=0, $last= -2) { // $array - the array to be sorted diff --git a/include/wwn.php b/include/wwn.php index d13957ec..9231be81 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -21,7 +21,7 @@ class wwn private $map_array; private $inquote = 0; - // constuctor + // constructor public function __construct () { $this->summary = array(); diff --git a/site.php b/site.php index e108f779..1c4be8ce 100644 --- a/site.php +++ b/site.php @@ -56,7 +56,7 @@ if (isset($_SERVER['PATH_INFO'])) $_SERVER['PHP_SELF'] = str_replace($page_params, '', $_SERVER['PHP_SELF']); $_SERVER['PHP_SELF'] = preg_replace('/\/\/$/', '/', $_SERVER['PHP_SELF']); - // don't contine the loop, this is the end page + // don't continue the loop, this is the end page unset($page_params); break; }

1 0

Alexandre Julliard : Wine release 6.11
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: website Branch: master Commit: 7d55b019818004a08bfa701c03759bf0b108d73e URL: https://source.winehq.org/git/website.git/?a=commit;h=7d55b019818004a08bfa7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 21:46:06 2021 +0200 Wine release 6.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021061801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021061801.xml b/news/en/2021061801.xml new file mode 100644 index 00000000..4f57421c --- /dev/null +++ b/news/en/2021061801.xml @@ -0,0 +1,17 @@ +<news> +<date>June 18, 2021</date> +<title>Wine 6.11 Released</title> +<body> + The Wine development release 6.11 is now available. + <a href="{$root}/announce/6.11">What's new</a> in this release: +<ul> + <li>Theming support in all builtin programs.</li> + <li>All remaining CRT math functions imported from Musl.</li> + <li>MP3 support requires libmpg123 also on macOS.</li> + <li>Support for codepage 720 (Arabic).</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.11.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

Paul Gofman : jscript: Enumerate with and block scopes.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: a35901137e3f9626f0d78472977466e8f9cdc2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35901137e3f9626f0d78472… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:17 2021 +0300 jscript: Enumerate with and block scopes. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 136 ++++++++++++++++++++++++++++++++++++++++--------- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 1 + 3 files changed, 113 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a35901137e3f9626f0d7…

1 0

Florian Eder : cmd: Do not change errorlevel when setting environment variables.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 617d14bc1238b57327a8400eda1c1ab22624beb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=617d14bc1238b57327a8400e… Author: Florian Eder <others.meder(a)gmail.com> Date: Tue Jun 1 07:02:54 2021 +0000 cmd: Do not change errorlevel when setting environment variables. Changes CMD to set its errorlevel to 0 only when the value of an environment variable is set in in non-interactive / batch mode, retains the previous value otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47791 Signed-off-by: Florian Eder <others.meder(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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 502694ffc46..c7df724ae00 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4218,7 +4218,7 @@ void WCMD_setshow_env (WCHAR *s) { if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; } else if (!status) WCMD_print_error(); - else errorlevel = 0; + else if (!interactive) errorlevel = 0; } }

1 0

Paul Gofman : jscript: Support nested scopes for functions defined inside.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: e73cf60a746ef7d79ff3feb2f201acce87849cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73cf60a746ef7d79ff3feb2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:19 2021 +0300 jscript: Support nested scopes for functions defined inside. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 39 +++++++++++++++++++++++++++++---- dlls/jscript/engine.c | 56 ++++++++++++++++++++++++++++++++++++++---------- dlls/jscript/engine.h | 2 ++ dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 1 + dlls/mshtml/tests/es5.js | 49 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 133 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e73cf60a746ef7d79ff3…

1 0

Alexandre Julliard : ntdll: Ignore faults caused by alignment check on x86-64.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: c0012ecdd79a698f2ddca9bdcd5e6bbf5a0fcf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0012ecdd79a698f2ddca9bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 13:49:03 2021 +0200 ntdll: Ignore faults caused by alignment check on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index c36699589d9..2cd133a1087 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2280,6 +2280,11 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (!rec.ExceptionCode) return; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ + if (EFL_sig(ucontext) & 0x00040000) + { + EFL_sig(ucontext) &= ~0x00040000; /* reset AC flag */ + return; + } rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default:

1 0

Nikolay Sivov : mfplay: Create media item on player creation, when url is specified.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 352da005c18e7a34935ecc05940c9b37110c7883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=352da005c18e7a34935ecc05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 18 19:28:53 2021 +0300 mfplay: Create media item on player creation, when url is specified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 29 +++++++++++++++++++++++++++++ dlls/mfplay/tests/mfplay.c | 20 ++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f6cb81de436..0bbe59f4c90 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1911,14 +1911,26 @@ static const IMFAsyncCallbackVtbl media_player_session_events_callback_vtbl = media_player_session_events_callback_Invoke, }; +/*********************************************************************** + * MFPCreateMediaPlayer (mfplay.@) + */ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { struct media_player *object; + IMFPMediaItem *item; HRESULT hr; TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); + if (!player) + return E_POINTER; + + *player = NULL; + + if (!url && start_playback) + return E_INVALIDARG; + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1950,6 +1962,23 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C 0, mfplay_instance, NULL); } + if (url) + { + if (FAILED(hr = media_player_create_item_from_url(object, url, TRUE, 0, &item))) + { + WARN("Failed to create media item, hr %#x.\n", hr); + goto failed; + } + + hr = IMFPMediaPlayer_SetMediaItem(&object->IMFPMediaPlayer_iface, item); + IMFPMediaItem_Release(item); + if (FAILED(hr)) + { + WARN("Failed to set media item, hr %#x.\n", hr); + goto failed; + } + } + *player = &object->IMFPMediaPlayer_iface; return S_OK; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index f11973ef939..a2d6da54f3e 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -87,6 +87,26 @@ static void test_create_player(void) HWND window; HRESULT hr; + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + player = (void *)0xdeadbeef; + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!player, "Unexpected pointer %p.\n", player); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, &player); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, &callback, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Tag wine-6.11 : Alexandre Julliard : Release 6.11
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: refs/tags/wine-6.11 Tag: 0cbd8cdb24005866cd5aaffbcf6a4aba7e60d70a URL: https://source.winehq.org/git/wine.git/?a=tag;h=0cbd8cdb24005866cd5aaffbcf6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 21:44:17 2021 +0200 Release 6.11

1 0

Nikolay Sivov : mfplay: Start playback on player creation automatically, when enabled.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: d2abb6a49bd216d10f4fe66fd78cbd0cab0f4fdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2abb6a49bd216d10f4fe66f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 18 19:28:54 2021 +0300 mfplay: Start playback on player creation automatically, when enabled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0bbe59f4c90..c4913134901 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1977,6 +1977,9 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C WARN("Failed to set media item, hr %#x.\n", hr); goto failed; } + + if (start_playback) + IMFPMediaPlayer_Play(&object->IMFPMediaPlayer_iface); } *player = &object->IMFPMediaPlayer_iface;

1 0