- wine-devel - winehq.org

[PATCH] riched20/tests: Fix typos in ok() messages.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1aa08f89a4..0415be8b80 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1013,9 +1013,9 @@ static void test_default_format(void) ITextHostImpl_TxGetCharFormat(host, &host_cf); ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); - ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expected %d.\n", cf2.yHeight, host_cf->yHeight); expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); - ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(host_cf->dwEffects == expected_effects, "got wrong dwEffects: %x, expected %x.\n", cf2.dwEffects, expected_effects); ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", cf2.bPitchAndFamily, host_cf->bPitchAndFamily); ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); -- 2.17.2

1 0

[PATCH 1/2] shell32/iconcache: Prevent the imagelists from going out of sync when loading an icon
by Gabriel Ivăncescu 29 Nov '18

29 Nov '18

When populating the imagelists cache with icons of different sizes, it can happen that only some icon sizes actually succeed the extraction, with others failing with a NULL handle. This is especially true with some broken "executable packers" where for example, a 32x32 icon loads okay, but a 16x16 fails. Even when PrivateExtractIconsW succeeds, the returned handle can still be NULL, leading to the ImageLists becoming out of sync. This fixes a regression, because at some point, we stopped failing if one icon failed to extract, so when SIC_IconAppend called ImageList_AddIcon with a NULL icon handle, it would go out of sync. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/iconcache.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c..44422ab 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -364,13 +364,14 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; unsigned int i; SIZE size; - int ret; + INT ret = -1; for (i = 0; i < ARRAY_SIZE(hicons); i++) { get_imagelist_icon_size( i, &size ); if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + if (!hicons[i]) goto fail; } if (flags & GIL_FORSHORTCUT) @@ -403,6 +404,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) } ret = SIC_IconAppend( sourcefile, index, hicons, flags ); + +fail: for (i = 0; i < ARRAY_SIZE(hicons); i++) DestroyIcon(hicons[i]); return ret; -- 2.19.1

2 7

TestBot news
by Francois Gouget 29 Nov '18

29 Nov '18

Yesterday I added an option to let the TestBot administrator decide whether to run all the tests in Wine for every Wine patch. I have not activated it yet. But I set it to run all of a dll's tests on Wine whenever that dll is patched. So for instance because job 43715 patched dinput the TestBot reran all of the dinput tests. In contrast, for dinput8 the patch only modified dinput8:dinput so only that test was rerun. And yes, this also illustrates that this mode does not take PARENTSRC into account (yet) :-( https://testbot.winehq.org/JobDetails.pl?Key=43715&f601=win32.report#k601 If this does not cause too many issues (false positives, long processing times) I'll change it to run all the tests all the time in a few days. The remaining todo list for the TestBot: * Add support for locales in Wine VMs. * Fix the performance issues caused by running all the tests on Wine for every Wine patch (I expect we can get by with just duplicating the Debian VM so we can run all the win32 tests on one host while another runs the module-level wow32 + wow64 + locale ones). * Allow submitting Windows test executables to run in Wine. * Allow specifying a locale for jobs running in Wine. * Better locale handling when submitting a job on the Windows VMs (duplicating the VM on the submit page is fine as long as there are only a couple locales but will get unwieldly as more are added). * Fix date/time handling on Wine VMs (the time is not updated when the task starts and risks getting too far off). * Support for Wine's other source repositories to limit the risk of misidentifying Wine patches. * Have the TestBot build its own WineTest executables. * Split the "Update Wine VMs" job in two so it does not hog the Debian VM for hours. * Testing vkd3d's patches... somehow. * Monitoring the VM disk sizes (the Debian one grows particularly fast). * Fix monitoring of WineTest log sizes. * Update the Windows VMs (Windows+TestAgentd). The Windows 10 one obviously but also the slow reverting ones (w7u 3mn, wvista 1mn, w864 1mn). * Automate creating locale snapshots for the Windows Ultimate VMs somehow (either via Ansible or through TestAgentd). * Add more locale snapshots for the Windows Ultimate VMs (w7u and wvistau64). * Remember the user's VM preferences for jobs. * Let users change their email, password, etc. * One day maybe: rewrite the web interface using "modern" technologies to avoid page reloads. -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

[PATCH 1/2] kernel32/tests: Align SizeOfHeaders to FileAlignment
by Brendan McGrath 29 Nov '18

29 Nov '18

According to: https://docs.microsoft.com/en-us/windows/desktop/debug/pe-format#optional-h… SizeOfHeaders: The combined size of an MS-DOS stub, PE header, and section headers rounded up to a multiple of FileAlignment. This change also fixes two kernel loader tests currently failing under 64bit. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- This patch set fixes three of the four failing 64bit kernel32 loader tests. The remaining test that fails is due to the clr header being version 2.4 and wine only offering 64bit support for clr header version 2.5 and above. I couldn't find any documentation to state why that is so I've left the test as failing. dlls/kernel32/tests/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 01c7cfa8a911..aaaa39f601d4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1097,7 +1097,7 @@ static void test_Loader(void) nt64.OptionalHeader.MajorOperatingSystemVersion = 4; nt64.OptionalHeader.MajorImageVersion = 1; nt64.OptionalHeader.MajorSubsystemVersion = 4; - nt64.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER); + nt64.OptionalHeader.SizeOfHeaders = ALIGN_SIZE(sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER), nt64.OptionalHeader.FileAlignment); nt64.OptionalHeader.SizeOfImage = nt64.OptionalHeader.SizeOfHeaders + 0x1000; nt64.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; nt64.OptionalHeader.SizeOfStackReserve = 0x321000; @@ -1212,7 +1212,7 @@ static void test_Loader(void) nt32.OptionalHeader.MajorOperatingSystemVersion = 4; nt32.OptionalHeader.MajorImageVersion = 1; nt32.OptionalHeader.MajorSubsystemVersion = 4; - nt32.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER); + nt32.OptionalHeader.SizeOfHeaders = ALIGN_SIZE(sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER), nt32.OptionalHeader.FileAlignment); nt32.OptionalHeader.SizeOfImage = nt32.OptionalHeader.SizeOfHeaders + 0x1000; nt32.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; nt32.OptionalHeader.SizeOfStackReserve = 0x321000; -- 2.17.1

3 5

[PATCH 1/2] libs/wine: Do not restrict base address of main thread on 64 bit mac os.
by Ken Thomases 29 Nov '18

29 Nov '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- libs/wine/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0af3b8e..8f40ea0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -709,6 +709,7 @@ struct apple_stack_info * Callback for wine_mmap_enum_reserved_areas to allocate space for * the secondary thread's stack. */ +#ifndef _WIN64 static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) { struct apple_stack_info *info = arg; @@ -725,6 +726,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); return (info->stack != (void *)-1); } +#endif /*********************************************************************** * apple_create_wine_thread @@ -742,6 +744,7 @@ static void apple_create_wine_thread( void *init_func ) if (!pthread_attr_init( &attr )) { +#ifndef _WIN64 struct apple_stack_info info; /* Try to put the new thread's stack in the reserved area. If this @@ -753,6 +756,7 @@ static void apple_create_wine_thread( void *init_func ) wine_mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } +#endif if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && !pthread_create( &thread, &attr, init_func, NULL )) -- 2.10.2

2 2

[PATCH] testbot/WineRunBuild: Trust the build task's missions.
by Francois Gouget 29 Nov '18

29 Nov '18

We now set the build task's missions field with the list of builds to perform so there is no need to recompute it in WineRunBuild. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 5a3a683fbb..68e6be4c0c 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -335,22 +335,6 @@ if ($Step->FileType ne "patch") } -# -# Figure out what to build -# - -my (%Missions, %TestExes); -foreach my $TestStep (@{$Job->Steps->GetItems()}) -{ - if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe/) - { - $Missions{$TestStep->FileType} = 1; - $TestExes{$TestStep->FileName} = $TestStep->FileType; - } -} - - # # Run the build # @@ -364,7 +348,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Missions) ."\n". + " ../bin/build/Build.pl patch.diff ". $Task->Missions ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -446,6 +430,16 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # +my %TestExes; +foreach my $TestStep (@{$Job->Steps->GetItems()}) +{ + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe/) + { + $TestExes{$TestStep->FileName} = $TestStep->FileType; + } +} + my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) -- 2.19.1

1 0

[PATCH] testbot/web: Clean up Submit's page handling.
by Francois Gouget 29 Nov '18

29 Nov '18

Also validate the page like every parameter coming from the web browser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 5c40ef5046..a81a954d5b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -48,6 +48,9 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; + # Page is a hidden parameter so fix it instead of issuing an error + $self->{Page} = 1 if ($self->{Page} !~ /^[1-4]$/); + $self->{LastPage} = $self->{Page}; my @PropertyDescriptors1 = ( CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), @@ -132,8 +135,7 @@ sub GenerateFields($) { my ($self) = @_; - print "<div><input type='hidden' name='Page' value='", $self->{Page}, - "'></div>\n"; + print "<div><input type='hidden' name='Page' value='$self->{Page}'></div>\n"; if ($self->{Page} == 1) { print "<div class='ItemProperty'><label>File</label>", @@ -215,7 +217,7 @@ sub GenerateFields($) } if ($self->{Page} == 2) { - if ($self->GetParam("Page") == 3) + if ($self->{LastPage} == 3) { my $VMs = CreateVMs(); # VMs that are only visible with ShowAll @@ -274,7 +276,7 @@ sub GenerateFields($) $Checked = undef; } if ($Checked and - ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) + ($self->{LastPage} == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; } @@ -454,7 +456,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->GetParam("Page") == 2) + if ($self->{Page} == 2 && $self->{LastPage} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -474,7 +476,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) + elsif ($self->{Page} == 3 && $self->{LastPage} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || -- 2.19.1

1 0

[PATCH] testbot: Better identify when multiple locales are tested.
by Francois Gouget 29 Nov '18

29 Nov '18

Previously testing the default English locale and one other locale would only show the latter in the mission description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 18d4f5ed3f..26623405d4 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -125,14 +125,16 @@ sub GetTaskMissionDescription($$) my $Lang; foreach my $Mission (@{$TaskMission->{Missions}}) { - next if (!$Mission->{lang}); - if (defined $Lang) + if (!defined $Lang) + { + $Lang = $Mission->{lang} || ""; + } + elsif ($Lang ne ($Mission->{lang} || "")) { $Description .= " + Locales"; $Lang = undef; last; } - $Lang = $Mission->{lang}; } $Description .= " ". LocaleName($Lang) if ($Lang); $Description .= " tests"; -- 2.19.1

1 0

[PATCH 3/3] gdi32/tests: Explicitly test BeginPath() return value in the metafile path tests.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/metafile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b33437a172..15f29d61fc 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2963,7 +2963,8 @@ static void test_mf_GetPath(void) hdc = CreateMetaFileA(NULL); ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); - BeginPath(hdc); + ret = BeginPath(hdc); + ok(!ret, "BeginPath on metafile DC should fail\n"); ret = MoveToEx(hdc, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdc, 50, 150); @@ -3851,7 +3852,8 @@ static void test_emf_paths(void) hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); - BeginPath(hdcMetafile); + ret = BeginPath(hdcMetafile); + ok(ret, "BeginPath error %d\n", GetLastError()); ret = MoveToEx(hdcMetafile, 50, 50, NULL); ok( ret, "MoveToEx error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 150); -- 2.17.1

2 1

[PATCH 2/3] gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

This just leads to empty path generated. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/path.c | 2 +- dlls/gdi32/tests/metafile.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 49e270c4fe..402b082f4c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1594,7 +1594,7 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC void *outline; dwSize = GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity); - if (dwSize == GDI_ERROR) return FALSE; + if (dwSize == GDI_ERROR) continue; /* add outline only if char is printable */ if(dwSize) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index c683f58af9..b33437a172 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2439,7 +2439,6 @@ static void test_emf_ExtTextOut_on_path(void) ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); -todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcDisplay); @@ -2455,7 +2454,7 @@ todo_wine ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); - todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); + ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcMetafile); ok(ret, "EndPath error %d\n", GetLastError()); @@ -2514,7 +2513,6 @@ todo_wine ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); -todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcMetafile); -- 2.17.1

2 1

