December 2017 - wine-commits

Francois Gouget : testbot: Make it possible to get the number of items in a Collection.
by Alexandre Julliard 19 Dec '17

19 Dec '17

Module: tools Branch: master Commit: ef0dc7115bc27fb25ec76a1941d4ee472d362d91 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ef0dc7115bc27fb25ec76a19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 23:53:55 2017 +0100 testbot: Make it possible to get the number of items in a Collection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index d441860..c3bc438 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -373,6 +373,28 @@ sub GetItems($) =pod =over 12 +=item C<GetItemsCount()> + +Returns how many Items are present in the Collection. + +=back +=cut + +sub GetItemsCount($) +{ + my ($self) = @_; + + if (! $self->{Loaded}) + { + $self->Load(); + } + + return scalar(keys %{$self->{Items}}); +} + +=pod +=over 12 + =item C<IsEmpty()> Returns true if the Collection contains no Item.

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

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

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

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

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

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

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

Louis Lenders : kernelbase: Quiet a noisy fixme in QuirkIsEnabled3.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 54c414d96ad3dfcc0b404b297acad5041c66de00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c414d96ad3dfcc0b404b297… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Dec 15 09:54:21 2017 +0100 kernelbase: Quiet a noisy fixme in QuirkIsEnabled3. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index b0a3478..9c89ff4 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -80,6 +80,10 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po */ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2) { - FIXME("(%p, %p) stub!\n", unk1, unk2); + static int once; + + if (!once++) + FIXME("(%p, %p) stub!\n", unk1, unk2); + return FALSE; }

1 0

Zhiyi Zhang : winecfg: Fix a crash when inputting non-ASCII dll override name.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: eee8131d3ba53daa85303602046e7523a04a3a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee8131d3ba53daa853036020… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Mon Dec 18 22:33:08 2017 +0800 winecfg: Fix a crash when inputting non-ASCII dll override name. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index dbac929..ba317c7 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -571,7 +571,7 @@ char **enumerate_values(HKEY root, char *path) WCHAR *wpath; WCHAR **wret; char **ret=NULL; - int i=0, len=0; + int i=0, len=0, size; wpath = HeapAlloc(GetProcessHeap(), 0, (strlen(path)+1)*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, strlen(path)+1); @@ -586,11 +586,13 @@ char **enumerate_values(HKEY root, char *path) /* convert WCHAR ** to char ** and HeapFree each WCHAR * element on our way */ for (i=0; i<len; i++) { - ret[i] = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(wret[i]) + 1) * sizeof(char)); - WideCharToMultiByte(CP_ACP, 0, wret[i], -1, ret[i], - lstrlenW(wret[i]) + 1, NULL, NULL); - HeapFree(GetProcessHeap(), 0, wret[i]); + size = WideCharToMultiByte(CP_ACP, 0, wret[i], -1, NULL, 0, NULL, NULL); + if(size) + { + ret[i] = HeapAlloc(GetProcessHeap(), 0, size); + WideCharToMultiByte(CP_ACP, 0, wret[i], -1, ret[i], size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, wret[i]); + } } ret[len] = NULL; }

1 0

Hans Leidekker : webservices/tests: Register an exception with the firewall to avoid a dialog.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 1ca988d4f4b0ced9ef15b130da0172d45a1ee42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca988d4f4b0ced9ef15b130d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 18 10:31:11 2017 +0100 webservices/tests: Register an exception with the firewall to avoid a dialog. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 2 +- dlls/webservices/tests/channel.c | 142 +++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index a7c93a7..63e24e6 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = webservices.dll -IMPORTS = webservices user32 rpcrt4 ws2_32 +IMPORTS = webservices oleaut32 ole32 user32 rpcrt4 ws2_32 advapi32 C_SRCS = \ channel.c \ diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 206f76d..32820fe 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -17,8 +17,11 @@ */ #include <stdio.h> +#define COBJMACROS #include "windows.h" #include "webservices.h" +#include "initguid.h" +#include "netfw.h" #include "wine/test.h" static void test_WsCreateChannel(void) @@ -814,10 +817,147 @@ static HANDLE start_listener( struct listener_info *info ) return thread; } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','e','b','s','e','r','v','i','c','e','s','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(channel) { + BOOL firewall_enabled = is_firewall_enabled(); struct listener_info info; HANDLE thread; + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip( "no privileges, skipping tests to avoid firewall dialog\n" ); + return; + } + if ((hr = set_firewall( APP_ADD )) != S_OK) + { + skip( "can't authorize app in firewall %08x\n", hr ); + return; + } + } test_WsCreateChannel(); test_WsOpenChannel(); @@ -859,4 +999,6 @@ START_TEST(channel) thread = start_listener( &info ); test_WsAcceptChannel( &info ); WaitForSingleObject( thread, 3000 ); + + if (firewall_enabled) set_firewall( APP_REMOVE ); }

1 0

Hans Leidekker : webservices/tests: Merge the listener tests into channel.c.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 209ad4c08739880ce0e4c2dd3d559dc018154ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=209ad4c08739880ce0e4c2dd3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 18 10:31:10 2017 +0100 webservices/tests: Merge the listener tests into channel.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 - dlls/webservices/tests/channel.c | 336 +++++++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 424 ------------------------------------- 3 files changed, 336 insertions(+), 425 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=209ad4c08739880ce0e4c…

1 0

Piotr Caban : msvcrt: Correctly set rounding mode in _ftol implementation.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 22edbd849ada33e8037f6f2b7fde75b1617f3f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22edbd849ada33e8037f6f2b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 18 12:10:28 2017 +0100 msvcrt: Correctly set rounding mode in _ftol implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0627bfa..7fb4666 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -693,7 +693,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__ftol, "subl $12, %esp\n\t" /* sizeof(LONGLONG) + 2*sizeof(WORD) */ "fnstcw (%esp)\n\t" "mov (%esp), %ax\n\t" - "or $0xc, %ax\n\t" + "or $0xc00, %ax\n\t" "mov %ax, 2(%esp)\n\t" "fldcw 2(%esp)\n\t" "fistpq 4(%esp)\n\t"

1 0

Piotr Caban : msvcr71: Don't raise exception in _invalid_parameter.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 8ee96fec2b305fb57a8107c0a65fc73c58a096d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee96fec2b305fb57a8107c0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 18 10:30:08 2017 +0100 msvcr71: Don't raise exception in _invalid_parameter. Support for invalid parameter handler was added in msvcr80. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 45bc194..5693043 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -472,7 +472,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ else { ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg ); -#if _MSVCR_VER > 0 +#if _MSVCR_VER >= 80 RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL ); #endif }

1 0

Nikolay Sivov : comctl32/tests: Add Edit control tests.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 3cd2d587184a4f91f32c04af6963cf42af895ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd2d587184a4f91f32c04af6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 11:35:33 2017 +0300 comctl32/tests: Add Edit control tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/edit.c | 2979 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/rsrc.rc | 60 + 3 files changed, 3040 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cd2d587184a4f91f32c0…

1 0

