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

Stefan Dösinger : ddraw: Fix D3DEXECUTEDATA.dwSize handling.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 6f5028337e6f3e1712bafaaa1a0a3bfb983850a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f5028337e6f3e1712bafaaa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 5 12:59:13 2018 +0200 ddraw: Fix D3DEXECUTEDATA.dwSize handling. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 497287e..89d9ed3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -610,6 +610,12 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * TRACE("iface %p, data %p.\n", iface, data); + if (data->dwSize != sizeof(*data)) + { + WARN("data->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", data->dwSize); + return DDERR_INVALIDPARAMS; + } + /* Skip past previous vertex data. */ buffer->src_vertex_pos += buffer->data.dwVertexCount; @@ -693,12 +699,11 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * static HRESULT WINAPI d3d_execute_buffer_GetExecuteData(IDirect3DExecuteBuffer *iface, D3DEXECUTEDATA *data) { struct d3d_execute_buffer *buffer = impl_from_IDirect3DExecuteBuffer(iface); - DWORD dwSize; TRACE("iface %p, data %p.\n", iface, data); - dwSize = data->dwSize; - memcpy(data, &buffer->data, dwSize); + /* Tests show that dwSize is ignored. */ + memcpy(data, &buffer->data, sizeof(*data)); if (TRACE_ON(ddraw)) {

1 0

Akihiro Sagawa : winmm/tests: Add MIDI System Exclusive message tests.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 96896023ff376577c826b574675c07344a4395fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=96896023ff376577c826b574… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 5 00:40:42 2018 +0900 winmm/tests: Add MIDI System Exclusive message tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 1024c2c..763ed2f 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -256,6 +256,17 @@ static void test_midi_mci(HWND hwnd) if(!err) ok(!strcmp(buf, "false"), "capability can record is %s\n", buf); } +static BYTE SysEx_reset[] = { + 0xF0, 0x7E, 0x7F, 0x09, 0x01, 0xF7 /* GM System ON */ +}; +static BYTE SysEx_volume_off[] = { + 0xF0, 0x7F, 0x7F, 0x04, 0x01, 0x00, 0x00, 0xF7 +}; +static BYTE SysEx_volume_full[] = { + 0xF0, 0x7F, 0x7F, 0x04, 0x01, 0x00, 0x7F, 0xF7 +}; +static BOOL found_fluidsynth; +const static char fluidsynth_prefix[] = "Synth input port "; static void test_midiOut_device(UINT udev, HWND hwnd) { @@ -415,6 +426,59 @@ static void test_midiOut_device(UINT udev, HWND hwnd) test_notification(hwnd, "midiOutClose", 0, WHATEVER); } test_notification(hwnd, "midiOut over", 0, WHATEVER); + if (!strncmp(capsA.szPname, fluidsynth_prefix, strlen(fluidsynth_prefix)) || + (udev == MIDIMAPPER && found_fluidsynth)) { + found_fluidsynth = TRUE; + skip("FluidSynth (at least 1.1.6) doesn't support desired System Exclusive message.\n"); + return; + } + + rc = midiOutOpen(&hm, udev, 0, (DWORD_PTR)0, CALLBACK_NULL); + ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + memset(&mhdr, 0, sizeof(mhdr)); + mhdr.lpData = (LPSTR)SysEx_reset; + mhdr.dwBufferLength = sizeof(SysEx_reset); + rc = midiOutPrepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader rc=%s\n", mmsys_error(rc)); + rc = midiOutLongMsg(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); + rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + Sleep(60); + + mhdr.lpData = (LPSTR)SysEx_volume_off; + mhdr.dwBufferLength = sizeof(SysEx_volume_off); + rc = midiOutPrepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader rc=%s\n", mmsys_error(rc)); + rc = midiOutLongMsg(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); + rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + + { + DWORD e = 0x006F4593; /* velocity 111, note #69, channel 4 */ + trace("ShortMsg type %x (muted)\n", LOBYTE(LOWORD(e))); + rc = midiOutShortMsg(hm, e); + ok(!rc, "midiOutShortMsg rc=%s\n", mmsys_error(rc)); + /* FIXME (for MIDI Mapper): we shouldn't hear this voice due to volume settings */ + if (!rc) Sleep(200); + + rc = midiOutShortMsg(hm, 0x00004593); /* velocity 0 */ + ok(!rc, "midiOutShortMsg rc=%s\n", mmsys_error(rc)); + } + + mhdr.lpData = (LPSTR)SysEx_volume_full; + mhdr.dwBufferLength = sizeof(SysEx_volume_full); + rc = midiOutPrepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader rc=%s\n", mmsys_error(rc)); + rc = midiOutLongMsg(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); + rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + + rc = midiOutClose(hm); + ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); } static void test_position(HMIDISTRM hm, UINT typein, UINT typeout)