[PATCH 1/3] gdi32/tests: Add some additional tests for ExtExtOut on a path for an EMF DC.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/metafile.c | 118 ++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 230d1e6d84..c683f58af9 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1122,6 +1122,44 @@ static const unsigned char EMF_TEXTOUT_ON_PATH_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_TEXTOUT_OUTLINE_ON_PATH_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x90, 0x06, 0x00, 0x00, 0x1a, 0x04, 0x00, 0x00, + 0x51, 0x02, 0x00, 0x00, 0x72, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x1a, 0x0b, 0x09, 0x00, + 0xf0, 0xa6, 0x05, 0x00, 0x25, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, + 0x3b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x54, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x01, 0x00, 0x00, 0x00, 0xc3, 0x30, 0x0d, 0x42, + 0xcf, 0xf3, 0x0c, 0x42, 0x0b, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x54, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, + 0x73, 0x00, 0x74, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + static const unsigned char MF_LINETO_BITS[] = { 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -2384,6 +2422,8 @@ static void test_emf_ExtTextOut_on_path(void) HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; BOOL ret; + LOGFONTA lf; + HFONT hFont; static const INT dx[4] = { 3, 5, 8, 12 }; /* Win9x doesn't play EMFs on invisible windows */ @@ -2394,6 +2434,20 @@ static void test_emf_ExtTextOut_on_path(void) hdcDisplay = GetDC(hwnd); ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError()); + /* with default font */ + ret = BeginPath(hdcDisplay); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); +todo_wine + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcDisplay); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcDisplay, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); @@ -2406,6 +2460,9 @@ static void test_emf_ExtTextOut_on_path(void) ret = EndPath(hdcMetafile); ok(ret, "EndPath error %d\n", GetLastError()); + ret = GetPath(hdcMetafile, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -2421,6 +2478,67 @@ static void test_emf_ExtTextOut_on_path(void) ret = DeleteEnhMetaFile(hMetafile); ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + + /* with outline font */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = ANSI_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfWeight = FW_DONTCARE; + lf.lfHeight = 7; + lf.lfQuality = DEFAULT_QUALITY; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hFont = CreateFontIndirectA(&lf); + ok(hFont != 0, "CreateFontIndirectA error %d\n", GetLastError()); + hFont = SelectObject(hdcDisplay, hFont); + + ret = BeginPath(hdcDisplay); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcDisplay); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcDisplay, NULL, NULL, 0); + ok(ret != 0, "expected != 0\n"); + + SelectObject(hdcDisplay, hFont); + + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + hFont = SelectObject(hdcMetafile, hFont); + + ret = BeginPath(hdcMetafile); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); +todo_wine + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcMetafile); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcMetafile, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + + hFont = SelectObject(hdcMetafile, hFont); + DeleteObject(hFont); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(hMetafile, EMF_TEXTOUT_OUTLINE_ON_PATH_BITS, sizeof(EMF_TEXTOUT_OUTLINE_ON_PATH_BITS), + "emf_TextOut_on_path", FALSE) != 0) + { + dump_emf_bits(hMetafile, "emf_TextOut_outline_on_path"); + dump_emf_records(hMetafile, "emf_TextOut_outline_on_path"); + } + + ret = DeleteEnhMetaFile(hMetafile); + ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + ret = ReleaseDC(hwnd, hdcDisplay); ok(ret, "ReleaseDC error %d\n", GetLastError()); DestroyWindow(hwnd); -- 2.17.1

2 1

[PATCH] gdi32: Improve detection of symbol charset for old truetype fonts.
by Dmitry Timoshkov 29 Nov '18

29 Nov '18

This patch uses same check for symbol charset that get_outline_text_metrics() already does, and allows the font attached to the bug 33117 be correctly recognized as a symbol ttf (like Windows does). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/freetype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5a4727239c..638ff941b0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2011,7 +2011,6 @@ static inline void get_bitmap_size( FT_Face ft_face, Bitmap_Size *face_size ) static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) { TT_OS2 *os2; - FT_UInt dummy; CHARSETINFO csi; FT_WinFNT_HeaderRec winfnt_header; int i; @@ -2028,10 +2027,10 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) if (os2->version == 0) { - if (pFT_Get_First_Char( ft_face, &dummy ) < 0x100) - fs->fsCsb[0] = FS_LATIN1; - else + if (os2->usFirstCharIndex >= 0xf000 && os2->usFirstCharIndex < 0xf100) fs->fsCsb[0] = FS_SYMBOL; + else + fs->fsCsb[0] = FS_LATIN1; } else { -- 2.17.1

2 1

[v2 PATCH 1/5] wincodecs: Fix return values for scaler's CopyPalette().
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 3789831a97..eedc1bbac4 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -163,7 +163,7 @@ static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, return E_INVALIDARG; if (!This->source) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_PALETTEUNAVAILABLE; return IWICBitmapSource_CopyPalette(This->source, pIPalette); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 2b5c373bf9..d4b597900d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1084,6 +1084,7 @@ static void test_bitmap_scaler(void) { WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; + IWICPalette *palette; double res_x, res_y; IWICBitmap *bitmap; UINT width, height; @@ -1148,6 +1149,15 @@ static void test_bitmap_scaler(void) ok(width == 123, "Unexpected width %u.\n", width); ok(height == 321, "Unexpected height %u.\n", height); + hr = IWICBitmapScaler_CopyPalette(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 4, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1224,6 +1234,12 @@ static void test_bitmap_scaler(void) ok(hr == S_OK, "Failed to get scaler resolution, hr %#x.\n", hr); ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap); -- 2.19.2

1 4

[PATCH] gdi32: Try Fontconfig substitutions when the font face is missing.
by Akihiro Sagawa 29 Nov '18

29 Nov '18

This improves font selection. With this patch, we can choose a decent font family by Fontconfig. Otherwise, Wine chooses some fonts based on supported charset, e.g. Droid Sans Fallback. Droid Sans Fallback supports various scripts including Japanese. However, as it's a fallback font, it doesn't have Latin alphabet glyphs. If the font is chosen, typically Japanese Ubuntu environment, users see a lot of squares instead of Latin alphabets. This patch asks Fontconfig for the best font for the current locale. If the font is returned and matches requested charset, the font is used. If failure, it fallbacks to existing procedure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)

2 1

[PATCH 1/4] shell32/autocomplete: Sort the enumerated strings using a helper function
by Gabriel Ivăncescu 29 Nov '18

29 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 236ba15..b9ea68f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -103,11 +103,16 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } -static int enumerate_strings_cmpfn(const void *a, const void *b) +static int sort_strs_cmpfn(const void *a, const void *b) { return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); } +static void sort_strs(WCHAR **strs, UINT numstrs) +{ + qsort(strs, numstrs, sizeof(*strs), sort_strs_cmpfn); +} + /* Enumerate all of the strings and sort them in the internal list. @@ -140,7 +145,7 @@ static void enumerate_strings(IAutoCompleteImpl *ac) { strs = tmp; if (cur > 0) - qsort(strs, cur, sizeof(*strs), enumerate_strings_cmpfn); + sort_strs(strs, cur); ac->enum_strs = strs; ac->enum_strs_num = cur; -- 2.19.1

2 7

[PATCH 1/5] wincodecs: Fix return value for scaler's CopyPalette().
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 3789831a97..eedc1bbac4 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -163,7 +163,7 @@ static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, return E_INVALIDARG; if (!This->source) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_PALETTEUNAVAILABLE; return IWICBitmapSource_CopyPalette(This->source, pIPalette); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 2b5c373bf9..d4b597900d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1084,6 +1084,7 @@ static void test_bitmap_scaler(void) { WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; + IWICPalette *palette; double res_x, res_y; IWICBitmap *bitmap; UINT width, height; @@ -1148,6 +1149,15 @@ static void test_bitmap_scaler(void) ok(width == 123, "Unexpected width %u.\n", width); ok(height == 321, "Unexpected height %u.\n", height); + hr = IWICBitmapScaler_CopyPalette(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 4, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1224,6 +1234,12 @@ static void test_bitmap_scaler(void) ok(hr == S_OK, "Failed to get scaler resolution, hr %#x.\n", hr); ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap); -- 2.19.2

3 10

[v2 PATCH 1/4] shcore: Implement a bunch of string conversion functions.
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 102 +++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 8 +-- dlls/shcore/tests/shcore.c | 95 ++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 4 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index bf477aefcc..2f32a741f4 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1455,3 +1455,105 @@ HRESULT WINAPI SHStrDupA(const char *src, WCHAR **dest) return S_OK; } + +/************************************************************************* + * SHAnsiToAnsi [SHCORE.@] + */ +DWORD WINAPI SHAnsiToAnsi(const char *src, char *dest, int dest_len) +{ + DWORD ret = 0; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + while (dest_len > 1 && *src) + { + dest_len--; + *dest++ = *src++; + ret++; + } + + if (dest_len) + { + *dest = 0; + ret++; + } + + return ret; +} + +/************************************************************************* + * SHUnicodeToAnsi [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToAnsi(const WCHAR *src, char *dest, int dest_len) +{ + int required = 1; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + required = WideCharToMultiByte(CP_ACP, 0, src, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, src, -1, dest, dest_len, NULL, NULL); + } + dest_len = min(required, dest_len); + + dest[dest_len - 1] = 0; + return dest_len; +} + +/************************************************************************* + * SHUnicodeToUnicode [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToUnicode(const WCHAR *src, WCHAR *dest, int dest_len) +{ + DWORD ret = 0; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + while (dest_len > 1 && *src) + { + dest_len--; + *dest++ = *src++; + ret++; + } + + if (dest_len) + { + *dest = 0; + ret++; + } + + return ret; +} + +/************************************************************************* + * SHAnsiToUnicode [SHCORE.@] + */ +DWORD WINAPI SHAnsiToUnicode(const char *src, WCHAR *dest, int dest_len) +{ + int required = 1; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + required = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); + MultiByteToWideChar(CP_ACP, 0, src, -1, dest, dest_len); + } + dest_len = min(required, dest_len); + + dest[dest_len - 1] = 0; + return dest_len; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 1473bf7b0a..918ba5595c 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -29,8 +29,8 @@ @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications -@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi -@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode +@ stdcall SHAnsiToAnsi(str ptr long) +@ stdcall SHAnsiToUnicode(str ptr long) @ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA @ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW @ stdcall SHCreateMemStream(ptr long) @@ -75,8 +75,8 @@ @ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) -@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi -@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) +@ stdcall SHUnicodeToUnicode(wstr ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 904d8264cd..15fcda5449 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -29,12 +29,16 @@ static HRESULT (WINAPI *pGetProcessReference)(IUnknown **); static void (WINAPI *pSetProcessReference)(IUnknown *); static HRESULT (WINAPI *pSHGetInstanceExplorer)(IUnknown **); +static int (WINAPI *pSHUnicodeToAnsi)(const WCHAR *, char *, int); +static int (WINAPI *pSHAnsiToUnicode)(const char *, WCHAR *, int); static void init(HMODULE hshcore) { #define X(f) p##f = (void*)GetProcAddress(hshcore, #f) X(GetProcessReference); X(SetProcessReference); + X(SHUnicodeToAnsi); + X(SHAnsiToUnicode); #undef X } @@ -122,6 +126,95 @@ static void test_process_reference(void) ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount); } +static void test_SHUnicodeToAnsi(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR emptyW[] = { 0 }; + char buff[16]; + int ret; + + ret = pSHUnicodeToAnsi(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + strcpy(buff, "abc"); + ret = pSHUnicodeToAnsi(NULL, buff, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buff[0] == 0 && buff[1] == 'b', "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(NULL, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + strcpy(buff, "test"); + ret = pSHUnicodeToAnsi(emptyW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "t"), "Unexpected buffer contents.\n"); +} + +static void test_SHAnsiToUnicode(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + WCHAR buffW[16]; + int ret; + + ret = pSHAnsiToUnicode(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + buffW[0] = 1; + buffW[1] = 2; + ret = pSHAnsiToUnicode(NULL, buffW, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 0 && buffW[1] == 2, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode(NULL, buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buffW, testW), "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 't' && buffW[1] == 0, "Unexpected buffer contents.\n"); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -135,4 +228,6 @@ START_TEST(shcore) init(hshcore); test_process_reference(); + test_SHUnicodeToAnsi(); + test_SHAnsiToUnicode(); } -- 2.19.2

2 7

[PATCH v2] wininet: Free security context in failure case.
by Daniel Lehman 29 Nov '18

29 Nov '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: invalidate handle after free --- dlls/wininet/netconnection.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad22177ee..c8bb3973e7 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -573,6 +573,10 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; + if(SecIsValidHandle(&connection->ssl_ctx)) { + DeleteSecurityContext(&connection->ssl_ctx); + SecInvalidateHandle(&connection->ssl_ctx); + } return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; } -- 2.17.1

2 1

[PATCH v2] user32: LoadImage should not only search in the working directory
by Fabian Maurer 28 Nov '18

28 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46186 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Use SearchPathW and add more tests --- dlls/user32/cursoricon.c | 11 ++++- dlls/user32/tests/cursoricon.c | 89 ++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f11f5e45ed..0f64a32e41 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3039,11 +3039,20 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { int depth; + WCHAR path[MAX_PATH]; TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); - if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; + if (loadflags & LR_LOADFROMFILE) { + loadflags &= ~LR_SHARED; + + /* Relative paths are not only relating to the current working directory */ + if (name != NULL && lstrlenW(name) > 2 && name[0] != '\\' && name[1] != ':') { + SearchPathW(NULL, name, NULL, ARRAY_SIZE(path), path, NULL); + name = path; + } + } switch (type) { case IMAGE_BITMAP: return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8404ee71ab..1db5467541 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,6 +1203,92 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } +void test_LoadImage_working_directory_run(char *path) +{ + DWORD bytes_written; + HANDLE handle; + BOOL ret; + char path_cursor[MAX_PATH]; + char path_image[MAX_PATH]; + static const test_icon_entries_t icon_desc = {32, 32}; + + sprintf(path_cursor, "%s\\icon.ico", path); + sprintf(path_image, "%s\\test.bmp", path); + + /* Create Files */ + create_ico_file(path_cursor, &icon_desc, 1); + + handle = CreateFileA(path_image, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "run %s: CreateFileA failed. %u\n", path, GetLastError()); + ret = WriteFile(handle, bmpimage, sizeof(bmpimage), &bytes_written, NULL); + ok(ret && bytes_written == sizeof(bmpimage), "run %s: Test file created improperly.\n", path); + CloseHandle(handle); + + /* Test cursor */ + handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImage() failed.\n", path); + + ret = DestroyCursor(handle); + ok(ret, "run %s: DestroyCusor failed: %d\n", path, GetLastError()); + + /* Test image */ + handle = LoadImageA(NULL, "test.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "run %s: LoadImageA failed.\n", path); + + ret = DeleteObject(handle); + ok(ret, "run %s: DeleteObject failed: %d\n", path, GetLastError()); + + /* Cleanup */ + ret = DeleteFileA(path_image); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); + ret = DeleteFileA(path_cursor); + ok(ret, "run %s: DeleteFileA failed: %d\n", path, GetLastError()); +} + +static void test_LoadImage_working_directory(void) +{ + char old_working_dir[MAX_PATH]; + char temp_dir_current[MAX_PATH]; + char temp_dir_PATH[MAX_PATH]; + char executable_path[MAX_PATH]; + int pos_slash; + char old_PATH[10000]; + char new_PATH[10000]; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(old_working_dir), old_working_dir); + + GetTempPathA(ARRAY_SIZE(temp_dir_current), temp_dir_current); + strcat(temp_dir_current, "wine-test-dir-current\\"); + GetTempPathA(ARRAY_SIZE(temp_dir_PATH), temp_dir_PATH); + strcat(temp_dir_PATH, "wine-test-dir-path\\"); + + GetModuleFileNameA(NULL, executable_path, ARRAY_SIZE(executable_path)); + pos_slash = strrchr(executable_path, '\\') - executable_path; + executable_path[pos_slash + 1] = 0; + + CreateDirectoryA(temp_dir_current, NULL); + CreateDirectoryA(temp_dir_PATH, NULL); + + SetCurrentDirectoryA(temp_dir_current); + + GetEnvironmentVariableA("PATH", old_PATH, ARRAY_SIZE(old_PATH)); + sprintf(new_PATH, "%s;%s", old_PATH, temp_dir_PATH); + SetEnvironmentVariableA("PATH", new_PATH); + + test_LoadImage_working_directory_run(temp_dir_current); + test_LoadImage_working_directory_run(executable_path); + test_LoadImage_working_directory_run(temp_dir_PATH); + + SetCurrentDirectoryA(old_working_dir); + SetEnvironmentVariableA("PATH", old_PATH); + + ret = RemoveDirectoryA(temp_dir_current); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); + ret = RemoveDirectoryA(temp_dir_PATH); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_LoadImage(void) { HANDLE handle; @@ -1326,6 +1412,9 @@ static void test_LoadImage(void) bitmap_header->biSize = sizeof(BITMAPINFOHEADER); test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); + + /* Test in which paths images with a relative path can be found */ + test_LoadImage_working_directory(); } static void test_CreateIconFromResource(void) -- 2.19.2