Nikolay Sivov : user32/tests: Class API tests for interaction with activation contexts.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: ea141a5ae9db43d5cbe74f31ad81c253bf7deb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea141a5ae9db43d5cbe74f31a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 13:41:12 2017 +0300 user32/tests: Class API tests for interaction with activation contexts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 6ab4cfe..88bf376 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1161,6 +1161,166 @@ static void test_IME(void) ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); } +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE create_test_actctx(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = CreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + +static void test_actctx_classes(void) +{ + static const char main_manifest[] = + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" + "<assemblyIdentity version=\"4.3.2.1\" name=\"Wine.WndClass.Test\" type=\"win32\" />" + "<file name=\"file.exe\">" + "<windowClass>MyTestClass</windowClass>" + "</file>" + "</assembly>"; + WNDCLASSA wc; + ULONG_PTR cookie; + HANDLE context; + BOOL ret; + ATOM class; + HINSTANCE hinst; + + create_manifest_file("main.manifest", main_manifest); + context = create_test_actctx("main.manifest"); + DeleteFileA("main.manifest"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = ClassTest_WndProc; + wc.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wc.lpszClassName = "MyTestClass"; + + hinst = GetModuleHandleW(0); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(!ret, "Expected failure.\n"); + + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + /* Class info is available by versioned and regular names. */ + ret = GetClassInfoA(hinst, "MyTestClass", &wc); + ok(ret, "Failed to get class info.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + /* Register versioned class without active context. */ + wc.lpszClassName = "4.3.2.1!MyTestClass"; + class = RegisterClassA(&wc); + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class == 0, "Expected failure.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + /* Only versioned name is registered. */ + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = GetClassInfoA(hinst, "MyTestClass", &wc); +todo_wine + ok(!ret, "Expected failure.\n"); + + ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); +todo_wine + ok(ret, "Failed to get class info.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + /* Register regular name first, it's not considered when versioned name is registered. */ + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = ActivateActCtx(context, &cookie); + ok(ret, "Failed to activate context.\n"); + + wc.lpszClassName = "MyTestClass"; + class = RegisterClassA(&wc); +todo_wine + ok(class != 0, "Failed to register class.\n"); + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context.\n"); + + ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); +todo_wine + ok(ret, "Failed to unregister class.\n"); + + ret = UnregisterClassA("MyTestClass", hinst); + ok(ret, "Failed to unregister class.\n"); + + ReleaseActCtx(context); +} + START_TEST(class) { char **argv; @@ -1190,6 +1350,7 @@ START_TEST(class) test_builtinproc(); test_icons(); test_comctl32_classes(); + test_actctx_classes(); /* this test unregisters the Button class so it should be executed at the end */ test_instances();

1 0

Nikolay Sivov : user32/tests: Remove runtime check for GetMenuBarInfo().
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: wine Branch: master Commit: 5f327bbb864fdf7edbddc43026ff2df25a787906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f327bbb864fdf7edbddc4302… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 18 11:35:17 2017 +0300 user32/tests: Remove runtime check for GetMenuBarInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 79c0010..e334be1 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,15 +38,6 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); - -static void init_function_pointers(void) -{ - HMODULE hdll = GetModuleHandleA("user32"); - - pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); -} - static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -2310,9 +2301,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 0, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2324,9 +2314,8 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR memset(&mbi, 0, sizeof(mbi)); mbi.cbSize = sizeof(mbi); SetLastError(0xdeadbeef); - ret = pGetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); - ok(ret || broken(!ret && GetLastError()==ERROR_INVALID_WINDOW_HANDLE) /* NT */, - "GetMenuBarInfo failed\n"); + ret = GetMenuBarInfo(ctx_menu, OBJID_CLIENT, 1, &mbi); + ok(ret, "GetMenuBarInfo failed\n"); if (ret) { ok(mbi.hMenu != NULL, "mbi.hMenu = NULL\n"); @@ -2356,7 +2345,7 @@ static LRESULT CALLBACK child_edit_menu_proc(HWND hwnd, UINT msg, WPARAM wParam, if (wParam == MSGF_MENU) { HWND hwndMenu = (HWND)lParam; MENUBARINFO mbi = { sizeof(MENUBARINFO) }; - if (pGetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { + if (GetMenuBarInfo(hwndMenu, OBJID_CLIENT, 0, &mbi)) { MENUITEMINFOA mii = { sizeof(MENUITEMINFOA), MIIM_STATE }; if (GetMenuItemInfoA(mbi.hMenu, EM_SETSEL, FALSE, &mii)) { if (mii.fState & MFS_HILITE) { @@ -2402,11 +2391,8 @@ static void test_contextmenu(void) ok(got_en_setfocus, "edit box didn't get focused\n"); ok(got_wm_capturechanged, "main window capture did not change\n"); - if (pGetMenuBarInfo) - { - p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); - SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); - } + p_edit_proc = (void*)SetWindowLongPtrA(hwndEdit, GWLP_WNDPROC, (ULONG_PTR)edit_proc_proxy); + SendMessageA(hwndEdit, WM_CONTEXTMENU, (WPARAM)hwndEdit, MAKEWORD(10, 10)); DestroyWindow (hwndEdit); @@ -2954,8 +2940,6 @@ START_TEST(edit) { BOOL b; - init_function_pointers(); - hinst = GetModuleHandleA(NULL); b = RegisterWindowClasses(); ok (b, "RegisterWindowClasses failed\n");

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

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

Julian Rüger : German translation for release 2.22
by Jeremy Newman 18 Dec '17

18 Dec '17

Module: website Branch: master Commit: c2a3eea28bce9a51dfde43f85cc9b593982f0860 URL: http://source.winehq.org/git/website.git/?a=commit;h=c2a3eea28bce9a51dfde43… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 15 16:12:37 2017 +0100 German translation for release 2.22 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017112401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017112401.xml b/news/de/2017112401.xml new file mode 100644 index 0000000..5a38e06 --- /dev/null +++ b/news/de/2017112401.xml @@ -0,0 +1,17 @@ +<news> +<date>24. November 2017</date> +<title>Wine 2.22 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.22 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.22">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Quellauswahldialog für Scanner.</li> + <li>Verbesserte ARM64-Unterstützung.</li> + <li>Float-Audioformate mit mehr als 2 Kanälen in XAudio.</li> + <li>Korrekturen an der DLL-Injektionsunterstützung.</li> + <li>Verbesserungen an den Inputmethoden.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Julian Rüger : German translation for release 3.0-rc1
by Jeremy Newman 18 Dec '17

18 Dec '17

Module: website Branch: master Commit: f0f36f09df34ed1bf3ef8984544ddbe389cf565c URL: http://source.winehq.org/git/website.git/?a=commit;h=f0f36f09df34ed1bf3ef89… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 15 16:22:10 2017 +0100 German translation for release 3.0-rc1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017120801.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/news/de/2017120801.xml b/news/de/2017120801.xml new file mode 100644 index 0000000..fe1c0ce --- /dev/null +++ b/news/de/2017120801.xml @@ -0,0 +1,21 @@ +<news> +<date>8. Dezember 2017</date> +<title>Wine 3.0-rc1 freigegeben</title> +<body> +<p> Die Entwicklungsversion 3.0-rc1 von Wine ist jetzt verfügbar.</p> +<p> Dies ist der erste Release Candidate des bevorstehenden Wine 3.0. Hiermit beginnt der Code-freeze. Es gab viele Änderungen in letzter Minute, daher bitten wir Sie, dieses Release ausführlich zu testen. Damit helfen Sie uns, Wine 3.0 so gut wie möglich zu machen.</p> +<p> <a href="{$root}/announce/3.0-rc1">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Direct3D 11 ist auf AMD- und Intel-Grafik nun standardmäßig aktiviert.</li> + <li>AES-Verschlüsselung unter macOS.</li> + <li>Implementierung des Taskplaners.</li> + <li>Unterstützung der Exportfunktion des reg.exe-Werkzeugs.</li> + <li>Progman-DDE-Unterstützung.</li> + <li>Verbesserungen des Zwischenspeichers für OLE-Daten.</li> + <li>Weitere Event-Unterstützung in MSHTML.</li> + <li>Verbessertes Relay-Debugging.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Francois Gouget : testbot: Task:: ChildPid is not used anymore so remove it.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: tools Branch: master Commit: 300a6da335592f7db58351ad7e42276eb4ae4fcb URL: http://source.winehq.org/git/tools.git/?a=commit;h=300a6da335592f7db58351ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 01:06:37 2017 +0100 testbot: Task::ChildPid is not used anymore so remove it. It was deprecated in favor of VM::ChildPid some time ago so it's now time to remove the database field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update28.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Tasks.pm | 2 -- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/testbot/ddl/update28.sql b/testbot/ddl/update28.sql new file mode 100644 index 0000000..b9bb9d9 --- /dev/null +++ b/testbot/ddl/update28.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Tasks + DROP ChildPid; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index f8d590f..12c1b68 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -150,7 +150,6 @@ CREATE TABLE Tasks VMName VARCHAR(20) NOT NULL, Timeout INT(4) NOT NULL, CmdLineArg VARCHAR(256) NULL, - ChildPid INT(5) NULL, Started DATETIME NULL, Ended DATETIME NULL, TestFailures INT(6) NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index de91f9a..9092c41 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2177,29 +2177,6 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> - <dia:string>#ChildPid#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#INT(5)#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="true"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> <dia:string>#Started#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index b3b6ae3..11f087f 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -223,8 +223,6 @@ BEGIN CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - # Note: ChildPid is not used anymore. - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6),

1 0

Francois Gouget : testbot: Re-save the database diagram with the current dia.
by Alexandre Julliard 18 Dec '17

18 Dec '17

Module: tools Branch: master Commit: 94fccb2edbed9be3e1296f52fc2c1615cf2904fc URL: http://source.winehq.org/git/tools.git/?a=commit;h=94fccb2edbed9be3e1296f52… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 18 01:04:53 2017 +0100 testbot: Re-save the database diagram with the current dia. The goal is to minimize the diff in coming changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/winetestbot-schema.dia | 1082 ++++++++++++++++++++++-------------- 1 file changed, 657 insertions(+), 425 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=94fccb2edbed9be3e129…

1 0

Alexandre Julliard : Wine release 3.0-rc2
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: website Branch: master Commit: d7a76c419f5093df2057cbf07bc4669776973dc6 URL: http://source.winehq.org/git/website.git/?a=commit;h=d7a76c419f5093df2057cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 21:46:44 2017 +0100 Wine release 3.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017121501.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017121501.xml b/news/en/2017121501.xml new file mode 100644 index 0000000..b3e603e --- /dev/null +++ b/news/en/2017121501.xml @@ -0,0 +1,12 @@ +<news> +<date>December 15, 2017</date> +<title>Wine 3.0-rc2 Released</title> +<body> +<p> The Wine development release 3.0-rc2 is now available.</p> +<p> <a href="{$root}/announce/3.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-3.0-rc2 : Alexandre Julliard : Release 3.0-rc2
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: refs/tags/wine-3.0-rc2 Tag: 1d56ed2930814b664a62d4a746515b5721950595 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1d56ed2930814b664a62d4a74651… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 21:43:56 2017 +0100 Release 3.0-rc2

1 0

Alexandre Julliard : Release 3.0-rc2.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: f37da2c85561028e86e8bf74bebdc8edaa66dc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37da2c85561028e86e8bf74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 21:43:56 2017 +0100 Release 3.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 560 +++++++++++++++----------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 143 insertions(+), 437 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f37da2c85561028e86e8b…

1 0

Nikolay Sivov : d2d1/tests: A test to show that DC is validated on BindDC( ).
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: 0fa707160833360d5e58b41d851a12a29dfce5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa707160833360d5e58b41d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 15 19:47:58 2017 +0300 d2d1/tests: A test to show that DC is validated on BindDC(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index af023a1..9bd9e2b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4813,7 +4813,7 @@ static void test_dc_target(void) ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc, 0, 0); - ok(clr == RGB(255, 0, 0), "Got color %#x\n", clr); + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); hdc2 = CreateCompatibleDC(NULL); ok(hdc2 != NULL, "Failed to create an HDC.\n"); @@ -4824,7 +4824,7 @@ static void test_dc_target(void) ok(hr == S_OK, "BindDC() returned %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); @@ -4843,10 +4843,42 @@ static void test_dc_target(void) ID2D1SolidColorBrush_Release(brush); clr = GetPixel(hdc2, 0, 0); - ok(clr == RGB(0, 255, 0), "Got color %#x\n", clr); + ok(clr == RGB(0, 255, 0), "Unexpected color 0x%08x.\n", clr); clr = GetPixel(hdc2, 10, 0); - ok(clr == 0, "Got color %#x\n", clr); + ok(clr == 0, "Unexpected color 0x%08x.\n", clr); + + /* Invalid DC. */ + hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); +todo_wine + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + + hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); + ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + + ID2D1DCRenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1DCRenderTarget_Clear(rt, &color); + + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); + + clr = GetPixel(hdc2, 0, 0); +todo_wine + ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: 6e80ac1d60b3a43a40b859a1b365751d1cc24839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e80ac1d60b3a43a40b859a1b… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 15 16:04:06 2017 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/po/de.po b/po/de.po index ae2eae7..d1f6215 100644 --- a/po/de.po +++ b/po/de.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: 2017-11-17 14:31+0100\n" +"PO-Revision-Date: 2017-12-15 16:04+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -8939,10 +8939,8 @@ msgid " sec" msgstr " Sek" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Ordner auswählen" +msgstr "Quelle auswählen" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -12092,17 +12090,6 @@ msgid "Icons (*.ico)" msgstr "Symbole (*.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" @@ -12118,7 +12105,7 @@ msgstr "" " REG [Operation] [Parameter]\n" "\n" "Unterstützte Operationen:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Hilfe für eine spezifische Operation:\n" " REG [Operation] /?\n" @@ -12262,22 +12249,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Unbekannte Escape-Sequenz [\\%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 datei.reg\n" +msgstr "REG EXPORT Schlüssel datei.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Ungültiger Systemschlüssel [%1]\n" +msgstr "reg: Ungültiger Systemschlüssel [%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 "Der Wert '%1' existiert bereits. Möchten Sie ihn ersetzen?" +msgstr "Die Datei '%1' existiert bereits. Möchten Sie sie ersetzen?" #: regedit.rc:34 msgid "&Registry"

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: afbf4c7053bc1a11ae8b901f9c7dd033db37a445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbf4c7053bc1a11ae8b901f9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 15 16:28:18 2017 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 172 +++++++++++++++------------------------------------------------ 1 file changed, 39 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afbf4c7053bc1a11ae8b9…

1 0

Alexandre Julliard : cabinet: Treat only -1 as an error from the FDICopy callback.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: 5cb30bbf6ef754e589c2ddfc42ae7a9cf06ace21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb30bbf6ef754e589c2ddfc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 18:47:14 2017 +0100 cabinet: Treat only -1 as an error from the FDICopy callback. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fdi.c | 4 ++-- dlls/cabinet/tests/fdi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 758133e..777174b 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2496,7 +2496,7 @@ BOOL __cdecl FDICopy( fdin.psz2 = (CAB(mii).nextinfo) ? CAB(mii).nextinfo : &emptystring; fdin.psz3 = pszCabPath; - if (((*pfnfdin)(fdintCABINET_INFO, &fdin))) { + if (pfnfdin(fdintCABINET_INFO, &fdin) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); goto bail_and_fail; } @@ -2623,7 +2623,7 @@ BOOL __cdecl FDICopy( fdin.psz2 = (CAB(mii).prevname) ? CAB(mii).prevname : &emptystring; fdin.psz3 = (CAB(mii).previnfo) ? CAB(mii).previnfo : &emptystring; - if (((*pfnfdin)(fdintPARTIAL_FILE, &fdin))) { + if (pfnfdin(fdintPARTIAL_FILE, &fdin) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); goto bail_and_fail; } diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index ba622f6..80f6a3c 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -744,7 +744,7 @@ static void test_FDIIsCabinet(void) static INT_PTR __cdecl CopyProgress(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { - return 0; + return 37; /* doc says 0, but anything != -1 apparently means success as well */ } static INT_PTR CDECL fdi_mem_open(char *name, int oflag, int pmode)

1 0

Alexandre Julliard : ntdll: Reset the exit frame when switching back to it.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: c2f34d1b24b50dafdf979420067b0b5badbe5b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f34d1b24b50dafdf9794200… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 12:36:16 2017 +0100 ntdll: Reset the exit frame when switching back to it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 32 ++++++++++++++++++-------------- dlls/ntdll/signal_x86_64.c | 31 +++++++++++++++++++------------ 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4be573e..07425e2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -547,6 +547,7 @@ struct x86_thread_data }; C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 ); #ifdef __HAVE_VM86 C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, vm86 ) == offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 )); @@ -2849,7 +2850,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, - void *relay, void **exit_frame ); + void *relay ); __ASM_GLOBAL_FUNC( start_thread, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -2863,8 +2864,7 @@ __ASM_GLOBAL_FUNC( start_thread, "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") /* store exit frame */ - "movl 24(%ebp),%eax\n\t" - "movl %ebp,(%eax)\n\t" + "movl %ebp,%fs:0x1f4\n\t" /* x86_thread_data()->exit_frame */ /* build initial context on thread stack */ "movl %fs:4,%eax\n\t" /* NtCurrentTeb()->StackBase */ "leal -0x2dc(%eax),%esi\n\t" /* sizeof(context) + 16 */ @@ -2899,11 +2899,18 @@ __ASM_GLOBAL_FUNC( start_thread, "movl %esi,(%esp)\n\t" "call " __ASM_NAME("set_cpu_context") ) -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) ); __ASM_GLOBAL_FUNC( call_thread_exit_func, - "movl 4(%esp),%eax\n\t" + /* fetch exit frame */ + "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */ + "testl %edx,%edx\n\t" + "jnz 1f\n\t" + "jmp *%ecx\n\t" + /* switch to exit frame stack */ + "1:\tmovl 4(%esp),%eax\n\t" "movl 8(%esp),%ecx\n\t" - "movl 12(%esp),%ebp\n\t" + "movl $0,%fs:0x1f4\n\t" + "movl %edx,%ebp\n\t" __ASM_CFI(".cfi_def_cfa %ebp,4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") @@ -2911,7 +2918,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") "leal -20(%ebp),%esp\n\t" "pushl %eax\n\t" - "call *%ecx" ); + "call *%ecx" ) extern void call_thread_entry(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( call_thread_entry, @@ -2970,7 +2977,7 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - start_thread( entry, arg, suspend, call_thread_entry, &x86_thread_data()->exit_frame ); + start_thread( entry, arg, suspend, call_thread_entry ); } /********************************************************************** @@ -2983,8 +2990,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - start_thread( entry, NtCurrentTeb()->Peb, suspend, - kernel32_start_process, &x86_thread_data()->exit_frame ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process ); } @@ -2993,8 +2999,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - if (!x86_thread_data()->exit_frame) exit_thread( status ); - call_thread_exit_func( status, exit_thread, x86_thread_data()->exit_frame ); + call_thread_exit_func( status, exit_thread ); } /*********************************************************************** @@ -3002,8 +3007,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - if (!x86_thread_data()->exit_frame) exit( status ); - call_thread_exit_func( status, exit, x86_thread_data()->exit_frame ); + call_thread_exit_func( status, exit ); } /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1f76640..60da3f3 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -321,6 +321,7 @@ struct amd64_thread_data }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) ); +C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct amd64_thread_data, exit_frame ) == 0x330 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -4074,7 +4075,7 @@ static void WINAPI call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ) extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, - void *relay, void *stack, void **exit_frame ); + void *relay ); __ASM_GLOBAL_FUNC( start_thread, "subq $56,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") @@ -4091,8 +4092,10 @@ __ASM_GLOBAL_FUNC( start_thread, "movq %r15,8(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %r15,8\n\t") /* store exit frame */ - "movq %rsp,(%r9)\n\t" + "movq %gs:0x30,%rax\n\t" + "movq %rsp,0x330(%rax)\n\t" /* amd64_thread_data()->exit_frame */ /* build initial context on thread stack */ + "movq 8(%rax),%r8\n\t" /* NtCurrentTeb()->Tib.StackBase */ "leaq -0x500(%r8),%r10\n\t" /* sizeof(context) + 0x30 for function params */ "movq $0x001000b,0x30(%r10)\n\t" /* context->ContextFlags = CONTEXT_FULL */ "movw %cs,0x38(%r10)\n\t" /* context->SegCs */ @@ -4116,8 +4119,16 @@ __ASM_GLOBAL_FUNC( start_thread, "movq %rsp,%rdi\n\t" "call " __ASM_NAME("set_cpu_context") ) -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + /* fetch exit frame */ + "movq %gs:0x30,%rax\n\t" + "movq 0x330(%rax),%rdx\n\t" /* amd64_thread_data()->exit_frame */ + "testq %rdx,%rdx\n\t" + "jnz 1f\n\t" + "jmp *%rsi\n" + /* switch to exit frame stack */ + "1:\tmovq $0,0x330(%rax)\n\t" "movq %rdx,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") __ASM_CFI(".cfi_rel_offset %rbp,48\n\t") @@ -4126,7 +4137,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, __ASM_CFI(".cfi_rel_offset %r13,24\n\t") __ASM_CFI(".cfi_rel_offset %r14,16\n\t") __ASM_CFI(".cfi_rel_offset %r15,8\n\t") - "call *%rsi" ); + "call *%rsi" ) /*********************************************************************** @@ -4139,8 +4150,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - start_thread( entry, arg, suspend, call_thread_func, - NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame ); + start_thread( entry, arg, suspend, call_thread_func ); } @@ -4154,8 +4164,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process, - NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process ); } @@ -4164,8 +4173,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - if (!amd64_thread_data()->exit_frame) exit_thread( status ); - call_thread_exit_func( status, exit_thread, amd64_thread_data()->exit_frame ); + call_thread_exit_func( status, exit_thread ); } /*********************************************************************** @@ -4173,8 +4181,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - if (!amd64_thread_data()->exit_frame) exit( status ); - call_thread_exit_func( status, exit, amd64_thread_data()->exit_frame ); + call_thread_exit_func( status, exit ); } /**********************************************************************

1 0

Alexandre Julliard : libport: Add a replacement implementation for strnlen.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: 9d36aad4571b288f5208d35425e1720c6f145376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d36aad4571b288f5208d3542… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 10:48:48 2017 +0100 libport: Add a replacement implementation for strnlen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ include/wine/port.h | 5 +++++ libs/port/Makefile.in | 1 + libs/port/strnlen.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 42 insertions(+) diff --git a/configure b/configure index 95c367c..132499b 100755 --- a/configure +++ b/configure @@ -15747,6 +15747,7 @@ for ac_func in \ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/configure.ac b/configure.ac index 00413bc..62ad8db 100644 --- a/configure.ac +++ b/configure.ac @@ -2125,6 +2125,7 @@ AC_CHECK_FUNCS(\ strdup \ strerror \ strncasecmp \ + strnlen \ strtold \ strtoll \ strtoull \ diff --git a/include/config.h.in b/include/config.h.in index aff5f35..9224837 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -921,6 +921,9 @@ /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP +/* Define to 1 if you have the `strnlen' function. */ +#undef HAVE_STRNLEN + /* Define to 1 if you have the <stropts.h> header file. */ #undef HAVE_STROPTS_H diff --git a/include/wine/port.h b/include/wine/port.h index addece0..fb7251e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -344,6 +344,10 @@ int strncasecmp(const char *str1, const char *str2, size_t n); # endif #endif /* !defined(HAVE_STRNCASECMP) */ +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ); +#endif /* !defined(HAVE_STRNLEN) */ + #ifndef HAVE_STRERROR const char *strerror(int err); #endif /* !defined(HAVE_STRERROR) */ @@ -538,6 +542,7 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define strcasecmp __WINE_NOT_PORTABLE(strcasecmp) #define strerror __WINE_NOT_PORTABLE(strerror) #define strncasecmp __WINE_NOT_PORTABLE(strncasecmp) +#define strnlen __WINE_NOT_PORTABLE(strnlen) #define usleep __WINE_NOT_PORTABLE(usleep) #endif /* NO_LIBWINE_PORT */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7fefda1..c87b99de 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,6 +102,7 @@ C_SRCS = \ strcasecmp.c \ strerror.c \ strncasecmp.c \ + strnlen.c \ symlink.c \ usleep.c \ utf8.c \ diff --git a/libs/port/strnlen.c b/libs/port/strnlen.c new file mode 100644 index 0000000..ab6668d --- /dev/null +++ b/libs/port/strnlen.c @@ -0,0 +1,31 @@ +/* + * strnlen function + * + * Copyright 2017 Alexandre Julliard + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifndef HAVE_STRNLEN +size_t strnlen( const char *str, size_t maxlen ) +{ + const char *ptr = memchr( str, 0, maxlen ); + if (!ptr) return maxlen; + return ptr - str; +} +#endif /* HAVE_STRNLEN */

1 0

Andrey Gusev : usp10: Fix a typo in an ERR() message.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: wine Branch: master Commit: acdbea2beeb7b3997c374948832457198b164908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdbea2beeb7b3997c3749488… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Dec 14 18:21:10 2017 +0200 usp10: Fix a typo in an ERR() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 0351f4f..1fd9c4d 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2051,7 +2051,7 @@ static void GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A } if (!offset) { - ERR("Failed to find avalible ligature connection point\n"); + ERR("Failed to find available ligature connection point\n"); return; }

1 0

Józef Kucia : include: Avoid including vkd3d_windows.h when real windows.h is included.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: vkd3d Branch: master Commit: 6671e79082998fec1ad665f9b24ab2d7577855a0 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=6671e79082998fec1ad665f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:22 2017 +0100 include: Avoid including vkd3d_windows.h when real windows.h is included. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_windows.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 09c30f6..3b1f92a 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -18,6 +18,7 @@ #ifndef __VKD3D_WINDOWS_H #define __VKD3D_WINDOWS_H +#ifndef _INC_WINDOWS #if !defined(_WIN32) || defined(__WIDL__) @@ -238,4 +239,5 @@ extern "C++" \ #endif #endif /* DEFINE_ENUM_FLAG_OPERATORS */ +#endif /* _INC_WINDOWS */ #endif /* __VKD3D_WINDOWS_H */

1 0

Józef Kucia : include: Prefix public header file names with vkd3d.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: vkd3d Branch: master Commit: abff3ca469e971ce544af21f993cd1c85bbdd93a URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=abff3ca469e971ce544af21f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:21 2017 +0100 include: Prefix public header file names with vkd3d. Prevents possible clashes when using vkd3d with external Win32 headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 22 +++++++++++----------- demos/demo.h | 2 +- demos/demo_win32.h | 2 +- include/.gitignore | 16 ++++++++-------- include/vkd3d.h | 2 +- include/{d3d12.idl => vkd3d_d3d12.idl} | 4 ++-- include/{dxgi.idl => vkd3d_dxgi.idl} | 4 ++-- include/{dxgi1_2.idl => vkd3d_dxgi1_2.idl} | 2 +- include/{dxgi1_3.idl => vkd3d_dxgi1_3.idl} | 2 +- include/{dxgi1_4.idl => vkd3d_dxgi1_4.idl} | 2 +- include/{dxgibase.idl => vkd3d_dxgibase.idl} | 2 +- include/{dxgiformat.idl => vkd3d_dxgiformat.idl} | 0 include/{dxgitype.idl => vkd3d_dxgitype.idl} | 2 +- include/{unknown.idl => vkd3d_unknown.idl} | 0 tests/d3d12.c | 4 ++-- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9e1f854..4d32b2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,22 +3,22 @@ AM_CFLAGS = @VKD3D_CFLAGS@ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private widl_headers = \ - include/d3d12.h \ - include/dxgi.h \ - include/dxgi1_2.h \ - include/dxgi1_3.h \ - include/dxgi1_4.h \ - include/dxgibase.h \ - include/dxgiformat.h \ - include/dxgitype.h + include/vkd3d_d3d12.h \ + include/vkd3d_dxgi.h \ + include/vkd3d_dxgi1_2.h \ + include/vkd3d_dxgi1_3.h \ + include/vkd3d_dxgi1_4.h \ + include/vkd3d_dxgibase.h \ + include/vkd3d_dxgiformat.h \ + include/vkd3d_dxgitype.h vkd3d_public_headers = \ - include/d3d12.h \ include/dummy/rpc.h \ include/dummy/rpcndr.h \ - include/dxgibase.h \ - include/dxgiformat.h \ include/vkd3d.h \ + include/vkd3d_d3d12.h \ + include/vkd3d_dxgibase.h \ + include/vkd3d_dxgiformat.h \ include/vkd3d_shader.h \ include/vkd3d_utils.h \ include/vkd3d_windows.h diff --git a/demos/demo.h b/demos/demo.h index dc36d10..4645bd7 100644 --- a/demos/demo.h +++ b/demos/demo.h @@ -36,7 +36,7 @@ #include <vkd3d_windows.h> #define WIDL_C_INLINE_WRAPPERS #define COBJMACROS -#include <d3d12.h> +#include <vkd3d_d3d12.h> #include <inttypes.h> #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x)) diff --git a/demos/demo_win32.h b/demos/demo_win32.h index addcc95..3b61bcf 100644 --- a/demos/demo_win32.h +++ b/demos/demo_win32.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <dxgi1_4.h> +#include <vkd3d_dxgi1_4.h> #include <stdbool.h> #include <stdio.h> diff --git a/include/.gitignore b/include/.gitignore index b7ead08..17852a8 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,11 +1,11 @@ config.h config.h.in -d3d12.h -dxgi.h -dxgi1_2.h -dxgi1_3.h -dxgi1_4.h -dxgibase.h -dxgiformat.h -dxgitype.h stamp-h1 +vkd3d_d3d12.h +vkd3d_dxgi.h +vkd3d_dxgi1_2.h +vkd3d_dxgi1_3.h +vkd3d_dxgi1_4.h +vkd3d_dxgibase.h +vkd3d_dxgiformat.h +vkd3d_dxgitype.h diff --git a/include/vkd3d.h b/include/vkd3d.h index 941663f..f6872c3 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -21,7 +21,7 @@ #ifndef VKD3D_NO_WIN32_TYPES # include "vkd3d_windows.h" -# include "d3d12.h" +# include "vkd3d_d3d12.h" #endif /* VKD3D_NO_WIN32_TYPES */ #include <vulkan/vulkan.h> diff --git a/include/d3d12.idl b/include/vkd3d_d3d12.idl similarity index 99% rename from include/d3d12.idl rename to include/vkd3d_d3d12.idl index 07218cd..4242daf 100644 --- a/include/d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -18,9 +18,9 @@ import "vkd3d_windows.h"; -import "dxgibase.idl"; +import "vkd3d_dxgibase.idl"; -#include "unknown.idl" +#include "vkd3d_unknown.idl" const UINT D3D12_CS_TGSM_REGISTER_COUNT = 8192; const UINT D3D12_MAX_ROOT_COST = 64; diff --git a/include/dxgi.idl b/include/vkd3d_dxgi.idl similarity index 98% rename from include/dxgi.idl rename to include/vkd3d_dxgi.idl index 746e000..5b80e1f 100644 --- a/include/dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -17,9 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgitype.idl"; +import "vkd3d_dxgitype.idl"; -#include "unknown.idl" +#include "vkd3d_unknown.idl" typedef enum DXGI_SWAP_EFFECT { diff --git a/include/dxgi1_2.idl b/include/vkd3d_dxgi1_2.idl similarity index 99% rename from include/dxgi1_2.idl rename to include/vkd3d_dxgi1_2.idl index dbee994..e7f951a 100644 --- a/include/dxgi1_2.idl +++ b/include/vkd3d_dxgi1_2.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgi.idl"; +import "vkd3d_dxgi.idl"; typedef enum DXGI_SCALING { diff --git a/include/dxgi1_3.idl b/include/vkd3d_dxgi1_3.idl similarity index 98% rename from include/dxgi1_3.idl rename to include/vkd3d_dxgi1_3.idl index 85a6e1e..88ac0a3 100644 --- a/include/dxgi1_3.idl +++ b/include/vkd3d_dxgi1_3.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgi1_2.idl"; +import "vkd3d_dxgi1_2.idl"; typedef struct DXGI_MATRIX_3X2_F DXGI_MATRIX_3X2_F; diff --git a/include/dxgi1_4.idl b/include/vkd3d_dxgi1_4.idl similarity index 98% rename from include/dxgi1_4.idl rename to include/vkd3d_dxgi1_4.idl index 908bd9b..ccd2224 100644 --- a/include/dxgi1_4.idl +++ b/include/vkd3d_dxgi1_4.idl @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgi1_3.idl"; +import "vkd3d_dxgi1_3.idl"; [ local, diff --git a/include/dxgibase.idl b/include/vkd3d_dxgibase.idl similarity index 97% rename from include/dxgibase.idl rename to include/vkd3d_dxgibase.idl index 86ba5dc..93f931e 100644 --- a/include/dxgibase.idl +++ b/include/vkd3d_dxgibase.idl @@ -18,7 +18,7 @@ import "vkd3d_windows.h"; -import "dxgiformat.idl"; +import "vkd3d_dxgiformat.idl"; cpp_quote("#ifndef DXGI_ERROR_INVALID_CALL") cpp_quote("#define DXGI_ERROR_INVALID_CALL _HRESULT_TYPEDEF_(0x887a0001)") diff --git a/include/dxgiformat.idl b/include/vkd3d_dxgiformat.idl similarity index 100% rename from include/dxgiformat.idl rename to include/vkd3d_dxgiformat.idl diff --git a/include/dxgitype.idl b/include/vkd3d_dxgitype.idl similarity index 98% rename from include/dxgitype.idl rename to include/vkd3d_dxgitype.idl index aad3f4b..74806c0 100644 --- a/include/dxgitype.idl +++ b/include/vkd3d_dxgitype.idl @@ -18,7 +18,7 @@ */ import "vkd3d_windows.h"; -import "dxgibase.idl"; +import "vkd3d_dxgibase.idl"; typedef enum DXGI_COLOR_SPACE_TYPE { diff --git a/include/unknown.idl b/include/vkd3d_unknown.idl similarity index 100% rename from include/unknown.idl rename to include/vkd3d_unknown.idl diff --git a/tests/d3d12.c b/tests/d3d12.c index 1d8e625..963ecff 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -41,7 +41,7 @@ typedef int HRESULT; #include "vkd3d_test.h" #include "vkd3d_windows.h" #define WIDL_C_INLINE_WRAPPERS -#include "d3d12.h" +#include "vkd3d_d3d12.h" #include <inttypes.h> #include <limits.h> @@ -49,7 +49,7 @@ typedef int HRESULT; #include <time.h> #ifdef _WIN32 -# include "dxgi1_4.h" +# include "vkd3d_dxgi1_4.h" #else # include <pthread.h> # include "vkd3d_utils.h"

1 0

Józef Kucia : include: Do not use vkd3d Win32 headers when VKD3D_NO_WIN32_TYPES is defined.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: vkd3d Branch: master Commit: f8c20beede23609eb240499fa657a6f62c8853eb URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=f8c20beede23609eb240499f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:20 2017 +0100 include: Do not use vkd3d Win32 headers when VKD3D_NO_WIN32_TYPES is defined. Allows using vkd3d with other Win32 headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 8cc9a67..941663f 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -19,8 +19,11 @@ #ifndef __VKD3D_H #define __VKD3D_H -#include "vkd3d_windows.h" -#include "d3d12.h" +#ifndef VKD3D_NO_WIN32_TYPES +# include "vkd3d_windows.h" +# include "d3d12.h" +#endif /* VKD3D_NO_WIN32_TYPES */ + #include <vulkan/vulkan.h> #include <stdbool.h>

1 0

Józef Kucia : libs/vkd3d-shader: Fix result type for OpImageSampleDref instructions.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: vkd3d Branch: master Commit: 4ae6285c8ee5f0fd0b3c78333f26f32ee2c74390 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=4ae6285c8ee5f0fd0b3c7833… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 15 15:16:19 2017 +0100 libs/vkd3d-shader: Fix result type for OpImageSampleDref instructions. Per the SPIR-V spec: "Result Type must be a scalar of integer type or floating-point type." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e749873..6fd198b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2616,6 +2616,25 @@ static void vkd3d_dxbc_compiler_emit_store_dst_components(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_store_dst_scalar(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst, uint32_t val_id, + enum vkd3d_component_type component_type, DWORD swizzle) +{ + unsigned int component_count = vkd3d_write_mask_component_count(dst->write_mask); + uint32_t component_ids[VKD3D_VEC4_SIZE]; + unsigned int component_idx, i; + + component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); + for (i = 0; i < component_count; ++i) + { + if (vkd3d_swizzle_get_component(swizzle, component_idx + i)) + ERR("Invalid swizzle %#x for scalar value, write mask %#x.\n", swizzle, dst->write_mask); + + component_ids[i] = val_id; + } + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, dst, component_type, component_ids); +} + static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *compiler, uint32_t target_id, SpvBuiltIn builtin) { @@ -4641,7 +4660,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_DEPTH); - sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); ref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); /* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */ @@ -4652,7 +4671,7 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil image.sampled_image_id, coordinate_id, ref_id, operands_mask, image_operands, image_operand_count); - vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, + vkd3d_dxbc_compiler_emit_store_dst_scalar(compiler, dst, val_id, image.sampled_type, src[1].swizzle); }

1 0

Alexandre Julliard : git-to-cvs: Remove obsolete script.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: c45dbf6b8b974ff50991000df7d8095080c5cb36 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c45dbf6b8b974ff50991000d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 13:09:43 2017 +0100 git-to-cvs: Remove obsolete script. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- git-to-cvs | 406 ------------------------------------------------------------- 1 file changed, 406 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c45dbf6b8b974ff50991…

1 0

Alexandre Julliard : wine_release: Remove the winapi_stats page generation , it's not meaningful information.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: 7498191d2b7b9f3e01856601d57bea131da37c9d URL: http://source.winehq.org/git/tools.git/?a=commit;h=7498191d2b7b9f3e01856601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 12:45:17 2017 +0100 wine_release: Remove the winapi_stats page generation, it's not meaningful information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winapi_stats | 62 ------------------------------------------------------------ wine_release | 9 +-------- 2 files changed, 1 insertion(+), 70 deletions(-) diff --git a/winapi_stats b/winapi_stats deleted file mode 100755 index 786017f..0000000 --- a/winapi_stats +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/perl -# -# Filter to generate the winapi stats table using winapi_extract. -# Must be run from the Wine top-level source directory. -# - -my %stats; - -open STATS, "-|" or exec "./tools/winapi/winapi_extract", "--pseudo-stub-statistics", "--no-verbose", "--no-progress" or die "cannot run winapi_extract"; -while (<STATS>) -{ - chomp; - if (/\*\.c: (.*): (\d+) of (\d+) functions are stubs $(\d+) real, (\d+) pseudo$ and (\d+) are forwards/) - { - my ($dll, $stubs, $total, $real, $pseudo, $forwards) = ($1, $2, $3, $4, $5, $6); - next if $dll =~ /^(wine.*\.drv|wine.*\.acm|wined3d|winedos|wprocs)$/; - $stats{$dll} = [ $stubs, $total, $real, $pseudo, $forwards ]; - ${$stats{" Total"}}[0] += $stubs; - ${$stats{" Total"}}[1] += $total; - ${$stats{" Total"}}[2] += $real; - ${$stats{" Total"}}[3] += $pseudo; - ${$stats{" Total"}}[4] += $forwards; - } -} -close STATS or die "winapi_extract failed"; - -my $bg = 0; - -print "\n\n"; -print "<h3>Win API Stats</h3>\n\n"; -print "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"3\">\n\n"; -print "<tr class=\"hdr\">\n"; -print "<th>Library</th>\n"; -print "<th>API count</th>\n"; -print "<th>% implemented</th>\n"; -print "<th>Total stubs</th>\n"; -print "<th>Real stubs</th>\n"; -print "<th>Pseudo stubs</th>\n"; -print "<th>Forwards</th>\n"; -print "</tr>\n"; - -foreach my $dll (sort keys %stats) -{ - my ($stubs, $total, $real, $pseudo, $forwards) = @{$stats{$dll}}; - my $color = $bg ? "white" : "grey"; - my $pct = $total ? ($total - $stubs) / $total * 100 : 0; - printf "<tr>\n"; - printf "<td class=\"%s\">%s</td>\n", $color, $dll; - printf "<td class=\"%s\">%u</td>\n", $color, $total; - printf "<td class=\"pct%u\">%u%%</td>\n", int(($pct + 2.5) / 5) * 5, $pct; - printf "<td class=\"%s\">%u</td>\n", $color, $stubs; - printf "<td class=\"%s\">%u</td>\n", $color, $real; - printf "<td class=\"%s\">%u</td>\n", $color, $pseudo; - printf "<td class=\"%s\">%u</td>\n", $color, $forwards; - printf "</tr>\n"; - $bg = !$bg; -} - -my $now = `date`; -chomp $now; -print "\n</table>\n"; -print "<p>last modified: $now</p>\n"; diff --git a/wine_release b/wine_release index aed1545..7b8def1 100755 --- a/wine_release +++ b/wine_release @@ -32,14 +32,11 @@ if [ "$branch" = "master" ] then # nuke old attempt (if any) rm -rf wine-$version - git clone -l -s -n git/wine.git wine-$version + git clone -b wine-$version git/wine.git wine-$version cd wine-$version - git checkout wine-$version # update man page and documentation - echo "==== UPDATING DOCUMENTATION ====" ./configure --quiet --without-x --without-freetype - make -s depend manpages="\ loader/wine.man \ @@ -74,10 +71,6 @@ then make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI - # Wine API Stats - echo "==== UPDATING WINE API STATS PAGE ====" - $tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template - cd .. rm -rf wine-$version fi

1 0

Francois Gouget : testbot/web: Remove an unnecessary WineTestBot:: Config prefix.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: b0277542085dc35746b313817a14818629c66a31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b0277542085dc35746b31381… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 08:00:40 2017 +0100 testbot/web: Remove an unnecessary WineTestBot::Config prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b0c2d45..deacf90 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -277,7 +277,7 @@ sub GenerateBody($) my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - if ($WineTestBot::Config::JobArchiveDays != 0) + if ($JobArchiveDays != 0) { my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName('Id'); my $MaxIdLength = $PropertyDescriptor->GetMaxLength();

1 0

Francois Gouget : testbot/Engine: Fix handling of --kill-vms.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: b679f7fb2daf0d9e011c0dee2ce8ed33fd5e5031 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b679f7fb2daf0d9e011c0dee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:58:45 2017 +0100 testbot/Engine: Fix handling of --kill-vms. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index dfe266f..7dab98e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -207,6 +207,12 @@ sub Cleanup($;$$) $VM->RunPowerOff(); } } + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + elsif ($KillVMs and $VM->Status !~ /^(?:off|offline)$/) + { + $VM->RunPowerOff(); + } } }

