December 2017 - Wine-commits

Francois Gouget : testbot/web: Use the TestBot records to show its activity.
by Alexandre Julliard 19 Dec '17

19 Dec '17

Module: tools Branch: master Commit: 8d380ebe14c8dbedffba0dfcaaaec7c159306f01 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8d380ebe14c8dbedffba0dfc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 23:53:58 2017 +0100 testbot/web: Use the TestBot records to show its activity. The main index page is nice to browse the jobs but does not allow getting a synthetic picture of what the TestBot is doing at a given time. Even the VM table at the bottom falls short as it only shows the current state and does not even show what task a given VM is running. Each row of the new Activity page shows what each VM was doing at that time, with color coding, links to the relevant task for running VMs, and a count of the runnable and queued tasks. Going down the table shows past history, allowing one to see how the TestBot got in the current state. The VMs are also grouped by host which makes it easier to verify that the scheduler is obeying its operational parameters like the limits on simultaneous running tasks, reverting VMs, etc. While the activity page shows no sensitive information for now access to it is restricted to users with a TestBot account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 199 ++++++++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/lib/WineTestBot/Config.pm | 8 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 + testbot/lib/WineTestBot/RecordGroups.pm | 12 +- testbot/lib/WineTestBot/Records.pm | 24 ++- testbot/web/Activity.pl | 249 +++++++++++++++++++++++++ testbot/web/WineTestBot.css | 39 ++++ 8 files changed, 528 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=8d380ebe14c8dbedffba…

1 0

Francois Gouget : testbot: Keep a record of the status of the VMs.
by Alexandre Julliard 19 Dec '17

19 Dec '17

Module: tools Branch: master Commit: 463e3cd3ac7c5dd5bf1355b081d9f202f71dc3c7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=463e3cd3ac7c5dd5bf1355b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 23:53:47 2017 +0100 testbot: Keep a record of the status of the VMs. Each row of the new Records table allows storing part of the details of an event or of the state of the TestBot. These pieces of information are put together into groups and timestamped through the RecordGroups table. Together these tables allow rebuilding the activity of the TestBot. The first user of these new tables is the job scheduler which uses them to store the new VM status if it changed. This will allow rebuilding and visualizing the activity of the TestBot for monitoring or debugging. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 21 ++ testbot/ddl/update29.sql | 20 ++ testbot/ddl/winetestbot.sql | 19 ++ testbot/doc/winetestbot-schema.dia | 338 ++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Jobs.pm | 64 +++++- testbot/lib/WineTestBot/RecordGroups.pm | 117 +++++++++++ testbot/lib/WineTestBot/Records.pm | 126 ++++++++++++ testbot/lib/WineTestBot/VMs.pm | 60 ++++++ 8 files changed, 760 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=463e3cd3ac7c5dd5bf13…

1 0

Francois Gouget : testbot: Save the status of all VMs on startup.
by Alexandre Julliard 19 Dec '17

19 Dec '17