1 0

[PATCH] ntdll: Add a futex-based condition variable implementation.
by Brendan McGrath 28 Nov '18

28 Nov '18

From: Zebediah Figura <z.figura12(a)gmail.com> With significant contributions from Andrew Wesie. --- What would be required to get this patch from wine-staging mainlined? It's required for Elite Dangerous to run (and I thought it would be nice to have included in wine v4.0) dlls/ntdll/sync.c | 213 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 185 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0c373a4c880a..79f36ca65278 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -26,6 +26,7 @@ #include <assert.h> #include <errno.h> +#include <limits.h> #include <signal.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> @@ -36,6 +37,9 @@ #ifdef HAVE_SYS_POLL_H # include <sys/poll.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -61,7 +65,140 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); HANDLE keyed_event = NULL; + static const LARGE_INTEGER zero_timeout; +#define TICKSPERSEC 10000000 + +#ifdef __linux__ + +static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ +static int wake_op = 129; /*FUTEX_WAKE|FUTEX_PRIVATE_FLAG*/ + +static inline int futex_wait( int *addr, int val, struct timespec *timeout ) +{ + return syscall( __NR_futex, addr, wait_op, val, timeout, 0, 0 ); +} + +static inline int futex_wake( int *addr, int val ) +{ + return syscall( __NR_futex, addr, wake_op, val, NULL, 0, 0 ); +} + +static inline int use_futexes(void) +{ + static int supported = -1; + + if (supported == -1) + { + futex_wait( &supported, 10, NULL ); + if (errno == ENOSYS) + { + wait_op = 0; /*FUTEX_WAIT*/ + wake_op = 1; /*FUTEX_WAKE*/ + futex_wait( &supported, 10, NULL ); + } + supported = (errno != ENOSYS); + } + return supported; +} + +static inline NTSTATUS fast_wait( RTL_CONDITION_VARIABLE *variable, int val, + const LARGE_INTEGER *timeout) +{ + struct timespec timespec; + LONGLONG timeleft; + LARGE_INTEGER now; + int ret; + + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) + { + if (timeout->QuadPart >= 0) + { + NtQuerySystemTime( &now ); + timeleft = timeout->QuadPart - now.QuadPart; + if (timeleft < 0) timeleft = 0; + } + else + timeleft = -timeout->QuadPart; + + timespec.tv_sec = timeleft / TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + + ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + } + else + ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + + if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; + return STATUS_WAIT_0; +} + +static inline NTSTATUS fast_sleep_cs( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *crit, const LARGE_INTEGER *timeout ) +{ + int val = *(int *)&variable->Ptr; + NTSTATUS ret; + + RtlLeaveCriticalSection( crit ); + + ret = fast_wait( variable, val, timeout ); + + RtlEnterCriticalSection( crit ); + + return ret; +} + +static inline NTSTATUS fast_sleep_srw( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + int val = *(int *)&variable->Ptr; + NTSTATUS ret; + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + ret = fast_wait( variable, val, timeout ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + + return ret; +} + +static inline NTSTATUS fast_wake( RTL_CONDITION_VARIABLE *variable, int val ) +{ + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + futex_wake( (int *)&variable->Ptr, val ); + return STATUS_SUCCESS; +} + +#else +static inline NTSTATUS fast_sleep_cs( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *crit, const LARGE_INTEGER *timeout ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static inline NTSTATUS fast_sleep_srw( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static inline NTSTATUS fast_wake( RTL_CONDITION_VARIABLE *variable, int val ) +{ + return STATUS_NOT_IMPLEMENTED; +} +#endif + static inline int interlocked_dec_if_nonzero( int *dest ) { @@ -1868,8 +2005,11 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + if (fast_wake( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + { + if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } } /*********************************************************************** @@ -1879,9 +2019,12 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); - while (val-- > 0) - NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); + if (fast_wake( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + { + int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); + while (val-- > 0) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } } /*********************************************************************** @@ -1903,17 +2046,24 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - RtlLeaveCriticalSection( crit ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) + if ((status = fast_sleep_cs( variable, crit, timeout )) == STATUS_NOT_IMPLEMENTED) { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlLeaveCriticalSection( crit ); - RtlEnterCriticalSection( crit ); + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + else if (status != STATUS_SUCCESS) + interlocked_dec_if_nonzero( (int *)&variable->Ptr ); + + RtlEnterCriticalSection( crit ); + } return status; } @@ -1940,24 +2090,31 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - - if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) - RtlReleaseSRWLockShared( lock ); - else - RtlReleaseSRWLockExclusive( lock ); - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); - if (status != STATUS_SUCCESS) + if ((status = fast_sleep_srw( variable, lock, timeout, flags )) == STATUS_NOT_IMPLEMENTED) { - if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) - status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); - } + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) - RtlAcquireSRWLockShared( lock ); - else - RtlAcquireSRWLockExclusive( lock ); + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + else if (status != STATUS_SUCCESS) + interlocked_dec_if_nonzero( (int *)&variable->Ptr ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + } return status; } -- 2.17.1

3 4

[PATCH 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 28 Nov '18

28 Nov '18

Renaming a file or directory from foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Currently Wine simply finds the existing foobar and thus "changes" it from foobar to foobar, which is a no-op and wrong. This is especially annoying with file managers when trying to rename files to different capitalization... The __wine_wcstoumbs thing is taken from the similar __wine_init_codepages layout used in locale.c. I've had to do it this way and export it because accessing the ntdll_wcstoumbs internal function is required here to build the filename in its original capitalization, untouched. I am aware that the extern function declaration may not be acceptable, but I made it similar to __wine_init_codepages since this function should not really be declared in other headers, in my opinion. Unless, of course, there's a better way to do this. dlls/kernel32/path.c | 69 +++++++++++++++++++++++++++++++++++++++---- dlls/ntdll/ntdll.spec | 1 + 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34..9ad9a6f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1310,6 +1320,9 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, LPPROGRESS_ROUTINE fnProgress, LPVOID param, DWORD flag ) { + extern int __wine_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, + int dstlen, const char* defchar, int *used); + FILE_BASIC_INFORMATION info; UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; @@ -1317,6 +1330,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1383,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attr = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attr = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attr & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1408,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); } @@ -1401,13 +1420,53 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { SetLastError( RtlNtStatusToDosError(status) ); + RtlFreeUnicodeString( &nt_name ); goto error; } + /* when it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links, the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t ntpathlen, pathlen; + int num, used_default; + char *tmp; + + /* find the '\' from the end */ + for (ntpathlen = nt_name.Length; nt_name.Buffer[--ntpathlen] != '\\';) {} + ntpathlen++; + + /* build it from path + filename (the latter converted from nt_name) */ + num = __wine_wcstoumbs(0, nt_name.Buffer + ntpathlen, nt_name.Length - ntpathlen, + NULL, 0, NULL, &used_default); + if (num > 0 && !used_default) + { + /* find the '/' from the end */ + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (source_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = pathlen + num + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + __wine_wcstoumbs(0, nt_name.Buffer + ntpathlen, nt_name.Length - ntpathlen, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f..3fb308e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1510,6 +1510,7 @@ # Codepages @ cdecl __wine_init_codepages(ptr ptr ptr) +@ cdecl __wine_wcstoumbs(long wstr long ptr long str ptr) ntdll_wcstoumbs # signal handling @ cdecl __wine_set_signal_handler(long ptr) -- 2.19.1

2 4

[v2 PATCH] comctl32/listbox: Store the items array size instead of using HeapSize().
by Nikolay Sivov 28 Nov '18

28 Nov '18

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 7525e7f7fe..cb645b4467 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -72,6 +72,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -688,7 +689,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -702,6 +703,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1528,12 +1530,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1545,6 +1545,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1704,13 +1705,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + max_items = descr->items_size; if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) { max_items -= LB_ARRAY_GRANULARITY; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1756,6 +1761,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2493,6 +2499,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1; -- 2.19.2

1 0

[PATCH 1/2] comctl32/tests: Also include LBS_NODATA cases when testing ownerdraw
by Gabriel Ivăncescu 28 Nov '18

28 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 79 +++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3ca..a384e03 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -402,62 +402,71 @@ static HWND create_parent( void ) static void test_ownerdraw(void) { + static const DWORD styles[] = + { + 0, + LBS_NODATA + }; HWND parent, hLB; INT ret; RECT rc; + UINT i; parent = create_parent(); ok(parent != NULL, "Failed to create parent window.\n"); - hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); - ok(hLB != NULL, "Failed to create listbox window.\n"); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE | styles[i], parent); + ok(hLB != NULL, "Failed to create listbox window.\n"); - SetForegroundWindow(hLB); - UpdateWindow(hLB); + SetForegroundWindow(hLB); + UpdateWindow(hLB); - /* make height short enough */ - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); + /* make height short enough */ + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); - /* make 0 item invisible */ - SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); - ok(ret == 1, "wrong top index %d\n", ret); + /* make 0 item invisible */ + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); + ok(ret == 1, "wrong top index %d\n", ret); - SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); - ok(!IsRectEmpty(&rc), "empty item rect\n"); - ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok(!IsRectEmpty(&rc), "empty item rect\n"); + ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); - DestroyWindow(hLB); + DestroyWindow(hLB); - /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ - hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, - NULL, NULL, NULL, 0); - ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | styles[i], + 0, 0, 100, 100, NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); - ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 0, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); - ok(ret == 1, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 13, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); - ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); - ok(ret == 42, "Unexpected item height %d.\n", ret); + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); - DestroyWindow (hLB); + DestroyWindow (hLB); + } DestroyWindow(parent); } -- 2.19.1

2 3

[PATCH 1/5] shcore: Add SHCreateThread().
by Nikolay Sivov 28 Nov '18

28 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 119 ++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 488e78eb86..93effef6ad 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ocidl.h" #include "shellscalingapi.h" +#include "shlwapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -1290,3 +1291,121 @@ void WINAPI SetProcessReference(IUnknown *obj) process_ref = obj; } + +struct thread_data +{ + LPTHREAD_START_ROUTINE thread_proc; + LPTHREAD_START_ROUTINE callback; + void *data; + DWORD flags; + HANDLE hEvent; + IUnknown *thread_ref; + IUnknown *process_ref; +}; + +static DWORD WINAPI shcore_thread_wrapper(void *data) +{ + struct thread_data thread_data; + HRESULT hr = E_FAIL; + DWORD retval; + + TRACE("(%p)\n", data); + + /* We are now executing in the context of the newly created thread. + * So we copy the data passed to us (it is on the stack of the function + * that called us, which is waiting for us to signal an event before + * returning). */ + thread_data = *(struct thread_data *)data; + + if (thread_data.flags & CTF_COINIT) + { + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + if (FAILED(hr)) + hr = CoInitializeEx(NULL, COINIT_DISABLE_OLE1DDE); + } + + if (thread_data.callback) + thread_data.callback(thread_data.data); + + /* Signal the thread that created us; it can return now. */ + SetEvent(thread_data.hEvent); + + /* Execute the callers start code. */ + retval = thread_data.thread_proc(thread_data.data); + + /* Release thread and process references. */ + if (thread_data.thread_ref) + IUnknown_Release(thread_data.thread_ref); + + if (thread_data.process_ref) + IUnknown_Release(thread_data.process_ref); + + if (SUCCEEDED(hr)) + CoUninitialize(); + + return retval; +} + +/************************************************************************* + * SHCreateThread [SHCORE.@] + */ +BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE thread_proc, void *data, DWORD flags, LPTHREAD_START_ROUTINE callback) +{ + struct thread_data thread_data; + BOOL called = FALSE; + + TRACE("(%p, %p, %#x, %p)\n", thread_proc, data, flags, callback); + + thread_data.thread_proc = thread_proc; + thread_data.callback = callback; + thread_data.data = data; + thread_data.flags = flags; + thread_data.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + if (flags & CTF_THREAD_REF) + SHGetThreadRef(&thread_data.thread_ref); + else + thread_data.thread_ref = NULL; + + if (flags & CTF_PROCESS_REF) + GetProcessReference(&thread_data.process_ref); + else + thread_data.process_ref = NULL; + + /* Create the thread */ + if (thread_data.hEvent) + { + HANDLE hThread; + DWORD retval; + + hThread = CreateThread(NULL, 0, shcore_thread_wrapper, &thread_data, 0, &retval); + if (hThread) + { + /* Wait for the thread to signal us to continue */ + WaitForSingleObject(thread_data.hEvent, INFINITE); + CloseHandle(hThread); + called = TRUE; + } + CloseHandle(thread_data.hEvent); + } + + if (!called) + { + if (!thread_data.callback && flags & CTF_INSIST) + { + /* Couldn't call, call synchronously */ + thread_data.thread_proc(data); + called = TRUE; + } + else + { + if (thread_data.thread_ref) + IUnknown_Release(thread_data.thread_ref); + + if (thread_data.process_ref) + IUnknown_Release(thread_data.process_ref); + } + } + + return called; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index c98f2db54a..a08c2da7e0 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -37,7 +37,7 @@ @ stdcall SHCreateStreamOnFileA(str long ptr) @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) @ stdcall SHCreateStreamOnFileW(wstr long ptr) -@ stdcall SHCreateThread(ptr ptr long ptr) shlwapi.SHCreateThread +@ stdcall SHCreateThread(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) @ stub SHCreateThreadWithHandle @ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA -- 2.19.2