1 0

Francois Gouget : testbot/Engine: Don't override $MaxVMsWhenIdle == 0.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: 679645d2fa162cb9f3637d2c9d09a80e464e99b7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=679645d2fa162cb9f3637d2c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:56:10 2017 +0100 testbot/Engine: Don't override $MaxVMsWhenIdle == 0. It should only be set to the default if left undefined. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ad492f6..dfe266f 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -714,7 +714,7 @@ sub main() $MaxRevertsWhileRunningVMs = $MaxRevertingVMs; LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } - $MaxVMsWhenIdle ||= $MaxActiveVMs; + $MaxVMsWhenIdle = $MaxActiveVMs if (!defined $MaxVMsWhenIdle); Cleanup(1); # Check for patches that arrived while the server was off.

1 0

Francois Gouget : testbot: Set $MaxRevertsWhileRunningVMs = 0 in the default configuration.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: 48be4beddec5c708f08fe584cd8afced5d68fa49 URL: http://source.winehq.org/git/tools.git/?a=commit;h=48be4beddec5c708f08fe584… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:55:46 2017 +0100 testbot: Set $MaxRevertsWhileRunningVMs = 0 in the default configuration. It's the safe option as it ensure the revert will not interfere with the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b0492a3..8388a0e 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -67,7 +67,7 @@ $BinDir = "$::RootDir/bin"; # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; -$MaxRevertsWhileRunningVMs = 1; +$MaxRevertsWhileRunningVMs = 0; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef;

1 0

Francois Gouget : testbot/web: Document that the Redirect() calls don' t return.
by Alexandre Julliard 15 Dec '17

15 Dec '17

Module: tools Branch: master Commit: b8631bb6ed62409c4b1074bc0b929f1ab5cd7d8a URL: http://source.winehq.org/git/tools.git/?a=commit;h=b8631bb6ed62409c4b1074bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 15 07:54:59 2017 +0100 testbot/web: Document that the Redirect() calls don't return. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9d1525d..a07f02b 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -171,7 +171,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); + $self->Redirect($Target); # does not return } 1;

1 0

Dmitry Timoshkov : bcrypt: Add some crypto-provider related stubs.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 76bc8d01c0461d12cc6f7ee96ad632145d1a64bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bc8d01c0461d12cc6f7ee96… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 13 12:45:42 2017 +0800 bcrypt: Add some crypto-provider related stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 12 ++++++------ dlls/bcrypt/bcrypt_main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 12 ++++++------ include/bcrypt.h | 23 +++++++++++++++++++++++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 9ecd21d..f00f55c 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) @ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -39,9 +39,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -49,7 +49,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) @ stub BCryptVerifySignature @ stub GetAsymmetricEncryptionInterface @ stub GetCipherInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 765f758..3bdc463 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -122,6 +122,42 @@ static void gnutls_uninitialize(void) } #endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */ +NTSTATUS WINAPI BCryptAddContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptAddContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptRemoveContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function) +{ + FIXME("%08x, %s, %08x, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider) +{ + FIXME("%08x, %s, %08x, %s, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) +{ + FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptUnregisterProvider(LPCWSTR provider) +{ + FIXME("%s: stub\n", debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1a78853..5d37121 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) bcrypt.BCryptAddContextFunction +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) bcrypt.BCryptAddContextFunctionProvider @ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -42,9 +42,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) bcrypt.BCryptRegisterProvider +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) bcrypt.BCryptRemoveContextFunction +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) bcrypt.BCryptRemoveContextFunctionProvider @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -52,7 +52,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider @ stub BCryptVerifySignature @ stub GetIsolationServerInterface @ stub GetKeyStorageInterface diff --git a/include/bcrypt.h b/include/bcrypt.h index 7c3c8d0..1f7093c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -94,6 +94,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT ULONG dwIncrement; } BCRYPT_KEY_LENGTHS_STRUCT; +typedef struct _CRYPT_INTERFACE_REG +{ + ULONG dwInterface; + ULONG dwFlags; + ULONG cFunctions; + PWSTR *rgpszFunctions; +} CRYPT_INTERFACE_REG, *PCRYPT_INTERFACE_REG; + +typedef struct _CRYPT_IMAGE_REG +{ + PWSTR pszImage; + ULONG cInterfaces; + PCRYPT_INTERFACE_REG *rgpInterfaces; +} CRYPT_IMAGE_REG, *PCRYPT_IMAGE_REG; + +typedef struct _CRYPT_PROVIDER_REG +{ + ULONG cAliases; + PWSTR *rgpszAliases; + PCRYPT_IMAGE_REG pUM; + PCRYPT_IMAGE_REG pKM; +} CRYPT_PROVIDER_REG, *PCRYPT_PROVIDER_REG; + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE;

1 0

Dmitry Timoshkov : wine.inf: Add "Security Packages" key.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: e5e556bf8505de7cf0a25b47111739b249deeb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e556bf8505de7cf0a25b471… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 13 12:45:04 2017 +0800 wine.inf: Add "Security Packages" key. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d88e4ff..a991319 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -683,6 +683,7 @@ HKLM,Software\Microsoft\Windows Messaging Subsystem,"MAPI",2,"1" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 +HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI"

1 0

Alexandre Julliard : ntdll: Define PTHREAD_STACK_MIN if it's missing.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 6eab1e93f34075477df323ad6f5f0f97815fbc50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eab1e93f34075477df323ad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 20:28:32 2017 +0100 ntdll: Define PTHREAD_STACK_MIN if it's missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6abfd85..479b8d6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -48,6 +48,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); +#ifndef PTHREAD_STACK_MIN +#define PTHREAD_STACK_MIN 16384 +#endif + struct _KUSER_SHARED_DATA *user_shared_data = NULL; PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL;

1 0

