August 2014 - Wine-commits - list.winehq.org

Francois Gouget : testbot: Ask unknown contributors to explain why they need a WineTestBot account.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: tools Branch: master Commit: cb99cd7adbadfe57e4ae1b0b58a0b656967eb992 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cb99cd7adbadfe57e4ae1b0b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 7 01:22:55 2014 +0200 testbot: Ask unknown contributors to explain why they need a WineTestBot account. --- testbot/web/Register.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index eb0f1ec..dcabf8a 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -58,7 +58,8 @@ sub GetHeaderText($) return "Since an account will allow you to run code on this system, your " . "request for an account will have to be manually approved. That " . "should be no problem if you're a well-known member of the Wine " . - "community.<br>\n" . + "community. Otherwise please explain in a few words why you need an " . + "account in the Remarks field.<br>\n" . "When your request has been approved, you'll receive a link via " . "email to activate your account and choose a password. Usually, " . "you should receive that email within a couple of hours.";

1 0

Francois Gouget : testbot: By default redirect to the same site.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: tools Branch: master Commit: 1784b23e553fb78089fd53797571d494a50a7054 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1784b23e553fb78089fd5379… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 7 01:24:28 2014 +0200 testbot: By default redirect to the same site. This makes is possible to access the website through an SSH redirection for instance. --- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 50e1629..a304629 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -404,7 +404,7 @@ sub Redirect($$$) $Location = $URI . $Location; } my $Server = $self->{Request}->server; - $Location = $Protocol . "://" . $Server->server_hostname . $Location; + $Location = $Protocol . "://" . $ENV{"HTTP_HOST"} . $Location; } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT);

1 0

Francois Gouget : testbot: Remove unneeded imports of the Fcntl module, document the others.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: tools Branch: master Commit: ea720a8538cac33e6518f40dfaa04fbb02529f8d URL: http://source.winehq.org/git/tools.git/?a=commit;h=ea720a8538cac33e6518f40d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 7 01:24:42 2014 +0200 testbot: Remove unneeded imports of the Fcntl module, document the others. --- testbot/bin/CheckForWinetestUpdate.pl | 1 - testbot/bin/WineRunTask.pl | 1 - testbot/web/GetFile.pl | 2 +- testbot/web/Submit.pl | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 3bedd88..e54da35 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -37,7 +37,6 @@ sub BEGIN } } -use Fcntl; use File::Basename; use File::Compare; use File::Copy; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9b8f43f..6cffd54 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -35,7 +35,6 @@ sub BEGIN } } -use POSIX qw(:fcntl_h); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::VMs; diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 943a445..89f3532 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -20,7 +20,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; +use Fcntl; # For O_XXX use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 823be4b..530c133 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -21,9 +21,9 @@ use strict; package SubmitPage; use CGI qw(:standard); -use Fcntl; +use Fcntl; # For O_XXX use IO::Handle; -use POSIX qw(:fcntl_h); +use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename; use ObjectModel::BasicPropertyDescriptor;

1 0

Francois Gouget : testbot: Add proper command line processing and --debug and --help options to the Task and VM scripts.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: tools Branch: master Commit: 466c21392d2c6bb9b7b52540b668e56ee424177e URL: http://source.winehq.org/git/tools.git/?a=commit;h=466c21392d2c6bb9b7b52540… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 7 01:25:45 2014 +0200 testbot: Add proper command line processing and --debug and --help options to the Task and VM scripts. The --debug option disables the VM status checks. This makes it possible to put a VM in maintenance mode and then manually run the scripts against it, without interference from the Engine. This also makes the VM status checks cleaner. The --debug option also causes log messages to be duplicated to stdout and additional traces to be printed so one can follow the script's progress. Concise timing information is also provided which makes it possible to figure out where the script spends its time. --- testbot/bin/RevertVM.pl | 100 ++++++++++++++++++++++----- testbot/bin/WineRunBuild.pl | 152 +++++++++++++++++++++++++++-------------- testbot/bin/WineRunReconfig.pl | 139 +++++++++++++++++++++++++------------ testbot/bin/WineRunTask.pl | 144 ++++++++++++++++++++++++++------------ testbot/lib/WineTestBot/Log.pm | 17 ++++- 5 files changed, 396 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=466c21392d2c6bb9b7b5…