2 5

[PATCH 2/2] user32: If there is no dialog controls to set focus to then set focus to dialog itself.
by Dmitry Timoshkov 28 Nov '18

28 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/dialog.c | 2 ++ dlls/user32/tests/msg.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index c47bd571ae..0b33a579b5 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -691,6 +691,8 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SendMessageW( focus, EM_SETSEL, 0, MAXLONG ); SetFocus( focus ); } + else + SetFocus( hwnd ); } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2fdb118e84..366a138b52 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13574,10 +13574,12 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_MOVE, sent }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, - { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ { HCBT_SETFOCUS, hook }, { HCBT_ACTIVATE, hook }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_PALETTEISCHANGING, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -13760,9 +13762,8 @@ static void test_dialog_messages(void) flush_sequence(); hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 1); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); - ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", TRUE); + ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); hfocus = GetFocus(); -todo_wine ok(hfocus == hdlg, "wrong focus %p\n", hfocus); EndDialog(hdlg, 0); DestroyWindow(hdlg); -- 2.17.1

2 1

[PATCH 1/2] user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG.
by Dmitry Timoshkov 28 Nov '18

28 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 42 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f78858f4d4..2fdb118e84 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13440,6 +13440,8 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR switch (message) { case WM_INITDIALOG: + return lParam; + case WM_GETDLGCODE: return 0; } @@ -13548,6 +13550,20 @@ static const struct message WmDefDlgSetFocus_2[] = { { 0 } }; /* Creation of a dialog */ +static const struct message WmCreateDialogParamSeq_0[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; +/* Creation of a dialog */ static const struct message WmCreateDialogParamSeq_1[] = { { HCBT_CREATEWND, hook }, { WM_NCCREATE, sent }, @@ -13558,6 +13574,14 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_MOVE, sent }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, + { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, + { HCBT_SETFOCUS, hook }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent|wparam, 1 }, + { WM_SETFOCUS, sent }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; @@ -13721,9 +13745,25 @@ static void test_dialog_messages(void) cls.lpfnWndProc = test_dlg_proc; if (!RegisterClassA(&cls)) assert(0); + SetFocus(0); + flush_sequence(); hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 0); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); - ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); + ok_sequence(WmCreateDialogParamSeq_0, "CreateDialogParam_0", FALSE); + hfocus = GetFocus(); + ok(hfocus == 0, "wrong focus %p\n", hfocus); + EndDialog(hdlg, 0); + DestroyWindow(hdlg); + flush_sequence(); + + SetFocus(0); + flush_sequence(); + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 1); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", TRUE); + hfocus = GetFocus(); +todo_wine + ok(hfocus == hdlg, "wrong focus %p\n", hfocus); EndDialog(hdlg, 0); DestroyWindow(hdlg); flush_sequence(); -- 2.17.1

2 1

[PATCH] testbot: Use autoreconf instead of autoconf.
by Zebediah Figura 28 Nov '18

28 Nov '18

autoconf doesn't regenerate config.h.in. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- testbot/lib/Build/Utils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 0f1ddb0..c53f609 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -139,11 +139,11 @@ sub ApplyPatch($$) if ($Impacts->{Autoconf}) { - InfoMsg "\nRunning autoconf\n"; - system("cd '$DataDir/$Dir' && set -x && autoconf"); + InfoMsg "\nRunning autoreconf\n"; + system("cd '$DataDir/$Dir' && set -x && autoreconf"); if ($? != 0) { - LogMsg "Autoconf failed\n"; + LogMsg "autoreconf failed\n"; return undef; } } -- 2.19.1

2 1

[PATCH 1/4] tools/make_unicode: Implement full Unicode character decomposition.
by Brendan McGrath 28 Nov '18

28 Nov '18

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- This is a patch-set from wine-staging required for the keyboard binds within Elite Dangerous to work. What would be required to see this mainlined (hopefully before wine v4.0)? (Please do correct me if sending the entire patchset to wine-devel is not the correct approach) libs/port/mbtowc.c | 14 +- tools/make_unicode | 333 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 279 insertions(+), 68 deletions(-) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82d8b12..6976f89722a7 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -101,19 +101,19 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, WCHAR *dst, unsigned int dstlen ) { const WCHAR * const cp2uni = (flags & MB_USEGLYPHCHARS) ? table->cp2uni_glyphs : table->cp2uni; - unsigned int len; + int len; if (!dstlen) /* compute length */ { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + int res = wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dst, len ); if (!res) break; len -= res; dst += res; @@ -203,7 +203,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, { const WCHAR * const cp2uni = table->cp2uni; const unsigned char * const cp2uni_lb = table->cp2uni_leadbytes; - unsigned int len, res; + int len, res; WCHAR ch; if (!dstlen) /* compute length */ @@ -219,7 +219,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_unicode_decompose_string( 0, &ch, 1, dummy, 4 ); } return len; } @@ -234,7 +234,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_unicode_decompose_string( 0, &ch, 1, dst, len ))) break; dst += res; len -= res; } diff --git a/tools/make_unicode b/tools/make_unicode index 56d190565677..2aa063bff624 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -472,6 +472,28 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + # store decomposition table + if ($decomp =~ /^<([a-zA-Z]+)>(\s+[0-9a-fA-F]+)+$/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [1, \@seq]; + } + elsif ($decomp =~ /^([0-9a-fA-F]+)(\s+([0-9a-fA-F]+))*$/) + { + my @seq = (); + for my $ch (split /\s+/, $decomp) + { + # we don't support surrogates at the moment + next if hex $ch > 0xffff; + push @seq, (hex $ch); + } + $decomp_table[$src] = [0, \@seq]; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -506,16 +528,13 @@ sub READ_DEFAULTS($) # decomposition contains only char values without prefix -> use first char $dst = hex $1; $category_table[$src] |= $category_table[$dst] if defined $category_table[$dst]; - # store decomposition if it contains two chars if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { - $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && (($src >= 0xf900 && $src < 0xfb00) || ($src >= 0xfe30 && $src < 0xfffd))) { - # Single char decomposition in the compatibility range $compatmap_table[$src] = hex $2; } } @@ -2264,6 +2283,51 @@ EOF save_file($filename); } +sub do_decomp +{ + my ($char, $table_ref, $compat) = @_; + + return ($char) unless defined $table_ref->[$char]; + my $data = $table_ref->[$char]; + return ($char) if $data->[0] && !$compat; + my @mapping = (); + for my $ch (@{$data->[1]}) + { + push @mapping, $ch; + } + return @mapping; +} + +sub expand_pairs +{ + my @data = @_; + my @result = (); + + for my $ch (@data) + { + if ($ch <= 0xFFFF) + { + push @result, $ch; + } + elsif ($ch >= 2097152) # 2**21 + { + die sprintf "Invalid Unicode character %04x\n", $ch; + } + else + { + my $hx = $ch & 0xFFFF; + my $hu = ($ch >> 16) & ((1 << 5) - 1); + my $hw = ($hu - 1) & 0xFFFF; + my $hi = 0xD800 | ($hw << 6) | ($hx >> 10); + my $lx = $ch & 0xFFFF; + my $lo = (0xDC00 | ($lx & ((1 << 10) - 1))) & 0xFFFF; + push @result, $hi; + push @result, $lo; + } + } + return @result; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2272,98 +2336,245 @@ sub dump_decompose_table($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; - print OUTPUT "/* Unicode char composition */\n"; + print OUTPUT "/* Unicode char decomposition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - # first determine all the 16-char subsets that contain something + # limit code points to BMP + my $utflim = 65536; + my %nfd_lookup = (); + my %nfkd_lookup = (); + my %decomp_lookup = (); + my @decomp_data = (0); + my $pos = 1; + my $lastchar_decomp; - my @filled = (0) x 4096; - my $pos = 16*2; # for the null subset - for (my $i = 0; $i < 65536; $i++) + for (my $i = 0; $i < $utflim; $i++) { next unless defined $decomp_table[$i]; - $filled[$i >> 4] = $pos; - $pos += 16*2; - $i |= 15; + + if (defined $decomp_table[$i]) + { + $lastchar_decomp = $i; + # fully expand input and mappings + + my @char; + push @char, $i; + push @char, 0; + my $char = pack "n*", @char; + + my @nfd = do_decomp( $i, \@decomp_table, 0 ); + push @nfd, 0; + my $nfd = pack "n*", @nfd; + + my @nfkd = do_decomp( $i, \@decomp_table, 1 ); + push @nfkd, 0; + my $nfkd = pack "n*", @nfkd; + + # lookup or add mappings + + if ($nfd eq $char) + { + $nfd = undef; + } + elsif (exists $decomp_lookup{$nfd}) + { + $nfd_lookup{$i} = $decomp_lookup{$nfd}; + } + else + { + push @decomp_data, @nfd; + $decomp_lookup{$nfd} = $pos; + $nfd_lookup{$i} = $pos; + $pos += @nfd; + } + + if ($nfkd eq $char) + { + $nfkd = undef; + } + elsif (exists $decomp_lookup{$nfkd}) + { + $nfkd_lookup{$i} = $decomp_lookup{$nfkd}; + } + else + { + push @decomp_data, @nfkd; + $decomp_lookup{$nfkd} = $pos; + $nfkd_lookup{$i} = $pos; + $pos += @nfkd; + } + } } - my $total = $pos; - # now count the 256-char subsets that contain something + printf OUTPUT "static const UINT last_decomposable = 0x%x;\n\n", $lastchar_decomp; - my @filled_idx = (256) x 256; - $pos = 256 + 16; - for (my $i = 0; $i < 4096; $i++) + # dump decomposition data + + printf OUTPUT "static const WCHAR data_decomp[%d] =\n", $pos; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @decomp_data ); + print OUTPUT "\n};\n\n"; + + # find 256-char subsets that contain something + + my $filled_pos = 1; + my $filled_lim = ($lastchar_decomp >> 8) + 1; + my @filled = (0) x $filled_lim; + for (my $i = 0; $i < $utflim; $i++) + { + last if $i > $lastchar_decomp; + next unless exists $nfd_lookup{$i} || exists $nfkd_lookup{$i}; + $filled[$i >> 8] = $filled_pos++; + $i |= 255; + } + + # dump index of 256-char subsets + + printf OUTPUT "static const BYTE idx1_decomp[%d] =\n", $filled_lim; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%02x", 0, @filled ); + print OUTPUT "\n};\n\n"; + + # for 256-char subsets, find non-empty 16-char subsets + + my $sub_filled_pos = 1; + my %sub_filled = (); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled_idx[$i >> 4] = $pos; - $pos += 16; - $i |= 15; + for (my $j = 0; $j < 256; $j++) + { + my $idx = ($i << 8) | $j; + next unless exists $nfd_lookup{$idx} || exists $nfkd_lookup{$idx}; + $sub_filled{$idx >> 4} = $sub_filled_pos++; + $j |= 15; + } } - my $null_offset = $pos; # null mapping - $total += $pos; - # add the index offsets to the subsets positions + # dump index of 16-char subsets - for (my $i = 0; $i < 4096; $i++) + printf OUTPUT "static const USHORT idx2_decomp[%d] =\n", $filled_pos * 16; + print OUTPUT "{\n"; + my @null_idx = (0) x 16; + print OUTPUT " /* null sub-index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_idx ); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled[$i] += $null_offset; + printf OUTPUT ",\n /* sub-index 0x%02x */\n", $filled[$i]; + + my @sub_idx; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($i << 4) | $j; + $sub_idx[$j] = $sub_filled{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_idx ); } + print OUTPUT "\n};\n\n"; - # dump the main index + # dump the 16-char subsets - printf OUTPUT "static const WCHAR table[%d] =\n", $total; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); - printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); + printf OUTPUT "static const USHORT offsets_decomp[%d] =\n", 32 * $sub_filled_pos; + print OUTPUT "{\n"; + print OUTPUT " /* (nfd, nfkd) x 16 */\n"; + my @null_table = (0) x 32; + print OUTPUT " /* no decomposition */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_table ); + for my $key (sort {$a <=> $b} keys %sub_filled) + { + printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $key, $key; + my @sub_table; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($key << 4) | $j; + $sub_table[2 * $j] = $nfd_lookup{$idx} || 0; + $sub_table[2 * $j + 1] = $nfkd_lookup{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_table ); + } + print OUTPUT "\n};\n\n"; - # dump the second-level indexes + print OUTPUT <<"EOF"; +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data, UINT scale_data ) +{ + USHORT a, b, c, d; - for (my $i = 0; $i < 256; $i++) + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << scale_data); + if (compat) ++c; + d = offsets[c]; + + return &data[d]; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + int total_decomp = 0; + int size_decomp; + const WCHAR *map; + + if (ch < 0xa0) /* fast path */ { - next unless ($filled_idx[$i] > 256); - my @table = @filled[($i<<4)..($i<<4)+15]; - for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } - printf OUTPUT ",\n /* sub-index %02x */\n", $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup( ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp, 1 ))) + { + if (dstlen) *dst = (WCHAR)ch; + return 1; } + else { + while (*map) + { + size_decomp = decompose_char_recursive( compat, *map, dst, dstlen ); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} - # dump the 16-char subsets +int wine_unicode_decompose_string( int compat, const WCHAR *src, + int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0; + int decomp_len; - printf OUTPUT ",\n /* null mapping */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, (0) x 32 ); + if (dstlen < 0) dstlen = 0; - for (my $i = 0; $i < 4096; $i++) + while (srcpos < srclen) { - next unless $filled[$i]; - my @table = (0) x 32; - for (my $j = 0; $j < 16; $j++) + ch = src[srcpos]; + + decomp_len = decompose_char_recursive( compat, ch, dst+dstpos, dstlen ); + dstpos += decomp_len; + + if (dstlen > 0) { - if (defined $decomp_table[($i<<4) + $j]) + dstlen -= decomp_len; + while (dstlen < 0) { - $table[2 * $j] = ${$decomp_table[($i << 4) + $j]}[0]; - $table[2 * $j + 1] = ${$decomp_table[($i << 4) + $j]}[1]; + dstpos--; + dstlen++; } } - printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $i, $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + + ++srcpos; } - printf OUTPUT "\n};\n\n"; - print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) -{ - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; - - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; + return dstpos; } EOF close OUTPUT; -- 2.17.1