Alexandre Julliard : ntdll: Switch back to the initial stack for thread exit on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: d147c4c3239a367381ac5dbccbc1cab40699fedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d147c4c3239a367381ac5dbcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 20:28:16 2017 +0100 ntdll: Switch back to the initial stack for thread exit on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 23f494d..272fc7b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1225,8 +1225,10 @@ extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void * __ASM_GLOBAL_FUNC( start_thread, ".arm\n\t" "push {r4-r12,lr}\n\t" - /* build initial context on thread stack */ + /* store exit frame */ "ldr r4, [sp, #40]\n\t" /* teb */ + "str sp, [r4, #0x1d4]\n\t" /* teb->SystemReserved2 */ + /* build initial context on thread stack */ "ldr r4, [r4, #4]\n\t" /* teb->Tib.StackBase */ "sub r5, r4, #0x1a0\n\t" /* sizeof(CONTEXT) */ "mov ip, #0x0200000\n\t" /* CONTEXT_ARM */ @@ -1246,6 +1248,16 @@ __ASM_GLOBAL_FUNC( start_thread, "mov r0, r5\n\t" "b " __ASM_NAME("set_cpu_context") ) +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + ".arm\n\t" + "ldr r3, [r2, #0x1d4]\n\t" /* teb->SystemReserved2 */ + "mov ip, #0\n\t" + "str ip, [r2, #0x1d4]\n\t" + "cmp r3, ip\n\t" + "movne sp, r3\n\t" + "blx r1" ) + /*********************************************************************** * signal_start_thread * @@ -1277,7 +1289,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) */ void signal_exit_thread( int status ) { - exit_thread( status ); + call_thread_exit_func( status, exit_thread, NtCurrentTeb() ); } /*********************************************************************** @@ -1285,7 +1297,7 @@ void signal_exit_thread( int status ) */ void signal_exit_process( int status ) { - exit( status ); + call_thread_exit_func( status, exit, NtCurrentTeb() ); } /**********************************************************************

1 0

Alexandre Julliard : ntdll: Reimplement thread initialization in assembler on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: f492efdb3c77f015247f6b73d98110a0353035b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f492efdb3c77f015247f6b73d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 18:34:46 2017 +0100 ntdll: Reimplement thread initialization in assembler on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 60 ++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index fc65c87..23f494d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1220,35 +1220,31 @@ static void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) abort(); /* should not be reached */ } -typedef void (WINAPI *thread_start_func)(LPTHREAD_START_ROUTINE,void *); - -struct startup_info -{ - thread_start_func start; - LPTHREAD_START_ROUTINE entry; - void *arg; - BOOL suspend; -}; - -/*********************************************************************** - * thread_startup - */ -static void thread_startup( void *param ) -{ - CONTEXT context = { 0 }; - struct startup_info *info = param; - - /* build the initial context */ - context.ContextFlags = CONTEXT_FULL; - context.R0 = (DWORD)info->entry; - context.R1 = (DWORD)info->arg; - context.Sp = (DWORD)NtCurrentTeb()->Tib.StackBase; - context.Pc = (DWORD)info->start; - - attach_dlls( &context, info->suspend ); - - set_cpu_context( &context ); -} +extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, + void *relay, TEB *teb ); +__ASM_GLOBAL_FUNC( start_thread, + ".arm\n\t" + "push {r4-r12,lr}\n\t" + /* build initial context on thread stack */ + "ldr r4, [sp, #40]\n\t" /* teb */ + "ldr r4, [r4, #4]\n\t" /* teb->Tib.StackBase */ + "sub r5, r4, #0x1a0\n\t" /* sizeof(CONTEXT) */ + "mov ip, #0x0200000\n\t" /* CONTEXT_ARM */ + "add ip, #0x3\n\t" /* CONTEXT_FULL */ + "str ip, [r5]\n\t" /* context->ContextFlags */ + "str r0, [r5, #0x4]\n\t" /* context->R0 = entry */ + "str r1, [r5, #0x8]\n\t" /* context->R1 = arg */ + "str r4, [r5, #0x38]\n\t" /* context->Sp = stack */ + "str r3, [r5, #0x40]\n\t" /* context->Pc = relay */ + /* switch to thread stack */ + "mov sp, r5\n\t" + /* attach dlls */ + "mov r0, r5\n\t" /* context */ + "mov r1, r2\n\t" /* suspend */ + "bl " __ASM_NAME("attach_dlls") "\n\t" + /* switch to the initial context */ + "mov r0, r5\n\t" + "b " __ASM_NAME("set_cpu_context") ) /*********************************************************************** * signal_start_thread @@ -1260,8 +1256,7 @@ static void thread_startup( void *param ) */ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) { - struct startup_info info = { call_thread_entry_point, entry, arg, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, arg, suspend, call_thread_entry_point, NtCurrentTeb() ); } /********************************************************************** @@ -1274,8 +1269,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend */ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) { - struct startup_info info = { kernel32_start_process, entry, NtCurrentTeb()->Peb, suspend }; - wine_switch_to_stack( thread_startup, &info, NtCurrentTeb()->Tib.StackBase ); + start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process, NtCurrentTeb() ); } /***********************************************************************

1 0

Alexandre Julliard : ntdll: Set all registers in set_cpu_context() on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 8a07ee48fa96e12474cb6f7c1d365858aaebcdff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a07ee48fa96e12474cb6f7c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 18:34:19 2017 +0100 ntdll: Set all registers in set_cpu_context() on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 51 ++++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index dcb4564..fc65c87 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -262,24 +262,10 @@ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" /* FIXME: Use the Stack instead of the actual register values */ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, ".arm\n\t" - "stmfd SP!, {r1}\n\t" - "mov r1, #0x0200000\n\t"/* CONTEXT_ARM */ - "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ - "str r1, [r0]\n\t" /* context->ContextFlags */ - "ldmfd SP!, {r1}\n\t" - "str r0, [r0, #0x4]\n\t" /* context->R0 */ - "str r1, [r0, #0x8]\n\t" /* context->R1 */ - "str r2, [r0, #0xc]\n\t" /* context->R2 */ - "str r3, [r0, #0x10]\n\t" /* context->R3 */ - "str r4, [r0, #0x14]\n\t" /* context->R4 */ - "str r5, [r0, #0x18]\n\t" /* context->R5 */ - "str r6, [r0, #0x1c]\n\t" /* context->R6 */ - "str r7, [r0, #0x20]\n\t" /* context->R7 */ - "str r8, [r0, #0x24]\n\t" /* context->R8 */ - "str r9, [r0, #0x28]\n\t" /* context->R9 */ - "str r10, [r0, #0x2c]\n\t" /* context->R10 */ - "str r11, [r0, #0x30]\n\t" /* context->R11 */ - "str IP, [r0, #0x34]\n\t" /* context->R12 */ + "stmib r0, {r0-r12}\n\t" /* context->R0..R12 */ + "mov r1, #0x0200000\n\t" /* CONTEXT_ARM */ + "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ + "str r1, [r0]\n\t" /* context->ContextFlags */ "str SP, [r0, #0x38]\n\t" /* context->Sp */ "str LR, [r0, #0x3c]\n\t" /* context->Lr */ "str PC, [r0, #0x40]\n\t" /* context->Pc */ @@ -294,26 +280,17 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, * * Set the new CPU context. */ -/* FIXME: What about the CPSR? */ -void set_cpu_context( const CONTEXT *context ); +void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_cpu_context, - "mov IP, r0\n\t" - "ldr r0, [IP, #0x4]\n\t" /* context->R0 */ - "ldr r1, [IP, #0x8]\n\t" /* context->R1 */ - "ldr r2, [IP, #0xc]\n\t" /* context->R2 */ - "ldr r3, [IP, #0x10]\n\t" /* context->R3 */ - "ldr r4, [IP, #0x14]\n\t" /* context->R4 */ - "ldr r5, [IP, #0x18]\n\t" /* context->R5 */ - "ldr r6, [IP, #0x1c]\n\t" /* context->R6 */ - "ldr r7, [IP, #0x20]\n\t" /* context->R7 */ - "ldr r8, [IP, #0x24]\n\t" /* context->R8 */ - "ldr r9, [IP, #0x28]\n\t" /* context->R9 */ - "ldr r10, [IP, #0x2c]\n\t" /* context->R10 */ - "ldr r11, [IP, #0x30]\n\t" /* context->R11 */ - "ldr SP, [IP, #0x38]\n\t" /* context->R12 */ - "ldr LR, [IP, #0x3c]\n\t" /* context->Lr */ - "ldr PC, [IP, #0x40]\n\t" /* context->Pc */ - ) + ".arm\n\t" + "ldr r1, [r0, #0x44]\n\t" /* context->Cpsr */ + "msr CPSR_f, r1\n\t" + "ldr r1, [r0, #0x40]\n\t" /* context->Pc */ + "ldr lr, [r0, #0x3c]\n\t" /* context->Lr */ + "ldr sp, [r0, #0x38]\n\t" /* context->Sp */ + "push {r1}\n\t" + "ldmib r0, {r0-r12}\n\t" /* context->R0..R12 */ + "pop {pc}" ) /***********************************************************************

1 0

Joel Holdsworth : urlmon: Support [Add.Code] sections in ActiveX INF files.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 185bcc4523c5827a78a56c63735f1a5f502e999b URL: http://source.winehq.org/git/wine.git/?a=commit;h=185bcc4523c5827a78a56c637… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Dec 13 13:32:22 2017 -0700 urlmon: Support [Add.Code] sections in ActiveX INF files. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 7ee7d94..d2cf7e6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -251,12 +251,25 @@ static HRESULT install_inf_file(install_ctx_t *ctx) len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); if(len) { - FIXME("[Add.Code] section not supported\n"); + default_install = FALSE; - /* Don't throw an error if we successfully ran setup hooks; - installation is likely to be complete enough */ - if(default_install) - return E_NOTIMPL; + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Add.Code] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, sect_name, + ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } } if(default_install) {

1 0

Huw Davies : ole32: Correctly save the remaining formats if their data has not been set.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 33be9fc78f51f869bd2bb8ab5e7ac205eeb5af47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33be9fc78f51f869bd2bb8ab5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 14 13:17:38 2017 +0000 ole32: Correctly save the remaining formats if their data has not been set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 48 +++++++++++++++++++++--------------------------- dlls/ole32/tests/ole2.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ae05b8e..ad55c6e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -829,17 +829,16 @@ static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) if (hr == S_OK && data_size) hr = IStream_Write(stream, bmi, data_size, NULL); } - else + else if(data_size) { BITMAPFILEHEADER bmp_fhdr; bmp_fhdr.bfType = 0x4d42; bmp_fhdr.bfSize = data_size + sizeof(BITMAPFILEHEADER); bmp_fhdr.bfReserved1 = bmp_fhdr.bfReserved2 = 0; - if (data_size) - bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); + bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); hr = IStream_Write(stream, &bmp_fhdr, sizeof(BITMAPFILEHEADER), NULL); - if (hr == S_OK && data_size) + if (hr == S_OK) hr = IStream_Write(stream, bmi, data_size, NULL); } @@ -897,25 +896,22 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { struct meta_placeable meta_place_rec; WORD *check; - if (entry->stgmedium.tymed != TYMED_NULL) + mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); + if (!mfpict) + return DV_E_STGMEDIUM; + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!data) { - mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - return DV_E_STGMEDIUM; - data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); - data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!data) - { - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - return E_OUTOFMEMORY; - } - GetMetaFileBitsEx(mfpict->hMF, data_size, data); + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + return E_OUTOFMEMORY; } + GetMetaFileBitsEx(mfpict->hMF, data_size, data); /* units are in 1/8th of a point (1 point is 1/72th of an inch) */ meta_place_rec.key = 0x9ac6cdd7; @@ -927,13 +923,12 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = 0; meta_place_rec.checksum = 0; meta_place_rec.reserved = 0; - if (mfpict) - { - /* These values are rounded down so MulDiv won't do the right thing */ - meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; - meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - } + + /* These values are rounded down so MulDiv won't do the right thing */ + meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; + meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); @@ -982,7 +977,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { data_size = GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, 0, NULL); data = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) + sizeof(ENHMETAHEADER) + data_size); @@ -991,8 +986,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, data_size, data + sizeof(DWORD) + sizeof(ENHMETAHEADER)); memcpy(data + sizeof(DWORD), data + sizeof(DWORD) + sizeof(ENHMETAHEADER), sizeof(ENHMETAHEADER)); data_size += sizeof(DWORD) + sizeof(ENHMETAHEADER); - if (hr == S_OK && data_size) - hr = IStream_Write(stream, data, data_size, NULL); + hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f42ebe2..fe45c6a 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4226,35 +4226,64 @@ static void test_data_cache_save_data(void) { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 3, 3, &CLSID_WineTest, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } } }, + /* without setting data */ { { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + }, + 3, 0, &CLSID_WineTest, + { + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + /* static picture clsids */ + { + { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_Dib, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } + } + }, + { + { + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + }, + 1, 1, &CLSID_Picture_Metafile, + { + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, { { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_EnhMetafile, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, + /* static picture clsids without setting any data */ { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_Picture_Dib, + 1, 0, &CLSID_Picture_Dib, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4263,7 +4292,7 @@ static void test_data_cache_save_data(void) { { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, }, - 1, 1, &CLSID_Picture_Metafile, + 1, 0, &CLSID_Picture_Metafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4272,7 +4301,7 @@ static void test_data_cache_save_data(void) { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_Picture_EnhMetafile, + 1, 0, &CLSID_Picture_EnhMetafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } }

1 0

Sergio Gómez Del Real : ole32: Correctly save the dib format if its data has not been set.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 179daf67a82945ee41f45f24d4bbf8f31fc2d7d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179daf67a82945ee41f45f24d… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Dec 14 13:17:37 2017 +0000 ole32: Correctly save the dib format if its data has not been set. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 75c9611..ae05b8e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -792,8 +792,14 @@ static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *he static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) { HRESULT hr = S_OK; - int data_size = GlobalSize(entry->stgmedium.u.hGlobal); - BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal); + int data_size = 0; + BITMAPINFO *bmi = NULL; + + if (entry->stgmedium.tymed != TYMED_NULL) + { + data_size = GlobalSize(entry->stgmedium.u.hGlobal); + bmi = GlobalLock(entry->stgmedium.u.hGlobal); + } if (!contents) {

1 0

Dmitry Timoshkov : secur32/tests: Add a test for Schannel behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: dfb09f480780107d6b1c9beb7dadf85db4aadc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb09f480780107d6b1c9beb7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 14 17:19:06 2017 +0800 secur32/tests: Add a test for Schannel behaviour with SECPKG_ATTR_NEGOTIATION_INFO query. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b5ed169..21ebb62 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -686,6 +686,7 @@ static void test_communication(void) SecPkgContext_ConnectionInfo conn_info; SecPkgContext_KeyInfoA key_info; CERT_CONTEXT *cert; + SecPkgContext_NegotiationInfoA info; SecBufferDesc buffers[2]; SecBuffer *buf; @@ -939,6 +940,9 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status); + status = QueryContextAttributesA(&context, SECPKG_ATTR_NEGOTIATION_INFO, &info); + ok(status == SEC_E_UNSUPPORTED_FUNCTION, "QueryContextAttributesA returned %08x\n", status); + reset_buffers(&buffers[0]); /* Send a simple request so we get data for testing DecryptMessage */

1 0

Dmitry Timoshkov : secur32/tests: Add a test for NTLM behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 09f6e200d9b220e28a98a74f466d69bb243c9e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f6e200d9b220e28a98a74f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 14 17:18:04 2017 +0800 secur32/tests: Add a test for NTLM behaviour with SECPKG_ATTR_NEGOTIATION_INFO query. To show that QueryContextAttributes(SECPKG_ATTR_NEGOTIATION_INFO) allocates flat memory block for the PackageInfo structure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 355af5a..c060420 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -36,6 +36,29 @@ #include "wine/test.h" +#define NEGOTIATE_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_GSS_COMPATIBLE | \ + SECPKG_FLAG_LOGON ) + +#define NTLM_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON ) + static HMODULE secdll; static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID pv); @@ -797,6 +820,8 @@ static void testAuth(ULONG data_rep, BOOL fake) SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; + SecPkgContext_NegotiationInfoA info; + SecPkgInfoA *pi; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { @@ -889,6 +914,41 @@ static void testAuth(ULONG data_rep, BOOL fake) "cbBlockSize should be 0 but is %u\n", ctxt_sizes.cbBlockSize); + memset(&info, 0, sizeof(info)); + sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info); +todo_wine + ok(sec_status == SEC_E_OK, "QueryContextAttributesA returned %08x\n", sec_status); + + pi = info.PackageInfo; + ok(info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState); +todo_wine + ok(pi != NULL, "expected non-NULL PackageInfo\n"); + if (pi) + { + UINT expected, got; + char *eob; + + ok(pi->fCapabilities == NTLM_BASE_CAPS || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), + "got %08x\n", pi->fCapabilities); + ok(pi->wVersion == 1, "got %u\n", pi->wVersion); + ok(pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID); + ok(!lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name); + + expected = sizeof(*pi) + lstrlenA(pi->Name) + 1 + lstrlenA(pi->Comment) + 1; + got = HeapSize(GetProcessHeap(), 0, pi); + ok(got == expected, "got %u, expected %u\n", got, expected); + eob = (char *)pi + expected; + ok(pi->Name + lstrlenA(pi->Name) < eob, "Name doesn't fit into allocated block\n"); + ok(pi->Comment + lstrlenA(pi->Comment) < eob, "Comment doesn't fit into allocated block\n"); + + sec_status = FreeContextBuffer(pi); + ok(sec_status == SEC_E_OK, "FreeContextBuffer error %#x\n", sec_status); + } + tAuthend: cleanupBuffers(&client); cleanupBuffers(&server);

1 0

Dmitry Timoshkov : secur32/tests: Add a test for Negotiate behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 8d4d7c7251e6f0279757a6f0cba0a654db5fb9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4d7c7251e6f0279757a6f0c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 14 17:17:02 2017 +0800 secur32/tests: Add a test for Negotiate behaviour with SECPKG_ATTR_NEGOTIATION_INFO query. To show that QueryContextAttributes(SECPKG_ATTR_NEGOTIATION_INFO) allocates flat memory block for the PackageInfo structure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/negotiate.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index a1c430d..2f1228c 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -284,13 +284,16 @@ static void test_authentication(void) memset( &info, 0, sizeof(info) ); status_c = QueryContextAttributesA( &client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info ); - ok( status_c == SEC_E_OK, "pQueryContextAttributesA returned %08x\n", status_c ); + ok( status_c == SEC_E_OK, "QueryContextAttributesA returned %08x\n", status_c ); pi = info.PackageInfo; ok( info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState ); ok( pi != NULL, "expected non-NULL PackageInfo\n" ); if (pi) { + UINT expected, got; + char *eob; + ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || @@ -300,6 +303,19 @@ static void test_authentication(void) ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); ok( pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID ); ok( !lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name ); + + expected = sizeof(*pi) + lstrlenA(pi->Name) + 1 + lstrlenA(pi->Comment) + 1; + got = HeapSize(GetProcessHeap(), 0, pi); +todo_wine + ok( got == expected, "got %u, expected %u\n", got, expected ); + eob = (char *)pi + expected; +todo_wine + ok( pi->Name + lstrlenA(pi->Name) < eob, "Name doesn't fit into allocated block\n" ); +todo_wine + ok( pi->Comment + lstrlenA(pi->Comment) < eob, "Comment doesn't fit into allocated block\n" ); + + status = FreeContextBuffer( pi ); + ok( status == SEC_E_OK, "FreeContextBuffer error %#x\n", status ); } done:

1 0

Martin Payne : user.exe16: Fix handling of 16-bit HBITMAPs in InsertMenu16.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 81fb745e407fa297fdb8167d4f3b8acbe327308c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fb745e407fa297fdb8167d4… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:24:32 2017 +0000 user.exe16: Fix handling of 16-bit HBITMAPs in InsertMenu16. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 729e973..f7d4109 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2405,6 +2405,10 @@ BOOL16 WINAPI InsertMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags, if ((pos == (UINT16)-1) && (flags & MF_BYPOSITION)) pos32 = (UINT)-1; if (IS_MENU_STRING_ITEM(flags) && data) return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, MapSL(data) ); + + /* If "data" is an HBITMAP, the high WORD will contain the application's DGROUP selector if the + * application cast (LPSTR)hBitmap rather than (LPSTR)(LONG)hBitmap. */ + if (flags & MF_BITMAP) data = (SEGPTR)HBITMAP_32(LOWORD(data)); return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, (LPSTR)data ); }

1 0

Zebediah Figura : po: Fix some MSI translations.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: b9f32e16722fab5c6b9acf3e99c8a4720c7e14b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f32e16722fab5c6b9acf3e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 13 18:39:59 2017 -0600 po: Fix some MSI translations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 16 ++++------------ po/bg.po | 4 +--- po/ca.po | 16 ++++------------ po/cs.po | 16 ++++------------ po/da.po | 16 ++++------------ po/el.po | 4 +--- po/eo.po | 12 +++--------- po/es.po | 16 ++++------------ po/fr.po | 16 ++++------------ po/he.po | 12 +++--------- po/hr.po | 16 ++++------------ po/hu.po | 16 ++++------------ po/it.po | 16 ++++------------ po/ko.po | 16 ++++------------ po/nb_NO.po | 12 ++++++------ po/nl.po | 16 ++++------------ po/pl.po | 12 ++++-------- po/pt_BR.po | 16 ++++------------ po/pt_PT.po | 16 ++++------------ po/ro.po | 16 ++++------------ po/sk.po | 4 +--- po/sl.po | 16 ++++------------ po/sr_RS(a)cyrillic.po | 12 +++--------- po/sr_RS(a)latin.po | 11 +++-------- po/sv.po | 16 ++++------------ po/th.po | 4 +--- po/uk.po | 24 ++++++------------------ po/wa.po | 7 ++----- po/zh_CN.po | 8 ++++---- po/zh_TW.po | 16 ++++------------ 30 files changed, 106 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9f32e16722fab5c6b9ac…

1 0

Alexandre Julliard : ntdll: Fix handling of floating point arguments in relay debugging on ARM.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 5e3534ee411a8c5baea5022705eac0e3c7f3cc70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3534ee411a8c5baea502270… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 11:44:57 2017 +0100 ntdll: Fix handling of floating point arguments in relay debugging on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 114 ++++++++++++++++++++++++++++++++++------------- tools/winebuild/spec32.c | 16 +++---- 2 files changed, 92 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 5d78420..a0c3cb1 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -468,6 +468,10 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi struct relay_private_data *data = descr->private; struct relay_entry_point *entry_point = data->entry_points + ordinal; unsigned int i, pos; +#ifndef __SOFTFP__ + unsigned int float_pos = 0, double_pos = 0; + const union fpregs { float s[16]; double d[8]; } *fpstack = (const union fpregs *)stack - 1; +#endif TRACE( "\1Call %s(", func_name( data, ordinal )); @@ -476,6 +480,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi switch (arg_types[i]) { case 'j': /* int64 */ + pos = (pos + 1) & ~1; TRACE( "%x%08x", stack[pos+1], stack[pos] ); pos += 2; break; @@ -489,6 +494,30 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi case 'w': /* wstr */ trace_string_w( stack[pos++] ); break; + case 'f': /* float */ +#ifndef __SOFTFP__ + if (!(float_pos % 2)) float_pos = max( float_pos, double_pos * 2 ); + if (float_pos < 16) + { + TRACE( "%g", fpstack->s[float_pos++] ); + break; + } +#endif + TRACE( "%g", *(const float *)&stack[pos++] ); + break; + case 'd': /* double */ +#ifndef __SOFTFP__ + double_pos = max( (float_pos + 1) / 2, double_pos ); + if (double_pos < 8) + { + TRACE( "%g", fpstack->d[double_pos++] ); + break; + } +#endif + pos = (pos + 1) & ~1; + TRACE( "%g", *(const double *)&stack[pos] ); + pos += 2; + break; case 'i': /* long */ default: TRACE( "%08x", stack[pos++] ); @@ -496,6 +525,14 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi } if (!is_ret_val( arg_types[i+1] )) TRACE( "," ); } + +#ifndef __SOFTFP__ + if (float_pos || double_pos) + { + pos |= 0x80000000; + stack = (const DWORD *)fpstack; /* retaddr is below the fp regs */ + } +#endif *nb_args = pos; TRACE( ") ret=%08x\n", stack[-1] ); return entry_point->orig_func; @@ -519,39 +556,56 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne TRACE( " retval=%08x ret=%08x\n", (UINT)retval, retaddr ); } -extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const DWORD *args ); -__ASM_GLOBAL_FUNC( call_entry_point, +extern LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const DWORD *stack ); +__ASM_GLOBAL_FUNC( relay_call, ".arm\n\t" - "push {r4, r5, LR}\n\t" - "mov r4, r0\n\t" - "mov r5, SP\n\t" + "push {r4-r8,lr}\n\t" + "sub sp, #16\n\t" + "mov r6, r2\n\t" + "add r3, sp, #12\n\t" + "mov r7, r0\n\t" + "mov r8, r1\n\t" + "bl " __ASM_NAME("relay_trace_entry") "\n\t" + "mov ip, r0\n\t" /* entry point */ + "mov r5, sp\n\t" + "ldr r1, [sp, #12]\n\t" /* number of args */ "lsl r3, r1, #2\n\t" - "sub SP, SP, r3\n\t" - "and SP, SP, #~7\n" - "1:\tsub r3, r3, #4\n\t" + "subs r3, #16\n\t" /* first 4 args are in registers */ + "ble 2f\n\t" + "sub sp, r3\n\t" + "and sp, #~7\n" + "add r2, r6, #16\n\t" /* skip r0-r3 */ + "1:\tsubs r3, r3, #4\n\t" "ldr r0, [r2, r3]\n\t" - "str r0, [SP, r3]\n\t" - "cmp r3, #0\n\t" - "bgt 1b\n\t" - "cmp r1, #0\n\t" - "beq 3f\n\t" - "cmp r1, #2\n\t" - "bgt 2f\n\t" - "pop {r0-r1}\n\t" - "b 3f\n" - "2:\tpop {r0-r3}\n" - "3:\tblx r4\n\t" - "mov SP, r5\n\t" - "pop {r4, r5, PC}" ) - -static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const DWORD *stack ) -{ - unsigned int nb_args; - void *func = relay_trace_entry( descr, idx, stack, &nb_args ); - LONGLONG ret = call_entry_point( func, nb_args, stack ); - relay_trace_exit( descr, idx, stack[-1], ret ); - return ret; -} + "str r0, [sp, r3]\n\t" + "bgt 1b\n" + "2:\t" +#ifndef __SOFTFP__ + "tst r1, #0x80000000\n\t" + "ldm r6, {r0-r3}\n\t" + "vldmdbne r6!, {s0-s15}\n\t" +#else + "ldm r6, {r0-r3}\n\t" +#endif + "blx ip\n\t" + "mov sp, r5\n\t" + "ldr r2, [r6, #-4]\n\t" /* retaddr */ + "mov r4, r0\n\t" + "mov r5, r1\n\t" + "mov r0, r7\n\t" + "mov r1, r8\n\t" + "strd r4, [sp]\n\t" +#ifndef __SOFTFP__ + "vstr d0, [sp, #8]\n\t" /* preserve floating point retval */ + "bl " __ASM_NAME("relay_trace_exit") "\n\t" + "vldr d0, [sp, #8]\n\t" +#else + "bl " __ASM_NAME("relay_trace_exit") "\n\t" +#endif + "mov r0, r4\n\t" + "mov r1, r5\n\t" + "add sp, #16\n\t" + "pop {r4-r8,pc}" ) #elif defined(__aarch64__) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index d028726..3552eca 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -255,16 +255,16 @@ static void output_relay_debug( DLLSPEC *spec ) case CPU_ARM: { unsigned int mask, val, count = 0; - unsigned int stack_size = min( 16, (get_args_size( odp ) + 7) & ~7 ); + int j, has_float = 0; + + if (strcmp( float_abi_option, "soft" )) + for (j = 0; j < odp->u.func.nb_args && !has_float; j++) + has_float = is_float_arg( odp, j ); val = (odp->u.func.args_str_offset << 16) | (i - spec->base); - switch (stack_size) - { - case 16: output( "\tpush {r0-r3}\n" ); break; - case 8: output( "\tpush {r0-r1}\n" ); break; - case 0: break; - } + output( "\tpush {r0-r3}\n" ); output( "\tmov r2, SP\n"); + if (has_float) output( "\tvpush {s0-s15}\n" ); output( "\tpush {LR}\n" ); output( "\tsub SP, #4\n"); for (mask = 0xff; mask; mask <<= 8) @@ -275,7 +275,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tldr IP, [r0, #4]\n"); output( "1:\tblx IP\n"); output( "\tldr IP, [SP, #4]\n" ); - output( "\tadd SP, #%u\n", stack_size + 8 ); + output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) ); output( "\tbx IP\n"); output( "2:\t.long .L__wine_spec_relay_descr-1b\n" ); break;

1 0

Alexandre Julliard : ntdll: Run the thread/ process detach code on the thread stack.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 7e9f1878dbaa5729c47b3b373e20fc22d2311a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9f1878dbaa5729c47b3b373… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 10:54:56 2017 +0100 ntdll: Run the thread/process detach code on the thread stack. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 3 ++- dlls/ntdll/signal_arm.c | 12 ++++++------ dlls/ntdll/signal_arm64.c | 12 ++++++------ dlls/ntdll/signal_i386.c | 12 ++++++------ dlls/ntdll/signal_powerpc.c | 12 ++++++------ dlls/ntdll/signal_x86_64.c | 12 ++++++------ dlls/ntdll/thread.c | 24 ++++++++++++++---------- 7 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index c9c79fb..80bca0c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -69,6 +69,8 @@ extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend ) DECLSPEC_HIDDEN; extern void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern HANDLE thread_init(void) DECLSPEC_HIDDEN; @@ -86,7 +88,6 @@ extern void server_init_process(void) DECLSPEC_HIDDEN; extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern size_t server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN; -extern void DECLSPEC_NORETURN terminate_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN exit_thread( int status ) DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 64ff1e0..dcb4564 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1233,7 +1233,7 @@ static void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - exit_thread( entry( arg )); + RtlExitUserThread( entry( arg )); } __EXCEPT(unhandled_exception_filter) { @@ -1302,19 +1302,19 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) } /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { exit_thread( status ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - terminate_thread( status ); + exit( status ); } /********************************************************************** diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 6905ab4..a04fe93 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -965,7 +965,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - exit_thread( entry( arg )); + RtlExitUserThread( entry( arg )); } __EXCEPT(unhandled_exception_filter) { @@ -1034,19 +1034,19 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) } /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { exit_thread( status ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - terminate_thread( status ); + exit( status ); } /********************************************************************** diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 351b67c..4be573e 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2989,21 +2989,21 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { if (!x86_thread_data()->exit_frame) exit_thread( status ); call_thread_exit_func( status, exit_thread, x86_thread_data()->exit_frame ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - if (!x86_thread_data()->exit_frame) terminate_thread( status ); - call_thread_exit_func( status, terminate_thread, x86_thread_data()->exit_frame ); + if (!x86_thread_data()->exit_frame) exit( status ); + call_thread_exit_func( status, exit, x86_thread_data()->exit_frame ); } /********************************************************************** diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 234fdc4..3182a13 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1143,7 +1143,7 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * __TRY { TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", entry, arg ); - exit_thread( entry( arg )); + RtlExitUserThread( entry( arg )); } __EXCEPT(unhandled_exception_filter) { @@ -1212,19 +1212,19 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) } /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { exit_thread( status ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - terminate_thread( status ); + exit( status ); } /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c955c4c..1f76640 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4160,21 +4160,21 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) /*********************************************************************** - * RtlExitUserThread (NTDLL.@) + * signal_exit_thread */ -void WINAPI RtlExitUserThread( ULONG status ) +void signal_exit_thread( int status ) { if (!amd64_thread_data()->exit_frame) exit_thread( status ); call_thread_exit_func( status, exit_thread, amd64_thread_data()->exit_frame ); } /*********************************************************************** - * abort_thread + * signal_exit_process */ -void abort_thread( int status ) +void signal_exit_process( int status ) { - if (!amd64_thread_data()->exit_frame) terminate_thread( status ); - call_thread_exit_func( status, terminate_thread, amd64_thread_data()->exit_frame ); + if (!amd64_thread_data()->exit_frame) exit( status ); + call_thread_exit_func( status, exit, amd64_thread_data()->exit_frame ); } /********************************************************************** diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7b726ab..6abfd85 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -426,13 +426,21 @@ static void free_thread_data( TEB *teb ) /*********************************************************************** - * terminate_thread + * abort_thread */ -void terminate_thread( int status ) +void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); + signal_exit_thread( status ); +} + +/*********************************************************************** + * exit_thread + */ +void exit_thread( int status ) +{ close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); @@ -442,9 +450,9 @@ void terminate_thread( int status ) /*********************************************************************** - * exit_thread + * RtlExitUserThread (NTDLL.@) */ -void exit_thread( int status ) +void WINAPI RtlExitUserThread( ULONG status ) { static void *prev_teb; TEB *teb; @@ -463,7 +471,7 @@ void exit_thread( int status ) if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) { LdrShutdownProcess(); - exit( status ); + signal_exit_process( status ); } LdrShutdownThread(); @@ -482,11 +490,7 @@ void exit_thread( int status ) } } - close( ntdll_get_thread_data()->wait_fd[0] ); - close( ntdll_get_thread_data()->wait_fd[1] ); - close( ntdll_get_thread_data()->reply_fd ); - close( ntdll_get_thread_data()->request_fd ); - pthread_exit( UIntToPtr(status) ); + signal_exit_thread( status ); }

