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

Louis Lenders : iexplore/iexplore.inf: Add svcVersion reg key and update to win7.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: add31e1d7a320a5f5a64bc1db8d2c0f62774cacc URL: https://source.winehq.org/git/wine.git/?a=commit;h=add31e1d7a320a5f5a64bc1d… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 6 11:29:11 2018 +0200 iexplore/iexplore.inf: Add svcVersion reg key and update to win7. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.inf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index 68c17e3..d8c5352 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -36,9 +36,10 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"98112" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.0.8112.16421" -HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.0.8112.16421" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"99600" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.11.9600.18376" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.11.9600.18376" +HKLM,"Software\Microsoft\Internet Explorer","svcVersion",,"11.0.9600.18376" [Strings]

1 0

Jacek Caban : advapi32: Initialize svcctl_GetNotifyResults output parameter to NULL.
by Alexandre Julliard 09 Apr '18

09 Apr '18

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

Ivan Kalvachev : kernel32: Add DECL_HOTPATCH to OutputDebugString functions.
by Alexandre Julliard 09 Apr '18

09 Apr '18

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

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

Dmitry Timoshkov : winspool.drv: Add A0, A1 and A2 paper sizes to generic.ppd.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: ba5fe9a31772c563a5cf2f1c9e36a6f0f6a35eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5fe9a31772c563a5cf2f1c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 11:41:26 2018 +0800 winspool.drv: Add A0, A1 and A2 paper sizes to generic.ppd. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/generic.ppd | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/winspool.drv/generic.ppd b/dlls/winspool.drv/generic.ppd index b6e4628..9d63e2e 100644 --- a/dlls/winspool.drv/generic.ppd +++ b/dlls/winspool.drv/generic.ppd @@ -22,6 +22,9 @@ *UIConstraints: *PageSize Executive *InputSlot Envelope *UIConstraints: *PageSize Letter *InputSlot Envelope *UIConstraints: *PageSize Legal *InputSlot Envelope +*UIConstraints: *PageSize A0 *InputSlot Envelope +*UIConstraints: *PageSize A1 *InputSlot Envelope +*UIConstraints: *PageSize A2 *InputSlot Envelope *UIConstraints: *PageSize A3 *InputSlot Envelope *UIConstraints: *PageSize A4 *InputSlot Envelope *UIConstraints: *PageSize A5 *InputSlot Envelope @@ -33,6 +36,9 @@ *PageSize Letter/Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice" *PageSize Legal/Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice" *PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice" +*PageSize A0/A0: "<</PageSize[2384 3370]/ImagingBBox null>>setpagedevice" +*PageSize A1/A1: "<</PageSize[1684 2384]/ImagingBBox null>>setpagedevice" +*PageSize A2/A2: "<</PageSize[1191 1684]/ImagingBBox null>>setpagedevice" *PageSize A3/A3: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice" *PageSize A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice" *PageSize A5/A5: "<</PageSize[420 595]/ImagingBBox null>>setpagedevice" @@ -50,6 +56,9 @@ *PageRegion Letter/Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice" *PageRegion Legal/Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice" *PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice" +*PageRegion A0/A0: "<</PageSize[2384 3370]/ImagingBBox null>>setpagedevice" +*PageRegion A1/A1: "<</PageSize[1684 2384]/ImagingBBox null>>setpagedevice" +*PageRegion A2/A2: "<</PageSize[1191 1684]/ImagingBBox null>>setpagedevice" *PageRegion A3/A3: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice" *PageRegion A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice" *PageRegion A5/A5: "<</PageSize[421 595]/ImagingBBox null>>setpagedevice" @@ -65,6 +74,9 @@ *ImageableArea Letter/US Letter: "18 18 594 774" *ImageableArea Legal/US Legal: "18 18 594 990" *ImageableArea Executive/Executive: "18 18 504 738" +*ImageableArea A0/A0: "12 12 2372 3358" +*ImageableArea A1/A1: "12 12 1672 2372" +*ImageableArea A2/A2: "12 12 1179 1672" *ImageableArea A3/A3: "12 12 830 1179" *ImageableArea A4/A4: "18 18 577 824" *ImageableArea A5/A5: "18 36 403 559" @@ -79,6 +91,9 @@ *PaperDimension Letter/Letter: "612 792" *PaperDimension Legal/Legal: "612 1008" *PaperDimension Executive/Executive: "522 756" +*PaperDimension A0/A0: "2384 3370" +*PaperDimension A1/A1: "1684 2384" +*PaperDimension A2/A2: "1191 1684" *PaperDimension A3/A3: "842 1191" *PaperDimension A4/A4: "595 842" *PaperDimension A5/A5: "421 595"