2 6

[PATCH 1/5] setupapi: Enforce a maximum device instance ID length.
by Zebediah Figura 28 Nov '18

28 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 14 +++++++++----- dlls/setupapi/tests/devinst.c | 20 +++++++++++++++++++- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 64c04131b0..8ce1344cda 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1337,7 +1337,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da /*********************************************************************** * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceName, +BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, const GUID *ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData) { @@ -1345,11 +1345,15 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceName, LPWSTR DeviceNameW = NULL; LPWSTR DeviceDescriptionW = NULL; - if (DeviceName) + if (!name || strlen(name) >= MAX_DEVICE_ID_LEN) { - DeviceNameW = MultiByteToUnicode(DeviceName, CP_ACP); - if (DeviceNameW == NULL) return FALSE; + SetLastError(ERROR_INVALID_DEVINST_NAME); + return FALSE; } + + DeviceNameW = MultiByteToUnicode(name, CP_ACP); + if (DeviceNameW == NULL) return FALSE; + if (DeviceDescription) { DeviceDescriptionW = MultiByteToUnicode(DeviceDescription, CP_ACP); @@ -1407,7 +1411,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, PCWSTR DeviceName, devinfo, debugstr_w(DeviceName), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), hwndParent, CreationFlags, device_data); - if (!DeviceName) + if (!DeviceName || strlenW(DeviceName) >= MAX_DEVICE_ID_LEN) { SetLastError(ERROR_INVALID_DEVINST_NAME); return FALSE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0e6a1c0a4e..338393e5f2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -271,8 +271,8 @@ static void test_device_info(void) { static const GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; SP_DEVINFO_DATA device = {0}, ret_device = {sizeof(ret_device)}; + char id[MAX_DEVICE_ID_LEN + 2]; HDEVINFO set; - char id[50]; BOOL ret; SetLastError(0xdeadbeef); @@ -382,6 +382,24 @@ todo_wine { check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\testguid"); check_device_info(set, 3, NULL, NULL); + memset(id, 'x', sizeof(id)); + memcpy(id, "Root\\LEGACY_BOGUS\\", strlen("Root\\LEGACY_BOGUS\\")); + id[MAX_DEVICE_ID_LEN + 1] = 0; + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, id, &guid, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DEVINST_NAME, "Got unexpected error %#x.\n", GetLastError()); + + id[MAX_DEVICE_ID_LEN] = 0; + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInfoA(set, id, &guid, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DEVINST_NAME, "Got unexpected error %#x.\n", GetLastError()); + + id[MAX_DEVICE_ID_LEN - 1] = 0; + ret = SetupDiCreateDeviceInfoA(set, id, &guid, NULL, NULL, 0, NULL); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); } -- 2.14.1

1 4

[PATCH 1/6] ntoskrnl.exe: Implement KeInitializeTimerEx().
by Zebediah Figura 28 Nov '18

28 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 --------------------- dlls/ntoskrnl.exe/sync.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 712681e0f9..be63740cf1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2285,27 +2285,6 @@ void WINAPI KeInitializeSpinLock( PKSPIN_LOCK SpinLock ) FIXME( "stub: %p\n", SpinLock ); } - -/*********************************************************************** - * KeInitializeTimerEx (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeTimerEx( PKTIMER Timer, TIMER_TYPE Type ) -{ - FIXME( "stub: %p %d\n", Timer, Type ); - - RtlZeroMemory(Timer, sizeof(KTIMER)); - Timer->Header.Type = Type ? 9 : 8; -} - - -/*********************************************************************** - * KeInitializeTimer (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeTimer( PKTIMER Timer ) -{ - KeInitializeTimerEx(Timer, NotificationTimer); -} - /*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index e63c7935bb..910572b0ee 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -38,6 +38,8 @@ enum object_type TYPE_AUTO_EVENT = 1, TYPE_MUTEX = 2, TYPE_SEMAPHORE = 5, + TYPE_MANUAL_TIMER = 8, + TYPE_AUTO_TIMER = 9, }; static CRITICAL_SECTION sync_cs; @@ -292,3 +294,26 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait ) return ret; } + +/*********************************************************************** + * KeInitializeTimerEx (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeTimerEx( KTIMER *timer, TIMER_TYPE type ) +{ + TRACE("timer %p, type %u.\n", timer, type); + + RtlZeroMemory(timer, sizeof(KTIMER)); + timer->Header.Type = (type == NotificationTimer) ? TYPE_MANUAL_TIMER : TYPE_AUTO_TIMER; + timer->Header.SignalState = FALSE; + timer->Header.Inserted = FALSE; + timer->Header.WaitListHead.Blink = NULL; + timer->Header.WaitListHead.Flink = NULL; +} + +/*********************************************************************** + * KeInitializeTimer (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeTimer( KTIMER *timer ) +{ + KeInitializeTimerEx(timer, NotificationTimer); +} -- 2.14.1

1 5

[PATCH v4 1/2] dbghelp: Avoid using inline assembly in do_x86cpuid().
by Zebediah Figura 28 Nov '18

28 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v4: fix build failure dlls/dbghelp/minidump.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45c9a..ad40c79bcf 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <time.h> #define NONAMELESSUNION @@ -542,20 +543,27 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +extern void do_x86cpuid(unsigned int ax, unsigned int *p); + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ); +#else +void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void) -- 2.14.1

1 1

[v2 PATCH 3/3] comsvcs: Add initial tests
by Alistair Leslie-Hughes 27 Nov '18

27 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/comsvcs/tests/Makefile.in | 5 + dlls/comsvcs/tests/dispenser.c | 256 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 263 insertions(+) create mode 100644 dlls/comsvcs/tests/Makefile.in create mode 100644 dlls/comsvcs/tests/dispenser.c diff --git a/configure b/configure index bb2817c..855e402 100755 --- a/configure +++ b/configure @@ -19255,6 +19255,7 @@ wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 wine_fn_config_makefile dlls/compstui enable_compstui wine_fn_config_makefile dlls/comsvcs enable_comsvcs +wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 wine_fn_config_makefile dlls/connect enable_connect wine_fn_config_makefile dlls/credui enable_credui diff --git a/configure.ac b/configure.ac index 8bf5e10..194ee1e 100644 --- a/configure.ac +++ b/configure.ac @@ -3110,6 +3110,7 @@ WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compstui) WINE_CONFIG_MAKEFILE(dlls/comsvcs) +WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) WINE_CONFIG_MAKEFILE(dlls/connect) WINE_CONFIG_MAKEFILE(dlls/credui) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in new file mode 100644 index 0000000..c89c193 --- /dev/null +++ b/dlls/comsvcs/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = comsvcs.dll +IMPORTS = ole32 uuid oleaut32 + +C_SRCS = \ + dispenser.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c new file mode 100644 index 0000000..187800e --- /dev/null +++ b/dlls/comsvcs/tests/dispenser.c @@ -0,0 +1,256 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "comsvcs.h" + +#include "wine/test.h" + +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + trace(#func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(driver_CreateResource); +DEFINE_EXPECT(driver_DestroyResource); +DEFINE_EXPECT(driver_ResetResource); +DEFINE_EXPECT(driver_Release); + +HRESULT driver_DestroyResource_ret = S_OK; + +static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid, void **object) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserDriver)) + { + *object = iface; + + return S_OK; + } + + ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI driver_AddRef(IDispenserDriver *iface) +{ + trace("AddRef\n"); + return 2; +} + +static ULONG WINAPI driver_Release(IDispenserDriver *iface) +{ + CHECK_EXPECT2(driver_Release); + return 1; +} + +static HRESULT WINAPI driver_CreateResource(IDispenserDriver *iface, const RESTYPID restypid, RESID *resid, TIMEINSECS *destroy) +{ + CHECK_EXPECT2(driver_CreateResource); + + *resid = 10; + return S_OK; +} + +static HRESULT WINAPI driver_RateResource(IDispenserDriver *iface, const RESTYPID restypid, const RESID resid, + const BOOL requires, RESOURCERATING *rating) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_EnlistResource(IDispenserDriver *iface, const RESID resid, const TRANSID transid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI driver_ResetResource(IDispenserDriver *iface, const RESID resid) +{ + CHECK_EXPECT2(driver_ResetResource); + ok((int)resid == 10, "RESID %d\n", (int)resid); + return S_OK; +} + +static HRESULT WINAPI driver_DestroyResource(IDispenserDriver *iface, const RESID resid) +{ + todo_wine CHECK_EXPECT2(driver_DestroyResource); + return driver_DestroyResource_ret; +} + +static HRESULT WINAPI driver_DestroyResourceS(IDispenserDriver *iface, const SRESID resid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + + +static const struct IDispenserDriverVtbl driver_vtbl = +{ + driver_QueryInterface, + driver_AddRef, + driver_Release, + driver_CreateResource, + driver_RateResource, + driver_EnlistResource, + driver_ResetResource, + driver_DestroyResource, + driver_DestroyResourceS +}; + +static IDispenserDriver DispenserDriver = { &driver_vtbl }; + +static void create_dispenser(void) +{ + static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; + static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; + static const WCHAR data[] = {'d','a','t','a','1',0}; + HRESULT hr; + IDispenserManager *dispenser = NULL; + IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + RESID resid; + BSTR str; + + hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if(FAILED(hr)) + { + win_skip("DispenserManager not available\n"); + return; + } + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(holder1 != holder2, "same holder object returned\n"); + + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool1, &holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if(holder1) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED_BROKEN(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder1, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder1); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + + IHolder_Release(holder1); + } + if(holder2) + { + SET_EXPECT(driver_CreateResource); + SET_EXPECT(driver_Release); + + str = SysAllocString(data); + hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resid == 10, "got %d\n", (int)resid); + SysFreeString(str); + + CHECK_CALLED(driver_CreateResource); + todo_wine CHECK_CALLED_BROKEN(driver_Release); + + SET_EXPECT(driver_ResetResource); + hr = IHolder_FreeResource(holder2, resid); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(driver_ResetResource); + + /* DestroyResource return doesn't directly affect the Holder Close return value */ + driver_DestroyResource_ret = E_FAIL; + SET_EXPECT(driver_DestroyResource); + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + CHECK_CALLED(driver_DestroyResource); + driver_DestroyResource_ret = S_OK; + IHolder_Release(holder2); + } + if(holder3) + { + SET_EXPECT(driver_Release); + hr = IHolder_Close(holder3); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(driver_Release); + IHolder_Release(holder3); + } + + IDispenserManager_Release(dispenser); +} + + +START_TEST(dispenser) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok( hr == S_OK, "failed to init com\n"); + if (hr != S_OK) + return; + + create_dispenser(); + + CoUninitialize(); +} -- 1.9.1

2 1

[PATCH] testbot: Show more specific mission descriptions.
by Francois Gouget 27 Nov '18