Module: tools Branch: master Commit: d6523a05cd74501cab92c6451275819757b67ba1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d6523a05cd74501cab92c645… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 23:53:51 2017 +0100 testbot: Save the status of all VMs on startup. This allows providing more information about the initial state of the VMs such as linking running VMs to the corresponding Task, and identifying the initial dirty status as running 'LibvirtTool checkidle'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 44 ++++++++++++++++++++++++++++++++++-------- testbot/lib/WineTestBot/VMs.pm | 7 +++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7dab98e..36a18ad 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -52,6 +52,7 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; use WineTestBot::PendingPatchSets; +use WineTestBot::RecordGroups; use WineTestBot::Utils; use WineTestBot::VMs; @@ -102,7 +103,7 @@ sub Cleanup($;$$) # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. - my %BusyVMs; + my %RunningVMs; foreach my $Job (@{CreateJobs()->GetItems()}) { my $CallUpdateStatus; @@ -135,7 +136,7 @@ sub Cleanup($;$$) { # This task is still running! LogMsg "$TaskKey is still running\n"; - $BusyVMs{$Task->VM->GetKey()} = 1; + $RunningVMs{$Task->VM->GetKey()} = join(" ", "running", $Job->Id, $Step->No, $Task->No); next; } if ($Requeue) @@ -158,16 +159,27 @@ sub Cleanup($;$$) } # Get the VMs in order now + my $RecordGroups = CreateRecordGroups(); + my $Records = $RecordGroups->Add()->Records; + # Save the new RecordGroup now so its Id is lower than those of the groups + # created by the scripts called from Cleanup(). + $RecordGroups->Save(); + my $VMs = CreateVMs(); - $VMs->FilterEnabledRole(); - $VMs->FilterEnabledStatus(); foreach my $VM (@{$VMs->GetItems()}) { my $VMKey = $VM->GetKey(); - if ($BusyVMs{$VMKey}) + if (!$VM->HasEnabledRole() or !$VM->HasEnabledStatus()) + { + $VM->RecordStatus($Records); + next; + } + + if ($RunningVMs{$VMKey}) { # This VM is still running a task. Let it. - LogMsg "$VMKey is used by a task\n"; + LogMsg "$VMKey is $RunningVMs{$VMKey}\n"; + $VM->RecordStatus($Records, $RunningVMs{$VMKey}); next; } @@ -177,27 +189,39 @@ sub Cleanup($;$$) { $VM->KillChild(); $VM->RunPowerOff(); + $VM->RecordStatus($Records, "dirty poweroff (kill tasks)"); } elsif ($KillVMs and $VM->Status ne "running") { $VM->KillChild(); # $KillVMs is normally used on shutdown so don't start a process that # will get stuck 'forever' waiting for an offline VM. - $VM->RunPowerOff() if ($VM->Status ne "offline"); + if ($VM->Status ne "offline") + { + $VM->RunPowerOff(); + $VM->RecordStatus($Records, "dirty poweroff (kill vms)"); + } } elsif (!$VM->CanHaveChild()) { # The VM should not have a process. $VM->KillChild(); $VM->RunPowerOff(); + $VM->RecordStatus($Records, "dirty poweroff (unexpected process)"); + } + elsif ($Starting) + { + # Let the process finish its work. Note that on shutdown we don't + # record the VM status if it did not change. + $VM->RecordStatus($Records); } - # else let the process finish its work } elsif ($Starting) { if ($VM->Status eq "idle") { $VM->RunCheckIdle(); + $VM->RecordStatus($Records, "dirty idle check"); } else { @@ -205,6 +229,7 @@ sub Cleanup($;$$) # This is the simplest way to resync the VM status field. # Also powering off a powered off VM will detect offline VMs. $VM->RunPowerOff(); + $VM->RecordStatus($Records, "dirty poweroff"); } } # $KillVMs is normally used on shutdown so don't start a process that @@ -212,8 +237,11 @@ sub Cleanup($;$$) elsif ($KillVMs and $VM->Status !~ /^(?:off|offline)$/) { $VM->RunPowerOff(); + $VM->RecordStatus($Records, "dirty poweroff (kill vms)"); } + # Note that on shutdown we don't record the VM status if it did not change. } + $RecordGroups->Save(); } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index a8da842..961be52 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -183,6 +183,13 @@ sub HasEnabledRole($) return $self->Role ne "retired" && $self->Role ne "deleted"; } +sub HasEnabledStatus($) +{ + my ($self) = @_; + # Filter out the maintenance VMs + return $self->Status ne "maintenance"; +} + sub GetHost($) { my ($self) = @_;

1 0

Sebastian Lackner : user32: Globally invalidate key state on changes in other threads.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 059d5ece23265e003ab413aa711e963da9c0564e URL: http://source.winehq.org/git/wine.git/?a=commit;h=059d5ece23265e003ab413aa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 18 16:20:58 2017 +0100 user32: Globally invalidate key state on changes in other threads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c475b19..ce4b13f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -390,6 +390,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; INT counter = global_key_state_counter; + BYTE prev_key_state; SHORT ret; if (key < 0 || key >= 256) return 0; @@ -417,14 +418,23 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { req->tid = 0; req->key = key; - if (key_state_info) wine_server_set_reply( req, key_state_info->state, - sizeof(key_state_info->state) ); + if (key_state_info) + { + prev_key_state = key_state_info->state[key]; + wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); + } if (!wine_server_call( req )) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; if (key_state_info) { + /* force refreshing the key state cache - some multithreaded programs + * (like Adobe Photoshop CS5) expect that changes to the async key state + * are also immediately available in other threads. */ + if (prev_key_state != key_state_info->state[key]) + counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + key_state_info->time = GetTickCount(); key_state_info->counter = counter; }