1 0

Nikolay Sivov : comctl32/tests: Add Static control tests.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: c170a483232f8ecf89e0d12408bd7a70730fdf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c170a483232f8ecf89e0d1240… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:21 2017 +0300 comctl32/tests: Add Static control tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/static.c | 177 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index ad298f8..36d77f0 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ progress.c \ propsheet.c \ rebar.c \ + static.c \ status.c \ subclass.c \ syslink.c \ diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c new file mode 100644 index 0000000..890fcf5 --- /dev/null +++ b/dlls/comctl32/tests/static.c @@ -0,0 +1,177 @@ +/* Unit test suite for static controls. + * + * Copyright 2007 Google (Mikolaj Zalewski) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +#include "v6util.h" + +#define TODO_COUNT 1 + +#define CTRL_ID 1995 + +static HWND hMainWnd; +static int g_nReceivedColorStatic; + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + +static HWND create_static(DWORD style) +{ + return CreateWindowA("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); +} + +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wparam; + HRGN hrgn = CreateRectRgn(0, 0, 1, 1); + ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n"); + DeleteObject(hrgn); + g_nReceivedColorStatic++; + return (LRESULT) GetStockObject(BLACK_BRUSH); + } + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_updates(int style, int flags) +{ + HWND hStatic = create_static(style); + RECT r1 = {20, 20, 30, 30}; + int exp; + + flush_events(); + g_nReceivedColorStatic = 0; + /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ + InvalidateRect(hMainWnd, NULL, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hMainWnd, &r1, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hStatic, &r1, FALSE); + UpdateWindow(hStatic); + InvalidateRect(hStatic, NULL, FALSE); + UpdateWindow(hStatic); + + if ((style & SS_TYPEMASK) == SS_BITMAP) + { + HDC hdc = GetDC(hStatic); + COLORREF colour = GetPixel(hdc, 10, 10); + todo_wine + ok(colour == 0, "Unexpected pixel color.\n"); + ReleaseDC(hStatic, hdc); + } + + if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) + exp = 4; + else + exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + + if (flags & TODO_COUNT) + todo_wine + ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) + ok(g_nReceivedColorStatic == exp, "Unexpected %u got %u\n", exp, g_nReceivedColorStatic); + else + ok(g_nReceivedColorStatic == exp, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + DestroyWindow(hStatic); +} + +static void test_set_text(void) +{ + HWND hStatic = create_static(SS_SIMPLE); + char buffA[10]; + + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(!strcmp(buffA, "Test"), "got wrong text %s\n", buffA); + + SetWindowTextA(hStatic, NULL); + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(buffA[0] == 0, "got wrong text %s\n", buffA); + + DestroyWindow(hStatic); +} + +START_TEST(static) +{ + static const char classname[] = "testclass"; + WNDCLASSEXA wndclass; + ULONG_PTR ctx_cookie; + HANDLE hCtx; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + wndclass.cbSize = sizeof(wndclass); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wndclass.hbrBackground = GetStockObject(WHITE_BRUSH); + wndclass.lpszClassName = classname; + wndclass.lpszMenuName = NULL; + RegisterClassExA(&wndclass); + + hMainWnd = CreateWindowA(classname, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, + GetModuleHandleA(NULL), NULL); + ShowWindow(hMainWnd, SW_SHOW); + + test_updates(0, 0); + test_updates(SS_SIMPLE, 0); + test_updates(SS_ICON, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); + test_updates(SS_BLACKRECT, TODO_COUNT); + test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, TODO_COUNT); + test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_set_text(); + + DestroyWindow(hMainWnd); + + unload_v6_module(ctx_cookie, hCtx); +}

1 0

Nikolay Sivov : comctl32/tests: Add ComboBox tests.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 0b907389cf6e22c7708b69ebe2a44804f88a61e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b907389cf6e22c7708b69ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:20 2017 +0300 comctl32/tests: Add ComboBox tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 639 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 614 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b907389cf6e22c7708b6…

1 0

Nikolay Sivov : comctl32/tests: Rename test file.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: d6c6790cb1157d5f4114df706fa37fb854c0f7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c6790cb1157d5f4114df706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:50:19 2017 +0300 comctl32/tests: Rename test file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/{comboex.c => combo.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 5faf1f8..ad298f8 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = comctl32 ole32 user32 gdi32 advapi32 C_SRCS = \ animate.c \ button.c \ - comboex.c \ + combo.c \ datetime.c \ dpa.c \ header.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/combo.c similarity index 99% rename from dlls/comctl32/tests/comboex.c rename to dlls/comctl32/tests/combo.c index fede917..4504ce9 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/combo.c @@ -594,7 +594,7 @@ static void test_get_set_item(void) DestroyWindow(hComboEx); } -START_TEST(comboex) +START_TEST(combo) { if (!init()) return;

1 0

Nikolay Sivov : user32/tests: Release window DCs consistently.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 0a953f117a068080f69acd7c60a72f852377d7c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a953f117a068080f69acd7c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 14 09:48:08 2017 +0300 user32/tests: Release window DCs consistently. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 ++ dlls/user32/tests/static.c | 1 + dlls/user32/tests/sysparams.c | 3 ++- dlls/user32/tests/win.c | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 61b32e0..211376b 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1070,6 +1070,8 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); + + ReleaseDC(NULL, hdc); } static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 929b50d..8776c3a 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -99,6 +99,7 @@ static void test_updates(int style, int flags) HDC hdc = GetDC( hStatic); COLORREF colour = GetPixel( hdc, 10, 10); ok ( colour != 0, "pixel should NOT be painted black!\n"); + ReleaseDC(hStatic, hdc); } if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fa473c1..5dd8e58 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2918,7 +2918,8 @@ static void test_GetSystemMetrics( void) trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } - ReleaseDC( 0, hdc); + + DeleteDC(hdc); } static void test_EnumDisplaySettings(void) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e72cbc..db27b6b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5242,6 +5242,7 @@ static void test_scrolldc( HWND parent) if (winetest_debug > 0) dump_region(hrgn); /* clean up */ + ReleaseDC(hwnd1, hdc); DeleteObject(hrgn); DeleteObject(exprgn); DeleteObject(tmprgn);