1 0

Akihiro Sagawa : winmm: Fix MEVT_LONGMSG handling in MIDI stream.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 185d98bbfdbf7ef10ef52d0264a5a38aedd3b19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=185d98bbfdbf7ef10ef52d02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 5 00:41:24 2018 +0900 winmm: Fix MEVT_LONGMSG handling in MIDI stream. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 0ea3d92..97cef2d 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -819,7 +819,7 @@ static void test_midiStream(UINT udev, HWND hwnd) e->dwEvent = MEVT_F_LONG | sizeof(SysEx_volume_off); memcpy(&e->dwParms[0], SysEx_volume_off, sizeof(SysEx_volume_off)); p += sizeof(MIDISHORTEVENT) + ROUNDUP4(sizeof(SysEx_volume_off)); - /* Note On (FIXME: we shouldn't hear this voice due to volume settings) */ + /* Note On (We can't hear this voice due to volume settings) */ e = (MIDIEVENT *)p; e->dwEvent = MEVT_F_SHORT | 0x6F4593; /* note #69 */ p += sizeof(MIDISHORTEVENT); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 1412d5e..faeb474 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1169,8 +1169,16 @@ start_header: /* do nothing, skip bytes */ break; case MEVT_LONGMSG: - midiOutLongMsg(lpMidiStrm->hDevice, lpMidiStrm->lpMidiHdr, MEVT_EVENTPARM(me->dwEvent)); - break; + { + MIDIHDR mh; + memset(&mh, 0, sizeof(mh)); + mh.lpData = (LPSTR)me->dwParms; + mh.dwBufferLength = MEVT_EVENTPARM(me->dwEvent); + midiOutPrepareHeader(lpMidiStrm->hDevice, &mh, sizeof(mh)); + midiOutLongMsg(lpMidiStrm->hDevice, &mh, sizeof(mh)); + midiOutUnprepareHeader(lpMidiStrm->hDevice, &mh, sizeof(mh)); + break; + } case MEVT_NOP: break; case MEVT_SHORTMSG:

1 0