1 0

Francois Gouget : winetest: Add a license to the winetest.cron script.
by Alexandre Julliard 07 Aug '14

07 Aug '14

Module: tools Branch: master Commit: 5f27ce2aa7299d38809b3d72a7306565ae16fccf URL: http://source.winehq.org/git/tools.git/?a=commit;h=5f27ce2aa7299d38809b3d72… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 7 01:29:16 2014 +0200 winetest: Add a license to the winetest.cron script. --- winetest/winetest.cron | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index eaacf4f..4349f26 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -1,5 +1,19 @@ #!/bin/sh # +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# # Cron job for generating winetest reports. Use it like # */5 * * * * apache winetest.cron

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 06 Aug '14

06 Aug '14

Module: wine Branch: master Commit: ba57f57209eca1329a3dce44a621a7a94665b3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba57f57209eca1329a3dce44a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Aug 6 20:22:26 2014 +0900 po: Update Japanese translation. --- po/ja.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index dfd21fc..bcc8037 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-06-19 00:15+0900\n" +"PO-Revision-Date: 2014-08-06 00:34+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -851,7 +851,7 @@ msgstr "ファイルが見つかりません" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "フォルダ以外が選択されています" #: comdlg32.rc:45 msgid "Up One Level" @@ -1044,10 +1044,8 @@ msgid "Open File" msgstr "ファイルを開く" #: comdlg32.rc:147 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "新しいフォルダ" +msgstr "フォルダの選択" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Ken Thomases : winemac: When removing the status item for a systray icon, discard any associated events in the queue.
by Alexandre Julliard 06 Aug '14

06 Aug '14

Module: wine Branch: master Commit: 9d1cfecc6d45fd37512f454111639d4ffbf32664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1cfecc6d45fd37512f45411… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Aug 5 19:11:09 2014 -0500 winemac: When removing the status item for a systray icon, discard any associated events in the queue. --- dlls/winemac.drv/cocoa_event.m | 13 ++++++++++--- dlls/winemac.drv/cocoa_status_item.m | 6 ++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 85cac5f..757ad6b 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -267,7 +267,7 @@ static const OSType WineHotKeySignature = 'Wine'; return ret; } - - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window + - (void) discardEventsPassingTest:(BOOL (^)(macdrv_event* event))block { NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSIndexSet* indexes; @@ -276,8 +276,7 @@ static const OSType WineHotKeySignature = 'Wine'; indexes = [events indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop){ MacDrvEvent* event = obj; - return ((event_mask_for_type(event->event->type) & mask) && - (!window || event->event->window == (macdrv_window)window)); + return block(event->event); }]; [events removeObjectsAtIndexes:indexes]; @@ -287,6 +286,14 @@ static const OSType WineHotKeySignature = 'Wine'; [pool release]; } + - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window + { + [self discardEventsPassingTest:^BOOL (macdrv_event* event){ + return ((event_mask_for_type(event->type) & mask) && + (!window || event->window == (macdrv_window)window)); + }]; + } + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents { macdrv_event* event; diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index f0a5863..c38dc51 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -96,6 +96,12 @@ NSStatusBar* statusBar = [NSStatusBar systemStatusBar]; [statusBar removeStatusItem:item]; [item setView:nil]; + + [queue discardEventsPassingTest:^BOOL (macdrv_event* event){ + return ((event->type == STATUS_ITEM_MOUSE_BUTTON && event->status_item_mouse_button.item == (macdrv_status_item)self) || + (event->type == STATUS_ITEM_MOUSE_MOVE && event->status_item_mouse_move.item == (macdrv_status_item)self)); + }]; + self.item = nil; } }