1 0

Alex Henrie : include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 224d284f99416ef5b56cd36284d289447a7f5edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=224d284f99416ef5b56cd3628… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 13 23:23:28 2017 -0700 include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/exception.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 5bc4d1c..8e3f481 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -61,10 +61,12 @@ extern "C" { * use GetExceptionInformation() and GetExceptionCode() to retrieve the * exception info. * - * Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements - * break out of the current block. You cannot use 'return', 'goto' - * or 'longjmp' to leave a __TRY block, as this will surely crash. - * You can use them to leave a __EXCEPT block though. + * Warning: Inside a __TRY or __EXCEPT block, 'break' or 'continue' statements + * break out of the current block, but avoid using them because they + * won't work when compiling with native exceptions. You cannot use + * 'return', 'goto', or 'longjmp' to leave a __TRY block either, as + * this will surely crash. You can use 'return', 'goto', or 'longjmp' + * to leave an __EXCEPT block though. * * -- AJ */

1 0

Henri Verbeet : include: Remove some superfluous semicolons.
by Alexandre Julliard 14 Dec '17

14 Dec '17

1 0

Józef Kucia : libs/vkd3d-shader: Avoid theoretical crash in vkd3d_dxbc_compiler_emit_dot().
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 7ee3a02f9230b52c54df4bf55418901589072b86 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=7ee3a02f9230b52c54df4bf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:59 2017 +0100 libs/vkd3d-shader: Avoid theoretical crash in vkd3d_dxbc_compiler_emit_dot(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0684cd3..e749873 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3806,7 +3806,7 @@ static void vkd3d_dxbc_compiler_emit_dot(struct vkd3d_dxbc_compiler *compiler, write_mask = VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_1; assert(instruction->src_count == ARRAY_SIZE(src_ids)); - for (i = 0; i < instruction->src_count; ++i) + for (i = 0; i < ARRAY_SIZE(src_ids); ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], write_mask); type_id = vkd3d_spirv_get_type_id(builder,

1 0

Józef Kucia : tests: Explicitly detect if tests are run under Wine.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: a285b4c842aeb7b2b666e3c763083ef105c4b786 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=a285b4c842aeb7b2b666e3c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:58 2017 +0100 tests: Explicitly detect if tests are run under Wine. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index f4a1627..888436a 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -237,6 +237,12 @@ static char *vkd3d_test_strdupWtoA(WCHAR *str) return out; } +static bool running_under_wine(void) +{ + HMODULE module = GetModuleHandleA("ntdll.dll"); + return module && GetProcAddress(module, "wine_server_call"); +} + int wmain(int argc, WCHAR **wargv) { char **argv; @@ -251,7 +257,7 @@ int wmain(int argc, WCHAR **wargv) } assert(i == argc); - vkd3d_test_platform = "windows"; + vkd3d_test_platform = running_under_wine() ? "wine" : "windows"; ret = main(argc, argv);

1 0

Józef Kucia : tests: Detect test platform dynamically.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 3956eaf6d00b4a3caeac1f98bc7b667363f7e5a7 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=3956eaf6d00b4a3caeac1f98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:57 2017 +0100 tests: Detect test platform dynamically. In order to run cross-compiled tests under Wine. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 56 +++++++++++++++++++++++++++++++++----------- tests/d3d12.c | 11 +++++---- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index c66b227..f4a1627 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -30,6 +30,7 @@ static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; +static const char *vkd3d_test_platform = "other"; #define START_TEST(name) \ static const char *vkd3d_test_name = #name; \ @@ -53,13 +54,8 @@ static const char *vkd3d_test_name; unsigned int vkd3d_line = line; \ VKD3D_TEST_TODO -#ifdef _WIN32 -# define VKD3D_TEST_TODO(args...) \ - vkd3d_test_ok(vkd3d_line, args); } while (0) -#else # define VKD3D_TEST_TODO(args...) \ vkd3d_test_todo(vkd3d_line, args); } while (0) -#endif /* _WIN32 */ #define skip_(line) \ do { \ @@ -88,8 +84,14 @@ static struct unsigned int debug_level; } vkd3d_test_state; -static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED -vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) +static bool +vkd3d_test_platform_is_windows(void) +{ + return !strcmp(vkd3d_test_platform, "windows"); +} + +static void +vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { if (result) { @@ -99,33 +101,44 @@ vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) } else { - va_list args; - va_start(args, fmt); printf("%s:%d: Test failed: ", vkd3d_test_name, line); vprintf(fmt, args); - va_end(args); InterlockedIncrement(&vkd3d_test_state.failure_count); } } static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED +vkd3d_test_ok(unsigned int line, bool result, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_test_check_ok(line, result, fmt, args); + va_end(args); +} + +static void VKD3D_PRINTF_FUNC(3, 4) VKD3D_UNUSED vkd3d_test_todo(unsigned int line, bool result, const char *fmt, ...) { va_list args; - if (result) + va_start(args, fmt); + if (vkd3d_test_platform_is_windows()) + { + vkd3d_test_check_ok(line, result, fmt, args); + } + else if (result) { printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_success_count); } else { printf("%s:%d: Todo: ", vkd3d_test_name, line); + vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_count); } - - va_start(args, fmt); - vprintf(fmt, args); va_end(args); } @@ -177,10 +190,20 @@ vkd3d_test_debug(const char *fmt, ...) int main(int argc, char **argv) { const char *debug_level = getenv("VKD3D_TEST_DEBUG"); + char *test_platform = getenv("VKD3D_TEST_PLATFORM"); memset(&vkd3d_test_state, 0, sizeof(vkd3d_test_state)); vkd3d_test_state.debug_level = !debug_level ? 0 : atoi(debug_level); + if (test_platform) + { + test_platform = strdup(test_platform); + vkd3d_test_platform = test_platform; + } + + if (vkd3d_test_state.debug_level > 1) + printf("Test platform: '%s'.\n", vkd3d_test_platform); + vkd3d_test_main(argc, argv); printf("%s: %lu tests executed (%lu failures, %lu skipped, %lu todo).\n", @@ -193,6 +216,9 @@ int main(int argc, char **argv) (unsigned long)vkd3d_test_state.skip_count, (unsigned long)vkd3d_test_state.todo_count); + if (test_platform) + free(test_platform); + return vkd3d_test_state.failure_count || vkd3d_test_state.todo_success_count; } @@ -225,6 +251,8 @@ int wmain(int argc, WCHAR **wargv) } assert(i == argc); + vkd3d_test_platform = "windows"; + ret = main(argc, argv); for (i = 0; i < argc; ++i) diff --git a/tests/d3d12.c b/tests/d3d12.c index caf94d2..1d8e625 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5193,11 +5193,12 @@ static void test_bundle_state_inheritance(void) unsigned int x, y; HRESULT hr; -#ifndef _WIN32 - /* Avoid 2048 test todos. */ - skip("Bundles are not implemented yet.\n"); - return; -#endif + if (!vkd3d_test_platform_is_windows()) + { + /* Avoid 2048 test todos. */ + skip("Bundles are not implemented yet.\n"); + return; + } if (use_warp_device) {

1 0

Józef Kucia : libs/vkd3d-shader: Introduce vkd3d_dxbc_compiler_get_constant_uint_vector() helper.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 006f36c2ac79e12235c422d8bc22d3511cbb210d URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=006f36c2ac79e12235c422d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:56 2017 +0100 libs/vkd3d-shader: Introduce vkd3d_dxbc_compiler_get_constant_uint_vector() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc07d96..0684cd3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2078,6 +2078,13 @@ static uint32_t vkd3d_dxbc_compiler_get_constant_float(struct vkd3d_dxbc_compile return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_FLOAT, 1, (uint32_t *)&value); } +static uint32_t vkd3d_dxbc_compiler_get_constant_uint_vector(struct vkd3d_dxbc_compiler *compiler, + uint32_t value, unsigned int component_count) +{ + const uint32_t values[] = {value, value, value, value}; + return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, values); +} + static uint32_t vkd3d_dxbc_compiler_get_constant_float_vector(struct vkd3d_dxbc_compiler *compiler, float value, unsigned int component_count) { @@ -2624,7 +2631,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler enum vkd3d_shader_conditional_op condition, unsigned int component_count, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - static const uint32_t zero[VKD3D_VEC4_SIZE]; uint32_t type_id; SpvOp op; @@ -2633,20 +2639,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_BOOL, component_count); op = condition & VKD3D_SHADER_CONDITIONAL_OP_Z ? SpvOpIEqual : SpvOpINotEqual; return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, op, type_id, val_id, - vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, zero)); + vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0, component_count)); } static uint32_t vkd3d_dxbc_compiler_emit_bool_to_int(struct vkd3d_dxbc_compiler *compiler, unsigned int component_count, uint32_t val_id) { - static const uint32_t d3d_true[] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}; - static const uint32_t d3d_false[] = {0, 0, 0, 0}; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, true_id, false_id; - true_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, d3d_true); - false_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, d3d_false); + true_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0xffffffff, component_count); + false_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0, component_count); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, component_count); return vkd3d_spirv_build_op_select(builder, type_id, val_id, true_id, false_id); } @@ -3885,9 +3888,7 @@ static void vkd3d_dxbc_compiler_emit_imad(struct vkd3d_dxbc_compiler *compiler, static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - static const uint32_t ffffffff[] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}; - - uint32_t type_id, val_id, src0_id, src1_id, condition_id, ffffffff_id; + uint32_t type_id, val_id, src0_id, src1_id, condition_id, uint_max_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; @@ -3904,12 +3905,12 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - ffffffff_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_UINT, component_count, ffffffff); + uint_max_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, + 0xffffffff, component_count); val_id = vkd3d_spirv_build_op_udiv(builder, type_id, src0_id, src1_id); /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ - val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, ffffffff_id); + val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, &dst[0], val_id); } @@ -3927,13 +3928,13 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - ffffffff_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_UINT, component_count, ffffffff); + uint_max_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, + 0xffffffff, component_count); } val_id = vkd3d_spirv_build_op_umod(builder, type_id, src0_id, src1_id); /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ - val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, ffffffff_id); + val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, &dst[1], val_id); }

1 0

Józef Kucia : build: Use AC_USE_SYSTEM_EXTENSIONS instead of ugly AC_EGREP_CPP test.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: ad8e27166ac564583e1fff0c76888f597ab6f792 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=ad8e27166ac564583e1fff0c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:55 2017 +0100 build: Use AC_USE_SYSTEM_EXTENSIONS instead of ugly AC_EGREP_CPP test. In order to use C functions which are not part of C99, e.g. strdup() and strncmp(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index a4db072..27c03a6 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_USE_SYSTEM_EXTENSIONS + dnl Check for progs AM_PROG_AR AC_PROG_CC @@ -29,7 +31,7 @@ LT_PREREQ([2.4.2]) LT_INIT dnl Check compiler specific flags -AC_SUBST([VKD3D_CFLAGS], [""]) +AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe" VKD3D_CHECK_CFLAGS([-std=c99]) @@ -39,17 +41,6 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) -AC_EGREP_CPP(yes, - [#define _POSIX_C_SOURCE 200809L - #include <unistd.h> - #ifdef _POSIX_VERSION - #if _POSIX_VERSION == 200809L - yes - #endif - #endif], - [AC_DEFINE([_POSIX_C_SOURCE], [200809L], [Define the POSIX version.])], - []) - dnl Check for cross compilers VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no])

1 0

Józef Kucia : tests: Make sure that config.h is included before other headers.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: d100804e912ba050121c866f5647186af437ce16 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=d100804e912ba050121c866f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:54 2017 +0100 tests: Make sure that config.h is included before other headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 3 +-- tests/d3d12.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 7eb72d3..c66b227 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -19,6 +19,7 @@ #ifndef __VKD3D_TEST_H #define __VKD3D_TEST_H +#include "vkd3d_common.h" #include <assert.h> #include <inttypes.h> #include <stdarg.h> @@ -27,8 +28,6 @@ #include <stdlib.h> #include <string.h> -#include "vkd3d_common.h" - static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; diff --git a/tests/d3d12.c b/tests/d3d12.c index 90f848f..caf94d2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36,11 +36,6 @@ typedef int HRESULT; #endif -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - #define COBJMACROS #define INITGUID #include "vkd3d_test.h" @@ -48,6 +43,11 @@ typedef int HRESULT; #define WIDL_C_INLINE_WRAPPERS #include "d3d12.h" +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + #ifdef _WIN32 # include "dxgi1_4.h" #else

1 0

Hans Leidekker : dplayx/tests: Remove the firewall exception after running the tests.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: ca9ca79d12e6e5031067d20d0afb30f34fc54759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ca79d12e6e5031067d20d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 13 13:59:37 2017 +0100 dplayx/tests: Remove the firewall exception after running the tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 0786d16..f4e7301 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6951,7 +6951,7 @@ START_TEST(dplayx) if (!winetest_interactive) { skip("Run in interactive mode to run all dplayx tests.\n"); - return; + goto done; } trace("Running in interactive mode, tests will take a while\n"); @@ -6991,6 +6991,8 @@ START_TEST(dplayx) test_remote_data_replication(); test_host_migration(); +done: FreeLibrary(module); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Alex Henrie : appwiz.cpl: Add comment explaining why we use HTTP instead of HTTPS.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 70366fcd9001ba05a058de193e750bb977c32cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70366fcd9001ba05a058de193… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 12 19:55:37 2017 -0700 appwiz.cpl: Add comment explaining why we use HTTP instead of HTTPS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5ec49cf..76f00a0 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -80,6 +80,9 @@ typedef struct { LPCWSTR dialog_template; } addon_info_t; +/* Download addon files over HTTP because Wine depends on an external library + * for TLS, so we can't be sure that HTTPS will work. The integrity of each file + * is checked with a hardcoded cryptographically secure hash. */ static const addon_info_t addons_info[] = { { GECKO_VERSION,

1 0

Henri Verbeet : d2d1/tests: Introduce an ARRAY_SIZE macro.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 1ddbab3f2773e550a8aaed04d99a9ff2796e1a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddbab3f2773e550a8aaed04d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 13 20:36:13 2017 +0330 d2d1/tests: Introduce an ARRAY_SIZE macro. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5116d78..af023a1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,6 +26,10 @@ #include "dwrite.h" #include "wincodec.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + struct resource_readback { ID3D10Resource *resource; @@ -1618,7 +1622,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget_Clear(rt, &color); ID2D1BitmapBrush_SetOpacity(brush, 1.0f); - for (i = 0; i < sizeof(extend_mode_tests) / sizeof(*extend_mode_tests); ++i) + for (i = 0; i < ARRAY_SIZE(extend_mode_tests); ++i) { ID2D1BitmapBrush_SetExtendModeX(brush, extend_mode_tests[i].extend_mode_x); extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); @@ -1776,7 +1780,7 @@ static void test_linear_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -1813,7 +1817,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -1886,7 +1890,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -1982,7 +1986,7 @@ static void test_radial_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -2025,7 +2029,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2100,7 +2104,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -3622,7 +3626,7 @@ static void test_bitmap_formats(void) bitmap_desc.dpiX = 96.0f; bitmap_desc.dpiY = 96.0f; - for (i = 0; i < sizeof(bitmap_formats) / sizeof(*bitmap_formats); ++i) + for (i = 0; i < ARRAY_SIZE(bitmap_formats); ++i) { for (j = 0; j < 4; ++j) { @@ -4406,7 +4410,7 @@ static void test_create_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(create_dpi_tests) / sizeof(*create_dpi_tests); ++i) + for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i) { ID2D1GdiInteropRenderTarget *interop; D2D1_RENDER_TARGET_PROPERTIES desc; @@ -4595,7 +4599,7 @@ todo_wine hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr); - for (i = 0; i < sizeof(antialias_mode_tests)/sizeof(*antialias_mode_tests); i++) + for (i = 0; i < ARRAY_SIZE(antialias_mode_tests); ++i) { IDWriteRenderingParams *rendering_params; @@ -4691,7 +4695,7 @@ static void test_dc_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(invalid_formats) / sizeof(*invalid_formats); ++i) + for (i = 0; i < ARRAY_SIZE(invalid_formats); ++i) { desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; desc.pixelFormat = invalid_formats[i]; @@ -5219,7 +5223,7 @@ static void test_stroke_style(void) desc.miterLimit = 1.5f; desc.dashOffset = 0.0f; - for (i = 0; i < sizeof(dash_style_tests)/sizeof(dash_style_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(dash_style_tests); ++i) { float dashes[10]; UINT dash_count; @@ -5232,7 +5236,7 @@ static void test_stroke_style(void) dash_count = ID2D1StrokeStyle_GetDashesCount(style); ok(dash_count == dash_style_tests[i].dash_count, "%u: unexpected dash count %u, expected %u.\n", i, dash_count, dash_style_tests[i].dash_count); - ok(dash_count < sizeof(dashes)/sizeof(dashes[0]), "%u: unexpectedly large dash count %u.\n", i, dash_count); + ok(dash_count < ARRAY_SIZE(dashes), "%u: unexpectedly large dash count %u.\n", i, dash_count); if (dash_count == dash_style_tests[i].dash_count) { unsigned int j; @@ -5243,11 +5247,11 @@ static void test_stroke_style(void) /* Ask for more dashes than style actually has. */ memset(dashes, 0xcc, sizeof(dashes)); - ID2D1StrokeStyle_GetDashes(style, dashes, sizeof(dashes)/sizeof(dashes[0])); + ID2D1StrokeStyle_GetDashes(style, dashes, ARRAY_SIZE(dashes)); ok(!memcmp(dashes, dash_style_tests[i].dashes, sizeof(*dashes) * dash_count), "%u: unexpected dash array.\n", i); - for (j = dash_count; j < sizeof(dashes)/sizeof(dashes[0]); j++) + for (j = dash_count; j < ARRAY_SIZE(dashes); ++j) ok(dashes[j] == 0.0f, "%u: unexpected dash value at %u.\n", i, j); } @@ -5308,9 +5312,9 @@ static void test_gradient(void) set_color(&stops[0].color, 1.0f, 0.5f, 0.4f, 1.0f); color = stops[0].color; stops[2] = stops[1] = stops[0]; - ID2D1GradientStopCollection_GetGradientStops(gradient, stops, sizeof(stops)/sizeof(stops[0])); + ID2D1GradientStopCollection_GetGradientStops(gradient, stops, ARRAY_SIZE(stops)); ok(!memcmp(stops, stops2, sizeof(*stops) * count), "Unexpected gradient stops array.\n"); - for (i = count; i < sizeof(stops)/sizeof(stops[0]); i++) + for (i = count; i < ARRAY_SIZE(stops); ++i) { ok(stops[i].position == 123.4f, "%u: unexpected stop position %f.\n", i, stops[i].position); ok(!memcmp(&stops[i].color, &color, sizeof(color)), "%u: unexpected stop color.\n", i);

1 0

Matteo Bruni : d3d11/tests: Add a couple of testcases for sRGB SRVs.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 77276430a1bc3a09047e7aa8c0aa2fa7146c30d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77276430a1bc3a09047e7aa8c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Dec 13 20:36:12 2017 +0330 d3d11/tests: Add a couple of testcases for sRGB SRVs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b23546..74c0488 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3287,6 +3287,7 @@ static void test_create_shader_resource_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_SRV_DIMENSION_UNKNOWN @@ -3412,6 +3413,8 @@ static void test_create_shader_resource_view(void) {{TEX_2D, 1, 9, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 1}}, {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_SRGB, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_SRGB}, {RGBA8_UNORM, TEX_2D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 1, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0, 1}}, @@ -3431,6 +3434,9 @@ static void test_create_shader_resource_view(void) }; #undef FMT_UNKNOWN #undef RGBA8_UNORM +#undef RGBA8_SRGB +#undef RGBA8_UINT +#undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D #undef TEX_1D_ARRAY @@ -8001,6 +8007,7 @@ static void test_render_target_views(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM #define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_RTV_DIMENSION_UNKNOWN #define TEX_1D D3D11_RTV_DIMENSION_TEXTURE1D @@ -8062,6 +8069,7 @@ static void test_render_target_views(void) #undef FMT_UNKNOWN #undef RGBA8_UNORM #undef RGBA8_SRGB +#undef RGBA8_UINT #undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D

1 0

Martin Payne : user.exe16: Implemented OldExitWindows() user.exe16 function.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 7f47234c9b80b038a11da1cff994450f89b90687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f47234c9b80b038a11da1cff… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:23:50 2017 +0000 user.exe16: Implemented OldExitWindows() user.exe16 function. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 9 +++++++++ dlls/user.exe16/user.exe16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index eac4a19..729e973 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -510,6 +510,15 @@ static void free_clipboard_formats(void) } +/*********************************************************************** + * OldExitWindows (USER.2) + */ +void WINAPI OldExitWindows16(void) +{ + ExitWindows16(0, 0); +} + + /********************************************************************** * InitApp (USER.5) */ diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index 8d928bc..ec57180 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -1,5 +1,5 @@ 1 pascal -ret16 MessageBox(word str str word) MessageBox16 -2 stub OldExitWindows +2 pascal -ret16 OldExitWindows() OldExitWindows16 3 stub EnableOEMLayer 4 stub DisableOEMLayer 5 pascal -ret16 InitApp(word) InitApp16