1 0

Jacek Caban : mshtml.idl: Added IDOMMouseEvent declaration.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: d943a5cc3183dcf437c67a028e83f5934741d24b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d943a5cc3183dcf437c67a028… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 18 16:22:04 2017 +0100 mshtml.idl: Added IDOMMouseEvent declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 26 ++++++++++++++ include/mshtml.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index b198800..9ff6388 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -3493,6 +3493,32 @@ #define DISPID_IDOMEVENT_CANCELBUBBLE DISPID_DOMEVENT+14 #define DISPID_IDOMEVENT_SRCELEMENT DISPID_DOMEVENT+15 +/* IDOMMouseEvent */ +#define DISPID_IDOMMOUSEEVENT_SCREENX DISPID_DOMMOUSEEVENT+1 +#define DISPID_IDOMMOUSEEVENT_SCREENY DISPID_DOMMOUSEEVENT+2 +#define DISPID_IDOMMOUSEEVENT_CLIENTX DISPID_DOMMOUSEEVENT+3 +#define DISPID_IDOMMOUSEEVENT_CLIENTY DISPID_DOMMOUSEEVENT+4 +#define DISPID_IDOMMOUSEEVENT_CTRLKEY DISPID_DOMMOUSEEVENT+5 +#define DISPID_IDOMMOUSEEVENT_SHIFTKEY DISPID_DOMMOUSEEVENT+6 +#define DISPID_IDOMMOUSEEVENT_ALTKEY DISPID_DOMMOUSEEVENT+7 +#define DISPID_IDOMMOUSEEVENT_METAKEY DISPID_DOMMOUSEEVENT+8 +#define DISPID_IDOMMOUSEEVENT_BUTTON DISPID_DOMMOUSEEVENT+9 +#define DISPID_IDOMMOUSEEVENT_RELATEDTARGET DISPID_DOMMOUSEEVENT+10 +#define DISPID_IDOMMOUSEEVENT_INITMOUSEEVENT DISPID_DOMMOUSEEVENT+11 +#define DISPID_IDOMMOUSEEVENT_GETMODIFIERSTATE DISPID_DOMMOUSEEVENT+12 +#define DISPID_IDOMMOUSEEVENT_BUTTONS DISPID_DOMMOUSEEVENT+13 +#define DISPID_IDOMMOUSEEVENT_FROMELEMENT DISPID_DOMMOUSEEVENT+14 +#define DISPID_IDOMMOUSEEVENT_TOELEMENT DISPID_DOMMOUSEEVENT+15 +#define DISPID_IDOMMOUSEEVENT_X DISPID_DOMMOUSEEVENT+16 +#define DISPID_IDOMMOUSEEVENT_Y DISPID_DOMMOUSEEVENT+17 +#define DISPID_IDOMMOUSEEVENT_OFFSETX DISPID_DOMMOUSEEVENT+18 +#define DISPID_IDOMMOUSEEVENT_OFFSETY DISPID_DOMMOUSEEVENT+19 +#define DISPID_IDOMMOUSEEVENT_PAGEX DISPID_DOMMOUSEEVENT+20 +#define DISPID_IDOMMOUSEEVENT_PAGEY DISPID_DOMMOUSEEVENT+21 +#define DISPID_IDOMMOUSEEVENT_LAYERX DISPID_DOMMOUSEEVENT+22 +#define DISPID_IDOMMOUSEEVENT_LAYERY DISPID_DOMMOUSEEVENT+23 +#define DISPID_IDOMMOUSEEVENT_WHICH DISPID_DOMMOUSEEVENT+24 + /* IDOMKeyboardEvent */ #define DISPID_IDOMKEYBOARDEVENT_KEY DISPID_DOMKEYBOARDEVENT+1 #define DISPID_IDOMKEYBOARDEVENT_LOCATION DISPID_DOMKEYBOARDEVENT+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index bd15e24..9e8c871 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -20103,6 +20103,107 @@ interface IDOMEvent : IDispatch } /***************************************************************************** + * IDOMMouseEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(305106ce-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMMouseEvent : IDispatch +{ + [propget, id(DISPID_IDOMMOUSEEVENT_SCREENX)] + HRESULT screenX([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_SCREENY)] + HRESULT screenY([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_CLIENTX)] + HRESULT clientX([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_CLIENTY)] + HRESULT clientY([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_CTRLKEY)] + HRESULT ctrlKey([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_SHIFTKEY)] + HRESULT shiftKey([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_ALTKEY)] + HRESULT altKey([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_METAKEY)] + HRESULT metaKey([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_BUTTON)] + HRESULT button([out, retval] USHORT *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_RELATEDTARGET)] + HRESULT relatedTarget([out, retval] IEventTarget **p); + + [id(DISPID_IDOMMOUSEEVENT_INITMOUSEEVENT)] + HRESULT initMouseEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] IHTMLWindow2 *viewArg, + [in] long detailArg, + [in] long screenXArg, + [in] long screenYArg, + [in] long clientXArg, + [in] long clientYArg, + [in] VARIANT_BOOL ctrlKeyArg, + [in] VARIANT_BOOL altKeyArg, + [in] VARIANT_BOOL shiftKeyArg, + [in] VARIANT_BOOL metaKeyArg, + [in] USHORT buttonArg, + [in] IEventTarget *relatedTargetArg); + + [id(DISPID_IDOMMOUSEEVENT_GETMODIFIERSTATE)] + HRESULT getModifierState( + [in] BSTR keyArg, + [out, retval] VARIANT_BOOL *activated); + + [propget, id(DISPID_IDOMMOUSEEVENT_BUTTONS)] + HRESULT buttons([out, retval] USHORT *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_FROMELEMENT)] + HRESULT fromElement([out, retval] IHTMLElement **p); + + [propget, id(DISPID_IDOMMOUSEEVENT_TOELEMENT)] + HRESULT toElement([out, retval] IHTMLElement **p); + + [propget, id(DISPID_IDOMMOUSEEVENT_X)] + HRESULT x([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_Y)] + HRESULT y([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_OFFSETX)] + HRESULT offsetX([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_OFFSETY)] + HRESULT offsetY([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_PAGEX)] + HRESULT pageX([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_PAGEY)] + HRESULT pageY([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_LAYERX)] + HRESULT layerX([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_LAYERY)] + HRESULT layerY([out, retval] long *p); + + [propget, id(DISPID_IDOMMOUSEEVENT_WHICH)] + HRESULT which([out, retval] USHORT *p); +} + +/***************************************************************************** * IDOMKeyboardEvent interface */ [