1 0

André Hentschel : wpcap: Initial stub implementation.
by Alexandre Julliard 06 Aug '14

06 Aug '14

Module: wine Branch: master Commit: af9f3a205483a8b416488da61ccaadd91211c3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9f3a205483a8b416488da61… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 4 22:37:29 2014 +0200 wpcap: Initial stub implementation. --- configure | 2 ++ configure.ac | 1 + dlls/wpcap/Makefile.in | 1 + dlls/wpcap/wpcap.spec | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+) diff --git a/configure b/configure index c9b1346..62e8abc 100755 --- a/configure +++ b/configure @@ -1282,6 +1282,7 @@ enable_wmiutils enable_wmp enable_wmvcore enable_wnaspi32 +enable_wpcap enable_ws2_32 enable_wshom_ocx enable_wsnmp32 @@ -17315,6 +17316,7 @@ wine_fn_config_test dlls/wmp/tests wmp_test wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib +wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test wine_fn_config_dll wshom.ocx enable_wshom_ocx clean diff --git a/configure.ac b/configure.ac index a56cda0..deb6b19 100644 --- a/configure.ac +++ b/configure.ac @@ -3279,6 +3279,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) +WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) WINE_CONFIG_DLL(wshom.ocx,,[clean]) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in new file mode 100644 index 0000000..5841adc --- /dev/null +++ b/dlls/wpcap/Makefile.in @@ -0,0 +1 @@ +MODULE = wpcap.dll diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec new file mode 100644 index 0000000..81df1b9 --- /dev/null +++ b/dlls/wpcap/wpcap.spec @@ -0,0 +1,78 @@ +@ stub bpf_dump +@ stub bpf_filter +@ stub bpf_image +@ stub bpf_validate +@ stub endservent +@ stub eproto_db +@ stub getservent +@ stub install_bpf_program +@ stub pcap_breakloop +@ stub pcap_close +@ stub pcap_compile +@ stub pcap_compile_nopcap +@ stub pcap_createsrcstr +@ stub pcap_datalink +@ stub pcap_datalink_name_to_val +@ stub pcap_datalink_val_to_description +@ stub pcap_datalink_val_to_name +@ stub pcap_dispatch +@ stub pcap_dump +@ stub pcap_dump_close +@ stub pcap_dump_file +@ stub pcap_dump_flush +@ stub pcap_dump_ftell +@ stub pcap_dump_open +@ stub pcap_file +@ stub pcap_fileno +@ stub pcap_findalldevs +@ stub pcap_findalldevs_ex +@ stub pcap_freealldevs +@ stub pcap_freecode +@ stub pcap_get_airpcap_handle +@ stub pcap_geterr +@ stub pcap_getevent +@ stub pcap_getnonblock +@ stub pcap_is_swapped +@ stub pcap_lib_version +@ stub pcap_list_datalinks +@ stub pcap_live_dump +@ stub pcap_live_dump_ended +@ stub pcap_lookupdev +@ stub pcap_lookupnet +@ stub pcap_loop +@ stub pcap_major_version +@ stub pcap_minor_version +@ stub pcap_next +@ stub pcap_next_etherent +@ stub pcap_next_ex +@ stub pcap_offline_filter +@ stub pcap_offline_read +@ stub pcap_open +@ stub pcap_open_dead +@ stub pcap_open_live +@ stub pcap_open_offline +@ stub pcap_parsesrcstr +@ stub pcap_perror +@ stub pcap_read +@ stub pcap_remoteact_accept +@ stub pcap_remoteact_cleanup +@ stub pcap_remoteact_close +@ stub pcap_remoteact_list +@ stub pcap_sendpacket +@ stub pcap_sendqueue_alloc +@ stub pcap_sendqueue_destroy +@ stub pcap_sendqueue_queue +@ stub pcap_sendqueue_transmit +@ stub pcap_set_datalink +@ stub pcap_setbuff +@ stub pcap_setfilter +@ stub pcap_setmintocopy +@ stub pcap_setmode +@ stub pcap_setnonblock +@ stub pcap_setsampling +@ stub pcap_setuserbuffer +@ stub pcap_snapshot +@ stub pcap_stats +@ stub pcap_stats_ex +@ stub pcap_strerror +@ stub wsockinit