27 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 37 +++++++++++++++++---------- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 869f699358..18d4f5ed3f 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -102,33 +102,42 @@ sub GetMissionBaseName($) return $BaseName; } -sub GetTaskMissionDescription($) +sub GetTaskMissionDescription($$) { - my ($TaskMission) = @_; + my ($TaskMission, $VMType) = @_; my $Builds = $TaskMission->{Builds}; my $Description = - ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit executable" : - $Builds->{exe32} ? "32 bit executable" : - $Builds->{exe64} ? "64 bit executable" : + ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit" : + $Builds->{exe32} ? "32 bit" : + $Builds->{exe64} ? "64 bit" : ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" : $Builds->{win32} ? "32 bit" : $Builds->{wow32} ? "32 bit WoW" : "64 bit WoW"; - my $Lang; - foreach my $Mission (@{$TaskMission->{Missions}}) + if ($Builds->{exe32} or $Builds->{exe64}) { - next if (!$Mission->{lang}); - if (defined $Lang) + $Description .= ($VMType eq "build") ? " build" : " executable"; + } + else + { + my $Lang; + foreach my $Mission (@{$TaskMission->{Missions}}) { - $Description .= " + Locales"; - $Lang = undef; - last; + next if (!$Mission->{lang}); + if (defined $Lang) + { + $Description .= " + Locales"; + $Lang = undef; + last; + } + $Lang = $Mission->{lang}; } - $Lang = $Mission->{lang}; + $Description .= " ". LocaleName($Lang) if ($Lang); + $Description .= " tests"; } - $Description .= " ". LocaleName($Lang) if ($Lang); + return $Description; } diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 4a803e775a..19bedaaf41 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -91,7 +91,7 @@ sub GetTitle($) my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); if (!defined $ErrMessage and @$Missions == 1) { - push @TitleParts, GetTaskMissionDescription($Missions->[0]); + push @TitleParts, GetTaskMissionDescription($Missions->[0], $self->VM->Type); } } if ($self->Type ne "suite" and $self->CmdLineArg) -- 2.19.1

1 0

[PATCH] testbot: Allow running Windows executables on the Wine VMs.
by Francois Gouget 27 Nov '18

27 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 17 +++--- testbot/bin/build/WineReconfig.pl | 19 +++++-- testbot/bin/build/WineTest.pl | 59 ++++++++++++++++++--- testbot/web/Submit.pl | 87 ++++++++++++++++--------------- 4 files changed, 124 insertions(+), 58 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 592162ad7b..19e3e8f3eb 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -388,7 +388,7 @@ if ($Step->Type ne "suite" and $Step->Type ne "single") FatalError("Unexpected step type '". $Step->Type ."' found\n"); } if (($Step->Type eq "suite" and $Step->FileType ne "none") or - ($Step->Type ne "suite" and $Step->FileType ne "patch")) + ($Step->Type ne "suite" and $Step->FileType !~ /^(?:exe32|exe64|patch)$/)) { FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } @@ -417,13 +417,14 @@ if (!$TA->SetTime()) } } -my $FileName = $Step->GetFullFileName(); +my $FileName = $Step->FileName; if (defined $FileName) { Debug(Elapsed($Start), " Sending '$FileName'\n"); - if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) + my $Dst = $Step->FileType eq "patch" ? "patch.diff" : $FileName; + if (!$TA->SendFile($Step->GetFullFileName(), "staging/$Dst", 0)) { - FatalTAError($TA, "Could not copy the patch to the VM"); + FatalTAError($TA, "Could send '$FileName' to the VM"); } } @@ -452,10 +453,14 @@ if ($Step->Type eq "suite") } $Script .= join(" ", "-m", ShQuote($AdminEMail), "-i", ShQuote($Info)); } -else +elsif ($Step->FileType eq "patch") { $Script .= "--testpatch ". $Task->Missions ." patch.diff"; } +else +{ + $Script .= join(" ", "--testexe", $Task->Missions, $FileName, $Task->CmdLineArg); +} $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -557,7 +562,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) { chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); if (!defined $LogFailures and @$LogErrors == 1) { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index cc25da0cc8..77810958ab 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -49,9 +49,9 @@ use WineTestBot::Missions; # Build helpers # -sub BuildWine($$$$) +sub BuildWine($$$$;$) { - my ($TaskMissions, $NoRm, $Build, $Extras) = @_; + my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_; return 1 if (!$TaskMissions->{Builds}->{$Build}); mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); @@ -60,6 +60,7 @@ sub BuildWine($$$$) # accumulate InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); + $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine); system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". @@ -70,6 +71,18 @@ sub BuildWine($$$$) return !1; } + # Compile TestLauncher + my $Bits = ($Build =~ /64/) ? "64" : "32"; + $WithWine ||= "."; + system("cd '$DataDir/wine-$Build' && set -x && ". + "gcc -m$Bits -c -o TestLauncher.o ../../src/TestLauncher/TestLauncher.c -fPIC -Iinclude -I../wine/include && ". + "'$WithWine/tools/winegcc/winegcc' -B'$WithWine/tools/winebuild' --sysroot=. -m$Bits -o TestLauncher.exe.so TestLauncher.o"); + if ($? != 0) + { + LogMsg "The $Build TestLauncher build failed\n"; + return !1; + } + return 1; } @@ -79,7 +92,7 @@ sub UpdateWineBuilds($$) return BuildWine($TaskMissions, $NoRm, "win32", "") && BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && - BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); + BuildWine($TaskMissions, $NoRm, "wow32", "", "$DataDir/wine-wow64"); } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 23da71832c..b7389ba25e 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -180,6 +180,28 @@ sub TestPatch($$) return 1; } +sub TestExe($$$) +{ + my ($Mission, $FileName, $Args) = @_; + + my $BaseName = SetupTest("the tests", $Mission); + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; + return 0; + } + } + + # Run the test executable + RunWine($Mission, "./TestLauncher.exe.so", "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'../$BaseName.report'"); + + return 1; +} + # # Setup and command line processing @@ -193,7 +215,11 @@ my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg eq "--testpatch") + if ($Arg eq "--testexe") + { + $Action = "testexe"; + } + elsif ($Arg eq "--testpatch") { $Action = "testpatch"; } @@ -243,6 +269,11 @@ while (@ARGV) $Usage = 2; last; } + if ($Action eq "testexe") + { + # The remainder are the executable's arguments + last; + } } else { @@ -319,10 +350,18 @@ if (!defined $Usage) } } - if (!defined $FileName and $Action eq "testpatch") + if (!defined $FileName) { - Error "you must provide a patch to test\n"; - $Usage = 2; + if ($Action eq "testexe") + { + Error "you must provide an executable to run\n"; + $Usage = 2; + } + elsif ($Action eq "testpatch") + { + Error "you must provide a patch to test\n"; + $Usage = 2; + } } } if (defined $Usage) @@ -333,12 +372,14 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--help] --testpatch MISSIONS PATCH\n"; + print "Usage: $Name0 [--help] --testexe MISSIONS EXE ARGS...\n"; + print "or $Name0 [--help] --testpatch MISSIONS PATCH\n"; print "or $Name0 [--help] --winetest [--no-submit] MISSIONS BASETAG ARGS\n"; print "\n"; print "Tests the specified patch or runs WineTest in Wine.\n"; print "\n"; print "Where:\n"; + print " --testexe Run the executable in Wine.\n"; print " --testpatch Verify that the patch compiles and run the impacted tests.\n"; print " --winetest Run WineTest and submit the result to the website.\n"; print " --no-submit Do not submit the WineTest results to the website.\n"; @@ -346,6 +387,8 @@ if (defined $Usage) print " - win32: The regular 32 bit Wine build.\n"; print " - wow32: The 32 bit WoW Wine build.\n"; print " - wow64: The 64 bit WoW Wine build.\n"; + print " EXE Is the staging file containing the executable to run.\n"; + print " ARGS Are the arguments for the test executable.\n"; print " PATCH Is the staging file containing the patch to test.\n"; print " BASETAG Is the tag for this WineTest run. Note that the build type is\n"; print " automatically added to this tag.\n"; @@ -379,7 +422,11 @@ if ($Action eq "testpatch") } foreach my $Mission (@{$TaskMissions->{Missions}}) { - if ($Action eq "testpatch") + if ($Action eq "testexe") + { + exit(1) if (!TestExe($Mission, $FileName, \@ARGV)); + } + elsif ($Action eq "testpatch") { exit(1) if (!TestPatch($Mission, $Impacts)); } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3b7da0636f..5c40ef5046 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -243,11 +243,7 @@ sub GenerateFields($) my $VMs = CreateVMs(); if ($self->{FileType} eq "exe64") { - $VMs->AddFilter("Type", ["win64"]); - } - elsif ($self->{FileType} eq "exe32") - { - $VMs->AddFilter("Type", ["win32", "win64"]); + $VMs->AddFilter("Type", ["win64", "wine"]); } else { @@ -808,7 +804,7 @@ sub SubmitJob($$$) if (!defined $ErrMessage) { $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); - $Task->Missions($Missions->[0]); + $Task->Missions($MissionStatement); # Save the build step so the others can reference it (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); @@ -849,49 +845,54 @@ sub SubmitJob($$$) } } - if ($FileType eq "patch") + my ($Tasks, $MissionStatement, $Timeout); + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["wine"]); + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) { - my ($Tasks, $MissionStatement, $Timeout); - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["wine"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs - if (!$Tasks) + if (!$Tasks) + { + # First create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($BaseName); + $WineStep->FileType($FileType); + $WineStep->Type("single"); + $WineStep->DebugLevel($self->GetParam("DebugLevel")); + $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $WineStep->Tasks; + + $MissionStatement = ($FileType =~ /^(?:exe32|patch)$/) ? "win32" : ""; + if ($FileType eq "exe64" or + ($FileType eq "patch" and defined $self->GetParam("Run64"))) { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($BaseName); - $WineStep->FileType($FileType); - $WineStep->Type("single"); - $WineStep->DebugLevel($self->GetParam("DebugLevel")); - $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $WineStep->Tasks; - - $MissionStatement = "win32"; - $MissionStatement.= ":wow64" if (defined $self->GetParam("Run64")); - - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - $Missions = $Missions->[0]; - $Timeout = GetBuildTimeout($Impacts, $Missions) + - GetTestTimeout($Impacts, $Missions); + $MissionStatement .= ":wow64"; } + $MissionStatement =~ s/^://; - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($Timeout); - $Task->Missions($MissionStatement); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + $Missions = $Missions->[0]; + $Timeout = $FileType ne "patch" ? + $SingleTimeout : + GetBuildTimeout($Impacts, $Missions) + + GetTestTimeout($Impacts, $Missions); } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($Timeout); + $Task->Missions($MissionStatement); + $Task->CmdLineArg($self->GetParam("CmdLineArg")) if ($FileType ne "patch"); } # Now save it all (or whatever's left to save) -- 2.19.1

1 0

[PATCH] Revert "include: Use the ARRAY_SIZE() macro in debug.h."
by Andre Heider 27 Nov '18

27 Nov '18

This reverts commit af3992374e530a037e650b45194f933c5406038f. wine/debug.h is a public header, and ARRAY_SIZE() is not defined for external projects. Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 066873a38a..fb0d6bb737 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < ARRAY_SIZE(variant_types)) + if (vt < sizeof(variant_types)/sizeof(*variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB) -- 2.19.1

4 18

[PATCH vkd3d 3/5] vkd3d: Disallow creating shader visible RTV/DSV descriptor heaps.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 7 +++++++ tests/d3d12.c | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 36c5cb232f67..0c3d7e809806 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2522,6 +2522,13 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, return E_INVALIDARG; } + if ((desc->Flags & D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE) + && (desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_RTV || desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_DSV)) + { + WARN("RTV/DSV descriptors heap cannot be shader visible.\n"); + return E_INVALIDARG; + } + max_descriptor_count = (~(size_t)0 - sizeof(*object)) / descriptor_size; if (desc->NumDescriptors > max_descriptor_count) { diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b3f04d47410..d0372454a8c3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2207,12 +2207,12 @@ static void test_create_descriptor_heap(void) heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; heap_desc.NodeMask = 0; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12DescriptorHeap_GetDevice(heap, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2229,31 +2229,39 @@ static void test_create_descriptor_heap(void) heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.18.1

3 2

[PATCH vkd3d 5/5] vkd3d: Skip uninitialized DSV and RTV descriptors.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9e5921ef81e2..3d5e898b4adb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3570,9 +3570,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi for (i = 0; i < render_target_descriptor_count; ++i) { if (single_descriptor_handle) - rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors) + i; + { + if ((rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors))) + rtv_desc += i; + } else + { rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); + } + + if (!rtv_desc) + { + WARN("RTV descriptor %u is not initialized.\n", i); + list->views[i + 1] = VK_NULL_HANDLE; + continue; + } d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -3591,21 +3603,28 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor); + if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor))) + { + d3d12_command_list_track_resource_usage(list, dsv_desc->resource); - d3d12_command_list_track_resource_usage(list, dsv_desc->resource); + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = dsv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + list->views[0] = VK_NULL_HANDLE; + } - /* In D3D12 CPU descriptors are consumed when a command is recorded. */ - view = dsv_desc->view; - if (!d3d12_command_allocator_add_view(list->allocator, view)) + list->views[0] = view->u.vk_image_view; + list->fb_width = max(list->fb_width, dsv_desc->width); + list->fb_height = max(list->fb_height, dsv_desc->height); + list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); + } + else { - WARN("Failed to add view.\n"); + WARN("DSV descriptor is not initialized.\n"); + list->views[0] = VK_NULL_HANDLE; } - - list->views[0] = view->u.vk_image_view; - list->fb_width = max(list->fb_width, dsv_desc->width); - list->fb_height = max(list->fb_height, dsv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); } d3d12_command_list_invalidate_current_framebuffer(list); -- 2.18.1

2 1