1 0

Jacek Caban : mshtml.idl: Added events dispinterfaces declarations.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: eb2bf1d6bcd47178c5d03f31892bd74dd8f9b76c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2bf1d6bcd47178c5d03f318… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 18 16:22:31 2017 +0100 mshtml.idl: Added events dispinterfaces declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 5 + include/mshtml.idl | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb2bf1d6bcd47178c5d03…

1 0

Alexandre Julliard : msvcp90/tests: Use the correct return type for basic_istream::ipfx.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: fc69b107969836c0a54560b18f75fa165e398249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc69b107969836c0a54560b18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 18 16:16:50 2017 +0100 msvcp90/tests: Use the correct return type for basic_istream::ipfx. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 5dcb1d4..c075f01 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1472,7 +1472,8 @@ static void test_istream_ipfx(void) basic_string_char str; IOSB_iostate state; wchar_t wide[64]; - int i, ret, next; + int i, next; + MSVCP_bool ret; /* makes tables narrower */ const IOSB_iostate IOSTATE_faileof = IOSTATE_failbit|IOSTATE_eofbit; @@ -1481,7 +1482,7 @@ static void test_istream_ipfx(void) const char *str; int unset_skipws; int noskip; - int ret; + MSVCP_bool ret; IOSB_iostate state; int next; } tests[] = { @@ -1507,7 +1508,7 @@ static void test_istream_ipfx(void) if(tests[i].unset_skipws) call_func2(p_ios_base_unsetf, &ss.basic_ios.base, TRUE); - ret = (int)call_func2(p_basic_istream_char_ipfx, &ss.base.base1, tests[i].noskip); + ret = (MSVCP_bool)(INT_PTR)call_func2(p_basic_istream_char_ipfx, &ss.base.base1, tests[i].noskip); state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); @@ -1527,7 +1528,7 @@ static void test_istream_ipfx(void) if(tests[i].unset_skipws) call_func2(p_ios_base_unsetf, &wss.basic_ios.base, TRUE); - ret = (int)call_func2(p_basic_istream_wchar_ipfx, &wss.base.base1, tests[i].noskip); + ret = (MSVCP_bool)(INT_PTR)call_func2(p_basic_istream_wchar_ipfx, &wss.base.base1, tests[i].noskip); state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &wss.basic_ios.base); nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1);

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 7183dc7360f1f7a514f9649fced4171175f16f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7183dc7360f1f7a514f9649fc… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Mon Dec 18 23:55:36 2017 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 100 +++++++++++++++--------------------------------------------- 1 file changed, 25 insertions(+), 75 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 92ecbf9..e1e92d2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-10-27 00:02-0500\n" +"PO-Revision-Date: 2017-12-16 00:29-0600\n" "Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.5\n" "Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:58 @@ -121,7 +121,8 @@ msgid "" "href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine 未找到到用于支持嵌入 HTML 的 Gecko 引擎。Wine 可以自动并下载安装它。\n" +"Wine 未找到到用于支持嵌入 HTML 的 Gecko 引擎。Wine 可以自动并下载安装该组" +"件。\n" "\n" "注意: 推荐您安装为发行版定制的软件包。具体请参看 <a href=\"https://wiki." "winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a>。" @@ -164,8 +165,8 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine 未找到到用于支持 .NET 应用的 wine-mono 组件。Wine 可以自动并下载安装" -"它。\n" +"Wine 未找到到用于支持 .NET 应用的 wine-mono 组件。Wine 可以自动并下载安装该组" +"件。\n" "\n" "注意: 推荐您安装为发行版定制的软件包。具体请参看 <a href=\"https://wiki." "winehq.org/Mono\">https://wiki.winehq.org/Mono</a>。" @@ -8842,10 +8843,8 @@ msgid " sec" msgstr " 秒" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "选择文件夹" +msgstr "选择来源" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10395,6 +10394,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"创建符号链接。\n" +"\n" +"语法：MKLINK [options] link_name target\n" +"\n" +"选项：\n" +"/d 创建目录符号链接。\n" +"/h 创建硬链接。\n" +"/j 创建目录结。\n" +"link_nam 为符号链接的名称。\n" +"target 为 link_name 指向的路径。\n" #: cmd.rc:312 msgid "" @@ -10403,47 +10412,6 @@ msgid "" msgstr "EXIT 结束当前命令会话并返回操作系统或者调用 CMD 的命令壳。\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10502,6 +10470,7 @@ msgstr "" "FTYPE\t\t显示或更改文件类型关联的打开命令\n" "HELP\t\t显示某个主题的帮助信息概览\n" "MD (MKDIR)\t创建子目录\n" +"MKLINK\t创建符号链接\n" "MORE\t\t分页显示输出\n" "MOVE\t\t移动一个或多个文件，或整个目录树\n" "PATH\t\t设置或显示命令搜索路径\n" @@ -10522,7 +10491,7 @@ msgstr "" "XCOPY\t\t将源文件或目录树复制到目标位置\n" "EXIT\t\t退出 CMD\n" "\n" -"输入 HELP <命令> 以获取更详细的，关于上述命令的信息。\n" +"输入 HELP <命令> 以获取关于上述命令的详细信息。\n" #: cmd.rc:365 msgid "Are you sure?" @@ -11838,17 +11807,6 @@ msgid "Icons (*.ico)" msgstr "图标 (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -11864,7 +11822,7 @@ msgstr "" " REG [操作] [参数]\n" "\n" "支持的操作：\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "要获取指定操作的帮助，请输入：\n" " REG [操作] /?\n" @@ -12002,22 +11960,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT file.reg\n" +msgstr "REG EXPORT key_name file.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: 无效的键名 [%1]\n" +msgstr "regedit: 无效的系统键 [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "注册表值 '%1' 已经存在。您想要覆盖它吗?" +msgstr "文件 '%1' 已存在。您想要覆盖它吗?" #: regedit.rc:34 msgid "&Registry" @@ -14746,10 +14698,8 @@ msgid "Expert" msgstr "专家" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "结果" +msgstr "重置结果" #: winemine.rc:80 msgid "Congratulations!" @@ -14777,7 +14727,7 @@ msgstr "地雷" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "所有结果都将丢失。您确定吗？" #: winemine.rc:30 msgid "WineMine"

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 6bca4de9586d675b231266cad71974a9f77ea995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bca4de9586d675b231266cad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 17 20:10:52 2017 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 1112 +++++++++++++++++++++++++------------------------------------- 1 file changed, 446 insertions(+), 666 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bca4de9586d675b23126…