1 0

Martin Payne : krnl386.exe16: Shared libraries have a ".exe" rather than " .dll" extension on Windows < 3.0.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 4a8834f6ce6ac183faf773c968ad4359cc9fd02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8834f6ce6ac183faf773c96… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:23:08 2017 +0000 krnl386.exe16: Shared libraries have a ".exe" rather than ".dll" extension on Windows < 3.0. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 70f8a46..14f8075 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -788,9 +788,9 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) /* its handle in the list of DLLs to initialize. */ HMODULE16 hDLL; - /* Append .DLL to name if no extension present */ + /* Append .DLL (Windows >= 3.00) or .EXE (Windows < 3.00) to name if no extension present */ if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) - strcat( buffer, ".DLL" ); + strcat( buffer, (GetExeVersion16() >= 0x0300) ? ".DLL" : ".EXE" ); if ((hDLL = MODULE_LoadModule16( buffer, TRUE, TRUE )) < 32) { @@ -988,7 +988,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ strcpy( dllname, basename ); q = strrchr( dllname, '.' ); - if (!q) strcat( dllname, ".dll" ); + if (!q) strcat( dllname, (GetExeVersion16() >= 0x0300) ? ".dll" : ".exe" ); for (q = dllname; *q; q++) if (*q >= 'A' && *q <= 'Z') *q += 32; strcpy( q, "16" );

1 0

Martin Payne : kernel32: Don't report valid non-Win16 NE executables ( e.g. OS/2) as broken.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: e562d4de81432f7206217b066514953b553f90ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e562d4de81432f7206217b066… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:21:00 2017 +0000 kernel32: Don't report valid non-Win16 NE executables (e.g. OS/2) as broken. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b4d5fe7..c0d9918 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -253,8 +253,8 @@ BOOL WINAPI DisableThreadLibraryCalls( HMODULE hModule ) /* Check whether a file is an OS/2 or a very old Windows executable * by testing on import of KERNEL. * - * FIXME: is reading the module imports the only way of discerning - * old Windows binaries from OS/2 ones ? At least it seems so... + * Reading the module imports is the only reasonable way of discerning + * old Windows binaries from OS/2 ones. */ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, const IMAGE_OS2_HEADER *ne) { @@ -270,31 +270,28 @@ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, || (!(modtab = HeapAlloc( GetProcessHeap(), 0, ne->ne_cmod*sizeof(WORD)))) || (!(ReadFile(hfile, modtab, ne->ne_cmod*sizeof(WORD), &len, NULL))) || (len != ne->ne_cmod*sizeof(WORD)) ) - goto broken; + goto done; /* read imported names table */ if ( (SetFilePointer( hfile, mz->e_lfanew + ne->ne_imptab, NULL, SEEK_SET ) == -1) || (!(nametab = HeapAlloc( GetProcessHeap(), 0, ne->ne_enttab - ne->ne_imptab))) || (!(ReadFile(hfile, nametab, ne->ne_enttab - ne->ne_imptab, &len, NULL))) || (len != ne->ne_enttab - ne->ne_imptab) ) - goto broken; + goto done; for (i=0; i < ne->ne_cmod; i++) { - LPSTR module = &nametab[modtab[i]]; - TRACE("modref: %.*s\n", module[0], &module[1]); - if (!(strncmp(&module[1], "KERNEL", module[0]))) - { /* very old Windows file */ - MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); + LPSTR module = &nametab[modtab[i]]; + TRACE("modref: %.*s\n", module[0], &module[1]); + if (!(strncmp(&module[1], "KERNEL", module[0]))) + { /* very old Windows file */ + MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); ret = BINARY_WIN16; - goto good; - } + break; + } } -broken: - ERR("Hmm, an error occurred. Is this binary file broken?\n"); - -good: +done: HeapFree( GetProcessHeap(), 0, modtab); HeapFree( GetProcessHeap(), 0, nametab); SetFilePointer( hfile, currpos, NULL, SEEK_SET); /* restore filepos */

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: fa48c269a9f5cb47b3e3782089d92cf49fd73f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa48c269a9f5cb47b3e378208… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Dec 13 14:43:51 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 124 ++++++++++++++++++++++++------------------------------------ 1 file changed, 49 insertions(+), 75 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 300ee86..0a6af74 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.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: 2017-07-19 16:00+0100\n" +"PO-Revision-Date: 2017-12-11 21:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -6962,7 +6962,7 @@ msgstr "Evaluerer startbetingelser" #: msi.rc:109 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "Migrerer egenskapstilstand fra relaterte programmer" #: msi.rc:110 msgid "Moving files" @@ -6974,13 +6974,11 @@ msgstr "Publiserer assembly informasjon" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "Avpubliserer assembly informasjon" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Ikonfiler" +msgstr "Oppdaterer filer" #: msi.rc:114 msgid "Updating component registration" @@ -6992,7 +6990,7 @@ msgstr "Publiserer kvalifiserte komponenter" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "Publiserer produktegenskaper" #: msi.rc:117 msgid "Publishing product information" @@ -7008,7 +7006,7 @@ msgstr "Registrerer COM+ programmer og komponenter" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "Registrerer utvidelsestjenere" #: msi.rc:121 msgid "Registering fonts" @@ -7024,7 +7022,7 @@ msgstr "Registrerer produkt" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "Registrerer programidentifikatorer" #: msi.rc:125 msgid "Registering type libraries" @@ -7039,10 +7037,8 @@ msgid "Removing duplicated files" msgstr "Fjerner duplikate filer" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Aktiverer skriftinnstillinger" +msgstr "Oppdaterer miljøvariabler" #: msi.rc:129 msgid "Removing applications" @@ -7058,7 +7054,7 @@ msgstr "Fjerner mapper" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "Fjerner INI filoppføringer" #: msi.rc:133 msgid "Removing ODBC components" @@ -7098,7 +7094,7 @@ msgstr "Avpubliserer kvalifiserte komponenter" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Avpubliserer produktegenskaper" #: msi.rc:144 msgid "Unpublishing product information" @@ -7114,7 +7110,7 @@ msgstr "Avregistrerer COM+ programmer og komponenter" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "Avregistrerer utvidelsestjenere" #: msi.rc:148 msgid "Unregistering fonts" @@ -7126,7 +7122,7 @@ msgstr "Avregistrerer MIME informasjon" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "Avregistrerer programidentifikatorer" #: msi.rc:151 msgid "Unregistering type libraries" @@ -7134,7 +7130,7 @@ msgstr "Avregistrerer typebibliotek" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "Skriver INI filverdier" #: msi.rc:154 msgid "Writing system registry values" @@ -7146,7 +7142,7 @@ msgstr "Plass ledig: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Egenskap: [1], Signatur: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7190,7 +7186,7 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Programkontekst:[1], Assemblynavn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" @@ -7198,19 +7194,19 @@ msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "Komponent ID: [1], Kvalifiserer: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Klasse ID: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}" #: msi.rc:181 msi.rc:202 msgid "Extension: [1]" @@ -7222,7 +7218,7 @@ msgstr "Skrift: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" @@ -7234,27 +7230,27 @@ msgstr "" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Navn: [1], Verdi: [2], Handling [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Program: [1], Kommandolinje: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fil: [1], Seksjon: [2], Nøkkel: [3], Verdi: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" @@ -7262,7 +7258,7 @@ msgstr "" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2], Verdi: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" @@ -7286,6 +7282,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Installeren har truffet på ett eventet problem under installeringen av denne " +"pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. " +"{{Argumentene er: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" @@ -7293,33 +7292,35 @@ msgstr "{{Disken er full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Handling [Tid]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Meldingstype: [1], Argument: [2]{, [3]" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== Logging startet: [Dato] [Tid] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Handling startet [Tid]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Handling avsluttet [Tid]: [1]. Returnert verdi [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Vennligst sett inn disk: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Kildefil ikke funnet{{(cabinet)}}: [2]. Bekreft at den finnes og at du har " +"tilgang til den." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8923,10 +8924,8 @@ msgid " sec" msgstr " sek" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Velg mappe" +msgstr "Velg kilde" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -12039,17 +12038,6 @@ msgid "Icons (*.ico)" msgstr "Ikoner (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12065,7 +12053,7 @@ msgstr "" " REG [operasjon] [parametere]\n" "\n" "Støttede operasjoner:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "For hjelp med spesifikke operasjoner, skriv:\n" " REG [operasjon] /?\n" @@ -12195,43 +12183,31 @@ msgstr "(verdi ikke oppgitt)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT fil.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Filen \"%1\" ble ikke funnet.\n" +msgstr "reg: Filen \"%1\" ble ikke funnet.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "reg: Kan ikke åpne registernøkkelen \"%1\".\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Ukjent escape-sekvens [\\%1!c!]\n" +msgstr "reg: Ukjent escape-sekvens [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n" +msgstr "REG EXPORT nøkkelnavn fil.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Ugyldig systemnøkkel [%1]\n" +msgstr "reg: Ugyldig systemnøkkel [%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 "Registerverdien \"%1\" finnes fra før. Vil du erstatte den?" +msgstr "Filen \"%1\" finnes fra før. Vil du erstatte den?" #: regedit.rc:34 msgid "&Registry" @@ -15003,10 +14979,8 @@ msgid "Expert" msgstr "Ekspert" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultat" +msgstr "Tilbakestill resultater" #: winemine.rc:80 msgid "Congratulations!" @@ -15034,7 +15008,7 @@ msgstr "Miner" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Alle resultater vil bli tapt. Er du sikker?" #: winemine.rc:30 msgid "WineMine"

1 0

Hans Leidekker : wsdapi/tests: Register an exception with the firewall to avoid a dialog.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 1f78cb8f4fb2264d1c8fcc5a6f87ea7054da23a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f78cb8f4fb2264d1c8fcc5a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 13 14:19:15 2017 +0100 wsdapi/tests: Register an exception with the firewall to avoid a dialog. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index cd4b418..c1e559e 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 user32 ws2_32 +IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index db5947d..f373510 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "objbase.h" #include "wsdapi.h" +#include <netfw.h> typedef struct IWSDiscoveryPublisherNotifyImpl { IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify_iface; @@ -276,8 +277,146 @@ static void Publish_tests(void) IWSDiscoveryPublisherNotify_Release(sink2); } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','s','d','a','p','i','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(discovery) { + BOOL firewall_enabled = is_firewall_enabled(); + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + if ((hr = set_firewall(APP_ADD)) != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + CoInitialize(NULL); CreateDiscoveryPublisher_tests(); @@ -285,4 +424,5 @@ START_TEST(discovery) Publish_tests(); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Józef Kucia : d3d10core/tests: Add test for combined clip and cull distances.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 56b71aa8d6b36845a34fa5e7aaf28f351139b36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b71aa8d6b36845a34fa5e7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 13 12:28:58 2017 +0100 d3d10core/tests: Add test for combined clip and cull distances. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 207 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56b71aa8d6b36845a34fa…

1 0