[PATCH vkd3d 4/5] vkd3d: Improve invalid format messages.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3ee602fafb4b..6f7373e996ef 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1809,7 +1809,7 @@ static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input if (!(format = vkd3d_get_format(e->Format, false))) { - WARN("Invalid DXGI format %#x.\n", e->Format); + WARN("Invalid input element format %#x.\n", e->Format); return E_INVALIDARG; } @@ -1956,7 +1956,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->DSVFormat, true))) { - WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); + WARN("Invalid DSV format %#x.\n", desc->DSVFormat); hr = E_INVALIDARG; goto fail; } @@ -2014,7 +2014,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) { - WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); + WARN("Invalid RTV format %#x.\n", desc->RTVFormats[i]); hr = E_INVALIDARG; goto fail; } @@ -2148,7 +2148,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(e->Format, false))) { - WARN("Invalid DXGI format %#x.\n", e->Format); + WARN("Invalid input element format %#x.\n", e->Format); hr = E_INVALIDARG; goto fail; } -- 2.18.1

2 1

[PATCH vkd3d 1/5] tests: Add more test for clearing array textures.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- More test for Anv bug... --- tests/d3d12.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index aa35315f3e7a..09dc339c8084 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,8 +3630,16 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { + static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const struct vec4 array_colors[] = + { + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3644,11 +3652,13 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; - ID3D12Resource *resource; ID3D12Device *device; + unsigned int i; D3D12_BOX box; HRESULT hr; + STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors)); + memset(&desc, 0, sizeof(desc)); desc.no_render_target = true; if (!init_test_context(&context, &desc)) @@ -3687,7 +3697,7 @@ static void test_clear_render_target_view(void) &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); memset(&rtv_desc, 0, sizeof(rtv_desc)); rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -3720,12 +3730,88 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 2D array texture */ + ID3D12Resource_Release(resource); + resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors); + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + reset_command_list(command_list, context.allocator); + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; + rtv_desc.Texture2DArray.FirstArraySlice = i; + rtv_desc.Texture2DArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + /* 2D multisample array texture */ + ID3D12Resource_Release(resource); + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, + &IID_ID3D12Resource, (void **)&resolved_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; + rtv_desc.Texture2DMSArray.FirstArraySlice = i; + rtv_desc.Texture2DMSArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + ID3D12Resource_Release(resolved_resource); + /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, @@ -3734,7 +3820,6 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); - reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); -- 2.18.1

2 1

[PATCH vkd3d 2/5] tests: Implement readback for multisample textures.
by Józef Kucia 27 Nov '18

27 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 24 +++-------- tests/vkd3d_d3d12_test.h | 86 ++++++++++++++++++++++++++-------------- 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 09dc339c8084..1b3f04d47410 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,16 +3630,15 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { - static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const unsigned int array_expected_colors[] = {0xff00ff00, 0xff0000ff, 0xffff0000}; static const struct vec4 array_colors[] = { - {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f}, }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; - ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3652,6 +3651,7 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; + ID3D12Resource *resource; ID3D12Device *device; unsigned int i; D3D12_BOX box; @@ -3770,13 +3770,6 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); - resource_desc.DepthOrArraySize = 1; - resource_desc.SampleDesc.Count = 1; - hr = ID3D12Device_CreateCommittedResource(device, - &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, - D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, - &IID_ID3D12Resource, (void **)&resolved_resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(array_colors); ++i) { @@ -3795,23 +3788,16 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) { - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); - ID3D12GraphicsCommandList_ResolveSubresource(command_list, - resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); reset_command_list(command_list, context.allocator); } - ID3D12Resource_Release(resolved_resource); - /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 1; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, diff --git a/tests/vkd3d_d3d12_test.h b/tests/vkd3d_d3d12_test.h index 28225e1749d2..fc07af78ffb4 100644 --- a/tests/vkd3d_d3d12_test.h +++ b/tests/vkd3d_d3d12_test.h @@ -159,6 +159,28 @@ static inline ID3D12DescriptorHeap *create_gpu_descriptor_heap_(unsigned int lin return descriptor_heap; } +static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + D3D12_RESOURCE_BARRIER barrier; + + barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + barrier.Transition.pResource = resource; + barrier.Transition.Subresource = sub_resource_idx; + barrier.Transition.StateBefore = state_before; + barrier.Transition.StateAfter = state_after; + + ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); +} + +static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, + state_before, state_after); +} + static unsigned int format_size(DXGI_FORMAT format) { switch (format) @@ -218,15 +240,16 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *src_resource; D3D12_RANGE read_range; unsigned int miplevel; ID3D12Device *device; - DXGI_FORMAT format; HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, @@ -240,35 +263,62 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi rb->row_pitch = align(rb->width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->data = NULL; - format = resource_desc.Format; + if (resource_desc.SampleDesc.Count > 1) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + resource_desc.Alignment = 0; + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, + &IID_ID3D12Resource, (void **)&src_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + src_resource, 0, texture, sub_resource, resource_desc.Format); + transition_resource_state(command_list, src_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + sub_resource = 0; + } + else + { + src_resource = texture; + } rb->resource = create_readback_buffer(device, rb->row_pitch * rb->height * rb->depth); dst_location.pResource = rb->resource; dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; dst_location.PlacedFootprint.Offset = 0; - dst_location.PlacedFootprint.Footprint.Format = format; + dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format; dst_location.PlacedFootprint.Footprint.Width = rb->width; dst_location.PlacedFootprint.Footprint.Height = rb->height; dst_location.PlacedFootprint.Footprint.Depth = rb->depth; dst_location.PlacedFootprint.Footprint.RowPitch = rb->row_pitch; - src_location.pResource = texture; + src_location.pResource = src_resource; src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; src_location.SubresourceIndex = sub_resource; ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); ID3D12Device_Release(device); + if (src_resource != texture) + ID3D12Resource_Release(src_resource); + read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void *get_readback_data(struct resource_readback *rb, @@ -367,28 +417,6 @@ static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device return texture; } -static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - D3D12_RESOURCE_BARRIER barrier; - - barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; - barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; - barrier.Transition.pResource = resource; - barrier.Transition.Subresource = sub_resource_idx; - barrier.Transition.StateBefore = state_before; - barrier.Transition.StateAfter = state_after; - - ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); -} - -static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, - state_before, state_after); -} - static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) { -- 2.18.1

2 1

[PATCH 1/5] wined3d: Simplify "glsl_generate_ffp" texture projection
by Daniel Ansorregui 27 Nov '18

27 Nov '18

* This is to simplify the code before adding the FETCH4 modifications No change is intended in the shader generation Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 63 ++++++++++---------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 545e1bff9f..4b2dfaf34a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9863,65 +9863,34 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * switch (settings->op[stage].tex_type) { case WINED3D_GL_RES_TYPE_TEX_1D: - if (proj) - { - texture_function = "texture1DProj"; - coord_mask = "xw"; - } - else - { - texture_function = "texture1D"; - coord_mask = "x"; - } + texture_function = "texture1D"; + coord_mask = "x"; break; case WINED3D_GL_RES_TYPE_TEX_2D: - if (proj) - { - texture_function = "texture2DProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2D"; - coord_mask = "xy"; - } + texture_function = "texture2D"; + coord_mask = "xy"; break; case WINED3D_GL_RES_TYPE_TEX_3D: - if (proj) - { - texture_function = "texture3DProj"; - coord_mask = "xyzw"; - } - else - { - texture_function = "texture3D"; - coord_mask = "xyz"; - } + texture_function = "texture3D"; + coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_CUBE: texture_function = "textureCube"; coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_RECT: - if (proj) - { - texture_function = "texture2DRectProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2DRect"; - coord_mask = "xy"; - } + texture_function = "texture2DRect"; + coord_mask = "xy"; break; default: FIXME("Unhandled texture type %#x.\n", settings->op[stage].tex_type); texture_function = ""; coord_mask = "xyzw"; + proj = FALSE; break; } if (!legacy_syntax) - texture_function = proj ? "textureProj" : "texture"; + texture_function = "texture"; if (stage > 0 && (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP @@ -9953,8 +9922,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, "ret = ffp_texcoord[%u] + ret.xyxy;\n", stage); } - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", - stage, texture_function, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ret.%s%c);\n", + stage, texture_function, proj ? "Proj" : "", stage, coord_mask, proj ? 'w' : ' '); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", @@ -9962,13 +9931,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", - stage, texture_function, stage, stage); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage); } else { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].%s);\n", - stage, texture_function, stage, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].%s%c);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage, coord_mask, proj ? 'w' : ' '); } string_buffer_sprintf(tex_reg_name, "tex%u", stage); -- 2.17.1

6 26

[PATCH v3 2/3] mpr: Implement support for making connections persistent.
by Pierre Schweitzer 27 Nov '18

27 Nov '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH 1/6] ntoskrnl.exe: Implement KeInitializeSemaphore().
by Zebediah Figura 27 Nov '18