1 0

Piotr Caban : msvcr110: Add __crtCaptureCurrentContext implementation.
by Alexandre Julliard 09 Apr '18

09 Apr '18

Module: wine Branch: master Commit: a2a258f4be957285c257e7d9c22131702af9949c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a258f4be957285c257e7d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:02:31 2018 +0200 msvcr110: Add __crtCaptureCurrentContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 27b3508..1a04161 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -904,7 +904,7 @@ @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale -@ stub -arch=win64 __crtCaptureCurrentContext +@ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext @ stub -arch=win64 __crtCapturePreviousContext @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 254040a..f65669c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -889,7 +889,7 @@ @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl __create_locale(long str) MSVCRT__create_locale -@ stub -arch=win64 __crtCaptureCurrentContext +@ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) ntdll.RtlCaptureContext @ stub -arch=win64 __crtCapturePreviousContext @ cdecl __crtCompareStringA(long long str long str long) @ stub -arch=i386,win64 __crtCompareStringEx diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4739055..0ba1780 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -883,7 +883,7 @@ @ cdecl __clean_type_info_names_internal(ptr) msvcr120.__clean_type_info_names_internal @ cdecl -arch=i386 __control87_2(long long ptr ptr) msvcr120.__control87_2 @ cdecl __create_locale(long str) msvcr120.__create_locale -@ stub -arch=win64 __crtCaptureCurrentContext +@ cdecl -arch=win64 -norelay __crtCaptureCurrentContext(ptr) msvcr120.__crtCaptureCurrentContext @ stub -arch=win64 __crtCapturePreviousContext @ stub __crtCloseWinRTThreadHandle @ cdecl __crtCompareStringA(long long str long str long) msvcr120.__crtCompareStringA

1 0

Jeremy Newman : add perm news blurb about wineconf
by Jeremy Newman 05 Apr '18

05 Apr '18

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 04 Apr '18

04 Apr '18

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

André Hentschel : progman: Fix warning in PUT_SHORT macro (clang).
by Alexandre Julliard 04 Apr '18

04 Apr '18

Module: wine Branch: master Commit: a6becd791f9d96b19863eb274d3da9e1756e1c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6becd791f9d96b19863eb27… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 4 19:06:14 2018 +0200 progman: Fix warning in PUT_SHORT macro (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/grpfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index d49dde3..4a71ce5 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -32,7 +32,7 @@ #define GET_SHORT(buffer, i)\ (((BYTE)((buffer)[(i)]) + 0x100 * (signed char)((buffer)[(i)+1]))) #define PUT_SHORT(buffer, i, s)\ - (((buffer)[(i)] = (s) & 0xff, (buffer)[(i)+1] = ((s) >> 8) & 0xff)) + (((buffer)[(i)] = (BYTE)((s) & 0xff), (buffer)[(i)+1] = (BYTE)(((s) >> 8) & 0xff))) static BOOL GRPFILE_ReadFileToBuffer(LPCSTR, HLOCAL*, INT*); static HLOCAL GRPFILE_ScanGroup(LPCSTR, INT, LPCSTR, BOOL);

1 0