Martin Storsjo : msvcrt: Fix copy/paste typos in arm64 setjmp/longjmp.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: wine Branch: master Commit: 49c3351fd76f684a614e95f71413cac487fa2540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c3351fd76f684a614e95f71… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 13 11:02:22 2017 +0200 msvcrt: Fix copy/paste typos in arm64 setjmp/longjmp. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index b024d49..904d006 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -150,7 +150,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, "str x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ "str x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ "str x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "str x26, [x0, #0x50]\n\t" /* jmp_buf->X27 */ + "str x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ "str x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ "str x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ "str x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ @@ -182,7 +182,7 @@ __ASM_GLOBAL_FUNC(longjmp_set_regs, "ldr x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ "ldr x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ "ldr x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "ldr x26, [x0, #0x50]\n\t" /* jmp_buf->X27 */ + "ldr x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ "ldr x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ "ldr x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ "ldr x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */

1 0

Zebediah Figura : testbot: Rebuild the tools when they are modified.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 60e0adff6f0bfe497541859ec2c04556865b97c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=60e0adff6f0bfe497541859e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 13 17:43:26 2017 +0100 testbot: Rebuild the tools when they are modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 82cd66a..96cf741 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedBuildNative = !1; my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; @@ -85,8 +86,8 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || - ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) + (! $NeedBuildNative || ! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || + ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) { @@ -117,6 +118,14 @@ sub ApplyPatch($$$) { $NeedMakeMakefiles = $NeedConfigure = 1; } + elsif ($Line =~ m=^diff.*tools/makedep.c=) + { + $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; + } + elsif ($Line =~ m=^diff.*tools/(?:winebuild|wrc)=) + { + $NeedBuildNative = 1; + } } close FH; } @@ -132,6 +141,15 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedBuildNative) + { + InfoMsg "Building tools\n"; + if (!BuildNative()) + { + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedMakeMakefiles) { InfoMsg "Running make_makefiles\n"; @@ -190,6 +208,25 @@ sub CountCPUs() $ncpus ||= 1; } +sub BuildNative() +{ + mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + system("( cd $DataDir/build-native && set -x && " . + " rm -rf * && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype && " . + " time make -j$ncpus depend && " . + " time make -j$ncpus __tooldeps__ " . + ") >>$LogDir/Build.log 2>&1"); + + if ($? != 0) + { + LogMsg "Build native failed\n"; + return !1; + } + + return 1; +} + sub BuildTestExecutable($$$$$$$$) { my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile,

1 0

Zebediah Figura : testbot: Run make_makefiles when a file is added or removed.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 6ab34c18e8b916323ec08fdfd1d1a24491ba3368 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6ab34c18e8b916323ec08fdf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 6 20:45:19 2017 -0600 testbot: Run make_makefiles when a file is added or removed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..82cd66a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,19 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || + $Line =~ m=diff.*tools/make_makefiles=) + { + $NeedMakeMakefiles = $NeedConfigure = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +132,19 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n";

1 0

Francois Gouget : testbot: Minor cosmetic tweaks to the installation guide.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 34adab8664660164d7dbf197bbd2204695373cde URL: http://source.winehq.org/git/tools.git/?a=commit;h=34adab8664660164d7dbf197… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 8 04:29:39 2017 +0100 testbot: Minor cosmetic tweaks to the installation guide. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 9947150..15b2b91 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -42,7 +42,7 @@ General setup for the web site: cd var touch log mkdir jobs latest patches socket staging - sudo chown WWWRUN:winehq staging + sudo chown wwwrun:winehq staging chmod g+w * - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. @@ -120,7 +120,7 @@ Dependencies: - Create a Linux VM and set it up so it can generate PE executables with MinGW. For instance on Debian you should install autoconf, bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to - have 64bit VMs then make sure MinGW can generate 64bit PE executables. + have 64 bit VMs then make sure MinGW can generate 64 bit PE executables. - You may also want to install ccache. - You will also need genisoimage. - Create a new user, 'testbot' for instance, and log in as that user.

1 0

Francois Gouget : testbot/testagentd: Detach from the console if given the --detach option.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: f1d368722b65c253720e2aa73fc1fb6be8f46b25 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f1d368722b65c253720e2aa7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 8 04:29:25 2017 +0100 testbot/testagentd: Detach from the console if given the --detach option. This makes it possible to close the console without killing testagentd, and to start the tests from a non-minimized window. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/platform.h | 3 +++ testbot/src/testagentd/platform_unix.c | 15 +++++++++++++++ testbot/src/testagentd/platform_windows.c | 5 +++++ testbot/src/testagentd/testagentd.c | 11 ++++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index ea807fb..84ab491 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -58,6 +58,9 @@ typedef int SOCKET; int platform_init(void); +/* Detach from the console so closing it won't kill testagentd. */ +void platform_detach_console(void); + enum run_flags_t { RUN_DNT = 1, RUN_DNTRUNC_OUT = 2, diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index b27c016..dcd4d69 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -328,6 +328,21 @@ void ta_freeaddrinfo(struct addrinfo *addresses) return freeaddrinfo(addresses); } +void platform_detach_console(void) +{ + pid_t pid; + + pid = fork(); + if (pid != 0) + exit(0); + + /* Daemonize */ + signal(SIGHUP, SIG_IGN); + pid = fork(); + if (pid != 0) + exit(0); +} + int platform_init(void) { struct sigaction sa, osa; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 70272a6..1efac1c 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -450,6 +450,11 @@ void ta_freeaddrinfo(struct addrinfo *addresses) } } +void platform_detach_console(void) +{ + FreeConsole(); +} + int platform_init(void) { HMODULE hdll; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fce28b2..5f0f54c 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1218,6 +1218,7 @@ int main(int argc, char** argv) { const char* p; char** arg; + int opt_detach = 0; char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; @@ -1242,6 +1243,10 @@ int main(int argc, char** argv) { opt_debug = 1; } + else if (strcmp(*arg, "--detach") == 0) + { + opt_detach = 1; + } else if (strcmp(*arg, "--help") == 0) { opt_usage = 1; @@ -1313,7 +1318,7 @@ int main(int argc, char** argv) } if (opt_usage) { - printf("Usage: %s [--debug] [--help] PORT [SRCHOST]\n", name0); + printf("Usage: %s [--debug] [--detach] [--help] PORT [SRCHOST]\n", name0); printf("\n"); printf("Provides a simple way to send/receive files and to run scripts on this host.\n"); printf("\n"); @@ -1321,9 +1326,13 @@ int main(int argc, char** argv) printf(" PORT The port to listen on for connections.\n"); printf(" SRCHOST If specified, only connections from this host will be accepted.\n"); printf(" --debug Prints detailed information about what happens.\n"); + printf(" --detach Detach from the console / terminal. Note that on Windows you should\n"); + printf(" combine this with start: start %s --detach ...\n", name0); printf(" --help Shows this usage message.\n"); exit(0); } + if (opt_detach) + platform_detach_console(); /* Bind to the host in a protocol neutral way */ #ifdef SOCK_CLOEXEC

1 0

Francois Gouget : testbot: Document Collection::DeleteItem().
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 942bf9d4885ccd0ba940aec95f3e26a0b905642b URL: http://source.winehq.org/git/tools.git/?a=commit;h=942bf9d4885ccd0ba940aec9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Dec 8 04:20:24 2017 +0100 testbot: Document Collection::DeleteItem(). In particular note that it cascades to other tables that have foreign keys to the row being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1b29ec1..6c1bd1d 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -550,6 +550,20 @@ sub GetMasterCols($) return ($self->{MasterColNames}, $self->{MasterColValues}); } +=pod +=over 12 + +=item C<DeleteItem()> + +Deletes the specified Item from the Collection and the database backing it. + +Note that if there are other tables with a foreign key referencing this item +the corresponding rows will be deleted too. So for instance deleting a Job +will also delete the Steps and Tasks it is composed of. + +=back +=cut + sub DeleteItem($$) { my ($self, $Item) = @_;

1 0

Francois Gouget : testbot: Assorted wording fixes.
by Alexandre Julliard 13 Dec '17

13 Dec '17

Module: tools Branch: master Commit: 7aa19f46807d2db27a2203c62e6b1e7e8f65f62a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7aa19f46807d2db27a2203c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 8 04:27:47 2017 +0100 testbot: Assorted wording fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/ObjectModel/Collection.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2e23976..62024d9 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -394,7 +394,7 @@ EOF { # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine - # so all any failure it reported not caused by this patch. + # so any failure it reported is not caused by this patch. $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", $BaseName, $StepTask->CmdLineArg); } diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 6c1bd1d..d441860 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -521,7 +521,7 @@ sub KeyChanged($$$) if (defined($self->{Items}{$NewKey})) { - die "Cant change key, new key $NewKey already exists"; + die "Could not change key, new key $NewKey already exists"; } $FullKey = $self->GetFullKey($NewKey); $ScopeItems->{$FullKey} = $Item if (defined $FullKey); diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 2139b6d..7b18df9 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -190,7 +190,7 @@ From: $RobotEMail To: $Recipient Subject: winetestbot account request -password reset request for your account $UserName was received via the website. +A password reset request for your account $UserName was received via the website. You can pick a new password by going to: $URL EOF

1 0

Akihiro Sagawa : ntdll/tests: Add tests for time zone names.
by Alexandre Julliard 12 Dec '17

12 Dec '17

Module: wine Branch: master Commit: 081eae7ac3074857bf1a0569e5416183b64bc0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=081eae7ac3074857bf1a0569e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 12 23:56:31 2017 +0900 ntdll/tests: Add tests for time zone names. Test shows internal NT API returns an indirect string, e.g. @tzres.dll,-32, not a localized one in Vista or later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index b684bc1..b12da2b 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -27,6 +27,8 @@ static VOID (WINAPI *pRtlTimeToTimeFields)( const LARGE_INTEGER *liTime, PTIME_FIELDS TimeFields) ; static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_INTEGER Time) ; static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); +static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); +static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); static const int MonthLengths[2][12] = { @@ -115,15 +117,57 @@ static void test_NtQueryPerformanceCounter(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); } +static void test_RtlQueryTimeZoneInformation(void) +{ + RTL_DYNAMIC_TIME_ZONE_INFORMATION tzinfo; + NTSTATUS status; + + /* test RtlQueryTimeZoneInformation returns an indirect string, + e.g. @tzres.dll,-32 (Vista or later) */ + if (!pRtlQueryTimeZoneInformation || !pRtlQueryDynamicTimeZoneInformation) + { + win_skip("Time zone name tests requires Vista or later\n"); + return; + } + + memset(&tzinfo, 0, sizeof(tzinfo)); + status = pRtlQueryDynamicTimeZoneInformation(&tzinfo); + ok(status == STATUS_SUCCESS, + "RtlQueryDynamicTimeZoneInformation failed, got %08x\n", status); + todo_wine ok(tzinfo.StandardName[0] == '@', + "standard time zone name isn't an indirect string, got %s\n", + wine_dbgstr_w(tzinfo.StandardName)); + todo_wine ok(tzinfo.DaylightName[0] == '@', + "daylight time zone name isn't an indirect string, got %s\n", + wine_dbgstr_w(tzinfo.DaylightName)); + + memset(&tzinfo, 0, sizeof(tzinfo)); + status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); + ok(status == STATUS_SUCCESS, + "RtlQueryTimeZoneInformation failed, got %08x\n", status); + todo_wine ok(tzinfo.StandardName[0] == '@', + "standard time zone name isn't an indirect string, got %s\n", + wine_dbgstr_w(tzinfo.StandardName)); + todo_wine ok(tzinfo.DaylightName[0] == '@', + "daylight time zone name isn't an indirect string, got %s\n", + wine_dbgstr_w(tzinfo.DaylightName)); +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter"); + pRtlQueryTimeZoneInformation = + (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); + pRtlQueryDynamicTimeZoneInformation = + (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); + if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); else win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); + test_RtlQueryTimeZoneInformation(); }

1 0

Akihiro Sagawa : po: Update Japanese Translation.
by Alexandre Julliard 12 Dec '17

12 Dec '17

Module: wine Branch: master Commit: d54bf06f55538a5c19dd1365f5de23030ad700fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54bf06f55538a5c19dd1365f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 12 23:56:29 2017 +0900 po: Update Japanese Translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 91 +++++++++++----------------------------------------------------- 1 file changed, 15 insertions(+), 76 deletions(-) diff --git a/po/ja.po b/po/ja.po index 23d172f..260559d 100644 --- a/po/ja.po +++ b/po/ja.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: 2017-10-02 22:05+0900\n" +"PO-Revision-Date: 2017-12-12 22:41+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -125,9 +125,9 @@ msgid "" "href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Gecko パッケージを見つけられません。このパッケージは HTML を組み込んだアプリ" -"ケーションが正しく動作するために必要です。 Wine で Gecko パッケージを自動的に" -"ダウンロードし、インストールできます。\n" +"Gecko パッケージを見つけられませんでした。このパッケージは HTML を組み込んだ" +"アプリケーションが正しく動作するために必要です。Wine で当該パッケージを自動的" +"にダウンロードし、インストールすることができます。\n" "\n" "注意: 代わりにディストリビューションのパッケージを利用することをおすすめしま" "す。詳しくは、<a href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq." @@ -171,9 +171,9 @@ msgid "" "href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"wine-mono パッケージを見つけられません。このパッケージは .NET アプリケーショ" -"ンが正しく動作するために必要です。 Wine で Mono パッケージを自動的にダウン" -"ロードし、インストールできます。\n" +"wine-mono パッケージを見つけられませんでした。このパッケージは .NET アプリ" +"ケーションが正しく動作するために必要です。Wine で当該パッケージを自動的にダウ" +"ンロードし、インストールすることができます。\n" "\n" "注意: 代わりにディストリビューションのパッケージを利用することをおすすめしま" "す。詳しくは、<a href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq." @@ -8909,10 +8909,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" @@ -10592,47 +10590,6 @@ msgstr "" "ります。\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" @@ -10691,6 +10648,7 @@ msgstr "" "FTYPE\t\tファイルタイプのオープンコマンドを表示または変更\n" "HELP\t\tトピックについて簡潔なヘルプを表示\n" "MD (MKDIR)\tサブディレクトリを作成\n" +"MKLINK\t\tシンボリックリンクを作成\n" "MORE\t\t出力をページ区切りで表示\n" "MOVE\t\tファイルまたはディレクトリツリーを移動\n" "PATH\t\tパスを表示または設定\n" @@ -12030,17 +11988,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" @@ -12056,7 +12003,7 @@ msgstr "" " REG [操作] [パラメータ]\n" "\n" "対応している操作:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "特定の操作に対するヘルプは以下を入力:\n" " REG [操作] /?\n" @@ -12199,22 +12146,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 ファイル.reg\n" +msgstr "REG EXPORT キー名ファイル.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 "reg: システムキーが無効です [%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" @@ -14955,7 +14896,7 @@ msgstr "盤面の変更(&C)..." #: winemine.rc:49 msgid "&Fastest Times" -msgstr "ハイスコア(&F)" +msgstr "ハイスコア(&F)" #: winemine.rc:54 msgid "&About WineMine" @@ -14982,10 +14923,8 @@ msgid "Expert" msgstr "上級" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "結果" +msgstr "ハイスコアのクリア" #: winemine.rc:80 msgid "Congratulations!"

1 0

Jacek Caban : mshtml/tests: Added a test of calls to functions from different frame.
by Alexandre Julliard 12 Dec '17

12 Dec '17

Module: wine Branch: master Commit: e6f7a759ed80da115ffbcc5e9777d485153f6cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f7a759ed80da115ffbcc5e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 15:28:04 2017 +0100 mshtml/tests: Added a test of calls to functions from different frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/elements.js | 16 ++++++++++++++++ dlls/mshtml/tests/frame.js | 25 +++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 6 ++++++ dlls/mshtml/tests/runscript.html | 11 +++++++++++ 4 files changed, 58 insertions(+) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 6e193ee..a16194f 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -104,6 +104,21 @@ function test_head() { next_test(); } +function test_iframe() { + document.body.innerHTML = '<iframe src="runscript.html?frame.js"></iframe>' + var iframe = document.body.firstChild; + + iframe.onload = guard(function() { + var r = iframe.contentWindow.global_object.get_global_value(); + ok(r === "global value", "get_global_value() returned " + r); + + var f = iframe.contentWindow.global_object.get_global_value; + ok(f() === "global value", "f() returned " + f()); + + next_test(); + }); +} + function test_getElementsByClassName() { var elems; @@ -178,6 +193,7 @@ var tests = [ test_ElementTraversal, test_getElementsByClassName, test_head, + test_iframe, test_query_selector, test_compare_position ]; diff --git a/dlls/mshtml/tests/frame.js b/dlls/mshtml/tests/frame.js new file mode 100644 index 0000000..588405c --- /dev/null +++ b/dlls/mshtml/tests/frame.js @@ -0,0 +1,25 @@ +/* + * Copyright 2017 Jacek Caban for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +var global_value = "global value"; + +var global_object = { + get_global_value: function() { + return global_value; + } +}; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index ec2b729..df5b469 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -34,6 +34,12 @@ vbtest.html HTML "vbtest.html" /* @makedep: events.html */ events.html HTML "events.html" +/* @makedep: runscript.html */ +runscript.html HTML "runscript.html" + +/* @makedep: frame.js */ +frame.js HTML "frame.js" + /* @makedep: externscr.js */ externscr.js HTML "externscr.js" diff --git a/dlls/mshtml/tests/runscript.html b/dlls/mshtml/tests/runscript.html new file mode 100644 index 0000000..a4d0ac5 --- /dev/null +++ b/dlls/mshtml/tests/runscript.html @@ -0,0 +1,11 @@ +<!DOCTYPE html> +<html> + <head> + </head> + <script> + var q = document.location.search.replace("?", ""); + if(q) document.write('<s'+'cript src="' + q + '"></s'+'cript>'); + </script> + <body> + </body> +</html>

1 0

Jacek Caban : jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across different script contexts.
by Alexandre Julliard 12 Dec '17

12 Dec '17

Module: wine Branch: master Commit: 2f9c2186cc6b42b6a0aff9d9500372bbc4b0e73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9c2186cc6b42b6a0aff9d95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 15:27:51 2017 +0100 jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across different script contexts. Fixes regression in calls between different contexts. Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ed88c6f..40c02a0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1103,6 +1103,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns return E_FAIL; } + if(ctx != jsdisp->ctx) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call(jsdisp, id, flags, argc, argv, ret); jsdisp_release(jsdisp); return hres; @@ -1191,6 +1193,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp) { + if(ctx != jsdisp->ctx) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); jsdisp_release(jsdisp); return hres;

1 0

Alexandre Julliard : ntdll: Only require MAP_SHARED for writable mappings.
by Alexandre Julliard 12 Dec '17

12 Dec '17

Module: wine Branch: master Commit: dac252ecb42fb17c2f3f2deb559262514b58e990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dac252ecb42fb17c2f3f2deb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 15:15:02 2017 +0100 ntdll: Only require MAP_SHARED for writable mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1156fc1..22965d0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1146,7 +1146,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); - unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITE) ? MAP_SHARED : MAP_PRIVATE); assert( start < view->size ); assert( start + size <= view->size );

1 0

Alexandre Julliard : explorer: Fix parsing command line that contains spaces.
by Alexandre Julliard 12 Dec '17

12 Dec '17

Module: wine Branch: master Commit: ff53db7e6396337692ed2966ef3bf49a4737e3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff53db7e6396337692ed2966e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 09:33:32 2017 +0100 explorer: Fix parsing command line that contains spaces. Reported by Alistair Leslie-Hughes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index afb565f..ac5bebb 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -658,7 +658,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) return folder; } -static int copy_path_string(LPWSTR target, LPWSTR source) +static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; @@ -667,10 +667,9 @@ static int copy_path_string(LPWSTR target, LPWSTR source) if (*source == '\"') { source ++; - while (*source != '\"') target[i++] = *source++; + while (*source && *source != '\"') target[i++] = *source++; target[i] = 0; - source ++; - i+=2; + if (*source) source++; } else { @@ -678,7 +677,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) target[i] = 0; } PathRemoveBackslashW(target); - return i; + return source; } @@ -741,12 +740,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) { p += sizeof(arg_root)/sizeof(WCHAR); - p+=copy_path_string(parameters->root,p); + p = copy_path_string(parameters->root,p); } else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) { p += sizeof(arg_select)/sizeof(WCHAR); - p+=copy_path_string(parameters->selection,p); + p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection);

1 0

Stefan Dösinger : dxdiag: Recognise /dontskip.
by Alexandre Julliard 11 Dec '17

11 Dec '17

Module: wine Branch: master Commit: 162e6c1e4041894639d8276032e28779839b789b URL: http://source.winehq.org/git/wine.git/?a=commit;h=162e6c1e4041894639d827603… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 8 21:15:39 2017 +0100 dxdiag: Recognise /dontskip. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 3ced122..d7d430b 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -110,6 +110,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info static const WCHAR whql_colonW[] = {'w','h','q','l',':',0}; static const WCHAR offW[] = {'o','f','f',0}; static const WCHAR onW[] = {'o','n',0}; + static const WCHAR dontskipW[] = {'d','o','n','t','s','k','i','p',0}; info->whql_check = FALSE; info->output_type = OUTPUT_NONE; @@ -163,6 +164,14 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info return FALSE; break; + + case 'd': + case 'D': + if (strncmpiW(cmdline, dontskipW, 8)) + return FALSE; + cmdline += 8; + break; + default: return FALSE; }

1 0

Alexandre Julliard : comctl32/imagelist: Use the correct allocation size for the image mask.
by Alexandre Julliard 11 Dec '17

11 Dec '17

Module: wine Branch: master Commit: 5dd9a1f00e7cbc30b306b8290c18b781f27e6af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd9a1f00e7cbc30b306b8290… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 11 19:55:01 2017 +0100 comctl32/imagelist: Use the correct allocation size for the image mask. Reported by Petru Florin Mihancea. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 70457c7..71145ed 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -296,7 +296,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) + if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mask_info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; }

1 0

Andrew Eikum : xaudio2: Account for abandoned buffer bytes.
by Alexandre Julliard 11 Dec '17

11 Dec '17

Module: wine Branch: master Commit: f57246e5e55a6ea65a35458a7256c8547ccc5462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57246e5e55a6ea65a35458a7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 11 10:41:35 2017 -0600 xaudio2: Account for abandoned buffer bytes. This should fix bug 44148, a regression caused by e2c73fc394ba. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 8f15ded..bc5cf1c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2286,13 +2286,14 @@ static void update_source_state(XA2SourceImpl *src) src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - if(processed > src->abandoned_albufs){ - for(i = src->abandoned_albufs; i < processed; ++i){ - ALint bufsize; + for(i = 0; i < processed; ++i){ + ALint bufsize; - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - src->in_al_bytes -= bufsize; + src->in_al_bytes -= bufsize; + + if(src->abandoned_albufs == 0){ src->played_frames += bufsize / src->submit_blocksize; if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ @@ -2318,11 +2319,10 @@ static void update_source_state(XA2SourceImpl *src) src->buffers[src->first_buf].xa2buffer.pContext); } } + }else{ + src->abandoned_albufs--; } - - src->abandoned_albufs = 0; - }else - src->abandoned_albufs -= processed; + } } if(!src->running)

1 0

Jacek Caban : mshtml/tests: Skip documentMode tests on IE7.
by Alexandre Julliard 11 Dec '17

11 Dec '17

Module: wine Branch: master Commit: eaca5e023ec857c6070ddec8c099ecceeb5c6e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaca5e023ec857c6070ddec8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 11 17:36:44 2017 +0100 mshtml/tests: Skip documentMode tests on IE7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5128d2f..6c0b637 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10597,6 +10597,10 @@ static void test_document_mode(IHTMLDocument2 *doc2) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc2, &IID_IHTMLDocument6, (void**)&doc); + if(hres == E_NOINTERFACE) { + win_skip("IHTMLDocument6 not supported\n"); + return; + } ok(hres == S_OK, "Could not get IHTMLDocument6 interface: %08x\n", hres); V_VT(&v) = VT_EMPTY;

1 0

Matteo Bruni : d3d11/tests: Add tests for GenerateMips().
by Alexandre Julliard 11 Dec '17

11 Dec '17

Module: wine Branch: master Commit: e14e6fdbce446e558907fbd3d6e5bb67e6724bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14e6fdbce446e558907fbd3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 8 17:54:24 2017 +0100 d3d11/tests: Add tests for GenerateMips(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 457 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 457 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e14e6fdbce446e558907f…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2017