Ivan Kalvachev : kernel32: Add DECL_HOTPATCH to OutputDebugString functions.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 7f359ea93e89de099ac6be15ca07a6ee16efdce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f359ea93e89de099ac6be15… Author: Ivan Kalvachev <ikalvachev(a)gmail.com> Date: Sat Apr 7 14:02:16 2018 +0300 kernel32: Add DECL_HOTPATCH to OutputDebugString functions. Some Microsoft debuggers hotpatch this function to get the debug output directly from the code they are tracing. Having the wrong function prologue leads to a crash. Signed-off-by: Ivan Kalvachev <ikalvachev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index a277f93..8e5af30 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -253,7 +253,7 @@ static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) * * Nothing. */ -void WINAPI OutputDebugStringA( LPCSTR str ) +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) { static HANDLE DBWinMutex = NULL; static BOOL mutex_inited = FALSE; @@ -364,7 +364,7 @@ void WINAPI OutputDebugStringA( LPCSTR str ) * * Nothing. */ -void WINAPI OutputDebugStringW( LPCWSTR str ) +void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str ) { UNICODE_STRING strW; STRING strA;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 41c5607ea78128531163a8953d9eb055a99f0d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=41c5607ea78128531163a895… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Apr 6 08:22:07 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/po/lt.po b/po/lt.po index e26d136..bb3ed3d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-02-26 22:09+0300\n" +"PO-Revision-Date: 2018-04-06 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9105,70 +9105,59 @@ msgid "" msgstr "Yra mažiausiai viena nenustatyta saugumo problema su šiuo liudijimu." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Baigėsi tarnybos užklausos laikas.\n" +msgstr "Baigėsi užklausos laikas.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Įvyko spausdintuvo klaida." +msgstr "Įvyko vidinė klaida.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Neteisingas kelias.\n" +msgstr "Neteisingas URL.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL schema neatpažinta arba nepalaikoma.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Naudotojo vardas nerastas.\n" +msgstr "Nepavyko nustatyti serverio vardo.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Naudotojo profilis netinkamas.\n" +msgstr "Užklausta operacija netinkama.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Operacija nutraukta, paprastai todėl, kad rodyklė su kuria dirbo užklausa " +"buvo uždaryta prieš pasibaigiant operacijai.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Profilis nepridėtas.\n" +msgstr "Užklaustas elementas nerastas.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Nepavyko prisijungti prie LDAP serverio" +msgstr "Bandymas prisijungti prie serverio nepavyko.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Susijungimas su serveriu buvo nutrauktas.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"SSL liudijimo data gauta iš serverio yra bloga. Liudijimas nebegalioja.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL liudijimo vardas (serverio vardo laukas) neteisingas.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12949,7 +12938,7 @@ msgstr "" #: taskkill.rc:38 msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "Procesas, kurio PID %1!u!, priverstinai nutrauktas.\n" +msgstr "Procesas su PID %1!u! priverstinai nutrauktas.\n" #: taskkill.rc:39 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 63c959199dac49e2a52d2b0c756da8e73ec2bb56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63c959199dac49e2a52d2b0c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 5 20:40:06 2018 +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 | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2962631..6de3f87 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9097,70 +9097,60 @@ msgstr "" "Tässä varmenteessa on ainakin yksi määrittelemätön turvallisuusongelma." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Palvelupyyntö aikakatkaistu.\n" +msgstr "Pyyntö on aikakatkaistu.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Tulostinvirhe." +msgstr "On tapahtunut sisäinen virhe.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Polku on viallinen.\n" +msgstr "URL on viallinen.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL-skeemaa ei tunnistettu, tai sitä ei tueta.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Käyttäjänimeä ei löytynyt.\n" +msgstr "Palvelimen nimeä ei voitu jäsentää.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Käyttäjäprofiili on viallinen.\n" +msgstr "Pyydetty toimenpide ei kelpaa.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Toimenpide keskeytettiin. Tämä johtuu yleensä siitä, että pyynnön " +"käsittelemä kahva suljettiin ennen toimenpiteen valmistumista.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Profiilia ei voitu lisätä.\n" +msgstr "Pyydettyä kohdetta ei löytynyt.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Ei voida yhdistää LDAP-palvelimeen" +msgstr "Yritys yhdistää palvelimeen epäonnistui.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Yhteys palvelimeen on katkaistu.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"Palvelimen lähettämän SSL-sertifikaatin päiväys ei kelpaa. Sertifikaatti on " +"vanhentunut.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikaatin yleinen nimi (CN, palvelimen nimi) ei kelpaa.\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Jacek Caban : advapi32: Initialize svcctl_GetNotifyResults output parameter to NULL.
by Alexandre Julliard April 9, 2018

April 9, 2018

Module: wine Branch: master Commit: 269dbdcfbf7b18cd32c059128319bae3aae1188f URL: https://source.winehq.org/git/wine.git/?a=commit;h=269dbdcfbf7b18cd32c05912… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 6 16:01:31 2018 +0200 advapi32: Initialize svcctl_GetNotifyResults output parameter to NULL. Otherwise rpcrt4 treats its uninitialized value as output buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 70907e1..c78edb2 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2637,7 +2637,7 @@ static DWORD WINAPI notify_thread(void *user) { DWORD err; notify_data *data = user; - SC_RPC_NOTIFY_PARAMS_LIST *list; + SC_RPC_NOTIFY_PARAMS_LIST *list = NULL; SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; BOOL dummy;

1 0

Jeremy Newman : add perm news blurb about wineconf
by Jeremy Newman April 5, 2018

April 5, 2018

Module: website Branch: master Commit: 941ab4df439b4e0f76ec1b1a3e69a484feac7b08 URL: https://source.winehq.org/git/website.git/?a=commit;h=941ab4df439b4e0f76ec1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 5 13:35:25 2018 -0500 add perm news blurb about wineconf --- templates/en/home.template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/templates/en/home.template b/templates/en/home.template index d525e1a..4f16328 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -86,6 +86,20 @@ <h1 class="title"><a href="{$root}/news">News and Updates</a></h1> + <p class="newstitle"><a href="/news/2018030801">WineConf 2018 - 25th anniversary</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> more news...</a></p>

1 0

Jacek Caban : jscript: Allow using reserved words as identifiers in ES5 mode.
by Alexandre Julliard April 4, 2018

April 4, 2018

Module: wine Branch: master Commit: 3263d51a1fd86abf195c5be224f6fdb4db284b53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3263d51a1fd86abf195c5be2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 21:43:19 2018 +0200 jscript: Allow using reserved words as identifiers in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 2 +- dlls/jscript/parser.y | 58 ++++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 18 ++++++++++++ dlls/mshtml/tests/es5.js | 43 ++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3523958..b4f6d95 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -135,7 +135,7 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lva return 1; if(lval) - *lval = ctx->ptr; + *lval = word; ctx->ptr = p1; return 0; } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 59e6757..a40b813 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -164,11 +164,11 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kIF kFINALLY kFOR kIN -%token kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH +%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kIN +%token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL -%token <srcptr> kFUNCTION '}' +%token <srcptr> '}' /* tokens */ %token <identifier> tIdentifier @@ -241,6 +241,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <literal> BooleanLiteral %type <srcptr> KFunction %type <ival> AssignOper +%type <identifier> IdentifierName ReservedAsIdentifier %nonassoc LOWER_THAN_ELSE %nonassoc kELSE @@ -272,7 +273,7 @@ FunctionExpression { $$ = new_function_expression(ctx, $4, $6, $9, $2, $1, $10-$1+1); } KFunction - : kFUNCTION { $$ = $1; } + : kFUNCTION { $$ = ctx->ptr - 8; } /* ECMA-262 3rd Edition 13 */ FunctionBody @@ -711,7 +712,7 @@ MemberExpression | FunctionExpression { $$ = $1; } | MemberExpression '[' Expression ']' { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); } - | MemberExpression '.' tIdentifier + | MemberExpression '.' IdentifierName { $$ = new_member_expression(ctx, $1, $3); } | kNEW MemberExpression Arguments { $$ = new_new_expression(ctx, $2, $3); } @@ -724,7 +725,7 @@ CallExpression { $$ = new_call_expression(ctx, $1, $2); } | CallExpression '[' Expression ']' { $$ = new_binary_expression(ctx, EXPR_ARRAY, $1, $3); } - | CallExpression '.' tIdentifier + | CallExpression '.' IdentifierName { $$ = new_member_expression(ctx, $1, $3); } /* ECMA-262 3rd Edition 11.2 */ @@ -787,7 +788,7 @@ PropertyNameAndValueList /* ECMA-262 3rd Edition 11.1.5 */ PropertyName - : tIdentifier { $$ = new_string_literal(ctx, $1); } + : IdentifierName { $$ = new_string_literal(ctx, $1); } | tStringLiteral { $$ = new_string_literal(ctx, $1); } | tNumericLiteral { $$ = $1; } @@ -796,6 +797,49 @@ Identifier_opt : /* empty*/ { $$ = NULL; } | tIdentifier { $$ = $1; } +/* ECMA-262 5.1 Edition 7.6 */ +IdentifierName + : tIdentifier { $$ = $1; } + | ReservedAsIdentifier + { + if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("%s keyword used as an identifier in legacy mode.\n", + debugstr_w($1)); + YYABORT; + } + $$ = $1; + } + +ReservedAsIdentifier + : kBREAK { $$ = $1; } + | kCASE { $$ = $1; } + | kCATCH { $$ = $1; } + | kCONTINUE { $$ = $1; } + | kDEFAULT { $$ = $1; } + | kDELETE { $$ = $1; } + | kDO { $$ = $1; } + | kELSE { $$ = $1; } + | kFALSE { $$ = $1; } + | kFINALLY { $$ = $1; } + | kFOR { $$ = $1; } + | kFUNCTION { $$ = $1; } + | kIF { $$ = $1; } + | kIN { $$ = $1; } + | kINSTANCEOF { $$ = $1; } + | kNEW { $$ = $1; } + | kNULL { $$ = $1; } + | kRETURN { $$ = $1; } + | kSWITCH { $$ = $1; } + | kTHIS { $$ = $1; } + | kTHROW { $$ = $1; } + | kTRUE { $$ = $1; } + | kTRY { $$ = $1; } + | kTYPEOF { $$ = $1; } + | kVAR { $$ = $1; } + | kVOID { $$ = $1; } + | kWHILE { $$ = $1; } + | kWITH { $$ = $1; } + /* ECMA-262 3rd Edition 7.8 */ Literal : kNULL { $$ = new_null_literal(ctx); } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index b9ac40e..21a3582 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -116,6 +116,20 @@ function test_javascript() { ok(!(func in obj), func + " found in " + obj); } + function test_parses(code, expect) { + var success; + try { + eval(code); + success = true; + }catch(e) { + success = false; + } + if(expect) + ok(success === true, code + " did not parse"); + else + ok(success === false, code + " parsed"); + } + var v = document.documentMode; test_exposed("ScriptEngineMajorVersion", g, true); @@ -125,6 +139,10 @@ function test_javascript() { test_exposed("isArray", Array, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); + test_parses("if(false) { o.default; }", v >= 9); + test_parses("if(false) { o.with; }", v >= 9); + test_parses("if(false) { o.if; }", v >= 9); + next_test(); } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 9f87e99..9b0dc21 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -73,8 +73,49 @@ function test_isArray() { next_test(); } +function test_identifier_keywords() { + var o = { + if: 1, + default: 2, + function: 3, + break: true, + case: true, + catch: true, + continue: true, + delete: true, + do: true, + else: true, + finally: true, + for: true, + in: true, + instanceof: true, + new: true, + return: true, + switch: true, + throw: true, + try: true, + typeof: true, + var: true, + void: true, + while: true, + with: true, + true: true, + false: true, + null: true, + this: true + }; + function ro() { return o; }; + + ok(o.if === 1, "o.if = " + o.if); + ok(ro().default === 2, "ro().default = " + ro().default); + ok(o.false === true, "o.false = " + o.false); + + next_test(); +} + var tests = [ test_date_now, test_indexOf, - test_isArray + test_isArray, + test_identifier_keywords ];

1 0

Huw Davies : user32: Avoid using the comma operator in a while condition.
by Alexandre Julliard April 4, 2018

April 4, 2018

Module: wine Branch: master Commit: da943f2c089a0dd32fb727ed1d09e7e00680c6ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=da943f2c089a0dd32fb727ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 4 19:32:15 2018 +0100 user32: Avoid using the comma operator in a while condition. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 7d1f6b3..6f23c74 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1582,9 +1582,9 @@ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious ) */ retvalue = hwndCtrl; hwnd = hwndCtrl; - while (hwndNext = GetWindow (hwnd, GW_HWNDNEXT), - 1) + while (1) { + hwndNext = GetWindow (hwnd, GW_HWNDNEXT); while (!hwndNext) { /* Climb out until there is a next sibling of the ancestor or we

1 0