27 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1cfb032dd..07e9104498 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2307,15 +2307,6 @@ LONG WINAPI KeReleaseMutex(PRKMUTEX Mutex, BOOLEAN Wait) } -/*********************************************************************** - * KeInitializeSemaphore (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeSemaphore( PRKSEMAPHORE Semaphore, LONG Count, LONG Limit ) -{ - FIXME( "(%p %d %d) stub\n", Semaphore , Count, Limit ); -} - - /*********************************************************************** * KeInitializeSpinLock (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 8011b56754..2190faa81f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -36,6 +36,7 @@ enum object_type { TYPE_MANUAL_EVENT = 0, TYPE_AUTO_EVENT = 1, + TYPE_SEMAPHORE = 5, }; static CRITICAL_SECTION sync_cs; @@ -172,3 +173,17 @@ LONG WINAPI KeResetEvent( PRKEVENT event ) return ret; } + +/*********************************************************************** + * KeInitializeSemaphore (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeSemaphore( PRKSEMAPHORE semaphore, LONG count, LONG limit ) +{ + TRACE("semaphore %p, count %d, limit %d.\n", semaphore, count, limit); + + semaphore->Header.Type = TYPE_SEMAPHORE; + semaphore->Header.SignalState = count; + semaphore->Header.WaitListHead.Blink = NULL; + semaphore->Header.WaitListHead.Flink = NULL; + semaphore->Limit = limit; +} -- 2.14.1

2 7

[PATCH v5] server: Release of related atoms when destroying a window class
by Ralf Habacker 27 Nov '18

27 Nov '18

1 0

[PATCH] testbot: Provide the missions list to the Reconfig scripts.
by Francois Gouget 27 Nov '18

27 Nov '18

The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4d50a3789a..2a8b1d625d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " echo git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.19.1

2 2

[PATCH v4] server: Release of related atoms when destroying a, window class
by Ralf Habacker 27 Nov '18

27 Nov '18

1 0

[PATCH v2] server: Release related atoms when destroying a window class
by Ralf Habacker 27 Nov '18

27 Nov '18

3 6

[PATCH v3] server: Release of related atoms when destroying a, window class
by Ralf Habacker 27 Nov '18

27 Nov '18

1 0

[PATCH 6/6] webservices: Add support for stream input.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 202 ++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 106 +++++++++++++++++++++ 2 files changed, 249 insertions(+), 59 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index cbce1f6afb..ba6a951e9c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -390,10 +390,13 @@ struct reader WS_XML_READER_ENCODING_TYPE input_enc; WS_CHARSET input_charset; WS_XML_READER_INPUT_TYPE input_type; + WS_READ_CALLBACK input_cb; + void *input_cb_state; struct xmlbuf *input_buf; const unsigned char *input_data; ULONG input_size; ULONG text_conv_offset; + unsigned char *stream_buf; const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; ULONG prop_count; @@ -515,6 +518,7 @@ static void free_reader( struct reader *reader ) destroy_nodes( reader->root ); clear_prefixes( reader->prefixes, reader->nb_prefixes ); heap_free( reader->prefixes ); + heap_free( reader->stream_buf ); #ifndef __MINGW32__ reader->cs.DebugInfo->Spare[0] = 0; @@ -615,6 +619,29 @@ void WINAPI WsFreeReader( WS_XML_READER *handle ) free_reader( reader ); } +static HRESULT read_more_data( struct reader *reader, ULONG min_size, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + ULONG size = 0, max_size; + + if (reader->read_size - reader->read_pos >= min_size) return S_OK; + if (reader->input_type != WS_XML_READER_INPUT_TYPE_STREAM) return WS_E_INVALID_FORMAT; + if (min_size > reader->input_size) return WS_E_QUOTA_EXCEEDED; + + if (min_size > reader->input_size - reader->read_pos) + { + memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); + reader->read_size -= reader->read_pos; + reader->read_pos = 0; + } + max_size = reader->input_size - reader->read_size; + + reader->input_cb( reader->input_cb_state, reader->stream_buf + reader->read_size, max_size, &size, ctx, error ); + if (size < min_size) return WS_E_QUOTA_EXCEEDED; + reader->read_size += size; + return S_OK; +} + /************************************************************************** * WsFillReader [webservices.@] */ @@ -622,7 +649,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; - HRESULT hr = S_OK; + HRESULT hr; TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -637,9 +664,16 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY return E_INVALIDARG; } - /* FIXME: add support for stream input */ - reader->read_size = min( min_size, reader->input_size ); - reader->read_pos = 0; + if (reader->input_type == WS_XML_READER_INPUT_TYPE_STREAM) + { + hr = read_more_data( reader, min_size, ctx, error ); + } + else + { + reader->read_size = min( min_size, reader->input_size ); + reader->read_pos = 0; + hr = S_OK; + } LeaveCriticalSection( &reader->cs ); TRACE( "returning %08x\n", hr ); @@ -931,7 +965,7 @@ WS_XML_DATETIME_TEXT *alloc_datetime_text( const WS_DATETIME *value ) static inline BOOL read_end_of_data( struct reader *reader ) { - return reader->read_pos >= reader->read_size; + return (read_more_data( reader, 1, NULL, NULL ) != S_OK); } static inline const unsigned char *read_current_ptr( struct reader *reader ) @@ -939,25 +973,35 @@ static inline const unsigned char *read_current_ptr( struct reader *reader ) return &reader->read_bufptr[reader->read_pos]; } +static inline void read_skip( struct reader *reader, unsigned int count ) +{ + assert( reader->read_pos + count <= reader->read_size ); + reader->read_pos += count; +} + static inline HRESULT read_peek( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; - memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); + HRESULT hr; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + memcpy( bytes, read_current_ptr( reader ), len ); return S_OK; } static inline HRESULT read_byte( struct reader *reader, unsigned char *byte ) { - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - *byte = reader->read_bufptr[reader->read_pos++]; + HRESULT hr; + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + *byte = *read_current_ptr( reader ); + read_skip( reader, 1 ); return S_OK; } static inline HRESULT read_bytes( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; - memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); - reader->read_pos += len; + HRESULT hr; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + memcpy( bytes, read_current_ptr( reader ), len ); + read_skip( reader, len ); return S_OK; } @@ -985,20 +1029,22 @@ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { unsigned int len; - unsigned char ch = reader->read_bufptr[reader->read_pos]; + unsigned char ch; const unsigned char *end; + HRESULT hr; - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + ch = *read_current_ptr( reader ); if (ch < 0x80) { *ret = ch; *skip = 1; return S_OK; } + len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; - end = reader->read_bufptr + reader->read_pos + len + 1; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + end = read_current_ptr( reader ) + len + 1; *ret = ch & utf8_mask[len]; switch (len) @@ -1020,12 +1066,6 @@ static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, return WS_E_INVALID_FORMAT; } -static inline void read_skip( struct reader *reader, unsigned int count ) -{ - if (reader->read_pos + count > reader->read_size) return; - reader->read_pos += count; -} - static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1042,16 +1082,22 @@ static inline BOOL read_isspace( unsigned int ch ) static inline void read_skip_whitespace( struct reader *reader ) { - while (reader->read_pos < reader->read_size && read_isspace( reader->read_bufptr[reader->read_pos] )) - reader->read_pos++; + for (;;) + { + if (read_more_data( reader, 1, NULL, NULL ) != S_OK || !read_isspace( *read_current_ptr( reader ) )) break; + read_skip( reader, 1 ); + } } static inline HRESULT read_cmp( struct reader *reader, const char *str, int len ) { - const unsigned char *ptr = read_current_ptr( reader ); + const unsigned char *ptr; + HRESULT hr; if (len < 0) len = strlen( str ); - if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; + if ((hr = read_more_data( reader, len, NULL, NULL )) != S_OK) return hr; + + ptr = read_current_ptr( reader ); while (len--) { if (*str != *ptr) return WS_E_INVALID_FORMAT; @@ -1064,9 +1110,8 @@ static HRESULT read_xmldecl( struct reader *reader ) { HRESULT hr; - if (!reader->read_size) return WS_E_INVALID_FORMAT; - - if (read_cmp( reader, "<", 1 ) != S_OK || read_cmp( reader, "<?", 2 ) != S_OK) + if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; + if (*read_current_ptr( reader ) != '<' || (hr = read_cmp( reader, "<?", 2 ) != S_OK)) { reader->state = READER_STATE_BOF; return S_OK; @@ -1075,8 +1120,11 @@ static HRESULT read_xmldecl( struct reader *reader ) read_skip( reader, 6 ); /* FIXME: parse attributes */ - while (reader->read_pos < reader->read_size && reader->read_bufptr[reader->read_pos] != '?') - reader->read_pos++; + for (;;) + { + if (read_more_data( reader, 1, NULL, NULL ) != S_OK || *read_current_ptr( reader ) == '?' ) break; + read_skip( reader, 1 ); + } if ((hr = read_cmp( reader, "?>", 2 )) != S_OK) return hr; read_skip( reader, 2 ); @@ -6829,19 +6877,15 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI static inline BOOL is_utf8( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xef,0xbb,0xbf}; - const unsigned char *p = data; - - return (size >= sizeof(bom) && !memcmp( p, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || + return (size >= sizeof(bom) && !memcmp( data, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || (size > 2 && !(*offset = 0)); } static inline BOOL is_utf16le( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xff,0xfe}; - const unsigned char *p = data; - - return (size >= sizeof(bom) && !memcmp( p, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || - (size >= 4 && p[0] == '<' && !p[1] && !(*offset = 0)); + return (size >= sizeof(bom) && !memcmp( data, bom, sizeof(bom) ) && (*offset = sizeof(bom))) || + (size >= 4 && data[0] == '<' && !data[1] && !(*offset = 0)); } static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG *offset ) @@ -6862,10 +6906,10 @@ static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG * return ret; } -static void set_input_buffer( struct reader *reader, struct xmlbuf *buf, const unsigned char *data, ULONG size ) +static void set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; - reader->input_buf = buf; + reader->input_buf = NULL; reader->input_data = data; reader->input_size = size; @@ -6876,6 +6920,28 @@ static void set_input_buffer( struct reader *reader, struct xmlbuf *buf, const u reader->text_conv_offset = 0; } +#define STREAM_BUFSIZE 4096 +static void set_input_stream( struct reader *reader, WS_READ_CALLBACK callback, void *state ) +{ + reader->input_type = WS_XML_READER_INPUT_TYPE_STREAM; + reader->input_cb = callback; + reader->input_cb_state = state; + reader->input_buf = NULL; + reader->input_data = reader->stream_buf; + reader->input_size = STREAM_BUFSIZE; + + if (reader->read_pos >= reader->read_size) reader->read_size = 0; + else + { + memmove( reader->stream_buf, reader->stream_buf + reader->read_pos, reader->read_size - reader->read_pos ); + reader->read_size -= reader->read_pos; + } + reader->read_pos = 0; + reader->read_bufptr = reader->input_data; + + reader->text_conv_offset = 0; +} + /************************************************************************** * WsSetInput [webservices.@] */ @@ -6914,19 +6980,14 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { case WS_XML_READER_ENCODING_TYPE_TEXT: { - WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; - - if (input->inputType != WS_XML_READER_INPUT_TYPE_BUFFER) + if (input->inputType == WS_XML_READER_INPUT_TYPE_BUFFER) { - FIXME( "charset detection on input type %u not supported\n", input->inputType ); - hr = E_NOTIMPL; - goto done; + WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; + WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; + else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); } - if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; - else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); - reader->input_enc = WS_XML_READER_ENCODING_TYPE_TEXT; break; } @@ -6950,8 +7011,18 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * case WS_XML_READER_INPUT_TYPE_BUFFER: { WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; - set_input_buffer( reader, NULL, (const unsigned char *)buf->encodedData + offset, - buf->encodedDataSize - offset ); + set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); + break; + } + case WS_XML_READER_INPUT_TYPE_STREAM: + { + WS_XML_READER_STREAM_INPUT *stream = (WS_XML_READER_STREAM_INPUT *)input; + if (!reader->stream_buf && !(reader->stream_buf = heap_alloc( STREAM_BUFSIZE ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + set_input_stream( reader, stream->readCallback, stream->readCallbackState ); break; } default: @@ -6969,6 +7040,24 @@ done: return hr; } +static void set_input_xml_buffer( struct reader *reader, struct xmlbuf *buf ) +{ + reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; + reader->input_buf = buf; + reader->input_enc = buf->encoding; + reader->input_charset = buf->charset; + reader->input_data = buf->bytes.bytes; + reader->input_size = buf->bytes.length; + reader->dict_static = buf->dict_static; + reader->dict = buf->dict; + + reader->read_size = reader->input_size; + reader->read_pos = 0; + reader->read_bufptr = reader->input_data; + + reader->text_conv_offset = 0; +} + /************************************************************************** * WsSetInputToBuffer [webservices.@] */ @@ -7003,12 +7092,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, } if ((hr = init_reader( reader )) != S_OK) goto done; - - reader->input_enc = xmlbuf->encoding; - reader->input_charset = xmlbuf->charset; - reader->dict_static = xmlbuf->dict_static; - reader->dict = xmlbuf->dict; - set_input_buffer( reader, xmlbuf, xmlbuf->bytes.bytes, xmlbuf->bytes.length ); + set_input_xml_buffer( reader, xmlbuf ); if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else read_insert_bof( reader, node ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index b21e8396be..2b0475fddf 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6689,6 +6689,111 @@ static void test_empty_text_field(void) WsFreeHeap( heap ); } +static const char stream_utf8[] = {0xef,0xbb,0xbf,'<','t','/','>',0}; +static const struct stream_test +{ + const char *xml; + HRESULT hr; + int todo; +} +stream_tests[] = +{ + { "", WS_E_QUOTA_EXCEEDED }, + { "<?xml version=\"1.0\" encoding=\"utf-8\"?><t/>", S_OK }, + { "<t/>", S_OK }, + { stream_utf8, S_OK, 1 }, +}; + +static CALLBACK HRESULT read_callback( void *state, void *buf, ULONG buflen, ULONG *retlen, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct stream_test *test = state; + ULONG len = strlen( test->xml ); + + ok( state != NULL, "NULL state\n" ); + ok( buf != NULL, "NULL buf\n" ); + ok( buflen > 0, "zero buflen\n" ); + ok( retlen != NULL, "NULL retlen\n" ); + if (buflen < len) return WS_E_QUOTA_EXCEEDED; + memcpy( buf, test->xml, len ); + *retlen = len; + return S_OK; +} + +static void test_stream_input(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}}; + WS_XML_READER_STREAM_INPUT stream; + WS_XML_READER *reader; + const WS_XML_NODE *node; + WS_CHARSET charset; + HRESULT hr; + BOOL found; + ULONG i, size; + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + stream.input.inputType = WS_XML_READER_INPUT_TYPE_STREAM; + stream.readCallback = read_callback; + stream.readCallbackState = (void *)&stream_tests[2]; + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %08x\n", hr ); + + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, strlen(stream_tests[2].xml), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + charset = 0xdeadbeef; + size = sizeof(charset); + hr = WsGetReaderProperty( reader, WS_XML_READER_PROPERTY_CHARSET, &charset, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); + + found = -1; + hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (i = 0; i < ARRAY_SIZE(stream_tests); i++) + { + stream.readCallbackState = (void *)&stream_tests[i]; + hr = WsSetInput( reader, &text.encoding, &stream.input, NULL, 0, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsFillReader( reader, strlen( stream_tests[i].xml ), NULL, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + found = -1; + hr = WsReadToStartElement( reader, &str_t, &str_ns, &found, NULL ); + todo_wine_if(stream_tests[i].todo) ok( hr == stream_tests[i].hr, "%u: got %08x\n", i, hr ); + if (hr == S_OK) + { + ok( found == TRUE, "%u: got %d\n", i, found ); + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "%u: got %u\n", i, node->nodeType ); + } + } + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -6738,4 +6843,5 @@ START_TEST(reader) test_float(); test_repeating_element_choice(); test_empty_text_field(); + test_stream_input(); } -- 2.11.0

1 0

[PATCH 5/6] webservices: Return HRESULT from read_utf8_char.
by Hans Leidekker 27 Nov '18

27 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 57 +++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ff19254640..cbce1f6afb 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -982,41 +982,42 @@ static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; -static inline unsigned int read_utf8_char( struct reader *reader, unsigned int *skip ) +static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { - unsigned int len, res; + unsigned int len; unsigned char ch = reader->read_bufptr[reader->read_pos]; const unsigned char *end; - if (reader->read_pos >= reader->read_size) return 0; + if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; if (ch < 0x80) { + *ret = ch; *skip = 1; - return ch; + return S_OK; } len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return 0; + if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; end = reader->read_bufptr + reader->read_pos + len + 1; - res = ch & utf8_mask[len]; + *ret = ch & utf8_mask[len]; switch (len) { case 3: if ((ch = end[-3] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 2: if ((ch = end[-2] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 1: if ((ch = end[-1] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; - if (res < utf8_minval[len]) break; + *ret = (*ret << 6) | ch; + if (*ret < utf8_minval[len]) break; *skip = len + 1; - return res; + return S_OK; } - return 0; + return WS_E_INVALID_FORMAT; } static inline void read_skip( struct reader *reader, unsigned int count ) @@ -1303,14 +1304,14 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT read_skip_whitespace( reader ); if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; - quote = read_utf8_char( reader, &skip ); + if ((hr = read_utf8_char( reader, &quote, &skip )) != S_OK) return hr; read_skip( reader, 1 ); len = 0; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == quote) break; read_skip( reader, skip ); len += skip; @@ -1651,19 +1652,23 @@ static HRESULT read_attribute_text( struct reader *reader, WS_XML_ATTRIBUTE **re unsigned int len = 0, ch, skip; const unsigned char *start; WS_XML_STRING *prefix, *localname; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if ((hr = parse_qname( start, len, &prefix, &localname )) != S_OK) goto error; if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) @@ -1953,16 +1958,19 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; - hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if (!(parent = find_parent( reader ))) goto error; if ((hr = parse_qname( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; @@ -2107,7 +2115,7 @@ static HRESULT read_text_text( struct reader *reader ) for (;;) { if (read_end_of_data( reader )) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '<') break; read_skip( reader, skip ); len += skip; @@ -2741,7 +2749,7 @@ static HRESULT read_endelement_text( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '>') { read_skip( reader, 1 ); @@ -2821,7 +2829,7 @@ static HRESULT read_comment_text( struct reader *reader ) read_skip( reader, 3 ); break; } - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } @@ -2907,12 +2915,13 @@ static HRESULT read_cdata( struct reader *reader ) struct node *node; WS_XML_TEXT_NODE *text; WS_XML_UTF8_TEXT *utf8; + HRESULT hr; start = read_current_ptr( reader ); for (;;) { if (read_cmp( reader, "]]>", 3 ) == S_OK) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } -- 2.11.0

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-devel