1 0

Alexandre Julliard : kernel32: Properly detect ELF binaries that are position independent executables.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 21149e63313797a1603ca496a4c876418605d495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21149e63313797a1603ca496a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 18 11:16:13 2017 +0100 kernel32: Properly detect ELF binaries that are position independent executables. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 64 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index c0d9918..d068f2a 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -310,13 +310,29 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) unsigned char magic[4]; unsigned char class; unsigned char data; - unsigned char version; - unsigned char ignored[9]; + unsigned char ignored1[10]; unsigned short type; unsigned short machine; + unsigned char ignored2[8]; + unsigned int phoff; + unsigned char ignored3[12]; + unsigned short phnum; } elf; struct { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char ignored1[10]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[12]; + unsigned __int64 phoff; + unsigned char ignored3[16]; + unsigned short phnum; + } elf64; + struct + { unsigned int magic; unsigned int cputype; unsigned int cpusubtype; @@ -335,20 +351,54 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) if (!memcmp( header.elf.magic, "\177ELF", 4 )) { - if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; #ifdef WORDS_BIGENDIAN - if (header.elf.data == 1) + BOOL byteswap = (header.elf.data == 1); #else - if (header.elf.data == 2) + BOOL byteswap = (header.elf.data == 2); #endif + if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; + if (byteswap) { header.elf.type = RtlUshortByteSwap( header.elf.type ); header.elf.machine = RtlUshortByteSwap( header.elf.machine ); } switch(header.elf.type) { - case 2: info->type = BINARY_UNIX_EXE; break; - case 3: info->type = BINARY_UNIX_LIB; break; + case 2: + info->type = BINARY_UNIX_EXE; + break; + case 3: + { + LARGE_INTEGER phoff; + unsigned short phnum; + unsigned int type; + if (header.elf.class == 2) + { + phoff.QuadPart = byteswap ? RtlUlonglongByteSwap( header.elf64.phoff ) : header.elf64.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf64.phnum ) : header.elf64.phnum; + } + else + { + phoff.QuadPart = byteswap ? RtlUlongByteSwap( header.elf.phoff ) : header.elf.phoff; + phnum = byteswap ? RtlUshortByteSwap( header.elf.phnum ) : header.elf.phnum; + } + while (phnum--) + { + if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return; + if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type)) return; + if (byteswap) type = RtlUlongByteSwap( type ); + if (type == 3) + { + info->type = BINARY_UNIX_EXE; + break; + } + phoff.QuadPart += (header.elf.class == 2) ? 56 : 32; + } + if (!info->type) info->type = BINARY_UNIX_LIB; + break; + } + default: + return; } switch(header.elf.machine) {

1 0