1 0

Indrek Altpere : wbemprox: Fix a few OLE variant mappings.
by Alexandre Julliard 06 Aug '14

06 Aug '14

Module: wine Branch: master Commit: 070356799860165d22045cf29518411c5509cd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=070356799860165d22045cf29… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Tue Aug 5 15:15:13 2014 +0300 wbemprox: Fix a few OLE variant mappings. --- dlls/wbemprox/builtin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 169227e..2145172 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -313,7 +313,7 @@ static const struct column col_compsys[] = { { prop_descriptionW, CIM_STRING }, { prop_domainW, CIM_STRING }, - { prop_domainroleW, CIM_UINT16 }, + { prop_domainroleW, CIM_UINT16, VT_I4 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -380,8 +380,8 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { - { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, - { prop_ipconnectionmetricW, CIM_UINT32 }, + { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, + { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, { prop_ipenabledW, CIM_BOOLEAN }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -498,9 +498,9 @@ static const struct column col_videocontroller[] = { prop_adapterdactypeW, CIM_STRING }, { prop_adapterramW, CIM_UINT32, VT_I4 }, { prop_availabilityW, CIM_UINT16 }, - { prop_currentbitsperpixelW, CIM_UINT32 }, - { prop_currenthorizontalresW, CIM_UINT32 }, - { prop_currentverticalresW, CIM_UINT32 }, + { prop_currentbitsperpixelW, CIM_UINT32, VT_I4 }, + { prop_currenthorizontalresW, CIM_UINT32, VT_I4 }, + { prop_currentverticalresW, CIM_UINT32, VT_I4 }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC },

1 0

Hao Peng : iphlpapi: Add PfBindInterfaceToIPAddress function stub.
by Alexandre Julliard 05 Aug '14

05 Aug '14

Module: wine Branch: master Commit: 331092b54e26e680c13b9c7d5e6b120e4c62d49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=331092b54e26e680c13b9c7d5… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jul 31 15:26:58 2014 +0800 iphlpapi: Add PfBindInterfaceToIPAddress function stub. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 36ba13f..655fda1c 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -245,7 +245,7 @@ #@ stub ParseNetworkString @ stub _PfAddFiltersToInterface(a)24 @ stub _PfAddGlobalFilterToInterface(a)8 -@ stub _PfBindInterfaceToIPAddress(a)12 +@ stdcall _PfBindInterfaceToIPAddress(a)12(long long ptr) PfBindInterfaceToIPAddress @ stub _PfBindInterfaceToIndex(a)16 @ stdcall _PfCreateInterface(a)24(long long long long long ptr) PfCreateInterface @ stub _PfDeleteInterface(a)4 diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 70a063b..8d8c39c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2511,6 +2511,15 @@ DWORD WINAPI PfCreateInterface(DWORD dwName, PFFORWARD_ACTION inAction, PFFORWAR } /****************************************************************** + * PfBindInterfaceToIPAddress(IPHLPAPI.@) + */ +DWORD WINAPI PfBindInterfaceToIPAddress(INTERFACE_HANDLE interface, PFADDRESSTYPE type, PBYTE ip) +{ + FIXME("(%p %d %p) stub\n", interface, type, ip); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************** * GetTcpTable2 (IPHLPAPI.@) */ ULONG WINAPI GetTcpTable2(PMIB_TCPTABLE2 table, PULONG size, BOOL order)

1 0